[GIT PULL] asm-generic fixes for 5.19, part 2

[Arnd Bergmann]

The following changes since commit b13baccc3850ca8b8cccbf8ed9912dbaa0fdf7f3:

  Linux 5.19-rc2 (2022-06-12 16:11:37 -0700)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git
tags/asm-generic-fixes-5.19-2

for you to fetch changes up to e2a619ca0b38f2114347b7078b8a67d72d457a3d:

  asm-generic: remove a broken and needless ifdef conditional
(2022-07-22 15:00:00 +0200)

----------------------------------------------------------------
asm-generic fixes for 5.19, part 2

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.

----------------------------------------------------------------
Florian Fainelli (1):
      tools: Fixed MIPS builds due to struct flock re-definition

Lukas Bulwahn (1):
      asm-generic: remove a broken and needless ifdef conditional

 include/asm-generic/io.h               |  2 --
 include/uapi/asm-generic/fcntl.h       |  2 ++
 tools/include/uapi/asm-generic/fcntl.h | 11 ++++++++++-
 3 files changed, 12 insertions(+), 3 deletions(-)