From: Linus Torvalds Date: Tue, 9 Jul 2019 16:43:20 +0000 (-0700) Subject: Merge tag 'please-pull-for_5.3' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: v5.3-rc1~171 X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/947fbd4ca9fb38f320b076e68cfccab977c5ea01?hp=-c Merge tag 'please-pull-for_5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras Pull EDAC updates from Tony Luck: "All the bits that Boris had queued in his tree plus four patches to add support for Intel Icelake Xeon and then fix a few corner cases" * tag 'please-pull-for_5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras: EDAC: Fix global-out-of-bounds write when setting edac_mc_poll_msec EDAC, skx, i10nm: Fix source ID register offset EDAC, i10nm: Check ECC enabling status per channel EDAC, i10nm: Add Intel additional Ice-Lake support EDAC: Make edac_debugfs_create_x*() return void EDAC/aspeed: Remove set but not used variable 'np' EDAC/ie31200: Reformat PCI device table EDAC/ie31200: Add Intel Coffee Lake CPU support EDAC/sifive: Add EDAC platform driver for SiFive SoCs EDAC/sb_edac: Remove redundant update of tad_base arm64: dts: stratix10: Add SDMMC EDAC node EDAC/altera: Add Stratix10 SDMMC support arm64: dts: stratix10: Add OCRAM EDAC node EDAC/altera: Add Stratix10 OCRAM ECC support EDAC/sysfs: Drop device references properly EDAC/sysfs: Fix memory leak when creating a csrow object --- 947fbd4ca9fb38f320b076e68cfccab977c5ea01 diff --combined MAINTAINERS index 369b2af4bd76,046596f6d490..df043c5e7132 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -364,7 -364,7 +364,7 @@@ F: drivers/acpi/fan. ACPI FOR ARM64 (ACPI/arm64) M: Lorenzo Pieralisi -M: Hanjun Guo +M: Hanjun Guo M: Sudeep Holla L: linux-acpi@vger.kernel.org L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) @@@ -1235,7 -1235,7 +1235,7 @@@ F: arch/arm/lib/floppydma. F: arch/arm/include/asm/floppy.h ARM PMU PROFILING AND DEBUGGING -M: Will Deacon +M: Will Deacon M: Mark Rutland S: Maintained L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) @@@ -1306,14 -1306,8 +1306,14 @@@ S: Maintaine F: Documentation/devicetree/bindings/interrupt-controller/arm,vic.txt F: drivers/irqchip/irq-vic.c +AMAZON ANNAPURNA LABS FIC DRIVER +M: Talel Shenhar +S: Maintained +F: Documentation/devicetree/bindings/interrupt-controller/amazon,al-fic.txt +F: drivers/irqchip/irq-al-fic.c + ARM SMMU DRIVERS -M: Will Deacon +M: Will Deacon R: Robin Murphy L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained @@@ -2091,7 -2085,7 +2091,7 @@@ F: drivers/tty/serial/msm_serial. F: drivers/usb/dwc3/dwc3-qcom.c F: include/dt-bindings/*/qcom* F: include/linux/*/qcom* -T: git git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git ARM/RADISYS ENP2611 MACHINE SUPPORT M: Lennert Buytenhek @@@ -2556,7 -2550,7 +2556,7 @@@ F: drivers/i2c/busses/i2c-xiic. ARM64 PORT (AARCH64 ARCHITECTURE) M: Catalin Marinas -M: Will Deacon +M: Will Deacon L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) T: git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git S: Maintained @@@ -2740,7 -2734,7 +2740,7 @@@ S: Maintaine F: drivers/net/wireless/atmel/atmel* ATOMIC INFRASTRUCTURE -M: Will Deacon +M: Will Deacon M: Peter Zijlstra R: Boqun Feng L: linux-kernel@vger.kernel.org @@@ -3127,8 -3121,7 +3127,8 @@@ F: arch/arm/mach-bcm BROADCOM BCM2835 ARM ARCHITECTURE M: Eric Anholt -M: Stefan Wahren +M: Stefan Wahren +L: bcm-kernel-feedback-list@broadcom.com L: linux-rpi-kernel@lists.infradead.org (moderated for non-subscribers) L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) T: git git://github.com/anholt/linux @@@ -3158,7 -3151,6 +3158,7 @@@ F: arch/arm/boot/dts/bcm953012 BROADCOM BCM53573 ARM ARCHITECTURE M: Rafał Miłecki +L: bcm-kernel-feedback-list@broadcom.com L: linux-arm-kernel@lists.infradead.org S: Maintained F: arch/arm/boot/dts/bcm53573* @@@ -3948,14 -3940,6 +3948,14 @@@ M: Miguel Ojeda L: linux-kernel@vger.kernel.org @@@ -4122,7 -4106,7 +4122,7 @@@ W: http://www.bullopensource.org/cpuset W: http://oss.sgi.com/projects/cpusets/ T: git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git S: Maintained -F: Documentation/cgroup-v1/cpusets.txt +F: Documentation/cgroup-v1/cpusets.rst F: include/linux/cpuset.h F: kernel/cgroup/cpuset.c @@@ -4257,7 -4241,6 +4257,7 @@@ F: crypto F: drivers/crypto/ F: include/crypto/ F: include/linux/crypto* +F: lib/crypto/ CRYPTOGRAPHIC RANDOM NUMBER GENERATOR M: Neil Horman @@@ -4714,7 -4697,6 +4714,7 @@@ F: Documentation/devicetree/bindings/mf F: Documentation/devicetree/bindings/input/da90??-onkey.txt F: Documentation/devicetree/bindings/thermal/da90??-thermal.txt F: Documentation/devicetree/bindings/regulator/da92*.txt +F: Documentation/devicetree/bindings/regulator/slg51000.txt F: Documentation/devicetree/bindings/watchdog/da90??-wdt.txt F: Documentation/devicetree/bindings/sound/da[79]*.txt F: drivers/gpio/gpio-da90??.c @@@ -4730,7 -4712,6 +4730,7 @@@ F: drivers/power/supply/da9052-battery. F: drivers/power/supply/da91??-*.c F: drivers/regulator/da903x.c F: drivers/regulator/da9???-regulator.[ch] +F: drivers/regulator/slg51000-regulator.[ch] F: drivers/thermal/da90??-thermal.c F: drivers/rtc/rtc-da90??.c F: drivers/video/backlight/da90??_bl.c @@@ -5828,6 -5809,12 +5828,12 @@@ L: linux-edac@vger.kernel.or S: Maintained F: drivers/edac/sb_edac.c + EDAC-SIFIVE + M: Yash Shah + L: linux-edac@vger.kernel.org + S: Supported + F: drivers/edac/sifive_edac.c + EDAC-SKYLAKE M: Tony Luck L: linux-edac@vger.kernel.org @@@ -6253,6 -6240,7 +6259,6 @@@ F: include/linux/ipmi-fru. K: fmc_d.*register FPGA MANAGER FRAMEWORK -M: Alan Tull M: Moritz Fischer L: linux-fpga@vger.kernel.org S: Maintained @@@ -6346,13 -6334,6 +6352,13 @@@ L: linux-i2c@vger.kernel.or S: Maintained F: drivers/i2c/busses/i2c-cpm.c +FREESCALE IMX DDR PMU DRIVER +M: Frank Li +L: linux-arm-kernel@lists.infradead.org +S: Maintained +F: drivers/perf/fsl_imx8_ddr_perf.c +F: Documentation/devicetree/bindings/perf/fsl-imx-ddr.txt + FREESCALE IMX LPI2C DRIVER M: Dong Aisheng L: linux-i2c@vger.kernel.org @@@ -6690,18 -6671,6 +6696,18 @@@ L: kvm@vger.kernel.or S: Supported F: drivers/uio/uio_pci_generic.c +GENERIC VDSO LIBRARY: +M: Andy Lutomirski +M: Thomas Gleixner +M: Vincenzo Frascino +L: linux-kernel@vger.kernel.org +T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/vdso +S: Maintained +F: lib/vdso/ +F: kernel/time/vsyscall.c +F: include/vdso/ +F: include/asm-generic/vdso/vsyscall.h + GENWQE (IBM Generic Workqueue Card) M: Frank Haverkamp S: Supported @@@ -7339,7 -7308,6 +7345,7 @@@ F: arch/x86/include/asm/trace/hyperv. F: arch/x86/include/asm/hyperv-tlfs.h F: arch/x86/kernel/cpu/mshyperv.c F: arch/x86/hyperv +F: drivers/clocksource/hyperv_timer.c F: drivers/hid/hid-hyperv.c F: drivers/hv/ F: drivers/input/serio/hyperv-keyboard.c @@@ -7350,7 -7318,6 +7356,7 @@@ F: drivers/uio/uio_hv_generic. F: drivers/video/fbdev/hyperv_fb.c F: drivers/iommu/hyperv_iommu.c F: net/vmw_vsock/hyperv_transport.c +F: include/clocksource/hyperv_timer.h F: include/linux/hyperv.h F: include/uapi/linux/hyperv.h F: tools/hv/ @@@ -7840,7 -7807,7 +7846,7 @@@ INGENIC JZ4780 NAND DRIVE M: Harvey Hunt L: linux-mtd@lists.infradead.org S: Maintained -F: drivers/mtd/nand/raw/jz4780_* +F: drivers/mtd/nand/raw/ingenic/ INOTIFY M: Jan Kara @@@ -8605,7 -8572,7 +8611,7 @@@ S: Odd Fixe KERNEL NFSD, SUNRPC, AND LOCKD SERVERS M: "J. Bruce Fields" -M: Jeff Layton +M: Chuck Lever L: linux-nfs@vger.kernel.org W: http://nfs.sourceforge.net/ T: git git://linux-nfs.org/~bfields/linux.git @@@ -9160,7 -9127,7 +9166,7 @@@ F: drivers/misc/lkdtm/ LINUX KERNEL MEMORY CONSISTENCY MODEL (LKMM) M: Alan Stern M: Andrea Parri -M: Will Deacon +M: Will Deacon M: Peter Zijlstra M: Boqun Feng M: Nicholas Piggin @@@ -9268,7 -9235,7 +9274,7 @@@ F: Documentation/admin-guide/LSM/LoadPi LOCKING PRIMITIVES M: Peter Zijlstra M: Ingo Molnar -M: Will Deacon +M: Will Deacon L: linux-kernel@vger.kernel.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking/core S: Maintained @@@ -10167,7 -10134,7 +10173,7 @@@ L: linux-leds@vger.kernel.or S: Supported F: drivers/leds/leds-mlxcpld.c F: drivers/leds/leds-mlxreg.c -F: Documentation/leds/leds-mlxcpld.txt +F: Documentation/leds/leds-mlxcpld.rst MELLANOX PLATFORM DRIVER M: Vadim Pasternak @@@ -10589,7 -10556,7 +10595,7 @@@ F: arch/arm/boot/dts/mmp F: arch/arm/mach-mmp/ MMU GATHER AND TLB INVALIDATION -M: Will Deacon +M: Will Deacon M: "Aneesh Kumar K.V" M: Andrew Morton M: Nick Piggin @@@ -12078,7 -12045,7 +12084,7 @@@ S: Maintaine F: drivers/pci/controller/dwc/*layerscape* PCI DRIVER FOR GENERIC OF HOSTS -M: Will Deacon +M: Will Deacon L: linux-pci@vger.kernel.org L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained @@@ -13741,7 -13708,7 +13747,7 @@@ L: linux-s390@vger.kernel.or L: kvm@vger.kernel.org S: Supported F: drivers/s390/cio/vfio_ccw* -F: Documentation/s390/vfio-ccw.txt +F: Documentation/s390/vfio-ccw.rst F: include/uapi/linux/vfio_ccw.h S390 ZCRYPT DRIVER @@@ -13761,7 -13728,7 +13767,7 @@@ S: Supporte F: drivers/s390/crypto/vfio_ap_drv.c F: drivers/s390/crypto/vfio_ap_private.h F: drivers/s390/crypto/vfio_ap_ops.c -F: Documentation/s390/vfio-ap.txt +F: Documentation/s390/vfio-ap.rst S390 ZFCP DRIVER M: Steffen Maier @@@ -14374,15 -14341,6 +14380,15 @@@ S: Supporte K: sifive N: sifive +SIFIVE FU540 SYSTEM-ON-CHIP +M: Paul Walmsley +M: Palmer Dabbelt +L: linux-riscv@lists.infradead.org +T: git git://git.kernel.org/pub/scm/linux/kernel/git/pjw/sifive.git +S: Supported +K: fu540 +N: fu540 + SILEAD TOUCHSCREEN DRIVER M: Hans de Goede L: linux-input@vger.kernel.org @@@ -14443,7 -14401,7 +14449,7 @@@ F: lib/test_siphash. F: include/linux/siphash.h SIOX -M: Gavin Schenk +M: Thorsten Scherer M: Uwe Kleine-König R: Pengutronix Kernel Team S: Supported @@@ -14660,14 -14618,6 +14666,14 @@@ S: Maintaine F: drivers/net/ethernet/socionext/netsec.c F: Documentation/devicetree/bindings/net/socionext-netsec.txt +SOCIONEXT (SNI) Synquacer SPI DRIVER +M: Masahisa Kojima +M: Jassi Brar +L: linux-spi@vger.kernel.org +S: Maintained +F: drivers/spi/spi-synquacer.c +F: Documentation/devicetree/bindings/spi/spi-synquacer.txt + SOLIDRUN CLEARFOG SUPPORT M: Russell King S: Maintained @@@ -15541,7 -15491,6 +15547,7 @@@ F: drivers/dma/tegra TEGRA I2C DRIVER M: Laxman Dewangan +R: Dmitry Osipenko S: Supported F: drivers/i2c/busses/i2c-tegra.c @@@ -17534,12 -17483,6 +17540,12 @@@ Q: https://patchwork.linuxtv.org/projec S: Maintained F: drivers/media/dvb-frontends/zd1301_demod* +ZHAOXIN PROCESSOR SUPPORT +M: Tony W Wang-oc +L: linux-kernel@vger.kernel.org +S: Maintained +F: arch/x86/kernel/cpu/zhaoxin.c + ZPOOL COMPRESSED PAGE STORAGE API M: Dan Streetman L: linux-mm@kvack.org