The following commit has been merged in the master branch: commit 5586c3c1e0eb04cb8b16684aef779e019c8cc64e Merge: 1a2a76c2685a29e46d7b37e752ccea7b15aa8e24 0fd169576648452725fa2949bf391d10883d3991 Author: Linus Torvalds torvalds@linux-foundation.org Date: Sun Feb 9 12:41:00 2020 -0800
Merge branch 'work.vboxsf' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vboxfs from Al Viro: "This is the VirtualBox guest shared folder support by Hans de Goede, with fixups for fs_parse folded in to avoid bisection hazards from those API changes..."
* 'work.vboxsf' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: fs: Add VirtualBox guest shared folder (vboxsf) support
diff --combined MAINTAINERS index f74871a22c42,8c87c7eba3f6..575d386e6583 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -317,45 -317,45 +317,45 @@@ ACP M: "Rafael J. Wysocki" rjw@rjwysocki.net M: Len Brown lenb@kernel.org L: linux-acpi@vger.kernel.org +S: Supported W: https://01.org/linux-acpi -Q: https://patchwork.kernel.org/project/linux-acpi/list/ T: git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm +Q: https://patchwork.kernel.org/project/linux-acpi/list/ B: https://bugzilla.kernel.org -S: Supported +F: Documentation/ABI/testing/configfs-acpi +F: Documentation/ABI/testing/sysfs-bus-acpi +F: Documentation/firmware-guide/acpi/ F: drivers/acpi/ +F: drivers/pci/*/*acpi* +F: drivers/pci/*acpi* F: drivers/pnp/pnpacpi/ +F: include/acpi/ F: include/linux/acpi.h F: include/linux/fwnode.h -F: include/acpi/ -F: Documentation/firmware-guide/acpi/ -F: Documentation/ABI/testing/sysfs-bus-acpi -F: Documentation/ABI/testing/configfs-acpi -F: drivers/pci/*acpi* -F: drivers/pci/*/*acpi* F: tools/power/acpi/
ACPI APEI M: "Rafael J. Wysocki" rjw@rjwysocki.net M: Len Brown lenb@kernel.org -L: linux-acpi@vger.kernel.org R: James Morse james.morse@arm.com R: Tony Luck tony.luck@intel.com R: Borislav Petkov bp@alien8.de +L: linux-acpi@vger.kernel.org F: drivers/acpi/apei/
ACPI COMPONENT ARCHITECTURE (ACPICA) M: Robert Moore robert.moore@intel.com -M: Erik Schmauss erik.schmauss@intel.com +M: Erik Kaneda erik.kaneda@intel.com M: "Rafael J. Wysocki" rafael.j.wysocki@intel.com L: linux-acpi@vger.kernel.org L: devel@acpica.org +S: Supported W: https://acpica.org/ W: https://github.com/acpica/acpica/ -Q: https://patchwork.kernel.org/project/linux-acpi/list/ T: git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm +Q: https://patchwork.kernel.org/project/linux-acpi/list/ B: https://bugzilla.kernel.org B: https://bugs.acpica.org -S: Supported F: drivers/acpi/acpica/ F: include/acpi/ F: tools/power/acpi/ @@@ -363,9 -363,9 +363,9 @@@ ACPI FAN DRIVER M: Zhang Rui rui.zhang@intel.com L: linux-acpi@vger.kernel.org +S: Supported W: https://01.org/linux-acpi B: https://bugzilla.kernel.org -S: Supported F: drivers/acpi/fan.c
ACPI FOR ARM64 (ACPI/arm64) @@@ -389,26 -389,26 +389,26 @@@ M: Len Brown <lenb@kernel.org R: Andy Shevchenko andriy.shevchenko@linux.intel.com R: Mika Westerberg mika.westerberg@linux.intel.com L: linux-acpi@vger.kernel.org -Q: https://patchwork.kernel.org/project/linux-acpi/list/ +S: Supported T: git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm +Q: https://patchwork.kernel.org/project/linux-acpi/list/ B: https://bugzilla.kernel.org -S: Supported F: drivers/acpi/pmic/
ACPI THERMAL DRIVER M: Zhang Rui rui.zhang@intel.com L: linux-acpi@vger.kernel.org +S: Supported W: https://01.org/linux-acpi B: https://bugzilla.kernel.org -S: Supported F: drivers/acpi/*thermal*
ACPI VIDEO DRIVER M: Zhang Rui rui.zhang@intel.com L: linux-acpi@vger.kernel.org +S: Supported W: https://01.org/linux-acpi B: https://bugzilla.kernel.org -S: Supported F: drivers/acpi/acpi_video.c
ACPI WMI DRIVER @@@ -674,14 -674,6 +674,14 @@@ S: Maintaine F: Documentation/i2c/busses/i2c-ali1563.rst F: drivers/i2c/busses/i2c-ali1563.c
+ALL SENSORS DLH SERIES PRESSURE SENSORS DRIVER +M: Tomislav Denis tomislav.denis@avl.com +W: http://www.allsensors.com/ +S: Maintained +L: linux-iio@vger.kernel.org +F: drivers/iio/pressure/dlhl60d.c +F: Documentation/devicetree/bindings/iio/pressure/asc,dlhl60d.yaml + ALLEGRO DVT VIDEO IP CORE DRIVER M: Michael Tretter m.tretter@pengutronix.de R: Pengutronix Kernel Team kernel@pengutronix.de @@@ -702,14 -694,6 +702,14 @@@ L: linux-crypto@vger.kernel.or S: Maintained F: drivers/crypto/allwinner/
+ALLWINNER THERMAL DRIVER +M: Vasily Khoruzhick anarsoul@gmail.com +M: Yangtao Li tiny.windzz@gmail.com +L: linux-pm@vger.kernel.org +S: Maintained +F: Documentation/devicetree/bindings/thermal/allwinner,sun8i-a83t-ths.yaml +F: drivers/thermal/sun8i_thermal.c + ALLWINNER VPU DRIVER M: Maxime Ripard mripard@kernel.org M: Paul Kocialkowski paul.kocialkowski@bootlin.com @@@ -736,13 -720,13 +736,13 @@@ F: Documentation/devicetree/bindings/i2 F: drivers/i2c/busses/i2c-altera.c
ALTERA MAILBOX DRIVER -M: Ley Foon Tan lftan@altera.com +M: Ley Foon Tan ley.foon.tan@intel.com L: nios2-dev@lists.rocketboards.org (moderated for non-subscribers) S: Maintained F: drivers/mailbox/mailbox-altera.c
ALTERA PIO DRIVER -M: Tien Hock Loh thloh@altera.com +M: Joyce Ooi joyce.ooi@intel.com L: linux-gpio@vger.kernel.org S: Maintained F: drivers/gpio/gpio-altera.c @@@ -807,6 -791,7 +807,6 @@@ F: include/uapi/rdma/efa-abi.
AMD CRYPTOGRAPHIC COPROCESSOR (CCP) DRIVER M: Tom Lendacky thomas.lendacky@amd.com -M: Gary Hook gary.hook@amd.com L: linux-crypto@vger.kernel.org S: Supported F: drivers/crypto/ccp/ @@@ -915,14 -900,6 +915,14 @@@ S: Supporte F: drivers/iio/dac/ad5758.c F: Documentation/devicetree/bindings/iio/dac/ad5758.txt
+ANALOG DEVICES INC AD7091R5 DRIVER +M: Beniamin Bia beniamin.bia@analog.com +L: linux-iio@vger.kernel.org +W: http://ez.analog.com/community/linux-device-drivers +S: Supported +F: drivers/iio/adc/ad7091r5.c +F: Documentation/devicetree/bindings/iio/adc/adi,ad7091r5.yaml + ANALOG DEVICES INC AD7124 DRIVER M: Stefan Popa stefan.popa@analog.com L: linux-iio@vger.kernel.org @@@ -1000,15 -977,6 +1000,15 @@@ W: http://ez.analog.com/community/linux F: drivers/iio/imu/adis16460.c F: Documentation/devicetree/bindings/iio/imu/adi,adis16460.yaml
+ANALOG DEVICES INC ADM1177 DRIVER +M: Beniamin Bia beniamin.bia@analog.com +M: Michael Hennerich Michael.Hennerich@analog.com +L: linux-hwmon@vger.kernel.org +W: http://ez.analog.com/community/linux-device-drivers +S: Supported +F: drivers/hwmon/adm1177.c +F: Documentation/devicetree/bindings/hwmon/adi,adm1177.yaml + ANALOG DEVICES INC ADP5061 DRIVER M: Stefan Popa stefan.popa@analog.com L: linux-pm@vger.kernel.org @@@ -1077,7 -1045,7 +1077,7 @@@ S: Supporte F: Documentation/ABI/testing/sysfs-bus-iio-frequency-ad9523 F: Documentation/ABI/testing/sysfs-bus-iio-frequency-adf4350 F: drivers/iio/*/ad* -F: drivers/iio/adc/ltc2497* +F: drivers/iio/adc/ltc249* X: drivers/iio/*/adjd* F: drivers/staging/iio/*/ad*
@@@ -1439,7 -1407,7 +1439,7 @@@ T: git git://git.kernel.org/pub/scm/lin
ARM/ACTIONS SEMI ARCHITECTURE M: Andreas Färber afaerber@suse.de -R: Manivannan Sadhasivam manivannan.sadhasivam@linaro.org +M: Manivannan Sadhasivam manivannan.sadhasivam@linaro.org L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained N: owl @@@ -2092,7 -2060,6 +2092,7 @@@ F: drivers/rtc/rtc-pl031. F: drivers/watchdog/coh901327_wdt.c F: Documentation/devicetree/bindings/arm/ste-* F: Documentation/devicetree/bindings/arm/ux500/ +F: Documentation/devicetree/bindings/arm/ux500.yaml T: git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git
ARM/NUVOTON NPCM ARCHITECTURE @@@ -2275,7 -2242,6 +2275,7 @@@ L: linux-rockchip@lists.infradead.or T: git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git S: Maintained F: Documentation/devicetree/bindings/i2c/i2c-rk3x.txt +F: Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.yaml F: arch/arm/boot/dts/rk3* F: arch/arm/boot/dts/rv1108* F: arch/arm/mach-rockchip/ @@@ -2728,14 -2694,6 +2728,14 @@@ S: Maintaine F: drivers/pinctrl/aspeed/ F: Documentation/devicetree/bindings/pinctrl/aspeed,*
+ASPEED SCU INTERRUPT CONTROLLER DRIVER +M: Eddie James eajames@linux.ibm.com +L: linux-aspeed@lists.ozlabs.org (moderated for non-subscribers) +S: Maintained +F: Documentation/devicetree/bindings/interrupt-controller/aspeed,ast2xxx-scu-ic.txt +F: drivers/irqchip/irq-aspeed-scu-ic.c +F: include/dt-bindings/interrupt-controller/aspeed-scu-ic.h + ASPEED VIDEO ENGINE DRIVER M: Eddie James eajames@linux.ibm.com L: linux-media@vger.kernel.org @@@ -3133,13 -3091,6 +3133,13 @@@ S: Supporte F: drivers/net/bonding/ F: include/uapi/linux/if_bonding.h
+BOSCH SENSORTEC BMA400 ACCELEROMETER IIO DRIVER +M: Dan Robertson dan@dlrobertson.com +L: linux-iio@vger.kernel.org +S: Maintained +F: drivers/iio/accel/bma400* +F: Documentation/devicetree/bindings/iio/accel/bosch,bma400.yaml + BPF (Safe dynamic programs and tools) M: Alexei Starovoitov ast@kernel.org M: Daniel Borkmann daniel@iogearbox.net @@@ -3199,7 -3150,7 +3199,7 @@@ S: Maintaine F: arch/mips/net/
BPF JIT for NFP NICs -M: Jakub Kicinski jakub.kicinski@netronome.com +M: Jakub Kicinski kuba@kernel.org L: netdev@vger.kernel.org L: bpf@vger.kernel.org S: Supported @@@ -3289,8 -3240,6 +3289,8 @@@ S: Maintaine N: bcm2711 N: bcm2835 F: drivers/staging/vc04_services +F: Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml +F: drivers/pci/controller/pcie-brcmstb.c
BROADCOM BCM47XX MIPS ARCHITECTURE M: Hauke Mehrtens hauke@hauke-m.de @@@ -3346,8 -3295,6 +3346,8 @@@ F: drivers/bus/brcmstb_gisb. F: arch/arm/mm/cache-b15-rac.c F: arch/arm/include/asm/hardware/cache-b15-rac.h N: brcmstb +F: Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml +F: drivers/pci/controller/pcie-brcmstb.c
BROADCOM BMIPS CPUFREQ DRIVER M: Markus Mayer mmayer@broadcom.com @@@ -4483,10 -4430,13 +4483,10 @@@ F: drivers/net/wireless/st/cw1200
CX18 VIDEO4LINUX DRIVER M: Andy Walls awalls@md.metrocast.net -L: ivtv-devel@ivtvdriver.org (subscribers-only) L: linux-media@vger.kernel.org T: git git://linuxtv.org/media_tree.git W: https://linuxtv.org -W: http://www.ivtvdriver.org/index.php/Cx18 S: Maintained -F: Documentation/media/v4l-drivers/cx18* F: drivers/media/pci/cx18/ F: include/uapi/linux/ivtv*
@@@ -4898,7 -4848,6 +4898,7 @@@ S: Supporte F: net/core/devlink.c F: include/net/devlink.h F: include/uapi/linux/devlink.h +F: Documentation/networking/devlink
DIALOG SEMICONDUCTOR DRIVERS M: Support Opensource support.opensource@diasemi.com @@@ -5027,24 -4976,6 +5027,24 @@@ F: Documentation/driver-api/dma-buf.rs K: dma_(buf|fence|resv) T: git git://anongit.freedesktop.org/drm/drm-misc
+DMA-BUF HEAPS FRAMEWORK +M: Sumit Semwal sumit.semwal@linaro.org +R: Andrew F. Davis afd@ti.com +R: Benjamin Gaignard benjamin.gaignard@linaro.org +R: Liam Mark lmark@codeaurora.org +R: Laura Abbott labbott@redhat.com +R: Brian Starkey Brian.Starkey@arm.com +R: John Stultz john.stultz@linaro.org +S: Maintained +L: linux-media@vger.kernel.org +L: dri-devel@lists.freedesktop.org +L: linaro-mm-sig@lists.linaro.org (moderated for non-subscribers) +F: include/uapi/linux/dma-heap.h +F: include/linux/dma-heap.h +F: drivers/dma-buf/dma-heap.c +F: drivers/dma-buf/heaps/* +T: git git://anongit.freedesktop.org/drm/drm-misc + DMA GENERIC OFFLOAD ENGINE SUBSYSTEM M: Vinod Koul vkoul@kernel.org L: dmaengine@vger.kernel.org @@@ -5250,12 -5181,6 +5250,12 @@@ T: git git://anongit.freedesktop.org/dr S: Maintained F: drivers/gpu/drm/bochs/
+DRM DRIVER FOR BOE HIMAX8279D PANELS +M: Jerry Han hanxu5@huaqin.corp-partner.google.com +S: Maintained +F: drivers/gpu/drm/panel/panel-boe-himax8279d.c +F: Documentation/devicetree/bindings/display/panel/boe,himax8279d.txt + DRM DRIVER FOR FARADAY TVE200 TV ENCODER M: Linus Walleij linus.walleij@linaro.org T: git git://anongit.freedesktop.org/drm/drm-misc @@@ -5411,12 -5336,6 +5411,12 @@@ S: Maintaine F: drivers/gpu/drm/tiny/st7735r.c F: Documentation/devicetree/bindings/display/sitronix,st7735r.txt
+DRM DRIVER FOR SONY ACX424AKP PANELS +M: Linus Walleij linus.walleij@linaro.org +T: git git://anongit.freedesktop.org/drm/drm-misc +S: Maintained +F: drivers/gpu/drm/panel/panel-sony-acx424akp.c + DRM DRIVER FOR ST-ERICSSON MCDE M: Linus Walleij linus.walleij@linaro.org T: git git://anongit.freedesktop.org/drm/drm-misc @@@ -5489,6 -5408,7 +5489,6 @@@ F: include/linux/vga DRM DRIVERS AND MISC GPU PATCHES M: Maarten Lankhorst maarten.lankhorst@linux.intel.com M: Maxime Ripard mripard@kernel.org -M: Sean Paul sean@poorly.run W: https://01.org/linuxgraphics/gfx-docs/maintainer-tools/drm-misc.html S: Maintained T: git git://anongit.freedesktop.org/drm/drm-misc @@@ -6235,12 -6155,6 +6235,12 @@@ M: Maxim Levitsky <maximlevitsky@gmail. S: Maintained F: drivers/media/rc/ene_ir.*
+EPAPR HYPERVISOR BYTE CHANNEL DEVICE DRIVER +M: Laurentiu Tudor laurentiu.tudor@nxp.com +L: linuxppc-dev@lists.ozlabs.org +S: Maintained +F: drivers/tty/ehv_bytechan.c + EPSON S1D13XXX FRAMEBUFFER DRIVER M: Kristoffer Ericson kristoffer.ericson@gmail.com S: Maintained @@@ -6283,7 -6197,6 +6283,7 @@@ ETHERNET PHY LIBRAR M: Andrew Lunn andrew@lunn.ch M: Florian Fainelli f.fainelli@gmail.com M: Heiner Kallweit hkallweit1@gmail.com +R: Russell King linux@armlinux.org.uk L: netdev@vger.kernel.org S: Maintained F: Documentation/ABI/testing/sysfs-class-net-phydev @@@ -6489,7 -6402,6 +6489,7 @@@ F: fs/ F: include/linux/fs.h F: include/linux/fs_types.h F: include/uapi/linux/fs.h +F: include/uapi/linux/openat2.h
FINTEK F75375S HARDWARE MONITOR AND FAN CONTROLLER DRIVER M: Riku Voipio riku.voipio@iki.fi @@@ -6908,7 -6820,7 +6908,7 @@@ T: git git://git.kernel.org/pub/scm/lin S: Maintained F: fs/fuse/ F: include/uapi/linux/fuse.h -F: Documentation/filesystems/fuse.txt +F: Documentation/filesystems/fuse.rst
FUTEX SUBSYSTEM M: Thomas Gleixner tglx@linutronix.de @@@ -7383,7 -7295,6 +7383,7 @@@ F: drivers/hwtracing HARDWARE SPINLOCK CORE M: Ohad Ben-Cohen ohad@wizery.com M: Bjorn Andersson bjorn.andersson@linaro.org +R: Baolin Wang baolin.wang7@gmail.com L: linux-remoteproc@vger.kernel.org S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc.git hwspinlock-next @@@ -7587,12 -7498,6 +7587,12 @@@ S: Supporte F: drivers/scsi/hisi_sas/ F: Documentation/devicetree/bindings/scsi/hisilicon-sas.txt
+HISILICON V3XX SPI NOR FLASH Controller Driver +M: John Garry john.garry@huawei.com +W: http://www.hisilicon.com +S: Maintained +F: drivers/spi/spi-hisi-sfc-v3xx.c + HISILICON QM AND ZIP Controller DRIVER M: Zhou Wang wangzhou1@hisilicon.com L: linux-crypto@vger.kernel.org @@@ -7663,8 -7568,9 +7663,8 @@@ S: Orpha F: drivers/net/usb/hso.c
HSR NETWORK PROTOCOL -M: Arvid Brodin arvid.brodin@alten.se L: netdev@vger.kernel.org -S: Maintained +S: Orphan F: net/hsr/
HT16K33 LED CONTROLLER DRIVER @@@ -7819,7 -7725,9 +7819,7 @@@ M: Jean Delvare <jdelvare@suse.com L: linux-i2c@vger.kernel.org S: Maintained F: Documentation/i2c/busses/i2c-parport.rst -F: Documentation/i2c/busses/i2c-parport-light.rst F: drivers/i2c/busses/i2c-parport.c -F: drivers/i2c/busses/i2c-parport-light.c
I2C SUBSYSTEM M: Wolfram Sang wsa@the-dreams.de @@@ -7933,10 -7841,10 +7933,10 @@@ F: Documentation/devicetree/bindings/i3 F: drivers/i3c/master/dw*
I3C DRIVER FOR CADENCE I3C MASTER IP -M: Przemysław Gaj pgaj@cadence.com -S: Maintained -F: Documentation/devicetree/bindings/i3c/cdns,i3c-master.txt -F: drivers/i3c/master/i3c-master-cdns.c +M: Przemysław Gaj pgaj@cadence.com +S: Maintained +F: Documentation/devicetree/bindings/i3c/cdns,i3c-master.txt +F: drivers/i3c/master/i3c-master-cdns.c
IA64 (Itanium) PLATFORM M: Tony Luck tony.luck@intel.com @@@ -8200,7 -8108,8 +8200,7 @@@ F: Documentation/devicetree/bindings/au F: drivers/auxdisplay/img-ascii-lcd.c
IMGTEC IR DECODER DRIVER -M: James Hogan jhogan@kernel.org -S: Maintained +S: Orphan F: drivers/media/rc/img-ir/
IMON SOUNDGRAPH USB IR RECEIVER @@@ -8441,6 -8350,7 +8441,6 @@@ S: Maintaine T: git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git F: drivers/gpio/gpio-ich.c F: drivers/gpio/gpio-intel-mid.c -F: drivers/gpio/gpio-lynxpoint.c F: drivers/gpio/gpio-merrifield.c F: drivers/gpio/gpio-ml-ioh.c F: drivers/gpio/gpio-pch.c @@@ -8471,14 -8381,6 +8471,14 @@@ Q: https://patchwork.kernel.org/project S: Supported F: drivers/dma/ioat*
+INTEL IADX DRIVER +M: Dave Jiang dave.jiang@intel.com +L: dmaengine@vger.kernel.org +S: Supported +F: drivers/dma/idxd/* +F: include/uapi/linux/idxd.h +F: include/linux/idxd.h + INTEL IDLE DRIVER M: Jacob Pan jacob.jun.pan@linux.intel.com M: Len Brown lenb@kernel.org @@@ -8660,12 -8562,6 +8660,12 @@@ S: Maintaine F: arch/x86/include/asm/intel_telemetry.h F: drivers/platform/x86/intel_telemetry*
+INTEL UNCORE FREQUENCY CONTROL +M: Srinivas Pandruvada srinivas.pandruvada@linux.intel.com +L: platform-driver-x86@vger.kernel.org +S: Maintained +F: drivers/platform/x86/intel-uncore-frequency.c + INTEL VIRTUAL BUTTON DRIVER M: AceLan Kao acelan.kao@canonical.com L: platform-driver-x86@vger.kernel.org @@@ -8673,7 -8569,7 +8673,7 @@@ S: Maintaine F: drivers/platform/x86/intel-vbtn.c
INTEL WIRELESS 3945ABG/BG, 4965AGN (iwlegacy) -M: Stanislaw Gruszka sgruszka@redhat.com +M: Stanislaw Gruszka stf_xl@wp.pl L: linux-wireless@vger.kernel.org S: Supported F: drivers/net/wireless/intel/iwlegacy/ @@@ -8911,12 -8807,10 +8911,12 @@@ L: isdn4linux@listserv.isdn4linux.de (s L: netdev@vger.kernel.org W: http://www.isdn4linux.de S: Maintained -F: drivers/isdn/mISDN -F: drivers/isdn/hardware +F: drivers/isdn/mISDN/ +F: drivers/isdn/hardware/ +F: drivers/isdn/Kconfig +F: drivers/isdn/Makefile
-ISDN/CAPI SUBSYSTEM +ISDN/CMTP OVER BLUETOOTH M: Karsten Keil isdn@linux-pingi.de L: isdn4linux@listserv.isdn4linux.de (subscribers-only) L: netdev@vger.kernel.org @@@ -8924,6 -8818,7 +8924,6 @@@ W: http://www.isdn4linux.d S: Odd Fixes F: Documentation/isdn/ F: drivers/isdn/capi/ -F: drivers/staging/isdn/ F: net/bluetooth/cmtp/ F: include/linux/isdn/ F: include/uapi/linux/isdn/ @@@ -8947,9 -8842,10 +8947,9 @@@ F: drivers/media/tuners/it913x
IVTV VIDEO4LINUX DRIVER M: Andy Walls awalls@md.metrocast.net -L: ivtv-devel@ivtvdriver.org (subscribers-only) L: linux-media@vger.kernel.org T: git git://linuxtv.org/media_tree.git -W: http://www.ivtvdriver.org +W: https://linuxtv.org S: Maintained F: Documentation/media/v4l-drivers/ivtv* F: drivers/media/pci/ivtv/ @@@ -9236,7 -9132,7 +9236,7 @@@ F: arch/x86/include/uapi/asm/svm. F: arch/x86/include/asm/kvm* F: arch/x86/include/asm/pvclock-abi.h F: arch/x86/include/asm/svm.h -F: arch/x86/include/asm/vmx.h +F: arch/x86/include/asm/vmx*.h F: arch/x86/kernel/kvm.c F: arch/x86/kernel/kvmclock.c
@@@ -9685,7 -9581,6 +9685,7 @@@ LINUX KERNEL DUMP TEST MODULE (LKDTM M: Kees Cook keescook@chromium.org S: Maintained F: drivers/misc/lkdtm/* +F: tools/testing/selftests/lkdtm/*
LINUX KERNEL MEMORY CONSISTENCY MODEL (LKMM) M: Alan Stern stern@rowland.harvard.edu @@@ -9994,7 -9889,7 +9994,7 @@@ S: Maintaine F: drivers/net/dsa/mv88e6xxx/ F: include/linux/platform_data/mv88e6xxx.h F: Documentation/devicetree/bindings/net/dsa/marvell.txt -F: Documentation/networking/devlink-params-mv88e6xxx.txt +F: Documentation/networking/devlink/mv88e6xxx.rst
MARVELL ARMADA DRM SUPPORT M: Russell King linux@armlinux.org.uk @@@ -10064,7 -9959,8 +10064,7 @@@ F: drivers/net/ethernet/marvell/mvneta.
MARVELL MWIFIEX WIRELESS DRIVER M: Amitkumar Karwar amitkarwar@gmail.com -M: Nishant Sarmukadam nishants@marvell.com -M: Ganapathi Bhat gbhat@marvell.com +M: Ganapathi Bhat ganapathi.bhat@nxp.com M: Xinming Hu huxinming820@gmail.com L: linux-wireless@vger.kernel.org S: Maintained @@@ -10103,16 -9999,6 +10103,16 @@@ M: Jerin Jacob <jerinj@marvell.com L: netdev@vger.kernel.org S: Supported F: drivers/net/ethernet/marvell/octeontx2/af/ +F: Documentation/networking/device_drivers/marvell/octeontx2.rst + +MARVELL OCTEONTX2 PHYSICAL FUNCTION DRIVER +M: Sunil Goutham sgoutham@marvell.com +M: Geetha sowjanya gakula@marvell.com +M: Subbaraya Sundeep sbhatta@marvell.com +M: hariprasad hkelam@marvell.com +L: netdev@vger.kernel.org +S: Supported +F: drivers/net/ethernet/marvell/octeontx2/nic/
MATROX FRAMEBUFFER DRIVER L: linux-fbdev@vger.kernel.org @@@ -10395,7 -10281,7 +10395,7 @@@ L: linux-media@vger.kernel.or L: linux-renesas-soc@vger.kernel.org T: git git://linuxtv.org/media_tree.git S: Supported -F: Documentation/devicetree/bindings/media/renesas,ceu.txt +F: Documentation/devicetree/bindings/media/renesas,ceu.yaml F: drivers/media/platform/renesas-ceu.c F: include/media/drv-intf/renesas-ceu.h
@@@ -10433,7 -10319,7 +10433,7 @@@ L: linux-media@vger.kernel.or L: linux-renesas-soc@vger.kernel.org T: git git://linuxtv.org/media_tree.git S: Supported -F: Documentation/devicetree/bindings/media/renesas,csi2.txt +F: Documentation/devicetree/bindings/media/renesas,csi2.yaml F: Documentation/devicetree/bindings/media/renesas,vin.txt F: drivers/media/platform/rcar-vin/
@@@ -11116,6 -11002,7 +11116,6 @@@ F: drivers/usb/image/microtek. MIPS M: Ralf Baechle ralf@linux-mips.org M: Paul Burton paulburton@kernel.org -M: James Hogan jhogan@kernel.org L: linux-mips@vger.kernel.org W: http://www.linux-mips.org/ T: git git://git.linux-mips.org/pub/scm/ralf/linux.git @@@ -11256,13 -11143,6 +11256,13 @@@ S: Maintaine F: Documentation/driver-api/serial/moxa-smartio.rst F: drivers/tty/mxser.*
+MONOLITHIC POWER SYSTEM PMIC DRIVER +M: Saravanan Sekar sravanhome@gmail.com +S: Maintained +F: Documentation/devicetree/bindings/regulator/mpq7920.yaml +F: drivers/regulator/mpq7920.c +F: drivers/regulator/mpq7920.h + MR800 AVERMEDIA USB FM RADIO DRIVER M: Alexey Klimov klimov.linux@gmail.com L: linux-media@vger.kernel.org @@@ -11506,7 -11386,7 +11506,7 @@@ F: Documentation/networking/net_failove
NETEM NETWORK EMULATOR M: Stephen Hemminger stephen@networkplumber.org -L: netem@lists.linux-foundation.org (moderated for non-subscribers) +L: netdev@vger.kernel.org S: Maintained F: net/sched/sch_netem.c
@@@ -11551,7 -11431,7 +11551,7 @@@ F: include/uapi/linux/netrom. F: net/netrom/
NETRONOME ETHERNET DRIVERS -M: Jakub Kicinski jakub.kicinski@netronome.com +M: Jakub Kicinski kuba@kernel.org L: oss-drivers@netronome.com S: Maintained F: drivers/net/ethernet/netronome/ @@@ -11619,7 -11499,6 +11619,7 @@@ F: drivers/net/dsa
NETWORKING [GENERAL] M: "David S. Miller" davem@davemloft.net +M: Jakub Kicinski kuba@kernel.org L: netdev@vger.kernel.org W: http://www.linuxfoundation.org/en/Net Q: http://patchwork.ozlabs.org/project/netdev/list/ @@@ -11694,18 -11573,6 +11694,18 @@@ F: net/ipv6/calipso. F: net/netfilter/xt_CONNSECMARK.c F: net/netfilter/xt_SECMARK.c
+NETWORKING [MPTCP] +M: Mat Martineau mathew.j.martineau@linux.intel.com +M: Matthieu Baerts matthieu.baerts@tessares.net +L: netdev@vger.kernel.org +L: mptcp@lists.01.org +W: https://github.com/multipath-tcp/mptcp_net-next/wiki +B: https://github.com/multipath-tcp/mptcp_net-next/issues +S: Maintained +F: include/net/mptcp.h +F: net/mptcp/ +F: tools/testing/selftests/net/mptcp/ + NETWORKING [TCP] M: Eric Dumazet edumazet@google.com L: netdev@vger.kernel.org @@@ -11724,7 -11591,7 +11724,7 @@@ M: Boris Pismenny <borisp@mellanox.com M: Aviad Yehezkel aviadye@mellanox.com M: John Fastabend john.fastabend@gmail.com M: Daniel Borkmann daniel@iogearbox.net -M: Jakub Kicinski jakub.kicinski@netronome.com +M: Jakub Kicinski kuba@kernel.org L: netdev@vger.kernel.org S: Maintained F: net/tls/* @@@ -11736,7 -11603,7 +11736,7 @@@ L: linux-wireless@vger.kernel.or Q: http://patchwork.kernel.org/project/linux-wireless/list/
NETDEVSIM -M: Jakub Kicinski jakub.kicinski@netronome.com +M: Jakub Kicinski kuba@kernel.org S: Maintained F: drivers/net/netdevsim/*
@@@ -11813,7 -11680,7 +11813,7 @@@ F: Documentation/scsi/NinjaSCSI.tx F: drivers/scsi/nsp32*
NIOS2 ARCHITECTURE -M: Ley Foon Tan lftan@altera.com +M: Ley Foon Tan ley.foon.tan@intel.com L: nios2-dev@lists.rocketboards.org (moderated for non-subscribers) T: git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git S: Maintained @@@ -12564,7 -12431,7 +12564,7 @@@ L: linux-crypto@vger.kernel.or S: Maintained F: kernel/padata.c F: include/linux/padata.h -F: Documentation/padata.txt +F: Documentation/core-api/padata.rst
PAGE POOL M: Jesper Dangaard Brouer hawk@kernel.org @@@ -12580,13 -12447,6 +12580,13 @@@ L: platform-driver-x86@vger.kernel.or S: Maintained F: drivers/platform/x86/panasonic-laptop.c
+PARALLAX PING IIO SENSOR DRIVER +M: Andreas Klinger ak@it-klinger.de +L: linux-iio@vger.kernel.org +S: Maintained +F: Documentation/devicetree/bindings/iio/proximity/parallax-ping.yaml +F: drivers/iio/proximity/ping.c + PARALLEL LCD/KEYPAD PANEL DRIVER M: Willy Tarreau willy@haproxy.com M: Ksenija Stanojevic ksenija.stanojevic@gmail.com @@@ -12704,7 -12564,7 +12704,7 @@@ F: Documentation/devicetree/bindings/pc F: drivers/pci/controller/pci-aardvark.c
PCI DRIVER FOR ALTERA PCIE IP -M: Ley Foon Tan lftan@altera.com +M: Ley Foon Tan ley.foon.tan@intel.com L: rfi@lists.rocketboards.org (moderated for non-subscribers) L: linux-pci@vger.kernel.org S: Supported @@@ -12724,7 -12584,7 +12724,7 @@@ M: Rob Herring <robh@kernel.org L: linux-pci@vger.kernel.org L: linux-arm-kernel@lists.infradead.org S: Maintained -F: Documentation/devicetree/bindings/pci/versatile.txt +F: Documentation/devicetree/bindings/pci/versatile.yaml F: drivers/pci/controller/pci-versatile.c
PCI DRIVER FOR ARMADA 8K @@@ -12757,7 -12617,7 +12757,7 @@@ M: Will Deacon <will@kernel.org L: linux-pci@vger.kernel.org L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained -F: Documentation/devicetree/bindings/pci/host-generic-pci.txt +F: Documentation/devicetree/bindings/pci/host-generic-pci.yaml F: drivers/pci/controller/pci-host-common.c F: drivers/pci/controller/pci-host-generic.c
@@@ -12883,7 -12743,7 +12883,7 @@@ S: Supporte F: Documentation/PCI/pci-error-recovery.rst
PCI MSI DRIVER FOR ALTERA MSI IP -M: Ley Foon Tan lftan@altera.com +M: Ley Foon Tan ley.foon.tan@intel.com L: rfi@lists.rocketboards.org (moderated for non-subscribers) L: linux-pci@vger.kernel.org S: Supported @@@ -12919,7 -12779,7 +12919,7 @@@ F: arch/x86/kernel/early-quirks.
PCI NATIVE HOST BRIDGE AND ENDPOINT DRIVERS M: Lorenzo Pieralisi lorenzo.pieralisi@arm.com -R: Andrew Murray andrew.murray@arm.com +R: Andrew Murray amurray@thegoodpenguin.co.uk L: linux-pci@vger.kernel.org Q: http://patchwork.ozlabs.org/project/linux-pci/list/ T: git git://git.kernel.org/pub/scm/linux/kernel/git/lpieralisi/pci.git/ @@@ -13284,11 -13144,6 +13284,11 @@@ S: Maintaine F: drivers/iio/chemical/pms7003.c F: Documentation/devicetree/bindings/iio/chemical/plantower,pms7003.yaml
+PLX DMA DRIVER +M: Logan Gunthorpe logang@deltatee.com +S: Maintained +F: drivers/dma/plx_dma.c + PMBUS HARDWARE MONITORING DRIVERS M: Guenter Roeck linux@roeck-us.net L: linux-hwmon@vger.kernel.org @@@ -13340,6 -13195,11 +13340,6 @@@ T: git git://github.com/intel/pm-grap S: Supported F: tools/power/pm-graph
-PNP SUPPORT -M: "Rafael J. Wysocki" rafael.j.wysocki@intel.com -S: Maintained -F: drivers/pnp/ - PNI RM3100 IIO DRIVER M: Song Qiang songqiang1304521@gmail.com L: linux-iio@vger.kernel.org @@@ -13347,11 -13207,6 +13347,11 @@@ S: Maintaine F: drivers/iio/magnetometer/rm3100* F: Documentation/devicetree/bindings/iio/magnetometer/pni,rm3100.txt
+PNP SUPPORT +M: "Rafael J. Wysocki" rafael.j.wysocki@intel.com +S: Maintained +F: drivers/pnp/ + POSIX CLOCKS and TIMERS M: Thomas Gleixner tglx@linutronix.de L: linux-kernel@vger.kernel.org @@@ -13359,8 -13214,6 +13359,8 @@@ T: git git://git.kernel.org/pub/scm/lin S: Maintained F: fs/timerfd.c F: include/linux/timer* +F: include/linux/time_namespace.h +F: kernel/time/namespace.c F: kernel/time/*timer*
POWER MANAGEMENT CORE @@@ -13796,13 -13649,6 +13796,13 @@@ T: git git://git.kernel.org/pub/scm/lin S: Supported F: drivers/net/wireless/ath/ath10k/
+QUALCOMM ATHEROS ATH11K WIRELESS DRIVER +M: Kalle Valo kvalo@codeaurora.org +L: ath11k@lists.infradead.org +T: git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git +S: Supported +F: drivers/net/wireless/ath/ath11k/ + QUALCOMM ATHEROS ATH9K WIRELESS DRIVER M: QCA ath9k Development ath9k-devel@qca.qualcomm.com L: linux-wireless@vger.kernel.org @@@ -13825,14 -13671,6 +13825,14 @@@ S: Maintaine F: Documentation/devicetree/bindings/opp/qcom-nvmem-cpufreq.txt F: drivers/cpufreq/qcom-cpufreq-nvmem.c
+QUALCOMM CORE POWER REDUCTION (CPR) AVS DRIVER +M: Niklas Cassel nks@flawful.org +L: linux-pm@vger.kernel.org +L: linux-arm-msm@vger.kernel.org +S: Maintained +F: Documentation/devicetree/bindings/power/avs/qcom,cpr.txt +F: drivers/power/avs/qcom-cpr.c + QUALCOMM EMAC GIGABIT ETHERNET DRIVER M: Timur Tabi timur@kernel.org L: netdev@vger.kernel.org @@@ -13982,7 -13820,7 +13982,7 @@@ S: Maintaine F: arch/mips/ralink
RALINK RT2X00 WIRELESS LAN DRIVER -M: Stanislaw Gruszka sgruszka@redhat.com +M: Stanislaw Gruszka stf_xl@wp.pl M: Helmut Schaa helmut.schaa@googlemail.com L: linux-wireless@vger.kernel.org S: Maintained @@@ -14109,6 -13947,7 +14109,6 @@@ F: include/linux/platform_data/rtc- F: tools/testing/selftests/rtc/
REALTEK AUDIO CODECS -M: Bard Liao bardliao@realtek.com M: Oder Chiou oder_chiou@realtek.com S: Maintained F: sound/soc/codecs/rt* @@@ -14296,12 -14135,6 +14296,12 @@@ F: drivers/hid/hid-roccat F: include/linux/hid-roccat* F: Documentation/ABI/*/sysfs-driver-hid-roccat*
+ROCKCHIP ISP V1 DRIVER +M: Helen Koike helen.koike@collabora.com +L: linux-media@vger.kernel.org +S: Maintained +F: drivers/staging/media/rkisp1/ + ROCKCHIP RASTER 2D GRAPHIC ACCELERATION UNIT DRIVER M: Jacob Chen jacob-chen@iotwrt.com M: Ezequiel Garcia ezequiel@collabora.com @@@ -14673,7 -14506,7 +14673,7 @@@ F: drivers/media/i2c/s5k5baf. SAMSUNG S5P Security SubSystem (SSS) DRIVER M: Krzysztof Kozlowski krzk@kernel.org M: Vladimir Zapolskiy vz@mleia.com -M: Kamil Konieczny k.konieczny@partner.samsung.com +M: Kamil Konieczny k.konieczny@samsung.com L: linux-crypto@vger.kernel.org L: linux-samsung-soc@vger.kernel.org S: Maintained @@@ -14949,8 -14782,8 +14949,8 @@@ S: Maintaine F: drivers/mmc/host/sdhci-omap.c
SECURE ENCRYPTING DEVICE (SED) OPAL DRIVER -M: Scott Bauer scott.bauer@intel.com M: Jonathan Derrick jonathan.derrick@intel.com +M: Revanth Rajashekar revanth.rajashekar@intel.com L: linux-block@vger.kernel.org S: Supported F: block/sed* @@@ -14985,7 -14818,6 +14985,7 @@@ F: include/uapi/linux/selinux_netlink. F: security/selinux/ F: scripts/selinux/ F: Documentation/admin-guide/LSM/SELinux.rst +F: Documentation/ABI/obsolete/sysfs-selinux-disable
SENSABLE PHANTOM M: Jiri Slaby jirislaby@gmail.com @@@ -15212,8 -15044,11 +15212,8 @@@ F: drivers/video/fbdev/sm712 F: Documentation/fb/sm712fb.rst
SIMPLE FIRMWARE INTERFACE (SFI) -M: Len Brown lenb@kernel.org -L: sfi-devel@simplefirmware.org W: http://simplefirmware.org/ -T: git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6.git -S: Supported +S: Obsolete F: arch/x86/platform/sfi/ F: drivers/sfi/ F: include/linux/sfi*.h @@@ -15933,18 -15768,8 +15933,18 @@@ M: Jose Abreu <joabreu@synopsys.com L: netdev@vger.kernel.org W: http://www.stlinux.com S: Supported +F: Documentation/networking/device_drivers/stmicro/ F: drivers/net/ethernet/stmicro/stmmac/
+EXTRA BOOT CONFIG +M: Masami Hiramatsu mhiramat@kernel.org +S: Maintained +F: lib/bootconfig.c +F: fs/proc/bootconfig.c +F: include/linux/bootconfig.h +F: tools/bootconfig/* +F: Documentation/admin-guide/bootconfig.rst + SUN3/3X M: Sam Creasey sammy@sammy.net W: http://sammy.net/sun3/ @@@ -16152,7 -15977,6 +16152,7 @@@ F: drivers/firmware/arm_scpi. F: drivers/firmware/arm_scmi/ F: drivers/reset/reset-scmi.c F: include/linux/sc[mp]i_protocol.h +F: include/trace/events/scmi.h
SYSTEM RESET/SHUTDOWN DRIVERS M: Sebastian Reichel sre@kernel.org @@@ -16516,15 -16340,12 +16516,15 @@@ F: Documentation/devicetree/bindings/th
THERMAL/CPU_COOLING M: Amit Daniel Kachhap amit.kachhap@gmail.com +M: Daniel Lezcano daniel.lezcano@linaro.org M: Viresh Kumar viresh.kumar@linaro.org M: Javi Merino javi.merino@kernel.org L: linux-pm@vger.kernel.org S: Supported F: Documentation/driver-api/thermal/cpu-cooling-api.rst -F: drivers/thermal/cpu_cooling.c +F: Documentation/driver-api/thermal/cpu-idle-cooling.rst +F: drivers/thermal/cpufreq_cooling.c +F: drivers/thermal/cpuidle_cooling.c F: include/linux/cpu_cooling.h
THERMAL DRIVER FOR AMLOGIC SOCS @@@ -16551,7 -16372,6 +16551,7 @@@ M: Andreas Noever <andreas.noever@gmail M: Michael Jamet michael.jamet@intel.com M: Mika Westerberg mika.westerberg@linux.intel.com M: Yehezkel Bernat YehezkelShB@gmail.com +L: linux-usb@vger.kernel.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git S: Maintained F: Documentation/admin-guide/thunderbolt.rst @@@ -16752,7 -16572,6 +16752,7 @@@ Q: http://patchwork.linuxtv.org/project S: Maintained F: drivers/media/platform/ti-vpe/ F: Documentation/devicetree/bindings/media/ti,vpe.yaml + Documentation/devicetree/bindings/media/ti,cal.yaml
TI WILINK WIRELESS DRIVERS L: linux-wireless@vger.kernel.org @@@ -16782,7 -16601,7 +16782,7 @@@ F: kernel/time/ntp. F: tools/testing/selftests/timers/
TIPC NETWORK LAYER -M: Jon Maloy jon.maloy@ericsson.com +M: Jon Maloy jmaloy@redhat.com M: Ying Xue ying.xue@windriver.com L: netdev@vger.kernel.org (core kernel code) L: tipc-discussion@lists.sourceforge.net (user apps, general discussion) @@@ -17138,6 -16957,7 +17138,6 @@@ F: drivers/staging/unisys UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER R: Alim Akhtar alim.akhtar@samsung.com R: Avri Altman avri.altman@wdc.com -R: Pedro Sousa pedrom.sousa@synopsys.com L: linux-scsi@vger.kernel.org S: Supported F: Documentation/scsi/ufs.txt @@@ -17554,7 -17374,7 +17554,7 @@@ F: drivers/mtd/nand/raw/vf610_nfc. VFAT/FAT/MSDOS FILESYSTEM M: OGAWA Hirofumi hirofumi@mail.parknet.co.jp S: Maintained -F: Documentation/filesystems/vfat.txt +F: Documentation/filesystems/vfat.rst F: fs/fat/
VFIO DRIVER @@@ -17677,7 -17497,6 +17677,7 @@@ F: net/vmw_vsock/diag. F: net/vmw_vsock/af_vsock_tap.c F: net/vmw_vsock/virtio_transport_common.c F: net/vmw_vsock/virtio_transport.c +F: net/vmw_vsock/vsock_loopback.c F: drivers/net/vsockmon.c F: drivers/vhost/vsock.c F: tools/testing/vsock/ @@@ -17791,6 -17610,12 +17791,12 @@@ F: include/linux/vbox_utils. F: include/uapi/linux/vbox*.h F: drivers/virt/vboxguest/
+ VIRTUAL BOX SHARED FOLDER VFS DRIVER: + M: Hans de Goede hdegoede@redhat.com + L: linux-fsdevel@vger.kernel.org + S: Maintained + F: fs/vboxsf/* + VIRTUAL SERIO DEVICE DRIVER M: Stephen Chandler Paul thatslyude@gmail.com S: Maintained @@@ -18048,14 -17873,6 +18054,14 @@@ L: linux-gpio@vger.kernel.or S: Maintained F: drivers/gpio/gpio-ws16c48.c
+WIREGUARD SECURE NETWORK TUNNEL +M: Jason A. Donenfeld Jason@zx2c4.com +S: Maintained +F: drivers/net/wireguard/ +F: tools/testing/selftests/wireguard/ +L: wireguard@lists.zx2c4.com +L: netdev@vger.kernel.org + WISTRON LAPTOP BUTTON DRIVER M: Miloslav Trmac mitr@volny.cz S: Maintained @@@ -18119,8 -17936,8 +18125,8 @@@ F: Documentation/core-api/workqueue.rs X-POWERS AXP288 PMIC DRIVERS M: Hans de Goede hdegoede@redhat.com S: Maintained -N: axp288 F: drivers/acpi/pmic/intel_pmic_xpower.c +N: axp288
X-POWERS MULTIFUNCTION PMIC DEVICE DRIVERS M: Chen-Yu Tsai wens@csie.org @@@ -18231,7 -18048,7 +18237,7 @@@ XDP (eXpress Data Path M: Alexei Starovoitov ast@kernel.org M: Daniel Borkmann daniel@iogearbox.net M: David S. Miller davem@davemloft.net -M: Jakub Kicinski jakub.kicinski@netronome.com +M: Jakub Kicinski kuba@kernel.org M: Jesper Dangaard Brouer hawk@kernel.org M: John Fastabend john.fastabend@gmail.com L: netdev@vger.kernel.org diff --combined fs/Makefile index 98be354fdb61,b807cbff3790..96520ba7bd64 --- a/fs/Makefile +++ b/fs/Makefile @@@ -37,7 -37,7 +37,7 @@@ obj-$(CONFIG_FS_DAX) += dax. obj-$(CONFIG_FS_ENCRYPTION) += crypto/ obj-$(CONFIG_FS_VERITY) += verity/ obj-$(CONFIG_FILE_LOCKING) += locks.o -obj-$(CONFIG_COMPAT) += compat.o compat_ioctl.o +obj-$(CONFIG_COMPAT) += compat.o obj-$(CONFIG_BINFMT_AOUT) += binfmt_aout.o obj-$(CONFIG_BINFMT_EM86) += binfmt_em86.o obj-$(CONFIG_BINFMT_MISC) += binfmt_misc.o @@@ -133,3 -133,4 +133,4 @@@ obj-$(CONFIG_CEPH_FS) += ceph obj-$(CONFIG_PSTORE) += pstore/ obj-$(CONFIG_EFIVAR_FS) += efivarfs/ obj-$(CONFIG_EROFS_FS) += erofs/ + obj-$(CONFIG_VBOXSF_FS) += vboxsf/