]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge tag 'edac_for_4.2_2' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 25 Jun 2015 02:52:06 +0000 (19:52 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 25 Jun 2015 02:52:06 +0000 (19:52 -0700)
Pull EDAC updates from Borislav Petkov:

 - New APM X-Gene SoC EDAC driver (Loc Ho)

 - AMD error injection module improvements (Aravind Gopalakrishnan)

 - Altera Arria 10 support (Thor Thayer)

 - misc fixes and cleanups all over the place

* tag 'edac_for_4.2_2' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp: (28 commits)
  EDAC: Update Documentation/edac.txt
  EDAC: Fix typos in Documentation/edac.txt
  EDAC, mce_amd_inj: Set MISCV on injection
  EDAC, mce_amd_inj: Move bit preparations before the injection
  EDAC, mce_amd_inj: Cleanup and simplify README
  EDAC, altera: Do not allow suspend when EDAC is enabled
  EDAC, mce_amd_inj: Make inj_type static
  arm: socfpga: dts: Add Arria10 SDRAM EDAC DTS support
  EDAC, altera: Add Arria10 EDAC support
  EDAC, altera: Refactor for Altera CycloneV SoC
  EDAC, altera: Generalize driver to use DT Memory size
  EDAC, mce_amd_inj: Add README file
  EDAC, mce_amd_inj: Add individual permissions field to dfs_node
  EDAC, mce_amd_inj: Modify flags attribute to use string arguments
  EDAC, mce_amd_inj: Read out number of MCE banks from the hardware
  EDAC, mce_amd_inj: Use MCE_INJECT_GET macro for bank node too
  EDAC, xgene: Fix cpuid abuse
  EDAC, mpc85xx: Extend error address to 64 bit
  EDAC, mpc8xxx: Adapt for FSL SoC
  EDAC, edac_stub: Drop arch-specific include
  ...

1  2 
MAINTAINERS
arch/arm64/Kconfig
arch/arm64/boot/dts/apm/apm-storm.dtsi
arch/x86/Kconfig

diff --combined MAINTAINERS
index 7ee651eb0b79310dc786f544acc25293f91ae340,a51ec44f9711601c8983c35ef34b05d56947a757..d7c53502aa86ffe516bb4345638e037aff8f797e
@@@ -51,9 -51,9 +51,9 @@@ trivial patch so apply some common sens
        or does something very odd once a month document it.
  
        PLEASE remember that submissions must be made under the terms
 -      of the OSDL certificate of contribution and should include a
 -      Signed-off-by: line.  The current version of this "Developer's
 -      Certificate of Origin" (DCO) is listed in the file
 +      of the Linux Foundation certificate of contribution and should
 +      include a Signed-off-by: line.  The current version of this
 +      "Developer's Certificate of Origin" (DCO) is listed in the file
        Documentation/SubmittingPatches.
  
  6.    Make sure you have the right to send any changes you make. If you
@@@ -445,7 -445,6 +445,7 @@@ F: drivers/input/misc/adxl34x.
  
  ADVANSYS SCSI DRIVER
  M:    Matthew Wilcox <matthew@wil.cx>
 +M:    Hannes Reinecke <hare@suse.de>
  L:    linux-scsi@vger.kernel.org
  S:    Maintained
  F:    Documentation/scsi/advansys.txt
@@@ -653,6 -652,7 +653,6 @@@ M: Tom Lendacky <thomas.lendacky@amd.co
  L:    netdev@vger.kernel.org
  S:    Supported
  F:    drivers/net/ethernet/amd/xgbe/
 -F:    drivers/net/phy/amd-xgbe-phy.c
  
  AMS (Apple Motion Sensor) DRIVER
  M:    Michael Hanselmann <linux-kernel@hansmi.ch>
@@@ -892,10 -892,11 +892,10 @@@ S:      Maintaine
  F:    arch/arm/mach-alpine/
  
  ARM/ATMEL AT91RM9200 AND AT91SAM ARM ARCHITECTURES
 -M:    Andrew Victor <linux@maxim.org.za>
  M:    Nicolas Ferre <nicolas.ferre@atmel.com>
 +M:    Alexandre Belloni <alexandre.belloni@free-electrons.com>
  M:    Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -W:    http://maxim.org.za/at91_26.html
  W:    http://www.linux4sam.org
  S:    Supported
  F:    arch/arm/mach-at91/
@@@ -922,13 -923,6 +922,13 @@@ M:       Krzysztof Halasa <khalasa@piap.pl
  S:    Maintained
  F:    arch/arm/mach-cns3xxx/
  
 +ARM/CAVIUM THUNDER NETWORK DRIVER
 +M:    Sunil Goutham <sgoutham@cavium.com>
 +M:    Robert Richter <rric@kernel.org>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Supported
 +F:    drivers/net/ethernet/cavium/
 +
  ARM/CIRRUS LOGIC CLPS711X ARM ARCHITECTURE
  M:    Alexander Shiyan <shc_work@mail.ru>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -981,7 -975,7 +981,7 @@@ S: Maintaine
  ARM/CORTINA SYSTEMS GEMINI ARM ARCHITECTURE
  M:    Hans Ulli Kroll <ulli.kroll@googlemail.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -T:    git git://git.berlios.de/gemini-board
 +T:    git git://github.com/ulli-kroll/linux.git
  S:    Maintained
  F:    arch/arm/mach-gemini/
  
@@@ -996,12 -990,6 +996,12 @@@ F:       drivers/clocksource/timer-prima2.
  F:    drivers/clocksource/timer-atlas7.c
  N:    [^a-z]sirf
  
 +ARM/CONEXANT DIGICOLOR MACHINE SUPPORT
 +M:    Baruch Siach <baruch@tkos.co.il>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
 +N:    digicolor
 +
  ARM/EBSA110 MACHINE SUPPORT
  M:    Russell King <linux@arm.linux.org.uk>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -1200,7 -1188,7 +1200,7 @@@ ARM/MAGICIAN MACHINE SUPPOR
  M:    Philipp Zabel <philipp.zabel@gmail.com>
  S:    Maintained
  
 -ARM/Marvell Armada 370 and Armada XP SOC support
 +ARM/Marvell Kirkwood and Armada 370, 375, 38x, XP SOC support
  M:    Jason Cooper <jason@lakedaemon.net>
  M:    Andrew Lunn <andrew@lunn.ch>
  M:    Gregory Clement <gregory.clement@free-electrons.com>
@@@ -1209,17 -1197,12 +1209,17 @@@ L:   linux-arm-kernel@lists.infradead.or
  S:    Maintained
  F:    arch/arm/mach-mvebu/
  F:    drivers/rtc/rtc-armada38x.c
 +F:    arch/arm/boot/dts/armada*
 +F:    arch/arm/boot/dts/kirkwood*
 +
  
  ARM/Marvell Berlin SoC support
  M:    Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-berlin/
 +F:    arch/arm/boot/dts/berlin*
 +
  
  ARM/Marvell Dove/MV78xx0/Orion SOC support
  M:    Jason Cooper <jason@lakedaemon.net>
@@@ -1232,9 -1215,6 +1232,9 @@@ F:      arch/arm/mach-dove
  F:    arch/arm/mach-mv78xx0/
  F:    arch/arm/mach-orion5x/
  F:    arch/arm/plat-orion/
 +F:    arch/arm/boot/dts/dove*
 +F:    arch/arm/boot/dts/orion5x*
 +
  
  ARM/Orion SoC/Technologic Systems TS-78xx platform support
  M:    Alexander Clouter <alex@digriz.org.uk>
@@@ -1386,7 -1366,6 +1386,7 @@@ N:      rockchi
  
  ARM/SAMSUNG EXYNOS ARM ARCHITECTURES
  M:    Kukjin Kim <kgene@kernel.org>
 +M:    Krzysztof Kozlowski <k.kozlowski@samsung.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  L:    linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
  S:    Maintained
@@@ -1460,10 -1439,9 +1460,10 @@@ ARM/SOCFPGA ARCHITECTUR
  M:    Dinh Nguyen <dinguyen@opensource.altera.com>
  S:    Maintained
  F:    arch/arm/mach-socfpga/
 +F:    arch/arm/boot/dts/socfpga*
 +F:    arch/arm/configs/socfpga_defconfig
  W:    http://www.rocketboards.org
 -T:    git://git.rocketboards.org/linux-socfpga.git
 -T:    git://git.rocketboards.org/linux-socfpga-next.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux.git
  
  ARM/SOCFPGA CLOCK FRAMEWORK SUPPORT
  M:    Dinh Nguyen <dinguyen@opensource.altera.com>
@@@ -1495,12 -1473,10 +1495,12 @@@ F:   drivers/phy/phy-stih407-usb.
  F:    drivers/phy/phy-stih41x-usb.c
  F:    drivers/pinctrl/pinctrl-st.c
  F:    drivers/reset/sti/
 +F:    drivers/rtc/rtc-st-lpc.c
  F:    drivers/tty/serial/st-asc.c
  F:    drivers/usb/dwc3/dwc3-st.c
  F:    drivers/usb/host/ehci-st.c
  F:    drivers/usb/host/ohci-st.c
 +F:    drivers/watchdog/st_lpc_wdt.c
  F:    drivers/ata/ahci_st.c
  
  ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT
@@@ -1643,12 -1619,11 +1643,12 @@@ F:   drivers/i2c/busses/i2c-cadence.
  F:    drivers/mmc/host/sdhci-of-arasan.c
  F:    drivers/edac/synopsys_edac.c
  
 -ARM SMMU DRIVER
 +ARM SMMU DRIVERS
  M:    Will Deacon <will.deacon@arm.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    drivers/iommu/arm-smmu.c
 +F:    drivers/iommu/arm-smmu-v3.c
  F:    drivers/iommu/io-pgtable-arm.c
  
  ARM64 PORT (AARCH64 ARCHITECTURE)
@@@ -1879,14 -1854,6 +1879,14 @@@ W:    http://www.attotech.co
  S:    Supported
  F:    drivers/scsi/esas2r
  
 +ATUSB IEEE 802.15.4 RADIO DRIVER
 +M:    Stefan Schmidt <stefan@osg.samsung.com>
 +L:    linux-wpan@vger.kernel.org
 +S:    Maintained
 +F:    drivers/net/ieee802154/atusb.c
 +F:    drivers/net/ieee802154/atusb.h
 +F:    drivers/net/ieee802154/at86rf230.h
 +
  AUDIT SUBSYSTEM
  M:    Paul Moore <paul@paul-moore.com>
  M:    Eric Paris <eparis@redhat.com>
@@@ -1962,7 -1929,7 +1962,7 @@@ S:      Maintaine
  F:    drivers/net/wireless/b43legacy/
  
  BACKLIGHT CLASS/SUBSYSTEM
 -M:    Jingoo Han <jg1.han@samsung.com>
 +M:    Jingoo Han <jingoohan1@gmail.com>
  M:    Lee Jones <lee.jones@linaro.org>
  S:    Maintained
  F:    drivers/video/backlight/
@@@ -2149,9 -2116,8 +2149,9 @@@ S:      Supporte
  F:    drivers/net/ethernet/broadcom/bnx2x/
  
  BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITECTURE
 -M:    Christian Daudt <bcm@fixthebug.org>
  M:    Florian Fainelli <f.fainelli@gmail.com>
 +M:    Ray Jui <rjui@broadcom.com>
 +M:    Scott Branden <sbranden@broadcom.com>
  L:    bcm-kernel-feedback-list@broadcom.com
  T:    git git://github.com/broadcom/mach-bcm
  S:    Maintained
@@@ -2202,6 -2168,7 +2202,6 @@@ S:      Maintaine
  F:    drivers/usb/gadget/udc/bcm63xx_udc.*
  
  BROADCOM BCM7XXX ARM ARCHITECTURE
 -M:    Marc Carino <marc.ceeeee@gmail.com>
  M:    Brian Norris <computersforpeace@gmail.com>
  M:    Gregory Fong <gregory.0xf0@gmail.com>
  M:    Florian Fainelli <f.fainelli@gmail.com>
@@@ -2268,13 -2235,6 +2268,13 @@@ N:    bcm9583
  N:    bcm583*
  N:    bcm113*
  
 +BROADCOM BRCMSTB GPIO DRIVER
 +M:    Gregory Fong <gregory.0xf0@gmail.com>
 +L:    bcm-kernel-feedback-list@broadcom.com>
 +S:    Supported
 +F:    drivers/gpio/gpio-brcmstb.c
 +F:    Documentation/devicetree/bindings/gpio/brcm,brcmstb-gpio.txt
 +
  BROADCOM KONA GPIO DRIVER
  M:    Ray Jui <rjui@broadcom.com>
  L:    bcm-kernel-feedback-list@broadcom.com
@@@ -2282,12 -2242,6 +2282,12 @@@ S:    Supporte
  F:    drivers/gpio/gpio-bcm-kona.c
  F:    Documentation/devicetree/bindings/gpio/gpio-bcm-kona.txt
  
 +BROADCOM STB NAND FLASH DRIVER
 +M:    Brian Norris <computersforpeace@gmail.com>
 +L:    linux-mtd@lists.infradead.org
 +S:    Maintained
 +F:    drivers/mtd/nand/brcmnand/
 +
  BROADCOM SPECIFIC AMBA DRIVER (BCMA)
  M:    Rafał Miłecki <zajec5@gmail.com>
  L:    linux-wireless@vger.kernel.org
@@@ -2458,6 -2412,7 +2458,6 @@@ L:      linux-security-module@vger.kernel.or
  S:    Supported
  F:    include/linux/capability.h
  F:    include/uapi/linux/capability.h
 -F:    security/capability.c
  F:    security/commoncap.c
  F:    kernel/capability.c
  
@@@ -2467,17 -2422,6 +2467,17 @@@ S:    Maintaine
  F:    drivers/iio/light/cm*
  F:    Documentation/devicetree/bindings/i2c/trivial-devices.txt
  
 +CAVIUM LIQUIDIO NETWORK DRIVER
 +M:     Derek Chickles <derek.chickles@caviumnetworks.com>
 +M:     Satanand Burla <satananda.burla@caviumnetworks.com>
 +M:     Felix Manlunas <felix.manlunas@caviumnetworks.com>
 +M:     Raghu Vatsavayi <raghu.vatsavayi@caviumnetworks.com>
 +L:     netdev@vger.kernel.org
 +W:     http://www.cavium.com
 +S:     Supported
 +F:     drivers/net/ethernet/cavium/
 +F:     drivers/net/ethernet/cavium/liquidio/
 +
  CC2520 IEEE-802.15.4 RADIO DRIVER
  M:    Varka Bhadram <varkabhadram@gmail.com>
  L:    linux-wpan@vger.kernel.org
@@@ -2489,6 -2433,7 +2489,6 @@@ F:      Documentation/devicetree/bindings/ne
  CELL BROADBAND ENGINE ARCHITECTURE
  M:    Arnd Bergmann <arnd@arndb.de>
  L:    linuxppc-dev@lists.ozlabs.org
 -L:    cbe-oss-dev@lists.ozlabs.org
  W:    http://www.ibm.com/developerworks/power/cell/
  S:    Supported
  F:    arch/powerpc/include/asm/cell*.h
@@@ -2644,13 -2589,6 +2644,13 @@@ L:    linux-scsi@vger.kernel.or
  S:    Supported
  F:    drivers/scsi/fnic/
  
 +CISCO SCSI HBA DRIVER
 +M:    Narsimhulu Musini <nmusini@cisco.com>
 +M:    Sesidhar Baddela <sebaddel@cisco.com>
 +L:    linux-scsi@vger.kernel.org
 +S:    Supported
 +F:    drivers/scsi/snic/
 +
  CMPC ACPI DRIVER
  M:    Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
  M:    Daniel Oliveira Nascimento <don@syst.com.br>
@@@ -3003,7 -2941,7 +3003,7 @@@ M:      Michael Neuling <mikey@neuling.org
  L:    linuxppc-dev@lists.ozlabs.org
  S:    Supported
  F:    drivers/misc/cxl/
 -F:    include/misc/cxl.h
 +F:    include/misc/cxl*
  F:    include/uapi/misc/cxl.h
  F:    Documentation/powerpc/cxl.txt
  F:    Documentation/powerpc/cxl.txt
@@@ -3475,13 -3413,6 +3475,13 @@@ F:    drivers/gpu/drm/rcar-du
  F:    drivers/gpu/drm/shmobile/
  F:    include/linux/platform_data/shmob_drm.h
  
 +DRM DRIVERS FOR ROCKCHIP
 +M:    Mark Yao <mark.yao@rock-chips.com>
 +L:    dri-devel@lists.freedesktop.org
 +S:    Maintained
 +F:    drivers/gpu/drm/rockchip/
 +F:    Documentation/devicetree/bindings/video/rockchip*
 +
  DSBR100 USB FM RADIO DRIVER
  M:    Alexey Klimov <klimov.linux@gmail.com>
  L:    linux-media@vger.kernel.org
@@@ -3777,7 -3708,7 +3777,7 @@@ S:      Maintaine
  F:    drivers/edac/ie31200_edac.c
  
  EDAC-MPC85XX
- M:    Johannes Thumshirn <johannes.thumshirn@men.de>
+ M:    Johannes Thumshirn <morbidrsa@gmail.com>
  L:    linux-edac@vger.kernel.org
  W:    bluesmoke.sourceforge.net
  S:    Maintained
@@@ -3804,6 -3735,13 +3804,13 @@@ W:    bluesmoke.sourceforge.ne
  S:    Maintained
  F:    drivers/edac/sb_edac.c
  
+ EDAC-XGENE
+ APPLIED MICRO (APM) X-GENE SOC EDAC
+ M:     Loc Ho <lho@apm.com>
+ S:     Supported
+ F:     drivers/edac/xgene_edac.c
+ F:     Documentation/devicetree/bindings/edac/apm-xgene-edac.txt
  EDIROL UA-101/UA-1000 DRIVER
  M:    Clemens Ladisch <clemens@ladisch.de>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
@@@ -3872,11 -3810,10 +3879,11 @@@ M:   David Woodhouse <dwmw2@infradead.org
  L:    linux-embedded@vger.kernel.org
  S:    Maintained
  
 -EMULEX LPFC FC SCSI DRIVER
 -M:    James Smart <james.smart@emulex.com>
 +EMULEX/AVAGO LPFC FC/FCOE SCSI DRIVER
 +M:    James Smart <james.smart@avagotech.com>
 +M:    Dick Kennedy <dick.kennedy@avagotech.com>
  L:    linux-scsi@vger.kernel.org
 -W:    http://sourceforge.net/projects/lpfcxxxx
 +W:    http://www.avagotech.com
  S:    Supported
  F:    drivers/scsi/lpfc/
  
@@@ -3975,7 -3912,7 +3982,7 @@@ F:      drivers/extcon
  F:    Documentation/extcon/
  
  EXYNOS DP DRIVER
 -M:    Jingoo Han <jg1.han@samsung.com>
 +M:    Jingoo Han <jingoohan1@gmail.com>
  L:    dri-devel@lists.freedesktop.org
  S:    Maintained
  F:    drivers/gpu/drm/exynos/exynos_dp*
@@@ -4434,10 -4371,11 +4441,10 @@@ F:   fs/gfs2
  F:    include/uapi/linux/gfs2_ondisk.h
  
  GIGASET ISDN DRIVERS
 -M:    Hansjoerg Lipp <hjlipp@web.de>
 -M:    Tilman Schmidt <tilman@imap.cc>
 +M:    Paul Bolle <pebolle@tiscali.nl>
  L:    gigaset307x-common@lists.sourceforge.net
  W:    http://gigaset307x.sourceforge.net/
 -S:    Maintained
 +S:    Odd Fixes
  F:    Documentation/isdn/README.gigaset
  F:    drivers/isdn/gigaset/
  F:    include/uapi/linux/gigaset_dev.h
@@@ -4584,7 -4522,7 +4591,7 @@@ M:      Jean Delvare <jdelvare@suse.de
  M:    Guenter Roeck <linux@roeck-us.net>
  L:    lm-sensors@lm-sensors.org
  W:    http://www.lm-sensors.org/
 -T:    quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-hwmon/
 +T:    quilt http://jdelvare.nerim.net/devel/linux/jdelvare-hwmon/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git
  S:    Maintained
  F:    Documentation/hwmon/
@@@ -4691,18 -4629,6 +4698,18 @@@ F:    drivers/hid
  F:    include/linux/hid*
  F:    include/uapi/linux/hid*
  
 +HID SENSOR HUB DRIVERS
 +M:    Jiri Kosina <jkosina@suse.cz>
 +M:    Jonathan Cameron <jic23@kernel.org>
 +M:    Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
 +L:    linux-input@vger.kernel.org
 +L:    linux-iio@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/hid/hid-sensor*
 +F:    drivers/hid/hid-sensor-*
 +F:    drivers/iio/*/hid-*
 +F:    include/linux/hid-sensor-*
 +
  HIGH-RESOLUTION TIMERS, CLOCKEVENTS, DYNTICKS
  M:    Thomas Gleixner <tglx@linutronix.de>
  L:    linux-kernel@vger.kernel.org
@@@ -4939,23 -4865,13 +4946,23 @@@ M:   Marcelo Henrique Cerri <mhcerri@linu
  M:    Fionnuala Gunter <fin@linux.vnet.ibm.com>
  L:    linux-crypto@vger.kernel.org
  S:    Supported
 -F:    drivers/crypto/nx/
 +F:    drivers/crypto/nx/Makefile
 +F:    drivers/crypto/nx/Kconfig
 +F:    drivers/crypto/nx/nx-aes*
 +F:    drivers/crypto/nx/nx-sha*
 +F:    drivers/crypto/nx/nx.*
 +F:    drivers/crypto/nx/nx_csbcpb.h
 +F:    drivers/crypto/nx/nx_debugfs.h
  
  IBM Power 842 compression accelerator
  M:    Dan Streetman <ddstreet@us.ibm.com>
  S:    Supported
 -F:    drivers/crypto/nx/nx-842.c
 -F:    include/linux/nx842.h
 +F:    drivers/crypto/nx/Makefile
 +F:    drivers/crypto/nx/Kconfig
 +F:    drivers/crypto/nx/nx-842*
 +F:    include/linux/sw842.h
 +F:    crypto/842.c
 +F:    lib/842/
  
  IBM Power Linux RAID adapter
  M:    Brian King <brking@us.ibm.com>
@@@ -5126,19 -5042,17 +5133,19 @@@ S:   Orpha
  F:    drivers/video/fbdev/imsttfb.c
  
  INFINIBAND SUBSYSTEM
 -M:    Roland Dreier <roland@kernel.org>
 +M:    Doug Ledford <dledford@redhat.com>
  M:    Sean Hefty <sean.hefty@intel.com>
  M:    Hal Rosenstock <hal.rosenstock@gmail.com>
  L:    linux-rdma@vger.kernel.org
  W:    http://www.openfabrics.org/
  Q:    http://patchwork.kernel.org/project/linux-rdma/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma.git
  S:    Supported
  F:    Documentation/infiniband/
  F:    drivers/infiniband/
  F:    include/uapi/linux/if_infiniband.h
 +F:    include/uapi/rdma/
 +F:    include/rdma/
  
  INOTIFY
  M:    John McCutchan <john@johnmccutchan.com>
@@@ -5891,7 -5805,6 +5898,7 @@@ F:      drivers/scsi/53c700
  LED SUBSYSTEM
  M:    Bryan Wu <cooloney@gmail.com>
  M:    Richard Purdie <rpurdie@rpsys.net>
 +M:    Jacek Anaszewski <j.anaszewski@samsung.com>
  L:    linux-leds@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds.git
  S:    Maintained
@@@ -6436,12 -6349,6 +6443,12 @@@ F:    include/uapi/linux/meye.
  F:    include/uapi/linux/ivtv*
  F:    include/uapi/linux/uvcvideo.h
  
 +MEDIATEK MT7601U WIRELESS LAN DRIVER
 +M:    Jakub Kicinski <kubakici@wp.pl>
 +L:    linux-wireless@vger.kernel.org
 +S:    Maintained
 +F:    drivers/net/wireless/mediatek/mt7601u/
 +
  MEGARAID SCSI/SAS DRIVERS
  M:    Kashyap Desai <kashyap.desai@avagotech.com>
  M:    Sumit Saxena <sumit.saxena@avagotech.com>
@@@ -6488,14 -6395,14 +6495,14 @@@ F:   include/linux/mtd
  F:    include/uapi/mtd/
  
  MEN A21 WATCHDOG DRIVER
- M:    Johannes Thumshirn <johannes.thumshirn@men.de>
+ M:    Johannes Thumshirn <morbidrsa@gmail.com>
  L:    linux-watchdog@vger.kernel.org
- S:    Supported
+ S:    Maintained
  F:    drivers/watchdog/mena21_wdt.c
  
  MEN CHAMELEON BUS (mcb)
- M:    Johannes Thumshirn <johannes.thumshirn@men.de>
- S:    Supported
+ M:    Johannes Thumshirn <morbidrsa@gmail.com>
+ S:    Maintained
  F:    drivers/mcb/
  F:    include/linux/mcb.h
  
@@@ -7043,17 -6950,6 +7050,17 @@@ T:    git git://git.rocketboards.org/linux
  S:    Maintained
  F:    arch/nios2/
  
 +NOKIA N900 POWER SUPPLY DRIVERS
 +M:    Pali Rohár <pali.rohar@gmail.com>
 +S:    Maintained
 +F:    include/linux/power/bq2415x_charger.h
 +F:    include/linux/power/bq27x00_battery.h
 +F:    include/linux/power/isp1704_charger.h
 +F:    drivers/power/bq2415x_charger.c
 +F:    drivers/power/bq27x00_battery.c
 +F:    drivers/power/isp1704_charger.c
 +F:    drivers/power/rx51_battery.c
 +
  NTB DRIVER
  M:    Jon Mason <jdmason@kudzu.us>
  M:    Dave Jiang <dave.jiang@intel.com>
@@@ -7642,7 -7538,7 +7649,7 @@@ S:      Maintaine
  F:    drivers/pci/host/*rcar*
  
  PCI DRIVER FOR SAMSUNG EXYNOS
 -M:    Jingoo Han <jg1.han@samsung.com>
 +M:    Jingoo Han <jingoohan1@gmail.com>
  L:    linux-pci@vger.kernel.org
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  L:    linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
@@@ -7650,8 -7546,7 +7657,8 @@@ S:      Maintaine
  F:    drivers/pci/host/pci-exynos.c
  
  PCI DRIVER FOR SYNOPSIS DESIGNWARE
 -M:    Jingoo Han <jg1.han@samsung.com>
 +M:    Jingoo Han <jingoohan1@gmail.com>
 +M:    Pratyush Anand <pratyush.anand@gmail.com>
  L:    linux-pci@vger.kernel.org
  S:    Maintained
  F:    drivers/pci/host/*designware*
@@@ -7665,19 -7560,10 +7672,19 @@@ F:   Documentation/devicetree/bindings/pc
  F:    drivers/pci/host/pci-host-generic.c
  
  PCIE DRIVER FOR ST SPEAR13XX
 +M:    Pratyush Anand <pratyush.anand@gmail.com>
  L:    linux-pci@vger.kernel.org
 -S:    Orphan
 +S:    Maintained
  F:    drivers/pci/host/*spear*
  
 +PCI MSI DRIVER FOR APPLIEDMICRO XGENE
 +M:    Duc Dang <dhdang@apm.com>
 +L:    linux-pci@vger.kernel.org
 +L:    linux-arm-kernel@lists.infradead.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/pci/xgene-pci-msi.txt
 +F:    drivers/pci/host/pci-xgene-msi.c
 +
  PCMCIA SUBSYSTEM
  P:    Linux PCMCIA Team
  L:    linux-pcmcia@lists.infradead.org
@@@ -7718,6 -7604,7 +7725,6 @@@ F:      kernel/delayacct.
  
  PERFORMANCE EVENTS SUBSYSTEM
  M:    Peter Zijlstra <a.p.zijlstra@chello.nl>
 -M:    Paul Mackerras <paulus@samba.org>
  M:    Ingo Molnar <mingo@redhat.com>
  M:    Arnaldo Carvalho de Melo <acme@kernel.org>
  L:    linux-kernel@vger.kernel.org
@@@ -7944,13 -7831,14 +7951,13 @@@ F:   drivers/net/wireless/prism54
  PS3 NETWORK SUPPORT
  M:    Geoff Levand <geoff@infradead.org>
  L:    netdev@vger.kernel.org
 -L:    cbe-oss-dev@lists.ozlabs.org
 +L:    linuxppc-dev@lists.ozlabs.org
  S:    Maintained
  F:    drivers/net/ethernet/toshiba/ps3_gelic_net.*
  
  PS3 PLATFORM SUPPORT
  M:    Geoff Levand <geoff@infradead.org>
  L:    linuxppc-dev@lists.ozlabs.org
 -L:    cbe-oss-dev@lists.ozlabs.org
  S:    Maintained
  F:    arch/powerpc/boot/ps3*
  F:    arch/powerpc/include/asm/lv1call.h
@@@ -7964,7 -7852,7 +7971,7 @@@ F:      sound/ppc/snd_ps3
  
  PS3VRAM DRIVER
  M:    Jim Paris <jim@jtan.com>
 -L:    cbe-oss-dev@lists.ozlabs.org
 +L:    linuxppc-dev@lists.ozlabs.org
  S:    Maintained
  F:    drivers/block/ps3vram.c
  
@@@ -8228,6 -8116,8 +8235,6 @@@ P:      rt2x00 projec
  M:    Stanislaw Gruszka <sgruszka@redhat.com>
  M:    Helmut Schaa <helmut.schaa@googlemail.com>
  L:    linux-wireless@vger.kernel.org
 -L:    users@rt2x00.serialmonkey.com (moderated for non-subscribers)
 -W:    http://rt2x00.serialmonkey.com/
  S:    Maintained
  F:    drivers/net/wireless/rt2x00/
  
@@@ -8612,25 -8502,19 +8619,25 @@@ S:   Supporte
  F:    sound/soc/samsung/
  
  SAMSUNG FRAMEBUFFER DRIVER
 -M:    Jingoo Han <jg1.han@samsung.com>
 +M:    Jingoo Han <jingoohan1@gmail.com>
  L:    linux-fbdev@vger.kernel.org
  S:    Maintained
  F:    drivers/video/fbdev/s3c-fb.c
  
 -SAMSUNG MULTIFUNCTION DEVICE DRIVERS
 +SAMSUNG MULTIFUNCTION PMIC DEVICE DRIVERS
  M:    Sangbeom Kim <sbkim73@samsung.com>
 +M:    Krzysztof Kozlowski <k.kozlowski@samsung.com>
  L:    linux-kernel@vger.kernel.org
 +L:    linux-samsung-soc@vger.kernel.org
  S:    Supported
  F:    drivers/mfd/sec*.c
  F:    drivers/regulator/s2m*.c
  F:    drivers/regulator/s5m*.c
 +F:    drivers/clk/clk-s2mps11.c
 +F:    drivers/rtc/rtc-s5m.c
  F:    include/linux/mfd/samsung/
 +F:    Documentation/devicetree/bindings/regulator/s5m8767-regulator.txt
 +F:    Documentation/devicetree/bindings/mfd/s2mp*.txt
  
  SAMSUNG S5P/EXYNOS4 SOC SERIES CAMERA SUBSYSTEM DRIVERS
  M:    Kyungmin Park <kyungmin.park@samsung.com>
@@@ -8917,19 -8801,16 +8924,19 @@@ F:   drivers/misc/phantom.
  F:    include/uapi/linux/phantom.h
  
  SERVER ENGINES 10Gbps iSCSI - BladeEngine 2 DRIVER
 -M:    Jayamohan Kallickal <jayamohan.kallickal@emulex.com>
 +M:    Jayamohan Kallickal <jayamohan.kallickal@avagotech.com>
 +M:    Minh Tran <minh.tran@avagotech.com>
 +M:    John Soni Jose <sony.john-n@avagotech.com>
  L:    linux-scsi@vger.kernel.org
 -W:    http://www.emulex.com
 +W:    http://www.avagotech.com
  S:    Supported
  F:    drivers/scsi/be2iscsi/
  
 -SERVER ENGINES 10Gbps NIC - BladeEngine 2 DRIVER
 -M:    Sathya Perla <sathya.perla@emulex.com>
 -M:    Subbu Seetharaman <subbu.seetharaman@emulex.com>
 -M:    Ajit Khaparde <ajit.khaparde@emulex.com>
 +Emulex 10Gbps NIC BE2, BE3-R, Lancer, Skyhawk-R DRIVER
 +M:    Sathya Perla <sathya.perla@avagotech.com>
 +M:    Ajit Khaparde <ajit.khaparde@avagotech.com>
 +M:    Padmanabh Ratnakar <padmanabh.ratnakar@avagotech.com>
 +M:    Sriharsha Basavapatna <sriharsha.basavapatna@avagotech.com>
  L:    netdev@vger.kernel.org
  W:    http://www.emulex.com
  S:    Supported
@@@ -9447,6 -9328,7 +9454,6 @@@ F:      drivers/net/ethernet/toshiba/spider_
  SPU FILE SYSTEM
  M:    Jeremy Kerr <jk@ozlabs.org>
  L:    linuxppc-dev@lists.ozlabs.org
 -L:    cbe-oss-dev@lists.ozlabs.org
  W:    http://www.ibm.com/developerworks/power/cell/
  S:    Supported
  F:    Documentation/filesystems/spufs.txt
@@@ -9668,13 -9550,6 +9675,13 @@@ F:    arch/arc
  F:    Documentation/devicetree/bindings/arc/
  F:    drivers/tty/serial/arc_uart.c
  
 +SYSTEM CONFIGURATION (SYSCON)
 +M:    Lee Jones <lee.jones@linaro.org>
 +M:    Arnd Bergmann <arnd@arndb.de>
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git
 +S:    Supported
 +F:    drivers/mfd/syscon.c
 +
  SYSV FILESYSTEM
  M:    Christoph Hellwig <hch@infradead.org>
  S:    Maintained
@@@ -10109,7 -9984,7 +10116,7 @@@ F:    include/linux/toshiba.
  F:    include/uapi/linux/toshiba.h
  
  TMIO MMC DRIVER
 -M:    Ian Molton <ian.molton@codethink.co.uk>
 +M:    Ian Molton <ian@mnementh.co.uk>
  L:    linux-mmc@vger.kernel.org
  S:    Maintained
  F:    drivers/mmc/host/tmio_mmc*
@@@ -10655,6 -10530,7 +10662,6 @@@ F:   include/linux/virtio_console.
  F:    include/uapi/linux/virtio_console.h
  
  VIRTIO CORE, NET AND BLOCK DRIVERS
 -M:    Rusty Russell <rusty@rustcorp.com.au>
  M:    "Michael S. Tsirkin" <mst@redhat.com>
  L:    virtualization@lists.linux-foundation.org
  S:    Maintained
@@@ -10681,7 -10557,8 +10688,7 @@@ F:   drivers/virtio/virtio_input.
  F:    include/uapi/linux/virtio_input.h
  
  VIA RHINE NETWORK DRIVER
 -M:    Roger Luethi <rl@hellgate.ch>
 -S:    Maintained
 +S:    Orphan
  F:    drivers/net/ethernet/via/via-rhine.c
  
  VIA SD/MMC CARD CONTROLLER DRIVER
@@@ -10987,7 -10864,7 +10994,7 @@@ M:   Andy Lutomirski <luto@amacapital.net
  L:    linux-kernel@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/vdso
  S:    Maintained
 -F:    arch/x86/vdso/
 +F:    arch/x86/entry/vdso/
  
  XC2028/3028 TUNER DRIVER
  M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
@@@ -11161,7 -11038,6 +11168,7 @@@ F:   drivers/media/pci/zoran
  ZRAM COMPRESSED RAM BLOCK DEVICE DRVIER
  M:    Minchan Kim <minchan@kernel.org>
  M:    Nitin Gupta <ngupta@vflare.org>
 +R:    Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>
  L:    linux-kernel@vger.kernel.org
  S:    Maintained
  F:    drivers/block/zram/
diff --combined arch/arm64/Kconfig
index 802400f2a69edf4e09ef17f075c5e03357600fb7,577078faea496a874eaeafd0fbce6167b8e411bf..290ed648aa1156c388b2cc9bf059aee8744f6c05
@@@ -1,6 -1,5 +1,6 @@@
  config ARM64
        def_bool y
 +      select ACPI_CCA_REQUIRED if ACPI
        select ACPI_GENERIC_GSI if ACPI
        select ACPI_REDUCED_HARDWARE_ONLY if ACPI
        select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
@@@ -23,6 -22,7 +23,7 @@@
        select BUILDTIME_EXTABLE_SORT
        select CLONE_BACKWARDS
        select COMMON_CLK
+       select EDAC_SUPPORT
        select CPU_PM if (SUSPEND || CPU_IDLE)
        select DCACHE_WORD_ACCESS
        select GENERIC_ALLOCATOR
@@@ -32,7 -32,6 +33,7 @@@
        select GENERIC_EARLY_IOREMAP
        select GENERIC_IRQ_PROBE
        select GENERIC_IRQ_SHOW
 +      select GENERIC_IRQ_SHOW_LEVEL
        select GENERIC_PCI_IOMAP
        select GENERIC_SCHED_CLOCK
        select GENERIC_SMP_IDLE_THREAD
@@@ -72,7 -71,6 +73,7 @@@
        select HAVE_RCU_TABLE_FREE
        select HAVE_SYSCALL_TRACEPOINTS
        select IRQ_DOMAIN
 +      select IRQ_FORCED_THREADING
        select MODULES_USE_ELF_RELA
        select NO_BOOTMEM
        select OF
index d8f3a1c65ecda782dec2e6023bfac8044810b38e,577799f0c5a36a9ec73f2113a0facfc07c3ebbff..0bb287ca0a98e8dcaac6ebd6497d762005b27013
                        };
                };
  
 +              msi: msi@79000000 {
 +                      compatible = "apm,xgene1-msi";
 +                      msi-controller;
 +                      reg = <0x00 0x79000000 0x0 0x900000>;
 +                      interrupts = <  0x0 0x10 0x4
 +                                      0x0 0x11 0x4
 +                                      0x0 0x12 0x4
 +                                      0x0 0x13 0x4
 +                                      0x0 0x14 0x4
 +                                      0x0 0x15 0x4
 +                                      0x0 0x16 0x4
 +                                      0x0 0x17 0x4
 +                                      0x0 0x18 0x4
 +                                      0x0 0x19 0x4
 +                                      0x0 0x1a 0x4
 +                                      0x0 0x1b 0x4
 +                                      0x0 0x1c 0x4
 +                                      0x0 0x1d 0x4
 +                                      0x0 0x1e 0x4
 +                                      0x0 0x1f 0x4>;
 +              };
 +
+               csw: csw@7e200000 {
+                       compatible = "apm,xgene-csw", "syscon";
+                       reg = <0x0 0x7e200000 0x0 0x1000>;
+               };
+               mcba: mcba@7e700000 {
+                       compatible = "apm,xgene-mcb", "syscon";
+                       reg = <0x0 0x7e700000 0x0 0x1000>;
+               };
+               mcbb: mcbb@7e720000 {
+                       compatible = "apm,xgene-mcb", "syscon";
+                       reg = <0x0 0x7e720000 0x0 0x1000>;
+               };
+               efuse: efuse@1054a000 {
+                       compatible = "apm,xgene-efuse", "syscon";
+                       reg = <0x0 0x1054a000 0x0 0x20>;
+               };
+               edac@78800000 {
+                       compatible = "apm,xgene-edac";
+                       #address-cells = <2>;
+                       #size-cells = <2>;
+                       ranges;
+                       regmap-csw = <&csw>;
+                       regmap-mcba = <&mcba>;
+                       regmap-mcbb = <&mcbb>;
+                       regmap-efuse = <&efuse>;
+                       reg = <0x0 0x78800000 0x0 0x100>;
+                       interrupts = <0x0 0x20 0x4>,
+                                    <0x0 0x21 0x4>,
+                                    <0x0 0x27 0x4>;
+                       edacmc@7e800000 {
+                               compatible = "apm,xgene-edac-mc";
+                               reg = <0x0 0x7e800000 0x0 0x1000>;
+                               memory-controller = <0>;
+                       };
+                       edacmc@7e840000 {
+                               compatible = "apm,xgene-edac-mc";
+                               reg = <0x0 0x7e840000 0x0 0x1000>;
+                               memory-controller = <1>;
+                       };
+                       edacmc@7e880000 {
+                               compatible = "apm,xgene-edac-mc";
+                               reg = <0x0 0x7e880000 0x0 0x1000>;
+                               memory-controller = <2>;
+                       };
+                       edacmc@7e8c0000 {
+                               compatible = "apm,xgene-edac-mc";
+                               reg = <0x0 0x7e8c0000 0x0 0x1000>;
+                               memory-controller = <3>;
+                       };
+                       edacpmd@7c000000 {
+                               compatible = "apm,xgene-edac-pmd";
+                               reg = <0x0 0x7c000000 0x0 0x200000>;
+                               pmd-controller = <0>;
+                       };
+                       edacpmd@7c200000 {
+                               compatible = "apm,xgene-edac-pmd";
+                               reg = <0x0 0x7c200000 0x0 0x200000>;
+                               pmd-controller = <1>;
+                       };
+                       edacpmd@7c400000 {
+                               compatible = "apm,xgene-edac-pmd";
+                               reg = <0x0 0x7c400000 0x0 0x200000>;
+                               pmd-controller = <2>;
+                       };
+                       edacpmd@7c600000 {
+                               compatible = "apm,xgene-edac-pmd";
+                               reg = <0x0 0x7c600000 0x0 0x200000>;
+                               pmd-controller = <3>;
+                       };
+               };
                pcie0: pcie@1f2b0000 {
                        status = "disabled";
                        device_type = "pci";
                                         0x0 0x0 0x0 0x4 &gic 0x0 0xc5 0x1>;
                        dma-coherent;
                        clocks = <&pcie0clk 0>;
 +                      msi-parent = <&msi>;
                };
  
                pcie1: pcie@1f2c0000 {
                                         0x0 0x0 0x0 0x4 &gic 0x0 0xcb 0x1>;
                        dma-coherent;
                        clocks = <&pcie1clk 0>;
 +                      msi-parent = <&msi>;
                };
  
                pcie2: pcie@1f2d0000 {
                                         0x0 0x0 0x0 0x4 &gic 0x0 0xd1 0x1>;
                        dma-coherent;
                        clocks = <&pcie2clk 0>;
 +                      msi-parent = <&msi>;
                };
  
                pcie3: pcie@1f500000 {
                                         0x0 0x0 0x0 0x4 &gic 0x0 0xd7 0x1>;
                        dma-coherent;
                        clocks = <&pcie3clk 0>;
 +                      msi-parent = <&msi>;
                };
  
                pcie4: pcie@1f510000 {
                                         0x0 0x0 0x0 0x4 &gic 0x0 0xdd 0x1>;
                        dma-coherent;
                        clocks = <&pcie4clk 0>;
 +                      msi-parent = <&msi>;
                };
  
                serial0: serial@1c020000 {
diff --combined arch/x86/Kconfig
index 7e39f9b227056d80a828faa1b2683d9cceb14d98,482c160a9fe99c7d51a4152a4c4e463993edd2d4..8e0b76ad8350d78c8a9486c6045b97bf0b4e2f17
@@@ -9,141 -9,142 +9,143 @@@ config 64BI
  config X86_32
        def_bool y
        depends on !64BIT
 -      select CLKSRC_I8253
 -      select HAVE_UID16
  
  config X86_64
        def_bool y
        depends on 64BIT
 -      select X86_DEV_DMA_OPS
 -      select ARCH_USE_CMPXCHG_LOCKREF
 -      select HAVE_LIVEPATCH
  
  ### Arch settings
  config X86
        def_bool y
 -      select ACPI_SYSTEM_POWER_STATES_SUPPORT if ACPI
 -      select ARCH_MIGHT_HAVE_ACPI_PDC if ACPI
 +      select ACPI_LEGACY_TABLES_LOOKUP        if ACPI
 +      select ACPI_SYSTEM_POWER_STATES_SUPPORT if ACPI
 +      select ANON_INODES
 +      select ARCH_CLOCKSOURCE_DATA
 +      select ARCH_DISCARD_MEMBLOCK
 +      select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
        select ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
 +      select ARCH_HAS_ELF_RANDOMIZE
        select ARCH_HAS_FAST_MULTIPLIER
        select ARCH_HAS_GCOV_PROFILE_ALL
 +      select ARCH_HAS_SG_CHAIN
 +      select ARCH_HAVE_NMI_SAFE_CMPXCHG
 +      select ARCH_MIGHT_HAVE_ACPI_PDC         if ACPI
        select ARCH_MIGHT_HAVE_PC_PARPORT
        select ARCH_MIGHT_HAVE_PC_SERIO
 -      select HAVE_AOUT if X86_32
 -      select HAVE_UNSTABLE_SCHED_CLOCK
 -      select ARCH_SUPPORTS_NUMA_BALANCING if X86_64
 -      select ARCH_SUPPORTS_INT128 if X86_64
 -      select HAVE_IDE
 -      select HAVE_OPROFILE
 -      select HAVE_PCSPKR_PLATFORM
 -      select HAVE_PERF_EVENTS
 -      select HAVE_IOREMAP_PROT
 -      select HAVE_KPROBES
 -      select HAVE_MEMBLOCK
 -      select HAVE_MEMBLOCK_NODE_MAP
 -      select ARCH_DISCARD_MEMBLOCK
 -      select ARCH_WANT_OPTIONAL_GPIOLIB
 +      select ARCH_SUPPORTS_ATOMIC_RMW
 +      select ARCH_SUPPORTS_INT128             if X86_64
 +      select ARCH_SUPPORTS_NUMA_BALANCING     if X86_64
 +      select ARCH_USE_BUILTIN_BSWAP
 +      select ARCH_USE_CMPXCHG_LOCKREF         if X86_64
 +      select ARCH_USE_QUEUED_RWLOCKS
 +      select ARCH_USE_QUEUED_SPINLOCKS
        select ARCH_WANT_FRAME_POINTERS
 -      select HAVE_DMA_ATTRS
 -      select HAVE_DMA_CONTIGUOUS
 -      select HAVE_KRETPROBES
 +      select ARCH_WANT_IPC_PARSE_VERSION      if X86_32
 +      select ARCH_WANT_OPTIONAL_GPIOLIB
 +      select BUILDTIME_EXTABLE_SORT
 +      select CLKEVT_I8253
 +      select CLKSRC_I8253                     if X86_32
 +      select CLOCKSOURCE_VALIDATE_LAST_CYCLE
 +      select CLOCKSOURCE_WATCHDOG
 +      select CLONE_BACKWARDS                  if X86_32
 +      select COMPAT_OLD_SIGACTION             if IA32_EMULATION
 +      select DCACHE_WORD_ACCESS
++      select EDAC_ATOMIC_SCRUB
++      select EDAC_SUPPORT
 +      select GENERIC_CLOCKEVENTS
 +      select GENERIC_CLOCKEVENTS_BROADCAST    if X86_64 || (X86_32 && X86_LOCAL_APIC)
 +      select GENERIC_CLOCKEVENTS_MIN_ADJUST
 +      select GENERIC_CMOS_UPDATE
 +      select GENERIC_CPU_AUTOPROBE
        select GENERIC_EARLY_IOREMAP
 -      select HAVE_OPTPROBES
 -      select HAVE_KPROBES_ON_FTRACE
 -      select HAVE_FTRACE_MCOUNT_RECORD
 -      select HAVE_FENTRY if X86_64
 +      select GENERIC_FIND_FIRST_BIT
 +      select GENERIC_IOMAP
 +      select GENERIC_IRQ_PROBE
 +      select GENERIC_IRQ_SHOW
 +      select GENERIC_PENDING_IRQ              if SMP
 +      select GENERIC_SMP_IDLE_THREAD
 +      select GENERIC_STRNCPY_FROM_USER
 +      select GENERIC_STRNLEN_USER
 +      select GENERIC_TIME_VSYSCALL
 +      select HAVE_ACPI_APEI                   if ACPI
 +      select HAVE_ACPI_APEI_NMI               if ACPI
 +      select HAVE_ALIGNED_STRUCT_PAGE         if SLUB
 +      select HAVE_AOUT                        if X86_32
 +      select HAVE_ARCH_AUDITSYSCALL
 +      select HAVE_ARCH_HUGE_VMAP              if X86_64 || X86_PAE
 +      select HAVE_ARCH_JUMP_LABEL
 +      select HAVE_ARCH_KASAN                  if X86_64 && SPARSEMEM_VMEMMAP
 +      select HAVE_ARCH_KGDB
 +      select HAVE_ARCH_KMEMCHECK
 +      select HAVE_ARCH_SECCOMP_FILTER
 +      select HAVE_ARCH_SOFT_DIRTY             if X86_64
 +      select HAVE_ARCH_TRACEHOOK
 +      select HAVE_ARCH_TRANSPARENT_HUGEPAGE
 +      select HAVE_BPF_JIT                     if X86_64
 +      select HAVE_CC_STACKPROTECTOR
 +      select HAVE_CMPXCHG_DOUBLE
 +      select HAVE_CMPXCHG_LOCAL
 +      select HAVE_CONTEXT_TRACKING            if X86_64
        select HAVE_C_RECORDMCOUNT
 +      select HAVE_DEBUG_KMEMLEAK
 +      select HAVE_DEBUG_STACKOVERFLOW
 +      select HAVE_DMA_API_DEBUG
 +      select HAVE_DMA_ATTRS
 +      select HAVE_DMA_CONTIGUOUS
        select HAVE_DYNAMIC_FTRACE
        select HAVE_DYNAMIC_FTRACE_WITH_REGS
 -      select HAVE_FUNCTION_TRACER
 -      select HAVE_FUNCTION_GRAPH_TRACER
 -      select HAVE_FUNCTION_GRAPH_FP_TEST
 -      select HAVE_SYSCALL_TRACEPOINTS
 -      select SYSCTL_EXCEPTION_TRACE
 -      select HAVE_KVM
 -      select HAVE_ARCH_KGDB
 -      select HAVE_ARCH_TRACEHOOK
 -      select HAVE_GENERIC_DMA_COHERENT if X86_32
        select HAVE_EFFICIENT_UNALIGNED_ACCESS
 -      select USER_STACKTRACE_SUPPORT
 -      select HAVE_REGS_AND_STACK_ACCESS_API
 -      select HAVE_DMA_API_DEBUG
 -      select HAVE_KERNEL_GZIP
 +      select HAVE_FENTRY                      if X86_64
 +      select HAVE_FTRACE_MCOUNT_RECORD
 +      select HAVE_FUNCTION_GRAPH_FP_TEST
 +      select HAVE_FUNCTION_GRAPH_TRACER
 +      select HAVE_FUNCTION_TRACER
 +      select HAVE_GENERIC_DMA_COHERENT        if X86_32
 +      select HAVE_HW_BREAKPOINT
 +      select HAVE_IDE
 +      select HAVE_IOREMAP_PROT
 +      select HAVE_IRQ_EXIT_ON_IRQ_STACK       if X86_64
 +      select HAVE_IRQ_TIME_ACCOUNTING
        select HAVE_KERNEL_BZIP2
 +      select HAVE_KERNEL_GZIP
 +      select HAVE_KERNEL_LZ4
        select HAVE_KERNEL_LZMA
 -      select HAVE_KERNEL_XZ
        select HAVE_KERNEL_LZO
 -      select HAVE_KERNEL_LZ4
 -      select HAVE_HW_BREAKPOINT
 +      select HAVE_KERNEL_XZ
 +      select HAVE_KPROBES
 +      select HAVE_KPROBES_ON_FTRACE
 +      select HAVE_KRETPROBES
 +      select HAVE_KVM
 +      select HAVE_LIVEPATCH                   if X86_64
 +      select HAVE_MEMBLOCK
 +      select HAVE_MEMBLOCK_NODE_MAP
        select HAVE_MIXED_BREAKPOINTS_REGS
 -      select PERF_EVENTS
 +      select HAVE_OPROFILE
 +      select HAVE_OPTPROBES
 +      select HAVE_PCSPKR_PLATFORM
 +      select HAVE_PERF_EVENTS
        select HAVE_PERF_EVENTS_NMI
        select HAVE_PERF_REGS
        select HAVE_PERF_USER_STACK_DUMP
 -      select HAVE_DEBUG_KMEMLEAK
 -      select ANON_INODES
 -      select HAVE_ALIGNED_STRUCT_PAGE if SLUB
 -      select HAVE_CMPXCHG_LOCAL
 -      select HAVE_CMPXCHG_DOUBLE
 -      select HAVE_ARCH_KMEMCHECK
 -      select HAVE_ARCH_KASAN if X86_64 && SPARSEMEM_VMEMMAP
 +      select HAVE_REGS_AND_STACK_ACCESS_API
 +      select HAVE_SYSCALL_TRACEPOINTS
 +      select HAVE_UID16                       if X86_32
 +      select HAVE_UNSTABLE_SCHED_CLOCK
        select HAVE_USER_RETURN_NOTIFIER
 -      select ARCH_HAS_ELF_RANDOMIZE
 -      select HAVE_ARCH_JUMP_LABEL
 -      select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
 -      select SPARSE_IRQ
 -      select GENERIC_FIND_FIRST_BIT
 -      select GENERIC_IRQ_PROBE
 -      select GENERIC_PENDING_IRQ if SMP
 -      select GENERIC_IRQ_SHOW
 -      select GENERIC_CLOCKEVENTS_MIN_ADJUST
        select IRQ_FORCED_THREADING
 -      select HAVE_BPF_JIT if X86_64
 -      select HAVE_ARCH_TRANSPARENT_HUGEPAGE
 -      select HAVE_ARCH_HUGE_VMAP if X86_64 || (X86_32 && X86_PAE)
 -      select ARCH_HAS_SG_CHAIN
 -      select CLKEVT_I8253
 -      select ARCH_HAVE_NMI_SAFE_CMPXCHG
 -      select GENERIC_IOMAP
 -      select DCACHE_WORD_ACCESS
 -      select GENERIC_SMP_IDLE_THREAD
 -      select ARCH_WANT_IPC_PARSE_VERSION if X86_32
 -      select HAVE_ARCH_SECCOMP_FILTER
 -      select BUILDTIME_EXTABLE_SORT
 -      select GENERIC_CMOS_UPDATE
 -      select HAVE_ARCH_SOFT_DIRTY if X86_64
 -      select CLOCKSOURCE_WATCHDOG
 -      select GENERIC_CLOCKEVENTS
 -      select ARCH_CLOCKSOURCE_DATA
 -      select CLOCKSOURCE_VALIDATE_LAST_CYCLE
 -      select GENERIC_CLOCKEVENTS_BROADCAST if X86_64 || (X86_32 && X86_LOCAL_APIC)
 -      select GENERIC_TIME_VSYSCALL
 -      select GENERIC_STRNCPY_FROM_USER
 -      select GENERIC_STRNLEN_USER
 -      select HAVE_CONTEXT_TRACKING if X86_64
 -      select HAVE_IRQ_TIME_ACCOUNTING
 -      select VIRT_TO_BUS
 -      select MODULES_USE_ELF_REL if X86_32
 -      select MODULES_USE_ELF_RELA if X86_64
 -      select CLONE_BACKWARDS if X86_32
 -      select ARCH_USE_BUILTIN_BSWAP
 -      select ARCH_USE_QUEUE_RWLOCK
 -      select OLD_SIGSUSPEND3 if X86_32 || IA32_EMULATION
 -      select OLD_SIGACTION if X86_32
 -      select COMPAT_OLD_SIGACTION if IA32_EMULATION
 +      select MODULES_USE_ELF_RELA             if X86_64
 +      select MODULES_USE_ELF_REL              if X86_32
 +      select OLD_SIGACTION                    if X86_32
 +      select OLD_SIGSUSPEND3                  if X86_32 || IA32_EMULATION
 +      select PERF_EVENTS
        select RTC_LIB
 -      select HAVE_DEBUG_STACKOVERFLOW
 -      select HAVE_IRQ_EXIT_ON_IRQ_STACK if X86_64
 -      select HAVE_CC_STACKPROTECTOR
 -      select GENERIC_CPU_AUTOPROBE
 -      select HAVE_ARCH_AUDITSYSCALL
 -      select ARCH_SUPPORTS_ATOMIC_RMW
 -      select HAVE_ACPI_APEI if ACPI
 -      select HAVE_ACPI_APEI_NMI if ACPI
 -      select ACPI_LEGACY_TABLES_LOOKUP if ACPI
 -      select X86_FEATURE_NAMES if PROC_FS
 +      select SPARSE_IRQ
        select SRCU
 -      select EDAC_SUPPORT
 -      select EDAC_ATOMIC_SCRUB
 +      select SYSCTL_EXCEPTION_TRACE
 +      select USER_STACKTRACE_SUPPORT
 +      select VIRT_TO_BUS
 +      select X86_DEV_DMA_OPS                  if X86_64
 +      select X86_FEATURE_NAMES                if PROC_FS
  
  config INSTRUCTION_DECODER
        def_bool y
@@@ -261,6 -262,10 +263,6 @@@ config X86_64_SM
        def_bool y
        depends on X86_64 && SMP
  
 -config X86_HT
 -      def_bool y
 -      depends on SMP
 -
  config X86_32_LAZY_GS
        def_bool y
        depends on X86_32 && !CC_STACKPROTECTOR
@@@ -338,7 -343,7 +340,7 @@@ config X86_FEATURE_NAME
  
  config X86_X2APIC
        bool "Support x2apic"
 -      depends on X86_LOCAL_APIC && X86_64 && IRQ_REMAP
 +      depends on X86_LOCAL_APIC && X86_64 && (IRQ_REMAP || HYPERVISOR_GUEST)
        ---help---
          This enables x2apic support on CPUs that have this feature.
  
@@@ -438,7 -443,6 +440,7 @@@ config X86_U
        depends on X86_EXTENDED_PLATFORM
        depends on NUMA
        depends on X86_X2APIC
 +      depends on PCI
        ---help---
          This option is needed in order to support SGI Ultraviolet systems.
          If you don't have one of these, you should say N here.
@@@ -464,6 -468,7 +466,6 @@@ config X86_INTEL_C
        select X86_REBOOTFIXUPS
        select OF
        select OF_EARLY_FLATTREE
 -      select IRQ_DOMAIN
        ---help---
          Select for the Intel CE media processor (CE4100) SOC.
          This option compiles in support for the CE4100 SOC for settop
@@@ -663,7 -668,7 +665,7 @@@ config PARAVIRT_DEBU
  config PARAVIRT_SPINLOCKS
        bool "Paravirtualization layer for spinlocks"
        depends on PARAVIRT && SMP
 -      select UNINLINE_SPIN_UNLOCK
 +      select UNINLINE_SPIN_UNLOCK if !QUEUED_SPINLOCKS
        ---help---
          Paravirtualized spinlocks allow a pvops backend to replace the
          spinlock implementation with something virtualization-friendly
@@@ -848,12 -853,11 +850,12 @@@ config NR_CPU
        default "1" if !SMP
        default "8192" if MAXSMP
        default "32" if SMP && X86_BIGSMP
 -      default "8" if SMP
 +      default "8" if SMP && X86_32
 +      default "64" if SMP
        ---help---
          This allows you to specify the maximum number of CPUs which this
          kernel will support.  If CPUMASK_OFFSTACK is enabled, the maximum
 -        supported value is 4096, otherwise the maximum value is 512.  The
 +        supported value is 8192, otherwise the maximum value is 512.  The
          minimum value which makes sense is 2.
  
          This is purely to save memory - each supported CPU adds
  
  config SCHED_SMT
        bool "SMT (Hyperthreading) scheduler support"
 -      depends on X86_HT
 +      depends on SMP
        ---help---
          SMT scheduler support improves the CPU scheduler's decision making
          when dealing with Intel Pentium 4 chips with HyperThreading at a
  config SCHED_MC
        def_bool y
        prompt "Multi-core scheduler support"
 -      depends on X86_HT
 +      depends on SMP
        ---help---
          Multi-core scheduler support improves the CPU scheduler's decision
          making when dealing with multi-core CPU chips at a cost of slightly
@@@ -912,12 -916,12 +914,12 @@@ config X86_UP_IOAPI
  config X86_LOCAL_APIC
        def_bool y
        depends on X86_64 || SMP || X86_32_NON_STANDARD || X86_UP_APIC || PCI_MSI
 -      select GENERIC_IRQ_LEGACY_ALLOC_HWIRQ
 +      select IRQ_DOMAIN_HIERARCHY
 +      select PCI_MSI_IRQ_DOMAIN if PCI_MSI
  
  config X86_IO_APIC
        def_bool y
        depends on X86_LOCAL_APIC || X86_UP_IOAPIC
 -      select IRQ_DOMAIN
  
  config X86_REROUTE_FOR_BROKEN_BOOT_IRQS
        bool "Reroute for broken boot IRQs"