From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 23 Oct 2016 22:56:23 +0000 (-0700)
Subject: Merge tag 'for-linus-4.9-2' of git://git.code.sf.net/p/openipmi/linux-ipmi
X-Git-Tag: v4.9-rc2~5
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=5766e9d25f41d79a0bb99e44a4408d00236dc3c7;hp=-c;p=cascardo%2Flinux.git

Merge tag 'for-linus-4.9-2' of git://git.code.sf.net/p/openipmi/linux-ipmi

Pull IPMI updates from Corey Minyard:
 "A small bug fix and a new driver for acting as an IPMI device.

  I was on vacation during the merge window (a long vacation) but this
  is a bug fix that should go in and a new driver that shouldn't hurt
  anything.

  This has been in linux-next for a month or so"

* tag 'for-linus-4.9-2' of git://git.code.sf.net/p/openipmi/linux-ipmi:
  ipmi: fix crash on reading version from proc after unregisted bmc
  ipmi/bt-bmc: remove redundant return value check of platform_get_resource()
  ipmi/bt-bmc: add a dependency on ARCH_ASPEED
  ipmi: Fix ioremap error handling in bt-bmc
  ipmi: add an Aspeed BT IPMI BMC driver
---

5766e9d25f41d79a0bb99e44a4408d00236dc3c7
diff --combined drivers/Makefile
index f0afdfb3c7df,5a9e7b6b7928..194d20bee7dc
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@@ -21,7 -21,7 +21,7 @@@ obj-y				+= video
  obj-y				+= idle/
  
  # IPMI must come before ACPI in order to provide IPMI opregion support
- obj-$(CONFIG_IPMI_HANDLER)	+= char/ipmi/
+ obj-y				+= char/ipmi/
  
  obj-$(CONFIG_ACPI)		+= acpi/
  obj-$(CONFIG_SFI)		+= sfi/
@@@ -29,8 -29,6 +29,8 @@@
  # was used and do nothing if so
  obj-$(CONFIG_PNP)		+= pnp/
  obj-y				+= amba/
 +
 +obj-y				+= clk/
  # Many drivers will want to use DMA so this has to be made available
  # really early.
  obj-$(CONFIG_DMADEVICES)	+= dma/
@@@ -144,6 -142,8 +144,6 @@@ obj-$(CONFIG_VHOST)		+= vhost
  obj-$(CONFIG_VLYNQ)		+= vlynq/
  obj-$(CONFIG_STAGING)		+= staging/
  obj-y				+= platform/
 -#common clk code
 -obj-y				+= clk/
  
  obj-$(CONFIG_MAILBOX)		+= mailbox/
  obj-$(CONFIG_HWSPINLOCK)	+= hwspinlock/
diff --combined include/uapi/linux/Kbuild
index 6965d0909554,17b12942c67d..cd2be1c8e9fb
--- a/include/uapi/linux/Kbuild
+++ b/include/uapi/linux/Kbuild
@@@ -71,10 -71,10 +71,11 @@@ header-y += binfmts.
  header-y += blkpg.h
  header-y += blktrace_api.h
  header-y += bpf_common.h
 +header-y += bpf_perf_event.h
  header-y += bpf.h
  header-y += bpqether.h
  header-y += bsg.h
+ header-y += bt-bmc.h
  header-y += btrfs.h
  header-y += can.h
  header-y += capability.h
@@@ -336,8 -336,6 +337,8 @@@ header-y += pkt_cls.
  header-y += pkt_sched.h
  header-y += pmu.h
  header-y += poll.h
 +header-y += posix_acl.h
 +header-y += posix_acl_xattr.h
  header-y += posix_types.h
  header-y += ppdev.h
  header-y += ppp-comp.h
@@@ -399,7 -397,6 +400,7 @@@ header-y += string.
  header-y += suspend_ioctls.h
  header-y += swab.h
  header-y += synclink.h
 +header-y += sync_file.h
  header-y += sysctl.h
  header-y += sysinfo.h
  header-y += target_core_user.h