]> Git Repo - J-linux.git/commitdiff
Merge tag 'apparmor-pr-2018-04-10' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <[email protected]>
Fri, 13 Apr 2018 22:38:53 +0000 (15:38 -0700)
committerLinus Torvalds <[email protected]>
Fri, 13 Apr 2018 22:38:53 +0000 (15:38 -0700)
Pull apparmor updates from John Johansen:
 "Features:
  - add base infrastructure for socket mediation. ABI bump and
    additional checks to ensure only v8 compliant policy uses socket af
    mediation.
  - improve and cleanup dfa verification
  - improve profile attachment logic
     - improve overlapping expression handling
     - add the xattr matching to the attachment logic
  - improve signal mediation handling with stacked labels
  - improve handling of no_new_privs in a label stack

  Cleanups and changes:
  - use dfa to parse string split
  - bounded version of label_parse
  - proper line wrap nulldfa.in
  - split context out into task and cred naming to better match usage
  - simplify code in aafs

  Bug fixes:
  - fix display of .ns_name for containers
  - fix resource audit messages when auditing peer
  - fix logging of the existence test for signals
  - fix resource audit messages when auditing peer
  - fix display of .ns_name for containers
  - fix an error code in verify_table_headers()
  - fix memory leak on buffer on error exit path
  - fix error returns checks by making size a ssize_t"

* tag 'apparmor-pr-2018-04-10' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor: (36 commits)
  apparmor: fix memory leak on buffer on error exit path
  apparmor: fix dangling symlinks to policy rawdata after replacement
  apparmor: Fix an error code in verify_table_headers()
  apparmor: fix error returns checks by making size a ssize_t
  apparmor: update MAINTAINERS file git and wiki locations
  apparmor: remove POLICY_MEDIATES_SAFE
  apparmor: add base infastructure for socket mediation
  apparmor: improve overlapping domain attachment resolution
  apparmor: convert attaching profiles via xattrs to use dfa matching
  apparmor: Add support for attaching profiles via xattr, presence and value
  apparmor: cleanup: simplify code to get ns symlink name
  apparmor: cleanup create_aafs() error path
  apparmor: dfa split verification of table headers
  apparmor: dfa add support for state differential encoding
  apparmor: dfa move character match into a macro
  apparmor: update domain transitions that are subsets of confinement at nnp
  apparmor: move context.h to cred.h
  apparmor: move task related defines and fns to task.X files
  apparmor: cleanup, drop unused fn __aa_task_is_confined()
  apparmor: cleanup fixup description of aa_replace_profiles
  ...

1  2 
MAINTAINERS
security/apparmor/apparmorfs.c
security/apparmor/lsm.c

diff --combined MAINTAINERS
index f79952e6f627a1e54a545549ce4c2c8954fe3b5c,2c0eceb2ac34e26216aa78a45473298458be98ab..9b091ef6579b0f8592e35cac37a4b7889570a347
@@@ -270,7 -270,6 +270,7 @@@ ACCES 104-QUAD-8 IIO DRIVE
  M:    William Breathitt Gray <[email protected]>
  L:    [email protected]
  S:    Maintained
 +F:    Documentation/ABI/testing/sysfs-bus-iio-counter-104-quad-8
  F:    drivers/iio/counter/104-quad-8.c
  
  ACCES PCI-IDIO-16 GPIO DRIVER
@@@ -279,12 -278,6 +279,12 @@@ L:       [email protected]
  S:    Maintained
  F:    drivers/gpio/gpio-pci-idio-16.c
  
 +ACCES PCIe-IDIO-24 GPIO DRIVER
 +M:    William Breathitt Gray <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/gpio/gpio-pcie-idio-24.c
 +
  ACENIC DRIVER
  M:    Jes Sorensen <[email protected]>
  L:    [email protected]
@@@ -336,7 -329,7 +336,7 @@@ F: drivers/acpi/apei
  
  ACPI COMPONENT ARCHITECTURE (ACPICA)
  M:    Robert Moore <[email protected]>
 -M:    Lv Zheng <lv.zheng@intel.com>
 +M:    Erik Schmauss <erik.schmauss@intel.com>
  M:    "Rafael J. Wysocki" <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -766,8 -759,6 +766,8 @@@ F: drivers/gpu/drm/amd/amdgpu/amdgpu_am
  F:    drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
  F:    drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c
  F:    drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c
 +F:    drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_fence.c
 +F:    drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
  F:    drivers/gpu/drm/amd/amdkfd/
  F:    drivers/gpu/drm/amd/include/cik_structs.h
  F:    drivers/gpu/drm/amd/include/kgd_kfd_interface.h
