From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 27 Jul 2022 16:50:18 +0000 (-0700)
Subject: Merge tag 'asm-generic-fixes-5.19-2' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: baikal/mips/sdk6.1~5256
X-Git-Url: https://git.baikalelectronics.ru/?a=commitdiff_plain;h=324985971856658c1fe6546a674937153fe6b5b7;p=kernel.git

Merge tag 'asm-generic-fixes-5.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic

Pull asm-generic fixes from Arnd Bergmann:
 "Two more bug fixes for asm-generic, one addressing an incorrect
  Kconfig symbol reference and another one fixing a build failure for
  the perf tool on mips and possibly others"

* tag 'asm-generic-fixes-5.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
  asm-generic: remove a broken and needless ifdef conditional
  tools: Fixed MIPS builds due to struct flock re-definition
---

324985971856658c1fe6546a674937153fe6b5b7