Message-ID: <bb38eb82-6c9a-5e47-7871-acec5d625823@acm.org>
Date:   Wed, 15 Nov 2017 14:17:16 -0600
From:   Corey Minyard <minyard@....org>
To:     Linus Torvalds <torvalds@...ux-foundation.org>
Cc:     Jessica Yu <jeyu@...nel.org>,
        linux-kernel <linux-kernel@...r.kernel.org>
Subject: [GIT PULL] IPMI updates for 4.15

Linus,

Please do the pull below for the IPMI code.  This is signed with
my new key, which is now signed by my old key.

NOTE: As Jessica sent in the module request, there was a conflict
between the module code and this code, some IPMI driver code
was split into a different file that the module tree modified.  I
merged in the module tree to fix the conflict.  Hopefully I did
this all correctly and the merge is smooth for you, and I believe
you need to merge the module code first.

Thanks,

-corey

---

The following changes since commit ece1996a21eeb344b49200e627c6660111009c10:

   module: Do not paper over type mismatches in module_param_call() 
(2017-10-31 15:30:47 +0100)

are available in the git repository at:

   https://github.com/cminyard/linux-ipmi.git tags/ipmi-for-4.15

for you to fetch changes up to 6297fabd93f93182245383ba7de56bef829a796b:

   Merge branch 'modules-next' of 
git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux into for-next 
(2017-11-02 11:19:15 -0500)

----------------------------------------------------------------
IPMI updates for 4.15

This is signed by my new key (919BFF81), which is now signed by my
old key.

This is a fairly large rework of the IPMI code, along with a bunch
of smaller fixes.  The major changes have been in the next tree for
a couple of months, so they should be good to do in.

- Some users had IPMI systems where the GUID of the IPMI controller
   could change.  So rescanning of the GUID was added.  The naming of
   some sysfs things was dependent on the GUID, however, so this
   resulted in the sysfs interface code in IPMI changing to remove that
   dependency and name the IPMI BMCs like other sysfs devices.

- The ipmi_si_intf.c code was fairly bloated with all the different
   discovery methods (PCI, ACPI, SMBIOS, OF, platform, module parameters,
   hot add).  The structure of how the interfaces were added was redone
   to make them more modular, then the individual methods were pulled
   out into their own files.

----------------------------------------------------------------
Arvind Yadav (1):
       ipmi: pr_err() strings should end with newlines

Bhumika Goyal (1):
       IPMI: make ipmi_poweroff_handler const

Colin Ian King (3):
       char: ipmi: make function ipmi_get_info_from_resources static
       ipmi: remove redundant initialization of bmc
       ipmi_si: fix memory leak on new_smi

Corey Minyard (39):
       ipmi: fix unsigned long underflow
       ipmi: Make IPMI panic strings always available
       ipmi: Fix getting the GUID data
       ipmi: Move bmc find routing to below bmc device type
       ipmi: Check that the device type is BMC when scanning device
       ipmi: Fix issues with BMC refcounts
       ipmi: Prefer ACPI system interfaces over SMBIOS ones
       ipmi: Rework BMC registration
       ipmi: Fix printing the BMC guid
       ipmi: Get the device id through a function
       ipmi: Don't use BMC product/dev ids in the BMC name
       ipmi: Remove the device id from ipmi_register_smi()
       ipmi: Always fetch the guid through ipmi_get_device_id()
       ipmi: Dynamically fetch GUID periodically
       ipmi: Use a temporary BMC for an interface
       ipmi: Rework device id and guid handling to catch changing BMCs
       ipmi: Retry BMC registration on a failure
       ipmi: Move lun and address out of channel struct
       ipmi: Rescan channel list on BMC changes
       ipmi: Convert IPMI GUID over to Linux guid_t
       ipmi_si: Rename function to add smi, make it global
       ipmi_si: Move some platform data into the io structure
       ipmi_si: Move irq setup handling into the io struct
       ipmi_si: Move io setup into io structure
       ipmi_si: Change ipmi_si_add_smi() to take just I/O info
       ipmi_si: Move the hotmod handling to another file.
       ipmi_si: Move hardcode handling to a separate file.
       ipmi_si: Move platform device handling to another file
       ipmi_si: Move PCI setup to another file
       ipmi_si: Move PARISC handling to another file
       ipmi_si: Get rid of unused spacing and port fields
       ipmi_si: Move port and mem I/O handling to their own files
       ipmi_si: remove ipmi_smi_alloc() function
       ipmi_si: Add device attrs for the things in proc
       ipmi_ssif: Add device attrs for the things in proc
       ipmi: Make the IPMI proc interface configurable
       ipmi: Make the DMI probe into a generic platform probe
       ipmi: Clean up some print operations
       Merge branch 'modules-next' of 
git://git.kernel.org/.../jeyu/linux into for-next

Hanjun Guo (1):
       char: ipmi: eliminate misleading print info when being probed via 
ACPI

Jeremy Kerr (3):
       ipmi: Add a reference from BMC devices to their interfaces
       ipmi: Make ipmi_demangle_device_id more generic
       ipmi: allow dynamic BMC version information

Markus Elfring (1):
       ipmi_si: Delete an error message for a failed memory allocation 
in try_smi_init()

  Documentation/IPMI.txt               |    4 +-
  drivers/char/ipmi/Kconfig            |   35 +-
  drivers/char/ipmi/Makefile           |   10 +-
  drivers/char/ipmi/ipmi_dmi.c         |   76 +-
  drivers/char/ipmi/ipmi_dmi.h         |    8 +-
  drivers/char/ipmi/ipmi_msghandler.c  | 1275 ++++++++++++-----
  drivers/char/ipmi/ipmi_powernv.c     |    4 +-
  drivers/char/ipmi/ipmi_poweroff.c    |    2 +-
  drivers/char/ipmi/ipmi_si.h          |   49 +
  drivers/char/ipmi/ipmi_si_hardcode.c |  146 ++
  drivers/char/ipmi/ipmi_si_hotmod.c   |  242 ++++
  drivers/char/ipmi/ipmi_si_intf.c     | 2478 
+++++++---------------------------
  drivers/char/ipmi/ipmi_si_mem_io.c   |  144 ++
  drivers/char/ipmi/ipmi_si_parisc.c   |   58 +
  drivers/char/ipmi/ipmi_si_pci.c      |  166 +++
  drivers/char/ipmi/ipmi_si_platform.c |  593 ++++++++
  drivers/char/ipmi/ipmi_si_port_io.c  |  112 ++
  drivers/char/ipmi/ipmi_si_sm.h       |   23 +
  drivers/char/ipmi/ipmi_ssif.c        |  112 +-
  drivers/char/ipmi/ipmi_watchdog.c    |   11 +-
  include/linux/ipmi.h                 |    8 +-
  include/linux/ipmi_smi.h             |   27 +-
  22 files changed, 3186 insertions(+), 2397 deletions(-)
  create mode 100644 drivers/char/ipmi/ipmi_si.h
  create mode 100644 drivers/char/ipmi/ipmi_si_hardcode.c
  create mode 100644 drivers/char/ipmi/ipmi_si_hotmod.c
  create mode 100644 drivers/char/ipmi/ipmi_si_mem_io.c
  create mode 100644 drivers/char/ipmi/ipmi_si_parisc.c
  create mode 100644 drivers/char/ipmi/ipmi_si_pci.c
  create mode 100644 drivers/char/ipmi/ipmi_si_platform.c
  create mode 100644 drivers/char/ipmi/ipmi_si_port_io.c

Powered by blists - more mailing lists