@@@ -843,6 -834,13 +843,6 @@@ F:        sound/soc/codecs/ad7
  F:    sound/soc/codecs/ssm*
  F:    sound/soc/codecs/sigmadsp.*
  
 -ANALOG DEVICES INC ASOC DRIVERS
 -L:    [email protected] (moderated for non-subscribers)
 -L:    [email protected] (moderated for non-subscribers)
 -W:    http://blackfin.uclinux.org/
 -S:    Supported
 -F:    sound/soc/blackfin/*
 -
  ANALOG DEVICES INC DMA DRIVERS
  M:    Lars-Peter Clausen <[email protected]>
  W:    http://ez.analog.com/community/linux-device-drivers
@@@ -855,23 -853,11 +855,23 @@@ M:      Michael Hennerich <Michael.Hennerich
  W:    http://wiki.analog.com/
  W:    http://ez.analog.com/community/linux-device-drivers
  S:    Supported
 +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*
  X:    drivers/iio/*/adjd*
  F:    drivers/staging/iio/*/ad*
 -F:    drivers/staging/iio/trigger/iio-trig-bfin-timer.c
 +
 +ANDES ARCHITECTURE
 +M:    Greentime Hu <[email protected]>
 +M:    Vincent Chen <[email protected]>
 +T:    git https://github.com/andestech/linux.git
 +S:    Supported
 +F:    arch/nds32/
 +F:    Documentation/devicetree/bindings/interrupt-controller/andestech,ativic32.txt
 +F:    Documentation/devicetree/bindings/nds32/
 +K:    nds32
 +N:    nds32
  
  ANDROID CONFIG FRAGMENTS
  M:    Rob Herring <[email protected]>
@@@ -889,12 -875,6 +889,12 @@@ S:       Supporte
  F:    drivers/android/
  F:    drivers/staging/android/
  
 +ANDROID GOLDFISH PIC DRIVER
 +M:    Miodrag Dinic <[email protected]>
 +S:    Supported
 +F:    Documentation/devicetree/bindings/interrupt-controller/google,goldfish-pic.txt
 +F:    drivers/irqchip/irq-goldfish-pic.c
 +
  ANDROID GOLDFISH RTC DRIVER
  M:    Miodrag Dinic <[email protected]>
  S:    Supported
  S:    Supported
  F:    drivers/staging/android/ion
  F:    drivers/staging/android/uapi/ion.h
 -F:    drivers/staging/android/uapi/ion_test.h
  
  AOA (Apple Onboard Audio) ALSA DRIVER
  M:    Johannes Berg <[email protected]>
@@@ -934,8 -915,8 +934,8 @@@ F: drivers/char/apm-emulation.
  APPARMOR SECURITY MODULE
  M:    John Johansen <[email protected]>
  L:    [email protected] (subscribers-only, general discussion)
- W:    apparmor.wiki.kernel.org
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jj/apparmor-dev.git
+ W:    wiki.apparmor.net
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor
  S:    Supported
  F:    security/apparmor/
  F:    Documentation/admin-guide/LSM/apparmor.rst
@@@ -1065,42 -1046,41 +1065,42 @@@ ARM POR
  M:    Russell King <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  W:    http://www.armlinux.org.uk/
 -S:    Maintained
 +S:    Odd Fixes
  T:    git git://git.armlinux.org.uk/~rmk/linux-arm.git
  F:    arch/arm/
 +X:    arch/arm/boot/dts/
  
  ARM PRIMECELL AACI PL041 DRIVER
  M:    Russell King <[email protected]>
 -S:    Maintained
 +S:    Odd Fixes
  F:    sound/arm/aaci.*
  
  ARM PRIMECELL BUS SUPPORT
  M:    Russell King <[email protected]>
 -S:    Maintained
 +S:    Odd Fixes
  F:    drivers/amba/
  F:    include/linux/amba/bus.h
  
  ARM PRIMECELL CLCD PL110 DRIVER
  M:    Russell King <[email protected]>
 -S:    Maintained
 +S:    Odd Fixes
  F:    drivers/video/fbdev/amba-clcd.*
  
  ARM PRIMECELL KMI PL050 DRIVER
  M:    Russell King <[email protected]>
 -S:    Maintained
 +S:    Odd Fixes
  F:    drivers/input/serio/ambakmi.*
  F:    include/linux/amba/kmi.h
  
  ARM PRIMECELL MMCI PL180/1 DRIVER
  M:    Russell King <[email protected]>
 -S:    Maintained
 +S:    Odd Fixes
  F:    drivers/mmc/host/mmci.*
  F:    include/linux/amba/mmci.h
  
  ARM PRIMECELL UART PL010 AND PL011 DRIVERS
  M:    Russell King <[email protected]>
 -S:    Maintained
 +S:    Odd Fixes
  F:    drivers/tty/serial/amba-pl01*.c
  F:    include/linux/amba/serial.h
  
@@@ -1158,7 -1138,7 +1158,7 @@@ S:      Maintaine
  F:    drivers/clk/sunxi/
  
  ARM/Allwinner sunXi SoC support
 -M:    Maxime Ripard <maxime.ripard@free-electrons.com>
 +M:    Maxime Ripard <maxime.ripard@bootlin.com>
  M:    Chen-Yu Tsai <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
@@@ -1232,21 -1212,37 +1232,21 @@@ F:   Documentation/devicetree/bindings/i2
  
  ARM/ASPEED MACHINE SUPPORT
  M:    Joel Stanley <[email protected]>
 -S:    Maintained
 +R:    Andrew Jeffery <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected] (moderated for non-subscribers)
 +Q:    https://patchwork.ozlabs.org/project/linux-aspeed/list/
 +S:    Supported
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed.git
  F:    arch/arm/mach-aspeed/
  F:    arch/arm/boot/dts/aspeed-*
 -F:    drivers/*/*aspeed*
 +N:    aspeed
  
  ARM/ATMEL AT91 Clock Support
 -M:    Boris Brezillon <boris.brezillon@free-electrons.com>
 +M:    Boris Brezillon <boris.brezillon@bootlin.com>
  S:    Maintained
  F:    drivers/clk/at91
  
 -ARM/ATMEL AT91RM9200, AT91SAM9 AND SAMA5 SOC SUPPORT
 -M:    Nicolas Ferre <[email protected]>
 -M:    Alexandre Belloni <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -W:    http://www.linux4sam.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91.git
 -S:    Supported
 -N:    at91
 -N:    atmel
 -F:    arch/arm/mach-at91/
 -F:    include/soc/at91/
 -F:    arch/arm/boot/dts/at91*.dts
 -F:    arch/arm/boot/dts/at91*.dtsi
 -F:    arch/arm/boot/dts/sama*.dts
 -F:    arch/arm/boot/dts/sama*.dtsi
 -F:    arch/arm/include/debug/at91.S
 -F:    drivers/memory/atmel*
 -F:    drivers/watchdog/sama5d4_wdt.c
 -X:    drivers/input/touchscreen/atmel_mxt_ts.c
 -X:    drivers/net/wireless/atmel/
 -
  ARM/CALXEDA HIGHBANK ARCHITECTURE
  M:    Rob Herring <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  F:    drivers/net/ethernet/cavium/thunder/
  
 +ARM/CIRRUS LOGIC BK3 MACHINE SUPPORT
 +M:    Lukasz Majewski <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    arch/arm/mach-ep93xx/ts72xx.c
 +
  ARM/CIRRUS LOGIC CLPS711X ARM ARCHITECTURE
  M:    Alexander Shiyan <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -1297,6 -1287,7 +1297,6 @@@ M:      Russell King <[email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  T:    git git://git.armlinux.org.uk/~rmk/linux-arm.git clkdev
 -F:    arch/arm/include/asm/clkdev.h
  F:    drivers/clk/clkdev.c
  
  ARM/COMPULAB CM-X270/EM-X270 and CM-X300 MACHINE SUPPORT
@@@ -1330,8 -1321,7 +1330,8 @@@ F:      tools/perf/arch/arm/util/pmu.
  F:    tools/perf/arch/arm/util/auxtrace.c
  F:    tools/perf/arch/arm/util/cs-etm.c
  F:    tools/perf/arch/arm/util/cs-etm.h
 -F:    tools/perf/util/cs-etm.h
 +F:    tools/perf/util/cs-etm.*
 +F:    tools/perf/util/cs-etm-decoder/*
  
  ARM/CORGI MACHINE SUPPORT
  M:    Richard Purdie <[email protected]>
@@@ -1345,10 -1335,8 +1345,10 @@@ T:    git git://github.com/ulli-kroll/linu
  S:    Maintained
  F:    Documentation/devicetree/bindings/arm/gemini.txt
  F:    Documentation/devicetree/bindings/pinctrl/cortina,gemini-pinctrl.txt
 +F:    Documentation/devicetree/bindings/net/cortina,gemini-ethernet.txt
  F:    Documentation/devicetree/bindings/rtc/faraday,ftrtc010.txt
  F:    arch/arm/mach-gemini/
 +F:    drivers/net/ethernet/cortina/
  F:    drivers/pinctrl/pinctrl-gemini.c
  F:    drivers/rtc/rtc-ftrtc010.c
  
@@@ -1567,11 -1555,20 +1567,11 @@@ ARM/MAGICIAN MACHINE SUPPOR
  M:    Philipp Zabel <[email protected]>
  S:    Maintained
  
 -ARM/Marvell Berlin SoC support
 -M:    Jisheng Zhang <[email protected]>
 -M:    Sebastian Hesselbarth <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 -F:    arch/arm/mach-berlin/
 -F:    arch/arm/boot/dts/berlin*
 -F:    arch/arm64/boot/dts/marvell/berlin*
 -
  ARM/Marvell Dove/MV78xx0/Orion SOC support
  M:    Jason Cooper <[email protected]>
  M:    Andrew Lunn <[email protected]>
  M:    Sebastian Hesselbarth <[email protected]>
 -M:    Gregory Clement <gregory.clement@free-electrons.com>
 +M:    Gregory Clement <gregory.clement@bootlin.com>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    Documentation/devicetree/bindings/soc/dove/
@@@ -1585,7 -1582,7 +1585,7 @@@ F:      arch/arm/boot/dts/orion5x
  ARM/Marvell Kirkwood and Armada 370, 375, 38x, 39x, XP, 3700, 7K/8K SOC support
  M:    Jason Cooper <[email protected]>
  M:    Andrew Lunn <[email protected]>
 -M:    Gregory Clement <gregory.clement@free-electrons.com>
 +M:    Gregory Clement <gregory.clement@bootlin.com>
  M:    Sebastian Hesselbarth <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
@@@ -1594,7 -1591,6 +1594,7 @@@ F:      arch/arm/boot/dts/kirkwood
  F:    arch/arm/configs/mvebu_*_defconfig
  F:    arch/arm/mach-mvebu/
  F:    arch/arm64/boot/dts/marvell/armada*
 +F:    drivers/cpufreq/armada-37xx-cpufreq.c
  F:    drivers/cpufreq/mvebu-cpufreq.c
  F:    drivers/irqchip/irq-armada-370-xp.c
  F:    drivers/irqchip/irq-mvebu-*
  F:    arch/arm/mach-ks8695/
  S:    Odd Fixes
  
 +ARM/Microchip (AT91) SoC support
 +M:    Nicolas Ferre <[email protected]>
 +M:    Alexandre Belloni <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +W:    http://www.linux4sam.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91.git
 +S:    Supported
 +N:    at91
 +N:    atmel
 +F:    arch/arm/mach-at91/
 +F:    include/soc/at91/
 +F:    arch/arm/boot/dts/at91*.dts
 +F:    arch/arm/boot/dts/at91*.dtsi
 +F:    arch/arm/boot/dts/sama*.dts
 +F:    arch/arm/boot/dts/sama*.dtsi
 +F:    arch/arm/include/debug/at91.S
 +F:    drivers/memory/atmel*
 +F:    drivers/watchdog/sama5d4_wdt.c
 +X:    drivers/input/touchscreen/atmel_mxt_ts.c
 +X:    drivers/net/wireless/atmel/
 +
  ARM/MIOA701 MACHINE SUPPORT
  M:    Robert Jarzmik <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -1668,54 -1643,16 +1668,54 @@@ ARM/NEC MOBILEPRO 900/c MACHINE SUPPOR
  M:    Michael Petchkovsky <[email protected]>
  S:    Maintained
  
 -ARM/NOMADIK ARCHITECTURE
 -M:    Alessandro Rubini <[email protected]>
 +ARM/NOMADIK/U300/Ux500 ARCHITECTURES
  M:    Linus Walleij <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-nomadik/
 -F:    drivers/pinctrl/nomadik/
 +F:    arch/arm/mach-u300/
 +F:    arch/arm/mach-ux500/
 +F:    arch/arm/boot/dts/ste-*
 +F:    drivers/clk/clk-nomadik.c
 +F:    drivers/clk/clk-u300.c
 +F:    drivers/clocksource/clksrc-dbx500-prcmu.c
 +F:    drivers/clocksource/timer-u300.c
 +F:    drivers/dma/coh901318*
 +F:    drivers/dma/ste_dma40*
 +F:    drivers/hwspinlock/u8500_hsem.c
  F:    drivers/i2c/busses/i2c-nomadik.c
 +F:    drivers/i2c/busses/i2c-stu300.c
 +F:    drivers/mfd/ab3100*
 +F:    drivers/mfd/ab8500*
 +F:    drivers/mfd/abx500*
 +F:    drivers/mfd/dbx500*
 +F:    drivers/mfd/db8500*
 +F:    drivers/pinctrl/nomadik/
 +F:    drivers/pinctrl/pinctrl-coh901*
 +F:    drivers/pinctrl/pinctrl-u300.c
 +F:    drivers/rtc/rtc-ab3100.c
 +F:    drivers/rtc/rtc-ab8500.c
 +F:    drivers/rtc/rtc-coh901331.c
 +F:    drivers/rtc/rtc-pl031.c
 +F:    drivers/watchdog/coh901327_wdt.c
 +F:    Documentation/devicetree/bindings/arm/ste-*
 +F:    Documentation/devicetree/bindings/arm/ux500/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git
  
 +ARM/NUVOTON NPCM ARCHITECTURE
 +M:    Avi Fishman <[email protected]>
 +M:    Tomer Maimon <[email protected]>
 +R:    Patrick Venture <[email protected]>
 +R:    Nancy Yuen <[email protected]>
 +R:    Brendan Higgins <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Supported
 +F:    arch/arm/mach-npcm/
 +F:    arch/arm/boot/dts/nuvoton-npcm*
 +F:    include/dt-bindings/clock/nuvoton,npcm7xx-clks.h
 +F:    drivers/*/*npcm*
 +F:    Documentation/*/*npcm*
 +
  ARM/NUVOTON W90X900 ARM ARCHITECTURE
  M:    Wan ZongShun <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -1726,7 -1663,7 +1726,7 @@@ F:      drivers/input/keyboard/w90p910_keypa
  F:    drivers/input/touchscreen/w90p910_ts.c
  F:    drivers/watchdog/nuc900_wdt.c
  F:    drivers/net/ethernet/nuvoton/w90p910_ether.c
 -F:    drivers/mtd/nand/nuc900_nand.c
 +F:    drivers/mtd/nand/raw/nuc900_nand.c
  F:    drivers/rtc/rtc-nuc900.c
  F:    drivers/spi/spi-nuc900.c
  F:    drivers/usb/host/ehci-w90x900.c
@@@ -1748,10 -1685,12 +1748,10 @@@ F:   arch/arm/mach-orion5x/ts78xx-
  ARM/OXNAS platform support
  M:    Neil Armstrong <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
 -L:    linux-oxnas@lists.tuxfamily.org (moderated for non-subscribers)
 +L:    linux-oxnas@groups.io (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-oxnas/
 -F:    arch/arm/boot/dts/ox8*.dtsi
 -F:    arch/arm/boot/dts/wd-mbwe.dts
 -F:    arch/arm/boot/dts/cloudengines-pogoplug-series-3.dts
 +F:    arch/arm/boot/dts/ox8*.dts*
  N:    oxnas
  
  ARM/PALM TREO SUPPORT
@@@ -1759,7 -1698,8 +1759,7 @@@ M:      Tomas Cech <[email protected]
  L:    [email protected]
  W:    http://hackndev.com
  S:    Maintained
 -F:    arch/arm/mach-pxa/include/mach/palmtreo.h
 -F:    arch/arm/mach-pxa/palmtreo.c
 +F:    arch/arm/mach-pxa/palmtreo.*
  
  ARM/PALMTX,PALMT5,PALMLD,PALMTE2,PALMTC SUPPORT
  M:    Marek Vasut <[email protected]>
@@@ -1768,10 -1708,12 +1768,10 @@@ W:   http://hackndev.co
  S:    Maintained
  F:    arch/arm/mach-pxa/include/mach/palmtx.h
  F:    arch/arm/mach-pxa/palmtx.c
 -F:    arch/arm/mach-pxa/include/mach/palmt5.h
 -F:    arch/arm/mach-pxa/palmt5.c
 +F:    arch/arm/mach-pxa/palmt5.*
  F:    arch/arm/mach-pxa/include/mach/palmld.h
  F:    arch/arm/mach-pxa/palmld.c
 -F:    arch/arm/mach-pxa/include/mach/palmte2.h
 -F:    arch/arm/mach-pxa/palmte2.c
 +F:    arch/arm/mach-pxa/palmte2.*
  F:    arch/arm/mach-pxa/include/mach/palmtc.h
  F:    arch/arm/mach-pxa/palmtc.c
  
@@@ -1780,7 -1722,8 +1780,7 @@@ M:      Sergey Lapin <[email protected]
  L:    [email protected]
  W:    http://hackndev.com
  S:    Maintained
 -F:    arch/arm/mach-pxa/include/mach/palmz72.h
 -F:    arch/arm/mach-pxa/palmz72.c
 +F:    arch/arm/mach-pxa/palmz72.*
  
  ARM/PLEB SUPPORT
  M:    Peter Chubb <[email protected]>
@@@ -1809,6 -1752,7 +1809,6 @@@ F:      drivers/clk/qcom
  F:    drivers/dma/qcom/
  F:    drivers/soc/qcom/
  F:    drivers/spi/spi-qup.c
 -F:    drivers/tty/serial/msm_serial.h
  F:    drivers/tty/serial/msm_serial.c
  F:    drivers/*/pm8???-*
  F:    drivers/mfd/ssbi.c
@@@ -1879,6 -1823,7 +1879,6 @@@ Q:      https://patchwork.kernel.org/project
  S:    Maintained
  F:    arch/arm/boot/dts/s3c*
  F:    arch/arm/boot/dts/s5p*
 -F:    arch/arm/boot/dts/samsung*
  F:    arch/arm/boot/dts/exynos*
  F:    arch/arm64/boot/dts/exynos/
  F:    arch/arm/plat-samsung/
@@@ -1978,14 -1923,6 +1978,14 @@@ M:    Thor Thayer <[email protected]
  S:    Maintained
  F:    drivers/edac/altera_edac.
  
 +ARM/SPREADTRUM SoC SUPPORT
 +M:    Orson Zhai <[email protected]>
 +M:    Baolin Wang <[email protected]>
 +M:    Chunyan Zhang <[email protected]>
 +S:    Maintained
 +F:    arch/arm64/boot/dts/sprd
 +N:    sprd
 +
  ARM/STI ARCHITECTURE
  M:    Patrice Chotard <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -2022,26 -1959,14 +2022,26 @@@ M:   Maxime Coquelin <mcoquelin.stm32@gma
  M:    Alexandre Torgue <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mcoquelin/stm32.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32-next
  N:    stm32
 +F:    arch/arm/boot/dts/stm32*
 +F:    arch/arm/mach-stm32/
  F:    drivers/clocksource/armv7m_systick.c
  
 +ARM/Synaptics Berlin SoC support
 +M:    Jisheng Zhang <[email protected]>
 +M:    Sebastian Hesselbarth <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    arch/arm/mach-berlin/
 +F:    arch/arm/boot/dts/berlin*
 +F:    arch/arm64/boot/dts/marvell/berlin*
 +
  ARM/TANGO ARCHITECTURE
 -M:    Marc Gonzalez <[email protected]>
 +M:    Marc Gonzalez <[email protected]>
 +M:    Mans Rullgard <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Odd Fixes
  N:    tango
  
  ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT
@@@ -2105,13 -2030,27 +2105,13 @@@ M:   Dmitry Eremin-Solenikov <dbaryshkov@
  M:    Dirk Opfer <[email protected]>
  S:    Maintained
  
 -ARM/U300 MACHINE SUPPORT
 -M:    Linus Walleij <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Supported
 -F:    arch/arm/mach-u300/
 -F:    drivers/clocksource/timer-u300.c
 -F:    drivers/i2c/busses/i2c-stu300.c
 -F:    drivers/rtc/rtc-coh901331.c
 -F:    drivers/watchdog/coh901327_wdt.c
 -F:    drivers/dma/coh901318*
 -F:    drivers/mfd/ab3100*
 -F:    drivers/rtc/rtc-ab3100.c
 -F:    drivers/rtc/rtc-coh901331.c
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git
 -
  ARM/UNIPHIER ARCHITECTURE
  M:    Masahiro Yamada <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier.git
  S:    Maintained
  F:    Documentation/devicetree/bindings/gpio/gpio-uniphier.txt
 +F:    Documentation/devicetree/bindings/pinctrl/socionext,uniphier-pinctrl.txt
  F:    arch/arm/boot/dts/uniphier*
  F:    arch/arm/include/asm/hardware/cache-uniphier.h
  F:    arch/arm/mach-uniphier/
@@@ -2127,6 -2066,24 +2127,6 @@@ F:     drivers/reset/reset-uniphier.
  F:    drivers/tty/serial/8250/8250_uniphier.c
  N:    uniphier
  
 -ARM/Ux500 ARM ARCHITECTURE
 -M:    Linus Walleij <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 -F:    arch/arm/mach-ux500/
 -F:    drivers/clocksource/clksrc-dbx500-prcmu.c
 -F:    drivers/dma/ste_dma40*
 -F:    drivers/hwspinlock/u8500_hsem.c
 -F:    drivers/mfd/abx500*
 -F:    drivers/mfd/ab8500*
 -F:    drivers/mfd/dbx500*
 -F:    drivers/mfd/db8500*
 -F:    drivers/pinctrl/nomadik/pinctrl-ab*
 -F:    drivers/pinctrl/nomadik/pinctrl-nomadik*
 -F:    drivers/rtc/rtc-ab8500.c
 -F:    drivers/rtc/rtc-pl031.c
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git
 -
  ARM/Ux500 CLOCK FRAMEWORK SUPPORT
  M:    Ulf Hansson <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    drivers/leds/leds-as3645a.c
  
 -AS3645A LED FLASH CONTROLLER DRIVER
 -M:    Laurent Pinchart <[email protected]>
 -L:    [email protected]
 -T:    git git://linuxtv.org/media_tree.git
 -S:    Maintained
 -F:    drivers/media/i2c/as3645a.c
 -F:    include/media/i2c/as3645a.h
 -
  ASAHI KASEI AK8974 DRIVER
  M:    Linus Walleij <[email protected]>
  L:    [email protected]
@@@ -2305,9 -2270,7 +2305,9 @@@ F:      include/linux/async_tx.
  AT24 EEPROM DRIVER
  M:    Bartosz Golaszewski <[email protected]>
  L:    [email protected]
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git
  S:    Maintained
 +F:    Documentation/devicetree/bindings/eeprom/at24.txt
  F:    drivers/misc/eeprom/at24.c
  F:    include/linux/platform_data/at24.h
  
@@@ -2428,6 -2391,13 +2428,6 @@@ F:     Documentation/devicetree/bindings/in
  F:    drivers/input/touchscreen/atmel_mxt_ts.c
  F:    include/linux/platform_data/atmel_mxt_ts.h
  
 -ATMEL NAND DRIVER
 -M:    Wenyou Yang <[email protected]>
 -M:    Josh Wu <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -F:    drivers/mtd/nand/atmel/*
 -
  ATMEL SAMA5D2 ADC DRIVER
  M:    Ludovic Desroches <[email protected]>
  L:    [email protected]
@@@ -2509,6 -2479,7 +2509,6 @@@ M:      Paul Moore <[email protected]
  M:    Eric Paris <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  W:    https://github.com/linux-audit
 -W:    https://people.redhat.com/sgrubb/audit
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git
  S:    Supported
  F:    include/linux/audit.h
@@@ -2538,8 -2509,6 +2538,8 @@@ L:      [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/arm/axentia.txt
  F:    arch/arm/boot/dts/at91-linea.dtsi
 +F:    arch/arm/boot/dts/at91-natte.dtsi
 +F:    arch/arm/boot/dts/at91-nattis-2-natte-2.dts
  F:    arch/arm/boot/dts/at91-tse850-3.dts
  
  AXENTIA ASOC DRIVERS
@@@ -2603,7 -2572,6 +2603,7 @@@ S:      Maintaine
  F:    Documentation/ABI/testing/sysfs-class-net-batman-adv
  F:    Documentation/ABI/testing/sysfs-class-net-mesh
  F:    Documentation/networking/batman-adv.rst
 +F:    include/uapi/linux/batadv_packet.h
  F:    include/uapi/linux/batman_adv.h
  F:    net/batman-adv/
  
@@@ -2660,6 -2628,51 +2660,6 @@@ F:     Documentation/filesystems/bfs.tx
  F:    fs/bfs/
  F:    include/uapi/linux/bfs_fs.h
  
 -BLACKFIN ARCHITECTURE
 -L:    [email protected] (moderated for non-subscribers)
 -T:    git git://git.code.sf.net/p/adi-linux/code
 -W:    http://blackfin.uclinux.org
 -S:    Orphan
 -F:    arch/blackfin/
 -
 -BLACKFIN EMAC DRIVER
 -L:    [email protected] (moderated for non-subscribers)
 -W:    http://blackfin.uclinux.org
 -S:    Orphan
 -F:    drivers/net/ethernet/adi/
 -
 -BLACKFIN MEDIA DRIVER
 -L:    [email protected] (moderated for non-subscribers)
 -W:    http://blackfin.uclinux.org/
 -S:    Orphan
 -F:    drivers/media/platform/blackfin/
 -F:    drivers/media/i2c/adv7183*
 -F:    drivers/media/i2c/vs6624*
 -
 -BLACKFIN RTC DRIVER
 -L:    [email protected] (moderated for non-subscribers)
 -W:    http://blackfin.uclinux.org
 -S:    Orphan
 -F:    drivers/rtc/rtc-bfin.c
 -
 -BLACKFIN SDH DRIVER
 -L:    [email protected] (moderated for non-subscribers)
 -W:    http://blackfin.uclinux.org
 -S:    Orphan
 -F:    drivers/mmc/host/bfin_sdh.c
 -
 -BLACKFIN SERIAL DRIVER
 -L:    [email protected] (moderated for non-subscribers)
 -W:    http://blackfin.uclinux.org
 -S:    Orphan
 -F:    drivers/tty/serial/bfin_uart.c
 -
 -BLACKFIN WATCHDOG DRIVER
 -L:    [email protected] (moderated for non-subscribers)
 -W:    http://blackfin.uclinux.org
 -S:    Orphan
 -F:    drivers/watchdog/bfin_wdt.c
 -
  BLINKM RGB LED DRIVER
  M:    Jan-Simon Moeller <[email protected]>
  S:    Maintained
@@@ -2671,7 -2684,6 +2671,7 @@@ L:      [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
  S:    Maintained
  F:    block/
 +F:    drivers/block/
  F:    kernel/trace/blktrace.c
  F:    lib/sbitmap.c
  
@@@ -2683,6 -2695,7 +2683,6 @@@ F:      drivers/mtd/devices/block2mtd.
  
  BLUETOOTH DRIVERS
  M:    Marcel Holtmann <[email protected]>
 -M:    Gustavo Padovan <[email protected]>
  M:    Johan Hedberg <[email protected]>
  L:    [email protected]
  W:    http://www.bluez.org/
@@@ -2693,6 -2706,7 +2693,6 @@@ F:      drivers/bluetooth
  
  BLUETOOTH SUBSYSTEM
  M:    Marcel Holtmann <[email protected]>
 -M:    Gustavo Padovan <[email protected]>
  M:    Johan Hedberg <[email protected]>
  L:    [email protected]
  W:    http://www.bluez.org/
@@@ -2717,16 -2731,12 +2717,16 @@@ M:   Alexei Starovoitov <[email protected]
  M:    Daniel Borkmann <[email protected]>
  L:    [email protected]
  L:    [email protected]
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git
  S:    Supported
  F:    arch/x86/net/bpf_jit*
  F:    Documentation/networking/filter.txt
  F:    Documentation/bpf/
  F:    include/linux/bpf*
  F:    include/linux/filter.h
 +F:    include/trace/events/bpf.h
 +F:    include/trace/events/xdp.h
  F:    include/uapi/linux/bpf*
  F:    include/uapi/linux/filter.h
  F:    kernel/bpf/
@@@ -2830,8 -2840,6 +2830,8 @@@ S:      Maintaine
  F:    arch/arm/mach-bcm/*brcmstb*
  F:    arch/arm/boot/dts/bcm7*.dts*
  F:    drivers/bus/brcmstb_gisb.c
 +F:    arch/arm/mm/cache-b15-rac.c
 +F:    arch/arm/include/asm/hardware/cache-b15-rac.h
  N:    brcmstb
  
  BROADCOM BMIPS CPUFREQ DRIVER
@@@ -3003,7 -3011,7 +3003,7 @@@ M:      Kamal Dasu <[email protected]
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
 -F:    drivers/mtd/nand/brcmnand/
 +F:    drivers/mtd/nand/raw/brcmnand/
  
  BROADCOM STB DPFE DRIVER
  M:    Markus Mayer <[email protected]>
@@@ -3193,7 -3201,7 +3193,7 @@@ W:      https://github.com/linux-ca
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git
  S:    Maintained
 -F:    Documentation/networking/can.txt
 +F:    Documentation/networking/can.rst
  F:    net/can/
  F:    include/linux/can/core.h
  F:    include/uapi/linux/can.h
@@@ -3271,11 -3279,12 +3271,11 @@@ F:   drivers/net/ieee802154/cc2520.
  F:    include/linux/spi/cc2520.h
  F:    Documentation/devicetree/bindings/net/ieee802154/cc2520.txt
  
 -CCREE ARM TRUSTZONE CRYPTOCELL 700 REE DRIVER
 +CCREE ARM TRUSTZONE CRYPTOCELL REE DRIVER
  M:    Gilad Ben-Yossef <[email protected]>
  L:    [email protected]
 -L:    [email protected]
  S:    Supported
 -F:    drivers/staging/ccree/
 +F:    drivers/crypto/ccree/
  W:    https://developer.arm.com/products/system-ip/trustzone-cryptocell/cryptocell-700-family
  
  CEC FRAMEWORK
@@@ -3293,7 -3302,6 +3293,7 @@@ F:      include/media/cec-notifier.
  F:    include/uapi/linux/cec.h
  F:    include/uapi/linux/cec-funcs.h
  F:    Documentation/devicetree/bindings/media/cec.txt
 +F:    Documentation/ABI/testing/debugfs-cec-error-inj
  
  CEC GPIO DRIVER
  M:    Hans Verkuil <[email protected]>
@@@ -3398,8 -3406,8 +3398,8 @@@ M:      Arnd Bergmann <[email protected]
  M:    Greg Kroah-Hartman <[email protected]>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
  S:    Supported
 -F:    drivers/char/*
 -F:    drivers/misc/*
 +F:    drivers/char/
 +F:    drivers/misc/
  F:    include/linux/miscdevice.h
  
  CHECKPATCH
@@@ -3547,7 -3555,7 +3547,7 @@@ F:      drivers/media/platform/coda
  
  COMMON CLK FRAMEWORK
  M:    Michael Turquette <[email protected]>
 -M:    Stephen Boyd <sboyd@codeaurora.org>
 +M:    Stephen Boyd <sboyd@kernel.org>
  L:    [email protected]
  Q:    http://patchwork.kernel.org/project/linux-clk/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git
@@@ -3736,6 -3744,16 +3736,6 @@@ S:     Maintaine
  F:    Documentation/filesystems/cramfs.txt
  F:    fs/cramfs/
  
 -CRIS PORT
 -M:    Mikael Starvik <[email protected]>
 -M:    Jesper Nilsson <[email protected]>
 -L:    [email protected]
 -W:    http://developer.axis.com
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris.git
 -S:    Maintained
 -F:    arch/cris/
 -F:    drivers/tty/serial/crisv10.*
 -
  CRYPTO API
  M:    Herbert Xu <[email protected]>
  M:    "David S. Miller" <[email protected]>
@@@ -4095,10 -4113,10 +4095,10 @@@ DENALI NAND DRIVE
  M:    Masahiro Yamada <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    drivers/mtd/nand/denali*
 +F:    drivers/mtd/nand/raw/denali*
  
  DESIGNWARE USB2 DRD IP DRIVER
 -M:    John Youn <johnyoun@synopsys.com>
 +M:    Minas Harutyunyan <hminas@synopsys.com>
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
  S:    Maintained
@@@ -4115,7 -4133,6 +4115,7 @@@ DEVANTECH SRF ULTRASONIC RANGER IIO DRI
  M:    Andreas Klinger <[email protected]>
  L:    [email protected]
  S:    Maintained
 +F:    Documentation/ABI/testing/sysfs-bus-iio-distance-srf08
  F:    drivers/iio/proximity/srf*.c
  
  DEVICE COREDUMP (DEV_COREDUMP)
@@@ -4312,7 -4329,6 +4312,7 @@@ Q:      https://patchwork.kernel.org/project
  S:    Maintained
  F:    drivers/dma/
  F:    include/linux/dmaengine.h
 +F:    include/linux/of_dma.h
  F:    Documentation/devicetree/bindings/dma/
  F:    Documentation/driver-api/dmaengine/
  T:    git git://git.infradead.org/users/vkoul/slave-dma.git
@@@ -4326,12 -4342,10 +4326,12 @@@ T:   git git://git.infradead.org/users/hc
  W:    http://git.infradead.org/users/hch/dma-mapping.git
  S:    Supported
  F:    lib/dma-debug.c
 -F:    lib/dma-noop.c
 +F:    lib/dma-direct.c
  F:    lib/dma-virt.c
  F:    drivers/base/dma-mapping.c
  F:    drivers/base/dma-coherent.c
 +F:    include/asm-generic/dma-mapping.h
 +F:    include/linux/dma-direct.h
  F:    include/linux/dma-mapping.h
  
  DME1737 HARDWARE MONITOR DRIVER
  S:    Maintained
  F:    drivers/staging/fsl-dpaa2/ethernet
  
 +DPAA2 ETHERNET SWITCH DRIVER
 +M:    Razvan Stefanescu <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/staging/fsl-dpaa2/ethsw
 +
  DPT_I2O SCSI RAID DRIVER
 -M:    Adaptec OEM Raid Solutions <aacraid@adaptec.com>
 +M:    Adaptec OEM Raid Solutions <aacraid@microsemi.com>
  L:    [email protected]
  W:    http://www.adaptec.com/
  S:    Maintained
@@@ -4442,13 -4450,6 +4442,13 @@@ T:    git git://anongit.freedesktop.org/dr
  S:    Supported
  F:    drivers/gpu/drm/pl111/
  
 +DRM DRIVER FOR ARM VERSATILE TFT PANELS
 +M:    Linus Walleij <[email protected]>
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +S:    Maintained
 +F:    drivers/gpu/drm/panel/panel-arm-versatile.c
 +F:    Documentation/devicetree/bindings/display/panel/arm,versatile-tft-panel.txt
 +
  DRM DRIVER FOR AST SERVER GRAPHICS CHIPS
  M:    Dave Airlie <[email protected]>
  S:    Odd Fixes
@@@ -4467,12 -4468,6 +4467,12 @@@ T:    git git://anongit.freedesktop.org/dr
  S:    Maintained
  F:    drivers/gpu/drm/tve200/
  
 +DRM DRIVER FOR ILITEK ILI9225 PANELS
 +M:    David Lechner <[email protected]>
 +S:    Maintained
 +F:    drivers/gpu/drm/tinydrm/ili9225.c
 +F:    Documentation/devicetree/bindings/display/ili9225.txt
 +
  DRM DRIVER FOR INTEL I810 VIDEO CARDS
  S:    Orphan / Obsolete
  F:    drivers/gpu/drm/i810/
@@@ -4559,12 -4554,6 +4559,12 @@@ S:    Maintaine
  F:    drivers/gpu/drm/tinydrm/st7586.c
  F:    Documentation/devicetree/bindings/display/st7586.txt
  
 +DRM DRIVER FOR SITRONIX ST7735R PANELS
 +M:    David Lechner <[email protected]>
 +S:    Maintained
 +F:    drivers/gpu/drm/tinydrm/st7735r.c
 +F:    Documentation/devicetree/bindings/display/st7735r.txt
 +
  DRM DRIVER FOR TDFX VIDEO CARDS
  S:    Orphan / Obsolete
  F:    drivers/gpu/drm/tdfx/
@@@ -4603,8 -4592,8 +4603,8 @@@ F:      include/uapi/drm
  F:    include/linux/vga*
  
  DRM DRIVERS AND MISC GPU PATCHES
 -M:    Daniel Vetter <[email protected]>
 -M:    Jani Nikula <jani.nikula@linux.intel.com>
 +M:    Gustavo Padovan <[email protected]>
 +M:    Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
  M:    Sean Paul <[email protected]>
  W:    https://01.org/linuxgraphics/gfx-docs/maintainer-tools/drm-misc.html
  S:    Maintained
@@@ -4617,7 -4606,7 +4617,7 @@@ F:      include/uapi/drm/drm
  F:    include/linux/vga*
  
  DRM DRIVERS FOR ALLWINNER A10
 -M:    Maxime Ripard  <maxime.ripard@free-electrons.com>
 +M:    Maxime Ripard  <maxime.ripard@bootlin.com>
  L:    [email protected]
  S:    Supported
  F:    drivers/gpu/drm/sun4i/
@@@ -4637,7 -4626,7 +4637,7 @@@ F:      Documentation/gpu/meson.rs
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  
  DRM DRIVERS FOR ATMEL HLCDC
 -M:    Boris Brezillon <boris.brezillon@free-electrons.com>
 +M:    Boris Brezillon <boris.brezillon@bootlin.com>
  L:    [email protected]
  S:    Supported
  F:    drivers/gpu/drm/atmel-hlcdc/
@@@ -4730,12 -4719,10 +4730,12 @@@ F:   drivers/gpu/drm/rcar-du
  F:    drivers/gpu/drm/shmobile/
  F:    include/linux/platform_data/shmob_drm.h
  F:    Documentation/devicetree/bindings/display/bridge/renesas,dw-hdmi.txt
 +F:    Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt
  F:    Documentation/devicetree/bindings/display/renesas,du.txt
  
  DRM DRIVERS FOR ROCKCHIP
 -M:    Mark Yao <[email protected]>
 +M:    Sandy Huang <[email protected]>
 +M:    Heiko Stübner <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/gpu/drm/rockchip/
@@@ -4823,15 -4810,6 +4823,15 @@@ S:    Maintaine
  F:    drivers/gpu/drm/tinydrm/
  F:    include/drm/tinydrm/
  
 +DRM TTM SUBSYSTEM
 +M:    Christian Koenig <[email protected]>
 +M:    Roger He <[email protected]>
 +T:    git git://people.freedesktop.org/~agd5f/linux
 +S:    Maintained
 +L:    [email protected]
 +F:    include/drm/ttm/
 +F:    drivers/gpu/drm/ttm/
 +
  DSBR100 USB FM RADIO DRIVER
  M:    Alexey Klimov <[email protected]>
  L:    [email protected]
@@@ -4969,11 -4947,6 +4969,11 @@@ S:    Maintaine
  F:    lib/dynamic_debug.c
  F:    include/linux/dynamic_debug.h
  
 +DYNAMIC INTERRUPT MODERATION
 +M:    Tal Gilboa <[email protected]>
 +S:    Maintained
 +F:    include/linux/net_dim.h
 +
  DZ DECSTATION DZ11 SERIAL DRIVER
  M:    "Maciej W. Rozycki" <[email protected]>
  S:    Maintained
@@@ -4997,6 -4970,12 +4997,6 @@@ T:     git git://linuxtv.org/anttip/media_t
  S:    Maintained
  F:    drivers/media/tuners/e4000*
  
 -EATA ISA/EISA/PCI SCSI DRIVER
 -M:    Dario Ballabio <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/scsi/eata.c
 -
  EC100 MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/edac/skx_edac.c
  
 +EDAC-TI
 +M:    Tero Kristo <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/edac/ti_edac.c
 +
  EDIROL UA-101/UA-1000 DRIVER
  M:    Clemens Ladisch <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -5538,7 -5511,7 +5538,7 @@@ M:      Luis R. Rodriguez <[email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/firmware_class/
 -F:    drivers/base/firmware*.c
 +F:    drivers/base/firmware_loader/
  F:    include/linux/firmware.h
  
  FLASH ADAPTER DRIVER (IBM Flash Adapter 900GB Full Height PCI Flash Card)
@@@ -5623,7 -5596,7 +5623,7 @@@ S:      Maintaine
  F:    drivers/dma/fsldma.*
  
  FREESCALE eTSEC ETHERNET DRIVER (GIANFAR)
 -M:    Claudiu Manoil <claudiu.manoil@freescale.com>
 +M:    Claudiu Manoil <claudiu.manoil@nxp.com>
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/ethernet/freescale/gianfar*
@@@ -5634,7 -5607,7 +5634,7 @@@ FREESCALE GPMI NAND DRIVE
  M:    Han Xu <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/mtd/nand/gpmi-nand/*
 +F:    drivers/mtd/nand/raw/gpmi-nand/*
  
  FREESCALE I2C CPM DRIVER
  M:    Jochen Friedrich <[email protected]>
@@@ -5785,6 -5758,10 +5785,6 @@@ F:     fs/crypto
  F:    include/linux/fscrypt*.h
  F:    Documentation/filesystems/fscrypt.rst
  
 -FUJITSU FR-V (FRV) PORT
 -S:    Orphan
 -F:    arch/frv/
 -
  FUJITSU LAPTOP EXTRAS
  M:    Jonathan Woithe <[email protected]>
  L:    [email protected]
@@@ -5832,6 -5809,12 +5832,6 @@@ F:     tools/testing/selftests/futex
  F:    tools/perf/bench/futex*
  F:    Documentation/*futex*
  
 -FUTURE DOMAIN TMC-16x0 SCSI DRIVER (16-bit)
 -M:    Rik Faith <[email protected]>
 -L:    [email protected]
 -S:    Odd Fixes (e.g., new signatures)
 -F:    drivers/scsi/fdomain.*
 -
  GCC PLUGINS
  M:    Kees Cook <[email protected]>
  R:    Emese Revfy <[email protected]>
@@@ -5843,7 -5826,7 +5843,7 @@@ F:      scripts/Makefile.gcc-plugin
  F:    Documentation/gcc-plugins.txt
  
  GCOV BASED KERNEL PROFILING
 -M:    Peter Oberparleiter <oberpar@linux.vnet.ibm.com>
 +M:    Peter Oberparleiter <[email protected]>
  S:    Maintained
  F:    kernel/gcov/
  F:    Documentation/dev-tools/gcov.rst
@@@ -5911,11 -5894,6 +5911,11 @@@ S:    Supporte
  F:    drivers/phy/
  F:    include/linux/phy/
  
 +GENERIC PINCTRL I2C DEMULTIPLEXER DRIVER
 +M:    Wolfram Sang <[email protected]>
 +S:    Supported
 +F:    drivers/i2c/muxes/i2c-demux-pinctrl.c
 +
  GENERIC PM DOMAINS
  M:    "Rafael J. Wysocki" <[email protected]>
  M:    Kevin Hilman <[email protected]>
  S:    Maintained
  F:    drivers/input/touchscreen/goodix.c
  
 +GPD POCKET FAN DRIVER
 +M:    Hans de Goede <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/platform/x86/gpd-pocket-fan.c
 +
  GPIO ACPI SUPPORT
  M:    Mika Westerberg <[email protected]>
  M:    Andy Shevchenko <[email protected]>
@@@ -5997,8 -5969,7 +5997,8 @@@ S:      Maintaine
  F:    drivers/media/rc/gpio-ir-tx.c
  
  GPIO MOCKUP DRIVER
 -M:    Bamvor Jian Zhang <[email protected]>
 +M:    Bamvor Jian Zhang <[email protected]>
 +R:    Bartosz Golaszewski <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/gpio/gpio-mockup.c
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git
  S:    Maintained
  F:    Documentation/devicetree/bindings/gpio/
 +F:    Documentation/driver-api/gpio/
  F:    Documentation/gpio/
  F:    Documentation/ABI/testing/gpio-cdev
  F:    Documentation/ABI/obsolete/sysfs-gpio
  F:    drivers/gpio/
  F:    include/linux/gpio/
  F:    include/linux/gpio.h
 +F:    include/linux/of_gpio.h
  F:    include/asm-generic/gpio.h
  F:    include/uapi/linux/gpio.h
  F:    tools/gpio/
@@@ -6227,11 -6196,6 +6227,11 @@@ F:    Documentation/hw_random.tx
  F:    drivers/char/hw_random/
  F:    include/linux/hw_random.h
  
 +HARDWARE TRACING FACILITIES
 +M:    Alexander Shishkin <[email protected]>
 +S:    Maintained
 +F:    drivers/hwtracing/
 +
  HARDWARE SPINLOCK CORE
  M:    Ohad Ben-Cohen <[email protected]>
  M:    Bjorn Andersson <[email protected]>
@@@ -6376,13 -6340,6 +6376,13 @@@ W:    http://www.hisilicon.co
  S:    Maintained
  F:    drivers/net/ethernet/hisilicon/hns3/
  
 +HISILICON LPC BUS DRIVER
 +M:    [email protected]
 +W:    http://www.hisilicon.com
 +S:    Maintained
 +F:    drivers/bus/hisi_lpc.c
 +F:    Documentation/devicetree/bindings/arm/hisilicon/hisilicon-low-pin-count.txt
 +
  HISILICON NETWORK SUBSYSTEM DRIVER
  M:    Yisen Zhuang <[email protected]>
  M:    Salil Mehta <[email protected]>
@@@ -6420,7 -6377,6 +6420,7 @@@ L:      [email protected]
  S:    Maintained
  F:    mm/hmm*
  F:    include/linux/hmm*
 +F:    Documentation/vm/hmm.txt
  
  HOST AP DRIVER
  M:    Jouni Malinen <[email protected]>
@@@ -6527,7 -6483,7 +6527,7 @@@ S:      Maintaine
  F:    Documentation/networking/netvsc.txt
  F:    arch/x86/include/asm/mshyperv.h
  F:    arch/x86/include/asm/trace/hyperv.h
 -F:    arch/x86/include/uapi/asm/hyperv.h
 +F:    arch/x86/include/asm/hyperv-tlfs.h
  F:    arch/x86/kernel/cpu/mshyperv.c
  F:    arch/x86/hyperv
  F:    drivers/hid/hid-hyperv.c
@@@ -6569,12 -6525,6 +6569,12 @@@ F:    drivers/i2c/i2c-mux.
  F:    drivers/i2c/muxes/
  F:    include/linux/i2c-mux.h
  
 +I2C MV64XXX MARVELL AND ALLWINNER DRIVER
 +M:    Gregory CLEMENT <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/i2c/busses/i2c-mv64xxx.c
 +
  I2C OVER PARALLEL PORT
  M:    Jean Delvare <[email protected]>
  L:    [email protected]
@@@ -6591,25 -6541,15 +6591,25 @@@ W:   https://i2c.wiki.kernel.org
  Q:    https://patchwork.ozlabs.org/project/linux-i2c/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git
  S:    Maintained
 -F:    Documentation/devicetree/bindings/i2c/
 +F:    Documentation/devicetree/bindings/i2c/i2c.txt
  F:    Documentation/i2c/
 -F:    drivers/i2c/
 -F:    drivers/i2c/*/
 +F:    drivers/i2c/*
  F:    include/linux/i2c.h
 -F:    include/linux/i2c-*.h
 +F:    include/linux/i2c-dev.h
 +F:    include/linux/i2c-smbus.h
  F:    include/uapi/linux/i2c.h
  F:    include/uapi/linux/i2c-*.h
  
 +I2C SUBSYSTEM HOST DRIVERS
 +L:    [email protected]
 +W:    https://i2c.wiki.kernel.org/
 +Q:    https://patchwork.ozlabs.org/project/linux-i2c/list/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git
 +S:    Odd Fixes
 +F:    Documentation/devicetree/bindings/i2c/
 +F:    drivers/i2c/algos/
 +F:    drivers/i2c/busses/
 +
  I2C-TAOS-EVM DRIVER
  M:    Jean Delvare <[email protected]>
  L:    [email protected]
@@@ -6884,8 -6824,6 +6884,8 @@@ R:      Peter Meerwald-Stadler <pmeerw@pmeer
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git
  S:    Maintained
 +F:    Documentation/ABI/testing/configfs-iio*
 +F:    Documentation/ABI/testing/sysfs-bus-iio*
  F:    Documentation/devicetree/bindings/iio/
  F:    drivers/iio/
  F:    drivers/staging/iio/
@@@ -6909,13 -6847,6 +6909,13 @@@ M:    James Hogan <[email protected]
  S:    Maintained
  F:    drivers/media/rc/img-ir/
  
 +IMON SOUNDGRAPH USB IR RECEIVER
 +M:    Sean Young <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/media/rc/imon_raw.c
 +F:    drivers/media/rc/imon.c
 +
  IMS TWINTURBO FRAMEBUFFER DRIVER
  L:    [email protected]
  S:    Orphan
@@@ -6950,9 -6881,9 +6950,9 @@@ INFINIBAND SUBSYSTE
  M:    Doug Ledford <[email protected]>
  M:    Jason Gunthorpe <[email protected]>
  L:    [email protected]
 -W:    http://www.openfabrics.org/
 +W:    https://github.com/linux-rdma/rdma-core
  Q:    http://patchwork.kernel.org/project/linux-rdma/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git
  S:    Supported
  F:    Documentation/devicetree/bindings/infiniband/
  F:    Documentation/infiniband/
@@@ -6970,7 -6901,7 +6970,7 @@@ INGENIC JZ4780 NAND DRIVE
  M:    Harvey Hunt <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/mtd/nand/jz4780_*
 +F:    drivers/mtd/nand/raw/jz4780_*
  
  INOTIFY
  M:    Jan Kara <[email protected]>
@@@ -7005,7 -6936,7 +7005,7 @@@ F:      drivers/input/input-mt.
  K:    \b(ABS|SYN)_MT_
  
  INSIDE SECURE CRYPTO DRIVER
 -M:    Antoine Tenart <antoine.tenart@free-electrons.com>
 +M:    Antoine Tenart <antoine.tenart@bootlin.com>
  F:    drivers/crypto/inside-secure/
  S:    Maintained
  L:    [email protected]
@@@ -7076,7 -7007,6 +7076,7 @@@ F:      Documentation/networking/ixgbe.tx
  F:    Documentation/networking/ixgbevf.txt
  F:    Documentation/networking/i40e.txt
  F:    Documentation/networking/i40evf.txt
 +F:    Documentation/networking/ice.txt
  F:    drivers/net/ethernet/intel/
  F:    drivers/net/ethernet/intel/*/
  F:    include/linux/avf/virtchnl.h
@@@ -7094,7 -7024,7 +7094,7 @@@ M:      Zhi Wang <[email protected]
  L:    [email protected]
  L:    [email protected]
  W:    https://01.org/igvt-g
 -T:    git https://github.com/01org/gvt-linux.git
 +T:    git https://github.com/intel/gvt-linux.git
  S:    Supported
  F:    drivers/gpu/drm/i915/gvt/
  
@@@ -7141,14 -7071,6 +7141,14 @@@ R:    Dan Williams <[email protected]
  S:    Odd fixes
  F:    drivers/dma/iop-adma.c
  
 +INTEL IPU3 CSI-2 CIO2 DRIVER
 +M:    Yong Zhi <[email protected]>
 +M:    Sakari Ailus <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/media/pci/intel/ipu3/
 +F:    Documentation/media/uapi/v4l/pixfmt-srggb10-ipu3.rst
 +
  INTEL IXP4XX QMGR, NPE, ETHERNET and HSS SUPPORT
  M:    Krzysztof Halasa <[email protected]>
  S:    Maintained
@@@ -7242,15 -7164,6 +7242,15 @@@ M:    Shiraz Saleem <[email protected]
  L:    [email protected]
  S:    Supported
  F:    drivers/infiniband/hw/i40iw/
 +F:    include/uapi/rdma/i40iw-abi.h
 +
 +INTEL SHA MULTIBUFFER DRIVER
 +M:    Megha Dey <[email protected]>
 +R:    Tim Chen <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    arch/x86/crypto/sha*-mb
 +F:    crypto/mcryptd.c
  
  INTEL TELEMETRY DRIVER
  M:    Souvik Kumar Chakravarty <[email protected]>
@@@ -7346,7 -7259,6 +7346,7 @@@ S:      Maintaine
  F:    Documentation/devicetree/bindings/iommu/
  F:    drivers/iommu/
  F:    include/linux/iommu.h
 +F:    include/linux/of_iommu.h
  F:    include/linux/iova.h
  
  IP MASQUERADING
@@@ -7365,7 -7277,7 +7365,7 @@@ F:      include/linux/ipmi
  F:    include/uapi/linux/ipmi*
  
  IPS SCSI RAID DRIVER
 -M:    Adaptec OEM Raid Solutions <aacraid@adaptec.com>
 +M:    Adaptec OEM Raid Solutions <aacraid@microsemi.com>
  L:    [email protected]
  W:    http://www.adaptec.com/
  S:    Maintained
@@@ -7393,16 -7305,17 +7393,16 @@@ F:   drivers/tty/ipwireless
  
  IPX NETWORK LAYER
  L:    [email protected]
 -S:    Odd fixes
 -F:    include/net/ipx.h
 +S:    Obsolete
  F:    include/uapi/linux/ipx.h
 -F:    net/ipx/
 +F:    drivers/staging/ipx/
  
  IRDA SUBSYSTEM
  M:    Samuel Ortiz <[email protected]>
  L:    [email protected] (subscribers-only)
  L:    [email protected]
  W:    http://irda.sourceforge.net/
 -S:    Maintained
 +S:    Obsolete
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/irda-2.6.git
  F:    Documentation/networking/irda.txt
  F:    drivers/staging/irda/
@@@ -7547,13 -7460,6 +7547,13 @@@ Q:    http://patchwork.linuxtv.org/project
  S:    Maintained
  F:    drivers/media/dvb-frontends/ix2505v*
  
 +JAILHOUSE HYPERVISOR INTERFACE
 +M:    Jan Kiszka <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    arch/x86/kernel/jailhouse.c
 +F:    arch/x86/include/asm/jailhouse_para.h
 +
  JC42.4 TEMPERATURE SENSOR DRIVER
  M:    Guenter Roeck <[email protected]>
  L:    [email protected]
@@@ -7633,10 -7539,8 +7633,10 @@@ F:    mm/kasan
  F:    scripts/Makefile.kasan
  
  KCONFIG
 +M:    Masahiro Yamada <[email protected]>
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kconfig
  L:    [email protected]
 -S:    Orphan
 +S:    Maintained
  F:    Documentation/kbuild/kconfig-language.txt
  F:    scripts/kconfig/
  
@@@ -7783,9 -7687,7 +7783,9 @@@ F:      arch/powerpc/kernel/kvm
  
  KERNEL VIRTUAL MACHINE for s390 (KVM/s390)
  M:    Christian Borntraeger <[email protected]>
 -M:    Cornelia Huck <[email protected]>
 +M:    Janosch Frank <[email protected]>
 +R:    David Hildenbrand <[email protected]>
 +R:    Cornelia Huck <[email protected]>
  L:    [email protected]
  W:    http://www.ibm.com/developerworks/linux/linux390/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git
@@@ -7837,7 -7739,6 +7837,7 @@@ F:      include/keys/encrypted-type.
  F:    security/keys/encrypted-keys/
  
  KEYS-TRUSTED
 +M:    James Bottomley <[email protected]>
  M:    Mimi Zohar <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -7940,13 -7841,11 +7940,13 @@@ F:   drivers/scsi/53c700
  
  LEAKING_ADDRESSES
  M:    Tobin C. Harding <[email protected]>
 +M:    Tycho Andersen <[email protected]>
 +L:    [email protected]
  S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tobin/leaks.git
  F:    scripts/leaking_addresses.pl
  
  LED SUBSYSTEM
 -M:    Richard Purdie <[email protected]>
  M:    Jacek Anaszewski <[email protected]>
  M:    Pavel Machek <[email protected]>
  L:    [email protected]
@@@ -8069,14 -7968,6 +8069,14 @@@ Q:    https://patchwork.kernel.org/project
  S:    Supported
  F:    drivers/nvdimm/pmem*
  
 +LIBNVDIMM: DEVICETREE BINDINGS
 +M:    Oliver O'Halloran <[email protected]>
 +L:    [email protected]
 +Q:    https://patchwork.kernel.org/project/linux-nvdimm/list/
 +S:    Supported
 +F:    drivers/nvdimm/of_pmem.c
 +F:    Documentation/devicetree/bindings/pmem/pmem-region.txt
 +
  LIBNVDIMM: NON-VOLATILE MEMORY DEVICE SUBSYSTEM
  M:    Dan Williams <[email protected]>
  L:    [email protected]
@@@ -8191,27 -8082,9 +8191,27 @@@ F:    drivers/*/*/*pasemi
  LINUX KERNEL DUMP TEST MODULE (LKDTM)
  M:    Kees Cook <[email protected]>
  S:    Maintained
 -F:    drivers/misc/lkdtm*
 +F:    drivers/misc/lkdtm/*
  
 -LINUX SECURITY MODULE (LSM) FRAMEWORK
 +LINUX KERNEL MEMORY CONSISTENCY MODEL (LKMM)
 +M:    Alan Stern <[email protected]>
 +M:    Andrea Parri <[email protected]>
 +M:    Will Deacon <[email protected]>
 +M:    Peter Zijlstra <[email protected]>
 +M:    Boqun Feng <[email protected]>
 +M:    Nicholas Piggin <[email protected]>
 +M:    David Howells <[email protected]>
 +M:    Jade Alglave <[email protected]>
 +M:    Luc Maranget <[email protected]>
 +M:    "Paul E. McKenney" <[email protected]>
 +R:    Akira Yokosawa <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
 +F:    tools/memory-model/
 +F:    Documentation/memory-barriers.txt
 +
 +LINUX SECURITY MODULE (LSM) FRAMEWORK
  M:    Chris Wright <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -8317,7 -8190,6 +8317,7 @@@ F:      arch/*/include/asm/rwsem.
  F:    include/linux/seqlock.h
  F:    lib/locking*.[ch]
  F:    kernel/locking/
 +X:    kernel/locking/locktorture.c
  
  LOGICAL DISK MANAGER SUPPORT (LDM, Windows 2000/XP/Vista Dynamic Disks)
  M:    "Richard Russon (FlatCap)" <[email protected]>
@@@ -8372,6 -8244,11 +8372,6 @@@ W:     http://linux-test-project.github.io
  T:    git git://github.com/linux-test-project/ltp.git
  S:    Maintained
  
 -M32R ARCHITECTURE
 -W:    http://www.linux-m32r.org/
 -S:    Orphan
 -F:    arch/m32r/
 -
  M68K ARCHITECTURE
  M:    Geert Uytterhoeven <[email protected]>
  L:    [email protected]
@@@ -8470,7 -8347,7 +8470,7 @@@ F:      include/uapi/drm/armada_drm.
  F:    Documentation/devicetree/bindings/display/armada/
  
  MARVELL CRYPTO DRIVER
 -M:    Boris Brezillon <boris.brezillon@free-electrons.com>
 +M:    Boris Brezillon <boris.brezillon@bootlin.com>
  M:    Arnaud Ebalard <[email protected]>
  F:    drivers/crypto/marvell/
  S:    Maintained
@@@ -8489,7 -8366,7 +8489,7 @@@ S:      Orpha
  F:    drivers/net/wireless/marvell/libertas/
  
  MARVELL MACCHIATOBIN SUPPORT
 -M:    Russell King <rmk@armlinux.org.uk>
 +M:    Russell King <linux@armlinux.org.uk>
  L:    [email protected]
  S:    Maintained
  F:    arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts
@@@ -8502,7 -8379,7 +8502,7 @@@ F:      drivers/net/ethernet/marvell/mv643xx
  F:    include/linux/mv643xx.h
  
  MARVELL MV88X3310 PHY DRIVER
 -M:    Russell King <rmk@armlinux.org.uk>
 +M:    Russell King <linux@armlinux.org.uk>
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/phy/marvell10g.c
  S:    Odd Fixes
  F:    drivers/net/wireless/marvell/mwl8k.c
  
 +MARVELL NAND CONTROLLER DRIVER
 +M:    Miquel Raynal <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/mtd/nand/raw/marvell_nand.c
 +F:    Documentation/devicetree/bindings/mtd/marvell-nand.txt
 +
  MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER
  M:    Nicolas Pitre <[email protected]>
  S:    Odd Fixes
@@@ -8644,23 -8514,13 +8644,23 @@@ W:   https://linuxtv.or
  S:    Maintained
  F:    drivers/media/radio/radio-maxiradio*
  
 -MCP4531 MICROCHIP DIGITAL POTENTIOMETER DRIVER
 +MCP4018 AND MCP4531 MICROCHIP DIGITAL POTENTIOMETER DRIVERS
  M:    Peter Rosin <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/ABI/testing/sysfs-bus-iio-potentiometer-mcp4531
 +F:    drivers/iio/potentiometer/mcp4018.c
  F:    drivers/iio/potentiometer/mcp4531.c
  
 +MCR20A IEEE-802.15.4 RADIO DRIVER
 +M:    Xue Liu <[email protected]>
 +L:    [email protected]
 +W:    https://github.com/xueliu/mcr20a-linux
 +S:    Maintained
 +F:    drivers/net/ieee802154/mcr20a.c
 +F:    drivers/net/ieee802154/mcr20a.h
 +F:    Documentation/devicetree/bindings/net/ieee802154/mcr20a.txt
 +
  MEASUREMENT COMPUTING CIO-DAC IIO DRIVER
  M:    William Breathitt Gray <[email protected]>
  L:    [email protected]
@@@ -8677,14 -8537,6 +8677,14 @@@ T:    git git://linuxtv.org/media_tree.gi
  S:    Supported
  F:    drivers/media/dvb-frontends/ascot2e*
  
 +MEDIA DRIVERS FOR CXD2099AR CI CONTROLLERS
 +M:    Jasmin Jessich <[email protected]>
 +L:    [email protected]
 +W:    https://linuxtv.org
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/dvb-frontends/cxd2099*
 +
  MEDIA DRIVERS FOR CXD2841ER
  M:    Sergey Kozlov <[email protected]>
  M:    Abylay Ospan <[email protected]>
@@@ -8695,15 -8547,6 +8695,15 @@@ T:    git git://linuxtv.org/media_tree.gi
  S:    Supported
  F:    drivers/media/dvb-frontends/cxd2841er*
  
 +MEDIA DRIVERS FOR CXD2880
 +M:    Yasunari Takiguchi <[email protected]>
 +L:    [email protected]
 +W:    http://linuxtv.org/
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Supported
 +F:    drivers/media/dvb-frontends/cxd2880/*
 +F:    drivers/media/spi/cxd2880*
 +
  MEDIA DRIVERS FOR DIGITAL DEVICES PCIE DEVICES
  M:    Daniel Scheller <[email protected]>
  L:    [email protected]
@@@ -8771,16 -8614,6 +8771,16 @@@ T:    git git://linuxtv.org/media_tree.gi
  S:    Supported
  F:    drivers/media/pci/netup_unidvb/*
  
 +MEDIA DRIVERS FOR RENESAS - CEU
 +M:    Jacopo Mondi <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Supported
 +F:    Documentation/devicetree/bindings/media/renesas,ceu.txt
 +F:    drivers/media/platform/renesas-ceu.c
 +F:    include/media/drv-intf/renesas-ceu.h
 +
  MEDIA DRIVERS FOR RENESAS - DRIF
  M:    Ramesh Shanmugasundaram <[email protected]>
  L:    [email protected]
@@@ -8843,15 -8676,6 +8843,15 @@@ T:    git git://linuxtv.org/media_tree.gi
  S:    Maintained
  F:    drivers/media/dvb-frontends/stv6111*
  
 +MEDIA DRIVERS FOR NVIDIA TEGRA - VDE
 +M:    Dmitry Osipenko <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/media/nvidia,tegra-vde.txt
 +F:    drivers/staging/media/tegra-vde/
 +
  MEDIA INPUT INFRASTRUCTURE (V4L/DVB)
  M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
@@@ -8880,15 -8704,6 +8880,15 @@@ M:    Sean Wang <[email protected]
  S:    Maintained
  F:    drivers/media/rc/mtk-cir.c
  
 +MEDIATEK DMA DRIVER
 +M:    Sean Wang <[email protected]>
 +L:    [email protected]
 +L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/dma/mtk-*
 +F:    drivers/dma/mediatek/
 +
  MEDIATEK PMIC LED DRIVER
  M:    Sean Wang <[email protected]>
  S:    Maintained
  S:    Maintained
  F:    drivers/net/ethernet/mediatek/
  
 +MEDIATEK SWITCH DRIVER
 +M:    Sean Wang <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/net/dsa/mt7530.*
 +F:    net/dsa/tag_mtk.c
 +
  MEDIATEK JPEG DRIVER
  M:    Rick Chang <[email protected]>
  M:    Bin Liu <[email protected]>
@@@ -8982,13 -8790,6 +8982,13 @@@ W:    http://www.melexis.co
  S:    Supported
  F:    drivers/iio/temperature/mlx90614.c
  
 +MELEXIS MLX90632 DRIVER
 +M:    Crt Mori <[email protected]>
 +L:    [email protected]
 +W:    http://www.melexis.com
 +S:    Supported
 +F:    drivers/iio/temperature/mlx90632.c
 +
  MELFAS MIP4 TOUCHSCREEN DRIVER
  M:    Sangwon Jee <[email protected]>
  W:    http://www.melfas.com
@@@ -9049,13 -8850,12 +9049,13 @@@ W:   http://www.mellanox.co
  Q:    http://patchwork.ozlabs.org/project/netdev/list/
  F:    drivers/net/ethernet/mellanox/mlxfw/
  
 -MELLANOX MLX CPLD HOTPLUG DRIVER
 +MELLANOX HARDWARE PLATFORM SUPPORT
 +M:    Andy Shevchenko <[email protected]>
 +M:    Darren Hart <[email protected]>
  M:    Vadim Pasternak <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    drivers/platform/x86/mlxcpld-hotplug.c
 -F:    include/linux/platform_data/mlxcpld-hotplug.h
 +F:    drivers/platform/mellanox/
  
  MELLANOX MLX4 core VPI driver
  M:    Tariq Toukan <[email protected]>
@@@ -9114,7 -8914,6 +9114,7 @@@ M:      Vadim Pasternak <[email protected]
  L:    [email protected]
  S:    Supported
  F:    drivers/leds/leds-mlxcpld.c
 +F:    drivers/leds/leds-mlxreg.c
  F:    Documentation/leds/leds-mlxcpld.txt
  
  MELLANOX PLATFORM DRIVER
@@@ -9130,7 -8929,6 +9130,7 @@@ L:      [email protected]
  S:    Supported
  F:    kernel/sched/membarrier.c
  F:    include/uapi/linux/membarrier.h
 +F:    arch/powerpc/include/asm/membarrier.h
  
  MEMORY MANAGEMENT
  L:    [email protected]
@@@ -9146,14 -8944,15 +9146,14 @@@ F:   mm
  MEMORY TECHNOLOGY DEVICES (MTD)
  M:    David Woodhouse <[email protected]>
  M:    Brian Norris <[email protected]>
 -M:    Boris Brezillon <boris.brezillon@free-electrons.com>
 +M:    Boris Brezillon <boris.brezillon@bootlin.com>
  M:    Marek Vasut <[email protected]>
  M:    Richard Weinberger <[email protected]>
 -M:    Cyrille Pitchen <[email protected]>
  L:    [email protected]
  W:    http://www.linux-mtd.infradead.org/
  Q:    http://patchwork.ozlabs.org/project/linux-mtd/list/
  T:    git git://git.infradead.org/linux-mtd.git master
 -T:    git git://git.infradead.org/l2-mtd.git master
 +T:    git git://git.infradead.org/linux-mtd.git mtd/next
  S:    Maintained
  F:    Documentation/devicetree/bindings/mtd/
  F:    drivers/mtd/
@@@ -9192,6 -8991,20 +9192,6 @@@ F:     drivers/media/platform/meson/ao-cec.
  F:    Documentation/devicetree/bindings/media/meson-ao-cec.txt
  T:    git git://linuxtv.org/media_tree.git
  
 -METAG ARCHITECTURE
 -M:    James Hogan <[email protected]>
 -L:    [email protected]
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git
 -S:    Odd Fixes
 -F:    arch/metag/
 -F:    Documentation/metag/
 -F:    Documentation/devicetree/bindings/metag/
 -F:    Documentation/devicetree/bindings/interrupt-controller/img,*
 -F:    drivers/clocksource/metag_generic.c
 -F:    drivers/irqchip/irq-metag.c
 -F:    drivers/irqchip/irq-metag-ext.c
 -F:    drivers/tty/metag_da.c
 -
  MICROBLAZE ARCHITECTURE
  M:    Michal Simek <[email protected]>
  W:    http://www.monstr.eu/fdt/
@@@ -9228,14 -9041,6 +9228,14 @@@ F:    drivers/media/platform/atmel/atmel-i
  F:    drivers/media/platform/atmel/atmel-isc-regs.h
  F:    devicetree/bindings/media/atmel-isc.txt
  
 +MICROCHIP / ATMEL NAND DRIVER
 +M:    Wenyou Yang <[email protected]>
 +M:    Josh Wu <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/mtd/nand/raw/atmel/*
 +F:    Documentation/devicetree/bindings/mtd/atmel-nand.txt
 +
  MICROCHIP KSZ SERIES ETHERNET SWITCH DRIVER
  M:    Woojung Huh <[email protected]>
  M:    Microchip Linux Driver Support <[email protected]>
@@@ -9246,13 -9051,6 +9246,13 @@@ F:    drivers/net/dsa/microchip/
  F:    include/linux/platform_data/microchip-ksz.h
  F:    Documentation/devicetree/bindings/net/dsa/ksz.txt
  
 +MICROCHIP LAN743X ETHERNET DRIVER
 +M:    Bryan Whitehead <[email protected]>
 +M:    Microchip Linux Driver Support <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/net/ethernet/microchip/lan743x_*
 +
  MICROCHIP USB251XB DRIVER
  M:    Richard Leitner <[email protected]>
  L:    [email protected]
@@@ -9260,15 -9058,6 +9260,15 @@@ S:    Maintaine
  F:    drivers/usb/misc/usb251xb.c
  F:    Documentation/devicetree/bindings/usb/usb251xb.txt
  
 +MICROSEMI MIPS SOCS
 +M:    Alexandre Belloni <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    arch/mips/generic/board-ocelot.c
 +F:    arch/mips/configs/generic/board-ocelot.config
 +F:    arch/mips/boot/dts/mscc/
 +F:    Documentation/devicetree/bindings/mips/mscc.txt
 +
  MICROSEMI SMART ARRAY SMARTPQI DRIVER (smartpqi)
  M:    Don Brace <[email protected]>
  L:    [email protected]
@@@ -9303,7 -9092,6 +9303,7 @@@ S:      Supporte
  F:    Documentation/devicetree/bindings/mips/
  F:    Documentation/mips/
  F:    arch/mips/
 +F:    drivers/platform/mips/
  
  MIPS BOSTON DEVELOPMENT BOARD
  M:    Paul Burton <[email protected]>
@@@ -9319,7 -9107,6 +9319,7 @@@ MIPS GENERIC PLATFOR
  M:    Paul Burton <[email protected]>
  L:    [email protected]
  S:    Supported
 +F:    Documentation/devicetree/bindings/power/mti,mips-cpc.txt
  F:    arch/mips/generic/
  F:    arch/mips/tools/generic-board-config.sh
  
@@@ -9332,25 -9119,6 +9332,25 @@@ F:    arch/mips/include/asm/mach-loongson3
  F:    drivers/*/*loongson1*
  F:    drivers/*/*/*loongson1*
  
 +MIPS/LOONGSON2 ARCHITECTURE
 +M:    Jiaxun Yang <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    arch/mips/loongson64/*{2e/2f}*
 +F:    arch/mips/include/asm/mach-loongson64/
 +F:    drivers/*/*loongson2*
 +F:    drivers/*/*/*loongson2*
 +
 +MIPS/LOONGSON3 ARCHITECTURE
 +M:    Huacai Chen <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    arch/mips/loongson64/
 +F:    arch/mips/include/asm/mach-loongson64/
 +F:    drivers/platform/mips/cpu_hwmon.c
 +F:    drivers/*/*loongson3*
 +F:    drivers/*/*/*loongson3*
 +
  MIPS RINT INSTRUCTION EMULATION
  M:    Aleksandar Markovic <[email protected]>
  L:    [email protected]
@@@ -9396,6 -9164,7 +9396,6 @@@ F:      drivers/media/dvb-frontends/mn88473
  
  MODULE SUPPORT
  M:    Jessica Yu <[email protected]>
 -M:    Rusty Russell <[email protected]>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git modules-next
  S:    Maintained
  F:    include/linux/module.h
@@@ -9489,14 -9258,6 +9489,14 @@@ S:    Maintaine
  F:    drivers/media/i2c/mt9t001.c
  F:    include/media/i2c/mt9t001.h
  
 +MT9T112 APTINA CAMERA SENSOR
 +M:    Jacopo Mondi <[email protected]>
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Odd Fixes
 +F:    drivers/media/i2c/mt9t112.c
 +F:    include/media/i2c/mt9t112.h
 +
  MT9V032 APTINA CAMERA SENSOR
  M:    Laurent Pinchart <[email protected]>
  L:    [email protected]
@@@ -9574,13 -9335,13 +9574,13 @@@ S:   Supporte
  F:    drivers/net/ethernet/myricom/myri10ge/
  
  NAND FLASH SUBSYSTEM
 -M:    Boris Brezillon <boris.brezillon@free-electrons.com>
 +M:    Boris Brezillon <boris.brezillon@bootlin.com>
  R:    Richard Weinberger <[email protected]>
  L:    [email protected]
  W:    http://www.linux-mtd.infradead.org/
  Q:    http://patchwork.ozlabs.org/project/linux-mtd/list/
  T:    git git://git.infradead.org/linux-mtd.git nand/fixes
 -T:    git git://git.infradead.org/l2-mtd.git nand/next
 +T:    git git://git.infradead.org/linux-mtd.git nand/next
  S:    Maintained
  F:    drivers/mtd/nand/
  F:    include/linux/mtd/*nand*.h
@@@ -9598,8 -9359,8 +9598,8 @@@ F:      drivers/net/ethernet/natsemi/natsemi
  
  NCP FILESYSTEM
  M:    Petr Vandrovec <[email protected]>
 -S:    Odd Fixes
 -F:    fs/ncpfs/
 +S:    Obsolete
 +F:    drivers/staging/ncpfs/
  
  NCR 5380 SCSI DRIVERS
  M:    Finn Thain <[email protected]>
@@@ -9835,11 -9596,6 +9835,11 @@@ NETWORKING [WIRELESS
  L:    [email protected]
  Q:    http://patchwork.kernel.org/project/linux-wireless/list/
  
 +NETDEVSIM
 +M:    Jakub Kicinski <[email protected]>
 +S:    Maintained
 +F:    drivers/net/netdevsim/*
 +
  NETXEN (1/10) GbE SUPPORT
  M:    Manish Chopra <[email protected]>
  M:    Rahul Verma <[email protected]>
@@@ -9952,7 -9708,7 +9952,7 @@@ F:      drivers/ntb/hw/amd
  NTB DRIVER CORE
  M:    Jon Mason <[email protected]>
  M:    Dave Jiang <[email protected]>
 -M:    Allen Hubbe <Allen.Hubbe@emc.com>
 +M:    Allen Hubbe <allenbh@gmail.com>
  L:    [email protected]
  S:    Supported
  W:    https://github.com/jonmason/ntb/wiki
@@@ -9986,15 -9742,6 +9986,15 @@@ S:    Supporte
  F:    Documentation/filesystems/ntfs.txt
  F:    fs/ntfs/
  
 +NUBUS SUBSYSTEM
 +M:    Finn Thain <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    arch/*/include/asm/nubus.h
 +F:    drivers/nubus/
 +F:    include/linux/nubus.h
 +F:    include/uapi/linux/nubus.h
 +
  NVIDIA (rivafb and nvidiafb) FRAMEBUFFER DRIVER
  M:    Antonino Daplas <[email protected]>
  L:    [email protected]
@@@ -10043,13 -9790,6 +10043,13 @@@ F:  Documentation/ABI/stable/sysfs-bus-n
  F:    include/linux/nvmem-consumer.h
  F:    include/linux/nvmem-provider.h
  
 +NXP SGTL5000 DRIVER
 +M:    Fabio Estevam <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/sound/sgtl5000.txt
 +F:    sound/soc/codecs/sgtl5000*
 +
  NXP TDA998X DRM DRIVER
  M:    Russell King <[email protected]>
  S:    Supported
@@@ -10062,7 -9802,6 +10062,7 @@@ NXP TFA9879 DRIVE
  M:    Peter Rosin <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
 +F:    Documentation/devicetree/bindings/sound/tfa9879.txt
  F:    sound/soc/codecs/tfa9879*
  
  NXP-NCI NFC DRIVER
@@@ -10074,22 -9813,9 +10074,22 @@@ F:  drivers/nfc/nxp-nc
  
  OBJTOOL
  M:    Josh Poimboeuf <[email protected]>
 +M:    Peter Zijlstra <[email protected]>
  S:    Supported
  F:    tools/objtool/
  
 +OCXL (Open Coherent Accelerator Processor Interface OpenCAPI) DRIVER
 +M:    Frederic Barrat <[email protected]>
 +M:    Andrew Donnellan <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    arch/powerpc/platforms/powernv/ocxl.c
 +F:    arch/powerpc/include/asm/pnv-ocxl.h
 +F:    drivers/misc/ocxl/
 +F:    include/misc/ocxl*
 +F:    include/uapi/misc/ocxl.h
 +F:    Documentation/accelerators/ocxl.txt
 +
  OMAP AUDIO SUPPORT
  M:    Peter Ujfalusi <[email protected]>
  M:    Jarkko Nikula <[email protected]>
@@@ -10302,13 -10028,6 +10302,13 @@@ T: git git://linuxtv.org/media_tree.gi
  S:    Maintained
  F:    drivers/media/i2c/ov13858.c
  
 +OMNIVISION OV2685 SENSOR DRIVER
 +M:    Shunqian Zheng <[email protected]>
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/i2c/ov2685.c
 +
  OMNIVISION OV5640 SENSOR DRIVER
  M:    Steve Longerbeam <[email protected]>
  L:    [email protected]
@@@ -10323,13 -10042,6 +10323,13 @@@ T: git git://linuxtv.org/media_tree.gi
  S:    Maintained
  F:    drivers/media/i2c/ov5647.c
  
 +OMNIVISION OV5695 SENSOR DRIVER
 +M:    Shunqian Zheng <[email protected]>
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/i2c/ov5695.c
 +
  OMNIVISION OV7670 SENSOR DRIVER
  M:    Jonathan Corbet <[email protected]>
  L:    [email protected]
@@@ -10338,37 -10050,11 +10338,37 @@@ S:        Maintaine
  F:    drivers/media/i2c/ov7670.c
  F:    Documentation/devicetree/bindings/media/i2c/ov7670.txt
  
 +OMNIVISION OV772x SENSOR DRIVER
 +M:    Jacopo Mondi <[email protected]>
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Odd fixes
 +F:    drivers/media/i2c/ov772x.c
 +F:    include/media/i2c/ov772x.h
 +
 +OMNIVISION OV7740 SENSOR DRIVER
 +M:    Wenyou Yang <[email protected]>
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/i2c/ov7740.c
 +F:    Documentation/devicetree/bindings/media/i2c/ov7740.txt
 +
 +OMNIVISION OV9650 SENSOR DRIVER
 +M:    Sakari Ailus <[email protected]>
 +R:    Akinobu Mita <[email protected]>
 +R:    Sylwester Nawrocki <[email protected]>
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/i2c/ov9650.c
 +F:    Documentation/devicetree/bindings/media/i2c/ov9650.txt
 +
  ONENAND FLASH DRIVER
  M:    Kyungmin Park <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/mtd/onenand/
 +F:    drivers/mtd/nand/onenand/
  F:    include/linux/mtd/onenand*.h
  
  ONSTREAM SCSI TAPE DRIVER
@@@ -10458,7 -10144,7 +10458,7 @@@ F:   include/uapi/linux/openvswitch.
  OPERATING PERFORMANCE POINTS (OPP)
  M:    Viresh Kumar <[email protected]>
  M:    Nishanth Menon <[email protected]>
 -M:    Stephen Boyd <sboyd@codeaurora.org>
 +M:    Stephen Boyd <sboyd@kernel.org>
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git
@@@ -10484,7 -10170,7 +10484,7 @@@ F:   drivers/oprofile
  F:    include/linux/oprofile.h
  
  ORACLE CLUSTER FILESYSTEM 2 (OCFS2)
 -M:    Mark Fasheh <mfasheh@versity.com>
 +M:    Mark Fasheh <mark@fasheh.com>
  M:    Joel Becker <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  W:    http://ocfs2.wiki.kernel.org
@@@ -10495,8 -10181,7 +10495,8 @@@ F:   fs/ocfs2
  
  ORANGEFS FILESYSTEM
  M:    Mike Marshall <[email protected]>
 -L:    [email protected] (subscribers-only)
 +R:    Martin Brandenburg <[email protected]>
 +L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux.git
  S:    Supported
  F:    fs/orangefs/
  S:    Maintained
  F:    drivers/platform/x86/panasonic-laptop.c
  
 -PANASONIC MN10300/AM33/AM34 PORT
 -M:    David Howells <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -W:    ftp://ftp.redhat.com/pub/redhat/gnupro/AM33/
 -S:    Maintained
 -F:    Documentation/mn10300/
 -F:    arch/mn10300/
 -
  PARALLEL LCD/KEYPAD PANEL DRIVER
  M:    Willy Tarreau <[email protected]>
  M:    Ksenija Stanojevic <[email protected]>
@@@ -10586,6 -10279,7 +10586,6 @@@ F:   Documentation/parport*.tx
  PARAVIRT_OPS INTERFACE
  M:    Juergen Gross <[email protected]>
  M:    Alok Kataria <[email protected]>
 -M:    Rusty Russell <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    Documentation/virtual/paravirt_ops.txt
@@@ -10704,13 -10398,6 +10704,13 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/pci/pci-armada8k.txt
  F:    drivers/pci/dwc/pcie-armada8k.c
  
 +PCI DRIVER FOR CADENCE PCIE IP
 +M:    Alan Douglas <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/pci/cdns,*.txt
 +F:    drivers/pci/cadence/pcie-cadence*
 +
  PCI DRIVER FOR FREESCALE LAYERSCAPE
  M:    Minghuan Lian <[email protected]>
  M:    Mingkai Hu <[email protected]>
@@@ -10861,13 -10548,8 +10861,13 @@@ T: git git://git.kernel.org/pub/scm/lin
  S:    Supported
  F:    Documentation/devicetree/bindings/pci/
  F:    Documentation/PCI/
 +F:    drivers/acpi/pci*
  F:    drivers/pci/
 +F:    include/asm-generic/pci*
  F:    include/linux/pci*
 +F:    include/linux/of_pci.h
 +F:    include/uapi/linux/pci*
 +F:    lib/pci*
  F:    arch/x86/pci/
  F:    arch/x86/kernel/quirks.c
  
  Q:    http://patchwork.ozlabs.org/project/linux-pci/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lpieralisi/pci.git/
  S:    Supported
 +F:    drivers/pci/cadence/
  F:    drivers/pci/host/
  F:    drivers/pci/dwc/
  
@@@ -10958,9 -10639,11 +10958,9 @@@ S:  Maintaine
  F:    drivers/pci/dwc/*spear*
  
  PCMCIA SUBSYSTEM
 -P:    Linux PCMCIA Team
 -L:    [email protected]
 -W:    http://lists.infradead.org/mailman/listinfo/linux-pcmcia
 +M:    Dominik Brodowski <[email protected]>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia.git
 -S:    Maintained
 +S:    Odd Fixes
  F:    Documentation/pcmcia/
  F:    tools/pcmcia/
  F:    drivers/pcmcia/
@@@ -10988,7 -10671,6 +10988,7 @@@ F:   drivers/platform/x86/peaq-wmi.
  PER-CPU MEMORY ALLOCATOR
  M:    Tejun Heo <[email protected]>
  M:    Christoph Lameter <[email protected]>
 +M:    Dennis Zhou <[email protected]>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu.git
  S:    Maintained
  F:    include/linux/percpu*.h
@@@ -11082,33 -10764,12 +11082,33 @@@ L:        [email protected]
  S:    Supported
  F:    drivers/pinctrl/pinctrl-at91-pio4.*
  
 +PIN CONTROLLER - FREESCALE
 +M:    Dong Aisheng <[email protected]>
 +M:    Fabio Estevam <[email protected]>
 +M:    Shawn Guo <[email protected]>
 +M:    Stefan Agner <[email protected]>
 +R:    Pengutronix Kernel Team <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/pinctrl/freescale/
 +F:    Documentation/devicetree/bindings/pinctrl/fsl,*
 +
  PIN CONTROLLER - INTEL
  M:    Mika Westerberg <[email protected]>
  M:    Heikki Krogerus <[email protected]>
  S:    Maintained
  F:    drivers/pinctrl/intel/
  
 +PIN CONTROLLER - MEDIATEK
 +M:    Sean Wang <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/pinctrl/pinctrl-mt65xx.txt
 +F:    Documentation/devicetree/bindings/pinctrl/pinctrl-mt7622.txt
 +F:    drivers/pinctrl/mediatek/pinctrl-mtk-common.*
 +F:    drivers/pinctrl/mediatek/pinctrl-mt2701.c
 +F:    drivers/pinctrl/mediatek/pinctrl-mt7622.c
 +
  PIN CONTROLLER - QUALCOMM
  M:    Bjorn Andersson <[email protected]>
  S:    Maintained
@@@ -11169,7 -10830,7 +11169,7 @@@ F:   include/linux/pktcdvd.
  F:    include/uapi/linux/pktcdvd.h
  
  PKUNITY SOC DRIVERS
 -M:    Guan Xuetao <gxt@mprc.pku.edu.cn>
 +M:    Guan Xuetao <[email protected]>
  W:    http://mprc.pku.edu.cn/~guanxuetao/linux
  S:    Maintained
  T:    git git://github.com/gxt/linux.git
@@@ -11227,7 -10888,6 +11227,7 @@@ F:   include/linux/pm.
  F:    include/linux/pm_*
  F:    include/linux/powercap.h
  F:    drivers/powercap/
 +F:    kernel/configs/nopm.config
  
  POWER STATE COORDINATION INTERFACE (PSCI)
  M:    Mark Rutland <[email protected]>
@@@ -11495,6 -11155,12 +11495,6 @@@ F:  include/sound/pxa2xx-lib.
  F:    sound/arm/pxa*
  F:    sound/soc/pxa/
  
 -PXA3xx NAND FLASH DRIVER
 -M:    Ezequiel Garcia <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/mtd/nand/pxa3xx_nand.c
 -
  QAT DRIVER
  M:    Giovanni Cabiddu <[email protected]>
  L:    [email protected]
@@@ -11514,11 -11180,9 +11514,11 @@@ M: "Michael S. Tsirkin" <[email protected]
  L:    [email protected]
  S:    Maintained
  F:    drivers/firmware/qemu_fw_cfg.c
 +F:    include/uapi/linux/qemu_fw_cfg.h
  
  QIB DRIVER
 -M:    Mike Marciniszyn <[email protected]>
 +M:    Dennis Dalessandro <[email protected]>
 +M:    Mike Marciniszyn <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/infiniband/hw/qib/
@@@ -11545,6 -11209,7 +11545,6 @@@ F:   include/linux/qed
  F:    drivers/net/ethernet/qlogic/qede/
  
  QLOGIC QL4xxx RDMA DRIVER
 -M:    Ram Amrani <[email protected]>
  M:    Michal Kalderon <[email protected]>
  M:    Ariel Elior <[email protected]>
  L:    [email protected]
@@@ -11608,9 -11273,8 +11608,9 @@@ M:   Stuart Yoder <[email protected]
  M:    Laurentiu Tudor <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/staging/fsl-mc/
 +F:    drivers/bus/fsl-mc/
  F:    Documentation/devicetree/bindings/misc/fsl,qoriq-mc.txt
 +F:    Documentation/networking/dpaa2/overview.rst
  
  QT1010 MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
@@@ -11692,7 -11356,6 +11692,7 @@@ F:   drivers/net/wireless/quantenn
  RADEON and AMDGPU DRM DRIVERS
  M:    Alex Deucher <[email protected]>
  M:    Christian König <[email protected]>
 +M:    David (ChunMing) Zhou <[email protected]>
  L:    [email protected]
  T:    git git://people.freedesktop.org/~agd5f/linux
  S:    Supported
@@@ -11769,13 -11432,6 +11769,13 @@@ S: Maintaine
  F:    Documentation/blockdev/ramdisk.txt
  F:    drivers/block/brd.c
  
 +RANCHU VIRTUAL BOARD FOR MIPS
 +M:    Miodrag Dinic <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    arch/mips/generic/board-ranchu.c
 +F:    arch/mips/configs/generic/board-ranchu.config
 +
  RANDOM NUMBER DRIVER
  M:    "Theodore Ts'o" <[email protected]>
  S:    Maintained
@@@ -11783,7 -11439,7 +11783,7 @@@ F:   drivers/char/random.
  
  RAPIDIO SUBSYSTEM
  M:    Matt Porter <[email protected]>
 -M:    Alexandre Bounine <alexandre.bounine@idt.com>
 +M:    Alexandre Bounine <alex.bou9@gmail.com>
  S:    Maintained
  F:    drivers/rapidio/
  
  S:    Orphan
  F:    drivers/net/wireless/ray*
  
 -RCUTORTURE MODULE
 -M:    Josh Triplett <[email protected]>
 -M:    "Paul E. McKenney" <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
 -F:    Documentation/RCU/torture.txt
 -F:    kernel/rcu/rcutorture.c
 -
  RCUTORTURE TEST FRAMEWORK
  M:    "Paul E. McKenney" <[email protected]>
  M:    Josh Triplett <[email protected]>
@@@ -11815,7 -11480,6 +11815,7 @@@ F:   drivers/net/ethernet/rdc/r6040.
  
  RDMAVT - RDMA verbs software
  M:    Dennis Dalessandro <[email protected]>
 +M:    Mike Marciniszyn <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/infiniband/sw/rdmavt
@@@ -11857,7 -11521,7 +11857,7 @@@ X:   kernel/torture.
  
  REAL TIME CLOCK (RTC) SUBSYSTEM
  M:    Alessandro Zummo <[email protected]>
 -M:    Alexandre Belloni <alexandre.belloni@free-electrons.com>
 +M:    Alexandre Belloni <alexandre.belloni@bootlin.com>
  L:    [email protected]
  Q:    http://patchwork.ozlabs.org/project/rtc-linux/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git
@@@ -11921,11 -11585,6 +11921,11 @@@ T: git git://git.kernel.org/pub/scm/lin
  S:    Supported
  F:    drivers/clk/renesas/
  
 +RENESAS EMEV2 I2C DRIVER
 +M:    Wolfram Sang <[email protected]>
 +S:    Supported
 +F:    drivers/i2c/busses/i2c-emev2.c
 +
  RENESAS ETHERNET DRIVERS
  R:    Sergei Shtylyov <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/iio/adc/rcar_gyro_adc.c
  
 +RENESAS R-CAR I2C DRIVERS
 +M:    Wolfram Sang <[email protected]>
 +S:    Supported
 +F:    drivers/i2c/busses/i2c-rcar.c
 +F:    drivers/i2c/busses/i2c-sh_mobile.c
 +
  RENESAS USB PHY DRIVER
  M:    Yoshihiro Shimoda <[email protected]>
  L:    [email protected]
@@@ -11990,8 -11643,8 +11990,8 @@@ F:   drivers/memstick/host/r592.
  RICOH SMARTMEDIA/XD DRIVER
  M:    Maxim Levitsky <[email protected]>
  S:    Maintained
 -F:    drivers/mtd/nand/r852.c
 -F:    drivers/mtd/nand/r852.h
 +F:    drivers/mtd/nand/raw/r852.c
 +F:    drivers/mtd/nand/raw/r852.h
  
  RISC-V ARCHITECTURE
  M:    Palmer Dabbelt <[email protected]>
@@@ -12104,13 -11757,15 +12104,13 @@@ T:        git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    drivers/net/wireless/realtek/rtl818x/rtl8187/
  
 -RTL8192CE WIRELESS DRIVER
 -M:    Larry Finger <[email protected]>
 -M:    Chaoming Li <[email protected]>
 +REALTEK WIRELESS DRIVER (rtlwifi family)
 +M:    Ping-Ke Shih <[email protected]>
  L:    [email protected]
  W:    http://wireless.kernel.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
  S:    Maintained
  F:    drivers/net/wireless/realtek/rtlwifi/
 -F:    drivers/net/wireless/realtek/rtlwifi/rtl8192ce/
  
  RTL8XXXU WIRELESS DRIVER (rtl8xxxu)
  M:    Jes Sorensen <[email protected]>
@@@ -12150,16 -11805,16 +12150,16 @@@ F:        Documentation/s390
  F:    Documentation/driver-api/s390-drivers.rst
  
  S390 COMMON I/O LAYER
 -M:    Sebastian Ott <sebott@linux.vnet.ibm.com>
 -M:    Peter Oberparleiter <oberpar@linux.vnet.ibm.com>
 +M:    Sebastian Ott <[email protected]>
 +M:    Peter Oberparleiter <[email protected]>
  L:    [email protected]
  W:    http://www.ibm.com/developerworks/linux/linux390/
  S:    Supported
  F:    drivers/s390/cio/
  
  S390 DASD DRIVER
 -M:    Stefan Haberland <sth@linux.vnet.ibm.com>
 -M:    Jan Hoeppner <hoeppner@linux.vnet.ibm.com>
 +M:    Stefan Haberland <[email protected]>
 +M:    Jan Hoeppner <[email protected]>
  L:    [email protected]
  W:    http://www.ibm.com/developerworks/linux/linux390/
  S:    Supported
@@@ -12174,8 -11829,8 +12174,8 @@@ S:   Supporte
  F:    drivers/iommu/s390-iommu.c
  
  S390 IUCV NETWORK LAYER
 -M:    Julian Wiedmann <jwi@linux.vnet.ibm.com>
 -M:    Ursula Braun <ubraun@linux.vnet.ibm.com>
 +M:    Julian Wiedmann <[email protected]>
 +M:    Ursula Braun <[email protected]>
  L:    [email protected]
  W:    http://www.ibm.com/developerworks/linux/linux390/
  S:    Supported
@@@ -12184,15 -11839,15 +12184,15 @@@ F:        include/net/iucv
  F:    net/iucv/
  
  S390 NETWORK DRIVERS
 -M:    Julian Wiedmann <jwi@linux.vnet.ibm.com>
 -M:    Ursula Braun <ubraun@linux.vnet.ibm.com>
 +M:    Julian Wiedmann <[email protected]>
 +M:    Ursula Braun <[email protected]>
  L:    [email protected]
  W:    http://www.ibm.com/developerworks/linux/linux390/
  S:    Supported
  F:    drivers/s390/net/
  
  S390 PCI SUBSYSTEM
 -M:    Sebastian Ott <sebott@linux.vnet.ibm.com>
 +M:    Sebastian Ott <[email protected]>
  M:    Gerald Schaefer <[email protected]>
  L:    [email protected]
  W:    http://www.ibm.com/developerworks/linux/linux390/
@@@ -12202,8 -11857,7 +12202,8 @@@ F:   drivers/pci/hotplug/s390_pci_hpc.
  
  S390 VFIO-CCW DRIVER
  M:    Cornelia Huck <[email protected]>
 -M:    Dong Jia Shi <[email protected]>
 +M:    Dong Jia Shi <[email protected]>
 +M:    Halil Pasic <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Supported
@@@ -12219,8 -11873,8 +12219,8 @@@ S:   Supporte
  F:    drivers/s390/crypto/
  
  S390 ZFCP DRIVER
 -M:    Steffen Maier <maier@linux.vnet.ibm.com>
 -M:    Benjamin Block <bblock@linux.vnet.ibm.com>
 +M:    Steffen Maier <[email protected]>
 +M:    Benjamin Block <[email protected]>
  L:    [email protected]
  W:    http://www.ibm.com/developerworks/linux/linux390/
  S:    Supported
@@@ -12266,7 -11920,6 +12266,7 @@@ M:   Sylwester Nawrocki <s.nawrocki@samsu
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  F:    sound/soc/samsung/
 +F:    Documentation/devicetree/bindings/sound/samsung*
  
  SAMSUNG EXYNOS PSEUDO RANDOM NUMBER GENERATOR (RNG) DRIVER
  M:    Krzysztof Kozlowski <[email protected]>
@@@ -12276,13 -11929,6 +12276,13 @@@ S: Maintaine
  F:    drivers/crypto/exynos-rng.c
  F:    Documentation/devicetree/bindings/crypto/samsung,exynos-rng4.txt
  
 +SAMSUNG EXYNOS TRUE RANDOM NUMBER GENERATOR (TRNG) DRIVER
 +M:    Łukasz Stelmach <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/char/hw_random/exynos-trng.c
 +F:    Documentation/devicetree/bindings/rng/samsung,exynos5250-trng.txt
 +
  SAMSUNG FRAMEBUFFER DRIVER
  M:    Jingoo Han <[email protected]>
  L:    [email protected]
@@@ -12345,7 -11991,6 +12345,7 @@@ F:   drivers/media/i2c/s5k5baf.
  SAMSUNG S5P Security SubSystem (SSS) DRIVER
  M:    Krzysztof Kozlowski <[email protected]>
  M:    Vladimir Zapolskiy <[email protected]>
 +M:    Kamil Konieczny <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -12372,7 -12017,7 +12372,7 @@@ F:   Documentation/devicetree/bindings/cl
  SAMSUNG SPI DRIVERS
  M:    Kukjin Kim <[email protected]>
  M:    Krzysztof Kozlowski <[email protected]>
 -M:    Andi Shyti <andi[email protected]>
 +M:    Andi Shyti <andi@etezian.org>
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
@@@ -12426,6 -12071,13 +12426,6 @@@ F:  include/linux/sched.
  F:    include/uapi/linux/sched.h
  F:    include/linux/wait.h
  
 -SCORE ARCHITECTURE
 -M:    Chen Liqin <[email protected]>
 -M:    Lennox Wu <[email protected]>
 -W:    http://www.sunplus.com
 -S:    Supported
 -F:    arch/score/
 -
  SCR24X CHIP CARD INTERFACE DRIVER
  M:    Lubomir Rintel <[email protected]>
  S:    Supported
@@@ -12656,7 -12308,7 +12656,7 @@@ S:   Maintaine
  F:    drivers/misc/sgi-xp/
  
  SHARED MEMORY COMMUNICATIONS (SMC) SOCKETS
 -M:    Ursula Braun <ubraun@linux.vnet.ibm.com>
 +M:    Ursula Braun <[email protected]>
  L:    [email protected]
  W:    http://www.ibm.com/developerworks/linux/linux390/
  S:    Supported
@@@ -12683,14 -12335,6 +12683,14 @@@ T: git git://linuxtv.org/anttip/media_t
  S:    Maintained
  F:    drivers/media/tuners/si2157*
  
 +SI2165 MEDIA DRIVER
 +M:    Matthias Schwarzott <[email protected]>
 +L:    [email protected]
 +W:    https://linuxtv.org
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +S:    Maintained
 +F:    drivers/media/dvb-frontends/si2165*
 +
  SI2168 MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
  L:    [email protected]
@@@ -12814,13 -12458,6 +12814,13 @@@ F: lib/siphash.
  F:    lib/test_siphash.c
  F:    include/linux/siphash.h
  
 +SIOX
 +M:    Gavin Schenk <[email protected]>
 +M:    Uwe Kleine-König <[email protected]>
 +S:    Supported
 +F:    drivers/siox/*
 +F:    include/trace/events/siox.h
 +
  SIS 190 ETHERNET DRIVER
  M:    Francois Romieu <[email protected]>
  L:    [email protected]
@@@ -12872,14 -12509,6 +12872,14 @@@ T: git git://git.kernel.org/pub/scm/lin
  F:    include/linux/srcu.h
  F:    kernel/rcu/srcu.c
  
 +SERIAL LOW-POWER INTER-CHIP MEDIA BUS (SLIMbus)
 +M:    Srinivas Kandagatla <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    drivers/slimbus/
 +F:    Documentation/devicetree/bindings/slimbus/
 +F:    include/linux/slimbus.h
 +
  SMACK SECURITY MODULE
  M:    Casey Schaufler <[email protected]>
  L:    [email protected]
@@@ -12953,26 -12582,14 +12953,26 @@@ S:        Maintaine
  F:    drivers/net/ethernet/smsc/smsc9420.*
  
  SOC-CAMERA V4L2 SUBSYSTEM
 -M:    Guennadi Liakhovetski <[email protected]>
  L:    [email protected]
  T:    git git://linuxtv.org/media_tree.git
 -S:    Maintained
 +S:    Orphan
  F:    include/media/soc*
  F:    drivers/media/i2c/soc_camera/
  F:    drivers/media/platform/soc_camera/
  
 +SOCIONEXT SYNQUACER I2C DRIVER
 +M:    Ard Biesheuvel <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/i2c/busses/i2c-synquacer.c
 +F:    Documentation/devicetree/bindings/i2c/i2c-synquacer.txt
 +
 +SOCIONEXT UNIPHIER SOUND DRIVER
 +M:    Katsuhiro Suzuki <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    sound/soc/uniphier/
 +
  SOEKRIS NET48XX LED SUPPORT
  M:    Chris Boot <[email protected]>
  S:    Maintained
  S:    Supported
  F:    drivers/media/pci/solo6x10/
  
 +SOFTWARE DELEGATED EXCEPTION INTERFACE (SDEI)
 +M:    James Morse <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/arm/firmware/sdei.txt
 +F:    drivers/firmware/arm_sdei.c
 +F:    include/linux/sdei.h
 +F:    include/uapi/linux/sdei.h
 +
  SOFTWARE RAID (Multiple Disks) SUPPORT
  M:    Shaohua Li <[email protected]>
  L:    [email protected]
@@@ -13018,26 -12626,6 +13018,26 @@@ F: drivers/md/raid
  F:    include/linux/raid/
  F:    include/uapi/linux/raid/
  
 +SOCIONEXT (SNI) NETSEC NETWORK DRIVER
 +M:    Jassi Brar <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/net/ethernet/socionext/netsec.c
 +F:    Documentation/devicetree/bindings/net/socionext-netsec.txt
 +
 +SOLIDRUN CLEARFOG SUPPORT
 +M:    Russell King <[email protected]>
 +S:    Maintained
 +F:    arch/arm/boot/dts/armada-388-clearfog*
 +F:    arch/arm/boot/dts/armada-38x-solidrun-*
 +
 +SOLIDRUN CUBOX-I/HUMMINGBOARD SUPPORT
 +M:    Russell King <[email protected]>
 +S:    Maintained
 +F:    arch/arm/boot/dts/imx6*-cubox-i*
 +F:    arch/arm/boot/dts/imx6*-hummingboard*
 +F:    arch/arm/boot/dts/imx6*-sr-*
 +
  SONIC NETWORK DRIVER
  M:    Thomas Bogendoerfer <[email protected]>
  L:    [email protected]
@@@ -13124,16 -12712,6 +13124,16 @@@ F: Documentation/sound/alsa/soc
  F:    sound/soc/
  F:    include/sound/soc*
  
 +SOUNDWIRE SUBSYSTEM
 +M:    Vinod Koul <[email protected]>
 +M:    Sanyog Kale <[email protected]>
 +R:    Pierre-Louis Bossart <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Supported
 +F:    Documentation/driver-api/soundwire/
 +F:    drivers/soundwire/
 +F:    include/linux/soundwire/
 +
  SP2 MEDIA DRIVER
  M:    Olli Salonen <[email protected]>
  L:    [email protected]
@@@ -13194,12 -12772,13 +13194,12 @@@ F:        arch/arm/boot/dts/spear
  F:    arch/arm/mach-spear/
  
  SPI NOR SUBSYSTEM
 -M:    Cyrille Pitchen <[email protected]>
  M:    Marek Vasut <[email protected]>
  L:    [email protected]
  W:    http://www.linux-mtd.infradead.org/
  Q:    http://patchwork.ozlabs.org/project/linux-mtd/list/
  T:    git git://git.infradead.org/linux-mtd.git spi-nor/fixes
 -T:    git git://git.infradead.org/l2-mtd.git spi-nor/next
 +T:    git git://git.infradead.org/linux-mtd.git spi-nor/next
  S:    Maintained
  F:    drivers/mtd/spi-nor/
  F:    include/linux/mtd/spi-nor.h
@@@ -13225,7 -12804,7 +13225,7 @@@ F:   Documentation/networking/spider_net.
  F:    drivers/net/ethernet/toshiba/spider_net*
  
  SPMI SUBSYSTEM
 -R:    Stephen Boyd <sboyd@codeaurora.org>
 +R:    Stephen Boyd <sboyd@kernel.org>
  L:    [email protected]
  F:    Documentation/devicetree/bindings/spmi/
  F:    drivers/spmi/
@@@ -13286,6 -12865,12 +13286,6 @@@ S:  Odd Fixe
  F:    Documentation/devicetree/bindings/staging/iio/
  F:    drivers/staging/iio/
  
 -STAGING - LIRC (LINUX INFRARED REMOTE CONTROL) DRIVERS
 -M:    Jarod Wilson <[email protected]>
 -W:    http://www.lirc.org/
 -S:    Odd Fixes
 -F:    drivers/staging/media/lirc/
 -
  STAGING - LUSTRE PARALLEL FILESYSTEM
  M:    Oleg Drokin <[email protected]>
  M:    Andreas Dilger <[email protected]>
@@@ -13446,7 -13031,7 +13446,7 @@@ F:   arch/x86/boot/video
  
  SWIOTLB SUBSYSTEM
  M:    Konrad Rzeszutek Wilk <[email protected]>
 -L:    [email protected].org
 +L:    [email protected].org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git
  S:    Supported
  F:    lib/swiotlb.c
@@@ -13511,11 -13096,6 +13511,11 @@@ S: Supporte
  F:    drivers/reset/reset-axs10x.c
  F:    Documentation/devicetree/bindings/reset/snps,axs10x-reset.txt
  
 +SYNOPSYS DESIGNWARE 8250 UART DRIVER
 +R:    Andy Shevchenko <[email protected]>
 +S:    Maintained
 +F:    drivers/tty/serial/8250/8250_dw.c
 +
  SYNOPSYS DESIGNWARE APB GPIO DRIVER
  M:    Hoan Tran <[email protected]>
  L:    [email protected]
@@@ -13523,12 -13103,6 +13523,12 @@@ S: Maintaine
  F:    drivers/gpio/gpio-dwapb.c
  F:    Documentation/devicetree/bindings/gpio/snps-dwapb-gpio.txt
  
 +SYNOPSYS DESIGNWARE AXI DMAC DRIVER
 +M:    Eugeniy Paltsev <[email protected]>
 +S:    Maintained
 +F:    drivers/dma/dwi-axi-dmac/
 +F:    Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.txt
 +
  SYNOPSYS DESIGNWARE DMAC DRIVER
  M:    Viresh Kumar <[email protected]>
  R:    Andy Shevchenko <[email protected]>
@@@ -13538,6 -13112,7 +13538,6 @@@ F:   include/linux/platform_data/dma-dw.
  F:    drivers/dma/dw/
  
  SYNOPSYS DESIGNWARE ENTERPRISE ETHERNET DRIVER
 -M:    Jie Deng <[email protected]>
  M:    Jose Abreu <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -13572,16 -13147,15 +13572,16 @@@ T:        git git://git.kernel.org/pub/scm/lin
  S:    Supported
  F:    drivers/mfd/syscon.c
  
 -SYSTEM CONTROL & POWER INTERFACE (SCPI) Message Protocol drivers
 +SYSTEM CONTROL & POWER/MANAGEMENT INTERFACE (SCPI/SCMI) Message Protocol drivers
  M:    Sudeep Holla <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/devicetree/bindings/arm/arm,scpi.txt
 -F:    drivers/clk/clk-scpi.c
 -F:    drivers/cpufreq/scpi-cpufreq.c
 +F:    Documentation/devicetree/bindings/arm/arm,sc[mp]i.txt
 +F:    drivers/clk/clk-sc[mp]i.c
 +F:    drivers/cpufreq/sc[mp]i-cpufreq.c
  F:    drivers/firmware/arm_scpi.c
 -F:    include/linux/scpi_protocol.h
 +F:    drivers/firmware/arm_scmi/
 +F:    include/linux/sc[mp]i_protocol.h
  
  SYSTEM RESET/SHUTDOWN DRIVERS
  M:    Sebastian Reichel <[email protected]>
@@@ -13678,15 -13252,6 +13678,15 @@@ T: git git://linuxtv.org/anttip/media_t
  S:    Maintained
  F:    drivers/media/tuners/tda18218*
  
 +TDA18250 MEDIA DRIVER
 +M:    Olli Salonen <[email protected]>
 +L:    [email protected]
 +W:    https://linuxtv.org
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/tuners/tda18250*
 +
  TDA18271 MEDIA DRIVER
  M:    Michael Krufky <[email protected]>
  L:    [email protected]
@@@ -13697,14 -13262,6 +13697,14 @@@ T: git git://linuxtv.org/mkrufky/tuners
  S:    Maintained
  F:    drivers/media/tuners/tda18271*
  
 +TDA1997x MEDIA DRIVER
 +M:    Tim Harvey <[email protected]>
 +L:    [email protected]
 +W:    https://linuxtv.org
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +S:    Maintained
 +F:    drivers/media/i2c/tda1997x.*
 +
  TDA827x MEDIA DRIVER
  M:    Michael Krufky <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/media/rc/ttusbir.c
  
 +TECHWELL TW9910 VIDEO DECODER
 +L:    [email protected]
 +S:    Orphan
 +F:    drivers/media/i2c/tw9910.c
 +F:    include/media/i2c/tw9910.h
 +
  TEE SUBSYSTEM
  M:    Jens Wiklander <[email protected]>
  S:    Maintained
@@@ -13827,8 -13378,7 +13827,8 @@@ S:   Supporte
  F:    drivers/i2c/busses/i2c-tegra.c
  
  TEGRA IOMMU DRIVERS
 -M:    Hiroshi Doyu <[email protected]>
 +M:    Thierry Reding <[email protected]>
 +L:    [email protected]
  S:    Supported
  F:    drivers/iommu/tegra*
  
@@@ -14116,10 -13666,23 +14116,10 @@@ S:        Orpha
  F:    drivers/net/wireless/ti/
  F:    include/linux/wl12xx.h
  
 -TILE ARCHITECTURE
 -W:    http://www.mellanox.com/repository/solutions/tile-scm/
 -S:    Orphan
 -F:    arch/tile/
 -F:    drivers/char/tile-srom.c
 -F:    drivers/edac/tile_edac.c
 -F:    drivers/net/ethernet/tile/
 -F:    drivers/rtc/rtc-tile.c
 -F:    drivers/tty/hvc/hvc_tile.c
 -F:    drivers/tty/serial/tilegx.c
 -F:    drivers/usb/host/*-tilegx.c
 -F:    include/linux/usb/tilegx.h
 -
  TIMEKEEPING, CLOCKSOURCE CORE, NTP, ALARMTIMER
  M:    John Stultz <[email protected]>
  M:    Thomas Gleixner <[email protected]>
 -R:    Stephen Boyd <sboyd@codeaurora.org>
 +R:    Stephen Boyd <sboyd@kernel.org>
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
  S:    Supported
  S:    Maintained
  F:    drivers/platform/x86/topstar-laptop.c
  
 +TORTURE-TEST MODULES
 +M:    Davidlohr Bueso <[email protected]>
 +M:    "Paul E. McKenney" <[email protected]>
 +M:    Josh Triplett <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
 +F:    Documentation/RCU/torture.txt
 +F:    kernel/torture.c
 +F:    kernel/rcu/rcutorture.c
 +F:    kernel/locking/locktorture.c
 +
  TOSHIBA ACPI EXTRAS DRIVER
  M:    Azael Avalos <[email protected]>
  L:    [email protected]
@@@ -14256,10 -13807,9 +14256,10 @@@ F: drivers/platform/x86/toshiba-wmi.
  TPM DEVICE DRIVER
  M:    Peter Huewe <[email protected]>
  M:    Jarkko Sakkinen <[email protected]>
 -R:    Jason Gunthorpe <jg[email protected]>
 +R:    Jason Gunthorpe <jg[email protected]>
  L:    [email protected]
  Q:    https://patchwork.kernel.org/project/linux-integrity/list/
 +W:    https://kernsec.org/wiki/index.php/Linux_Kernel_Integrity
  T:    git git://git.infradead.org/users/jjs/linux-tpmdd.git
  S:    Maintained
  F:    drivers/char/tpm/
@@@ -14298,13 -13848,6 +14298,13 @@@ T: git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  K:    ^Subject:.*(?i)trivial
  
 +TEMPO SEMICONDUCTOR DRIVERS
 +M:    Steven Eckhoff <[email protected]>
 +S:    Maintained
 +F:    sound/soc/codecs/tscs*.c
 +F:    sound/soc/codecs/tscs*.h
 +F:    Documentation/devicetree/bindings/sound/tscs*.txt
 +
  TTY LAYER
  M:    Greg Kroah-Hartman <[email protected]>
  M:    Jiri Slaby <[email protected]>
@@@ -14441,7 -13984,7 +14441,7 @@@ F:   include/linux/uwb.
  F:    include/linux/uwb/
  
  UNICORE32 ARCHITECTURE:
 -M:    Guan Xuetao <gxt@mprc.pku.edu.cn>
 +M:    Guan Xuetao <[email protected]>
  W:    http://mprc.pku.edu.cn/~guanxuetao/linux
  S:    Maintained
  T:    git git://github.com/gxt/linux.git
@@@ -14466,8 -14009,6 +14466,8 @@@ UNISYS S-PAR DRIVER
  M:    David Kershner <[email protected]>
  L:    [email protected] (Unisys internal)
  S:    Supported
 +F:    include/linux/visorbus.h
 +F:    drivers/visorbus/
  F:    drivers/staging/unisys/
  
  UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER
@@@ -14580,12 -14121,6 +14580,12 @@@ S: Maintaine
  F:    Documentation/hid/hiddev.txt
  F:    drivers/hid/usbhid/
  
 +USB INTEL XHCI ROLE MUX DRIVER
 +M:    Hans de Goede <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/usb/roles/intel-xhci-usb-role-switch.c
 +
  USB ISP116X DRIVER
  M:    Olav Kongas <[email protected]>
  L:    [email protected]
@@@ -14716,12 -14251,6 +14716,12 @@@ F: drivers/usb
  F:    include/linux/usb.h
  F:    include/linux/usb/
  
 +USB TYPEC PI3USB30532 MUX DRIVER
 +M:    Hans de Goede <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/usb/typec/mux/pi3usb30532.c
 +
  USB TYPEC SUBSYSTEM
  M:    Heikki Krogerus <[email protected]>
  L:    [email protected]
@@@ -14843,7 -14372,7 +14843,7 @@@ VF610 NAND DRIVE
  M:    Stefan Agner <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    drivers/mtd/nand/vf610_nfc.c
 +F:    drivers/mtd/nand/raw/vf610_nfc.c
  
  VFAT/FAT/MSDOS FILESYSTEM
  M:    OGAWA Hirofumi <[email protected]>
@@@ -14871,7 -14400,7 +14871,7 @@@ F:   include/linux/mdev.
  F:    samples/vfio-mdev/
  
  VFIO PLATFORM DRIVER
 -M:    Baptiste Reynal <b.reynal@virtualopensystems.com>
 +M:    Eric Auger <eric.auger@redhat.com>
  L:    [email protected]
  S:    Maintained
  F:    drivers/vfio/platform/
@@@ -14991,7 -14520,7 +14991,7 @@@ F:   include/uapi/linux/virtio_crypto.
  
  VIRTIO DRIVERS FOR S390
  M:    Cornelia Huck <[email protected]>
 -M:    Halil Pasic <pasic@linux.vnet.ibm.com>
 +M:    Halil Pasic <[email protected]>
  L:    [email protected]
  L:    [email protected]
  L:    [email protected]
@@@ -15026,15 -14555,6 +15026,15 @@@ S: Maintaine
  F:    drivers/virtio/virtio_input.c
  F:    include/uapi/linux/virtio_input.h
  
 +VIRTUAL BOX GUEST DEVICE DRIVER
 +M:    Hans de Goede <[email protected]>
 +M:    Arnd Bergmann <[email protected]>
 +M:    Greg Kroah-Hartman <[email protected]>
 +S:    Maintained
 +F:    include/linux/vbox_utils.h
 +F:    include/uapi/linux/vbox*.h
 +F:    drivers/virt/vboxguest/
 +
  VIRTUAL SERIO DEVICE DRIVER
  M:    Stephen Chandler Paul <[email protected]>
  S:    Maintained
@@@ -15106,7 -14626,7 +15106,7 @@@ F:   drivers/input/mouse/vmmouse.
  F:    drivers/input/mouse/vmmouse.h
  
  VMWARE VMXNET3 ETHERNET DRIVER
 -M:    Shrikrishna Khare <skhare@vmware.com>
 +M:    Ronak Doshi <doshir@vmware.com>
  M:    "VMware, Inc." <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -15126,7 -14646,6 +15126,7 @@@ W:   http://www.slimlogic.co.uk/?p=4
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git
  S:    Supported
  F:    Documentation/devicetree/bindings/regulator/
 +F:    Documentation/power/regulator/
  F:    drivers/regulator/
  F:    include/dt-bindings/regulator/
  F:    include/linux/regulator/
@@@ -15199,8 -14718,8 +15199,8 @@@ S:   Maintaine
  F:    drivers/input/tablet/wacom_serial4.c
  
  WATCHDOG DEVICE DRIVERS
 -M:    Wim Van Sebroeck <wim@iguana.be>
 -R:    Guenter Roeck <[email protected]>
 +M:    Wim Van Sebroeck <wim@linux-watchdog.org>
 +M:    Guenter Roeck <[email protected]>
  L:    [email protected]
  W:    http://www.linux-watchdog.org/
  T:    git git://www.linux-watchdog.org/linux-watchdog.git
@@@ -15224,9 -14743,9 +15224,9 @@@ S:   Maintaine
  F:    drivers/hid/hid-wiimote*
  
  WILOCITY WIL6210 WIRELESS DRIVER
 -M:    Maya Erez <[email protected]>
 +M:    Maya Erez <[email protected]>
  L:    [email protected]
 -L:    wil6210@qca.qualcomm.com
 +L:    wil6210@qti.qualcomm.com
  S:    Supported
  W:    http://wireless.kernel.org/en/users/Drivers/wil6210
  F:    drivers/net/wireless/ath/wil6210/
@@@ -15320,12 -14839,6 +15320,12 @@@ F: include/linux/workqueue.
  F:    kernel/workqueue.c
  F:    Documentation/core-api/workqueue.rst
  
 +X-POWERS AXP288 PMIC DRIVERS
 +M:    Hans de Goede <[email protected]>
 +S:    Maintained
 +N:    axp288
 +F:    drivers/acpi/pmic/intel_pmic_xpower.c
 +
  X-POWERS MULTIFUNCTION PMIC DEVICE DRIVERS
  M:    Chen-Yu Tsai <[email protected]>
  L:    [email protected]
@@@ -15367,7 -14880,7 +15367,7 @@@ X86 PLATFORM DRIVER
  M:    Darren Hart <[email protected]>
  M:    Andy Shevchenko <[email protected]>
  L:    [email protected]
 -T:    git git://git.infradead.org/users/dvhart/linux-platform-drivers-x86.git
 +T:    git git://git.infradead.org/linux-platform-drivers-x86.git
  S:    Maintained
  F:    drivers/platform/x86/
  F:    drivers/platform/olpc/
@@@ -15453,7 -14966,6 +15453,7 @@@ F:   include/xen/interface/io/vscsiif.
  XEN SWIOTLB SUBSYSTEM
  M:    Konrad Rzeszutek Wilk <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  S:    Supported
  F:    arch/x86/xen/*swiotlb*
  F:    drivers/xen/*swiotlb*
index a9428daa69f3096367d028adc6c48f1280d4e139,f4308683c0af3911e9e193eae54f65b6cc87429d..949dd8a48164a3efe2618356ddffc3a7c96d79cc
  #include "include/apparmor.h"
  #include "include/apparmorfs.h"
  #include "include/audit.h"
- #include "include/context.h"
+ #include "include/cred.h"
  #include "include/crypto.h"
  #include "include/ipc.h"
- #include "include/policy_ns.h"
  #include "include/label.h"
  #include "include/policy.h"
  #include "include/policy_ns.h"
@@@ -120,9 -119,7 +119,7 @@@ static int aafs_count
  
  static int aafs_show_path(struct seq_file *seq, struct dentry *dentry)
  {
-       struct inode *inode = d_inode(dentry);
-       seq_printf(seq, "%s:[%lu]", AAFS_NAME, inode->i_ino);
+       seq_printf(seq, "%s:[%lu]", AAFS_NAME, d_inode(dentry)->i_ino);
        return 0;
  }
  
@@@ -313,6 -310,7 +310,7 @@@ static struct dentry *aafs_create_dir(c
   * @name: name of dentry to create
   * @parent: parent directory for this dentry
   * @target: if symlink, symlink target string
+  * @private: private data
   * @iops: struct of inode_operations that should be used
   *
   * If @target parameter is %NULL, then the @iops parameter needs to be
  static struct dentry *aafs_create_symlink(const char *name,
                                          struct dentry *parent,
                                          const char *target,
+                                         void *private,
                                          const struct inode_operations *iops)
  {
        struct dentry *dent;
        char *link = NULL;
  
        if (target) {
-               link = kstrdup(target, GFP_KERNEL);
                if (!link)
                        return ERR_PTR(-ENOMEM);
        }
-       dent = aafs_create(name, S_IFLNK | 0444, parent, NULL, link, NULL,
+       dent = aafs_create(name, S_IFLNK | 0444, parent, private, link, NULL,
                           iops);
        if (IS_ERR(dent))
                kfree(link);
@@@ -571,16 -569,16 +569,16 @@@ static int ns_revision_open(struct inod
        return 0;
  }
  
 -static unsigned int ns_revision_poll(struct file *file, poll_table *pt)
 +static __poll_t ns_revision_poll(struct file *file, poll_table *pt)
  {
        struct aa_revision *rev = file->private_data;
 -      unsigned int mask = 0;
 +      __poll_t mask = 0;
  
        if (rev) {
                mutex_lock_nested(&rev->ns->lock, rev->ns->level);
                poll_wait(file, &rev->ns->wait, pt);
                if (rev->last_read < rev->ns->revision)
 -                      mask |= POLLIN | POLLRDNORM;
 +                      mask |= EPOLLIN | EPOLLRDNORM;
                mutex_unlock(&rev->ns->lock);
        }
  
@@@ -622,7 -620,7 +620,7 @@@ static void profile_query_cb(struct aa_
                        tmp = aa_compute_fperms(dfa, state, &cond);
                }
        } else if (profile->policy.dfa) {
-               if (!PROFILE_MEDIATES_SAFE(profile, *match_str))
+               if (!PROFILE_MEDIATES(profile, *match_str))
                        return; /* no change to current perms */
                dfa = profile->policy.dfa;
                state = aa_dfa_match_len(dfa, profile->policy.start[0],
@@@ -1189,9 -1187,7 +1187,7 @@@ static int seq_ns_level_show(struct seq
  static int seq_ns_name_show(struct seq_file *seq, void *v)
  {
        struct aa_label *label = begin_current_label_crit_section();
-       seq_printf(seq, "%s\n", aa_ns_name(labels_ns(label),
-                                          labels_ns(label), true));
+       seq_printf(seq, "%s\n", labels_ns(label)->base.name);
        end_current_label_crit_section(label);
  
        return 0;
@@@ -1484,26 -1480,97 +1480,97 @@@ static int profile_depth(struct aa_prof
        return depth;
  }
  
- static int gen_symlink_name(char *buffer, size_t bsize, int depth,
-                           const char *dirname, const char *fname)
+ static char *gen_symlink_name(int depth, const char *dirname, const char *fname)
  {
+       char *buffer, *s;
        int error;
+       int size = depth * 6 + strlen(dirname) + strlen(fname) + 11;
+       s = buffer = kmalloc(size, GFP_KERNEL);
+       if (!buffer)
+               return ERR_PTR(-ENOMEM);
  
        for (; depth > 0; depth--) {
-               if (bsize < 7)
-                       return -ENAMETOOLONG;
-               strcpy(buffer, "../../");
-               buffer += 6;
-               bsize -= 6;
+               strcpy(s, "../../");
+               s += 6;
+               size -= 6;
        }
  
-       error = snprintf(buffer, bsize, "raw_data/%s/%s", dirname, fname);
-       if (error >= bsize || error < 0)
-               return -ENAMETOOLONG;
+       error = snprintf(s, size, "raw_data/%s/%s", dirname, fname);
+       if (error >= size || error < 0) {
+               kfree(buffer);
+               return ERR_PTR(-ENAMETOOLONG);
+       }
  
-       return 0;
+       return buffer;
+ }
+ static void rawdata_link_cb(void *arg)
+ {
+       kfree(arg);
+ }
+ static const char *rawdata_get_link_base(struct dentry *dentry,
+                                        struct inode *inode,
+                                        struct delayed_call *done,
+                                        const char *name)
+ {
+       struct aa_proxy *proxy = inode->i_private;
+       struct aa_label *label;
+       struct aa_profile *profile;
+       char *target;
+       int depth;
+       if (!dentry)
+               return ERR_PTR(-ECHILD);
+       label = aa_get_label_rcu(&proxy->label);
+       profile = labels_profile(label);
+       depth = profile_depth(profile);
+       target = gen_symlink_name(depth, profile->rawdata->name, name);
+       aa_put_label(label);
+       if (IS_ERR(target))
+               return target;
+       set_delayed_call(done, rawdata_link_cb, target);
+       return target;
+ }
+ static const char *rawdata_get_link_sha1(struct dentry *dentry,
+                                        struct inode *inode,
+                                        struct delayed_call *done)
+ {
+       return rawdata_get_link_base(dentry, inode, done, "sha1");
+ }
+ static const char *rawdata_get_link_abi(struct dentry *dentry,
+                                       struct inode *inode,
+                                       struct delayed_call *done)
+ {
+       return rawdata_get_link_base(dentry, inode, done, "abi");
+ }
+ static const char *rawdata_get_link_data(struct dentry *dentry,
+                                        struct inode *inode,
+                                        struct delayed_call *done)
+ {
+       return rawdata_get_link_base(dentry, inode, done, "raw_data");
  }
  
+ static const struct inode_operations rawdata_link_sha1_iops = {
+       .get_link       = rawdata_get_link_sha1,
+ };
+ static const struct inode_operations rawdata_link_abi_iops = {
+       .get_link       = rawdata_get_link_abi,
+ };
+ static const struct inode_operations rawdata_link_data_iops = {
+       .get_link       = rawdata_get_link_data,
+ };
  /*
   * Requires: @profile->ns->lock held
   */
@@@ -1574,34 -1641,28 +1641,28 @@@ int __aafs_profile_mkdir(struct aa_prof
        }
  
        if (profile->rawdata) {
-               char target[64];
-               int depth = profile_depth(profile);
-               error = gen_symlink_name(target, sizeof(target), depth,
-                                        profile->rawdata->name, "sha1");
-               if (error < 0)
-                       goto fail2;
-               dent = aafs_create_symlink("raw_sha1", dir, target, NULL);
+               dent = aafs_create_symlink("raw_sha1", dir, NULL,
+                                          profile->label.proxy,
+                                          &rawdata_link_sha1_iops);
                if (IS_ERR(dent))
                        goto fail;
+               aa_get_proxy(profile->label.proxy);
                profile->dents[AAFS_PROF_RAW_HASH] = dent;
  
-               error = gen_symlink_name(target, sizeof(target), depth,
-                                        profile->rawdata->name, "abi");
-               if (error < 0)
-                       goto fail2;
-               dent = aafs_create_symlink("raw_abi", dir, target, NULL);
+               dent = aafs_create_symlink("raw_abi", dir, NULL,
+                                          profile->label.proxy,
+                                          &rawdata_link_abi_iops);
                if (IS_ERR(dent))
                        goto fail;
+               aa_get_proxy(profile->label.proxy);
                profile->dents[AAFS_PROF_RAW_ABI] = dent;
  
-               error = gen_symlink_name(target, sizeof(target), depth,
-                                        profile->rawdata->name, "raw_data");
-               if (error < 0)
-                       goto fail2;
-               dent = aafs_create_symlink("raw_data", dir, target, NULL);
+               dent = aafs_create_symlink("raw_data", dir, NULL,
+                                          profile->label.proxy,
+                                          &rawdata_link_data_iops);
                if (IS_ERR(dent))
                        goto fail;
+               aa_get_proxy(profile->label.proxy);
                profile->dents[AAFS_PROF_RAW_DATA] = dent;
        }
  
@@@ -2152,6 -2213,10 +2213,10 @@@ static struct aa_sfs_entry aa_sfs_entry
        { }
  };
  
+ static struct aa_sfs_entry aa_sfs_entry_attach[] = {
+       AA_SFS_FILE_BOOLEAN("xattr", 1),
+       { }
+ };
  static struct aa_sfs_entry aa_sfs_entry_domain[] = {
        AA_SFS_FILE_BOOLEAN("change_hat",       1),
        AA_SFS_FILE_BOOLEAN("change_hatv",      1),
        AA_SFS_FILE_BOOLEAN("change_profile",   1),
        AA_SFS_FILE_BOOLEAN("stack",            1),
        AA_SFS_FILE_BOOLEAN("fix_binfmt_elf_mmap",      1),
+       AA_SFS_FILE_BOOLEAN("post_nnp_subset",  1),
+       AA_SFS_FILE_BOOLEAN("computed_longest_left",    1),
+       AA_SFS_DIR("attach_conditions",         aa_sfs_entry_attach),
        AA_SFS_FILE_STRING("version", "1.2"),
        { }
  };
@@@ -2167,6 -2235,7 +2235,7 @@@ static struct aa_sfs_entry aa_sfs_entry
        AA_SFS_FILE_BOOLEAN("v5",       1),
        AA_SFS_FILE_BOOLEAN("v6",       1),
        AA_SFS_FILE_BOOLEAN("v7",       1),
+       AA_SFS_FILE_BOOLEAN("v8",       1),
        { }
  };
  
@@@ -2202,6 -2271,7 +2271,7 @@@ static struct aa_sfs_entry aa_sfs_entry
        AA_SFS_DIR("policy",                    aa_sfs_entry_policy),
        AA_SFS_DIR("domain",                    aa_sfs_entry_domain),
        AA_SFS_DIR("file",                      aa_sfs_entry_file),
+       AA_SFS_DIR("network_v8",                aa_sfs_entry_network),
        AA_SFS_DIR("mount",                     aa_sfs_entry_mount),
        AA_SFS_DIR("namespaces",                aa_sfs_entry_ns),
        AA_SFS_FILE_U64("capability",           VFS_CAP_FLAGS_MASK),
@@@ -2394,29 -2464,18 +2464,18 @@@ static const char *policy_get_link(stru
        return NULL;
  }
  
- static int ns_get_name(char *buf, size_t size, struct aa_ns *ns,
-                      struct inode *inode)
- {
-       int res = snprintf(buf, size, "%s:[%lu]", AAFS_NAME, inode->i_ino);
-       if (res < 0 || res >= size)
-               res = -ENOENT;
-       return res;
- }
  static int policy_readlink(struct dentry *dentry, char __user *buffer,
                           int buflen)
  {
-       struct aa_ns *ns;
        char name[32];
        int res;
  
-       ns = aa_get_current_ns();
-       res = ns_get_name(name, sizeof(name), ns, d_inode(dentry));
-       if (res >= 0)
+       res = snprintf(name, sizeof(name), "%s:[%lu]", AAFS_NAME,
+                      d_inode(dentry)->i_ino);
+       if (res > 0 && res < sizeof(name))
                res = readlink_copy(buffer, buflen, name);
-       aa_put_ns(ns);
+       else
+               res = -ENOENT;
  
        return res;
  }
@@@ -2460,34 -2519,26 +2519,26 @@@ static int __init aa_create_aafs(void
  
        dent = securityfs_create_file(".load", 0666, aa_sfs_entry.dentry,
                                      NULL, &aa_fs_profile_load);
-       if (IS_ERR(dent)) {
-               error = PTR_ERR(dent);
-               goto error;
-       }
+       if (IS_ERR(dent))
+               goto dent_error;
        ns_subload(root_ns) = dent;
  
        dent = securityfs_create_file(".replace", 0666, aa_sfs_entry.dentry,
                                      NULL, &aa_fs_profile_replace);
-       if (IS_ERR(dent)) {
-               error = PTR_ERR(dent);
-               goto error;
-       }
+       if (IS_ERR(dent))
+               goto dent_error;
        ns_subreplace(root_ns) = dent;
  
        dent = securityfs_create_file(".remove", 0666, aa_sfs_entry.dentry,
                                      NULL, &aa_fs_profile_remove);
-       if (IS_ERR(dent)) {
-               error = PTR_ERR(dent);
-               goto error;
-       }
+       if (IS_ERR(dent))
+               goto dent_error;
        ns_subremove(root_ns) = dent;
  
        dent = securityfs_create_file("revision", 0444, aa_sfs_entry.dentry,
                                      NULL, &aa_fs_ns_revision_fops);
-       if (IS_ERR(dent)) {
-               error = PTR_ERR(dent);
-               goto error;
-       }
+       if (IS_ERR(dent))
+               goto dent_error;
        ns_subrevision(root_ns) = dent;
  
        /* policy tree referenced by magic policy symlink */
        /* magic symlink similar to nsfs redirects based on task policy */
        dent = securityfs_create_symlink("policy", aa_sfs_entry.dentry,
                                         NULL, &policy_link_iops);
-       if (IS_ERR(dent)) {
-               error = PTR_ERR(dent);
-               goto error;
-       }
+       if (IS_ERR(dent))
+               goto dent_error;
  
        error = aa_mk_null_file(aa_sfs_entry.dentry);
        if (error)
        aa_info_message("AppArmor Filesystem Enabled");
        return 0;
  
+ dent_error:
+       error = PTR_ERR(dent);
  error:
        aa_destroy_aafs();
        AA_ERROR("Error creating AppArmor securityfs\n");
diff --combined security/apparmor/lsm.c
index 528f59b580a8dffb2ab059c3f1bee1830a66ac73,956edebf83eba9e3e46938b4a77e401979220c89..ce2b89e9ad94eb9b5b657a8ccce703894c021e19
  #include <linux/sysctl.h>
  #include <linux/audit.h>
  #include <linux/user_namespace.h>
 -#include <linux/kmemleak.h>
  #include <net/sock.h>
  
  #include "include/apparmor.h"
  #include "include/apparmorfs.h"
  #include "include/audit.h"
  #include "include/capability.h"
- #include "include/context.h"
+ #include "include/cred.h"
  #include "include/file.h"
  #include "include/ipc.h"
+ #include "include/net.h"
  #include "include/path.h"
  #include "include/label.h"
  #include "include/policy.h"
@@@ -50,12 -52,12 +51,12 @@@ DEFINE_PER_CPU(struct aa_buffers, aa_bu
   */
  
  /*
-  * free the associated aa_task_ctx and put its labels
+  * put the associated labels
   */
  static void apparmor_cred_free(struct cred *cred)
  {
-       aa_free_task_context(cred_ctx(cred));
-       cred_ctx(cred) = NULL;
+       aa_put_label(cred_label(cred));
+       cred_label(cred) = NULL;
  }
  
  /*
   */
  static int apparmor_cred_alloc_blank(struct cred *cred, gfp_t gfp)
  {
-       /* freed by apparmor_cred_free */
-       struct aa_task_ctx *ctx = aa_alloc_task_context(gfp);
-       if (!ctx)
-               return -ENOMEM;
-       cred_ctx(cred) = ctx;
+       cred_label(cred) = NULL;
        return 0;
  }
  
  /*
-  * prepare new aa_task_ctx for modification by prepare_cred block
+  * prepare new cred label for modification by prepare_cred block
   */
  static int apparmor_cred_prepare(struct cred *new, const struct cred *old,
                                 gfp_t gfp)
  {
-       /* freed by apparmor_cred_free */
-       struct aa_task_ctx *ctx = aa_alloc_task_context(gfp);
-       if (!ctx)
-               return -ENOMEM;
-       aa_dup_task_context(ctx, cred_ctx(old));
-       cred_ctx(new) = ctx;
+       cred_label(new) = aa_get_newest_label(cred_label(old));
        return 0;
  }
  
   */
  static void apparmor_cred_transfer(struct cred *new, const struct cred *old)
  {
-       const struct aa_task_ctx *old_ctx = cred_ctx(old);
-       struct aa_task_ctx *new_ctx = cred_ctx(new);
+       cred_label(new) = aa_get_newest_label(cred_label(old));
+ }
+ static void apparmor_task_free(struct task_struct *task)
+ {
+       aa_free_task_ctx(task_ctx(task));
+       task_ctx(task) = NULL;
+ }
+ static int apparmor_task_alloc(struct task_struct *task,
+                              unsigned long clone_flags)
+ {
+       struct aa_task_ctx *new = aa_alloc_task_ctx(GFP_KERNEL);
+       if (!new)
+               return -ENOMEM;
+       aa_dup_task_ctx(new, task_ctx(current));
+       task_ctx(task) = new;
  
-       aa_dup_task_context(new_ctx, old_ctx);
+       return 0;
  }
  
  static int apparmor_ptrace_access_check(struct task_struct *child,
@@@ -576,11 -583,11 +582,11 @@@ static int apparmor_getprocattr(struct 
        int error = -ENOENT;
        /* released below */
        const struct cred *cred = get_task_cred(task);
-       struct aa_task_ctx *ctx = cred_ctx(cred);
+       struct aa_task_ctx *ctx = task_ctx(current);
        struct aa_label *label = NULL;
  
        if (strcmp(name, "current") == 0)
-               label = aa_get_newest_label(ctx->label);
+               label = aa_get_newest_label(cred_label(cred));
        else if (strcmp(name, "prev") == 0  && ctx->previous)
                label = aa_get_newest_label(ctx->previous);
        else if (strcmp(name, "exec") == 0 && ctx->onexec)
@@@ -677,11 -684,11 +683,11 @@@ fail
  static void apparmor_bprm_committing_creds(struct linux_binprm *bprm)
  {
        struct aa_label *label = aa_current_raw_label();
-       struct aa_task_ctx *new_ctx = cred_ctx(bprm->cred);
+       struct aa_label *new_label = cred_label(bprm->cred);
  
        /* bail out if unconfined or not changing profile */
-       if ((new_ctx->label->proxy == label->proxy) ||
-           (unconfined(new_ctx->label)))
+       if ((new_label->proxy == label->proxy) ||
+           (unconfined(new_label)))
                return;
  
        aa_inherit_files(bprm->cred, current->files);
        current->pdeath_signal = 0;
  
        /* reset soft limits and set hard limits for the new label */
-       __aa_transition_rlimits(label, new_ctx->label);
+       __aa_transition_rlimits(label, new_label);
  }
  
  /**
   */
  static void apparmor_bprm_committed_creds(struct linux_binprm *bprm)
  {
-       /* TODO: cleanup signals - ipc mediation */
+       /* clear out temporary/transitional state from the context */
+       aa_clear_task_ctx_trans(task_ctx(current));
        return;
  }
  
@@@ -716,23 -725,16 +724,23 @@@ static int apparmor_task_setrlimit(stru
  }
  
  static int apparmor_task_kill(struct task_struct *target, struct siginfo *info,
 -                            int sig, u32 secid)
 +                            int sig, const struct cred *cred)
  {
        struct aa_label *cl, *tl;
        int error;
  
 -      if (secid)
 -              /* TODO: after secid to label mapping is done.
 -               *  Dealing with USB IO specific behavior
 +      if (cred) {
 +              /*
 +               * Dealing with USB IO specific behavior
                 */
 -              return 0;
 +              cl = aa_get_newest_cred_label(cred);
 +              tl = aa_get_task_label(target);
 +              error = aa_may_signal(cl, tl, sig);
 +              aa_put_label(cl);
 +              aa_put_label(tl);
 +              return error;
 +      }
 +
        cl = __begin_current_label_crit_section();
        tl = aa_get_task_label(target);
        error = aa_may_signal(cl, tl, sig);
        return error;
  }
  
+ /**
+  * apparmor_sk_alloc_security - allocate and attach the sk_security field
+  */
+ static int apparmor_sk_alloc_security(struct sock *sk, int family, gfp_t flags)
+ {
+       struct aa_sk_ctx *ctx;
+       ctx = kzalloc(sizeof(*ctx), flags);
+       if (!ctx)
+               return -ENOMEM;
+       SK_CTX(sk) = ctx;
+       return 0;
+ }
+ /**
+  * apparmor_sk_free_security - free the sk_security field
+  */
+ static void apparmor_sk_free_security(struct sock *sk)
+ {
+       struct aa_sk_ctx *ctx = SK_CTX(sk);
+       SK_CTX(sk) = NULL;
+       aa_put_label(ctx->label);
+       aa_put_label(ctx->peer);
+       kfree(ctx);
+ }
+ /**
+  * apparmor_clone_security - clone the sk_security field
+  */
+ static void apparmor_sk_clone_security(const struct sock *sk,
+                                      struct sock *newsk)
+ {
+       struct aa_sk_ctx *ctx = SK_CTX(sk);
+       struct aa_sk_ctx *new = SK_CTX(newsk);
+       new->label = aa_get_label(ctx->label);
+       new->peer = aa_get_label(ctx->peer);
+ }
+ /**
+  * apparmor_socket_create - check perms before creating a new socket
+  */
+ static int apparmor_socket_create(int family, int type, int protocol, int kern)
+ {
+       struct aa_label *label;
+       int error = 0;
+       AA_BUG(in_interrupt());
+       label = begin_current_label_crit_section();
+       if (!(kern || unconfined(label)))
+               error = af_select(family,
+                                 create_perm(label, family, type, protocol),
+                                 aa_af_perm(label, OP_CREATE, AA_MAY_CREATE,
+                                            family, type, protocol));
+       end_current_label_crit_section(label);
+       return error;
+ }
+ /**
+  * apparmor_socket_post_create - setup the per-socket security struct
+  *
+  * Note:
+  * -   kernel sockets currently labeled unconfined but we may want to
+  *     move to a special kernel label
+  * -   socket may not have sk here if created with sock_create_lite or
+  *     sock_alloc. These should be accept cases which will be handled in
+  *     sock_graft.
+  */
+ static int apparmor_socket_post_create(struct socket *sock, int family,
+                                      int type, int protocol, int kern)
+ {
+       struct aa_label *label;
+       if (kern) {
+               struct aa_ns *ns = aa_get_current_ns();
+               label = aa_get_label(ns_unconfined(ns));
+               aa_put_ns(ns);
+       } else
+               label = aa_get_current_label();
+       if (sock->sk) {
+               struct aa_sk_ctx *ctx = SK_CTX(sock->sk);
+               aa_put_label(ctx->label);
+               ctx->label = aa_get_label(label);
+       }
+       aa_put_label(label);
+       return 0;
+ }
+ /**
+  * apparmor_socket_bind - check perms before bind addr to socket
+  */
+ static int apparmor_socket_bind(struct socket *sock,
+                               struct sockaddr *address, int addrlen)
+ {
+       AA_BUG(!sock);
+       AA_BUG(!sock->sk);
+       AA_BUG(!address);
+       AA_BUG(in_interrupt());
+       return af_select(sock->sk->sk_family,
+                        bind_perm(sock, address, addrlen),
+                        aa_sk_perm(OP_BIND, AA_MAY_BIND, sock->sk));
+ }
+ /**
+  * apparmor_socket_connect - check perms before connecting @sock to @address
+  */
+ static int apparmor_socket_connect(struct socket *sock,
+                                  struct sockaddr *address, int addrlen)
+ {
+       AA_BUG(!sock);
+       AA_BUG(!sock->sk);
+       AA_BUG(!address);
+       AA_BUG(in_interrupt());
+       return af_select(sock->sk->sk_family,
+                        connect_perm(sock, address, addrlen),
+                        aa_sk_perm(OP_CONNECT, AA_MAY_CONNECT, sock->sk));
+ }
+ /**
+  * apparmor_socket_list - check perms before allowing listen
+  */
+ static int apparmor_socket_listen(struct socket *sock, int backlog)
+ {
+       AA_BUG(!sock);
+       AA_BUG(!sock->sk);
+       AA_BUG(in_interrupt());
+       return af_select(sock->sk->sk_family,
+                        listen_perm(sock, backlog),
+                        aa_sk_perm(OP_LISTEN, AA_MAY_LISTEN, sock->sk));
+ }
+ /**
+  * apparmor_socket_accept - check perms before accepting a new connection.
+  *
+  * Note: while @newsock is created and has some information, the accept
+  *       has not been done.
+  */
+ static int apparmor_socket_accept(struct socket *sock, struct socket *newsock)
+ {
+       AA_BUG(!sock);
+       AA_BUG(!sock->sk);
+       AA_BUG(!newsock);
+       AA_BUG(in_interrupt());
+       return af_select(sock->sk->sk_family,
+                        accept_perm(sock, newsock),
+                        aa_sk_perm(OP_ACCEPT, AA_MAY_ACCEPT, sock->sk));
+ }
+ static int aa_sock_msg_perm(const char *op, u32 request, struct socket *sock,
+                           struct msghdr *msg, int size)
+ {
+       AA_BUG(!sock);
+       AA_BUG(!sock->sk);
+       AA_BUG(!msg);
+       AA_BUG(in_interrupt());
+       return af_select(sock->sk->sk_family,
+                        msg_perm(op, request, sock, msg, size),
+                        aa_sk_perm(op, request, sock->sk));
+ }
+ /**
+  * apparmor_socket_sendmsg - check perms before sending msg to another socket
+  */
+ static int apparmor_socket_sendmsg(struct socket *sock,
+                                  struct msghdr *msg, int size)
+ {
+       return aa_sock_msg_perm(OP_SENDMSG, AA_MAY_SEND, sock, msg, size);
+ }
+ /**
+  * apparmor_socket_recvmsg - check perms before receiving a message
+  */
+ static int apparmor_socket_recvmsg(struct socket *sock,
+                                  struct msghdr *msg, int size, int flags)
+ {
+       return aa_sock_msg_perm(OP_RECVMSG, AA_MAY_RECEIVE, sock, msg, size);
+ }
+ /* revaliation, get/set attr, shutdown */
+ static int aa_sock_perm(const char *op, u32 request, struct socket *sock)
+ {
+       AA_BUG(!sock);
+       AA_BUG(!sock->sk);
+       AA_BUG(in_interrupt());
+       return af_select(sock->sk->sk_family,
+                        sock_perm(op, request, sock),
+                        aa_sk_perm(op, request, sock->sk));
+ }
+ /**
+  * apparmor_socket_getsockname - check perms before getting the local address
+  */
+ static int apparmor_socket_getsockname(struct socket *sock)
+ {
+       return aa_sock_perm(OP_GETSOCKNAME, AA_MAY_GETATTR, sock);
+ }
+ /**
+  * apparmor_socket_getpeername - check perms before getting remote address
+  */
+ static int apparmor_socket_getpeername(struct socket *sock)
+ {
+       return aa_sock_perm(OP_GETPEERNAME, AA_MAY_GETATTR, sock);
+ }
+ /* revaliation, get/set attr, opt */
+ static int aa_sock_opt_perm(const char *op, u32 request, struct socket *sock,
+                           int level, int optname)
+ {
+       AA_BUG(!sock);
+       AA_BUG(!sock->sk);
+       AA_BUG(in_interrupt());
+       return af_select(sock->sk->sk_family,
+                        opt_perm(op, request, sock, level, optname),
+                        aa_sk_perm(op, request, sock->sk));
+ }
+ /**
+  * apparmor_getsockopt - check perms before getting socket options
+  */
+ static int apparmor_socket_getsockopt(struct socket *sock, int level,
+                                     int optname)
+ {
+       return aa_sock_opt_perm(OP_GETSOCKOPT, AA_MAY_GETOPT, sock,
+                               level, optname);
+ }
+ /**
+  * apparmor_setsockopt - check perms before setting socket options
+  */
+ static int apparmor_socket_setsockopt(struct socket *sock, int level,
+                                     int optname)
+ {
+       return aa_sock_opt_perm(OP_SETSOCKOPT, AA_MAY_SETOPT, sock,
+                               level, optname);
+ }
+ /**
+  * apparmor_socket_shutdown - check perms before shutting down @sock conn
+  */
+ static int apparmor_socket_shutdown(struct socket *sock, int how)
+ {
+       return aa_sock_perm(OP_SHUTDOWN, AA_MAY_SHUTDOWN, sock);
+ }
+ /**
+  * apparmor_socket_sock_recv_skb - check perms before associating skb to sk
+  *
+  * Note: can not sleep may be called with locks held
+  *
+  * dont want protocol specific in __skb_recv_datagram()
+  * to deny an incoming connection  socket_sock_rcv_skb()
+  */
+ static int apparmor_socket_sock_rcv_skb(struct sock *sk, struct sk_buff *skb)
+ {
+       return 0;
+ }
+ static struct aa_label *sk_peer_label(struct sock *sk)
+ {
+       struct aa_sk_ctx *ctx = SK_CTX(sk);
+       if (ctx->peer)
+               return ctx->peer;
+       return ERR_PTR(-ENOPROTOOPT);
+ }
+ /**
+  * apparmor_socket_getpeersec_stream - get security context of peer
+  *
+  * Note: for tcp only valid if using ipsec or cipso on lan
+  */
+ static int apparmor_socket_getpeersec_stream(struct socket *sock,
+                                            char __user *optval,
+                                            int __user *optlen,
+                                            unsigned int len)
+ {
+       char *name;
+       int slen, error = 0;
+       struct aa_label *label;
+       struct aa_label *peer;
+       label = begin_current_label_crit_section();
+       peer = sk_peer_label(sock->sk);
+       if (IS_ERR(peer)) {
+               error = PTR_ERR(peer);
+               goto done;
+       }
+       slen = aa_label_asxprint(&name, labels_ns(label), peer,
+                                FLAG_SHOW_MODE | FLAG_VIEW_SUBNS |
+                                FLAG_HIDDEN_UNCONFINED, GFP_KERNEL);
+       /* don't include terminating \0 in slen, it breaks some apps */
+       if (slen < 0) {
+               error = -ENOMEM;
+       } else {
+               if (slen > len) {
+                       error = -ERANGE;
+               } else if (copy_to_user(optval, name, slen)) {
+                       error = -EFAULT;
+                       goto out;
+               }
+               if (put_user(slen, optlen))
+                       error = -EFAULT;
+ out:
+               kfree(name);
+       }
+ done:
+       end_current_label_crit_section(label);
+       return error;
+ }
+ /**
+  * apparmor_socket_getpeersec_dgram - get security label of packet
+  * @sock: the peer socket
+  * @skb: packet data
+  * @secid: pointer to where to put the secid of the packet
+  *
+  * Sets the netlabel socket state on sk from parent
+  */
+ static int apparmor_socket_getpeersec_dgram(struct socket *sock,
+                                           struct sk_buff *skb, u32 *secid)
+ {
+       /* TODO: requires secid support */
+       return -ENOPROTOOPT;
+ }
+ /**
+  * apparmor_sock_graft - Initialize newly created socket
+  * @sk: child sock
+  * @parent: parent socket
+  *
+  * Note: could set off of SOCK_CTX(parent) but need to track inode and we can
+  *       just set sk security information off of current creating process label
+  *       Labeling of sk for accept case - probably should be sock based
+  *       instead of task, because of the case where an implicitly labeled
+  *       socket is shared by different tasks.
+  */
+ static void apparmor_sock_graft(struct sock *sk, struct socket *parent)
+ {
+       struct aa_sk_ctx *ctx = SK_CTX(sk);
+       if (!ctx->label)
+               ctx->label = aa_get_current_label();
+ }
  static struct security_hook_list apparmor_hooks[] __lsm_ro_after_init = {
        LSM_HOOK_INIT(ptrace_access_check, apparmor_ptrace_access_check),
        LSM_HOOK_INIT(ptrace_traceme, apparmor_ptrace_traceme),
        LSM_HOOK_INIT(getprocattr, apparmor_getprocattr),
        LSM_HOOK_INIT(setprocattr, apparmor_setprocattr),
  
+       LSM_HOOK_INIT(sk_alloc_security, apparmor_sk_alloc_security),
+       LSM_HOOK_INIT(sk_free_security, apparmor_sk_free_security),
+       LSM_HOOK_INIT(sk_clone_security, apparmor_sk_clone_security),
+       LSM_HOOK_INIT(socket_create, apparmor_socket_create),
+       LSM_HOOK_INIT(socket_post_create, apparmor_socket_post_create),
+       LSM_HOOK_INIT(socket_bind, apparmor_socket_bind),
+       LSM_HOOK_INIT(socket_connect, apparmor_socket_connect),
+       LSM_HOOK_INIT(socket_listen, apparmor_socket_listen),
+       LSM_HOOK_INIT(socket_accept, apparmor_socket_accept),
+       LSM_HOOK_INIT(socket_sendmsg, apparmor_socket_sendmsg),
+       LSM_HOOK_INIT(socket_recvmsg, apparmor_socket_recvmsg),
+       LSM_HOOK_INIT(socket_getsockname, apparmor_socket_getsockname),
+       LSM_HOOK_INIT(socket_getpeername, apparmor_socket_getpeername),
+       LSM_HOOK_INIT(socket_getsockopt, apparmor_socket_getsockopt),
+       LSM_HOOK_INIT(socket_setsockopt, apparmor_socket_setsockopt),
+       LSM_HOOK_INIT(socket_shutdown, apparmor_socket_shutdown),
+       LSM_HOOK_INIT(socket_sock_rcv_skb, apparmor_socket_sock_rcv_skb),
+       LSM_HOOK_INIT(socket_getpeersec_stream,
+                     apparmor_socket_getpeersec_stream),
+       LSM_HOOK_INIT(socket_getpeersec_dgram,
+                     apparmor_socket_getpeersec_dgram),
+       LSM_HOOK_INIT(sock_graft, apparmor_sock_graft),
        LSM_HOOK_INIT(cred_alloc_blank, apparmor_cred_alloc_blank),
        LSM_HOOK_INIT(cred_free, apparmor_cred_free),
        LSM_HOOK_INIT(cred_prepare, apparmor_cred_prepare),
        LSM_HOOK_INIT(bprm_committing_creds, apparmor_bprm_committing_creds),
        LSM_HOOK_INIT(bprm_committed_creds, apparmor_bprm_committed_creds),
  
+       LSM_HOOK_INIT(task_free, apparmor_task_free),
+       LSM_HOOK_INIT(task_alloc, apparmor_task_alloc),
        LSM_HOOK_INIT(task_setrlimit, apparmor_task_setrlimit),
        LSM_HOOK_INIT(task_kill, apparmor_task_kill),
  };
@@@ -1032,12 -1427,12 +1433,12 @@@ static int __init set_init_ctx(void
        struct cred *cred = (struct cred *)current->real_cred;
        struct aa_task_ctx *ctx;
  
-       ctx = aa_alloc_task_context(GFP_KERNEL);
+       ctx = aa_alloc_task_ctx(GFP_KERNEL);
        if (!ctx)
                return -ENOMEM;
  
-       ctx->label = aa_get_label(ns_unconfined(root_ns));
-       cred_ctx(cred) = ctx;
+       cred_label(cred) = aa_get_label(ns_unconfined(root_ns));
+       task_ctx(current) = ctx;
  
        return 0;
  }
This page took 0.212313 seconds and 4 git commands to generate.