Merge branch 'for-linus-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad...

Pull iscsi_ibft fix from Konrad Rzeszutek Wilk:
 "One tiny fix to enable iSCSI IBFT to be compiled under ARM"

* 'for-linus-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft:
  iscsi_ibft: make ISCSI_IBFT depend on ACPI instead of ISCSI_IBFT_FIND

diff --combined drivers/firmware/Kconfig
index 53446e3,f028218..ba8d3d0
--- 1/drivers/firmware/Kconfig
--- 2/drivers/firmware/Kconfig
+++ b/drivers/firmware/Kconfig
@@@ -1,11 -1,24 +1,11 @@@
 +# SPDX-License-Identifier: GPL-2.0-only
  #
  # For a description of the syntax of this configuration file,
 -# see Documentation/kbuild/kconfig-language.txt.
 +# see Documentation/kbuild/kconfig-language.rst.
  #
  
  menu "Firmware Drivers"
  
 -config ARM_PSCI_FW
 -      bool
 -
 -config ARM_PSCI_CHECKER
 -      bool "ARM PSCI checker"
 -      depends on ARM_PSCI_FW && HOTPLUG_CPU && CPU_IDLE && !TORTURE_TEST
 -      help
 -        Run the PSCI checker during startup. This checks that hotplug and
 -        suspend operations work correctly when using PSCI.
 -
 -        The torture tests may interfere with the PSCI checker by turning CPUs
 -        on and off through hotplug, so for now torture tests and PSCI checker
 -        are mutually exclusive.
 -
  config ARM_SCMI_PROTOCOL
        bool "ARM System Control and Management Interface (SCMI) Message Protocol"
        depends on ARM || ARM64 || COMPILE_TEST
@@@ -157,7 -170,7 +157,7 @@@ config DMI_SCAN_MACHINE_NON_EFI_FALLBAC
  
  config ISCSI_IBFT_FIND
        bool "iSCSI Boot Firmware Table Attributes"
-       depends on X86 && ACPI
+       depends on X86 && ISCSI_IBFT
        default n
        help
          This option enables the kernel to find the region of memory
@@@ -168,7 -181,8 +168,8 @@@
  config ISCSI_IBFT
        tristate "iSCSI Boot Firmware Table Attributes module"
        select ISCSI_BOOT_SYSFS
-       depends on ISCSI_IBFT_FIND && SCSI && SCSI_LOWLEVEL
+       select ISCSI_IBFT_FIND if X86
+       depends on ACPI && SCSI && SCSI_LOWLEVEL
        default n
        help
          This option enables support for detection and exposing of iSCSI
@@@ -205,7 -219,7 +206,7 @@@ config FW_CFG_SYSFS_CMDLIN
  
  config INTEL_STRATIX10_SERVICE
        tristate "Intel Stratix10 Service Layer"
 -      depends on HAVE_ARM_SMCCC
 +      depends on ARCH_STRATIX10 && HAVE_ARM_SMCCC
        default n
        help
          Intel Stratix10 service layer runs at privileged exception level,
@@@ -254,26 -268,9 +255,26 @@@ config TI_SCI_PROTOCO
          This protocol library is used by client drivers to use the features
          provided by the system controller.
  
 +config TRUSTED_FOUNDATIONS
 +      bool "Trusted Foundations secure monitor support"
 +      depends on ARM && CPU_V7
 +      help
 +        Some devices (including most early Tegra-based consumer devices on
 +        the market) are booted with the Trusted Foundations secure monitor
 +        active, requiring some core operations to be performed by the secure
 +        monitor instead of the kernel.
 +
 +        This option allows the kernel to invoke the secure monitor whenever
 +        required on devices using Trusted Foundations. See the functions and
 +        comments in linux/firmware/trusted_foundations.h or the device tree
 +        bindings for "tlm,trusted-foundations" for details on how to use it.
 +
 +        Choose N if you don't know what this is about.
 +
  config HAVE_ARM_SMCCC
        bool
  
 +source "drivers/firmware/psci/Kconfig"
  source "drivers/firmware/broadcom/Kconfig"
  source "drivers/firmware/google/Kconfig"
  source "drivers/firmware/efi/Kconfig"

diff --combined drivers/firmware/iscsi_ibft.c
index ab3aa39,966aef3..7e12cbd
--- 1/drivers/firmware/iscsi_ibft.c
--- 2/drivers/firmware/iscsi_ibft.c
+++ b/drivers/firmware/iscsi_ibft.c
@@@ -1,4 -1,3 +1,4 @@@
 +// SPDX-License-Identifier: GPL-2.0-only
  /*
   *  Copyright 2007-2010 Red Hat, Inc.
   *  by Peter Jones <pjones@redhat.com>
@@@ -9,6 -8,15 +9,6 @@@
   *
   * This code exposes the iSCSI Boot Format Table to userland via sysfs.
   *
 - * This program is free software; you can redistribute it and/or modify
 - * it under the terms of the GNU General Public License v2.0 as published by
 - * the Free Software Foundation
 - *
 - * This program is distributed in the hope that it will be useful,
 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 - * GNU General Public License for more details.
 - *
   * Changelog:
   *
   *  06 Jan 2010 - Peter Jones <pjones@redhat.com>
@@@ -55,6 -63,7 +55,6 @@@
   *
   *  27 Aug 2007 - Konrad Rzeszutek <konradr@linux.vnet.ibm.com>
   *   First version exposing iBFT data via a binary /sysfs. (v0.1)
 - *
   */
  
  
@@@ -84,6 -93,10 +84,10 @@@ MODULE_DESCRIPTION("sysfs interface to 
  MODULE_LICENSE("GPL");
  MODULE_VERSION(IBFT_ISCSI_VERSION);
  
+ #ifndef CONFIG_ISCSI_IBFT_FIND
+ struct acpi_table_ibft *ibft_addr;
+ #endif
+ 
  struct ibft_hdr {
        u8 id;
        u8 version;
@@@ -416,7 -429,7 +420,7 @@@ static ssize_t ibft_attr_show_acpitbl(v
  
        switch (type) {
        case ISCSI_BOOT_ACPITBL_SIGNATURE:
 -              str += sprintf_string(str, ACPI_NAME_SIZE,
 +              str += sprintf_string(str, ACPI_NAMESEG_SIZE,
                                      entry->header->header.signature);
                break;
        case ISCSI_BOOT_ACPITBL_OEM_ID: