diff options
Diffstat (limited to 'Next/merge.log')
| -rw-r--r-- | Next/merge.log | 15882 |
1 files changed, 15882 insertions, 0 deletions
diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..c3aa9b162cab --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,15882 @@ +$ date -R +Tue, 19 May 2020 08:59:50 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +Updating files: 75% (7995/10658)
Updating files: 76% (8101/10658)
Updating files: 77% (8207/10658)
Updating files: 78% (8314/10658)
Updating files: 79% (8420/10658)
Updating files: 80% (8527/10658)
Updating files: 81% (8633/10658)
Updating files: 82% (8740/10658)
Updating files: 83% (8847/10658)
Updating files: 84% (8953/10658)
Updating files: 85% (9060/10658)
Updating files: 86% (9166/10658)
Updating files: 87% (9273/10658)
Updating files: 88% (9380/10658)
Updating files: 89% (9486/10658)
Updating files: 90% (9593/10658)
Updating files: 91% (9699/10658)
Updating files: 92% (9806/10658)
Updating files: 93% (9912/10658)
Updating files: 94% (10019/10658)
Updating files: 95% (10126/10658)
Updating files: 96% (10232/10658)
Updating files: 97% (10339/10658)
Updating files: 98% (10445/10658)
Updating files: 99% (10552/10658)
Updating files: 100% (10658/10658)
Updating files: 100% (10658/10658), done. +HEAD is now at 9b1f2cbdb6d3 Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux +Merging origin/master (642b151f45dd Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity) +$ git merge origin/master +Updating 9b1f2cbdb6d3..642b151f45dd +Fast-forward + Makefile | 2 +- + drivers/char/ipmi/ipmi_ssif.c | 4 ++-- + fs/afs/fsclient.c | 8 +++---- + fs/afs/yfsclient.c | 8 +++---- + fs/exfat/file.c | 13 ++++++----- + fs/exfat/namei.c | 1 + + security/integrity/evm/evm_crypto.c | 46 ++++++++++++++++++------------------- + security/integrity/evm/evm_main.c | 4 ++-- + security/integrity/evm/evm_secfs.c | 9 +++++++- + security/integrity/ima/ima_crypto.c | 12 +++++----- + security/integrity/ima/ima_fs.c | 3 +-- + 11 files changed, 59 insertions(+), 51 deletions(-) +Merging fixes/master (cd2b06ec45d6 device_cgroup: Fix RCU list debugging warning) +$ git merge fixes/master +Updating 642b151f45dd..cd2b06ec45d6 +Fast-forward + security/device_cgroup.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging kbuild-current/fixes (6a8b55ed4056 Linux 5.7-rc3) +$ git merge kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (7915502377c5 ARC: show_regs: avoid extra line of output) +$ git merge arc-current/for-curr +Merge made by the 'recursive' strategy. + arch/arc/configs/hsdk_defconfig | 1 + + arch/arc/include/asm/dsp-impl.h | 2 ++ + arch/arc/include/asm/entry-arcv2.h | 2 ++ + arch/arc/kernel/Makefile | 3 --- + arch/arc/kernel/ptrace.c | 2 +- + arch/arc/kernel/setup.c | 5 +++-- + arch/arc/kernel/troubleshoot.c | 14 ++++++-------- + arch/arc/kernel/unwind.c | 2 -- + arch/arc/plat-eznps/Kconfig | 1 + + 9 files changed, 16 insertions(+), 16 deletions(-) +Merging arm-current/fixes (513149cba8f2 Merge branch 'uaccess' into fixes) +$ git merge arm-current/fixes +Merge made by the 'recursive' strategy. + arch/arm/boot/compressed/vmlinux.lds.S | 2 +- + arch/arm/include/asm/assembler.h | 75 +-------------------- + arch/arm/include/asm/uaccess-asm.h | 117 +++++++++++++++++++++++++++++++++ + arch/arm/kernel/atags_proc.c | 2 +- + arch/arm/kernel/entry-armv.S | 11 +--- + arch/arm/kernel/entry-header.S | 9 +-- + 6 files changed, 125 insertions(+), 91 deletions(-) + create mode 100644 arch/arm/include/asm/uaccess-asm.h +Merging arm-soc-fixes/arm/fixes (d5fef88ccbd3 Merge tag 'renesas-fixes-for-v5.7-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel into arm/fixes) +$ git merge arm-soc-fixes/arm/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (d51c214541c5 arm64: fix the flush_icache_range arguments in machine_kexec) +$ git merge arm64-fixes/for-next/fixes +Already up to date. +Merging m68k-current/for-linus (86cded5fc525 m68k: defconfig: Update defconfigs for v5.6-rc4) +$ git merge m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (249c9b0cd193 powerpc/40x: Make more space for system call exception) +$ git merge powerpc-fixes/fixes +Already up to date. +Merging s390-fixes/fixes (70b690547d5e s390/kexec_file: fix initrd location for kdump kernel) +$ git merge s390-fixes/fixes +Merge made by the 'recursive' strategy. + arch/s390/include/asm/pci_io.h | 10 +- + arch/s390/kernel/machine_kexec_file.c | 2 +- + arch/s390/pci/pci_mmio.c | 213 +++++++++++++++++++++++++++++++++- + 3 files changed, 220 insertions(+), 5 deletions(-) +Merging sparc/master (fcdf818d239e Merge branch 'sparc-scnprintf') +$ git merge sparc/master +Merge made by the 'recursive' strategy. + arch/sparc/kernel/cpumap.c | 2 +- + arch/sparc/kernel/ds.c | 8 ++++---- + arch/sparc/kernel/pci.c | 2 +- + arch/sparc/kernel/vio.c | 2 +- + arch/sparc/mm/init_64.c | 10 +++++----- + drivers/tty/vcc.c | 1 + + 6 files changed, 13 insertions(+), 12 deletions(-) +Merging fscrypt-current/for-stable (2b4eae95c736 fscrypt: don't evict dirty inodes after removing key) +$ git merge fscrypt-current/for-stable +Already up to date. +Merging net/master (e3f2d5579c0b net: phy: propagate an error back to the callers of phy_sfp_probe) +$ git merge net/master +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/net/dsa/b53.txt | 3 +++ + drivers/net/dsa/mt7530.c | 9 ++------- + drivers/net/dsa/mt7530.h | 1 + + drivers/net/ipa/gsi.c | 1 + + drivers/net/phy/phy_device.c | 4 ++-- + net/dsa/tag_mtk.c | 15 +++++++++++++++ + net/ipv4/nexthop.c | 2 +- + net/ipv4/route.c | 14 ++++++-------- + net/ipv6/ip6mr.c | 3 ++- + 9 files changed, 33 insertions(+), 19 deletions(-) +Merging bpf/master (f85c1598ddfe Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge bpf/master +Already up to date. +Merging ipsec/master (56b1b7c667fb esp6: calculate transport_header correctly when sel.family != AF_INET6) +$ git merge ipsec/master +Merge made by the 'recursive' strategy. + include/net/espintcp.h | 1 + + include/uapi/linux/xfrm.h | 2 +- + net/ipv4/esp4_offload.c | 17 ++++++++++------- + net/ipv4/ip_vti.c | 23 ++++++++++++++++++++++- + net/ipv6/esp6_offload.c | 37 +++++++++++++++++++++++++------------ + net/xfrm/espintcp.c | 2 ++ + net/xfrm/xfrm_device.c | 8 +++----- + net/xfrm/xfrm_input.c | 2 +- + net/xfrm/xfrm_interface.c | 21 +++++++++++++++++++++ + net/xfrm/xfrm_output.c | 12 +++++++----- + 10 files changed, 93 insertions(+), 32 deletions(-) +Merging netfilter/master (e3f2d5579c0b net: phy: propagate an error back to the callers of phy_sfp_probe) +$ git merge netfilter/master +Already up to date. +Merging ipvs/master (0141317611ab Merge branch 'hns3-fixes') +$ git merge ipvs/master +Already up to date. +Merging wireless-drivers/master (f92f26f2ed2c iwlwifi: pcie: handle QuZ configs with killer NICs as well) +$ git merge wireless-drivers/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 4 ++++ + 1 file changed, 4 insertions(+) +Merging mac80211/master (4a3de90b1184 mac80211: sta_info: Add lockdep condition for RCU list usage) +$ git merge mac80211/master +Merge made by the 'recursive' strategy. +Merging rdma-fixes/for-rc (ccfdbaa5cf46 RDMA/uverbs: Move IB_EVENT_DEVICE_FATAL to destroy_uobj) +$ git merge rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (b0cb099062b0 ALSA: iec1712: Initialize STDSP24 properly when using the model=staudio option) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/core/pcm_lib.c | 1 + + sound/pci/hda/patch_realtek.c | 1 + + sound/pci/ice1712/ice1712.c | 3 ++- + 3 files changed, 4 insertions(+), 1 deletion(-) +Merging sound-asoc-fixes/for-linus (c6bc5f5c6304 Merge remote-tracking branch 'asoc/for-5.7' into asoc-linus) +$ git merge sound-asoc-fixes/for-linus +Merge made by the 'recursive' strategy. + .../devicetree/bindings/sound/nau8825.txt | 2 +- + Documentation/devicetree/bindings/sound/rt1308.txt | 0 + sound/soc/amd/raven/acp3x-pcm-dma.c | 37 ++++--- + sound/soc/codecs/adau7118-i2c.c | 7 ++ + sound/soc/codecs/max9768.c | 2 +- + sound/soc/codecs/max98373.c | 2 +- + sound/soc/codecs/max9867.c | 4 +- + sound/soc/codecs/tlv320adcx140.c | 19 ++-- + sound/soc/codecs/tlv320adcx140.h | 1 + + sound/soc/codecs/wm8962.c | 7 +- + sound/soc/fsl/fsl_esai.c | 4 + + sound/soc/intel/baytrail/sst-baytrail-ipc.c | 4 +- + sound/soc/intel/boards/broadwell.c | 17 +++- + sound/soc/intel/common/sst-dsp.c | 9 +- + sound/soc/mediatek/mt8183/mt8183-afe-pcm.c | 7 +- + sound/soc/pxa/mmp-sspa.c | 5 +- + sound/soc/sof/control.c | 4 +- + sound/soc/sof/sof-audio.h | 2 +- + sound/soc/sof/topology.c | 2 + + sound/soc/tegra/tegra_alc5632.c | 7 +- + sound/soc/tegra/tegra_asoc_utils.c | 113 ++++++++++----------- + sound/soc/tegra/tegra_asoc_utils.h | 1 - + sound/soc/tegra/tegra_max98090.c | 22 ++-- + sound/soc/tegra/tegra_rt5640.c | 22 ++-- + sound/soc/tegra/tegra_rt5677.c | 7 +- + sound/soc/tegra/tegra_sgtl5000.c | 7 +- + sound/soc/tegra/tegra_wm8753.c | 22 ++-- + sound/soc/tegra/tegra_wm8903.c | 22 ++-- + sound/soc/tegra/tegra_wm9712.c | 8 +- + sound/soc/tegra/trimslice.c | 18 +--- + sound/soc/ti/davinci-mcasp.c | 4 +- + 31 files changed, 176 insertions(+), 212 deletions(-) + mode change 100755 => 100644 Documentation/devicetree/bindings/sound/rt1308.txt +Merging regmap-fixes/for-linus (cef570d20922 Merge remote-tracking branch 'regmap/for-5.7' into regmap-linus) +$ git merge regmap-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/base/regmap/regmap-debugfs.c | 6 ++++++ + 1 file changed, 6 insertions(+) +Merging regulator-fixes/for-linus (276b2684ec26 Merge remote-tracking branch 'regulator/for-5.7' into regulator-linus) +$ git merge regulator-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/regulator/qcom-rpmh-regulator.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) +Merging spi-fixes/for-linus (5b201ddd7775 Merge remote-tracking branch 'spi/for-5.7' into spi-linus) +$ git merge spi-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/spi/spi-axi-spi-engine.c | 32 +++++++++++++++--------------- + drivers/spi/spi-bcm-qspi.c | 43 +++++++++++++++++++++------------------- + drivers/spi/spi-ep93xx.c | 8 ++++++-- + drivers/spi/spi-sc18is602.c | 2 +- + drivers/spi/spi.c | 1 + + 5 files changed, 47 insertions(+), 39 deletions(-) +Merging pci-current/for-linus (ef46738cc47a MAINTAINERS: Add Rob Herring and remove Andy Murray as PCI reviewers) +$ git merge pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (2ef96a5bb12b Linux 5.7-rc5) +$ git merge driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (17b4efdf4e48 tty: serial: add missing spin_lock_init for SiFive serial console) +$ git merge tty.current/tty-linus +Merge made by the 'recursive' strategy. + drivers/tty/serial/sifive.c | 1 + + 1 file changed, 1 insertion(+) +Merging usb.current/usb-linus (b9bbe6ed63b2 Linux 5.7-rc6) +$ git merge usb.current/usb-linus +Already up to date. +Merging usb-gadget-fixes/fixes (172b14b48ca1 usb: cdns3: gadget: make a bunch of functions static) +$ git merge usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (78d6de3cfbd3 USB: serial: qcserial: Add DW5816e support) +$ git merge usb-serial-fixes/usb-linus +Already up to date. +Merging usb-chipidea-fixes/ci-for-usb-stable (b3f3736ac305 usb: chipidea: msm: Ensure proper controller reset using role switch API) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Merge made by the 'recursive' strategy. +Merging phy/fixes (820eeb9de62f phy: qualcomm: usb-hs-28nm: Prepare clocks in init) +$ git merge phy/fixes +Already up to date. +Merging staging.current/staging-linus (bcb392871813 Merge tag 'iio-fixes-for-5.7b' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus) +$ git merge staging.current/staging-linus +Merge made by the 'recursive' strategy. + drivers/iio/accel/sca3000.c | 2 +- + drivers/iio/adc/stm32-adc.c | 8 ++++---- + drivers/iio/adc/stm32-dfsdm-adc.c | 21 +++++++++++---------- + drivers/iio/adc/ti-ads8344.c | 8 +++++--- + drivers/iio/chemical/atlas-sensor.c | 14 +++++++++++++- + drivers/iio/dac/vf610_dac.c | 1 + + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c | 7 +++++-- + drivers/staging/greybus/uart.c | 4 ++-- + drivers/staging/iio/resolver/ad2s1210.c | 17 ++++++++++++----- + drivers/staging/kpc2000/kpc2000/core.c | 9 ++++----- + drivers/staging/wfx/scan.c | 4 +++- + 11 files changed, 61 insertions(+), 34 deletions(-) +Merging char-misc.current/char-misc-linus (1ea34b298855 bus: mhi: core: Fix some error return code) +$ git merge char-misc.current/char-misc-linus +Merge made by the 'recursive' strategy. + drivers/bus/mhi/core/init.c | 2 ++ + drivers/hwtracing/coresight/coresight-cti-platform.c | 4 ++-- + drivers/ipack/carriers/tpci200.c | 1 + + drivers/misc/mei/client.c | 2 ++ + 4 files changed, 7 insertions(+), 2 deletions(-) +Merging soundwire-fixes/fixes (8f3d9f354286 Linux 5.7-rc1) +$ git merge soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (2ef96a5bb12b Linux 5.7-rc5) +$ git merge thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (d34fced41e17 Input: applespi - replace zero-length array with flexible-array) +$ git merge input-current/for-linus +Merge made by the 'recursive' strategy. + drivers/input/evdev.c | 19 ++----- + drivers/input/joystick/xpad.c | 12 +++++ + drivers/input/keyboard/applespi.c | 2 +- + drivers/input/keyboard/cros_ec_keyb.c | 14 ++--- + drivers/input/keyboard/dlink-dir685-touchkeys.c | 2 +- + drivers/input/misc/axp20x-pek.c | 72 +++++++++++++------------ + drivers/input/rmi4/rmi_driver.c | 5 +- + drivers/input/serio/i8042-x86ia64io.h | 7 +++ + drivers/input/touchscreen/elants_i2c.c | 11 +++- + drivers/input/touchscreen/mms114.c | 12 ++--- + drivers/input/touchscreen/usbtouchscreen.c | 1 + + include/linux/input/lm8333.h | 2 +- + 12 files changed, 87 insertions(+), 72 deletions(-) +Merging crypto-current/master (a9a8ba90fa58 crypto: arch/nhpoly1305 - process in explicit 4k chunks) +$ git merge crypto-current/master +Already up to date. +Merging ide/master (63bef48fd6c9 Merge branch 'akpm' (patches from Andrew)) +$ git merge ide/master +Already up to date. +Merging vfio-fixes/for-linus (5cbf3264bc71 vfio/type1: Fix VA->PA translation for PFNMAP VMAs in vaddr_get_pfn()) +$ git merge vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (851c4df54dc1 selftests/lkdtm: Use grep -E instead of egrep) +$ git merge kselftest-fixes/fixes +Already up to date. +Merging modules-fixes/modules-linus (57baec7b1b04 scripts/nsdeps: make sure to pass all module source files to spatch) +$ git merge modules-fixes/modules-linus +Already up to date. +Merging slave-dma-fixes/fixes (be4054b8b667 dmaengine: ti: k3-udma: Fix TR mode flags for slave_sg and memcpy) +$ git merge slave-dma-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/dma/dmatest.c | 9 +++++---- + drivers/dma/idxd/device.c | 7 +++++++ + drivers/dma/idxd/irq.c | 26 +++++++++++++++++++------- + drivers/dma/owl-dma.c | 8 +++----- + drivers/dma/ti/k3-udma.c | 6 ++++-- + drivers/dma/xilinx/zynqmp_dma.c | 3 +-- + 6 files changed, 39 insertions(+), 20 deletions(-) +Merging backlight-fixes/for-backlight-fixes (219d54332a09 Linux 5.4) +$ git merge backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/mtd/fixes (7b01b7239d0d mtd: Fix mtd not registered due to nvmem name collision) +$ git merge mtd-fixes/mtd/fixes +Merge made by the 'recursive' strategy. + drivers/mtd/mtdcore.c | 2 +- + drivers/mtd/nand/spi/core.c | 4 ++++ + 2 files changed, 5 insertions(+), 1 deletion(-) +Merging mfd-fixes/for-mfd-fixes (603d9299da32 mfd: mt6397: Fix probe after changing mt6397-core) +$ git merge mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (8f3d9f354286 Linux 5.7-rc1) +$ git merge v4l-dvb-fixes/fixes +Already up to date. +Merging reset-fixes/reset/fixes (b460e0a9e240 reset: intel: add unspecified HAS_IOMEM dependency) +$ git merge reset-fixes/reset/fixes +Already up to date. +Merging mips-fixes/mips-fixes (8f3d9f354286 Linux 5.7-rc1) +$ git merge mips-fixes/mips-fixes +Already up to date. +Merging at91-fixes/at91-fixes (54ecb8f7028c Linux 5.4-rc1) +$ git merge at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (fb6823a6f980 ARM: dts: Fix wrong mdio clock for dm814x) +$ git merge omap-fixes/fixes +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/am437x-gp-evm.dts | 2 +- + arch/arm/boot/dts/am437x-idk-evm.dts | 2 +- + arch/arm/boot/dts/am437x-sk-evm.dts | 4 ++-- + arch/arm/boot/dts/am571x-idk.dts | 4 ++-- + arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi | 4 ++-- + arch/arm/boot/dts/am57xx-idk-common.dtsi | 4 ++-- + arch/arm/boot/dts/dm814x.dtsi | 2 +- + 7 files changed, 11 insertions(+), 11 deletions(-) +Merging kvm-fixes/master (c4e0e4ab4cf3 KVM: x86: Fix off-by-one error in kvm_vcpu_ioctl_x86_setup_mce) +$ git merge kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (5615e74f48dc KVM: s390: Remove false WARN_ON_ONCE for the PQAP instruction) +$ git merge kvms390-fixes/master +Already up to date. +Merging hwmon-fixes/hwmon (333e22db228f hwmon: (da9052) Synchronize access with mfd) +$ git merge hwmon-fixes/hwmon +Already up to date. +Merging nvdimm-fixes/libnvdimm-fixes (f84afbdd3a9e libnvdimm: Out of bounds read in __nd_ioctl()) +$ git merge nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging btrfs-fixes/next-fixes (4f28062adf92 Merge branch 'misc-5.7' into next-fixes) +$ git merge btrfs-fixes/next-fixes +Already up to date! +Merge made by the 'recursive' strategy. +Merging vfs-fixes/fixes (b0d3869ce9ee propagate_one(): mnt_set_mountpoint() needs mount_lock) +$ git merge vfs-fixes/fixes +Already up to date. +Merging dma-mapping-fixes/for-linus (9c24eaf81cc4 iommu/vt-d: Return the correct dma mask when we are bypassing the IOMMU) +$ git merge dma-mapping-fixes/for-linus +Already up to date. +Merging i3c-fixes/master (6fbc7275c7a9 Linux 5.2-rc7) +$ git merge i3c-fixes/master +Already up to date. +Merging drivers-x86-fixes/fixes (2ef96a5bb12b Linux 5.7-rc5) +$ git merge drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (8f3d9f354286 Linux 5.7-rc1) +$ git merge samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/pinctrl-fixes (8f3d9f354286 Linux 5.7-rc1) +$ git merge pinctrl-samsung-fixes/pinctrl-fixes +Already up to date. +Merging devicetree-fixes/dt/linus (4bc77b2d211e dt-bindings: phy: qcom-qusb2: Fix defaults) +$ git merge devicetree-fixes/dt/linus +Already up to date. +Merging scsi-fixes/fixes (f2e6b75f6ee8 scsi: target: Put lun_ref at end of tmr processing) +$ git merge scsi-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/scsi/qla2xxx/qla_attr.c | 3 --- + drivers/scsi/scsi_pm.c | 10 ++++++++-- + drivers/target/target_core_transport.c | 1 + + 3 files changed, 9 insertions(+), 5 deletions(-) +Merging drm-fixes/drm-fixes (1d2a1eb13610 Merge tag 'drm-misc-fixes-2020-05-14' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes) +$ git merge drm-fixes/drm-fixes +Already up to date. +Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue) +$ git merge amdgpu-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (955da9d77435 drm/i915: Handle idling during i915_gem_evict_something busy loops) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (2b17b8d7cc65 mmc: sdhci: Fix SDHCI_QUIRK_BROKEN_CQE) +$ git merge mmc-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/mmc/host/sdhci.c | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) +Merging rtc-fixes/rtc-fixes (8f3d9f354286 Linux 5.7-rc1) +$ git merge rtc-fixes/rtc-fixes +Already up to date. +Merging gnss-fixes/gnss-linus (2ef96a5bb12b Linux 5.7-rc5) +$ git merge gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (38dce4195f0d x86/hyperv: Properly suspend/resume reenlightenment notifications) +$ git merge hyperv-fixes/hyperv-fixes +Merge made by the 'recursive' strategy. + arch/x86/hyperv/hv_init.c | 19 +++++++++++++++++-- + 1 file changed, 17 insertions(+), 2 deletions(-) +Merging soc-fsl-fixes/fix (fe8fe7723a3a soc: fsl: dpio: register dpio irq handlers after dpio create) +$ git merge soc-fsl-fixes/fix +Already up to date. +Merging risc-v-fixes/fixes (ed1ed4c0da54 riscv: mmiowb: Fix implicit declaration of function 'smp_processor_id') +$ git merge risc-v-fixes/fixes +Already up to date. +Merging pidfd-fixes/fixes (3f2c788a1314 fork: prevent accidental access to clone3 features) +$ git merge pidfd-fixes/fixes +Already up to date. +Merging fpga-fixes/fixes (9edd5112d963 fpga: zynqmp: fix modular build) +$ git merge fpga-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/fpga/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging spdx/spdx-linus (6a8b55ed4056 Linux 5.7-rc3) +$ git merge spdx/spdx-linus +Already up to date. +Merging gpio-intel-fixes/fixes (8f3d9f354286 Linux 5.7-rc1) +$ git merge gpio-intel-fixes/fixes +Already up to date. +Merging pinctrl-intel-fixes/fixes (69388e15f507 pinctrl: cherryview: Add missing spinlock usage in chv_gpio_irq_handler) +$ git merge pinctrl-intel-fixes/fixes +Already up to date. +Merging erofs-fixes/fixes (d1eef1c61974 Linux 5.5-rc2) +$ git merge erofs-fixes/fixes +Already up to date. +Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc()) +$ git merge integrity-fixes/fixes +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (abf56fadf0e2 gpu/drm: Ingenic: Fix opaque pointer casted to wrong type) +$ git merge drm-misc-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/ingenic/ingenic-drm.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) +Merging kspp-gustavo/for-next/kspp (8b579b17886f media: s5k5baf: avoid gcc-10 zero-length-bounds warning) +$ git merge kspp-gustavo/for-next/kspp +Auto-merging include/net/mac80211.h +Auto-merging include/linux/nfs_xdr.h +Auto-merging include/linux/kvm_host.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/dmaengine.h +Auto-merging drivers/dma/ti/k3-udma.c +Auto-merging drivers/dma/tegra20-apb-dma.c +Merge made by the 'recursive' strategy. + arch/ia64/kernel/unwind_i.h | 2 +- + arch/m68k/amiga/config.c | 2 +- + arch/m68k/tools/amiga/dmesg.c | 2 +- + arch/powerpc/mm/hugetlbpage.c | 2 +- + arch/powerpc/platforms/powermac/nvram.c | 2 +- + arch/um/drivers/vector_kern.h | 2 +- + arch/um/drivers/vhost_user.h | 2 +- + arch/x86/kvm/vmx/vmcs.h | 2 +- + block/partitions/ldm.h | 2 +- + drivers/amba/tegra-ahb.c | 2 +- + drivers/block/drbd/drbd_int.h | 2 +- + drivers/block/drbd/drbd_protocol.h | 8 ++-- + drivers/block/rbd_types.h | 2 +- + drivers/crypto/chelsio/chcr_crypto.h | 8 ++-- + drivers/dma/milbeaut-hdmac.c | 2 +- + drivers/dma/milbeaut-xdmac.c | 2 +- + drivers/dma/moxart-dma.c | 2 +- + drivers/dma/tegra20-apb-dma.c | 2 +- + drivers/dma/ti/edma.c | 2 +- + drivers/dma/ti/k3-udma.c | 2 +- + drivers/dma/timb_dma.c | 2 +- + drivers/firewire/core-cdev.c | 2 +- + drivers/firewire/core-transaction.c | 2 +- + drivers/firewire/core.h | 2 +- + drivers/firewire/nosy.c | 2 +- + drivers/firewire/ohci.c | 2 +- + drivers/firmware/dmi-sysfs.c | 2 +- + drivers/firmware/google/memconsole-coreboot.c | 2 +- + drivers/firmware/google/vpd.c | 2 +- + drivers/firmware/iscsi_ibft.c | 2 +- + drivers/firmware/pcdp.h | 2 +- + drivers/fpga/dfl.h | 2 +- + drivers/hwtracing/stm/policy.c | 2 +- + drivers/hwtracing/stm/stm.h | 4 +- + drivers/md/dm-crypt.c | 2 +- + drivers/md/dm-integrity.c | 2 +- + drivers/md/dm-log-writes.c | 2 +- + drivers/md/dm-raid.c | 2 +- + drivers/md/dm-raid1.c | 2 +- + drivers/md/dm-stats.c | 2 +- + drivers/md/dm-stripe.c | 2 +- + drivers/md/dm-switch.c | 2 +- + drivers/md/md-linear.h | 2 +- + drivers/md/persistent-data/dm-btree-internal.h | 2 +- + drivers/md/raid1.h | 2 +- + drivers/md/raid10.h | 2 +- + drivers/media/i2c/s5k5baf.c | 4 +- + drivers/media/platform/qcom/venus/hfi_cmds.h | 2 +- + drivers/media/platform/qcom/venus/hfi_msgs.h | 10 ++-- + drivers/media/usb/pwc/pwc.h | 2 +- + drivers/net/can/peak_canfd/peak_pciefd_main.c | 4 +- + drivers/net/ethernet/i825xx/sun3_82586.h | 2 +- + drivers/net/wireless/ath/carl9170/fwcmd.h | 2 +- + drivers/net/wireless/ath/carl9170/hw.h | 2 +- + drivers/net/wireless/intel/ipw2x00/ipw2200.c | 2 +- + drivers/net/wireless/intel/ipw2x00/ipw2200.h | 10 ++-- + drivers/net/wireless/intel/ipw2x00/libipw.h | 28 +++++------ + drivers/net/wireless/intel/iwlegacy/commands.h | 22 ++++----- + drivers/net/wireless/intel/iwlegacy/iwl-spectrum.h | 4 +- + drivers/net/wireless/intel/iwlwifi/dvm/commands.h | 12 ++--- + .../net/wireless/intel/iwlwifi/fw/api/nvm-reg.h | 4 +- + drivers/net/wireless/intel/iwlwifi/fw/debugfs.c | 2 +- + drivers/net/wireless/intel/iwlwifi/iwl-op-mode.h | 2 +- + drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 2 +- + drivers/net/wireless/intersil/prism54/isl_oid.h | 8 ++-- + drivers/net/wireless/intersil/prism54/islpci_mgt.h | 2 +- + drivers/net/wireless/marvell/mwl8k.c | 2 +- + drivers/net/wireless/quantenna/qtnfmac/bus.h | 2 +- + drivers/net/wireless/quantenna/qtnfmac/qlink.h | 54 +++++++++++----------- + drivers/net/wireless/rndis_wlan.c | 8 ++-- + drivers/nvme/host/fc.c | 2 +- + drivers/nvme/host/lightnvm.c | 2 +- + drivers/oprofile/cpu_buffer.h | 2 +- + drivers/phy/samsung/phy-samsung-usb2.h | 2 +- + drivers/pnp/pnpbios/pnpbios.h | 2 +- + drivers/rapidio/rio-scan.c | 2 +- + drivers/soc/ti/knav_qmss.h | 2 +- + drivers/thermal/imx8mm_thermal.c | 2 +- + drivers/w1/w1_netlink.h | 4 +- + fs/aio.c | 2 +- + fs/binfmt_elf.c | 2 +- + fs/dlm/dlm_internal.h | 6 +-- + fs/dlm/user.c | 2 +- + fs/hfs/btree.h | 2 +- + fs/hfsplus/hfsplus_fs.h | 2 +- + fs/isofs/rock.h | 8 ++-- + fs/jffs2/nodelist.h | 2 +- + fs/jffs2/summary.h | 4 +- + fs/jfs/jfs_dtree.c | 2 +- + fs/jfs/jfs_xattr.h | 4 +- + fs/notify/fanotify/fanotify.h | 2 +- + fs/select.c | 4 +- + fs/squashfs/squashfs_fs.h | 16 +++---- + fs/xfs/libxfs/xfs_format.h | 2 +- + include/drm/drm_displayid.h | 2 +- + include/keys/encrypted-type.h | 2 +- + include/keys/rxrpc-type.h | 4 +- + include/keys/user-type.h | 2 +- + include/linux/can/skb.h | 2 +- + include/linux/cb710.h | 2 +- + include/linux/ceph/mon_client.h | 2 +- + include/linux/crush/crush.h | 2 +- + include/linux/dma/ti-cppi5.h | 4 +- + include/linux/dmaengine.h | 4 +- + include/linux/efi.h | 2 +- + include/linux/fs.h | 2 +- + include/linux/fscache-cache.h | 2 +- + include/linux/fsl/bestcomm/bestcomm.h | 2 +- + include/linux/i2c-mux.h | 2 +- + include/linux/ieee80211.h | 6 +-- + include/linux/kexec.h | 2 +- + include/linux/kprobes.h | 2 +- + include/linux/kvm_host.h | 2 +- + include/linux/libata.h | 2 +- + include/linux/mailbox/zynqmp-ipi-message.h | 2 +- + include/linux/mm.h | 2 +- + include/linux/mtd/cfi.h | 6 +-- + include/linux/mtd/qinfo.h | 2 +- + include/linux/nfs4.h | 2 +- + include/linux/nfs_xdr.h | 2 +- + include/linux/nvme.h | 2 +- + include/linux/platform_data/cros_ec_commands.h | 4 +- + include/linux/platform_data/cros_ec_proto.h | 2 +- + include/linux/sctp.h | 36 +++++++-------- + include/linux/tifm.h | 2 +- + include/net/cfg80211.h | 8 ++-- + include/net/mac80211.h | 10 ++-- + include/pcmcia/cistpl.h | 6 +-- + include/rdma/rdmavt_qp.h | 2 +- + kernel/locking/lockdep.c | 2 +- + kernel/params.c | 2 +- + kernel/sched/fair.c | 2 +- + kernel/sched/sched.h | 2 +- + kernel/trace/trace_probe.h | 2 +- + kernel/tracepoint.c | 2 +- + mm/slab.h | 2 +- + net/mac80211/ieee80211_i.h | 2 +- + net/wireless/core.h | 2 +- + samples/mei/mei-amt-version.c | 2 +- + security/apparmor/apparmorfs.c | 2 +- + security/integrity/ima/ima.h | 2 +- + security/integrity/integrity.h | 4 +- + sound/soc/intel/atom/sst-atom-controls.h | 2 +- + sound/soc/intel/skylake/skl-i2s.h | 2 +- + sound/soc/intel/skylake/skl-topology.h | 4 +- + sound/soc/intel/skylake/skl.h | 2 +- + sound/soc/sof/probe.h | 8 ++-- + tools/testing/nvdimm/test/nfit_test.h | 6 +-- + tools/testing/selftests/powerpc/pmu/ebb/trace.h | 4 +- + 149 files changed, 286 insertions(+), 286 deletions(-) +Merging kbuild/for-next (2c2d2528e3f0 Merge branch 'kconfig' into for-next) +$ git merge kbuild/for-next +Removing scripts/kconfig/tests/rand_nested_choice/expected_stdout2 +Removing scripts/kconfig/tests/rand_nested_choice/expected_stdout1 +Removing scripts/kconfig/tests/rand_nested_choice/expected_stdout0 +Removing scripts/kconfig/tests/rand_nested_choice/__init__.py +Removing scripts/kconfig/tests/rand_nested_choice/Kconfig +Auto-merging init/Kconfig +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Documentation/admin-guide/README.rst | 11 +- + Documentation/kbuild/makefiles.rst | 183 +++++++++++++++------ + Kconfig | 2 - + Makefile | 81 +++++---- + arch/arm/Makefile | 2 - + arch/arm64/Makefile | 2 - + arch/h8300/boot/compressed/Makefile | 2 +- + arch/hexagon/Makefile | 2 +- + arch/um/Makefile | 2 +- + arch/um/drivers/Makefile | 4 +- + arch/unicore32/lib/Makefile | 4 +- + include/linux/kconfig.h | 2 + + init/Kconfig | 30 +++- + init/Makefile | 2 +- + net/bpfilter/Kconfig | 6 +- + net/bpfilter/Makefile | 11 +- + samples/Kconfig | 26 ++- + samples/Makefile | 5 +- + samples/auxdisplay/Makefile | 11 +- + samples/connector/Makefile | 12 +- + samples/hidraw/Makefile | 9 +- + samples/mei/Makefile | 9 +- + samples/pidfd/Makefile | 8 +- + samples/seccomp/Makefile | 42 +---- + samples/timers/Makefile | 17 +- + samples/uhid/.gitignore | 2 + + samples/uhid/Makefile | 9 +- + samples/uhid/uhid-example.c | 4 +- + samples/vfs/Makefile | 11 +- + samples/watchdog/Makefile | 10 +- + scripts/Kbuild.include | 2 +- + scripts/Makefile.build | 6 + + scripts/Makefile.clean | 2 +- + scripts/Makefile.host | 4 +- + scripts/Makefile.lib | 26 ++- + scripts/Makefile.userprogs | 45 +++++ + scripts/basic/fixdep.c | 2 +- + scripts/checkstack.pl | 87 ++++++---- + scripts/gcc-plugins/Makefile | 2 +- + scripts/headers_install.sh | 11 +- + scripts/kconfig/Makefile | 11 +- + scripts/kconfig/menu.c | 3 +- + scripts/kconfig/parser.y | 30 ++-- + scripts/kconfig/streamline_config.pl | 21 +++ + scripts/kconfig/symbol.c | 2 +- + scripts/kconfig/tests/rand_nested_choice/Kconfig | 35 ---- + .../kconfig/tests/rand_nested_choice/__init__.py | 17 -- + .../tests/rand_nested_choice/expected_stdout0 | 2 - + .../tests/rand_nested_choice/expected_stdout1 | 4 - + .../tests/rand_nested_choice/expected_stdout2 | 5 - + scripts/mkcompile_h | 3 +- + scripts/mod/modpost.c | 2 +- + scripts/mod/modpost.h | 2 +- + scripts/modules-check.sh | 16 +- + usr/include/Makefile | 6 +- + 55 files changed, 496 insertions(+), 371 deletions(-) + create mode 100644 samples/uhid/.gitignore + create mode 100644 scripts/Makefile.userprogs + delete mode 100644 scripts/kconfig/tests/rand_nested_choice/Kconfig + delete mode 100644 scripts/kconfig/tests/rand_nested_choice/__init__.py + delete mode 100644 scripts/kconfig/tests/rand_nested_choice/expected_stdout0 + delete mode 100644 scripts/kconfig/tests/rand_nested_choice/expected_stdout1 + delete mode 100644 scripts/kconfig/tests/rand_nested_choice/expected_stdout2 +Merging compiler-attributes/compiler-attributes (98d54f81e36b Linux 5.6-rc4) +$ git merge compiler-attributes/compiler-attributes +Already up to date. +Merging leaks/leaks-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge leaks/leaks-next +Already up to date. +Merging dma-mapping/for-next (94d1aed9f477 Merge branch 'dma-sg_table-helper' into dma-mapping-for-next) +$ git merge dma-mapping/for-next +Auto-merging arch/x86/Kconfig +Merge made by the 'recursive' strategy. + arch/x86/Kconfig | 1 + + drivers/iommu/dma-iommu.c | 5 +- + include/linux/dma-direct.h | 2 + + include/linux/dma-mapping.h | 86 ++++++++++++++- + include/linux/iommu.h | 16 +++ + include/linux/scatterlist.h | 50 ++++++++- + kernel/dma/Kconfig | 6 +- + kernel/dma/Makefile | 1 + + kernel/dma/contiguous.c | 4 +- + kernel/dma/debug.c | 2 +- + kernel/dma/direct.c | 56 ++++++++-- + kernel/dma/pool.c | 264 ++++++++++++++++++++++++++++++++++++++++++++ + kernel/dma/remap.c | 121 +------------------- + 13 files changed, 470 insertions(+), 144 deletions(-) + create mode 100644 kernel/dma/pool.c +Merging asm-generic/master (060dc911501f nds32: fix build failure caused by page table folding updates) +$ git merge asm-generic/master +Already up to date. +Merging arc/for-next (def9d2780727 Linux 5.5-rc7) +$ git merge arc/for-next +Already up to date. +Merging arm/for-next (ddc69f025fdc Merge branches 'fixes' and 'misc' into for-next) +$ git merge arm/for-next +Removing arch/arm/boot/compressed/libfdt_env.h +Auto-merging arch/arm/boot/compressed/head.S +Merge made by the 'recursive' strategy. + arch/arm/boot/compressed/.gitignore | 9 ---- + arch/arm/boot/compressed/Makefile | 41 +++++++--------- + arch/arm/boot/compressed/atags_to_fdt.c | 1 + + arch/arm/boot/compressed/fdt.c | 2 + + arch/arm/boot/compressed/fdt_get_mem_start.c | 56 ++++++++++++++++++++++ + arch/arm/boot/compressed/fdt_ro.c | 2 + + arch/arm/boot/compressed/fdt_rw.c | 2 + + arch/arm/boot/compressed/fdt_wip.c | 2 + + arch/arm/boot/compressed/head.S | 54 ++++++++++++++++++++- + arch/arm/boot/compressed/libfdt_env.h | 24 ---------- + arch/arm/include/asm/assembler.h | 3 +- + arch/arm/kernel/sys_oabi-compat.c | 15 ++---- + drivers/gpu/drm/armada/armada_drv.c | 2 +- + .../gpu/drm/bridge/synopsys/dw-hdmi-ahb-audio.c | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 2 +- + drivers/media/cec/cec-notifier.c | 2 +- + drivers/net/phy/swphy.c | 2 +- + include/media/cec-notifier.h | 2 +- + 18 files changed, 148 insertions(+), 75 deletions(-) + create mode 100644 arch/arm/boot/compressed/fdt.c + create mode 100644 arch/arm/boot/compressed/fdt_get_mem_start.c + create mode 100644 arch/arm/boot/compressed/fdt_ro.c + create mode 100644 arch/arm/boot/compressed/fdt_rw.c + create mode 100644 arch/arm/boot/compressed/fdt_wip.c + delete mode 100644 arch/arm/boot/compressed/libfdt_env.h +Merging arm64/for-next/core (7508b88c922b Merge branch 'for-next/kvm/errata' into for-next/core) +$ git merge arm64/for-next/core +Auto-merging tools/testing/selftests/wireguard/qemu/debug.config +Auto-merging include/linux/mm.h +Auto-merging fs/binfmt_elf.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/arm64/kvm/hyp/sysreg-sr.c +Auto-merging arch/arm64/kernel/vdso/Makefile +Auto-merging arch/arm64/Makefile +Auto-merging arch/arm64/Kconfig +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kdump/vmcoreinfo.rst | 6 + + Documentation/arm64/booting.rst | 3 +- + Documentation/arm64/cpu-feature-registers.rst | 2 + + Documentation/arm64/elf_hwcaps.rst | 5 + + Documentation/arm64/silicon-errata.rst | 8 +- + Documentation/filesystems/proc.rst | 1 + + arch/arm64/Kconfig | 157 +++++++---- + arch/arm64/Makefile | 12 +- + arch/arm64/include/asm/asm_pointer_auth.h | 43 ++- + arch/arm64/include/asm/assembler.h | 50 ++++ + arch/arm64/include/asm/cacheflush.h | 6 +- + arch/arm64/include/asm/compiler.h | 4 - + arch/arm64/include/asm/cpucaps.h | 17 +- + arch/arm64/include/asm/cpufeature.h | 12 + + arch/arm64/include/asm/debug-monitors.h | 2 + + arch/arm64/include/asm/elf.h | 50 ++++ + arch/arm64/include/asm/esr.h | 2 +- + arch/arm64/include/asm/exception.h | 1 + + arch/arm64/include/asm/hwcap.h | 1 + + arch/arm64/include/asm/insn.h | 30 ++- + arch/arm64/include/asm/kvm_emulate.h | 6 +- + arch/arm64/include/asm/kvm_host.h | 4 - + arch/arm64/include/asm/kvm_hyp.h | 2 +- + arch/arm64/include/asm/linkage.h | 46 ++++ + arch/arm64/include/asm/mman.h | 37 +++ + arch/arm64/include/asm/pgtable-hwdef.h | 2 +- + arch/arm64/include/asm/pgtable-prot.h | 11 + + arch/arm64/include/asm/pgtable.h | 9 +- + arch/arm64/include/asm/ptrace.h | 1 + + arch/arm64/include/asm/smp.h | 11 - + arch/arm64/include/asm/stacktrace.h | 40 +-- + arch/arm64/include/asm/sysreg.h | 39 ++- + arch/arm64/include/uapi/asm/hwcap.h | 1 + + arch/arm64/include/uapi/asm/mman.h | 9 + + arch/arm64/include/uapi/asm/ptrace.h | 9 + + arch/arm64/kernel/asm-offsets.c | 3 - + arch/arm64/kernel/cpu-reset.S | 4 +- + arch/arm64/kernel/cpu_errata.c | 29 +-- + arch/arm64/kernel/cpufeature.c | 289 ++++++++++++++++----- + arch/arm64/kernel/cpuinfo.c | 5 +- + arch/arm64/kernel/crash_core.c | 4 + + arch/arm64/kernel/debug-monitors.c | 4 +- + arch/arm64/kernel/efi-entry.S | 2 +- + arch/arm64/kernel/efi-header.S | 2 +- + arch/arm64/kernel/efi-rt-wrapper.S | 4 +- + arch/arm64/kernel/entry-common.c | 13 +- + arch/arm64/kernel/entry-fpsimd.S | 20 +- + arch/arm64/kernel/entry.S | 31 +-- + arch/arm64/kernel/head.S | 43 +-- + arch/arm64/kernel/hibernate-asm.S | 16 +- + arch/arm64/kernel/hyp-stub.S | 20 +- + arch/arm64/kernel/image-vars.h | 2 +- + arch/arm64/kernel/insn.c | 46 ++-- + arch/arm64/kernel/machine_kexec_file.c | 14 +- + arch/arm64/kernel/probes/decode-insn.c | 2 +- + arch/arm64/kernel/probes/kprobes_trampoline.S | 4 +- + arch/arm64/kernel/process.c | 41 ++- + arch/arm64/kernel/ptrace.c | 2 +- + arch/arm64/kernel/reloc_test_syms.S | 44 ++-- + arch/arm64/kernel/relocate_kernel.S | 4 +- + arch/arm64/kernel/sdei.c | 28 +- + arch/arm64/kernel/signal.c | 16 ++ + arch/arm64/kernel/sleep.S | 13 +- + arch/arm64/kernel/smccc-call.S | 8 +- + arch/arm64/kernel/smp.c | 10 +- + arch/arm64/kernel/syscall.c | 18 ++ + arch/arm64/kernel/traps.c | 133 +++++----- + arch/arm64/kernel/vdso.c | 155 ++++++----- + arch/arm64/kernel/vdso/Makefile | 10 +- + arch/arm64/kernel/vdso/note.S | 3 + + arch/arm64/kernel/vdso/sigreturn.S | 3 + + arch/arm64/kernel/vdso/vdso.S | 3 + + arch/arm64/kernel/vmlinux.lds.S | 18 +- + arch/arm64/kvm/hyp/switch.c | 6 +- + arch/arm64/kvm/hyp/sysreg-sr.c | 6 +- + arch/arm64/kvm/hyp/tlb.c | 11 +- + arch/arm64/kvm/reset.c | 12 +- + arch/arm64/lib/copy_from_user.S | 32 +-- + arch/arm64/lib/copy_in_user.S | 32 +-- + arch/arm64/lib/copy_to_user.S | 32 +-- + arch/arm64/lib/crc32.S | 2 +- + arch/arm64/lib/memcpy.S | 32 +-- + arch/arm64/mm/dump.c | 5 + + arch/arm64/mm/init.c | 2 +- + arch/arm64/mm/mmu.c | 24 ++ + arch/arm64/mm/pageattr.c | 4 +- + arch/arm64/mm/proc.S | 46 +--- + arch/arm64/net/bpf_jit.h | 30 +++ + arch/arm64/net/bpf_jit_comp.c | 85 +++++- + arch/x86/Kconfig | 1 + + arch/x86/Kconfig.debug | 9 - + arch/x86/entry/entry_32.S | 2 - + arch/x86/include/asm/doublefault.h | 2 +- + arch/x86/include/asm/traps.h | 2 - + arch/x86/kernel/Makefile | 4 +- + arch/x86/kernel/dumpstack_32.c | 4 - + arch/x86/kernel/traps.c | 2 - + arch/x86/mm/cpu_entry_area.c | 4 +- + drivers/acpi/arm64/gtdt.c | 4 +- + drivers/acpi/arm64/iort.c | 112 ++++---- + drivers/firmware/arm_sdei.c | 37 +-- + drivers/perf/Kconfig | 9 +- + drivers/perf/arm_dsu_pmu.c | 4 +- + drivers/perf/arm_smmuv3_pmu.c | 5 +- + drivers/perf/arm_spe_pmu.c | 4 +- + drivers/perf/hisilicon/Kconfig | 7 + + drivers/perf/hisilicon/Makefile | 3 +- + drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c | 10 +- + drivers/perf/hisilicon/hisi_uncore_hha_pmu.c | 12 +- + drivers/perf/hisilicon/hisi_uncore_l3c_pmu.c | 10 +- + drivers/perf/hisilicon/hisi_uncore_pmu.c | 23 +- + fs/Kconfig.binfmt | 6 + + fs/binfmt_elf.c | 145 ++++++++++- + fs/compat_binfmt_elf.c | 4 + + fs/proc/task_mmu.c | 3 + + include/linux/elf.h | 43 +++ + include/linux/linkage.h | 8 +- + include/linux/mm.h | 3 + + include/uapi/linux/elf.h | 11 + + lib/Kconfig | 3 + + .../testing/selftests/wireguard/qemu/debug.config | 1 - + 121 files changed, 1700 insertions(+), 863 deletions(-) + create mode 100644 arch/arm64/include/asm/mman.h + create mode 100644 arch/arm64/include/uapi/asm/mman.h + create mode 100644 drivers/perf/hisilicon/Kconfig +Merging arm-perf/for-next/perf (10f6cd2af21b pmu/smmuv3: Clear IRQ affinity hint on device removal) +$ git merge arm-perf/for-next/perf +Already up to date. +Merging arm-soc/for-next (fc4c1091c327 soc: document merges) +$ git merge arm-soc/for-next +Removing include/linux/platform_data/clk-integrator.h +Removing drivers/misc/vexpress-syscfg.c +Removing arch/arm/plat-versatile/sched-clock.c +Removing arch/arm/plat-versatile/include/plat/sched_clock.h +Removing arch/arm/plat-versatile/Kconfig +Removing arch/arm/mach-integrator/lm.h +Removing arch/arm/mach-integrator/lm.c +Removing arch/arm/mach-integrator/impd1.h +Removing arch/arm/mach-integrator/impd1.c +Auto-merging arch/arm/Makefile +Merge made by the 'recursive' strategy. + .../bindings/bus/arm,integrator-ap-lm.yaml | 83 ++++ + MAINTAINERS | 7 +- + arch/arm/Kconfig | 4 +- + arch/arm/Kconfig.debug | 10 + + arch/arm/Makefile | 3 + + arch/arm/arm-soc-for-next-contents.txt | 52 +++ + arch/arm/kernel/time.c | 2 +- + arch/arm/mach-actions/Kconfig | 1 - + arch/arm/mach-alpine/Kconfig | 1 - + arch/arm/mach-asm9260/Kconfig | 1 - + arch/arm/mach-aspeed/Kconfig | 1 - + arch/arm/mach-berlin/Kconfig | 1 - + arch/arm/mach-clps711x/Kconfig | 5 - + arch/arm/mach-davinci/Kconfig | 1 - + arch/arm/mach-integrator/Kconfig | 9 +- + arch/arm/mach-integrator/Makefile | 3 +- + arch/arm/mach-integrator/impd1.c | 475 --------------------- + arch/arm/mach-integrator/impd1.h | 15 - + arch/arm/mach-integrator/integrator_ap.c | 31 -- + arch/arm/mach-integrator/lm.c | 96 ----- + arch/arm/mach-integrator/lm.h | 24 -- + arch/arm/mach-mediatek/mediatek.c | 2 +- + arch/arm/mach-mmp/Kconfig | 1 - + arch/arm/mach-mmp/mmp-dt.c | 2 +- + arch/arm/mach-mmp/mmp2-dt.c | 2 +- + arch/arm/mach-mvebu/Kconfig | 3 - + arch/arm/mach-omap2/Kconfig | 1 - + arch/arm/mach-omap2/omap-smp.c | 2 +- + arch/arm/mach-omap2/pm33xx-core.c | 2 +- + arch/arm/mach-omap2/sleep34xx.S | 2 +- + arch/arm/mach-prima2/Kconfig | 1 - + arch/arm/mach-realtek/Kconfig | 11 + + arch/arm/mach-realtek/Makefile | 2 + + arch/arm/mach-realtek/rtd1195.c | 40 ++ + arch/arm/mach-realview/Kconfig | 10 - + arch/arm/mach-s3c64xx/mach-crag6410-module.c | 7 +- + arch/arm/mach-shmobile/setup-rcar-gen2.c | 2 + + arch/arm/mach-socfpga/Kconfig | 1 - + arch/arm/mach-tegra/pm.c | 4 + + arch/arm/mach-tegra/reset-handler.S | 7 +- + arch/arm/mach-tegra/sleep-tegra30.S | 16 +- + arch/arm/mach-tegra/tegra.c | 8 +- + arch/arm/mach-versatile/Kconfig | 1 - + arch/arm/mach-versatile/versatile_dt.c | 5 - + arch/arm/mach-vexpress/Kconfig | 4 - + arch/arm/mach-vexpress/core.h | 1 + + arch/arm/mach-vexpress/dcscb.c | 1 + + arch/arm/mach-vexpress/v2m.c | 23 + + arch/arm/mm/cache-b15-rac.c | 3 +- + arch/arm/plat-samsung/adc.c | 8 +- + arch/arm/plat-versatile/Kconfig | 7 - + arch/arm/plat-versatile/Makefile | 1 - + arch/arm/plat-versatile/include/plat/sched_clock.h | 7 - + arch/arm/plat-versatile/sched-clock.c | 28 -- + arch/arm64/Kconfig.platforms | 3 - + drivers/amba/bus.c | 14 +- + drivers/bus/Kconfig | 11 +- + drivers/bus/Makefile | 2 +- + drivers/bus/arm-integrator-lm.c | 128 ++++++ + drivers/bus/vexpress-config.c | 354 ++++++++++++--- + drivers/clk/Makefile | 2 +- + drivers/clk/versatile/Kconfig | 26 +- + drivers/clk/versatile/clk-impd1.c | 121 ------ + drivers/clk/versatile/clk-vexpress-osc.c | 20 +- + drivers/firmware/tegra/bpmp.c | 9 +- + drivers/firmware/trusted_foundations.c | 21 +- + drivers/mfd/Kconfig | 5 +- + drivers/mfd/vexpress-sysreg.c | 99 +---- + drivers/misc/Kconfig | 9 - + drivers/misc/Makefile | 1 - + drivers/misc/vexpress-syscfg.c | 280 ------------ + include/linux/firmware/trusted_foundations.h | 1 + + include/linux/platform_data/clk-integrator.h | 2 - + include/linux/vexpress.h | 30 -- + 74 files changed, 769 insertions(+), 1409 deletions(-) + create mode 100644 Documentation/devicetree/bindings/bus/arm,integrator-ap-lm.yaml + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + delete mode 100644 arch/arm/mach-integrator/impd1.c + delete mode 100644 arch/arm/mach-integrator/impd1.h + delete mode 100644 arch/arm/mach-integrator/lm.c + delete mode 100644 arch/arm/mach-integrator/lm.h + create mode 100644 arch/arm/mach-realtek/Kconfig + create mode 100644 arch/arm/mach-realtek/Makefile + create mode 100644 arch/arm/mach-realtek/rtd1195.c + delete mode 100644 arch/arm/plat-versatile/Kconfig + delete mode 100644 arch/arm/plat-versatile/include/plat/sched_clock.h + delete mode 100644 arch/arm/plat-versatile/sched-clock.c + create mode 100644 drivers/bus/arm-integrator-lm.c + delete mode 100644 drivers/misc/vexpress-syscfg.c + delete mode 100644 include/linux/platform_data/clk-integrator.h +Merging amlogic/for-next (036596b100a1 Merge branch 'v5.8/defconfig' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 6 +- + .../boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi | 18 +++--- + arch/arm64/boot/dts/amlogic/meson-g12b-s922x.dtsi | 15 +++++ + .../boot/dts/amlogic/meson-g12b-ugoos-am6.dts | 2 +- + .../boot/dts/amlogic/meson-gx-libretech-pc.dtsi | 47 ++++++++++++++- + .../arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 66 ++++++++++++++++++++- + arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 23 ++++++-- + arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts | 2 +- + .../boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 2 +- + .../boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts | 2 +- + .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 2 +- + .../boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 2 +- + .../boot/dts/amlogic/meson-gxbb-wetek-play2.dts | 4 +- + arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi | 2 +- + arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 23 ++++++++ + .../dts/amlogic/meson-gxl-s805x-libretech-ac.dts | 43 +++++++++++++- + .../boot/dts/amlogic/meson-gxl-s805x-p241.dts | 3 +- + .../dts/amlogic/meson-gxl-s905d-phicomm-n1.dts | 4 ++ + .../boot/dts/amlogic/meson-gxl-s905w-p281.dts | 4 ++ + .../boot/dts/amlogic/meson-gxl-s905w-tx3-mini.dts | 4 ++ + .../dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 4 ++ + .../dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 47 ++++++++++++++- + .../dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts | 3 +- + .../boot/dts/amlogic/meson-gxl-s905x-p212.dtsi | 3 +- + arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 68 +++++++++++++++------- + .../boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 3 +- + .../arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts | 3 +- + arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts | 4 +- + arch/arm64/boot/dts/amlogic/meson-gxm-vega-s96.dts | 4 ++ + arch/arm64/boot/dts/amlogic/meson-gxm.dtsi | 7 ++- + arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi | 4 +- + arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts | 2 +- + arch/arm64/configs/defconfig | 2 + + 33 files changed, 362 insertions(+), 66 deletions(-) +Merging aspeed/for-next (fa4c8ec6feaa ARM: dts: aspeed: Change KCS nodes to v2 binding) +$ git merge aspeed/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/Makefile | 2 + + arch/arm/boot/dts/aspeed-ast2600-evb.dts | 4 + + .../arm/boot/dts/aspeed-bmc-facebook-tiogapass.dts | 78 ++++- + .../boot/dts/aspeed-bmc-facebook-yosemitev2.dts | 231 +++++++++++++++ + arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 202 +++++++++---- + arch/arm/boot/dts/aspeed-bmc-opp-mihawk.dts | 310 ++++++++++++++++++-- + arch/arm/boot/dts/aspeed-bmc-opp-nicole.dts | 326 +++++++++++++++++++++ + arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts | 35 ++- + arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts | 112 +++++++ + arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 34 +++ + arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts | 37 ++- + arch/arm/boot/dts/aspeed-g4.dtsi | 10 + + arch/arm/boot/dts/aspeed-g5.dtsi | 43 ++- + arch/arm/boot/dts/aspeed-g6.dtsi | 64 +++- + 14 files changed, 1378 insertions(+), 110 deletions(-) + create mode 100644 arch/arm/boot/dts/aspeed-bmc-facebook-yosemitev2.dts + create mode 100644 arch/arm/boot/dts/aspeed-bmc-opp-nicole.dts +Merging at91/at91-next (ec539e70d882 Merge branches 'at91-soc', 'at91-dt' and 'at91-defconfig' into at91-next) +$ git merge at91/at91-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging imx-mxs/for-next (36a816eea186 Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/fsl.yaml | 4 + + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/e60k02.dtsi | 2 + + arch/arm/boot/dts/imx6dl-colibri-v1_1-eval-v3.dts | 31 ++ + arch/arm/boot/dts/imx6q-dhcom-pdk2.dts | 115 +++++- + arch/arm/boot/dts/imx6qdl-colibri-v1_1-uhs.dtsi | 44 +++ + arch/arm/boot/dts/imx6qdl-colibri.dtsi | 11 +- + arch/arm/boot/dts/imx6qdl-sr-som.dtsi | 11 + + arch/arm/boot/dts/imx7-tqma7.dtsi | 2 +- + arch/arm/boot/dts/imx7d-cl-som-imx7.dts | 4 + + arch/arm/boot/dts/imx7d-colibri.dtsi | 4 + + arch/arm/boot/dts/imx7d-nitrogen7.dts | 4 + + arch/arm/boot/dts/imx7d-sdb.dts | 4 + + arch/arm/boot/dts/imx7d-tqma7.dtsi | 4 + + arch/arm/boot/dts/imx7d-zii-rmu2.dts | 2 +- + arch/arm/boot/dts/imx7d-zii-rpu2.dts | 2 +- + arch/arm/boot/dts/ls1021a-twr.dts | 14 + + arch/arm/mach-imx/cpu.c | 16 + + arch/arm/mach-imx/mach-vf610.c | 53 +++ + arch/arm/mach-imx/mxc.h | 6 + + arch/arm64/boot/dts/freescale/fsl-ls1012a-frdm.dts | 15 + + arch/arm64/boot/dts/freescale/fsl-ls1012a-frwy.dts | 15 + + arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts | 15 + + arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts | 15 + + arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 13 + + arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 6 + + arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 130 ++++++- + .../dts/freescale/imx8mm-beacon-baseboard.dtsi | 285 ++++++++++++++ + .../arm64/boot/dts/freescale/imx8mm-beacon-kit.dts | 19 + + .../boot/dts/freescale/imx8mm-beacon-som.dtsi | 410 +++++++++++++++++++++ + arch/arm64/boot/dts/freescale/imx8mm-evk.dts | 12 + + arch/arm64/boot/dts/freescale/imx8mm.dtsi | 4 + + arch/arm64/boot/dts/freescale/imx8mn-ddr4-evk.dts | 12 + + arch/arm64/boot/dts/freescale/imx8mn.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 74 ++++ + .../boot/dts/freescale/imx8mq-librem5-devkit.dts | 4 +- + arch/arm64/boot/dts/freescale/imx8qxp-mek.dts | 93 +++-- + arch/arm64/boot/dts/freescale/imx8qxp.dtsi | 18 +- + arch/arm64/boot/dts/freescale/qoriq-fman3-0.dtsi | 1 + + arch/arm64/configs/defconfig | 1 + + drivers/clk/imx/Kconfig | 8 +- + drivers/clk/imx/clk-gate2.c | 31 +- + drivers/clk/imx/clk-imx6ul.c | 2 +- + drivers/clk/imx/clk-imx7ulp.c | 6 +- + drivers/clk/imx/clk-pll14xx.c | 8 +- + drivers/clk/imx/clk-pllv3.c | 16 +- + drivers/clk/imx/clk-sscg-pll.c | 10 - + drivers/clk/imx/clk.h | 55 ++- + drivers/firmware/imx/imx-scu.c | 62 +++- + drivers/soc/imx/soc-imx8m.c | 7 +- + include/dt-bindings/clock/imx7ulp-clock.h | 5 +- + include/dt-bindings/clock/imx8mp-clock.h | 62 ++++ + 52 files changed, 1631 insertions(+), 119 deletions(-) + create mode 100644 arch/arm/boot/dts/imx6dl-colibri-v1_1-eval-v3.dts + create mode 100644 arch/arm/boot/dts/imx6qdl-colibri-v1_1-uhs.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-beacon-baseboard.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-beacon-kit.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-beacon-som.dtsi +Merging keystone/next (560b4d4691b0 Merge branch 'for_5.7/keystone-dts' into next) +$ git merge keystone/next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/keystone-k2g-evm.dts | 101 +++++++++++++++++++++++++++++++++ + arch/arm/boot/dts/keystone-k2g.dtsi | 22 +++++++ + 2 files changed, 123 insertions(+) +Merging mediatek/for-next (931dde8affeb Merge branch 'v5.7-next/soc' into for-next) +$ git merge mediatek/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/mediatek.yaml | 22 + + .../bindings/arm/mediatek/mediatek,mmsys.txt | 7 +- + .../devicetree/bindings/gpu/arm,mali-utgard.yaml | 2 + + .../devicetree/bindings/i2c/i2c-mt65xx.txt | 1 + + arch/arm/boot/dts/mt2701-evb.dts | 21 + + arch/arm/boot/dts/mt2701.dtsi | 33 + + arch/arm/boot/dts/mt7623.dtsi | 25 + + arch/arm/boot/dts/mt7623n-rfb-emmc.dts | 1 + + arch/arm64/boot/dts/mediatek/Makefile | 3 + + arch/arm64/boot/dts/mediatek/mt2712e.dtsi | 42 +- + arch/arm64/boot/dts/mediatek/mt6797-x20-dev.dts | 49 + + arch/arm64/boot/dts/mediatek/mt6797.dtsi | 229 +++- + .../boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts | 4 + + arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts | 4 + + arch/arm64/boot/dts/mediatek/mt7622.dtsi | 11 + + .../boot/dts/mediatek/mt8173-elm-hana-rev7.dts | 27 + + arch/arm64/boot/dts/mediatek/mt8173-elm-hana.dts | 14 + + arch/arm64/boot/dts/mediatek/mt8173-elm-hana.dtsi | 70 ++ + arch/arm64/boot/dts/mediatek/mt8173-elm.dts | 14 + + arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi | 1173 ++++++++++++++++++++ + arch/arm64/boot/dts/mediatek/mt8173.dtsi | 82 +- + arch/arm64/boot/dts/mediatek/mt8183.dtsi | 26 +- + drivers/clk/mediatek/Kconfig | 7 + + drivers/clk/mediatek/Makefile | 1 + + drivers/clk/mediatek/clk-mt8173-mm.c | 146 +++ + drivers/clk/mediatek/clk-mt8173.c | 104 -- + drivers/gpu/drm/mediatek/Kconfig | 1 + + drivers/gpu/drm/mediatek/mtk_disp_color.c | 5 +- + drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 5 +- + drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 5 +- + drivers/gpu/drm/mediatek/mtk_dpi.c | 12 +- + drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 19 +- + drivers/gpu/drm/mediatek/mtk_drm_ddp.c | 259 +---- + drivers/gpu/drm/mediatek/mtk_drm_ddp.h | 7 - + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 45 +- + drivers/gpu/drm/mediatek/mtk_drm_drv.h | 2 +- + drivers/gpu/drm/mediatek/mtk_dsi.c | 8 +- + drivers/gpu/drm/mediatek/mtk_hdmi.c | 4 +- + drivers/soc/mediatek/Kconfig | 8 + + drivers/soc/mediatek/Makefile | 1 + + drivers/soc/mediatek/mtk-cmdq-helper.c | 4 +- + drivers/soc/mediatek/mtk-mmsys.c | 338 ++++++ + include/linux/soc/mediatek/mtk-mmsys.h | 20 + + 43 files changed, 2385 insertions(+), 476 deletions(-) + create mode 100644 arch/arm64/boot/dts/mediatek/mt8173-elm-hana-rev7.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8173-elm-hana.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8173-elm-hana.dtsi + create mode 100644 arch/arm64/boot/dts/mediatek/mt8173-elm.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi + create mode 100644 drivers/clk/mediatek/clk-mt8173-mm.c + create mode 100644 drivers/soc/mediatek/mtk-mmsys.c + create mode 100644 include/linux/soc/mediatek/mtk-mmsys.h +Merging mvebu/for-next (869da228bd45 Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge mvebu/for-next +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/armada-370-xp.dtsi | 2 - + arch/arm/boot/dts/armada-375.dtsi | 2 - + arch/arm/boot/dts/armada-38x.dtsi | 2 - + arch/arm/boot/dts/armada-39x.dtsi | 4 - + arch/arm/boot/dts/dove.dtsi | 1 - + arch/arm/boot/dts/kirkwood-l-50.dts | 438 +++++++++++++++++++++ + .../boot/dts/kirkwood-netgear_readynas_nv+_v2.dts | 14 + + arch/arm64/boot/dts/marvell/armada-3720-db.dts | 3 + + .../boot/dts/marvell/armada-3720-espressobin.dtsi | 2 +- + .../boot/dts/marvell/armada-3720-turris-mox.dts | 10 +- + arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts | 22 +- + arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 4 +- + .../dts/marvell/armada-8040-clearfog-gt-8k.dts | 2 +- + .../dts/marvell/armada-8040-mcbin-singleshot.dts | 4 +- + arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts | 4 +- + arch/arm64/boot/dts/marvell/armada-ap80x.dtsi | 1 - + 18 files changed, 489 insertions(+), 28 deletions(-) + create mode 100644 arch/arm/boot/dts/kirkwood-l-50.dts +Merging omap/for-next (e2cfa48ea595 Merge branch 'fixes' into for-next) +$ git merge omap/for-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/am335x-guardian.dts | 1 + + arch/arm/boot/dts/am3517-evm.dts | 1 + + arch/arm/boot/dts/am571x-idk.dts | 48 +- + arch/arm/boot/dts/am5729-beagleboneai.dts | 731 +++++++++++++++++++++++ + arch/arm/boot/dts/am572x-idk-common.dtsi | 63 +- + arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi | 63 +- + arch/arm/boot/dts/am57xx-idk-common.dtsi | 58 ++ + arch/arm/boot/dts/dra7-evm-common.dtsi | 1 + + arch/arm/boot/dts/dra7-evm.dts | 54 ++ + arch/arm/boot/dts/dra7-ipu-dsp-common.dtsi | 39 ++ + arch/arm/boot/dts/dra7-l4.dtsi | 50 +- + arch/arm/boot/dts/dra7.dtsi | 36 ++ + arch/arm/boot/dts/dra71-evm.dts | 42 ++ + arch/arm/boot/dts/dra72-evm-common.dtsi | 18 +- + arch/arm/boot/dts/dra72-evm-revc.dts | 42 ++ + arch/arm/boot/dts/dra72-evm.dts | 42 ++ + arch/arm/boot/dts/dra72x.dtsi | 6 + + arch/arm/boot/dts/dra74-ipu-dsp-common.dtsi | 18 + + arch/arm/boot/dts/dra74x.dtsi | 21 + + arch/arm/boot/dts/dra76-evm.dts | 54 ++ + arch/arm/boot/dts/logicpd-torpedo-baseboard.dtsi | 1 + + arch/arm/boot/dts/omap3-gta04.dtsi | 1 + + arch/arm/boot/dts/omap5-l4.dtsi | 31 + + arch/arm/boot/dts/omap5.dtsi | 86 +++ + arch/arm/mach-omap2/clockdomains44xx_data.c | 2 +- + arch/arm/mach-omap2/clockdomains54xx_data.c | 2 +- + 27 files changed, 1430 insertions(+), 82 deletions(-) + create mode 100644 arch/arm/boot/dts/am5729-beagleboneai.dts + create mode 100644 arch/arm/boot/dts/dra7-ipu-dsp-common.dtsi + create mode 100644 arch/arm/boot/dts/dra74-ipu-dsp-common.dtsi +Merging qcom/for-next (54142d225360 Merge branches 'arm64-defconfig-for-5.8', 'arm64-for-5.8', 'drivers-for-5.8' and 'dts-for-5.8' into for-next) +$ git merge qcom/for-next +Auto-merging arch/arm64/configs/defconfig +Removing arch/arm64/boot/dts/qcom/apq8016-sbc-soc-pins.dtsi +Removing arch/arm64/boot/dts/qcom/apq8016-sbc-pmic-pins.dtsi +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/cpus.yaml | 1 + + Documentation/devicetree/bindings/arm/qcom.yaml | 7 + + .../devicetree/bindings/iommu/arm,smmu.yaml | 1 + + .../devicetree/bindings/power/qcom,rpmpd.yaml | 1 + + .../devicetree/bindings/soc/qcom/qcom,aoss-qmp.txt | 1 + + .../devicetree/bindings/soc/qcom/qcom,apr.txt | 20 +- + arch/arm/boot/dts/qcom-ipq4019.dtsi | 1 + + arch/arm/boot/dts/qcom-ipq8064.dtsi | 6 + + arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts | 405 ++++++++- + arch/arm/boot/dts/qcom-msm8974.dtsi | 11 + + arch/arm64/boot/dts/qcom/Makefile | 1 + + .../arm64/boot/dts/qcom/apq8016-sbc-pmic-pins.dtsi | 74 -- + arch/arm64/boot/dts/qcom/apq8016-sbc-soc-pins.dtsi | 89 -- + arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 257 +++++- + arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 53 +- + arch/arm64/boot/dts/qcom/ipq8074-hk01.dts | 112 ++- + arch/arm64/boot/dts/qcom/ipq8074.dtsi | 474 +++++----- + .../boot/dts/qcom/msm8916-longcheer-l8150.dts | 25 +- + arch/arm64/boot/dts/qcom/msm8916-pins.dtsi | 221 +++-- + .../dts/qcom/msm8916-samsung-a2015-common.dtsi | 98 ++- + .../boot/dts/qcom/msm8916-samsung-a3u-eur.dts | 54 ++ + .../boot/dts/qcom/msm8916-samsung-a5u-eur.dts | 35 + + arch/arm64/boot/dts/qcom/msm8916.dtsi | 228 ++++- + arch/arm64/boot/dts/qcom/msm8996.dtsi | 87 +- + arch/arm64/boot/dts/qcom/msm8998.dtsi | 38 +- + arch/arm64/boot/dts/qcom/pm8150.dtsi | 14 +- + arch/arm64/boot/dts/qcom/pm8150b.dtsi | 14 +- + arch/arm64/boot/dts/qcom/pm8150l.dtsi | 14 +- + arch/arm64/boot/dts/qcom/pmi8994.dtsi | 6 + + arch/arm64/boot/dts/qcom/qcs404-evb.dtsi | 85 +- + arch/arm64/boot/dts/qcom/qcs404.dtsi | 100 +++ + arch/arm64/boot/dts/qcom/sc7180-idp.dts | 66 +- + arch/arm64/boot/dts/qcom/sc7180.dtsi | 952 +++++++++++++++++++-- + .../arm64/boot/dts/qcom/sdm660-xiaomi-lavender.dts | 46 + + arch/arm64/boot/dts/qcom/sdm660.dtsi | 372 ++++++++ + arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 2 + + arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 210 +++++ + arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 2 +- + arch/arm64/boot/dts/qcom/sdm845.dtsi | 98 ++- + .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 13 + + arch/arm64/boot/dts/qcom/sm8250-mtp.dts | 351 ++++++++ + arch/arm64/boot/dts/qcom/sm8250.dtsi | 126 ++- + arch/arm64/configs/defconfig | 9 +- + drivers/firmware/qcom_scm-legacy.c | 2 +- + drivers/firmware/qcom_scm.c | 11 +- + drivers/soc/qcom/Kconfig | 6 +- + drivers/soc/qcom/cmd-db.c | 78 +- + drivers/soc/qcom/pdr_interface.c | 4 - + drivers/soc/qcom/qcom_aoss.c | 1 + + drivers/soc/qcom/rpmh-internal.h | 59 +- + drivers/soc/qcom/rpmh-rsc.c | 746 +++++++++++----- + drivers/soc/qcom/rpmh.c | 97 +-- + drivers/soc/qcom/rpmhpd.c | 24 + + drivers/soc/qcom/rpmpd.c | 5 + + drivers/soc/qcom/smp2p.c | 4 +- + drivers/soc/qcom/socinfo.c | 6 + + include/dt-bindings/power/qcom-rpmpd.h | 12 + + include/soc/qcom/cmd-db.h | 1 + + kernel/cpu_pm.c | 4 +- + 59 files changed, 4731 insertions(+), 1109 deletions(-) + delete mode 100644 arch/arm64/boot/dts/qcom/apq8016-sbc-pmic-pins.dtsi + delete mode 100644 arch/arm64/boot/dts/qcom/apq8016-sbc-soc-pins.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sdm660-xiaomi-lavender.dts + create mode 100644 arch/arm64/boot/dts/qcom/sdm660.dtsi +Merging raspberrypi/for-next (f5e216e42689 ARM: dts: bcm283x: Use firmware PM driver for V3D) +$ git merge raspberrypi/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 13 ++++++++++++- + arch/arm/boot/dts/bcm2835-common.dtsi | 1 - + arch/arm/boot/dts/bcm2835-rpi-common.dtsi | 12 ++++++++++++ + arch/arm/boot/dts/bcm2835.dtsi | 1 + + arch/arm/boot/dts/bcm2836.dtsi | 1 + + arch/arm/boot/dts/bcm2837.dtsi | 1 + + arch/arm/configs/bcm2835_defconfig | 1 + + 7 files changed, 28 insertions(+), 2 deletions(-) + create mode 100644 arch/arm/boot/dts/bcm2835-rpi-common.dtsi +Merging realtek/for-next (486f29df6941 Merge branch 'v5.8/dt' into next) +$ git merge realtek/for-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/realtek.yaml | 21 ++ + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + arch/arm/boot/dts/Makefile | 3 + + arch/arm/boot/dts/rtd1195-horseradish.dts | 32 +++ + arch/arm/boot/dts/rtd1195-mele-x1000.dts | 32 +++ + arch/arm/boot/dts/rtd1195.dtsi | 217 +++++++++++++++++++ + arch/arm64/boot/dts/realtek/Makefile | 6 + + arch/arm64/boot/dts/realtek/rtd1293-ds418j.dts | 6 +- + arch/arm64/boot/dts/realtek/rtd1293.dtsi | 12 +- + arch/arm64/boot/dts/realtek/rtd1295-mele-v9.dts | 6 +- + .../arm64/boot/dts/realtek/rtd1295-probox2-ava.dts | 6 +- + arch/arm64/boot/dts/realtek/rtd1295-xnano-x5.dts | 30 +++ + arch/arm64/boot/dts/realtek/rtd1295-zidoo-x9s.dts | 4 +- + arch/arm64/boot/dts/realtek/rtd1295.dtsi | 21 +- + arch/arm64/boot/dts/realtek/rtd1296-ds418.dts | 4 +- + arch/arm64/boot/dts/realtek/rtd1296.dtsi | 8 +- + arch/arm64/boot/dts/realtek/rtd129x.dtsi | 221 +++++++++++++------- + arch/arm64/boot/dts/realtek/rtd1395-bpi-m4.dts | 30 +++ + arch/arm64/boot/dts/realtek/rtd1395-lionskin.dts | 36 ++++ + arch/arm64/boot/dts/realtek/rtd1395.dtsi | 65 ++++++ + arch/arm64/boot/dts/realtek/rtd139x.dtsi | 193 +++++++++++++++++ + arch/arm64/boot/dts/realtek/rtd1619-mjolnir.dts | 44 ++++ + arch/arm64/boot/dts/realtek/rtd1619.dtsi | 12 ++ + arch/arm64/boot/dts/realtek/rtd16xx.dtsi | 229 +++++++++++++++++++++ + include/dt-bindings/reset/realtek,rtd1195.h | 74 +++++++ + include/dt-bindings/reset/realtek,rtd1295.h | 3 + + 26 files changed, 1208 insertions(+), 109 deletions(-) + create mode 100644 arch/arm/boot/dts/rtd1195-horseradish.dts + create mode 100644 arch/arm/boot/dts/rtd1195-mele-x1000.dts + create mode 100644 arch/arm/boot/dts/rtd1195.dtsi + create mode 100644 arch/arm64/boot/dts/realtek/rtd1295-xnano-x5.dts + create mode 100644 arch/arm64/boot/dts/realtek/rtd1395-bpi-m4.dts + create mode 100644 arch/arm64/boot/dts/realtek/rtd1395-lionskin.dts + create mode 100644 arch/arm64/boot/dts/realtek/rtd1395.dtsi + create mode 100644 arch/arm64/boot/dts/realtek/rtd139x.dtsi + create mode 100644 arch/arm64/boot/dts/realtek/rtd1619-mjolnir.dts + create mode 100644 arch/arm64/boot/dts/realtek/rtd1619.dtsi + create mode 100644 arch/arm64/boot/dts/realtek/rtd16xx.dtsi + create mode 100644 include/dt-bindings/reset/realtek,rtd1195.h +Merging renesas/next (1bd79704bee2 Merge branch 'renesas-dt-bindings-for-v5.8' into renesas-next) +$ git merge renesas/next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/renesas.yaml | 10 + + .../bindings/power/renesas,rcar-sysc.yaml | 1 + + .../devicetree/bindings/reset/renesas,rst.yaml | 1 + + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/r8a7740.dtsi | 2 +- + arch/arm/boot/dts/r8a7742-iwg21d-q7.dts | 37 ++ + arch/arm/boot/dts/r8a7742-iwg21m.dtsi | 53 ++ + arch/arm/boot/dts/r8a7742.dtsi | 648 +++++++++++++++++++++ + arch/arm/boot/dts/r8a7743.dtsi | 12 +- + arch/arm/boot/dts/r8a7744.dtsi | 12 +- + arch/arm/boot/dts/r8a7745.dtsi | 12 +- + arch/arm/boot/dts/r8a7790.dtsi | 12 +- + arch/arm/boot/dts/r8a7791.dtsi | 95 ++- + arch/arm/boot/dts/r8a7793.dtsi | 14 +- + arch/arm/boot/dts/r8a7794.dtsi | 12 +- + arch/arm/boot/dts/sh73a0.dtsi | 2 +- + arch/arm/configs/multi_v7_defconfig | 1 + + arch/arm/configs/shmobile_defconfig | 2 + + arch/arm64/boot/dts/renesas/Makefile | 3 +- + .../dts/renesas/aistarvision-mipi-adapter-2.1.dtsi | 94 +++ + arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 18 +- + arch/arm64/boot/dts/renesas/r8a774b1.dtsi | 18 +- + .../boot/dts/renesas/r8a774c0-ek874-mipi-2.1.dts | 72 +++ + arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 18 +- + arch/arm64/boot/dts/renesas/r8a77950.dtsi | 14 +- + arch/arm64/boot/dts/renesas/r8a77951.dtsi | 34 +- + arch/arm64/boot/dts/renesas/r8a77960.dtsi | 22 +- + arch/arm64/boot/dts/renesas/r8a77961.dtsi | 403 ++++++++++++- + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 20 +- + arch/arm64/boot/dts/renesas/r8a77970.dtsi | 10 +- + arch/arm64/boot/dts/renesas/r8a77980.dtsi | 16 +- + arch/arm64/boot/dts/renesas/r8a77990.dtsi | 20 +- + arch/arm64/boot/dts/renesas/r8a77995.dtsi | 20 +- + drivers/soc/renesas/Kconfig | 11 + + drivers/soc/renesas/Makefile | 1 + + drivers/soc/renesas/r8a7742-sysc.c | 42 ++ + drivers/soc/renesas/rcar-rst.c | 1 + + drivers/soc/renesas/rcar-sysc.c | 3 + + drivers/soc/renesas/rcar-sysc.h | 1 + + include/dt-bindings/clock/r8a7742-cpg-mssr.h | 42 ++ + include/dt-bindings/power/r8a7742-sysc.h | 29 + + 41 files changed, 1672 insertions(+), 167 deletions(-) + create mode 100644 arch/arm/boot/dts/r8a7742-iwg21d-q7.dts + create mode 100644 arch/arm/boot/dts/r8a7742-iwg21m.dtsi + create mode 100644 arch/arm/boot/dts/r8a7742.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/aistarvision-mipi-adapter-2.1.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a774c0-ek874-mipi-2.1.dts + create mode 100644 drivers/soc/renesas/r8a7742-sysc.c + create mode 100644 include/dt-bindings/clock/r8a7742-cpg-mssr.h + create mode 100644 include/dt-bindings/power/r8a7742-sysc.h +Merging reset/reset/next (697fa27dc5fb reset: hi6220: Add support for AO reset controller) +$ git merge reset/reset/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/reset/fsl,imx7-src.txt | 6 +- + drivers/reset/hisilicon/hi6220_reset.c | 69 +++++++++++++- + drivers/reset/reset-imx7.c | 101 +++++++++++++++++++++ + .../dt-bindings/reset/amlogic,meson-gxbb-reset.h | 2 +- + include/dt-bindings/reset/imx8mp-reset.h | 50 ++++++++++ + include/dt-bindings/reset/imx8mq-reset.h | 56 ++++++------ + 6 files changed, 253 insertions(+), 31 deletions(-) + create mode 100644 include/dt-bindings/reset/imx8mp-reset.h +Merging rockchip/for-next (504ba3b074ff Merge tag 'v5.7-rc6' into for-next) +$ git merge rockchip/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/rockchip.yaml | 5 + + arch/arm/boot/dts/rk3036-kylin.dts | 2 +- + arch/arm/boot/dts/rk3066a-mk808.dts | 2 +- + arch/arm/boot/dts/rk3188-radxarock.dts | 6 +- + arch/arm/boot/dts/rk3229-xms6.dts | 19 +- + arch/arm/boot/dts/rk322x.dtsi | 10 + + arch/arm/boot/dts/rk3288-firefly-reload.dts | 12 +- + arch/arm/boot/dts/rk3288-firefly.dtsi | 12 +- + arch/arm/boot/dts/rk3288-miqi.dts | 2 +- + arch/arm/boot/dts/rk3288-phycore-som.dtsi | 6 +- + arch/arm/boot/dts/rk3288-rock2-square.dts | 4 +- + arch/arm/boot/dts/rk3288-tinker.dtsi | 6 +- + arch/arm/boot/dts/rk3288.dtsi | 1 - + arch/arm/mach-rockchip/platsmp.c | 2 +- + arch/arm/mach-rockchip/rockchip.c | 2 +- + arch/arm64/boot/dts/rockchip/Makefile | 1 + + arch/arm64/boot/dts/rockchip/px30.dtsi | 3 + + arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts | 7 +- + arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts | 557 +++++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3326.dtsi | 15 + + arch/arm64/boot/dts/rockchip/rk3328-a1.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts | 4 +- + arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 4 +- + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts | 4 +- + .../boot/dts/rockchip/rk3368-orion-r68-meta.dts | 4 +- + arch/arm64/boot/dts/rockchip/rk3368-r88.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-ficus.dts | 29 +- + arch/arm64/boot/dts/rockchip/rk3399-firefly.dts | 10 +- + arch/arm64/boot/dts/rockchip/rk3399-hugsun-x99.dts | 7 +- + arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi | 4 +- + arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts | 4 +- + .../boot/dts/rockchip/rk3399-pinebook-pro.dts | 11 +- + arch/arm64/boot/dts/rockchip/rk3399-rock960.dts | 29 +- + arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi | 27 + + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 18 +- + drivers/clk/rockchip/clk-pll.c | 70 +-- + include/dt-bindings/pinctrl/rockchip.h | 11 - + 38 files changed, 779 insertions(+), 137 deletions(-) + create mode 100644 arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3326.dtsi +Merging samsung-krzk/for-next (4f9340b8148f Merge branch 'next/drivers' into for-next) +$ git merge samsung-krzk/for-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + .../bindings/arm/samsung/samsung-boards.yaml | 1 + + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/exynos3250-monk.dts | 3 +- + arch/arm/boot/dts/exynos3250-rinato.dts | 48 +- + arch/arm/boot/dts/exynos4210-i9100.dts | 768 +++++++++++++++++++++ + arch/arm/boot/dts/exynos4210-origen.dts | 7 +- + arch/arm/boot/dts/exynos4210-trats.dts | 41 +- + arch/arm/boot/dts/exynos4210-universal_c210.dts | 33 +- + arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi | 6 +- + arch/arm/boot/dts/exynos4412-midas.dtsi | 17 +- + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 8 +- + arch/arm/boot/dts/exynos4412-origen.dts | 14 +- + arch/arm/boot/dts/exynos5250-arndale.dts | 13 +- + arch/arm/boot/dts/exynos5420-arndale-octa.dts | 2 +- + arch/arm/boot/dts/s5pv210-aries.dtsi | 359 +++++++++- + arch/arm/boot/dts/s5pv210-fascinate4g.dts | 249 +++++++ + arch/arm/boot/dts/s5pv210-galaxys.dts | 292 ++++++++ + arch/arm/boot/dts/s5pv210-pinctrl.dtsi | 9 +- + arch/arm/boot/dts/s5pv210.dtsi | 23 +- + arch/arm/configs/exynos_defconfig | 8 +- + drivers/memory/samsung/exynos5422-dmc.c | 8 +- + 21 files changed, 1828 insertions(+), 82 deletions(-) + create mode 100644 arch/arm/boot/dts/exynos4210-i9100.dts +Merging scmi/for-linux-next (c24026b31056 Merge branch 'for-next/juno' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) +$ git merge scmi/for-linux-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/arm,scmi.txt | 3 +- + arch/arm/boot/dts/vexpress-v2m-rs1.dtsi | 328 ++++++++++----------- + arch/arm64/boot/dts/arm/foundation-v8-gicv2.dtsi | 4 +- + arch/arm64/boot/dts/arm/foundation-v8-gicv3.dtsi | 11 +- + arch/arm64/boot/dts/arm/foundation-v8.dtsi | 142 ++++----- + arch/arm64/boot/dts/arm/fvp-base-revc.dts | 10 +- + arch/arm64/boot/dts/arm/juno-base.dtsi | 82 +++--- + arch/arm64/boot/dts/arm/juno-motherboard.dtsi | 166 +++++------ + arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts | 2 +- + .../boot/dts/arm/rtsm_ve-motherboard-rs2.dtsi | 4 +- + arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi | 152 +++++----- + drivers/firmware/arm_scmi/Makefile | 4 +- + drivers/firmware/arm_scmi/base.c | 7 + + drivers/firmware/arm_scmi/common.h | 11 + + drivers/firmware/arm_scmi/driver.c | 133 +++++++-- + drivers/firmware/arm_scmi/mailbox.c | 17 ++ + drivers/firmware/arm_scmi/perf.c | 5 + + drivers/firmware/arm_scmi/power.c | 6 + + drivers/firmware/arm_scmi/sensors.c | 4 + + drivers/firmware/arm_scmi/shmem.c | 15 + + drivers/firmware/arm_scmi/smc.c | 153 ++++++++++ + include/linux/scmi_protocol.h | 6 + + include/linux/scpi_protocol.h | 6 + + 23 files changed, 791 insertions(+), 480 deletions(-) + create mode 100644 drivers/firmware/arm_scmi/smc.c +Merging sunxi/sunxi/for-next (243cd8fba48d Merge branch 'sunxi/dt-for-5.8' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/sunxi.yaml | 5 + + arch/arm/boot/dts/Makefile | 1 + + .../arm/boot/dts/sun7i-a20-olinuxino-lime-emmc.dts | 32 ++++++ + arch/arm/boot/dts/sun8i-a83t.dtsi | 10 ++ + .../boot/dts/sun8i-h2-plus-bananapi-m2-zero.dts | 2 +- + arch/arm/boot/dts/sun8i-h3.dtsi | 24 ++++- + arch/arm/boot/dts/sunxi-h3-h5.dtsi | 10 ++ + arch/arm/configs/sunxi_defconfig | 1 + + .../boot/dts/allwinner/sun50i-a64-olinuxino.dts | 9 ++ + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 12 +++ + .../boot/dts/allwinner/sun50i-h6-beelink-gs1.dts | 9 +- + .../boot/dts/allwinner/sun50i-h6-cpu-opp.dtsi | 117 +++++++++++++++++++++ + .../boot/dts/allwinner/sun50i-h6-orangepi-3.dts | 3 + + .../dts/allwinner/sun50i-h6-orangepi-lite2.dts | 65 ++++++++++++ + .../boot/dts/allwinner/sun50i-h6-orangepi.dtsi | 17 ++- + .../boot/dts/allwinner/sun50i-h6-pine-h64.dts | 43 ++++---- + .../boot/dts/allwinner/sun50i-h6-tanix-tx6.dts | 13 +++ + arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 60 +++++++++++ + arch/arm64/configs/defconfig | 1 + + drivers/clk/sunxi/clk-sunxi.c | 2 +- + 20 files changed, 411 insertions(+), 25 deletions(-) + create mode 100644 arch/arm/boot/dts/sun7i-a20-olinuxino-lime-emmc.dts + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h6-cpu-opp.dtsi +Merging tegra/for-next (62c5be8e5433 Merge branch for-5.8/arm64/dt into for-next) +$ git merge tegra/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/cpufreq/nvidia,tegra20-cpufreq.txt | 56 + + .../display/tegra/nvidia,tegra20-host1x.txt | 73 +- + .../devicetree/bindings/i2c/nvidia,tegra20-i2c.txt | 6 + + .../memory-controllers/nvidia,tegra210-emc.yaml | 82 + + MAINTAINERS | 10 + + arch/arm/boot/dts/tegra114-dalmore.dts | 3 +- + arch/arm/boot/dts/tegra124-venice2.dts | 2 +- + arch/arm/boot/dts/tegra20-colibri-eval-v3.dts | 2 +- + arch/arm/boot/dts/tegra20-colibri-iris.dts | 2 +- + arch/arm/boot/dts/tegra20-harmony.dts | 2 +- + arch/arm/boot/dts/tegra20-medcom-wide.dts | 2 +- + arch/arm/boot/dts/tegra20-paz00.dts | 2 +- + arch/arm/boot/dts/tegra20-seaboard.dts | 2 +- + arch/arm/boot/dts/tegra20-ventana.dts | 2 +- + arch/arm/boot/dts/tegra30-apalis-eval.dts | 2 +- + arch/arm/boot/dts/tegra30-apalis-v1.1-eval.dts | 2 +- + arch/arm/boot/dts/tegra30-beaver.dts | 40 +- + arch/arm/boot/dts/tegra30-cardhu.dtsi | 2 +- + arch/arm/boot/dts/tegra30-colibri-eval-v3.dts | 2 +- + arch/arm64/boot/dts/nvidia/tegra132-norrin.dts | 2 +- + arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi | 5 +- + arch/arm64/boot/dts/nvidia/tegra194.dtsi | 30 +- + arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi | 10 + + arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts | 4 + + arch/arm64/boot/dts/nvidia/tegra210.dtsi | 89 +- + drivers/clk/tegra/Kconfig | 4 - + drivers/clk/tegra/Makefile | 4 +- + drivers/clk/tegra/clk-pll.c | 12 +- + drivers/clk/tegra/clk-tegra-super-cclk.c | 212 ++ + .../clk/tegra/{clk-emc.c => clk-tegra124-emc.c} | 0 + drivers/clk/tegra/clk-tegra20.c | 7 +- + drivers/clk/tegra/clk-tegra210-emc.c | 369 ++++ + drivers/clk/tegra/clk-tegra210.c | 94 +- + drivers/clk/tegra/clk-tegra30.c | 6 +- + drivers/clk/tegra/clk.h | 24 +- + drivers/cpufreq/Kconfig.arm | 6 +- + drivers/cpufreq/tegra20-cpufreq.c | 217 +- + drivers/cpuidle/cpuidle-tegra.c | 1 - + drivers/i2c/busses/i2c-tegra.c | 248 ++- + drivers/memory/tegra/Kconfig | 14 + + drivers/memory/tegra/Makefile | 4 + + drivers/memory/tegra/mc.h | 1 + + drivers/memory/tegra/tegra124-emc.c | 6 +- + drivers/memory/tegra/tegra186-emc.c | 21 +- + drivers/memory/tegra/tegra186.c | 4 +- + drivers/memory/tegra/tegra20-emc.c | 34 +- + drivers/memory/tegra/tegra210-emc-cc-r21021.c | 1775 +++++++++++++++++ + drivers/memory/tegra/tegra210-emc-core.c | 2100 ++++++++++++++++++++ + drivers/memory/tegra/tegra210-emc-table.c | 90 + + drivers/memory/tegra/tegra210-emc.h | 1016 ++++++++++ + drivers/memory/tegra/tegra210-mc.h | 50 + + drivers/memory/tegra/tegra30-emc.c | 122 +- + drivers/of/of_reserved_mem.c | 41 +- + drivers/soc/tegra/Kconfig | 1 + + drivers/soc/tegra/fuse/fuse-tegra.c | 57 +- + drivers/soc/tegra/fuse/fuse-tegra20.c | 1 + + drivers/soc/tegra/fuse/fuse-tegra30.c | 6 + + drivers/soc/tegra/fuse/fuse.h | 8 + + drivers/soc/tegra/fuse/tegra-apbmisc.c | 32 +- + drivers/soc/tegra/pmc.c | 2 + + drivers/staging/media/Kconfig | 2 + + drivers/staging/media/Makefile | 1 + + drivers/staging/media/tegra-video/Kconfig | 12 + + drivers/staging/media/tegra-video/Makefile | 8 + + drivers/staging/media/tegra-video/TODO | 11 + + drivers/staging/media/tegra-video/csi.c | 539 +++++ + drivers/staging/media/tegra-video/csi.h | 147 ++ + drivers/staging/media/tegra-video/tegra210.c | 978 +++++++++ + drivers/staging/media/tegra-video/vi.c | 1074 ++++++++++ + drivers/staging/media/tegra-video/vi.h | 257 +++ + drivers/staging/media/tegra-video/video.c | 155 ++ + drivers/staging/media/tegra-video/video.h | 29 + + include/dt-bindings/clock/tegra114-car.h | 14 +- + include/dt-bindings/clock/tegra124-car-common.h | 14 +- + include/dt-bindings/clock/tegra20-car.h | 2 +- + include/dt-bindings/clock/tegra210-car.h | 20 +- + include/dt-bindings/clock/tegra30-car.h | 14 +- + include/linux/clk/tegra.h | 27 + + include/linux/of_reserved_mem.h | 12 + + 79 files changed, 9859 insertions(+), 480 deletions(-) + create mode 100644 Documentation/devicetree/bindings/cpufreq/nvidia,tegra20-cpufreq.txt + create mode 100644 Documentation/devicetree/bindings/memory-controllers/nvidia,tegra210-emc.yaml + create mode 100644 drivers/clk/tegra/clk-tegra-super-cclk.c + rename drivers/clk/tegra/{clk-emc.c => clk-tegra124-emc.c} (100%) + create mode 100644 drivers/clk/tegra/clk-tegra210-emc.c + create mode 100644 drivers/memory/tegra/tegra210-emc-cc-r21021.c + create mode 100644 drivers/memory/tegra/tegra210-emc-core.c + create mode 100644 drivers/memory/tegra/tegra210-emc-table.c + create mode 100644 drivers/memory/tegra/tegra210-emc.h + create mode 100644 drivers/memory/tegra/tegra210-mc.h + create mode 100644 drivers/staging/media/tegra-video/Kconfig + create mode 100644 drivers/staging/media/tegra-video/Makefile + create mode 100644 drivers/staging/media/tegra-video/TODO + create mode 100644 drivers/staging/media/tegra-video/csi.c + create mode 100644 drivers/staging/media/tegra-video/csi.h + create mode 100644 drivers/staging/media/tegra-video/tegra210.c + create mode 100644 drivers/staging/media/tegra-video/vi.c + create mode 100644 drivers/staging/media/tegra-video/vi.h + create mode 100644 drivers/staging/media/tegra-video/video.c + create mode 100644 drivers/staging/media/tegra-video/video.h +Merging ti-k3/ti-k3-next (cae809434da1 arm64: dts: ti: k3-j721e-main: Add main domain watchdog entries) +$ git merge ti-k3/ti-k3-next +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 104 +++++++++++++++++++++ + arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi | 11 +++ + .../boot/dts/ti/k3-am654-industrial-thermal.dtsi | 45 +++++++++ + .../boot/dts/ti/k3-j721e-common-proc-board.dts | 20 ++++ + arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 75 +++++++++++++++ + 5 files changed, 255 insertions(+) + create mode 100644 arch/arm64/boot/dts/ti/k3-am654-industrial-thermal.dtsi +Merging clk/clk-next (267701f9e720 Merge branch 'clk-qcom' into clk-next) +$ git merge clk/clk-next +Auto-merging arch/arm64/Kconfig.platforms +Removing arch/arm/mach-mmp/clock.h +Removing arch/arm/mach-mmp/clock.c +Removing arch/arm/mach-mmp/clock-pxa910.c +Removing arch/arm/mach-mmp/clock-pxa168.c +Removing arch/arm/mach-mmp/clock-mmp2.c +Auto-merging arch/arm/mach-clps711x/Kconfig +Auto-merging arch/arm/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/clock/qcom,gcc.yaml | 3 + + .../devicetree/bindings/clock/qcom,mmcc.yaml | 4 + + .../bindings/clock/renesas,cpg-mssr.yaml | 1 + + .../bindings/clock/renesas,rcar-usb2-clock-sel.txt | 4 +- + MAINTAINERS | 1 + + arch/Kconfig | 6 - + arch/arm/Kconfig | 5 +- + arch/arm/mach-mmp/Makefile | 6 - + arch/arm/mach-mmp/clock-mmp2.c | 114 --------- + arch/arm/mach-mmp/clock-pxa168.c | 94 ------- + arch/arm/mach-mmp/clock-pxa910.c | 70 ------ + arch/arm/mach-mmp/clock.c | 105 -------- + arch/arm/mach-mmp/clock.h | 65 ----- + arch/arm/mach-mmp/pxa168.c | 1 - + arch/arm/mach-mmp/time.c | 1 - + arch/arm/mach-vt8500/Kconfig | 1 - + arch/arm64/Kconfig.platforms | 1 - + arch/c6x/Kconfig | 1 + + arch/h8300/Kconfig | 1 - + arch/m68k/Kconfig.cpu | 2 +- + arch/mips/Kconfig | 7 +- + arch/mips/loongson2ef/Kconfig | 2 +- + arch/mips/loongson64/smp.c | 1 - + arch/mips/ralink/Kconfig | 4 + + arch/sh/boards/Kconfig | 5 + + arch/unicore32/Kconfig | 2 +- + drivers/clk/Kconfig | 25 +- + drivers/clk/clk.c | 4 - + drivers/clk/meson/g12a.c | 30 ++- + drivers/clk/meson/gxbb.c | 40 +-- + drivers/clk/meson/meson8b.c | 120 ++++++--- + drivers/clk/meson/meson8b.h | 5 +- + drivers/clk/qcom/gcc-msm8916.c | 8 +- + drivers/clk/qcom/gcc-sm8150.c | 148 +++++++++++ + drivers/clk/qcom/gdsc.c | 23 ++ + drivers/clk/qcom/gdsc.h | 4 + + drivers/clk/qcom/mmcc-msm8996.c | 2 + + drivers/clk/renesas/Kconfig | 8 +- + drivers/clk/renesas/Makefile | 1 + + drivers/clk/renesas/r8a7742-cpg-mssr.c | 275 +++++++++++++++++++++ + drivers/clk/renesas/r9a06g032-clocks.c | 6 +- + drivers/clk/renesas/renesas-cpg-mssr.c | 6 + + drivers/clk/renesas/renesas-cpg-mssr.h | 1 + + drivers/clk/ti/clk-44xx.c | 14 +- + drivers/clk/ti/clk-54xx.c | 14 +- + drivers/clk/ti/clk-7xx.c | 6 +- + drivers/clk/ti/composite.c | 1 + + drivers/mmc/host/Kconfig | 2 +- + include/dt-bindings/clock/meson8b-clkc.h | 1 + + include/dt-bindings/clock/qcom,gcc-msm8939.h | 206 +++++++++++++++ + include/dt-bindings/reset/qcom,gcc-msm8939.h | 110 +++++++++ + 51 files changed, 991 insertions(+), 576 deletions(-) + delete mode 100644 arch/arm/mach-mmp/clock-mmp2.c + delete mode 100644 arch/arm/mach-mmp/clock-pxa168.c + delete mode 100644 arch/arm/mach-mmp/clock-pxa910.c + delete mode 100644 arch/arm/mach-mmp/clock.c + delete mode 100644 arch/arm/mach-mmp/clock.h + create mode 100644 drivers/clk/renesas/r8a7742-cpg-mssr.c + create mode 100644 include/dt-bindings/clock/qcom,gcc-msm8939.h + create mode 100644 include/dt-bindings/reset/qcom,gcc-msm8939.h +Merging clk-samsung/for-next (ae9aa4119e55 ARM/SAMSUNG EXYNOS ARM ARCHITECTURES: Use fallthrough;) +$ git merge clk-samsung/for-next +Merge made by the 'recursive' strategy. + drivers/clk/samsung/clk-exynos5420.c | 18 ++++++++++-------- + drivers/clk/samsung/clk-s3c2443.c | 2 +- + drivers/i2c/busses/i2c-s3c2410.c | 3 +-- + 3 files changed, 12 insertions(+), 11 deletions(-) +Merging c6x/for-linux-next (8adcc59974b8 Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge c6x/for-linux-next +Already up to date. +Merging csky/linux-next (51bb38cb7836 csky: Fixup raw_copy_from_user()) +$ git merge csky/linux-next +Already up to date. +Merging h8300/h8300-next (beab3d5cb0e1 irq-renesas-h8s: Fix external interrupt control.) +$ git merge h8300/h8300-next +Auto-merging drivers/tty/serial/sh-sci.c +Merge made by the 'recursive' strategy. + arch/h8300/Kconfig.cpu | 4 ++ + arch/h8300/boot/dts/edosk2674.dts | 10 ++++- + arch/h8300/configs/edosk2674_defconfig | 10 ++--- + arch/h8300/configs/h8300h-sim_defconfig | 8 +--- + arch/h8300/configs/h8s-sim_defconfig | 8 +--- + arch/h8300/lib/memset.S | 17 +++++---- + drivers/clocksource/h8300_timer8.c | 20 +++++----- + drivers/irqchip/irq-renesas-h8300h.c | 19 +++++++++- + drivers/irqchip/irq-renesas-h8s.c | 67 +++++++++++++++++++++++++-------- + drivers/net/ethernet/smsc/Kconfig | 1 - + drivers/net/ethernet/smsc/smc91x.c | 10 +++++ + drivers/tty/serial/sh-sci.c | 5 +-- + 12 files changed, 120 insertions(+), 59 deletions(-) +Merging ia64/next (172e7890406d tty/serial: cleanup after ioc*_serial driver removal) +$ git merge ia64/next +Already up to date. +Merging m68k/for-next (b5c08eb306ab m68k: defconfig: Update defconfigs for v5.7-rc1) +$ git merge m68k/for-next +Auto-merging arch/m68k/amiga/config.c +Merge made by the 'recursive' strategy. + arch/m68k/amiga/config.c | 5 +++-- + arch/m68k/configs/amiga_defconfig | 6 +++++- + arch/m68k/configs/apollo_defconfig | 6 +++++- + arch/m68k/configs/atari_defconfig | 6 +++++- + arch/m68k/configs/bvme6000_defconfig | 6 +++++- + arch/m68k/configs/hp300_defconfig | 6 +++++- + arch/m68k/configs/mac_defconfig | 6 +++++- + arch/m68k/configs/multi_defconfig | 6 +++++- + arch/m68k/configs/mvme147_defconfig | 6 +++++- + arch/m68k/configs/mvme16x_defconfig | 6 +++++- + arch/m68k/configs/q40_defconfig | 6 +++++- + arch/m68k/configs/sun3_defconfig | 6 +++++- + arch/m68k/configs/sun3x_defconfig | 6 +++++- + 13 files changed, 63 insertions(+), 14 deletions(-) +Merging m68knommu/for-next (5b50f06e33a3 m68k: Drop CONFIG_MTD_M25P80 in stmark2_defconfig) +$ git merge m68knommu/for-next +Merge made by the 'recursive' strategy. + arch/m68k/coldfire/pci.c | 4 +++- + arch/m68k/configs/stmark2_defconfig | 1 - + 2 files changed, 3 insertions(+), 2 deletions(-) +Merging microblaze/next (8f3d9f354286 Linux 5.7-rc1) +$ git merge microblaze/next +Already up to date. +Merging mips/mips-next (8be26bab0ea2 MIPS: SGI-IP30: Remove R5432_CP0_INTERRUPT_WAR from war.h) +$ git merge mips/mips-next +Auto-merging init/Kconfig +Removing arch/mips/pmcs-msp71xx/msp_usb.c +Removing arch/mips/pmcs-msp71xx/msp_time.c +Removing arch/mips/pmcs-msp71xx/msp_smp.c +Removing arch/mips/pmcs-msp71xx/msp_setup.c +Removing arch/mips/pmcs-msp71xx/msp_serial.c +Removing arch/mips/pmcs-msp71xx/msp_prom.c +Removing arch/mips/pmcs-msp71xx/msp_pci.c +Removing arch/mips/pmcs-msp71xx/msp_irq_slp.c +Removing arch/mips/pmcs-msp71xx/msp_irq_per.c +Removing arch/mips/pmcs-msp71xx/msp_irq_cic.c +Removing arch/mips/pmcs-msp71xx/msp_irq.c +Removing arch/mips/pmcs-msp71xx/msp_hwbutton.c +Removing arch/mips/pmcs-msp71xx/msp_eth.c +Removing arch/mips/pmcs-msp71xx/msp_elb.c +Removing arch/mips/pmcs-msp71xx/Platform +Removing arch/mips/pmcs-msp71xx/Makefile +Removing arch/mips/pmcs-msp71xx/Kconfig +Removing arch/mips/pci/pci-lasat.c +Removing arch/mips/pci/pci-emma2rh.c +Removing arch/mips/pci/ops-pmcmsp.c +Removing arch/mips/pci/ops-nile4.c +Removing arch/mips/pci/ops-emma2rh.c +Removing arch/mips/pci/fixup-pmcmsp.c +Removing arch/mips/pci/fixup-emma2rh.c +Removing arch/mips/loongson64/rtc.c +Auto-merging arch/mips/loongson2ef/Kconfig +CONFLICT (content): Merge conflict in arch/mips/loongson2ef/Kconfig +Removing arch/mips/lasat/sysctl.c +Removing arch/mips/lasat/setup.c +Removing arch/mips/lasat/serial.c +Removing arch/mips/lasat/reset.c +Removing arch/mips/lasat/prom.h +Removing arch/mips/lasat/prom.c +Removing arch/mips/lasat/picvue_proc.c +Removing arch/mips/lasat/picvue.h +Removing arch/mips/lasat/picvue.c +Removing arch/mips/lasat/lasat_models.h +Removing arch/mips/lasat/lasat_board.c +Removing arch/mips/lasat/interrupt.c +Removing arch/mips/lasat/image/romscript.normal +Removing arch/mips/lasat/image/head.S +Removing arch/mips/lasat/image/Makefile +Removing arch/mips/lasat/ds1603.h +Removing arch/mips/lasat/ds1603.c +Removing arch/mips/lasat/at93c.h +Removing arch/mips/lasat/at93c.c +Removing arch/mips/lasat/Platform +Removing arch/mips/lasat/Makefile +Removing arch/mips/lasat/Kconfig +Removing arch/mips/kernel/8250-platform.c +Removing arch/mips/jz4740/timer.c +Removing arch/mips/jz4740/time.c +Removing arch/mips/jz4740/reset.h +Removing arch/mips/jz4740/reset.c +Removing arch/mips/jz4740/prom.c +Removing arch/mips/jz4740/pm.c +Removing arch/mips/include/asm/nile4.h +Removing arch/mips/include/asm/mach-xilfpga/irq.h +Removing arch/mips/include/asm/mach-pmcs-msp71xx/war.h +Removing arch/mips/include/asm/mach-pmcs-msp71xx/msp_usb.h +Removing arch/mips/include/asm/mach-pmcs-msp71xx/msp_slp_int.h +Removing arch/mips/include/asm/mach-pmcs-msp71xx/msp_regs.h +Removing arch/mips/include/asm/mach-pmcs-msp71xx/msp_regops.h +Removing arch/mips/include/asm/mach-pmcs-msp71xx/msp_prom.h +Removing arch/mips/include/asm/mach-pmcs-msp71xx/msp_pci.h +Removing arch/mips/include/asm/mach-pmcs-msp71xx/msp_int.h +Removing arch/mips/include/asm/mach-pmcs-msp71xx/msp_gpio_macros.h +Removing arch/mips/include/asm/mach-pmcs-msp71xx/msp_cic_int.h +Removing arch/mips/include/asm/mach-pmcs-msp71xx/cpu-feature-overrides.h +Removing arch/mips/include/asm/mach-loongson64/mc146818rtc.h +Removing arch/mips/include/asm/mach-lasat/mach-gt64120.h +Removing arch/mips/include/asm/mach-lasat/irq.h +Removing arch/mips/include/asm/mach-jz4740/timer.h +Removing arch/mips/include/asm/mach-jz4740/dma.h +Removing arch/mips/include/asm/mach-jz4740/base.h +Removing arch/mips/include/asm/mach-emma2rh/irq.h +Removing arch/mips/include/asm/mach-au1x00/ioremap.h +Removing arch/mips/include/asm/lasat/serial.h +Removing arch/mips/include/asm/lasat/picvue.h +Removing arch/mips/include/asm/lasat/lasatint.h +Removing arch/mips/include/asm/lasat/lasat.h +Removing arch/mips/include/asm/lasat/head.h +Removing arch/mips/include/asm/lasat/eeprom.h +Removing arch/mips/include/asm/lasat/ds1603.h +Removing arch/mips/include/asm/emma/markeins.h +Removing arch/mips/include/asm/emma/emma2rh.h +Removing arch/mips/include/asm/clock.h +Removing arch/mips/emma/markeins/setup.c +Removing arch/mips/emma/markeins/platform.c +Removing arch/mips/emma/markeins/led.c +Removing arch/mips/emma/markeins/irq.c +Removing arch/mips/emma/markeins/Makefile +Removing arch/mips/emma/common/prom.c +Removing arch/mips/emma/common/Makefile +Removing arch/mips/emma/Platform +Removing arch/mips/emma/Makefile +Removing arch/mips/configs/msp71xx_defconfig +Removing arch/mips/configs/markeins_defconfig +Removing arch/mips/configs/lasat_defconfig +Auto-merging arch/mips/Kconfig +Resolved 'arch/mips/loongson2ef/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master ac5ff256bd76] Merge remote-tracking branch 'mips/mips-next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/mips/loongson/rs780e-acpi.yaml | 40 + + arch/mips/Kbuild | 2 +- + arch/mips/Kbuild.platforms | 76 +- + arch/mips/Kconfig | 76 +- + arch/mips/Makefile | 45 +- + arch/mips/alchemy/Platform | 3 - + arch/mips/alchemy/common/setup.c | 17 +- + arch/mips/alchemy/devboards/db1550.c | 2 +- + arch/mips/ar7/Platform | 1 - + arch/mips/ar7/setup.c | 2 +- + arch/mips/ath25/Platform | 1 - + arch/mips/ath79/Platform | 1 - + arch/mips/ath79/setup.c | 3 +- + arch/mips/bcm47xx/Platform | 1 - + arch/mips/bcm63xx/Platform | 1 - + arch/mips/bcm63xx/cpu.c | 2 +- + arch/mips/bcm63xx/dev-flash.c | 2 +- + arch/mips/bmips/Platform | 1 - + arch/mips/boot/compressed/Makefile | 2 +- + arch/mips/boot/dts/ingenic/ci20.dts | 3 + + arch/mips/boot/dts/ingenic/gcw0.dts | 499 ++++++++++- + arch/mips/boot/dts/ingenic/jz4740.dtsi | 33 +- + arch/mips/boot/dts/ingenic/jz4770.dtsi | 227 ++++- + arch/mips/boot/dts/ingenic/jz4780.dtsi | 65 +- + arch/mips/boot/dts/ingenic/x1000.dtsi | 9 +- + arch/mips/boot/dts/loongson/rs780e-pch.dtsi | 5 + + arch/mips/boot/dts/mscc/ocelot.dtsi | 2 +- + arch/mips/boot/dts/qca/ar9331.dtsi | 2 +- + arch/mips/boot/dts/qca/ar9331_dpt_module.dts | 6 +- + arch/mips/cavium-octeon/Platform | 1 - + .../mips/cavium-octeon/executive/cvmx-helper-npi.c | 12 - + arch/mips/cavium-octeon/executive/cvmx-pko.c | 2 +- + arch/mips/cavium-octeon/octeon-platform.c | 4 +- + arch/mips/cavium-octeon/octeon-usb.c | 2 +- + arch/mips/cobalt/Platform | 1 - + arch/mips/configs/ath79_defconfig | 1 - + arch/mips/configs/ci20_defconfig | 62 +- + arch/mips/configs/db1xxx_defconfig | 1 - + arch/mips/configs/gcw0_defconfig | 131 ++- + arch/mips/configs/generic/board-ocelot.config | 1 - + arch/mips/configs/lasat_defconfig | 55 -- + arch/mips/configs/loongson3_defconfig | 4 +- + arch/mips/configs/markeins_defconfig | 185 ---- + arch/mips/configs/msp71xx_defconfig | 77 -- + arch/mips/configs/pistachio_defconfig | 1 - + arch/mips/configs/rt305x_defconfig | 1 - + arch/mips/dec/Platform | 1 - + arch/mips/dec/int-handler.S | 4 +- + arch/mips/dec/tc.c | 2 +- + arch/mips/emma/Makefile | 7 - + arch/mips/emma/Platform | 4 - + arch/mips/emma/common/Makefile | 6 - + arch/mips/emma/common/prom.c | 56 -- + arch/mips/emma/markeins/Makefile | 6 - + arch/mips/emma/markeins/irq.c | 293 ------- + arch/mips/emma/markeins/led.c | 44 - + arch/mips/emma/markeins/platform.c | 199 ----- + arch/mips/emma/markeins/setup.c | 115 --- + arch/mips/fw/cfe/cfe_api.c | 5 - + arch/mips/generic/Platform | 1 - + arch/mips/include/asm/asm-eva.h | 2 +- + arch/mips/include/asm/asm.h | 24 +- + arch/mips/include/asm/bootinfo.h | 13 +- + arch/mips/include/asm/branch.h | 3 + + arch/mips/include/asm/cacheops.h | 2 +- + arch/mips/include/asm/clock.h | 49 -- + arch/mips/include/asm/cpu-features.h | 6 - + arch/mips/include/asm/cpu.h | 4 + + arch/mips/include/asm/emma/emma2rh.h | 248 ------ + arch/mips/include/asm/emma/markeins.h | 28 - + arch/mips/include/asm/fpu.h | 2 +- + arch/mips/include/asm/fpu_emulator.h | 4 - + arch/mips/include/asm/inst.h | 779 +++++++++++++++++ + arch/mips/include/asm/io.h | 87 +- + arch/mips/include/asm/lasat/ds1603.h | 19 - + arch/mips/include/asm/lasat/eeprom.h | 18 - + arch/mips/include/asm/lasat/head.h | 23 - + arch/mips/include/asm/lasat/lasat.h | 245 ------ + arch/mips/include/asm/lasat/lasatint.h | 15 - + arch/mips/include/asm/lasat/picvue.h | 16 - + arch/mips/include/asm/lasat/serial.h | 14 - + .../include/asm/mach-ath25/cpu-feature-overrides.h | 1 - + .../include/asm/mach-ath79/cpu-feature-overrides.h | 1 - + arch/mips/include/asm/mach-au1x00/ioremap.h | 38 - + arch/mips/include/asm/mach-bcm63xx/ioremap.h | 5 - + arch/mips/include/asm/mach-bmips/ioremap.h | 5 - + arch/mips/include/asm/mach-emma2rh/irq.h | 15 - + arch/mips/include/asm/mach-generic/ioremap.h | 9 - + arch/mips/include/asm/mach-generic/irq.h | 6 - + arch/mips/include/asm/mach-ip27/spaces.h | 12 +- + arch/mips/include/asm/mach-ip30/war.h | 1 - + arch/mips/include/asm/mach-jz4740/base.h | 27 - + arch/mips/include/asm/mach-jz4740/dma.h | 23 - + arch/mips/include/asm/mach-jz4740/irq.h | 45 +- + arch/mips/include/asm/mach-jz4740/timer.h | 126 --- + .../asm/mach-lantiq/falcon/cpu-feature-overrides.h | 1 - + arch/mips/include/asm/mach-lasat/irq.h | 14 - + arch/mips/include/asm/mach-lasat/mach-gt64120.h | 28 - + arch/mips/include/asm/mach-loongson2ef/loongson.h | 1 + + arch/mips/include/asm/mach-loongson64/boot_param.h | 11 + + .../asm/mach-loongson64/cpu-feature-overrides.h | 1 + + .../include/asm/mach-loongson64/loongson_regs.h | 29 +- + .../mips/include/asm/mach-loongson64/mc146818rtc.h | 36 - + .../asm/mach-pmcs-msp71xx/cpu-feature-overrides.h | 22 - + .../include/asm/mach-pmcs-msp71xx/msp_cic_int.h | 139 --- + .../asm/mach-pmcs-msp71xx/msp_gpio_macros.h | 343 -------- + arch/mips/include/asm/mach-pmcs-msp71xx/msp_int.h | 31 - + arch/mips/include/asm/mach-pmcs-msp71xx/msp_pci.h | 189 ----- + arch/mips/include/asm/mach-pmcs-msp71xx/msp_prom.h | 159 ---- + .../include/asm/mach-pmcs-msp71xx/msp_regops.h | 237 ------ + arch/mips/include/asm/mach-pmcs-msp71xx/msp_regs.h | 652 -------------- + .../include/asm/mach-pmcs-msp71xx/msp_slp_int.h | 129 --- + arch/mips/include/asm/mach-pmcs-msp71xx/msp_usb.h | 124 --- + arch/mips/include/asm/mach-pmcs-msp71xx/war.h | 28 - + .../asm/mach-ralink/mt7620/cpu-feature-overrides.h | 1 - + arch/mips/include/asm/mach-ralink/mt7621.h | 2 - + .../asm/mach-ralink/mt7621/cpu-feature-overrides.h | 1 - + .../asm/mach-ralink/rt288x/cpu-feature-overrides.h | 1 - + .../asm/mach-ralink/rt305x/cpu-feature-overrides.h | 1 - + .../asm/mach-ralink/rt3883/cpu-feature-overrides.h | 1 - + .../asm/mach-rc32434/cpu-feature-overrides.h | 1 - + arch/mips/include/asm/mach-rc32434/pci.h | 3 - + arch/mips/include/asm/mach-tx39xx/ioremap.h | 9 - + arch/mips/include/asm/mach-tx49xx/ioremap.h | 9 - + arch/mips/include/asm/mach-xilfpga/irq.h | 14 - + arch/mips/include/asm/mipsregs.h | 6 + + arch/mips/include/asm/nile4.h | 310 ------- + arch/mips/include/asm/octeon/cvmx-sli-defs.h | 2 +- + arch/mips/include/asm/page.h | 2 +- + arch/mips/include/asm/pgtable-64.h | 4 +- + arch/mips/include/asm/pgtable-bits.h | 20 +- + arch/mips/include/asm/pgtable.h | 71 +- + arch/mips/include/asm/smp.h | 2 +- + arch/mips/include/uapi/asm/inst.h | 26 + + arch/mips/jazz/Platform | 1 - + arch/mips/jz4740/Makefile | 7 +- + arch/mips/jz4740/Platform | 1 - + arch/mips/jz4740/pm.c | 34 - + arch/mips/jz4740/prom.c | 19 - + arch/mips/jz4740/reset.c | 24 - + arch/mips/jz4740/reset.h | 7 - + arch/mips/jz4740/setup.c | 63 +- + arch/mips/jz4740/time.c | 17 - + arch/mips/jz4740/timer.c | 42 - + arch/mips/kernel/8250-platform.c | 46 - + arch/mips/kernel/Makefile | 2 - + arch/mips/kernel/branch.c | 26 +- + arch/mips/kernel/cpu-probe.c | 85 +- + arch/mips/kernel/genex.S | 6 +- + arch/mips/kernel/head.S | 3 + + arch/mips/kernel/idle.c | 5 +- + arch/mips/kernel/mips-cm.c | 66 +- + arch/mips/kernel/mips-r2-to-r6-emul.c | 2 +- + arch/mips/kernel/perf_event_mipsxx.c | 373 +++++++- + arch/mips/kernel/scall64-o32.S | 2 +- + arch/mips/kernel/setup.c | 14 +- + arch/mips/kernel/signal.c | 4 +- + arch/mips/kernel/traps.c | 3 +- + arch/mips/kernel/unaligned.c | 775 ----------------- + arch/mips/kernel/vmlinux.lds.S | 2 +- + arch/mips/kernel/watch.c | 26 +- + arch/mips/kvm/emulate.c | 12 +- + arch/mips/kvm/mips.c | 4 +- + arch/mips/kvm/tlb.c | 4 +- + arch/mips/kvm/vz.c | 10 +- + arch/mips/lantiq/Platform | 1 - + arch/mips/lasat/Kconfig | 16 - + arch/mips/lasat/Makefile | 15 - + arch/mips/lasat/Platform | 7 - + arch/mips/lasat/at93c.c | 148 ---- + arch/mips/lasat/at93c.h | 19 - + arch/mips/lasat/ds1603.c | 190 ----- + arch/mips/lasat/ds1603.h | 32 - + arch/mips/lasat/image/Makefile | 53 -- + arch/mips/lasat/image/head.S | 32 - + arch/mips/lasat/image/romscript.normal | 23 - + arch/mips/lasat/interrupt.c | 119 --- + arch/mips/lasat/lasat_board.c | 268 ------ + arch/mips/lasat/lasat_models.h | 68 -- + arch/mips/lasat/picvue.c | 242 ------ + arch/mips/lasat/picvue.h | 45 - + arch/mips/lasat/picvue_proc.c | 208 ----- + arch/mips/lasat/prom.c | 126 --- + arch/mips/lasat/prom.h | 8 - + arch/mips/lasat/reset.c | 48 -- + arch/mips/lasat/serial.c | 80 -- + arch/mips/lasat/setup.c | 141 --- + arch/mips/lasat/sysctl.c | 268 ------ + arch/mips/loongson2ef/Kconfig | 1 - + arch/mips/loongson2ef/Platform | 1 - + arch/mips/loongson2ef/lemote-2f/clock.c | 98 +-- + arch/mips/loongson32/Platform | 1 - + arch/mips/loongson64/Kconfig | 12 +- + arch/mips/loongson64/Makefile | 3 +- + arch/mips/loongson64/Platform | 1 - + arch/mips/loongson64/cop2-ex.c | 289 ++++++- + arch/mips/loongson64/dma.c | 9 +- + arch/mips/loongson64/env.c | 20 + + arch/mips/loongson64/init.c | 17 + + arch/mips/loongson64/pci.c | 2 - + arch/mips/loongson64/rtc.c | 39 - + arch/mips/loongson64/time.c | 8 +- + arch/mips/math-emu/cp1emu.c | 28 +- + arch/mips/math-emu/dp_add.c | 3 +- + arch/mips/math-emu/dp_div.c | 3 +- + arch/mips/math-emu/dp_fmax.c | 6 +- + arch/mips/math-emu/dp_fmin.c | 6 +- + arch/mips/math-emu/dp_maddf.c | 3 +- + arch/mips/math-emu/dp_mul.c | 3 +- + arch/mips/math-emu/dp_sqrt.c | 5 +- + arch/mips/math-emu/dp_sub.c | 3 +- + arch/mips/math-emu/sp_add.c | 3 +- + arch/mips/math-emu/sp_div.c | 3 +- + arch/mips/math-emu/sp_fdp.c | 3 +- + arch/mips/math-emu/sp_fmax.c | 6 +- + arch/mips/math-emu/sp_fmin.c | 6 +- + arch/mips/math-emu/sp_maddf.c | 3 +- + arch/mips/math-emu/sp_mul.c | 3 +- + arch/mips/math-emu/sp_sub.c | 3 +- + arch/mips/mm/Makefile | 2 +- + arch/mips/mm/c-r4k.c | 20 +- + arch/mips/mm/cache.c | 1 - + arch/mips/mm/ioremap.c | 151 +--- + arch/mips/mm/ioremap64.c | 23 + + arch/mips/mm/tlbex.c | 2 +- + arch/mips/mti-malta/Platform | 1 - + arch/mips/netlogic/Platform | 1 - + arch/mips/netlogic/xlr/fmn.c | 2 +- + arch/mips/oprofile/common.c | 2 +- + arch/mips/oprofile/op_model_mipsxx.c | 26 +- + arch/mips/paravirt/Platform | 1 - + arch/mips/pci/Makefile | 6 - + arch/mips/pci/fixup-emma2rh.c | 84 -- + arch/mips/pci/fixup-pmcmsp.c | 216 ----- + arch/mips/pci/fixup-sni.c | 3 +- + arch/mips/pci/ops-bcm63xx.c | 2 +- + arch/mips/pci/ops-emma2rh.c | 167 ---- + arch/mips/pci/ops-nile4.c | 136 --- + arch/mips/pci/ops-pmcmsp.c | 944 --------------------- + arch/mips/pci/pci-alchemy.c | 2 +- + arch/mips/pci/pci-emma2rh.c | 72 -- + arch/mips/pci/pci-lasat.c | 88 -- + arch/mips/pic32/Platform | 1 - + arch/mips/pistachio/Platform | 1 - + arch/mips/pmcs-msp71xx/Kconfig | 50 -- + arch/mips/pmcs-msp71xx/Makefile | 13 - + arch/mips/pmcs-msp71xx/Platform | 7 - + arch/mips/pmcs-msp71xx/msp_elb.c | 46 - + arch/mips/pmcs-msp71xx/msp_eth.c | 111 --- + arch/mips/pmcs-msp71xx/msp_hwbutton.c | 165 ---- + arch/mips/pmcs-msp71xx/msp_irq.c | 155 ---- + arch/mips/pmcs-msp71xx/msp_irq_cic.c | 208 ----- + arch/mips/pmcs-msp71xx/msp_irq_per.c | 127 --- + arch/mips/pmcs-msp71xx/msp_irq_slp.c | 102 --- + arch/mips/pmcs-msp71xx/msp_pci.c | 50 -- + arch/mips/pmcs-msp71xx/msp_prom.c | 513 ----------- + arch/mips/pmcs-msp71xx/msp_serial.c | 154 ---- + arch/mips/pmcs-msp71xx/msp_setup.c | 228 ----- + arch/mips/pmcs-msp71xx/msp_smp.c | 56 -- + arch/mips/pmcs-msp71xx/msp_time.c | 90 -- + arch/mips/pmcs-msp71xx/msp_usb.c | 173 ---- + arch/mips/pnx833x/Platform | 1 - + arch/mips/ralink/Platform | 1 - + arch/mips/rb532/Platform | 1 - + arch/mips/sgi-ip22/Platform | 2 - + arch/mips/sgi-ip27/Platform | 3 - + arch/mips/sgi-ip30/Platform | 3 - + arch/mips/sgi-ip32/Platform | 1 - + arch/mips/sibyte/Platform | 4 - + arch/mips/sni/Platform | 1 - + arch/mips/tools/loongson3-llsc-check.c | 2 + + arch/mips/txx9/Kconfig | 14 +- + arch/mips/txx9/Platform | 3 - + arch/mips/vdso/Kconfig | 18 + + arch/mips/vdso/Makefile | 43 +- + arch/mips/vdso/vdso.lds.S | 2 +- + arch/mips/vr41xx/Makefile | 5 + + arch/mips/vr41xx/Platform | 3 - + drivers/cpufreq/loongson2_cpufreq.c | 22 +- + drivers/platform/mips/Kconfig | 6 + + drivers/platform/mips/Makefile | 1 + + .../platform/mips/rs780e-acpi.c | 58 +- + init/Kconfig | 3 + + sound/soc/txx9/txx9aclc-ac97.c | 1 + + 284 files changed, 3191 insertions(+), 12630 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mips/loongson/rs780e-acpi.yaml + delete mode 100644 arch/mips/configs/lasat_defconfig + delete mode 100644 arch/mips/configs/markeins_defconfig + delete mode 100644 arch/mips/configs/msp71xx_defconfig + delete mode 100644 arch/mips/emma/Makefile + delete mode 100644 arch/mips/emma/Platform + delete mode 100644 arch/mips/emma/common/Makefile + delete mode 100644 arch/mips/emma/common/prom.c + delete mode 100644 arch/mips/emma/markeins/Makefile + delete mode 100644 arch/mips/emma/markeins/irq.c + delete mode 100644 arch/mips/emma/markeins/led.c + delete mode 100644 arch/mips/emma/markeins/platform.c + delete mode 100644 arch/mips/emma/markeins/setup.c + delete mode 100644 arch/mips/include/asm/clock.h + delete mode 100644 arch/mips/include/asm/emma/emma2rh.h + delete mode 100644 arch/mips/include/asm/emma/markeins.h + delete mode 100644 arch/mips/include/asm/lasat/ds1603.h + delete mode 100644 arch/mips/include/asm/lasat/eeprom.h + delete mode 100644 arch/mips/include/asm/lasat/head.h + delete mode 100644 arch/mips/include/asm/lasat/lasat.h + delete mode 100644 arch/mips/include/asm/lasat/lasatint.h + delete mode 100644 arch/mips/include/asm/lasat/picvue.h + delete mode 100644 arch/mips/include/asm/lasat/serial.h + delete mode 100644 arch/mips/include/asm/mach-au1x00/ioremap.h + delete mode 100644 arch/mips/include/asm/mach-emma2rh/irq.h + delete mode 100644 arch/mips/include/asm/mach-jz4740/base.h + delete mode 100644 arch/mips/include/asm/mach-jz4740/dma.h + delete mode 100644 arch/mips/include/asm/mach-jz4740/timer.h + delete mode 100644 arch/mips/include/asm/mach-lasat/irq.h + delete mode 100644 arch/mips/include/asm/mach-lasat/mach-gt64120.h + delete mode 100644 arch/mips/include/asm/mach-loongson64/mc146818rtc.h + delete mode 100644 arch/mips/include/asm/mach-pmcs-msp71xx/cpu-feature-overrides.h + delete mode 100644 arch/mips/include/asm/mach-pmcs-msp71xx/msp_cic_int.h + delete mode 100644 arch/mips/include/asm/mach-pmcs-msp71xx/msp_gpio_macros.h + delete mode 100644 arch/mips/include/asm/mach-pmcs-msp71xx/msp_int.h + delete mode 100644 arch/mips/include/asm/mach-pmcs-msp71xx/msp_pci.h + delete mode 100644 arch/mips/include/asm/mach-pmcs-msp71xx/msp_prom.h + delete mode 100644 arch/mips/include/asm/mach-pmcs-msp71xx/msp_regops.h + delete mode 100644 arch/mips/include/asm/mach-pmcs-msp71xx/msp_regs.h + delete mode 100644 arch/mips/include/asm/mach-pmcs-msp71xx/msp_slp_int.h + delete mode 100644 arch/mips/include/asm/mach-pmcs-msp71xx/msp_usb.h + delete mode 100644 arch/mips/include/asm/mach-pmcs-msp71xx/war.h + delete mode 100644 arch/mips/include/asm/mach-xilfpga/irq.h + delete mode 100644 arch/mips/include/asm/nile4.h + delete mode 100644 arch/mips/jz4740/pm.c + delete mode 100644 arch/mips/jz4740/prom.c + delete mode 100644 arch/mips/jz4740/reset.c + delete mode 100644 arch/mips/jz4740/reset.h + delete mode 100644 arch/mips/jz4740/time.c + delete mode 100644 arch/mips/jz4740/timer.c + delete mode 100644 arch/mips/kernel/8250-platform.c + delete mode 100644 arch/mips/lasat/Kconfig + delete mode 100644 arch/mips/lasat/Makefile + delete mode 100644 arch/mips/lasat/Platform + delete mode 100644 arch/mips/lasat/at93c.c + delete mode 100644 arch/mips/lasat/at93c.h + delete mode 100644 arch/mips/lasat/ds1603.c + delete mode 100644 arch/mips/lasat/ds1603.h + delete mode 100644 arch/mips/lasat/image/Makefile + delete mode 100644 arch/mips/lasat/image/head.S + delete mode 100644 arch/mips/lasat/image/romscript.normal + delete mode 100644 arch/mips/lasat/interrupt.c + delete mode 100644 arch/mips/lasat/lasat_board.c + delete mode 100644 arch/mips/lasat/lasat_models.h + delete mode 100644 arch/mips/lasat/picvue.c + delete mode 100644 arch/mips/lasat/picvue.h + delete mode 100644 arch/mips/lasat/picvue_proc.c + delete mode 100644 arch/mips/lasat/prom.c + delete mode 100644 arch/mips/lasat/prom.h + delete mode 100644 arch/mips/lasat/reset.c + delete mode 100644 arch/mips/lasat/serial.c + delete mode 100644 arch/mips/lasat/setup.c + delete mode 100644 arch/mips/lasat/sysctl.c + delete mode 100644 arch/mips/loongson64/rtc.c + create mode 100644 arch/mips/mm/ioremap64.c + delete mode 100644 arch/mips/pci/fixup-emma2rh.c + delete mode 100644 arch/mips/pci/fixup-pmcmsp.c + delete mode 100644 arch/mips/pci/ops-emma2rh.c + delete mode 100644 arch/mips/pci/ops-nile4.c + delete mode 100644 arch/mips/pci/ops-pmcmsp.c + delete mode 100644 arch/mips/pci/pci-emma2rh.c + delete mode 100644 arch/mips/pci/pci-lasat.c + delete mode 100644 arch/mips/pmcs-msp71xx/Kconfig + delete mode 100644 arch/mips/pmcs-msp71xx/Makefile + delete mode 100644 arch/mips/pmcs-msp71xx/Platform + delete mode 100644 arch/mips/pmcs-msp71xx/msp_elb.c + delete mode 100644 arch/mips/pmcs-msp71xx/msp_eth.c + delete mode 100644 arch/mips/pmcs-msp71xx/msp_hwbutton.c + delete mode 100644 arch/mips/pmcs-msp71xx/msp_irq.c + delete mode 100644 arch/mips/pmcs-msp71xx/msp_irq_cic.c + delete mode 100644 arch/mips/pmcs-msp71xx/msp_irq_per.c + delete mode 100644 arch/mips/pmcs-msp71xx/msp_irq_slp.c + delete mode 100644 arch/mips/pmcs-msp71xx/msp_pci.c + delete mode 100644 arch/mips/pmcs-msp71xx/msp_prom.c + delete mode 100644 arch/mips/pmcs-msp71xx/msp_serial.c + delete mode 100644 arch/mips/pmcs-msp71xx/msp_setup.c + delete mode 100644 arch/mips/pmcs-msp71xx/msp_smp.c + delete mode 100644 arch/mips/pmcs-msp71xx/msp_time.c + delete mode 100644 arch/mips/pmcs-msp71xx/msp_usb.c + create mode 100644 arch/mips/vdso/Kconfig + create mode 100644 arch/mips/vr41xx/Makefile + rename arch/mips/loongson64/acpi_init.c => drivers/platform/mips/rs780e-acpi.c (70%) +Merging nds32/next (d785c5a324cd nds32: configs: Cleanup CONFIG_CROSS_COMPILE) +$ git merge nds32/next +Merge made by the 'recursive' strategy. + arch/nds32/configs/defconfig | 1 - + arch/nds32/kernel/time.c | 2 +- + 2 files changed, 1 insertion(+), 2 deletions(-) +Merging nios2/for-next (0ec8a5054d7f MAINTAINERS: Remove nios2-dev@lists.rocketboards.org) +$ git merge nios2/for-next +Already up to date. +Merging openrisc/for-next (9737e2c5f0bc openrisc: Remove obsolete show_trace_task function) +$ git merge openrisc/for-next +Already up to date. +Merging parisc-hd/for-next (b6522fa409cf parisc: add sysctl file interface panic_on_stackoverflow) +$ git merge parisc-hd/for-next +Merge made by the 'recursive' strategy. + arch/parisc/Makefile | 4 ++-- + arch/parisc/boot/compressed/Makefile | 1 + + kernel/sysctl.c | 20 +++++++++++--------- + 3 files changed, 14 insertions(+), 11 deletions(-) +Merging powerpc/next (30df74d67d48 powerpc/watchpoint/xmon: Support 2nd DAWR) +$ git merge powerpc/next +Auto-merging arch/powerpc/mm/nohash/8xx.c +Auto-merging arch/powerpc/kernel/setup_64.c +Auto-merging arch/powerpc/kernel/exceptions-64s.S +Auto-merging arch/powerpc/include/asm/uaccess.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-devices-system-cpu | 39 + + Documentation/powerpc/index.rst | 1 + + Documentation/powerpc/vas-api.rst | 292 ++++++ + Documentation/userspace-api/ioctl/ioctl-number.rst | 1 + + MAINTAINERS | 2 +- + arch/powerpc/Kconfig | 3 +- + arch/powerpc/boot/dts/pcm032.dts | 4 +- + arch/powerpc/boot/wrapper | 3 +- + arch/powerpc/include/asm/book3s/32/pgtable.h | 4 +- + arch/powerpc/include/asm/book3s/64/mmu.h | 3 + + arch/powerpc/include/asm/book3s/64/pgtable.h | 20 +- + arch/powerpc/include/asm/book3s/64/tlbflush-hash.h | 3 +- + arch/powerpc/include/asm/code-patching.h | 37 +- + arch/powerpc/include/asm/cputable.h | 6 +- + arch/powerpc/include/asm/debug.h | 2 +- + arch/powerpc/include/asm/fadump-internal.h | 4 +- + arch/powerpc/include/asm/firmware.h | 1 + + arch/powerpc/include/asm/ftrace.h | 14 + + arch/powerpc/include/asm/hw_breakpoint.h | 32 +- + arch/powerpc/include/asm/icswx.h | 20 +- + arch/powerpc/include/asm/idle.h | 93 ++ + arch/powerpc/include/asm/inst.h | 109 +++ + arch/powerpc/include/asm/iommu.h | 4 +- + arch/powerpc/include/asm/kprobes.h | 2 +- + arch/powerpc/include/asm/kvm_book3s.h | 2 +- + arch/powerpc/include/asm/kvm_book3s_64.h | 34 +- + arch/powerpc/include/asm/mmu.h | 9 - + arch/powerpc/include/asm/mmu_context.h | 30 + + arch/powerpc/include/asm/nohash/32/pgtable.h | 4 +- + arch/powerpc/include/asm/page.h | 7 - + arch/powerpc/include/asm/ppc-opcode.h | 3 + + arch/powerpc/include/asm/processor.h | 10 +- + arch/powerpc/include/asm/ptrace.h | 46 +- + arch/powerpc/include/asm/reg.h | 13 +- + arch/powerpc/include/asm/sstep.h | 17 +- + arch/powerpc/include/asm/switch_to.h | 2 - + arch/powerpc/include/asm/syscall.h | 5 +- + arch/powerpc/include/asm/uaccess.h | 45 + + arch/powerpc/include/asm/uprobes.h | 7 +- + arch/powerpc/include/asm/vas.h | 13 +- + arch/powerpc/include/asm/xive.h | 9 +- + arch/powerpc/include/uapi/asm/vas-api.h | 24 + + arch/powerpc/kernel/align.c | 18 +- + arch/powerpc/kernel/asm-offsets.c | 8 + + arch/powerpc/kernel/crash_dump.c | 7 +- + arch/powerpc/kernel/dawr.c | 23 +- + arch/powerpc/kernel/eeh.c | 31 + + arch/powerpc/kernel/epapr_paravirt.c | 7 +- + arch/powerpc/kernel/exceptions-64s.S | 47 +- + arch/powerpc/kernel/fadump.c | 153 ++- + arch/powerpc/kernel/head_64.S | 9 +- + arch/powerpc/kernel/head_booke.h | 2 +- + arch/powerpc/kernel/hw_breakpoint.c | 641 ++++++++++-- + arch/powerpc/kernel/jump_label.c | 5 +- + arch/powerpc/kernel/kgdb.c | 9 +- + arch/powerpc/kernel/kprobes.c | 37 +- + arch/powerpc/kernel/mce.c | 16 +- + arch/powerpc/kernel/mce_power.c | 19 +- + arch/powerpc/kernel/module_32.c | 17 +- + arch/powerpc/kernel/module_64.c | 20 +- + arch/powerpc/kernel/nvram_64.c | 4 +- + arch/powerpc/kernel/optprobes.c | 100 +- + arch/powerpc/kernel/optprobes_head.S | 3 + + arch/powerpc/kernel/pci-hotplug.c | 2 - + arch/powerpc/kernel/pci_64.c | 6 +- + arch/powerpc/kernel/process.c | 113 +-- + arch/powerpc/kernel/prom.c | 10 +- + arch/powerpc/kernel/prom_init.c | 24 +- + arch/powerpc/kernel/ptrace/ptrace-noadv.c | 72 +- + arch/powerpc/kernel/ptrace/ptrace-tm.c | 2 +- + arch/powerpc/kernel/ptrace/ptrace-view.c | 2 +- + arch/powerpc/kernel/ptrace/ptrace32.c | 4 +- + arch/powerpc/kernel/security.c | 48 +- + arch/powerpc/kernel/setup_32.c | 8 +- + arch/powerpc/kernel/setup_64.c | 15 +- + arch/powerpc/kernel/signal.c | 22 +- + arch/powerpc/kernel/signal_32.c | 2 +- + arch/powerpc/kernel/signal_64.c | 10 +- + arch/powerpc/kernel/sysfs.c | 82 +- + arch/powerpc/kernel/trace/ftrace.c | 168 ++-- + arch/powerpc/kernel/traps.c | 45 +- + arch/powerpc/kernel/uprobes.c | 5 +- + arch/powerpc/kernel/vecemu.c | 20 +- + arch/powerpc/kvm/book3s_64_mmu_hv.c | 13 +- + arch/powerpc/kvm/book3s_64_mmu_radix.c | 38 +- + arch/powerpc/kvm/book3s_64_vio_hv.c | 66 +- + arch/powerpc/kvm/book3s_hv.c | 12 +- + arch/powerpc/kvm/book3s_hv_nested.c | 39 +- + arch/powerpc/kvm/book3s_hv_rm_mmu.c | 60 +- + arch/powerpc/kvm/book3s_hv_rmhandlers.S | 18 +- + arch/powerpc/kvm/emulate_loadstore.c | 2 +- + arch/powerpc/lib/Makefile | 2 +- + arch/powerpc/lib/code-patching.c | 313 +++--- + arch/powerpc/lib/feature-fixups-test.S | 69 ++ + arch/powerpc/lib/feature-fixups.c | 162 ++- + arch/powerpc/lib/inst.c | 73 ++ + arch/powerpc/lib/sstep.c | 460 ++++++--- + arch/powerpc/lib/test_code-patching.S | 20 + + arch/powerpc/lib/test_emulate_step.c | 56 +- + arch/powerpc/mm/book3s64/hash_pgtable.c | 11 - + arch/powerpc/mm/book3s64/hash_tlb.c | 22 +- + arch/powerpc/mm/book3s64/hash_utils.c | 62 +- + arch/powerpc/mm/book3s64/pgtable.c | 24 +- + arch/powerpc/mm/book3s64/radix_pgtable.c | 21 +- + arch/powerpc/mm/fault.c | 92 +- + arch/powerpc/mm/init_64.c | 4 +- + arch/powerpc/mm/nohash/8xx.c | 5 +- + arch/powerpc/mm/slice.c | 2 +- + arch/powerpc/perf/8xx-pmu.c | 9 +- + arch/powerpc/perf/callchain_64.c | 46 +- + arch/powerpc/perf/core-book3s.c | 4 +- + arch/powerpc/platforms/86xx/mpc86xx_smp.c | 5 +- + arch/powerpc/platforms/cell/iommu.c | 6 +- + arch/powerpc/platforms/powermac/bootx_init.c | 14 +- + arch/powerpc/platforms/powermac/smp.c | 5 +- + arch/powerpc/platforms/powernv/Makefile | 2 +- + arch/powerpc/platforms/powernv/idle.c | 2 +- + arch/powerpc/platforms/powernv/opal-fadump.c | 2 +- + arch/powerpc/platforms/powernv/pci-ioda.c | 10 +- + arch/powerpc/platforms/powernv/vas-api.c | 278 ++++++ + arch/powerpc/platforms/powernv/vas-debug.c | 2 +- + arch/powerpc/platforms/powernv/vas-fault.c | 382 ++++++++ + arch/powerpc/platforms/powernv/vas-window.c | 238 ++++- + arch/powerpc/platforms/powernv/vas.c | 85 +- + arch/powerpc/platforms/powernv/vas.h | 59 +- + arch/powerpc/platforms/ps3/mm.c | 52 +- + arch/powerpc/platforms/ps3/setup.c | 2 +- + arch/powerpc/platforms/pseries/eeh_pseries.c | 8 +- + arch/powerpc/platforms/pseries/ras.c | 62 +- + arch/powerpc/platforms/pseries/rtas-fadump.c | 2 +- + arch/powerpc/platforms/pseries/setup.c | 22 +- + arch/powerpc/sysdev/xive/native.c | 6 +- + arch/powerpc/tools/head_check.sh | 8 +- + arch/powerpc/xmon/Makefile | 2 +- + arch/powerpc/xmon/xmon.c | 223 +++-- + arch/powerpc/xmon/xmon_bpts.S | 11 + + arch/powerpc/xmon/xmon_bpts.h | 14 + + arch/s390/include/asm/pgtable.h | 4 +- + drivers/block/ps3disk.c | 1 - + drivers/cpuidle/cpuidle-pseries.c | 39 +- + drivers/crypto/nx/Makefile | 2 +- + .../nx/{nx-842-powernv.c => nx-common-powernv.c} | 204 ++-- + drivers/macintosh/windfarm_pm112.c | 21 +- + drivers/net/ethernet/toshiba/ps3_gelic_net.c | 2 - + drivers/ps3/ps3-lpm.c | 8 +- + drivers/ps3/ps3-vuart.c | 5 +- + drivers/vfio/pci/vfio_pci_nvlink2.c | 2 +- + drivers/video/fbdev/ps3fb.c | 4 +- + include/asm-generic/pgtable.h | 4 +- + kernel/events/hw_breakpoint.c | 16 + + mm/huge_memory.c | 4 +- + sound/ppc/snd_ps3.c | 2 +- + tools/testing/selftests/powerpc/Makefile | 1 + + .../selftests/powerpc/nx-gzip/99-nx-gzip.rules | 1 + + tools/testing/selftests/powerpc/nx-gzip/Makefile | 8 + + tools/testing/selftests/powerpc/nx-gzip/README | 45 + + .../testing/selftests/powerpc/nx-gzip/gunz_test.c | 1028 ++++++++++++++++++++ + .../testing/selftests/powerpc/nx-gzip/gzfht_test.c | 433 +++++++++ + tools/testing/selftests/powerpc/nx-gzip/gzip_vas.c | 316 ++++++ + .../selftests/powerpc/nx-gzip/include/copy-paste.h | 56 ++ + .../selftests/powerpc/nx-gzip/include/crb.h | 155 +++ + .../testing/selftests/powerpc/nx-gzip/include/nx.h | 38 + + .../selftests/powerpc/nx-gzip/include/nx_dbg.h | 95 ++ + .../selftests/powerpc/nx-gzip/include/nxu.h | 650 +++++++++++++ + .../selftests/powerpc/nx-gzip/include/vas-api.h | 1 + + .../selftests/powerpc/nx-gzip/nx-gzip-test.sh | 46 + + tools/testing/selftests/powerpc/pmu/.gitignore | 1 + + tools/testing/selftests/powerpc/pmu/Makefile | 8 +- + .../selftests/powerpc/pmu/count_stcx_fail.c | 161 +++ + tools/testing/selftests/powerpc/pmu/loop.S | 35 + + tools/testing/selftests/powerpc/signal/Makefile | 2 +- + .../powerpc/signal/sig_sc_double_restart.c | 174 ++++ + 172 files changed, 8037 insertions(+), 1557 deletions(-) + create mode 100644 Documentation/powerpc/vas-api.rst + create mode 100644 arch/powerpc/include/asm/idle.h + create mode 100644 arch/powerpc/include/asm/inst.h + create mode 100644 arch/powerpc/include/uapi/asm/vas-api.h + create mode 100644 arch/powerpc/lib/inst.c + create mode 100644 arch/powerpc/lib/test_code-patching.S + create mode 100644 arch/powerpc/platforms/powernv/vas-api.c + create mode 100644 arch/powerpc/platforms/powernv/vas-fault.c + create mode 100644 arch/powerpc/xmon/xmon_bpts.S + create mode 100644 arch/powerpc/xmon/xmon_bpts.h + rename drivers/crypto/nx/{nx-842-powernv.c => nx-common-powernv.c} (87%) + create mode 100644 tools/testing/selftests/powerpc/nx-gzip/99-nx-gzip.rules + create mode 100644 tools/testing/selftests/powerpc/nx-gzip/Makefile + create mode 100644 tools/testing/selftests/powerpc/nx-gzip/README + create mode 100644 tools/testing/selftests/powerpc/nx-gzip/gunz_test.c + create mode 100644 tools/testing/selftests/powerpc/nx-gzip/gzfht_test.c + create mode 100644 tools/testing/selftests/powerpc/nx-gzip/gzip_vas.c + create mode 100644 tools/testing/selftests/powerpc/nx-gzip/include/copy-paste.h + create mode 100644 tools/testing/selftests/powerpc/nx-gzip/include/crb.h + create mode 100644 tools/testing/selftests/powerpc/nx-gzip/include/nx.h + create mode 100644 tools/testing/selftests/powerpc/nx-gzip/include/nx_dbg.h + create mode 100644 tools/testing/selftests/powerpc/nx-gzip/include/nxu.h + create mode 120000 tools/testing/selftests/powerpc/nx-gzip/include/vas-api.h + create mode 100755 tools/testing/selftests/powerpc/nx-gzip/nx-gzip-test.sh + create mode 100644 tools/testing/selftests/powerpc/pmu/count_stcx_fail.c + create mode 100644 tools/testing/selftests/powerpc/signal/sig_sc_double_restart.c +Merging fsl/next (a76bea0287ce powerpc/kmcent2: add ranges to the pci bridges) +$ git merge fsl/next +Already up to date. +Merging soc-fsl/next (461c3ac0dc46 soc: fsl: qe: fix sparse warnings for ucc_slow.c) +$ git merge soc-fsl/next +Already up to date. +Merging risc-v/for-next (44ab661dd29d riscv: Use text_mutex instead of patch_lock) +$ git merge risc-v/for-next +Auto-merging arch/riscv/mm/init.c +Auto-merging arch/riscv/kernel/Makefile +Auto-merging arch/riscv/Kconfig.socs +Auto-merging arch/riscv/Kconfig +Merge made by the 'recursive' strategy. + arch/riscv/Kbuild | 1 + + arch/riscv/Kconfig | 7 + + arch/riscv/Kconfig.socs | 17 +- + arch/riscv/boot/dts/Makefile | 2 + + arch/riscv/boot/dts/kendryte/Makefile | 4 +- + arch/riscv/configs/nommu_k210_defconfig | 7 +- + arch/riscv/include/asm/gdb_xml.h | 117 ++++++++++ + arch/riscv/include/asm/kdebug.h | 12 + + arch/riscv/include/asm/kgdb.h | 112 +++++++++ + arch/riscv/include/asm/parse_asm.h | 219 ++++++++++++++++++ + arch/riscv/include/asm/patch.h | 4 +- + arch/riscv/include/asm/soc.h | 39 ++++ + arch/riscv/kernel/Makefile | 1 + + arch/riscv/kernel/ftrace.c | 15 +- + arch/riscv/kernel/head.S | 11 +- + arch/riscv/kernel/kgdb.c | 390 ++++++++++++++++++++++++++++++++ + arch/riscv/kernel/patch.c | 46 ++-- + arch/riscv/kernel/setup.c | 4 + + arch/riscv/kernel/soc.c | 27 +++ + arch/riscv/kernel/traps.c | 5 + + arch/riscv/kernel/vmlinux.lds.S | 5 + + arch/riscv/mm/init.c | 9 + + drivers/soc/kendryte/k210-sysctl.c | 12 + + kernel/debug/debug_core.c | 12 + + 24 files changed, 1048 insertions(+), 30 deletions(-) + create mode 100644 arch/riscv/include/asm/gdb_xml.h + create mode 100644 arch/riscv/include/asm/kdebug.h + create mode 100644 arch/riscv/include/asm/kgdb.h + create mode 100644 arch/riscv/include/asm/parse_asm.h + create mode 100644 arch/riscv/kernel/kgdb.c +Merging sifive/for-next (467e050e9760 Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux) +$ git merge sifive/for-next +Already up to date. +Merging s390/features (23a457b8d57d s390: nvme reipl) +$ git merge s390/features +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 2 + + Documentation/s390/index.rst | 1 + + Documentation/s390/pci.rst | 125 ++++++++++++ + MAINTAINERS | 1 + + arch/s390/include/asm/ipl.h | 11 + + arch/s390/include/asm/pci.h | 41 +++- + arch/s390/include/asm/pci_clp.h | 12 +- + arch/s390/include/uapi/asm/ipl.h | 25 +++ + arch/s390/kernel/Makefile | 5 - + arch/s390/kernel/ipl.c | 209 +++++++++++++++++++ + arch/s390/kernel/ptrace.c | 2 +- + arch/s390/pci/Makefile | 3 +- + arch/s390/pci/pci.c | 204 ++++++++----------- + arch/s390/pci/pci_bus.c | 260 ++++++++++++++++++++++++ + arch/s390/pci/pci_bus.h | 31 +++ + arch/s390/pci/pci_clp.c | 4 + + arch/s390/pci/pci_event.c | 39 ++-- + arch/s390/pci/pci_sysfs.c | 4 +- + drivers/iommu/s390-iommu.c | 8 +- + drivers/pci/hotplug/s390_pci_hpc.c | 16 +- + drivers/s390/cio/qdio.h | 13 +- + drivers/s390/cio/qdio_main.c | 105 ++++------ + drivers/s390/cio/qdio_setup.c | 100 +++++---- + drivers/s390/cio/qdio_thinint.c | 61 +++--- + 24 files changed, 973 insertions(+), 309 deletions(-) + create mode 100644 Documentation/s390/pci.rst + create mode 100644 arch/s390/pci/pci_bus.c + create mode 100644 arch/s390/pci/pci_bus.h +Merging sh/sh-next (a193018e5290 sh: add missing EXPORT_SYMBOL() for __delay) +$ git merge sh/sh-next +Merge made by the 'recursive' strategy. + arch/sh/include/asm/cache.h | 2 +- + arch/sh/kernel/Makefile | 2 -- + arch/sh/kernel/sh_ksyms_32.c | 17 +++++++++++++++++ + arch/sh/lib/delay.c | 1 + + 4 files changed, 19 insertions(+), 3 deletions(-) +Merging sparc-next/master (0a2576dae032 oradax: convert get_user_pages() --> pin_user_pages()) +$ git merge sparc-next/master +Merge made by the 'recursive' strategy. + arch/sparc/include/asm/page_32.h | 12 ++--- + arch/sparc/include/asm/pgalloc_32.h | 11 +++-- + arch/sparc/include/asm/pgtable_32.h | 40 ++++++++++------ + arch/sparc/include/asm/pgtsrmmu.h | 36 ++------------ + arch/sparc/include/asm/viking.h | 5 +- + arch/sparc/kernel/head_32.S | 8 ++-- + arch/sparc/mm/hypersparc.S | 3 +- + arch/sparc/mm/srmmu.c | 95 +++++++++++++------------------------ + arch/sparc/mm/viking.S | 5 +- + drivers/sbus/char/oradax.c | 8 ++-- + 10 files changed, 88 insertions(+), 135 deletions(-) +Merging uml/linux-next (2e27d33d22af um: Fix typo in vector driver transport option definition) +$ git merge uml/linux-next +Merge made by the 'recursive' strategy. + arch/um/drivers/vector_user.h | 2 +- + arch/um/include/asm/xor.h | 2 +- + arch/um/kernel/skas/syscall.c | 1 + + 3 files changed, 3 insertions(+), 2 deletions(-) +Merging xtensa/xtensa-for-next (70cbddb97385 arch/xtensa: fix grammar in Kconfig help text) +$ git merge xtensa/xtensa-for-next +Already up to date. +Merging fscrypt/master (0e698dfa2822 Linux 5.7-rc4) +$ git merge fscrypt/master +Already up to date. +Merging afs/afs-next (4fe171bb81b1 afs: Remove set but not used variable 'ret') +$ git merge afs/afs-next +Already up to date. +Merging btrfs/for-next (3ade84b69d56 Merge branch 'for-next-next-v5.7-20200515' into for-next-20200515) +$ git merge btrfs/for-next +Merge made by the 'recursive' strategy. + .clang-format | 1 + + Documentation/block/biovecs.rst | 2 + + fs/btrfs/backref.c | 834 ++++++++++++++++++++++++++ + fs/btrfs/backref.h | 297 ++++++++++ + fs/btrfs/block-group.c | 233 +++++--- + fs/btrfs/block-group.h | 14 +- + fs/btrfs/block-rsv.c | 3 + + fs/btrfs/btrfs_inode.h | 26 +- + fs/btrfs/compression.c | 4 +- + fs/btrfs/ctree.c | 112 ++-- + fs/btrfs/ctree.h | 83 ++- + fs/btrfs/disk-io.c | 21 +- + fs/btrfs/disk-io.h | 1 - + fs/btrfs/extent-tree.c | 21 +- + fs/btrfs/extent_io.c | 288 +++++---- + fs/btrfs/extent_io.h | 67 ++- + fs/btrfs/file-item.c | 18 +- + fs/btrfs/free-space-cache.c | 52 +- + fs/btrfs/inode.c | 846 ++++++++------------------- + fs/btrfs/locking.c | 1 + + fs/btrfs/misc.h | 54 ++ + fs/btrfs/qgroup.c | 14 + + fs/btrfs/relocation.c | 1232 ++++++++------------------------------- + fs/btrfs/scrub.c | 53 +- + fs/btrfs/send.c | 67 +++ + fs/btrfs/space-info.c | 81 ++- + fs/btrfs/space-info.h | 1 + + fs/btrfs/struct-funcs.c | 223 +++---- + fs/btrfs/super.c | 27 +- + fs/btrfs/transaction.c | 62 +- + fs/btrfs/transaction.h | 3 +- + fs/btrfs/tree-checker.c | 4 - + fs/btrfs/tree-log.c | 138 ++--- + fs/btrfs/volumes.c | 73 ++- + include/linux/bio.h | 8 + + include/uapi/linux/btrfs_tree.h | 9 - + 36 files changed, 2586 insertions(+), 2387 deletions(-) +Merging ceph/master (12ae44a40a1b ceph: demote quotarealm lookup warning to a debug message) +$ git merge ceph/master +Already up to date. +Merging cifs/for-next (ed5bfc1f82a2 cifs: handle "nolease" option for vers=1.0) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/connect.c | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) +Merging configfs/for-next (8aebfffacfa3 configfs: fix config_item refcnt leak in configfs_rmdir()) +$ git merge configfs/for-next +Already up to date. +Merging ecryptfs/next (8b614cb8f1dc Merge tag '5.6-rc4-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6) +$ git merge ecryptfs/next +Already up to date. +Merging erofs/dev (8f3d9f354286 Linux 5.7-rc1) +$ git merge erofs/dev +Already up to date. +Merging exfat/dev (69eca64b2fc2 exfat: replace 'time_ms' with 'time_cs') +$ git merge exfat/dev +Merge made by the 'recursive' strategy. + fs/exfat/Kconfig | 7 ++++--- + fs/exfat/balloc.c | 8 +++----- + fs/exfat/dir.c | 17 ++++++++--------- + fs/exfat/exfat_fs.h | 13 +++++++++---- + fs/exfat/exfat_raw.h | 4 ++-- + fs/exfat/fatent.c | 13 +++++-------- + fs/exfat/file.c | 2 +- + fs/exfat/inode.c | 4 ++-- + fs/exfat/misc.c | 22 +++++++++++----------- + fs/exfat/namei.c | 49 ++++++++++++++++--------------------------------- + fs/exfat/nls.c | 33 ++++++++------------------------- + fs/exfat/super.c | 49 ++++++++++++++++++++++--------------------------- + 12 files changed, 91 insertions(+), 130 deletions(-) +Merging ext3/for_next (a32f0ecd79b4 Merge fanotify fix from Nathan Chancellor.) +$ git merge ext3/for_next +Already up to date! +Merge made by the 'recursive' strategy. +Merging ext4/dev (907ea529fc4c ext4: convert BUG_ON's to WARN_ON's in mballoc.c) +$ git merge ext4/dev +Already up to date. +Merging f2fs/dev (9c30df7c5a30 f2fs: flush dirty meta pages when flushing them) +$ git merge f2fs/dev +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-fs-f2fs | 15 ++ + Documentation/filesystems/f2fs.rst | 2 +- + fs/f2fs/Kconfig | 10 + + fs/f2fs/acl.h | 2 +- + fs/f2fs/checkpoint.c | 33 ++- + fs/f2fs/compress.c | 173 +++++++++++--- + fs/f2fs/data.c | 142 +++++++++++- + fs/f2fs/dir.c | 364 ++++++++++++++++-------------- + fs/f2fs/f2fs.h | 162 ++++++++++---- + fs/f2fs/file.c | 386 ++++++++++++++++++++++++++++++-- + fs/f2fs/gc.c | 125 +++++++---- + fs/f2fs/gc.h | 2 +- + fs/f2fs/hash.c | 76 +++---- + fs/f2fs/inline.c | 49 ++-- + fs/f2fs/namei.c | 8 +- + fs/f2fs/node.c | 84 +++++-- + fs/f2fs/node.h | 5 +- + fs/f2fs/recovery.c | 51 ++++- + fs/f2fs/segment.c | 20 +- + fs/f2fs/segment.h | 2 +- + fs/f2fs/super.c | 86 ++++--- + fs/f2fs/sysfs.c | 95 ++++++-- + fs/f2fs/trace.h | 2 +- + fs/f2fs/xattr.h | 2 +- + include/trace/events/f2fs.h | 83 ++++++- + 25 files changed, 1494 insertions(+), 485 deletions(-) +Merging fsverity/fsverity (0e698dfa2822 Linux 5.7-rc4) +$ git merge fsverity/fsverity +Already up to date. +Merging fuse/for-next (75d892588e95 fuse: Update stale comment in queue_interrupt()) +$ git merge fuse/for-next +Merge made by the 'recursive' strategy. + Documentation/filesystems/virtiofs.rst | 14 +++++ + fs/fuse/dev.c | 7 ++- + fs/fuse/file.c | 1 + + fs/fuse/fuse_i.h | 1 + + fs/fuse/virtio_fs.c | 106 ++++++++++++++++++++++----------- + 5 files changed, 91 insertions(+), 38 deletions(-) +Merging jfs/jfs-next (7aba5dcc2346 jfs: Replace zero-length array with flexible-array member) +$ git merge jfs/jfs-next +Merge made by the 'recursive' strategy. +Merging nfs/linux-next (8eed292bc8cb NFSv3: fix rpc receive buffer size for MOUNT call) +$ git merge nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (55dee1bc0d72 nfs: add minor version to nfs_server_key for fscache) +$ git merge nfs-anna/linux-next +Already up to date. +Merging nfsd/nfsd-next (746c6237ece6 sunrpc: add missing newline when printing parameter 'pool_mode' by sysfs) +$ git merge nfsd/nfsd-next +Auto-merging include/linux/fs.h +Merge made by the 'recursive' strategy. + Documentation/filesystems/locking.rst | 2 + + fs/locks.c | 3 + + fs/nfsd/nfs4proc.c | 2 + + fs/nfsd/nfs4state.c | 103 ++++++++++++++++++++++++++++------ + fs/nfsd/nfsd.h | 2 + + fs/nfsd/nfssvc.c | 6 ++ + include/linux/fs.h | 1 + + include/linux/kthread.h | 1 + + include/linux/sunrpc/svc.h | 1 + + kernel/kthread.c | 17 ++++++ + net/sunrpc/svc.c | 10 ++-- + net/sunrpc/svcauth_unix.c | 9 --- + 12 files changed, 127 insertions(+), 30 deletions(-) +Merging orangefs/for-next (aa317d3351de orangefs: clarify build steps for test server in orangefs.txt) +$ git merge orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (144da23beab8 ovl: return required buffer size for file handles) +$ git merge overlayfs/overlayfs-next +Auto-merging include/linux/fs.h +Merge made by the 'recursive' strategy. + Documentation/filesystems/overlayfs.rst | 7 ++- + fs/overlayfs/copy_up.c | 7 +-- + fs/overlayfs/dir.c | 49 ++++++++++++----- + fs/overlayfs/export.c | 21 ++++---- + fs/overlayfs/inode.c | 18 +++++++ + fs/overlayfs/namei.c | 11 ---- + fs/overlayfs/overlayfs.h | 6 +-- + fs/overlayfs/ovl_entry.h | 3 ++ + fs/overlayfs/readdir.c | 18 +++++-- + fs/overlayfs/super.c | 94 ++++++++++++++++++++++++++++++--- + fs/overlayfs/util.c | 3 +- + fs/sync.c | 3 +- + include/linux/fs.h | 2 + + 13 files changed, 186 insertions(+), 56 deletions(-) +Merging ubifs/linux-next (0e7572cffe44 ubi: Fix seq_file usage in detailed_erase_block_info debugfs file) +$ git merge ubifs/linux-next +Merge made by the 'recursive' strategy. + drivers/mtd/ubi/debug.c | 12 ++---------- + fs/ubifs/auth.c | 17 ++++------------- + fs/ubifs/file.c | 6 +----- + fs/ubifs/replay.c | 13 ++----------- + 4 files changed, 9 insertions(+), 39 deletions(-) +Merging v9fs/9p-next (c6f141412d24 9p: document short read behaviour with O_NONBLOCK) +$ git merge v9fs/9p-next +Already up to date. +Merging xfs/for-next (508578f2f560 xfs: Use the correct style for SPDX License Identifier) +$ git merge xfs/for-next +Auto-merging fs/xfs/libxfs/xfs_format.h +Merge made by the 'recursive' strategy. + fs/xfs/Makefile | 5 +- + fs/xfs/kmem.h | 2 +- + fs/xfs/libxfs/xfs_ag_resv.h | 2 +- + fs/xfs/libxfs/xfs_alloc.h | 2 +- + fs/xfs/libxfs/xfs_alloc_btree.h | 2 +- + fs/xfs/libxfs/xfs_attr.h | 2 +- + fs/xfs/libxfs/xfs_attr_leaf.h | 2 +- + fs/xfs/libxfs/xfs_attr_remote.h | 2 +- + fs/xfs/libxfs/xfs_attr_sf.h | 2 +- + fs/xfs/libxfs/xfs_bit.h | 2 +- + fs/xfs/libxfs/xfs_bmap.h | 2 +- + fs/xfs/libxfs/xfs_bmap_btree.h | 2 +- + fs/xfs/libxfs/xfs_btree.h | 2 +- + fs/xfs/libxfs/xfs_da_btree.h | 2 +- + fs/xfs/libxfs/xfs_da_format.h | 2 +- + fs/xfs/libxfs/xfs_defer.c | 152 +-- + fs/xfs/libxfs/xfs_defer.h | 26 +- + fs/xfs/libxfs/xfs_dir2.h | 2 +- + fs/xfs/libxfs/xfs_dir2_priv.h | 2 +- + fs/xfs/libxfs/xfs_errortag.h | 6 +- + fs/xfs/libxfs/xfs_format.h | 2 +- + fs/xfs/libxfs/xfs_fs.h | 2 +- + fs/xfs/libxfs/xfs_health.h | 2 +- + fs/xfs/libxfs/xfs_inode_buf.c | 12 +- + fs/xfs/libxfs/xfs_inode_buf.h | 2 +- + fs/xfs/libxfs/xfs_inode_fork.c | 2 +- + fs/xfs/libxfs/xfs_log_recover.h | 83 +- + fs/xfs/libxfs/xfs_trans_inode.c | 2 +- + fs/xfs/scrub/ialloc.c | 3 +- + fs/xfs/xfs_bmap_item.c | 237 +++- + fs/xfs/xfs_bmap_item.h | 11 - + fs/xfs/xfs_bmap_util.c | 2 +- + fs/xfs/xfs_buf.c | 70 +- + fs/xfs/xfs_buf.h | 2 + + fs/xfs/xfs_buf_item.c | 106 +- + fs/xfs/xfs_buf_item.h | 2 - + fs/xfs/xfs_buf_item_recover.c | 984 ++++++++++++++ + fs/xfs/xfs_dquot.c | 47 +- + fs/xfs/xfs_dquot_item.c | 17 +- + fs/xfs/xfs_dquot_item_recover.c | 201 +++ + fs/xfs/xfs_error.c | 3 + + fs/xfs/xfs_extfree_item.c | 216 ++- + fs/xfs/xfs_extfree_item.h | 25 +- + fs/xfs/xfs_fsops.c | 5 +- + fs/xfs/xfs_icache.c | 6 +- + fs/xfs/xfs_icreate_item.c | 152 +++ + fs/xfs/xfs_inode.c | 143 +- + fs/xfs/xfs_inode.h | 1 + + fs/xfs/xfs_inode_item.c | 28 +- + fs/xfs/xfs_inode_item.h | 6 +- + fs/xfs/xfs_inode_item_recover.c | 400 ++++++ + fs/xfs/xfs_ioctl.c | 40 +- + fs/xfs/xfs_iops.c | 77 +- + fs/xfs/xfs_log_recover.c | 2801 ++++----------------------------------- + fs/xfs/xfs_message.c | 22 + + fs/xfs/xfs_message.h | 24 +- + fs/xfs/xfs_mount.c | 7 +- + fs/xfs/xfs_mount.h | 6 +- + fs/xfs/xfs_pnfs.c | 5 +- + fs/xfs/xfs_qm.c | 7 +- + fs/xfs/xfs_qm_syscalls.c | 6 +- + fs/xfs/xfs_refcount_item.c | 252 ++-- + fs/xfs/xfs_refcount_item.h | 11 - + fs/xfs/xfs_rmap_item.c | 229 ++-- + fs/xfs/xfs_rmap_item.h | 13 - + fs/xfs/xfs_super.c | 51 +- + fs/xfs/xfs_symlink.c | 6 +- + fs/xfs/xfs_trans.h | 6 +- + fs/xfs/xfs_trans_ail.c | 79 +- + fs/xfs/xfs_trans_priv.h | 21 +- + fs/xfs/xfs_xattr.c | 1 - + 71 files changed, 3210 insertions(+), 3449 deletions(-) + create mode 100644 fs/xfs/xfs_buf_item_recover.c + create mode 100644 fs/xfs/xfs_dquot_item_recover.c + create mode 100644 fs/xfs/xfs_inode_item_recover.c +Merging zonefs/for-next (568776f992c4 zonefs: Replace uuid_copy() with import_uuid()) +$ git merge zonefs/for-next +Merge made by the 'recursive' strategy. + fs/zonefs/super.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging iomap/iomap-for-next (b75dfde12129 fibmap: Warn and return an error in case of block > INT_MAX) +$ git merge iomap/iomap-for-next +Already up to date. +Merging djw-vfs/vfs-for-next (2c567af418e3 fs: Introduce DCACHE_DONTCACHE) +$ git merge djw-vfs/vfs-for-next +Auto-merging include/linux/fs.h +Auto-merging fs/xfs/xfs_super.c +Auto-merging fs/xfs/xfs_inode.h +Auto-merging fs/xfs/xfs_icache.c +Merge made by the 'recursive' strategy. + Documentation/filesystems/dax.txt | 142 +++++++++++++++++++++++++++++++++++++- + drivers/block/loop.c | 6 +- + fs/dcache.c | 19 +++++ + fs/stat.c | 3 + + fs/xfs/xfs_icache.c | 4 +- + fs/xfs/xfs_inode.h | 3 +- + fs/xfs/xfs_super.c | 2 +- + include/linux/dcache.h | 2 + + include/linux/fs.h | 14 ++-- + include/uapi/linux/stat.h | 1 + + 10 files changed, 178 insertions(+), 18 deletions(-) +Merging file-locks/locks-next (dbdaf6a3250b locks: reinstate locks_delete_block optimization) +$ git merge file-locks/locks-next +Auto-merging fs/locks.c +Auto-merging fs/cifs/file.c +Merge made by the 'recursive' strategy. +Merging vfs/for-next (d6de0fcfaa99 Merge branch 'from-miklos' into for-next) +$ git merge vfs/for-next +Auto-merging net/ipv6/route.c +Auto-merging net/ipv4/route.c +Auto-merging net/core/neighbour.c +Auto-merging mm/page_alloc.c +Auto-merging kernel/umh.c +Auto-merging kernel/trace/trace.c +Auto-merging kernel/sysctl.c +CONFLICT (content): Merge conflict in kernel/sysctl.c +Auto-merging kernel/sched/fair.c +Auto-merging include/uapi/linux/stat.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/kprobes.h +Auto-merging include/linux/ftrace.h +Auto-merging include/linux/fs.h +Auto-merging fs/stat.c +Auto-merging fs/dcache.c +Auto-merging fs/compat_binfmt_elf.c +Auto-merging fs/binfmt_elf.c +Auto-merging fs/aio.c +CONFLICT (modify/delete): arch/mips/lasat/sysctl.c deleted in HEAD and modified in vfs/for-next. Version vfs/for-next of arch/mips/lasat/sysctl.c left in tree. +Resolved 'kernel/sysctl.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/mips/lasat/sysctl.c +rm 'arch/mips/lasat/sysctl.c' +$ git commit --no-edit -v -a +[master f51aadac2496] Merge remote-tracking branch 'vfs/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/alpha/include/asm/checksum.h | 3 +- + arch/alpha/kernel/syscalls/syscall.tbl | 1 + + arch/alpha/lib/csum_partial_copy.c | 6 +- + arch/arm/include/asm/checksum.h | 14 + + arch/arm/tools/syscall.tbl | 1 + + arch/arm64/include/asm/unistd.h | 2 +- + arch/arm64/include/asm/unistd32.h | 2 + + arch/arm64/kernel/armv8_deprecated.c | 2 +- + arch/arm64/kernel/fpsimd.c | 3 +- + arch/c6x/lib/checksum.c | 22 - + arch/ia64/include/asm/checksum.h | 10 - + arch/ia64/kernel/syscalls/syscall.tbl | 1 + + arch/ia64/lib/csum_partial_copy.c | 32 +- + arch/m68k/include/asm/checksum.h | 3 +- + arch/m68k/kernel/syscalls/syscall.tbl | 1 + + arch/m68k/lib/checksum.c | 4 +- + arch/microblaze/kernel/syscalls/syscall.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n32.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n64.tbl | 1 + + arch/mips/kernel/syscalls/syscall_o32.tbl | 1 + + arch/nios2/include/asm/checksum.h | 2 - + arch/parisc/include/asm/checksum.h | 7 - + arch/parisc/kernel/syscalls/syscall.tbl | 1 + + arch/parisc/lib/checksum.c | 20 - + arch/powerpc/kernel/syscalls/syscall.tbl | 1 + + arch/powerpc/platforms/cell/spufs/coredump.c | 87 +- + arch/powerpc/platforms/cell/spufs/file.c | 330 +- + arch/powerpc/platforms/cell/spufs/spufs.h | 3 +- + arch/s390/appldata/appldata_base.c | 11 +- + arch/s390/include/asm/checksum.h | 19 - + arch/s390/kernel/debug.c | 2 +- + arch/s390/kernel/syscalls/syscall.tbl | 1 + + arch/s390/kernel/topology.c | 2 +- + arch/s390/mm/cmm.c | 12 +- + arch/sh/include/asm/checksum_32.h | 9 +- + arch/sh/kernel/syscalls/syscall.tbl | 1 + + arch/sparc/include/asm/checksum.h | 1 + + arch/sparc/include/asm/checksum_32.h | 15 +- + arch/sparc/include/asm/checksum_64.h | 2 +- + arch/sparc/kernel/syscalls/syscall.tbl | 1 + + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + arch/x86/ia32/ia32_signal.c | 2 +- + arch/x86/include/asm/checksum.h | 2 + + arch/x86/include/asm/checksum_32.h | 21 +- + arch/x86/include/asm/checksum_64.h | 12 +- + arch/x86/include/asm/compat.h | 8 +- + arch/x86/kernel/itmt.c | 3 +- + arch/x86/kernel/signal.c | 28 +- + arch/x86/lib/csum-wrappers_64.c | 35 +- + arch/x86/um/asm/checksum.h | 20 - + arch/xtensa/include/asm/checksum.h | 11 +- + arch/xtensa/kernel/syscalls/syscall.tbl | 1 + + drivers/cdrom/cdrom.c | 2 +- + drivers/char/random.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 5 +- + drivers/macintosh/mac_hid.c | 3 +- + drivers/parport/procfs.c | 39 +- + fs/aio.c | 8 + + fs/binfmt_elf.c | 21 +- + fs/binfmt_elf_fdpic.c | 21 +- + fs/char_dev.c | 3 + + fs/compat_binfmt_elf.c | 2 +- + fs/dcache.c | 2 +- + fs/drop_caches.c | 2 +- + fs/erofs/internal.h | 27 +- + fs/erofs/super.c | 251 +- + fs/erofs/xattr.c | 4 +- + fs/erofs/zdata.c | 4 +- + fs/eventfd.c | 64 +- + fs/file_table.c | 4 +- + fs/fs_context.c | 30 - + fs/fscache/main.c | 3 +- + fs/inode.c | 2 +- + fs/internal.h | 1 - + fs/mount.h | 12 +- + fs/namei.c | 21 +- + fs/namespace.c | 96 +- + fs/open.c | 58 +- + fs/proc/proc_sysctl.c | 47 +- + fs/proc_namespace.c | 4 +- + fs/quota/dquot.c | 2 +- + fs/readdir.c | 12 +- + fs/stat.c | 11 +- + fs/super.c | 2 +- + fs/utimes.c | 6 +- + fs/xfs/xfs_sysctl.c | 4 +- + include/asm-generic/checksum.h | 9 - + include/linux/bpf-cgroup.h | 9 +- + include/linux/compaction.h | 2 +- + include/linux/compat.h | 11 +- + include/linux/coredump.h | 4 + + include/linux/device_cgroup.h | 3 + + include/linux/file.h | 2 + + include/linux/fs.h | 12 +- + include/linux/ftrace.h | 3 +- + include/linux/hugetlb.h | 15 +- + include/linux/kprobes.h | 2 +- + include/linux/latencytop.h | 4 +- + include/linux/mm.h | 14 +- + include/linux/mmzone.h | 27 +- + include/linux/mount.h | 4 +- + include/linux/nmi.h | 15 +- + include/linux/perf_event.h | 13 +- + include/linux/pid.h | 3 + + include/linux/printk.h | 2 +- + include/linux/sched/sysctl.h | 44 +- + include/linux/security.h | 2 +- + include/linux/signal.h | 8 + + include/linux/stat.h | 1 + + include/linux/syscalls.h | 6 +- + include/linux/sysctl.h | 61 +- + include/linux/timer.h | 3 +- + include/linux/uaccess.h | 8 + + include/linux/vmstat.h | 8 +- + include/linux/writeback.h | 28 +- + include/net/checksum.h | 14 +- + include/uapi/asm-generic/unistd.h | 4 +- + include/uapi/linux/fcntl.h | 10 + + include/uapi/linux/stat.h | 18 +- + ipc/ipc_sysctl.c | 10 +- + ipc/mq_sysctl.c | 4 +- + kernel/bpf/cgroup.c | 35 +- + kernel/compat.c | 12 +- + kernel/events/callchain.c | 2 +- + kernel/events/core.c | 6 +- + kernel/exit.c | 12 +- + kernel/kprobes.c | 2 +- + kernel/latencytop.c | 4 +- + kernel/pid_namespace.c | 2 +- + kernel/printk/printk.c | 2 +- + kernel/sched/core.c | 9 +- + kernel/sched/fair.c | 3 +- + kernel/sched/rt.c | 10 +- + kernel/sched/topology.c | 2 +- + kernel/seccomp.c | 2 +- + kernel/signal.c | 106 +- + kernel/sysctl.c | 3861 ++++++++++++------------ + kernel/time/timer.c | 3 +- + kernel/trace/trace.c | 2 +- + kernel/umh.c | 2 +- + kernel/utsname_sysctl.c | 2 +- + kernel/watchdog.c | 12 +- + lib/checksum.c | 20 - + lib/strncpy_from_user.c | 4 +- + lib/strnlen_user.c | 4 +- + lib/usercopy.c | 6 +- + mm/compaction.c | 2 +- + mm/hugetlb.c | 9 +- + mm/page-writeback.c | 16 +- + mm/page_alloc.c | 42 +- + mm/util.c | 10 +- + mm/vmstat.c | 4 +- + net/bridge/br_netfilter_hooks.c | 2 +- + net/core/neighbour.c | 28 +- + net/core/sysctl_net_core.c | 27 +- + net/decnet/dn_dev.c | 7 +- + net/decnet/sysctl_net_decnet.c | 27 +- + net/ipv4/devinet.c | 9 +- + net/ipv4/route.c | 3 +- + net/ipv4/sysctl_net_ipv4.c | 38 +- + net/ipv6/addrconf.c | 33 +- + net/ipv6/ndisc.c | 3 +- + net/ipv6/route.c | 5 +- + net/ipv6/sysctl_net_ipv6.c | 3 +- + net/mpls/af_mpls.c | 5 +- + net/netfilter/ipvs/ip_vs_ctl.c | 6 +- + net/netfilter/nf_conntrack_standalone.c | 2 +- + net/netfilter/nf_log.c | 2 +- + net/phonet/sysctl.c | 3 +- + net/rds/tcp.c | 6 +- + net/sctp/sysctl.c | 32 +- + net/sunrpc/sysctl.c | 29 +- + net/sunrpc/xprtrdma/svc_rdma.c | 7 +- + samples/vfs/test-statx.c | 2 +- + security/apparmor/lsm.c | 2 +- + security/min_addr.c | 2 +- + security/yama/yama_lsm.c | 2 +- + tools/include/uapi/linux/stat.h | 11 +- + 179 files changed, 3077 insertions(+), 3368 deletions(-) +Merging printk/for-next (d34f14ae521f Merge branch 'for-5.7-preferred-console' into for-next) +$ git merge printk/for-next +Auto-merging kernel/printk/printk.c +Auto-merging include/linux/console.h +Merge made by the 'recursive' strategy. + include/linux/console.h | 2 +- + kernel/printk/console_cmdline.h | 1 + + kernel/printk/printk.c | 128 +++++++++++++++++++++++++--------------- + 3 files changed, 83 insertions(+), 48 deletions(-) +Merging pci/next (30370da5c805 Merge branch 'remotes/lorenzo/pci/v3-semi') +$ git merge pci/next +Auto-merging drivers/pci/quirks.c +CONFLICT (content): Merge conflict in drivers/pci/quirks.c +Auto-merging drivers/base/platform.c +Auto-merging MAINTAINERS +Resolved 'drivers/pci/quirks.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master da4ad82d2fdc] Merge remote-tracking branch 'pci/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/PCI/endpoint/pci-endpoint.rst | 16 +- + .../devicetree/bindings/pci/brcm,stb-pcie.yaml | 2 + + .../devicetree/bindings/pci/rcar-pci-ep.yaml | 77 ++ + Documentation/devicetree/bindings/pci/rcar-pci.txt | 3 +- + MAINTAINERS | 3 +- + arch/arm64/kernel/pci.c | 4 +- + drivers/acpi/pci_mcfg.c | 8 +- + drivers/acpi/pci_root.c | 9 +- + drivers/base/platform.c | 40 +- + drivers/firmware/Kconfig | 3 +- + drivers/firmware/raspberrypi.c | 61 + + drivers/pci/controller/Kconfig | 22 +- + drivers/pci/controller/Makefile | 3 +- + drivers/pci/controller/cadence/pcie-cadence-ep.c | 2 +- + drivers/pci/controller/dwc/Kconfig | 3 +- + drivers/pci/controller/dwc/pci-dra7xx.c | 8 +- + drivers/pci/controller/dwc/pci-imx6.c | 4 +- + drivers/pci/controller/dwc/pci-meson.c | 4 +- + drivers/pci/controller/dwc/pcie-al.c | 2 +- + drivers/pci/controller/dwc/pcie-designware-ep.c | 22 +- + drivers/pci/controller/dwc/pcie-designware-host.c | 8 +- + drivers/pci/controller/dwc/pcie-designware.c | 7 +- + drivers/pci/controller/dwc/pcie-designware.h | 3 +- + drivers/pci/controller/dwc/pcie-hisi.c | 19 +- + drivers/pci/controller/dwc/pcie-intel-gw.c | 2 +- + drivers/pci/controller/dwc/pcie-tegra194.c | 4 +- + .../pci/controller/mobiveil/pcie-mobiveil-host.c | 4 +- + drivers/pci/controller/pci-aardvark.c | 3 + + drivers/pci/controller/pci-host-common.c | 18 +- + drivers/pci/controller/pci-host-generic.c | 26 +- + drivers/pci/controller/pci-hyperv.c | 60 +- + drivers/pci/controller/pci-tegra.c | 4 +- + drivers/pci/controller/pci-thunder-ecam.c | 14 +- + drivers/pci/controller/pci-thunder-pem.c | 16 +- + drivers/pci/controller/pci-v3-semi.c | 6 +- + drivers/pci/controller/pci-xgene.c | 4 +- + drivers/pci/controller/pcie-altera.c | 2 +- + drivers/pci/controller/pcie-brcmstb.c | 37 +- + drivers/pci/controller/pcie-mediatek.c | 3 + + drivers/pci/controller/pcie-rcar-ep.c | 563 +++++++++ + drivers/pci/controller/pcie-rcar-host.c | 1130 ++++++++++++++++++ + drivers/pci/controller/pcie-rcar.c | 1211 +------------------- + drivers/pci/controller/pcie-rcar.h | 140 +++ + drivers/pci/controller/pcie-rockchip-ep.c | 2 +- + drivers/pci/controller/pcie-tango.c | 13 +- + drivers/pci/ecam.c | 10 +- + drivers/pci/endpoint/functions/pci-epf-test.c | 3 + + drivers/pci/endpoint/pci-epc-mem.c | 204 +++- + drivers/pci/hotplug/pciehp.h | 2 - + drivers/pci/hotplug/rpaphp_core.c | 2 +- + drivers/pci/p2pdma.c | 2 + + drivers/pci/pci.c | 6 +- + drivers/pci/pcie/Kconfig | 2 - + drivers/pci/pcie/aer.c | 26 +- + drivers/pci/pcie/aspm.c | 10 - + drivers/pci/pcie/edr.c | 4 +- + drivers/pci/quirks.c | 13 + + drivers/pci/setup-bus.c | 1 + + drivers/pci/setup-res.c | 9 +- + drivers/tty/serial/8250/8250_pci.c | 6 - + drivers/usb/host/pci-quirks.c | 16 + + include/linux/pci-acpi.h | 8 +- + include/linux/pci-ecam.h | 25 +- + include/linux/pci-epc.h | 38 +- + include/linux/pci.h | 4 +- + include/linux/pci_ids.h | 6 + + include/soc/bcm2835/raspberrypi-firmware.h | 9 +- + 67 files changed, 2525 insertions(+), 1476 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pci/rcar-pci-ep.yaml + create mode 100644 drivers/pci/controller/pcie-rcar-ep.c + create mode 100644 drivers/pci/controller/pcie-rcar-host.c + create mode 100644 drivers/pci/controller/pcie-rcar.h +Merging pstore/for-next/pstore (dcaa1e76b774 mtd: Support kmsg dumper based on pstore/blk) +$ git merge pstore/for-next/pstore +Auto-merging kernel/printk/printk.c +Auto-merging arch/powerpc/kernel/nvram_64.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/admin-guide/pstore-blk.rst | 243 ++++ + Documentation/admin-guide/ramoops.rst | 14 +- + .../bindings/reserved-memory/ramoops.txt | 13 +- + MAINTAINERS | 1 + + arch/powerpc/kernel/nvram_64.c | 4 +- + drivers/mtd/Kconfig | 10 + + drivers/mtd/Makefile | 1 + + drivers/mtd/mtdpstore.c | 578 ++++++++ + drivers/platform/chrome/chromeos_pstore.c | 2 +- + fs/pstore/Kconfig | 109 ++ + fs/pstore/Makefile | 6 + + fs/pstore/blk.c | 521 +++++++ + fs/pstore/ftrace.c | 54 + + fs/pstore/inode.c | 129 +- + fs/pstore/internal.h | 11 +- + fs/pstore/platform.c | 117 +- + fs/pstore/ram.c | 153 +- + fs/pstore/zone.c | 1465 ++++++++++++++++++++ + include/linux/kmsg_dump.h | 12 +- + include/linux/pstore.h | 9 +- + include/linux/pstore_blk.h | 118 ++ + include/linux/pstore_ram.h | 2 +- + include/linux/pstore_zone.h | 60 + + kernel/printk/printk.c | 32 +- + kernel/reboot.c | 6 +- + 25 files changed, 3466 insertions(+), 204 deletions(-) + create mode 100644 Documentation/admin-guide/pstore-blk.rst + create mode 100644 drivers/mtd/mtdpstore.c + create mode 100644 fs/pstore/blk.c + create mode 100644 fs/pstore/zone.c + create mode 100644 include/linux/pstore_blk.h + create mode 100644 include/linux/pstore_zone.h +Merging hid/for-next (6ab875d19f3b Merge branch 'for-5.7/upstream-fixes' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + drivers/hid/Kconfig | 11 +- + drivers/hid/hid-apple.c | 30 ++++- + drivers/hid/hid-asus.c | 122 ++++++++++++++++---- + drivers/hid/hid-ids.h | 4 + + drivers/hid/hid-logitech-dj.c | 4 +- + drivers/hid/hid-logitech-hidpp.c | 2 +- + drivers/hid/hid-mcp2221.c | 169 ++++++++++++++++++++++++++++ + drivers/hid/hid-quirks.c | 1 + + drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c | 8 ++ + drivers/hid/intel-ish-hid/ishtp-fw-loader.c | 2 + + 10 files changed, 324 insertions(+), 29 deletions(-) +Merging i2c/i2c/for-next (41895bfee70e Merge branch 'i2c/for-current-fixed' into i2c/for-next) +$ git merge i2c/i2c/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .mailmap | 2 + + .../devicetree/bindings/i2c/i2c-qcom-cci.txt | 92 +++ + Documentation/devicetree/bindings/i2c/i2c.txt | 66 +- + .../devicetree/bindings/i2c/st,stm32-i2c.yaml | 8 +- + MAINTAINERS | 9 +- + drivers/i2c/algos/i2c-algo-pca.c | 2 +- + drivers/i2c/busses/Kconfig | 35 +- + drivers/i2c/busses/Makefile | 4 +- + drivers/i2c/busses/i2c-altera.c | 18 +- + drivers/i2c/busses/i2c-at91-core.c | 2 + + drivers/i2c/busses/i2c-at91-master.c | 69 +- + drivers/i2c/busses/i2c-at91.h | 7 +- + drivers/i2c/busses/i2c-axxia.c | 8 +- + drivers/i2c/busses/i2c-bcm-iproc.c | 10 +- + drivers/i2c/busses/i2c-bcm-kona.c | 7 +- + drivers/i2c/busses/i2c-brcmstb.c | 20 +- + drivers/i2c/busses/i2c-cadence.c | 323 ++++++++- + drivers/i2c/busses/i2c-cht-wc.c | 6 +- + drivers/i2c/busses/i2c-davinci.c | 4 +- + drivers/i2c/busses/i2c-designware-core.h | 27 +- + drivers/i2c/busses/i2c-designware-master.c | 65 +- + drivers/i2c/busses/i2c-designware-pcidrv.c | 33 +- + drivers/i2c/busses/i2c-designware-platdrv.c | 52 +- + drivers/i2c/busses/i2c-designware-slave.c | 11 + + drivers/i2c/busses/i2c-digicolor.c | 4 +- + drivers/i2c/busses/i2c-emev2.c | 4 +- + drivers/i2c/busses/i2c-exynos5.c | 4 +- + drivers/i2c/busses/i2c-hix5hd2.c | 4 +- + drivers/i2c/busses/i2c-i801.c | 6 +- + drivers/i2c/busses/i2c-img-scb.c | 8 +- + drivers/i2c/busses/i2c-imx-lpi2c.c | 4 +- + drivers/i2c/busses/i2c-jz4780.c | 4 +- + drivers/i2c/busses/i2c-lpc2k.c | 8 +- + drivers/i2c/busses/i2c-meson.c | 8 +- + drivers/i2c/busses/i2c-mt65xx.c | 328 +++++++-- + drivers/i2c/busses/i2c-mv64xxx.c | 4 +- + drivers/i2c/busses/i2c-octeon-platdrv.c | 4 +- + drivers/i2c/busses/i2c-omap.c | 4 +- + drivers/i2c/busses/i2c-owl.c | 8 +- + drivers/i2c/busses/i2c-pca-platform.c | 3 +- + drivers/i2c/busses/i2c-piix4.c | 3 +- + drivers/i2c/busses/i2c-pnx.c | 1 - + drivers/i2c/busses/i2c-powermac.c | 18 +- + drivers/i2c/busses/i2c-pxa.c | 624 ++++++++-------- + drivers/i2c/busses/i2c-qcom-cci.c | 791 +++++++++++++++++++++ + drivers/i2c/busses/i2c-qup.c | 18 +- + drivers/i2c/busses/i2c-rcar.c | 4 +- + drivers/i2c/busses/i2c-rk3x.c | 8 +- + drivers/i2c/busses/i2c-sirf.c | 4 +- + drivers/i2c/busses/i2c-sprd.c | 4 +- + drivers/i2c/busses/i2c-stm32.c | 10 +- + drivers/i2c/busses/i2c-stm32f4.c | 4 +- + drivers/i2c/busses/i2c-stm32f7.c | 138 ++-- + drivers/i2c/busses/i2c-stu300.c | 4 +- + drivers/i2c/busses/i2c-sun6i-p2wi.c | 8 +- + drivers/i2c/busses/i2c-synquacer.c | 8 +- + drivers/i2c/busses/i2c-uniphier-f.c | 4 +- + drivers/i2c/busses/i2c-uniphier.c | 4 +- + drivers/i2c/busses/i2c-xlp9xx.c | 8 +- + drivers/i2c/busses/i2c-xlr.c | 4 +- + drivers/i2c/busses/i2c-zx2967.c | 4 +- + drivers/i2c/i2c-core-base.c | 93 +-- + drivers/i2c/i2c-core-of.c | 2 +- + drivers/i2c/i2c-slave-eeprom.c | 31 +- + drivers/i2c/muxes/i2c-demux-pinctrl.c | 1 + + drivers/i2c/muxes/i2c-mux-pca954x.c | 44 +- + drivers/platform/mellanox/mlxreg-hotplug.c | 11 +- + include/linux/i2c.h | 2 +- + include/linux/platform_data/i2c-pxa.h | 48 -- + 69 files changed, 2320 insertions(+), 868 deletions(-) + create mode 100644 Documentation/devicetree/bindings/i2c/i2c-qcom-cci.txt + create mode 100644 drivers/i2c/busses/i2c-qcom-cci.c +Merging i3c/i3c/next (b4203ce05563 i3c master: GETMRL's 3rd byte is optional even with BCR_IBI_PAYLOAD) +$ git merge i3c/i3c/next +Merge made by the 'recursive' strategy. + drivers/i3c/master.c | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) +Merging dmi/master (8cf87c744696 firmware/dmi: Report DMI Bios & EC firmware release) +$ git merge dmi/master +Auto-merging scripts/mod/file2alias.c +Auto-merging include/linux/mod_devicetable.h +Auto-merging drivers/firmware/dmi_scan.c +Merge made by the 'recursive' strategy. + drivers/firmware/dmi-id.c | 6 ++++++ + drivers/firmware/dmi_scan.c | 30 ++++++++++++++++++++++++++++++ + include/linux/mod_devicetable.h | 2 ++ + scripts/mod/file2alias.c | 2 ++ + 4 files changed, 40 insertions(+) +Merging hwmon-staging/hwmon-next (9b7f228e84ed hwmon: (lm90) Add max6654 support to lm90 driver) +$ git merge hwmon-staging/hwmon-next +Merge made by the 'recursive' strategy. + Documentation/hwmon/ina2xx.rst | 19 +++ + Documentation/hwmon/index.rst | 1 + + Documentation/hwmon/lm90.rst | 23 ++- + Documentation/hwmon/max16601.rst | 159 ++++++++++++++++++++ + drivers/hwmon/Kconfig | 15 +- + drivers/hwmon/adt7411.c | 3 +- + drivers/hwmon/dell-smm-hwmon.c | 26 +--- + drivers/hwmon/hwmon.c | 68 +++++---- + drivers/hwmon/ina2xx.c | 183 +++++++++++++++++++++++ + drivers/hwmon/lm70.c | 47 +++++- + drivers/hwmon/lm75.c | 8 +- + drivers/hwmon/lm75.h | 31 ++-- + drivers/hwmon/lm90.c | 45 +++++- + drivers/hwmon/nct6775.c | 10 +- + drivers/hwmon/nct7904.c | 138 ++++++++++++++++- + drivers/hwmon/pmbus/Kconfig | 9 ++ + drivers/hwmon/pmbus/Makefile | 1 + + drivers/hwmon/pmbus/max16601.c | 314 +++++++++++++++++++++++++++++++++++++++ + drivers/hwmon/pmbus/pmbus_core.c | 8 +- + 19 files changed, 1011 insertions(+), 97 deletions(-) + create mode 100644 Documentation/hwmon/max16601.rst + create mode 100644 drivers/hwmon/pmbus/max16601.c +Merging jc_docs/docs-next (fdb1b5e08929 Revert "docs: sysctl/kernel: document ngroups_max") +$ git merge jc_docs/docs-next +Auto-merging virt/kvm/arm/vgic/vgic-mmio-v3.c +Auto-merging tools/include/uapi/linux/kvm.h +Auto-merging samples/Kconfig +Auto-merging mm/gup.c +Auto-merging lib/Kconfig.debug +Auto-merging lib/Kconfig +Auto-merging include/linux/printk.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/fscache-cache.h +Auto-merging fs/namespace.c +Auto-merging fs/locks.c +Auto-merging fs/inode.c +Auto-merging fs/fuse/dev.c +Auto-merging fs/Kconfig.binfmt +Auto-merging drivers/base/platform.c +Auto-merging drivers/base/core.c +Auto-merging MAINTAINERS +Auto-merging Documentation/userspace-api/ioctl/ioctl-number.rst +Auto-merging Documentation/filesystems/proc.rst +Removing Documentation/filesystems/devpts.txt +Auto-merging Documentation/filesystems/debugfs.rst +Auto-merging Documentation/filesystems/dax.txt +Removing Documentation/filesystems/coda.txt +Removing Documentation/filesystems/caching/fscache.txt +Auto-merging Documentation/core-api/printk-formats.rst +Auto-merging Documentation/arm64/booting.rst +CONFLICT (content): Merge conflict in Documentation/arm64/booting.rst +Auto-merging Documentation/arm64/amu.rst +CONFLICT (content): Merge conflict in Documentation/arm64/amu.rst +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging .mailmap +Resolved 'Documentation/arm64/amu.rst' using previous resolution. +Resolved 'Documentation/arm64/booting.rst' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 647c15642a36] Merge remote-tracking branch 'jc_docs/docs-next' +$ git diff -M --stat --summary HEAD^.. + .mailmap | 1 + + Documentation/ABI/stable/sysfs-devices-node | 2 +- + Documentation/ABI/testing/procfs-smaps_rollup | 2 +- + Documentation/Makefile | 6 +- + Documentation/PCI/boot-interrupts.rst | 34 +- + Documentation/admin-guide/cpu-load.rst | 2 +- + Documentation/admin-guide/hw-vuln/l1tf.rst | 2 +- + Documentation/admin-guide/init.rst | 76 +- + Documentation/admin-guide/kernel-parameters.txt | 2 +- + .../admin-guide/kernel-per-CPU-kthreads.rst | 2 +- + Documentation/admin-guide/mm/userfaultfd.rst | 211 +-- + Documentation/admin-guide/nfs/nfsroot.rst | 2 +- + Documentation/admin-guide/numastat.rst | 31 +- + Documentation/admin-guide/ras.rst | 28 +- + Documentation/admin-guide/sysctl/kernel.rst | 97 +- + Documentation/arm64/booting.rst | 36 +- + Documentation/conf.py | 38 - + .../debugging-via-ohci1394.rst} | 0 + .../dma-api-howto.rst} | 0 + .../{DMA-API.txt => core-api/dma-api.rst} | 0 + .../dma-attributes.rst} | 0 + .../{DMA-ISA-LPC.txt => core-api/dma-isa-lpc.rst} | 0 + Documentation/core-api/index.rst | 9 + + .../{IRQ.txt => core-api/irq/concepts.rst} | 0 + Documentation/core-api/irq/index.rst | 11 + + .../irq/irq-affinity.rst} | 0 + .../irq/irq-domain.rst} | 3 +- + .../irq/irqflags-tracing.rst} | 0 + Documentation/core-api/kobject.rst | 28 +- + Documentation/{kref.txt => core-api/kref.rst} | 0 + Documentation/core-api/printk-basics.rst | 115 ++ + Documentation/core-api/printk-formats.rst | 2 + + Documentation/{rbtree.txt => core-api/rbtree.rst} | 0 + Documentation/doc-guide/maintainer-profile.rst | 2 +- + Documentation/driver-api/dma-buf.rst | 4 +- + Documentation/driver-api/driver-model/device.rst | 4 +- + Documentation/driver-api/driver-model/overview.rst | 2 +- + Documentation/driver-api/index.rst | 1 + + Documentation/{IPMI.txt => driver-api/ipmi.rst} | 0 + Documentation/driver-api/nvdimm/nvdimm.rst | 4 +- + .../driver-api/thermal/cpu-idle-cooling.rst | 3 + + Documentation/driver-api/thermal/index.rst | 1 + + Documentation/filesystems/9p.rst | 2 +- + ...automount-support.txt => automount-support.rst} | 23 +- + .../caching/{backend-api.txt => backend-api.rst} | 165 +- + .../caching/{cachefiles.txt => cachefiles.rst} | 139 +- + Documentation/filesystems/caching/fscache.rst | 565 +++++++ + Documentation/filesystems/caching/fscache.txt | 448 ------ + Documentation/filesystems/caching/index.rst | 14 + + .../caching/{netfs-api.txt => netfs-api.rst} | 172 +- + .../filesystems/caching/{object.txt => object.rst} | 43 +- + .../caching/{operations.txt => operations.rst} | 45 +- + .../cifs/{cifsroot.txt => cifsroot.rst} | 56 +- + Documentation/filesystems/coda.rst | 1670 +++++++++++++++++++ + Documentation/filesystems/coda.txt | 1676 -------------------- + .../{configfs/configfs.txt => configfs.rst} | 131 +- + Documentation/filesystems/dax.txt | 2 +- + Documentation/filesystems/debugfs.rst | 5 +- + Documentation/filesystems/devpts.rst | 36 + + Documentation/filesystems/devpts.txt | 26 - + .../filesystems/{dnotify.txt => dnotify.rst} | 13 +- + .../filesystems/{fiemap.txt => fiemap.rst} | 135 +- + Documentation/filesystems/{files.txt => files.rst} | 15 +- + .../filesystems/{fuse-io.txt => fuse-io.rst} | 6 + + Documentation/filesystems/index.rst | 23 + + Documentation/filesystems/{locks.txt => locks.rst} | 14 +- + ...mandatory-locking.txt => mandatory-locking.rst} | 25 +- + .../filesystems/{mount_api.txt => mount_api.rst} | 329 ++-- + Documentation/filesystems/orangefs.rst | 4 +- + Documentation/filesystems/proc.rst | 2 +- + Documentation/filesystems/{quota.txt => quota.rst} | 41 +- + .../filesystems/ramfs-rootfs-initramfs.rst | 2 +- + .../filesystems/{seq_file.txt => seq_file.rst} | 61 +- + .../{sharedsubtree.txt => sharedsubtree.rst} | 398 +++-- + Documentation/filesystems/spufs/index.rst | 13 + + Documentation/filesystems/spufs/spu_create.rst | 131 ++ + Documentation/filesystems/spufs/spu_run.rst | 138 ++ + .../filesystems/{spufs.txt => spufs/spufs.rst} | 304 +--- + .../filesystems/{sysfs-pci.txt => sysfs-pci.rst} | 23 +- + .../{sysfs-tagging.txt => sysfs-tagging.rst} | 22 +- + Documentation/filesystems/sysfs.rst | 2 +- + ...g-design.txt => xfs-delayed-logging-design.rst} | 65 +- + ...tadata.txt => xfs-self-describing-metadata.rst} | 190 +-- + Documentation/i2c/{i2c.svg => i2c_bus.svg} | 2 +- + Documentation/i2c/summary.rst | 2 +- + Documentation/ia64/irq-redir.rst | 2 +- + Documentation/iio/iio_configfs.rst | 2 +- + .../futex-requeue-pi.rst} | 0 + .../{hwspinlock.txt => locking/hwspinlock.rst} | 0 + Documentation/locking/index.rst | 7 + + Documentation/locking/locktorture.rst | 2 +- + .../percpu-rw-semaphore.rst} | 0 + .../{pi-futex.txt => locking/pi-futex.rst} | 0 + .../preempt-locking.rst} | 0 + .../robust-futex-ABI.rst} | 0 + .../robust-futexes.rst} | 0 + Documentation/locking/rt-mutex.rst | 2 +- + Documentation/memory-barriers.txt | 2 +- + Documentation/misc-devices/index.rst | 1 + + Documentation/networking/scaling.rst | 4 +- + Documentation/powerpc/cxl.rst | 2 + + Documentation/powerpc/firmware-assisted-dump.rst | 2 +- + Documentation/process/adding-syscalls.rst | 2 +- + Documentation/process/submit-checklist.rst | 2 +- + Documentation/s390/vfio-ap.rst | 2 +- + Documentation/scheduler/sched-domains.rst | 10 +- + Documentation/{digsig.txt => security/digsig.rst} | 0 + Documentation/security/index.rst | 1 + + Documentation/sphinx/requirements.txt | 2 +- + Documentation/trace/coresight/coresight-ect.rst | 1 + + .../translations/it_IT/doc-guide/kernel-doc.rst | 25 +- + .../translations/it_IT/kernel-hacking/hacking.rst | 18 + + .../translations/it_IT/kernel-hacking/locking.rst | 172 +- + .../translations/it_IT/process/2.Process.rst | 95 +- + .../translations/it_IT/process/adding-syscalls.rst | 2 +- + .../translations/it_IT/process/coding-style.rst | 6 +- + .../translations/it_IT/process/deprecated.rst | 130 +- + .../translations/it_IT/process/email-clients.rst | 332 +++- + Documentation/translations/it_IT/process/index.rst | 1 + + .../it_IT/process/management-style.rst | 293 +++- + .../it_IT/process/submit-checklist.rst | 2 +- + .../translations/it_IT/riscv/patch-acceptance.rst | 40 + + .../translations/ko_KR/memory-barriers.txt | 2 +- + Documentation/translations/zh_CN/IRQ.txt | 4 +- + .../translations/zh_CN/filesystems/debugfs.rst | 221 +++ + .../translations/zh_CN/filesystems/index.rst | 1 + + .../translations/zh_CN/filesystems/sysfs.txt | 8 +- + .../zh_CN/process/submit-checklist.rst | 2 +- + .../zh_CN/video4linux/v4l2-framework.txt | 2 +- + Documentation/usb/gadget_configfs.rst | 4 +- + Documentation/userspace-api/ioctl/ioctl-number.rst | 1 + + Documentation/virt/kvm/amd-memory-encryption.rst | 2 +- + Documentation/virt/kvm/api.rst | 12 +- + Documentation/virt/kvm/arm/pvtime.rst | 2 +- + Documentation/virt/kvm/devices/vcpu.rst | 2 +- + Documentation/virt/kvm/hypercalls.rst | 4 +- + Documentation/virt/kvm/mmu.rst | 2 +- + Documentation/virt/kvm/review-checklist.rst | 2 +- + Documentation/vm/index.rst | 1 + + Documentation/vm/page_frags.rst | 2 +- + .../watchdog/convert_drivers_to_kernel_api.rst | 4 +- + Documentation/watchdog/watchdog-kernel-api.rst | 2 +- + Documentation/x86/x86_64/uefi.rst | 2 +- + MAINTAINERS | 24 +- + arch/powerpc/include/uapi/asm/kvm_para.h | 2 +- + arch/x86/kvm/mmu/mmu.c | 2 +- + drivers/ata/libata-core.c | 2 +- + drivers/base/core.c | 2 +- + drivers/base/platform.c | 6 +- + drivers/char/ipmi/Kconfig | 2 +- + drivers/char/ipmi/ipmi_si_hotmod.c | 2 +- + drivers/char/ipmi/ipmi_si_intf.c | 2 +- + .../crypto/allwinner/sun8i-ce/sun8i-ce-cipher.c | 2 +- + drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c | 2 +- + .../crypto/allwinner/sun8i-ss/sun8i-ss-cipher.c | 2 +- + drivers/crypto/allwinner/sun8i-ss/sun8i-ss-core.c | 2 +- + drivers/gpu/drm/Kconfig | 2 +- + drivers/gpu/drm/drm_ioctl.c | 2 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 2 +- + drivers/hwtracing/coresight/Kconfig | 2 +- + drivers/media/v4l2-core/v4l2-fwnode.c | 2 +- + fs/Kconfig | 2 +- + fs/Kconfig.binfmt | 2 +- + fs/adfs/Kconfig | 2 +- + fs/affs/Kconfig | 2 +- + fs/afs/Kconfig | 6 +- + fs/bfs/Kconfig | 2 +- + fs/cachefiles/Kconfig | 4 +- + fs/coda/Kconfig | 2 +- + fs/configfs/inode.c | 2 +- + fs/configfs/item.c | 2 +- + fs/cramfs/Kconfig | 2 +- + fs/ecryptfs/Kconfig | 2 +- + fs/fat/Kconfig | 8 +- + fs/fscache/Kconfig | 8 +- + fs/fscache/cache.c | 8 +- + fs/fscache/cookie.c | 2 +- + fs/fscache/object.c | 4 +- + fs/fscache/operation.c | 2 +- + fs/fuse/Kconfig | 2 +- + fs/fuse/dev.c | 2 +- + fs/hfs/Kconfig | 2 +- + fs/hpfs/Kconfig | 2 +- + fs/inode.c | 6 +- + fs/isofs/Kconfig | 2 +- + fs/locks.c | 2 +- + fs/namespace.c | 2 +- + fs/notify/inotify/Kconfig | 2 +- + fs/ntfs/Kconfig | 2 +- + fs/ocfs2/Kconfig | 2 +- + fs/overlayfs/Kconfig | 6 +- + fs/proc/Kconfig | 4 +- + fs/romfs/Kconfig | 2 +- + fs/sysfs/dir.c | 2 +- + fs/sysfs/file.c | 2 +- + fs/sysfs/mount.c | 2 +- + fs/sysfs/symlink.c | 2 +- + fs/sysv/Kconfig | 2 +- + fs/udf/Kconfig | 2 +- + include/linux/configfs.h | 2 +- + include/linux/fs_context.h | 2 +- + include/linux/fscache-cache.h | 4 +- + include/linux/fscache.h | 42 +- + include/linux/kobject.h | 2 +- + include/linux/kobject_ns.h | 2 +- + include/linux/lsm_hooks.h | 2 +- + include/linux/mm.h | 4 +- + include/linux/printk.h | 112 +- + include/linux/rbtree.h | 2 +- + include/linux/rbtree_augmented.h | 2 +- + include/linux/relay.h | 2 +- + include/linux/spi/spi.h | 1 + + include/linux/sysfs.h | 2 +- + include/linux/watchdog.h | 4 +- + include/uapi/linux/ethtool_netlink.h | 2 +- + include/uapi/linux/firewire-cdev.h | 2 +- + include/uapi/linux/kvm.h | 4 +- + include/uapi/rdma/rdma_user_ioctl_cmds.h | 2 +- + kernel/futex.c | 3 + + kernel/relay.c | 2 +- + lib/Kconfig | 2 +- + lib/Kconfig.debug | 2 +- + lib/bitmap.c | 31 +- + lib/kobject.c | 4 +- + mm/gup.c | 12 +- + samples/Kconfig | 2 +- + samples/binderfs/Makefile | 6 +- + scripts/kernel-doc | 41 +- + scripts/sphinx-pre-install | 291 +++- + tools/include/linux/rbtree.h | 2 +- + tools/include/linux/rbtree_augmented.h | 2 +- + tools/include/uapi/linux/kvm.h | 4 +- + virt/kvm/arm/vgic/vgic-mmio-v3.c | 2 +- + virt/kvm/arm/vgic/vgic.h | 4 +- + 234 files changed, 6052 insertions(+), 4110 deletions(-) + rename Documentation/{debugging-via-ohci1394.txt => core-api/debugging-via-ohci1394.rst} (100%) + rename Documentation/{DMA-API-HOWTO.txt => core-api/dma-api-howto.rst} (100%) + rename Documentation/{DMA-API.txt => core-api/dma-api.rst} (100%) + rename Documentation/{DMA-attributes.txt => core-api/dma-attributes.rst} (100%) + rename Documentation/{DMA-ISA-LPC.txt => core-api/dma-isa-lpc.rst} (100%) + rename Documentation/{IRQ.txt => core-api/irq/concepts.rst} (100%) + create mode 100644 Documentation/core-api/irq/index.rst + rename Documentation/{IRQ-affinity.txt => core-api/irq/irq-affinity.rst} (100%) + rename Documentation/{IRQ-domain.txt => core-api/irq/irq-domain.rst} (99%) + rename Documentation/{irqflags-tracing.txt => core-api/irq/irqflags-tracing.rst} (100%) + rename Documentation/{kref.txt => core-api/kref.rst} (100%) + create mode 100644 Documentation/core-api/printk-basics.rst + rename Documentation/{rbtree.txt => core-api/rbtree.rst} (100%) + rename Documentation/{IPMI.txt => driver-api/ipmi.rst} (100%) + rename Documentation/filesystems/{automount-support.txt => automount-support.rst} (92%) + rename Documentation/filesystems/caching/{backend-api.txt => backend-api.rst} (87%) + rename Documentation/filesystems/caching/{cachefiles.txt => cachefiles.rst} (90%) + create mode 100644 Documentation/filesystems/caching/fscache.rst + delete mode 100644 Documentation/filesystems/caching/fscache.txt + create mode 100644 Documentation/filesystems/caching/index.rst + rename Documentation/filesystems/caching/{netfs-api.txt => netfs-api.rst} (91%) + rename Documentation/filesystems/caching/{object.txt => object.rst} (95%) + rename Documentation/filesystems/caching/{operations.txt => operations.rst} (90%) + rename Documentation/filesystems/cifs/{cifsroot.txt => cifsroot.rst} (72%) + create mode 100644 Documentation/filesystems/coda.rst + delete mode 100644 Documentation/filesystems/coda.txt + rename Documentation/filesystems/{configfs/configfs.txt => configfs.rst} (87%) + create mode 100644 Documentation/filesystems/devpts.rst + delete mode 100644 Documentation/filesystems/devpts.txt + rename Documentation/filesystems/{dnotify.txt => dnotify.rst} (88%) + rename Documentation/filesystems/{fiemap.txt => fiemap.rst} (70%) + rename Documentation/filesystems/{files.txt => files.rst} (95%) + rename Documentation/filesystems/{fuse-io.txt => fuse-io.rst} (95%) + rename Documentation/filesystems/{locks.txt => locks.rst} (91%) + rename Documentation/filesystems/{mandatory-locking.txt => mandatory-locking.rst} (91%) + rename Documentation/filesystems/{mount_api.txt => mount_api.rst} (79%) + rename Documentation/filesystems/{quota.txt => quota.rst} (81%) + rename Documentation/filesystems/{seq_file.txt => seq_file.rst} (92%) + rename Documentation/filesystems/{sharedsubtree.txt => sharedsubtree.rst} (72%) + create mode 100644 Documentation/filesystems/spufs/index.rst + create mode 100644 Documentation/filesystems/spufs/spu_create.rst + create mode 100644 Documentation/filesystems/spufs/spu_run.rst + rename Documentation/filesystems/{spufs.txt => spufs/spufs.rst} (57%) + rename Documentation/filesystems/{sysfs-pci.txt => sysfs-pci.rst} (92%) + rename Documentation/filesystems/{sysfs-tagging.txt => sysfs-tagging.rst} (72%) + rename Documentation/filesystems/{xfs-delayed-logging-design.txt => xfs-delayed-logging-design.rst} (97%) + rename Documentation/filesystems/{xfs-self-describing-metadata.txt => xfs-self-describing-metadata.rst} (83%) + rename Documentation/i2c/{i2c.svg => i2c_bus.svg} (99%) + rename Documentation/{futex-requeue-pi.txt => locking/futex-requeue-pi.rst} (100%) + rename Documentation/{hwspinlock.txt => locking/hwspinlock.rst} (100%) + rename Documentation/{percpu-rw-semaphore.txt => locking/percpu-rw-semaphore.rst} (100%) + rename Documentation/{pi-futex.txt => locking/pi-futex.rst} (100%) + rename Documentation/{preempt-locking.txt => locking/preempt-locking.rst} (100%) + rename Documentation/{robust-futex-ABI.txt => locking/robust-futex-ABI.rst} (100%) + rename Documentation/{robust-futexes.txt => locking/robust-futexes.rst} (100%) + rename Documentation/{digsig.txt => security/digsig.rst} (100%) + create mode 100644 Documentation/translations/it_IT/riscv/patch-acceptance.rst + create mode 100644 Documentation/translations/zh_CN/filesystems/debugfs.rst +Merging v4l-dvb/master (ad3a44cbd1b2 media: i2c: imx219: Parse and register properties) +$ git merge v4l-dvb/master +Auto-merging drivers/staging/media/Makefile +Auto-merging drivers/staging/media/Kconfig +Auto-merging drivers/media/v4l2-core/v4l2-fwnode.c +Removing drivers/media/platform/tegra-cec/Makefile +Removing drivers/media/platform/sti/cec/Makefile +Removing drivers/media/platform/sh_veu.c +Removing drivers/media/platform/seco-cec/Makefile +Removing drivers/media/platform/meson/Makefile +Removing drivers/media/platform/cros-ec-cec/Makefile +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/configs/exynos_defconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/translations/zh_CN/video4linux/v4l2-framework.txt +Removing Documentation/media/v4l-drivers/cardlist.rst +Removing Documentation/media/media_uapi.rst +Removing Documentation/media/media_kapi.rst +Removing Documentation/media/index.rst +Removing Documentation/media/dvb-drivers/udev.rst +Removing Documentation/media/dvb-drivers/intro.rst +Removing Documentation/media/dvb-drivers/index.rst +Removing Documentation/media/dvb-drivers/faq.rst +Removing Documentation/media/dvb-drivers/cards.rst +Removing Documentation/media/dvb-drivers/bt8xx.rst +Removing Documentation/media/dvb-drivers/avermedia.rst +Removing Documentation/media/cec-drivers/index.rst +Removing Documentation/media/.gitignore +Auto-merging Documentation/driver-api/index.rst +Removing Documentation/devicetree/bindings/media/rockchip-vpu.txt +Removing Documentation/devicetree/bindings/media/rockchip-rga.txt +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/Makefile +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/debugfs-cec-error-inj | 2 +- + Documentation/Makefile | 10 +- + Documentation/admin-guide/index.rst | 1 + + Documentation/admin-guide/kernel-parameters.txt | 4 +- + .../media}/au0828-cardlist.rst | 0 + Documentation/admin-guide/media/avermedia.rst | 94 ++ + Documentation/admin-guide/media/bt8xx.rst | 156 +++ + .../media}/bttv-cardlist.rst | 2 +- + .../v4l-drivers => admin-guide/media}/bttv.rst | 443 +++---- + Documentation/admin-guide/media/building.rst | 357 ++++++ + .../media}/cafe_ccic.rst | 0 + Documentation/admin-guide/media/cardlist.rst | 29 + + Documentation/admin-guide/media/cec-drivers.rst | 10 + + Documentation/admin-guide/media/ci.rst | 77 ++ + .../v4l-drivers => admin-guide/media}/cpia2.rst | 56 +- + Documentation/admin-guide/media/cx18-cardlist.rst | 17 + + .../admin-guide/media/cx231xx-cardlist.rst | 99 ++ + .../media}/cx23885-cardlist.rst | 6 +- + .../media}/cx88-cardlist.rst | 6 +- + Documentation/admin-guide/media/cx88.rst | 58 + + .../media}/davinci-vpbe.rst | 42 +- + Documentation/admin-guide/media/dvb-drivers.rst | 16 + + .../admin-guide/media/dvb-usb-a800-cardlist.rst | 16 + + .../admin-guide/media/dvb-usb-af9005-cardlist.rst | 20 + + .../admin-guide/media/dvb-usb-af9015-cardlist.rst | 80 ++ + .../admin-guide/media/dvb-usb-af9035-cardlist.rst | 74 ++ + .../admin-guide/media/dvb-usb-anysee-cardlist.rst | 16 + + .../admin-guide/media/dvb-usb-au6610-cardlist.rst | 16 + + .../admin-guide/media/dvb-usb-az6007-cardlist.rst | 20 + + .../admin-guide/media/dvb-usb-az6027-cardlist.rst | 24 + + .../admin-guide/media/dvb-usb-ce6230-cardlist.rst | 18 + + .../media/dvb-usb-cinergyT2-cardlist.rst | 16 + + .../admin-guide/media/dvb-usb-cxusb-cardlist.rst | 40 + + .../admin-guide/media/dvb-usb-dib0700-cardlist.rst | 162 +++ + .../media/dvb-usb-dibusb-mb-cardlist.rst | 42 + + .../media/dvb-usb-dibusb-mc-cardlist.rst | 30 + + .../admin-guide/media/dvb-usb-digitv-cardlist.rst | 16 + + .../admin-guide/media/dvb-usb-dtt200u-cardlist.rst | 22 + + .../admin-guide/media/dvb-usb-dtv5100-cardlist.rst | 16 + + .../admin-guide/media/dvb-usb-dvbsky-cardlist.rst | 42 + + .../admin-guide/media/dvb-usb-dw2102-cardlist.rst | 52 + + .../admin-guide/media/dvb-usb-ec168-cardlist.rst | 16 + + .../admin-guide/media/dvb-usb-gl861-cardlist.rst | 20 + + .../admin-guide/media/dvb-usb-gp8psk-cardlist.rst | 22 + + .../admin-guide/media/dvb-usb-lmedm04-cardlist.rst | 20 + + .../admin-guide/media/dvb-usb-m920x-cardlist.rst | 26 + + .../media/dvb-usb-mxl111sf-cardlist.rst | 36 + + .../media/dvb-usb-nova-t-usb2-cardlist.rst | 16 + + .../admin-guide/media/dvb-usb-opera1-cardlist.rst | 16 + + .../media/dvb-usb-pctv452e-cardlist.rst | 20 + + .../media/dvb-usb-rtl28xxu-cardlist.rst | 80 ++ + .../media/dvb-usb-technisat-usb2-cardlist.rst | 16 + + .../admin-guide/media/dvb-usb-ttusb2-cardlist.rst | 24 + + .../admin-guide/media/dvb-usb-umt-010-cardlist.rst | 16 + + .../admin-guide/media/dvb-usb-vp702x-cardlist.rst | 16 + + .../admin-guide/media/dvb-usb-vp7045-cardlist.rst | 18 + + .../admin-guide/media/dvb-usb-zd1301-cardlist.rst | 16 + + Documentation/admin-guide/media/dvb.rst | 12 + + Documentation/admin-guide/media/dvb_intro.rst | 616 ++++++++++ + Documentation/admin-guide/media/dvb_references.rst | 29 + + .../media}/em28xx-cardlist.rst | 10 +- + Documentation/admin-guide/media/faq.rst | 216 ++++ + .../v4l-drivers => admin-guide/media}/fimc.rst | 22 +- + .../admin-guide/media/frontend-cardlist.rst | 226 ++++ + .../media}/gspca-cardlist.rst | 0 + Documentation/admin-guide/media/i2c-cardlist.rst | 290 +++++ + .../v4l-drivers => admin-guide/media}/imx.rst | 227 ++-- + .../admin-guide/media/imx6q-sabreauto.dot | 51 + + Documentation/admin-guide/media/imx6q-sabresd.dot | 56 + + .../v4l-drivers => admin-guide/media}/imx7.rst | 0 + Documentation/admin-guide/media/index.rst | 61 + + Documentation/admin-guide/media/intro.rst | 27 + + .../v4l-drivers => admin-guide/media}/ipu3.rst | 59 +- + .../v4l-drivers => admin-guide/media}/ipu3_rcb.svg | 0 + .../media}/ivtv-cardlist.rst | 2 +- + .../v4l-drivers => admin-guide/media}/ivtv.rst | 0 + .../dvb-drivers => admin-guide/media}/lmedm04.rst | 0 + .../v4l-drivers => admin-guide/media}/meye.rst | 41 - + Documentation/admin-guide/media/misc-cardlist.rst | 28 + + Documentation/admin-guide/media/omap3isp.rst | 92 ++ + .../media}/omap4_camera.rst | 0 + .../media}/opera-firmware.rst | 0 + .../admin-guide/media/other-usb-cardlist.rst | 92 ++ + Documentation/admin-guide/media/pci-cardlist.rst | 107 ++ + .../v4l-drivers => admin-guide/media}/philips.rst | 0 + .../admin-guide/media/platform-cardlist.rst | 90 ++ + .../media}/pulse8-cec.rst | 0 + .../media}/qcom_camss.rst | 0 + .../media}/qcom_camss_8x96_graph.dot | 0 + .../media}/qcom_camss_graph.dot | 0 + Documentation/admin-guide/media/radio-cardlist.rst | 44 + + .../media}/rcar-fdp1.rst | 0 + .../media/remote-controller.rst} | 9 +- + .../media}/saa7134-cardlist.rst | 2 +- + Documentation/admin-guide/media/saa7134.rst | 88 ++ + .../media}/saa7164-cardlist.rst | 2 +- + .../v4l-drivers => admin-guide/media}/si470x.rst | 0 + .../v4l-drivers => admin-guide/media}/si4713.rst | 0 + .../v4l-drivers => admin-guide/media}/si476x.rst | 0 + Documentation/admin-guide/media/siano-cardlist.rst | 56 + + .../media}/technisat.rst | 0 + .../media}/tm6000-cardlist.rst | 0 + .../media}/ttusb-dec.rst | 0 + .../media}/tuner-cardlist.rst | 0 + Documentation/admin-guide/media/usb-cardlist.rst | 157 +++ + .../media}/usbvision-cardlist.rst | 0 + Documentation/admin-guide/media/v4l-drivers.rst | 33 + + .../v4l-drivers => admin-guide/media}/vimc.dot | 0 + .../v4l-drivers => admin-guide/media}/vimc.rst | 11 - + .../v4l-drivers => admin-guide/media}/vivid.rst | 0 + .../v4l-drivers => admin-guide/media}/zr364xx.rst | 28 +- + .../devicetree/bindings/media/rockchip,vdec.yaml | 73 ++ + .../devicetree/bindings/media/rockchip-rga.txt | 34 - + .../devicetree/bindings/media/rockchip-rga.yaml | 83 ++ + .../devicetree/bindings/media/rockchip-vpu.txt | 43 - + .../devicetree/bindings/media/rockchip-vpu.yaml | 77 ++ + .../devicetree/bindings/media/video-interfaces.txt | 372 +++++- + Documentation/doc-guide/parse-headers.rst | 2 +- + Documentation/driver-api/index.rst | 1 + + .../{media/kapi => driver-api/media}/cec-core.rst | 0 + .../{media/kapi => driver-api/media}/csi2.rst | 0 + .../driver-api/media/drivers/bttv-devel.rst | 116 ++ + .../media/drivers}/contributors.rst | 0 + .../driver-api/media/drivers/cpia2_devel.rst | 56 + + .../media/drivers/cx2341x-devel.rst} | 175 --- + .../media/drivers/cx88-devel.rst} | 52 - + .../media/drivers/davinci-vpbe-devel.rst | 39 + + .../media/drivers}/dvb-usb.rst | 0 + .../driver-api/media/drivers/fimc-devel.rst | 33 + + .../media/drivers}/frontends.rst | 0 + Documentation/driver-api/media/drivers/index.rst | 38 + + .../media/drivers}/pvrusb2.rst | 0 + .../media/drivers}/pxa_camera.rst | 0 + .../media/drivers}/radiotrack.rst | 0 + .../media/drivers/saa7134-devel.rst} | 48 - + .../media/drivers}/sh_mobile_ceu_camera.rst | 0 + .../media/drivers}/tuners.rst | 0 + .../driver-api/media/drivers/vimc-devel.rst | 15 + + .../{media/kapi => driver-api/media}/dtv-ca.rst | 0 + .../kapi => driver-api/media}/dtv-common.rst | 0 + .../{media/kapi => driver-api/media}/dtv-core.rst | 0 + .../{media/kapi => driver-api/media}/dtv-demux.rst | 0 + .../kapi => driver-api/media}/dtv-frontend.rst | 0 + .../{media/kapi => driver-api/media}/dtv-net.rst | 0 + Documentation/driver-api/media/index.rst | 54 + + .../{media/kapi => driver-api/media}/mc-core.rst | 0 + .../{media/kapi => driver-api/media}/rc-core.rst | 0 + .../kapi => driver-api/media}/v4l2-async.rst | 0 + .../kapi => driver-api/media}/v4l2-clocks.rst | 0 + .../kapi => driver-api/media}/v4l2-common.rst | 0 + .../kapi => driver-api/media}/v4l2-controls.rst | 0 + .../{media/kapi => driver-api/media}/v4l2-core.rst | 0 + .../{media/kapi => driver-api/media}/v4l2-dev.rst | 0 + .../kapi => driver-api/media}/v4l2-device.rst | 0 + .../kapi => driver-api/media}/v4l2-dv-timings.rst | 0 + .../kapi => driver-api/media}/v4l2-event.rst | 0 + .../{media/kapi => driver-api/media}/v4l2-fh.rst | 0 + .../media}/v4l2-flash-led-class.rst | 0 + .../kapi => driver-api/media}/v4l2-fwnode.rst | 0 + .../kapi => driver-api/media}/v4l2-intro.rst | 0 + .../{media/kapi => driver-api/media}/v4l2-mc.rst | 0 + .../kapi => driver-api/media}/v4l2-mediabus.rst | 0 + .../kapi => driver-api/media}/v4l2-mem2mem.rst | 0 + .../{media/kapi => driver-api/media}/v4l2-rect.rst | 0 + .../kapi => driver-api/media}/v4l2-subdev.rst | 53 +- + .../kapi => driver-api/media}/v4l2-tuner.rst | 0 + .../kapi => driver-api/media}/v4l2-tveeprom.rst | 0 + .../kapi => driver-api/media}/v4l2-videobuf.rst | 5 +- + .../kapi => driver-api/media}/v4l2-videobuf2.rst | 0 + Documentation/fb/api.rst | 4 +- + Documentation/index.rst | 1 - + Documentation/media/.gitignore | 5 - + Documentation/media/cec-drivers/index.rst | 34 - + Documentation/media/dvb-drivers/avermedia.rst | 269 ----- + Documentation/media/dvb-drivers/bt8xx.rst | 124 -- + Documentation/media/dvb-drivers/cards.rst | 146 --- + Documentation/media/dvb-drivers/faq.rst | 169 --- + Documentation/media/dvb-drivers/index.rst | 45 - + Documentation/media/dvb-drivers/intro.rst | 23 - + Documentation/media/dvb-drivers/udev.rst | 63 - + Documentation/media/index.rst | 26 - + Documentation/media/media_kapi.rst | 38 - + Documentation/media/media_uapi.rst | 33 - + Documentation/media/v4l-drivers/cardlist.rst | 20 - + .../translations/it_IT/doc-guide/parse-headers.rst | 2 +- + .../translations/zh_CN/video4linux/omap3isp.txt | 4 +- + .../zh_CN/video4linux/v4l2-framework.txt | 6 +- + Documentation/userspace-api/index.rst | 1 + + Documentation/{ => userspace-api}/media/Makefile | 2 +- + .../media/audio.h.rst.exceptions | 0 + .../{ => userspace-api}/media/ca.h.rst.exceptions | 0 + .../{ => userspace-api}/media/cec.h.rst.exceptions | 0 + .../uapi => userspace-api/media}/cec/cec-api.rst | 2 +- + .../media}/cec/cec-func-close.rst | 2 +- + .../media}/cec/cec-func-ioctl.rst | 2 +- + .../media}/cec/cec-func-open.rst | 2 +- + .../media}/cec/cec-func-poll.rst | 2 +- + .../uapi => userspace-api/media}/cec/cec-funcs.rst | 2 +- + .../media}/cec/cec-header.rst | 2 +- + .../uapi => userspace-api/media}/cec/cec-intro.rst | 2 +- + .../media}/cec/cec-ioc-adap-g-caps.rst | 2 +- + .../media}/cec/cec-ioc-adap-g-conn-info.rst | 0 + .../media}/cec/cec-ioc-adap-g-log-addrs.rst | 2 +- + .../media}/cec/cec-ioc-adap-g-phys-addr.rst | 2 +- + .../media}/cec/cec-ioc-dqevent.rst | 2 +- + .../media}/cec/cec-ioc-g-mode.rst | 2 +- + .../media}/cec/cec-ioc-receive.rst | 2 +- + .../media}/cec/cec-pin-error-inj.rst | 2 +- + .../{ => userspace-api}/media/conf_nitpick.py | 0 + .../{ => userspace-api}/media/dmx.h.rst.exceptions | 0 + .../userspace-api/media/drivers/cx2341x-uapi.rst | 179 +++ + .../userspace-api/media/drivers/imx-uapi.rst | 125 ++ + .../media/drivers}/index.rst | 39 +- + .../media/drivers}/max2175.rst | 2 +- + .../userspace-api/media/drivers/meye-uapi.rst | 53 + + .../media/drivers/omap3isp-uapi.rst} | 80 +- + .../media/drivers}/uvcvideo.rst | 0 + .../media}/dvb/audio-bilingual-channel-select.rst | 2 +- + .../media}/dvb/audio-channel-select.rst | 2 +- + .../media}/dvb/audio-clear-buffer.rst | 2 +- + .../media}/dvb/audio-continue.rst | 2 +- + .../media}/dvb/audio-fclose.rst | 2 +- + .../media}/dvb/audio-fopen.rst | 2 +- + .../media}/dvb/audio-fwrite.rst | 2 +- + .../media}/dvb/audio-get-capabilities.rst | 2 +- + .../media}/dvb/audio-get-status.rst | 2 +- + .../media}/dvb/audio-pause.rst | 2 +- + .../media}/dvb/audio-play.rst | 2 +- + .../media}/dvb/audio-select-source.rst | 2 +- + .../media}/dvb/audio-set-av-sync.rst | 2 +- + .../media}/dvb/audio-set-bypass-mode.rst | 2 +- + .../media}/dvb/audio-set-id.rst | 2 +- + .../media}/dvb/audio-set-mixer.rst | 2 +- + .../media}/dvb/audio-set-mute.rst | 2 +- + .../media}/dvb/audio-set-streamtype.rst | 2 +- + .../media}/dvb/audio-stop.rst | 2 +- + .../uapi => userspace-api/media}/dvb/audio.rst | 2 +- + .../media}/dvb/audio_data_types.rst | 2 +- + .../media}/dvb/audio_function_calls.rst | 2 +- + .../uapi => userspace-api/media}/dvb/ca-fclose.rst | 2 +- + .../uapi => userspace-api/media}/dvb/ca-fopen.rst | 2 +- + .../media}/dvb/ca-get-cap.rst | 2 +- + .../media}/dvb/ca-get-descr-info.rst | 2 +- + .../media}/dvb/ca-get-msg.rst | 2 +- + .../media}/dvb/ca-get-slot-info.rst | 2 +- + .../uapi => userspace-api/media}/dvb/ca-reset.rst | 2 +- + .../media}/dvb/ca-send-msg.rst | 2 +- + .../media}/dvb/ca-set-descr.rst | 2 +- + .../{media/uapi => userspace-api/media}/dvb/ca.rst | 3 +- + .../media}/dvb/ca_data_types.rst | 2 +- + .../media}/dvb/ca_function_calls.rst | 2 +- + .../media/dvb/ca_high_level.rst} | 82 +- + .../uapi => userspace-api/media}/dvb/demux.rst | 2 +- + .../media}/dvb/dmx-add-pid.rst | 2 +- + .../media}/dvb/dmx-expbuf.rst | 2 +- + .../media}/dvb/dmx-fclose.rst | 2 +- + .../uapi => userspace-api/media}/dvb/dmx-fopen.rst | 2 +- + .../uapi => userspace-api/media}/dvb/dmx-fread.rst | 2 +- + .../media}/dvb/dmx-fwrite.rst | 2 +- + .../media}/dvb/dmx-get-pes-pids.rst | 2 +- + .../media}/dvb/dmx-get-stc.rst | 2 +- + .../uapi => userspace-api/media}/dvb/dmx-mmap.rst | 2 +- + .../media}/dvb/dmx-munmap.rst | 2 +- + .../uapi => userspace-api/media}/dvb/dmx-qbuf.rst | 2 +- + .../media}/dvb/dmx-querybuf.rst | 2 +- + .../media}/dvb/dmx-remove-pid.rst | 2 +- + .../media}/dvb/dmx-reqbufs.rst | 2 +- + .../media}/dvb/dmx-set-buffer-size.rst | 2 +- + .../media}/dvb/dmx-set-filter.rst | 2 +- + .../media}/dvb/dmx-set-pes-filter.rst | 2 +- + .../uapi => userspace-api/media}/dvb/dmx-start.rst | 2 +- + .../uapi => userspace-api/media}/dvb/dmx-stop.rst | 2 +- + .../media}/dvb/dmx_fcalls.rst | 2 +- + .../uapi => userspace-api/media}/dvb/dmx_types.rst | 2 +- + .../media}/dvb/dvb-fe-read-status.rst | 2 +- + .../media}/dvb/dvb-frontend-event.rst | 2 +- + .../media}/dvb/dvb-frontend-parameters.rst | 2 +- + .../uapi => userspace-api/media}/dvb/dvbapi.rst | 2 +- + .../media}/dvb/dvbproperty.rst | 2 +- + .../uapi => userspace-api/media}/dvb/dvbstb.svg | 2 +- + .../uapi => userspace-api/media}/dvb/examples.rst | 2 +- + .../media}/dvb/fe-bandwidth-t.rst | 2 +- + .../media}/dvb/fe-diseqc-recv-slave-reply.rst | 2 +- + .../media}/dvb/fe-diseqc-reset-overload.rst | 2 +- + .../media}/dvb/fe-diseqc-send-burst.rst | 2 +- + .../media}/dvb/fe-diseqc-send-master-cmd.rst | 2 +- + .../media}/dvb/fe-dishnetwork-send-legacy-cmd.rst | 2 +- + .../media}/dvb/fe-enable-high-lnb-voltage.rst | 2 +- + .../media}/dvb/fe-get-event.rst | 2 +- + .../media}/dvb/fe-get-frontend.rst | 2 +- + .../media}/dvb/fe-get-info.rst | 2 +- + .../media}/dvb/fe-get-property.rst | 2 +- + .../media}/dvb/fe-read-ber.rst | 2 +- + .../media}/dvb/fe-read-signal-strength.rst | 2 +- + .../media}/dvb/fe-read-snr.rst | 2 +- + .../media}/dvb/fe-read-status.rst | 2 +- + .../media}/dvb/fe-read-uncorrected-blocks.rst | 2 +- + .../media}/dvb/fe-set-frontend-tune-mode.rst | 2 +- + .../media}/dvb/fe-set-frontend.rst | 2 +- + .../media}/dvb/fe-set-tone.rst | 2 +- + .../media}/dvb/fe-set-voltage.rst | 2 +- + .../uapi => userspace-api/media}/dvb/fe-type-t.rst | 2 +- + .../media}/dvb/fe_property_parameters.rst | 2 +- + .../media}/dvb/frontend-header.rst | 2 +- + .../media}/dvb/frontend-property-cable-systems.rst | 2 +- + .../dvb/frontend-property-satellite-systems.rst | 2 +- + .../dvb/frontend-property-terrestrial-systems.rst | 2 +- + .../media}/dvb/frontend-stat-properties.rst | 2 +- + .../uapi => userspace-api/media}/dvb/frontend.rst | 2 +- + .../media}/dvb/frontend_f_close.rst | 2 +- + .../media}/dvb/frontend_f_open.rst | 2 +- + .../media}/dvb/frontend_fcalls.rst | 2 +- + .../media}/dvb/frontend_legacy_api.rst | 2 +- + .../media}/dvb/frontend_legacy_dvbv3_api.rst | 2 +- + .../uapi => userspace-api/media}/dvb/headers.rst | 2 +- + .../uapi => userspace-api/media}/dvb/intro.rst | 2 +- + .../media}/dvb/legacy_dvb_apis.rst | 2 +- + .../media}/dvb/net-add-if.rst | 2 +- + .../media}/dvb/net-get-if.rst | 2 +- + .../media}/dvb/net-remove-if.rst | 2 +- + .../uapi => userspace-api/media}/dvb/net-types.rst | 2 +- + .../uapi => userspace-api/media}/dvb/net.rst | 2 +- + .../media}/dvb/query-dvb-frontend-info.rst | 2 +- + .../media}/dvb/video-clear-buffer.rst | 2 +- + .../media}/dvb/video-command.rst | 2 +- + .../media}/dvb/video-continue.rst | 2 +- + .../media}/dvb/video-fast-forward.rst | 2 +- + .../media}/dvb/video-fclose.rst | 2 +- + .../media}/dvb/video-fopen.rst | 2 +- + .../media}/dvb/video-freeze.rst | 2 +- + .../media}/dvb/video-fwrite.rst | 2 +- + .../media}/dvb/video-get-capabilities.rst | 2 +- + .../media}/dvb/video-get-event.rst | 2 +- + .../media}/dvb/video-get-frame-count.rst | 2 +- + .../media}/dvb/video-get-pts.rst | 2 +- + .../media}/dvb/video-get-size.rst | 2 +- + .../media}/dvb/video-get-status.rst | 2 +- + .../media}/dvb/video-play.rst | 2 +- + .../media}/dvb/video-select-source.rst | 2 +- + .../media}/dvb/video-set-blank.rst | 2 +- + .../media}/dvb/video-set-display-format.rst | 2 +- + .../media}/dvb/video-set-format.rst | 2 +- + .../media}/dvb/video-set-streamtype.rst | 2 +- + .../media}/dvb/video-slowmotion.rst | 2 +- + .../media}/dvb/video-stillpicture.rst | 2 +- + .../media}/dvb/video-stop.rst | 2 +- + .../media}/dvb/video-try-command.rst | 2 +- + .../uapi => userspace-api/media}/dvb/video.rst | 2 +- + .../media}/dvb/video_function_calls.rst | 2 +- + .../media}/dvb/video_types.rst | 2 +- + .../uapi => userspace-api/media}/fdl-appendix.rst | 2 +- + .../media/frontend.h.rst.exceptions | 0 + .../uapi => userspace-api/media}/gen-errors.rst | 2 +- + Documentation/userspace-api/media/index.rst | 67 ++ + Documentation/{ => userspace-api}/media/intro.rst | 0 + .../media/lirc.h.rst.exceptions | 0 + .../media/media.h.rst.exceptions | 0 + .../media}/mediactl/media-controller-intro.rst | 2 +- + .../media}/mediactl/media-controller-model.rst | 2 +- + .../media}/mediactl/media-controller.rst | 2 +- + .../media}/mediactl/media-func-close.rst | 2 +- + .../media}/mediactl/media-func-ioctl.rst | 2 +- + .../media}/mediactl/media-func-open.rst | 2 +- + .../media}/mediactl/media-funcs.rst | 2 +- + .../media}/mediactl/media-header.rst | 2 +- + .../media}/mediactl/media-ioc-device-info.rst | 2 +- + .../media}/mediactl/media-ioc-enum-entities.rst | 2 +- + .../media}/mediactl/media-ioc-enum-links.rst | 2 +- + .../media}/mediactl/media-ioc-g-topology.rst | 2 +- + .../media}/mediactl/media-ioc-request-alloc.rst | 2 +- + .../media}/mediactl/media-ioc-setup-link.rst | 2 +- + .../media}/mediactl/media-request-ioc-queue.rst | 2 +- + .../media}/mediactl/media-request-ioc-reinit.rst | 2 +- + .../media}/mediactl/media-types.rst | 2 +- + .../media}/mediactl/request-api.rst | 2 +- + .../media}/mediactl/request-func-close.rst | 2 +- + .../media}/mediactl/request-func-ioctl.rst | 2 +- + .../media}/mediactl/request-func-poll.rst | 2 +- + .../{ => userspace-api}/media/net.h.rst.exceptions | 0 + .../uapi => userspace-api/media}/rc/keytable.c.rst | 2 +- + .../media}/rc/lirc-dev-intro.rst | 2 +- + .../uapi => userspace-api/media}/rc/lirc-dev.rst | 2 +- + .../uapi => userspace-api/media}/rc/lirc-func.rst | 2 +- + .../media}/rc/lirc-get-features.rst | 2 +- + .../media}/rc/lirc-get-rec-mode.rst | 2 +- + .../media}/rc/lirc-get-rec-resolution.rst | 2 +- + .../media}/rc/lirc-get-send-mode.rst | 2 +- + .../media}/rc/lirc-get-timeout.rst | 2 +- + .../media}/rc/lirc-header.rst | 2 +- + .../uapi => userspace-api/media}/rc/lirc-read.rst | 2 +- + .../media}/rc/lirc-set-measure-carrier-mode.rst | 2 +- + .../media}/rc/lirc-set-rec-carrier-range.rst | 2 +- + .../media}/rc/lirc-set-rec-carrier.rst | 2 +- + .../media}/rc/lirc-set-rec-timeout-reports.rst | 2 +- + .../media}/rc/lirc-set-rec-timeout.rst | 2 +- + .../media}/rc/lirc-set-send-carrier.rst | 2 +- + .../media}/rc/lirc-set-send-duty-cycle.rst | 2 +- + .../media}/rc/lirc-set-transmitter-mask.rst | 2 +- + .../media}/rc/lirc-set-wideband-receiver.rst | 2 +- + .../uapi => userspace-api/media}/rc/lirc-write.rst | 2 +- + .../uapi => userspace-api/media}/rc/rc-intro.rst | 2 +- + .../uapi => userspace-api/media}/rc/rc-protos.rst | 0 + .../media}/rc/rc-sysfs-nodes.rst | 2 +- + .../media}/rc/rc-table-change.rst | 2 +- + .../uapi => userspace-api/media}/rc/rc-tables.rst | 2 +- + .../media}/rc/remote_controllers.rst | 2 +- + .../media/typical_media_device.svg | 2 +- + .../uapi => userspace-api/media}/v4l/app-pri.rst | 2 +- + .../uapi => userspace-api/media}/v4l/async.rst | 2 +- + .../uapi => userspace-api/media}/v4l/audio.rst | 2 +- + .../uapi => userspace-api/media}/v4l/bayer.svg | 2 +- + .../uapi => userspace-api/media}/v4l/biblio.rst | 2 +- + .../uapi => userspace-api/media}/v4l/buffer.rst | 2 +- + .../media}/v4l/capture-example.rst | 2 +- + .../uapi => userspace-api/media}/v4l/capture.c.rst | 2 +- + .../media}/v4l/colorspaces-defs.rst | 2 +- + .../media}/v4l/colorspaces-details.rst | 2 +- + .../media}/v4l/colorspaces.rst | 2 +- + .../media}/v4l/common-defs.rst | 2 +- + .../uapi => userspace-api/media}/v4l/common.rst | 3 +- + .../uapi => userspace-api/media}/v4l/compat.rst | 2 +- + .../media}/v4l/constraints.svg | 2 +- + .../uapi => userspace-api/media}/v4l/control.rst | 2 +- + .../uapi => userspace-api/media}/v4l/crop.rst | 2 +- + .../uapi => userspace-api/media}/v4l/crop.svg | 2 +- + .../media}/v4l/depth-formats.rst | 2 +- + .../media}/v4l/dev-capture.rst | 2 +- + .../media}/v4l/dev-decoder.rst | 0 + .../uapi => userspace-api/media}/v4l/dev-event.rst | 2 +- + .../media}/v4l/dev-mem2mem.rst | 2 +- + .../uapi => userspace-api/media}/v4l/dev-meta.rst | 2 +- + .../uapi => userspace-api/media}/v4l/dev-osd.rst | 2 +- + .../media}/v4l/dev-output.rst | 2 +- + .../media}/v4l/dev-overlay.rst | 2 +- + .../uapi => userspace-api/media}/v4l/dev-radio.rst | 2 +- + .../media}/v4l/dev-raw-vbi.rst | 2 +- + .../uapi => userspace-api/media}/v4l/dev-rds.rst | 2 +- + .../uapi => userspace-api/media}/v4l/dev-sdr.rst | 2 +- + .../media}/v4l/dev-sliced-vbi.rst | 4 +- + .../media}/v4l/dev-stateless-decoder.rst | 0 + .../media}/v4l/dev-subdev.rst | 7 +- + .../uapi => userspace-api/media}/v4l/dev-touch.rst | 2 +- + .../uapi => userspace-api/media}/v4l/devices.rst | 2 +- + .../uapi => userspace-api/media}/v4l/diff-v4l.rst | 2 +- + .../uapi => userspace-api/media}/v4l/dmabuf.rst | 2 +- + .../media}/v4l/dv-timings.rst | 2 +- + .../media}/v4l/ext-ctrls-camera.rst | 153 ++- + .../media}/v4l/ext-ctrls-codec.rst | 14 +- + .../media}/v4l/ext-ctrls-detect.rst | 2 +- + .../media}/v4l/ext-ctrls-dv.rst | 2 +- + .../media}/v4l/ext-ctrls-flash.rst | 2 +- + .../media}/v4l/ext-ctrls-fm-rx.rst | 2 +- + .../media}/v4l/ext-ctrls-fm-tx.rst | 2 +- + .../media}/v4l/ext-ctrls-image-process.rst | 4 +- + .../media}/v4l/ext-ctrls-image-source.rst | 2 +- + .../media}/v4l/ext-ctrls-jpeg.rst | 2 +- + .../media}/v4l/ext-ctrls-rf-tuner.rst | 2 +- + .../media}/v4l/extended-controls.rst | 2 +- + .../media}/v4l/field-order.rst | 2 +- + .../media}/v4l/fieldseq_bt.svg | 2 +- + .../media}/v4l/fieldseq_tb.svg | 2 +- + .../uapi => userspace-api/media}/v4l/format.rst | 2 +- + .../media/v4l}/fourcc.rst | 0 + .../media}/v4l/func-close.rst | 2 +- + .../media}/v4l/func-ioctl.rst | 2 +- + .../uapi => userspace-api/media}/v4l/func-mmap.rst | 2 +- + .../media}/v4l/func-munmap.rst | 2 +- + .../uapi => userspace-api/media}/v4l/func-open.rst | 2 +- + .../uapi => userspace-api/media}/v4l/func-poll.rst | 2 +- + .../uapi => userspace-api/media}/v4l/func-read.rst | 2 +- + .../media}/v4l/func-select.rst | 2 +- + .../media}/v4l/func-write.rst | 2 +- + .../uapi => userspace-api/media}/v4l/hist-v4l2.rst | 2 +- + .../media}/v4l/hsv-formats.rst | 2 +- + .../{media/uapi => userspace-api/media}/v4l/io.rst | 2 +- + .../media}/v4l/libv4l-introduction.rst | 2 +- + .../uapi => userspace-api/media}/v4l/libv4l.rst | 2 +- + .../media}/v4l/meta-formats.rst | 2 +- + .../uapi => userspace-api/media}/v4l/mmap.rst | 2 +- + .../uapi => userspace-api/media}/v4l/nv12mt.svg | 2 +- + .../media}/v4l/nv12mt_example.svg | 2 +- + .../uapi => userspace-api/media}/v4l/open.rst | 2 +- + .../uapi => userspace-api/media}/v4l/pipeline.dot | 0 + .../media}/v4l/pixfmt-bayer.rst | 2 +- + .../media}/v4l/pixfmt-cnf4.rst | 0 + .../media}/v4l/pixfmt-compressed.rst | 2 +- + .../media}/v4l/pixfmt-grey.rst | 2 +- + .../media}/v4l/pixfmt-indexed.rst | 2 +- + .../media}/v4l/pixfmt-intro.rst | 2 +- + .../media}/v4l/pixfmt-inzi.rst | 2 +- + .../media}/v4l/pixfmt-m420.rst | 2 +- + .../media}/v4l/pixfmt-meta-d4xx.rst | 2 +- + .../media}/v4l/pixfmt-meta-intel-ipu3.rst | 2 +- + .../media}/v4l/pixfmt-meta-uvc.rst | 2 +- + .../media}/v4l/pixfmt-meta-vivid.rst | 2 +- + .../media}/v4l/pixfmt-meta-vsp1-hgo.rst | 2 +- + .../media}/v4l/pixfmt-meta-vsp1-hgt.rst | 2 +- + .../media}/v4l/pixfmt-nv12.rst | 2 +- + .../media}/v4l/pixfmt-nv12m.rst | 2 +- + .../media}/v4l/pixfmt-nv12mt.rst | 2 +- + .../media}/v4l/pixfmt-nv16.rst | 2 +- + .../media}/v4l/pixfmt-nv16m.rst | 2 +- + .../media}/v4l/pixfmt-nv24.rst | 2 +- + .../media}/v4l/pixfmt-packed-hsv.rst | 2 +- + .../media}/v4l/pixfmt-packed-yuv.rst | 2 +- + .../media}/v4l/pixfmt-reserved.rst | 4 +- + .../media}/v4l/pixfmt-rgb.rst | 138 +-- + .../media}/v4l/pixfmt-sdr-cs08.rst | 2 +- + .../media}/v4l/pixfmt-sdr-cs14le.rst | 2 +- + .../media}/v4l/pixfmt-sdr-cu08.rst | 2 +- + .../media}/v4l/pixfmt-sdr-cu16le.rst | 2 +- + .../media}/v4l/pixfmt-sdr-pcu16be.rst | 2 +- + .../media}/v4l/pixfmt-sdr-pcu18be.rst | 2 +- + .../media}/v4l/pixfmt-sdr-pcu20be.rst | 2 +- + .../media}/v4l/pixfmt-sdr-ru12le.rst | 2 +- + .../media}/v4l/pixfmt-srggb10-ipu3.rst | 2 +- + .../media}/v4l/pixfmt-srggb10.rst | 2 +- + .../media}/v4l/pixfmt-srggb10alaw8.rst | 2 +- + .../media}/v4l/pixfmt-srggb10dpcm8.rst | 2 +- + .../media}/v4l/pixfmt-srggb10p.rst | 2 +- + .../media}/v4l/pixfmt-srggb12.rst | 2 +- + .../media}/v4l/pixfmt-srggb12p.rst | 2 +- + .../media}/v4l/pixfmt-srggb14.rst | 2 +- + .../media}/v4l/pixfmt-srggb14p.rst | 2 +- + .../media}/v4l/pixfmt-srggb16.rst | 2 +- + .../media}/v4l/pixfmt-srggb8.rst | 2 +- + .../media}/v4l/pixfmt-tch-td08.rst | 2 +- + .../media}/v4l/pixfmt-tch-td16.rst | 2 +- + .../media}/v4l/pixfmt-tch-tu08.rst | 2 +- + .../media}/v4l/pixfmt-tch-tu16.rst | 2 +- + .../media}/v4l/pixfmt-uv8.rst | 2 +- + .../media}/v4l/pixfmt-uyvy.rst | 2 +- + .../media}/v4l/pixfmt-v4l2-mplane.rst | 2 +- + .../media}/v4l/pixfmt-v4l2.rst | 2 +- + .../media}/v4l/pixfmt-vyuy.rst | 2 +- + .../media}/v4l/pixfmt-y10.rst | 2 +- + .../media}/v4l/pixfmt-y10b.rst | 2 +- + .../media}/v4l/pixfmt-y10p.rst | 2 +- + .../media}/v4l/pixfmt-y12.rst | 2 +- + .../media}/v4l/pixfmt-y12i.rst | 2 +- + .../media}/v4l/pixfmt-y14.rst | 2 +- + .../media}/v4l/pixfmt-y16-be.rst | 2 +- + .../media}/v4l/pixfmt-y16.rst | 2 +- + .../media}/v4l/pixfmt-y41p.rst | 2 +- + .../media}/v4l/pixfmt-y8i.rst | 2 +- + .../media}/v4l/pixfmt-yuv410.rst | 2 +- + .../media}/v4l/pixfmt-yuv411p.rst | 2 +- + .../media}/v4l/pixfmt-yuv420.rst | 2 +- + .../media}/v4l/pixfmt-yuv420m.rst | 2 +- + .../media}/v4l/pixfmt-yuv422m.rst | 2 +- + .../media}/v4l/pixfmt-yuv422p.rst | 2 +- + .../media}/v4l/pixfmt-yuv444m.rst | 2 +- + .../media}/v4l/pixfmt-yuyv.rst | 2 +- + .../media}/v4l/pixfmt-yvyu.rst | 2 +- + .../media}/v4l/pixfmt-z16.rst | 2 +- + .../uapi => userspace-api/media}/v4l/pixfmt.rst | 2 +- + .../media}/v4l/planar-apis.rst | 2 +- + .../uapi => userspace-api/media}/v4l/querycap.rst | 2 +- + .../{media/uapi => userspace-api/media}/v4l/rw.rst | 2 +- + .../media}/v4l/sdr-formats.rst | 2 +- + .../media}/v4l/selection-api-configuration.rst | 2 +- + .../media}/v4l/selection-api-examples.rst | 2 +- + .../media}/v4l/selection-api-intro.rst | 2 +- + .../media}/v4l/selection-api-targets.rst | 2 +- + .../media}/v4l/selection-api-vs-crop-api.rst | 2 +- + .../media}/v4l/selection-api.rst | 2 +- + .../uapi => userspace-api/media}/v4l/selection.svg | 2 +- + .../media}/v4l/selections-common.rst | 2 +- + .../uapi => userspace-api/media}/v4l/standard.rst | 2 +- + .../media}/v4l/streaming-par.rst | 2 +- + .../media}/v4l/subdev-formats.rst | 2 +- + .../media}/v4l/subdev-image-processing-crop.svg | 2 +- + .../media}/v4l/subdev-image-processing-full.svg | 2 +- + ...ubdev-image-processing-scaling-multi-source.svg | 2 +- + .../media}/v4l/tch-formats.rst | 2 +- + .../uapi => userspace-api/media}/v4l/tuner.rst | 2 +- + .../uapi => userspace-api/media}/v4l/user-func.rst | 3 +- + .../uapi => userspace-api/media}/v4l/userp.rst | 2 +- + .../media}/v4l/v4l2-selection-flags.rst | 2 +- + .../media}/v4l/v4l2-selection-targets.rst | 2 +- + .../uapi => userspace-api/media}/v4l/v4l2.rst | 2 +- + .../media}/v4l/v4l2grab-example.rst | 2 +- + .../media}/v4l/v4l2grab.c.rst | 2 +- + .../uapi => userspace-api/media}/v4l/vbi_525.svg | 2 +- + .../uapi => userspace-api/media}/v4l/vbi_625.svg | 2 +- + .../uapi => userspace-api/media}/v4l/vbi_hsync.svg | 2 +- + .../uapi => userspace-api/media}/v4l/video.rst | 2 +- + .../uapi => userspace-api/media}/v4l/videodev.rst | 2 +- + .../media}/v4l/vidioc-create-bufs.rst | 4 +- + .../media}/v4l/vidioc-cropcap.rst | 2 +- + .../media}/v4l/vidioc-dbg-g-chip-info.rst | 2 +- + .../media}/v4l/vidioc-dbg-g-register.rst | 2 +- + .../media}/v4l/vidioc-decoder-cmd.rst | 2 +- + .../media}/v4l/vidioc-dqevent.rst | 2 +- + .../media}/v4l/vidioc-dv-timings-cap.rst | 2 +- + .../media}/v4l/vidioc-encoder-cmd.rst | 2 +- + .../media}/v4l/vidioc-enum-dv-timings.rst | 2 +- + .../media}/v4l/vidioc-enum-fmt.rst | 54 +- + .../media}/v4l/vidioc-enum-frameintervals.rst | 2 +- + .../media}/v4l/vidioc-enum-framesizes.rst | 2 +- + .../media}/v4l/vidioc-enum-freq-bands.rst | 2 +- + .../media}/v4l/vidioc-enumaudio.rst | 2 +- + .../media}/v4l/vidioc-enumaudioout.rst | 2 +- + .../media}/v4l/vidioc-enuminput.rst | 2 +- + .../media}/v4l/vidioc-enumoutput.rst | 2 +- + .../media}/v4l/vidioc-enumstd.rst | 2 +- + .../media}/v4l/vidioc-expbuf.rst | 2 +- + .../media}/v4l/vidioc-g-audio.rst | 2 +- + .../media}/v4l/vidioc-g-audioout.rst | 2 +- + .../media}/v4l/vidioc-g-crop.rst | 2 +- + .../media}/v4l/vidioc-g-ctrl.rst | 2 +- + .../media}/v4l/vidioc-g-dv-timings.rst | 8 +- + .../media}/v4l/vidioc-g-edid.rst | 2 +- + .../media}/v4l/vidioc-g-enc-index.rst | 2 +- + .../media}/v4l/vidioc-g-ext-ctrls.rst | 2 +- + .../media}/v4l/vidioc-g-fbuf.rst | 2 +- + .../media}/v4l/vidioc-g-fmt.rst | 2 +- + .../media}/v4l/vidioc-g-frequency.rst | 2 +- + .../media}/v4l/vidioc-g-input.rst | 2 +- + .../media}/v4l/vidioc-g-jpegcomp.rst | 2 +- + .../media}/v4l/vidioc-g-modulator.rst | 2 +- + .../media}/v4l/vidioc-g-output.rst | 2 +- + .../media}/v4l/vidioc-g-parm.rst | 2 +- + .../media}/v4l/vidioc-g-priority.rst | 2 +- + .../media}/v4l/vidioc-g-selection.rst | 2 +- + .../media}/v4l/vidioc-g-sliced-vbi-cap.rst | 2 +- + .../media}/v4l/vidioc-g-std.rst | 8 +- + .../media}/v4l/vidioc-g-tuner.rst | 2 +- + .../media}/v4l/vidioc-log-status.rst | 2 +- + .../media}/v4l/vidioc-overlay.rst | 2 +- + .../media}/v4l/vidioc-prepare-buf.rst | 2 +- + .../media}/v4l/vidioc-qbuf.rst | 2 +- + .../media}/v4l/vidioc-query-dv-timings.rst | 2 +- + .../media}/v4l/vidioc-querybuf.rst | 2 +- + .../media}/v4l/vidioc-querycap.rst | 10 +- + .../media}/v4l/vidioc-queryctrl.rst | 2 +- + .../media}/v4l/vidioc-querystd.rst | 2 +- + .../media}/v4l/vidioc-reqbufs.rst | 4 +- + .../media}/v4l/vidioc-s-hw-freq-seek.rst | 2 +- + .../media}/v4l/vidioc-streamon.rst | 2 +- + .../v4l/vidioc-subdev-enum-frame-interval.rst | 2 +- + .../media}/v4l/vidioc-subdev-enum-frame-size.rst | 2 +- + .../media}/v4l/vidioc-subdev-enum-mbus-code.rst | 2 +- + .../media}/v4l/vidioc-subdev-g-crop.rst | 11 +- + .../media}/v4l/vidioc-subdev-g-fmt.rst | 10 +- + .../media}/v4l/vidioc-subdev-g-frame-interval.rst | 10 +- + .../media}/v4l/vidioc-subdev-g-selection.rst | 10 +- + .../media/v4l/vidioc-subdev-querycap.rst | 112 ++ + .../media}/v4l/vidioc-subscribe-event.rst | 2 +- + .../media}/v4l/yuv-formats.rst | 2 +- + .../media/video.h.rst.exceptions | 0 + .../media/videodev2.h.rst.exceptions | 1 + + MAINTAINERS | 82 +- + arch/arm/configs/exynos_defconfig | 2 +- + arch/arm/configs/multi_v7_defconfig | 2 +- + drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 2 +- + drivers/media/Kconfig | 242 ++-- + drivers/media/Makefile | 2 +- + drivers/media/cec/Kconfig | 25 + + drivers/media/cec/Makefile | 16 +- + drivers/media/cec/core/Makefile | 16 + + drivers/media/cec/{ => core}/cec-adap.c | 8 +- + drivers/media/cec/{ => core}/cec-api.c | 0 + drivers/media/cec/{ => core}/cec-core.c | 0 + drivers/media/cec/{ => core}/cec-notifier.c | 0 + drivers/media/cec/{ => core}/cec-pin-error-inj.c | 0 + drivers/media/cec/{ => core}/cec-pin-priv.h | 0 + drivers/media/cec/{ => core}/cec-pin.c | 0 + drivers/media/cec/{ => core}/cec-priv.h | 0 + drivers/media/cec/platform/Kconfig | 120 ++ + drivers/media/cec/platform/Makefile | 14 + + drivers/media/{ => cec}/platform/cec-gpio/Makefile | 0 + .../media/{ => cec}/platform/cec-gpio/cec-gpio.c | 18 +- + drivers/media/cec/platform/cros-ec/Makefile | 2 + + .../platform/cros-ec}/cros-ec-cec.c | 0 + drivers/media/cec/platform/meson/Makefile | 3 + + .../media/{ => cec}/platform/meson/ao-cec-g12a.c | 0 + drivers/media/{ => cec}/platform/meson/ao-cec.c | 0 + .../s5p-cec => cec/platform/s5p}/Makefile | 2 +- + .../s5p-cec => cec/platform/s5p}/exynos_hdmi_cec.h | 0 + .../platform/s5p}/exynos_hdmi_cecctrl.c | 0 + .../s5p-cec => cec/platform/s5p}/regs-cec.h | 0 + .../s5p-cec => cec/platform/s5p}/s5p_cec.c | 0 + .../s5p-cec => cec/platform/s5p}/s5p_cec.h | 0 + drivers/media/cec/platform/seco/Makefile | 2 + + .../seco-cec => cec/platform/seco}/seco-cec.c | 2 +- + .../seco-cec => cec/platform/seco}/seco-cec.h | 0 + drivers/media/cec/platform/sti/Makefile | 2 + + .../sti/cec => cec/platform/sti}/stih-cec.c | 0 + drivers/media/cec/platform/stm32/Makefile | 2 + + drivers/media/{ => cec}/platform/stm32/stm32-cec.c | 0 + drivers/media/cec/platform/tegra/Makefile | 2 + + .../tegra-cec => cec/platform/tegra}/tegra_cec.c | 0 + .../tegra-cec => cec/platform/tegra}/tegra_cec.h | 0 + drivers/media/cec/usb/Kconfig | 8 + + drivers/media/cec/usb/Makefile | 6 + + .../{usb/pulse8-cec => cec/usb/pulse8}/Kconfig | 3 +- + .../{usb/pulse8-cec => cec/usb/pulse8}/Makefile | 0 + .../pulse8-cec => cec/usb/pulse8}/pulse8-cec.c | 0 + .../rainshadow-cec => cec/usb/rainshadow}/Kconfig | 3 +- + .../rainshadow-cec => cec/usb/rainshadow}/Makefile | 0 + .../usb/rainshadow}/rainshadow-cec.c | 0 + drivers/media/common/Kconfig | 2 +- + drivers/media/dvb-core/Kconfig | 27 + + drivers/media/dvb-frontends/Kconfig | 16 +- + drivers/media/dvb-frontends/cxd2880/cxd2880_top.c | 2 +- + drivers/media/dvb-frontends/dib3000.h | 2 +- + drivers/media/dvb-frontends/dib3000mb.c | 2 +- + drivers/media/dvb-frontends/drxk_hard.c | 2 +- + drivers/media/dvb-frontends/eds1547.h | 2 +- + drivers/media/dvb-frontends/lgdt3306a.c | 14 + + drivers/media/dvb-frontends/m88ds3103.c | 4 +- + drivers/media/dvb-frontends/stv0900_core.c | 2 +- + drivers/media/dvb-frontends/z0194a.h | 2 +- + drivers/media/firewire/Kconfig | 5 +- + drivers/media/i2c/Kconfig | 444 +++++--- + drivers/media/i2c/cx25840/cx25840-core.c | 40 +- + drivers/media/i2c/et8ek8/Kconfig | 4 +- + drivers/media/i2c/imx219.c | 108 +- + drivers/media/i2c/m5mols/Kconfig | 5 +- + drivers/media/i2c/max2175.c | 6 +- + drivers/media/i2c/ov13858.c | 13 +- + drivers/media/i2c/ov5640.c | 4 +- + drivers/media/i2c/ov5670.c | 14 +- + drivers/media/i2c/smiapp/Kconfig | 5 +- + drivers/media/mc/Kconfig | 19 +- + drivers/media/mc/mc-entity.c | 2 +- + drivers/media/mmc/Kconfig | 1 - + drivers/media/mmc/siano/Kconfig | 2 + + drivers/media/pci/Kconfig | 14 +- + drivers/media/pci/bt8xx/Kconfig | 2 +- + drivers/media/pci/cobalt/Kconfig | 4 +- + drivers/media/pci/cx18/cx18-ioctl.c | 22 +- + drivers/media/pci/cx18/cx18-streams.c | 4 +- + drivers/media/pci/cx23885/cx23885-cards.c | 51 +- + drivers/media/pci/cx23885/cx23885-dvb.c | 31 + + drivers/media/pci/cx23885/cx23885-video.c | 99 +- + drivers/media/pci/cx88/cx88-core.c | 3 +- + drivers/media/pci/cx88/cx88-input.c | 2 +- + drivers/media/pci/cx88/cx88-video.c | 2 +- + drivers/media/pci/ddbridge/Kconfig | 1 - + drivers/media/pci/ddbridge/Makefile | 2 +- + drivers/media/pci/ddbridge/ddbridge-core.c | 4 +- + drivers/media/pci/ddbridge/ddbridge-dummy-fe.c | 153 +++ + drivers/media/pci/ddbridge/ddbridge-dummy-fe.h | 16 + + drivers/media/pci/intel/ipu3/Kconfig | 4 +- + drivers/media/pci/ivtv/ivtv-ioctl.c | 26 +- + drivers/media/pci/mantis/mantis_dvb.c | 2 +- + drivers/media/pci/meye/Kconfig | 2 +- + drivers/media/pci/saa7134/saa7134-input.c | 2 +- + drivers/media/pci/sta2x11/Kconfig | 6 +- + drivers/media/platform/Kconfig | 191 +--- + drivers/media/platform/Makefile | 19 - + drivers/media/platform/am437x/Kconfig | 4 +- + drivers/media/platform/atmel/Kconfig | 4 +- + drivers/media/platform/cadence/Kconfig | 8 +- + drivers/media/platform/coda/coda-bit.c | 9 +- + drivers/media/platform/coda/coda-common.c | 199 +++- + drivers/media/platform/coda/coda-jpeg.c | 577 ++++++++++ + drivers/media/platform/coda/coda.h | 12 +- + drivers/media/platform/cros-ec-cec/Makefile | 2 - + drivers/media/platform/davinci/vpif_display.c | 1 - + drivers/media/platform/exynos4-is/Kconfig | 5 +- + drivers/media/platform/marvell-ccic/cafe-driver.c | 2 +- + drivers/media/platform/meson/Makefile | 3 - + drivers/media/platform/mtk-mdp/mtk_mdp_comp.c | 8 +- + drivers/media/platform/pxa_camera.c | 4 +- + drivers/media/platform/qcom/venus/core.c | 21 +- + drivers/media/platform/qcom/venus/core.h | 7 +- + drivers/media/platform/qcom/venus/helpers.c | 18 +- + drivers/media/platform/qcom/venus/helpers.h | 2 +- + drivers/media/platform/qcom/venus/hfi.c | 10 +- + drivers/media/platform/qcom/venus/hfi.h | 3 +- + drivers/media/platform/qcom/venus/hfi_msgs.c | 2 + + drivers/media/platform/qcom/venus/vdec.c | 200 +++- + drivers/media/platform/qcom/venus/venc.c | 10 +- + drivers/media/platform/rcar-fcp.c | 5 + + drivers/media/platform/rcar-vin/Kconfig | 8 +- + drivers/media/platform/rcar-vin/rcar-csi2.c | 4 +- + drivers/media/platform/rcar-vin/rcar-v4l2.c | 40 +- + drivers/media/platform/seco-cec/Makefile | 2 - + drivers/media/platform/sh_veu.c | 1203 -------------------- + drivers/media/platform/sti/cec/Makefile | 2 - + drivers/media/platform/stm32/Makefile | 1 - + drivers/media/platform/sunxi/Kconfig | 2 + + drivers/media/platform/sunxi/Makefile | 2 + + drivers/media/platform/sunxi/sun4i-csi/Kconfig | 6 +- + drivers/media/platform/sunxi/sun4i-csi/Makefile | 2 + + drivers/media/platform/sunxi/sun6i-csi/Kconfig | 4 +- + drivers/media/platform/sunxi/sun8i-di/sun8i-di.c | 6 +- + drivers/media/platform/tegra-cec/Makefile | 2 - + drivers/media/platform/ti-vpe/cal.c | 439 ++++--- + drivers/media/platform/ti-vpe/cal_regs.h | 21 +- + drivers/media/platform/video-mux.c | 87 +- + drivers/media/platform/xilinx/Kconfig | 4 +- + drivers/media/radio/Kconfig | 12 +- + drivers/media/radio/si470x/Kconfig | 2 +- + drivers/media/radio/wl128x/Kconfig | 5 +- + drivers/media/rc/gpio-ir-tx.c | 51 +- + drivers/media/rc/iguanair.c | 36 +- + drivers/media/rc/ir-rx51.c | 2 +- + drivers/media/rc/rc-core-priv.h | 22 + + drivers/media/spi/Kconfig | 8 +- + drivers/media/test-drivers/Kconfig | 26 + + drivers/media/test-drivers/Makefile | 9 + + .../{platform => test-drivers}/vicodec/Kconfig | 2 + + .../{platform => test-drivers}/vicodec/Makefile | 0 + .../vicodec/codec-fwht.c | 0 + .../vicodec/codec-fwht.h | 0 + .../vicodec/codec-v4l2-fwht.c | 0 + .../vicodec/codec-v4l2-fwht.h | 0 + .../vicodec/vicodec-core.c | 15 +- + drivers/media/{platform => test-drivers}/vim2m.c | 8 - + .../media/{platform => test-drivers}/vimc/Kconfig | 4 +- + .../media/{platform => test-drivers}/vimc/Makefile | 0 + .../{platform => test-drivers}/vimc/vimc-capture.c | 37 +- + .../{platform => test-drivers}/vimc/vimc-common.c | 83 +- + .../{platform => test-drivers}/vimc/vimc-common.h | 88 +- + .../{platform => test-drivers}/vimc/vimc-core.c | 90 +- + .../{platform => test-drivers}/vimc/vimc-debayer.c | 88 +- + .../{platform => test-drivers}/vimc/vimc-scaler.c | 27 +- + .../{platform => test-drivers}/vimc/vimc-sensor.c | 23 +- + .../vimc/vimc-streamer.c | 0 + .../vimc/vimc-streamer.h | 7 +- + .../media/{platform => test-drivers}/vivid/Kconfig | 2 + + .../{platform => test-drivers}/vivid/Makefile | 0 + .../{platform => test-drivers}/vivid/vivid-cec.c | 0 + .../{platform => test-drivers}/vivid/vivid-cec.h | 0 + .../{platform => test-drivers}/vivid/vivid-core.c | 0 + .../{platform => test-drivers}/vivid/vivid-core.h | 0 + .../{platform => test-drivers}/vivid/vivid-ctrls.c | 0 + .../{platform => test-drivers}/vivid/vivid-ctrls.h | 0 + .../vivid/vivid-kthread-cap.c | 0 + .../vivid/vivid-kthread-cap.h | 0 + .../vivid/vivid-kthread-out.c | 0 + .../vivid/vivid-kthread-out.h | 0 + .../vivid/vivid-kthread-touch.c | 0 + .../vivid/vivid-kthread-touch.h | 0 + .../vivid/vivid-meta-cap.c | 0 + .../vivid/vivid-meta-cap.h | 0 + .../vivid/vivid-meta-out.c | 0 + .../vivid/vivid-meta-out.h | 0 + .../{platform => test-drivers}/vivid/vivid-osd.c | 0 + .../{platform => test-drivers}/vivid/vivid-osd.h | 0 + .../vivid/vivid-radio-common.c | 0 + .../vivid/vivid-radio-common.h | 0 + .../vivid/vivid-radio-rx.c | 0 + .../vivid/vivid-radio-rx.h | 0 + .../vivid/vivid-radio-tx.c | 0 + .../vivid/vivid-radio-tx.h | 0 + .../vivid/vivid-rds-gen.c | 0 + .../vivid/vivid-rds-gen.h | 0 + .../vivid/vivid-sdr-cap.c | 0 + .../vivid/vivid-sdr-cap.h | 0 + .../vivid/vivid-touch-cap.c | 0 + .../vivid/vivid-touch-cap.h | 0 + .../vivid/vivid-vbi-cap.c | 0 + .../vivid/vivid-vbi-cap.h | 0 + .../vivid/vivid-vbi-gen.c | 0 + .../vivid/vivid-vbi-gen.h | 0 + .../vivid/vivid-vbi-out.c | 0 + .../vivid/vivid-vbi-out.h | 0 + .../vivid/vivid-vid-cap.c | 0 + .../vivid/vivid-vid-cap.h | 0 + .../vivid/vivid-vid-common.c | 0 + .../vivid/vivid-vid-common.h | 0 + .../vivid/vivid-vid-out.c | 0 + .../vivid/vivid-vid-out.h | 0 + drivers/media/tuners/Kconfig | 6 +- + drivers/media/tuners/si2157.c | 419 ++++++- + drivers/media/tuners/si2157_priv.h | 2 + + drivers/media/usb/Kconfig | 12 +- + drivers/media/usb/Makefile | 2 - + drivers/media/usb/cx231xx/cx231xx-avcore.c | 35 +- + drivers/media/usb/cx231xx/cx231xx-input.c | 5 +- + drivers/media/usb/cx231xx/cx231xx-video.c | 85 +- + drivers/media/usb/dvb-usb-v2/Kconfig | 10 +- + drivers/media/usb/dvb-usb-v2/ec168.c | 25 +- + drivers/media/usb/dvb-usb-v2/gl861.c | 4 +- + drivers/media/usb/dvb-usb-v2/lmedm04.c | 4 +- + drivers/media/usb/dvb-usb-v2/lmedm04.h | 2 +- + drivers/media/usb/dvb-usb-v2/mxl111sf.c | 2 +- + drivers/media/usb/dvb-usb-v2/mxl111sf.h | 2 +- + drivers/media/usb/dvb-usb/Kconfig | 3 +- + drivers/media/usb/dvb-usb/a800.c | 8 +- + drivers/media/usb/dvb-usb/af9005-fe.c | 2 +- + drivers/media/usb/dvb-usb/af9005-remote.c | 2 +- + drivers/media/usb/dvb-usb/af9005.c | 6 +- + drivers/media/usb/dvb-usb/af9005.h | 2 +- + drivers/media/usb/dvb-usb/az6027.c | 6 +- + drivers/media/usb/dvb-usb/cxusb.c | 6 +- + drivers/media/usb/dvb-usb/dib0700.h | 31 +- + drivers/media/usb/dvb-usb/dib0700_core.c | 6 +- + drivers/media/usb/dvb-usb/dibusb-common.c | 2 +- + drivers/media/usb/dvb-usb/dibusb-mb.c | 4 +- + drivers/media/usb/dvb-usb/dibusb-mc-common.c | 2 +- + drivers/media/usb/dvb-usb/dibusb-mc.c | 2 +- + drivers/media/usb/dvb-usb/dibusb.h | 2 +- + drivers/media/usb/dvb-usb/digitv.c | 31 +- + drivers/media/usb/dvb-usb/dtt200u-fe.c | 2 +- + drivers/media/usb/dvb-usb/dtt200u.c | 2 +- + drivers/media/usb/dvb-usb/dtt200u.h | 2 +- + drivers/media/usb/dvb-usb/dvb-usb-common.h | 3 +- + drivers/media/usb/dvb-usb/dvb-usb-firmware.c | 3 +- + drivers/media/usb/dvb-usb/dvb-usb-init.c | 10 +- + drivers/media/usb/dvb-usb/dvb-usb.h | 10 +- + drivers/media/usb/dvb-usb/dw2102.c | 6 +- + drivers/media/usb/dvb-usb/gp8psk.c | 2 +- + drivers/media/usb/dvb-usb/gp8psk.h | 2 +- + drivers/media/usb/dvb-usb/m920x.c | 6 +- + drivers/media/usb/dvb-usb/nova-t-usb2.c | 2 +- + drivers/media/usb/dvb-usb/opera1.c | 2 +- + drivers/media/usb/dvb-usb/technisat-usb2.c | 4 +- + drivers/media/usb/dvb-usb/ttusb2.c | 9 +- + drivers/media/usb/dvb-usb/ttusb2.h | 2 +- + drivers/media/usb/dvb-usb/umt-010.c | 2 +- + drivers/media/usb/dvb-usb/vp702x-fe.c | 2 +- + drivers/media/usb/dvb-usb/vp702x.c | 2 +- + drivers/media/usb/dvb-usb/vp7045-fe.c | 2 +- + drivers/media/usb/dvb-usb/vp7045.c | 2 +- + drivers/media/usb/dvb-usb/vp7045.h | 2 +- + drivers/media/usb/gspca/Kconfig | 2 +- + drivers/media/usb/gspca/mr97310a.c | 1 - + drivers/media/usb/hdpvr/hdpvr-core.c | 4 +- + drivers/media/usb/hdpvr/hdpvr-i2c.c | 2 +- + drivers/media/usb/pvrusb2/pvrusb2-i2c-core.c | 4 +- + drivers/media/usb/pwc/pwc-ctrl.c | 2 +- + drivers/media/usb/pwc/pwc-if.c | 54 +- + drivers/media/usb/ttusb-dec/ttusb_dec.c | 9 +- + drivers/media/usb/zr364xx/Kconfig | 2 +- + drivers/media/v4l2-core/Kconfig | 27 +- + drivers/media/v4l2-core/Makefile | 3 + + drivers/media/v4l2-core/v4l2-common.c | 3 +- + drivers/media/v4l2-core/v4l2-ctrls.c | 92 +- + drivers/media/v4l2-core/v4l2-dev.c | 25 +- + drivers/media/v4l2-core/v4l2-device.c | 7 +- + drivers/media/v4l2-core/v4l2-fwnode.c | 104 +- + drivers/media/v4l2-core/v4l2-h264.c | 270 +++++ + drivers/media/v4l2-core/v4l2-ioctl.c | 72 +- + drivers/media/v4l2-core/v4l2-jpeg.c | 632 ++++++++++ + drivers/media/v4l2-core/v4l2-mc.c | 95 ++ + drivers/media/v4l2-core/v4l2-mem2mem.c | 11 +- + drivers/media/v4l2-core/v4l2-subdev.c | 91 +- + drivers/staging/media/Kconfig | 2 + + drivers/staging/media/Makefile | 1 + + drivers/staging/media/hantro/Kconfig | 6 +- + drivers/staging/media/hantro/Makefile | 2 + + drivers/staging/media/hantro/hantro.h | 7 +- + drivers/staging/media/hantro/hantro_drv.c | 28 +- + drivers/staging/media/hantro/hantro_h264.c | 237 +--- + drivers/staging/media/hantro/hantro_hw.h | 31 + + drivers/staging/media/hantro/hantro_v4l2.c | 111 +- + drivers/staging/media/imx/Kconfig | 5 +- + drivers/staging/media/imx/TODO | 29 - + drivers/staging/media/imx/imx-ic-prp.c | 15 +- + drivers/staging/media/imx/imx-ic-prpencvf.c | 14 +- + drivers/staging/media/imx/imx-media-capture.c | 42 +- + drivers/staging/media/imx/imx-media-csc-scaler.c | 13 +- + drivers/staging/media/imx/imx-media-csi.c | 223 ++-- + drivers/staging/media/imx/imx-media-dev-common.c | 50 +- + drivers/staging/media/imx/imx-media-dev.c | 2 +- + drivers/staging/media/imx/imx-media-internal-sd.c | 6 +- + drivers/staging/media/imx/imx-media-of.c | 114 -- + drivers/staging/media/imx/imx-media-utils.c | 550 ++++----- + drivers/staging/media/imx/imx-media-vdic.c | 12 +- + drivers/staging/media/imx/imx-media.h | 63 +- + drivers/staging/media/imx/imx6-mipi-csi2.c | 93 +- + drivers/staging/media/imx/imx7-media-csi.c | 177 +-- + drivers/staging/media/imx/imx7-mipi-csis.c | 582 ++++++---- + drivers/staging/media/ipu3/Kconfig | 3 +- + drivers/staging/media/ipu3/TODO | 6 - + drivers/staging/media/ipu3/include/intel-ipu3.h | 7 +- + drivers/staging/media/ipu3/ipu3-css-params.c | 14 +- + drivers/staging/media/ipu3/ipu3-css.c | 7 + + drivers/staging/media/ipu3/ipu3-mmu.c | 10 +- + drivers/staging/media/ipu3/ipu3-v4l2.c | 92 +- + drivers/staging/media/ipu3/ipu3.c | 5 +- + drivers/staging/media/ipu3/ipu3.h | 4 + + drivers/staging/media/meson/vdec/codec_vp9.c | 31 + + drivers/staging/media/omap4iss/Kconfig | 4 +- + .../staging/media/phy-rockchip-dphy-rx0/Kconfig | 2 +- + drivers/staging/media/rkisp1/Kconfig | 6 +- + drivers/staging/media/rkisp1/Makefile | 2 + + drivers/staging/media/rkisp1/TODO | 6 - + drivers/staging/media/rkisp1/rkisp1-capture.c | 101 +- + drivers/staging/media/rkisp1/rkisp1-common.h | 16 +- + drivers/staging/media/rkisp1/rkisp1-dev.c | 114 +- + drivers/staging/media/rkisp1/rkisp1-isp.c | 94 +- + drivers/staging/media/rkisp1/rkisp1-resizer.c | 36 +- + drivers/staging/media/rkvdec/Kconfig | 16 + + drivers/staging/media/rkvdec/Makefile | 3 + + drivers/staging/media/rkvdec/TODO | 11 + + drivers/staging/media/rkvdec/rkvdec-h264.c | 1156 +++++++++++++++++++ + drivers/staging/media/rkvdec/rkvdec-regs.h | 223 ++++ + drivers/staging/media/rkvdec/rkvdec.c | 1103 ++++++++++++++++++ + drivers/staging/media/rkvdec/rkvdec.h | 121 ++ + .../staging/media/soc_camera}/soc-camera.rst | 0 + drivers/staging/media/sunxi/cedrus/Kconfig | 5 +- + drivers/staging/media/usbvision/Kconfig | 2 +- + drivers/staging/media/usbvision/usbvision-core.c | 2 +- + include/media/cec-pin.h | 16 +- + include/media/dvb-usb-ids.h | 2 +- + include/media/h264-ctrls.h | 8 +- + include/media/media-entity.h | 3 +- + include/media/rc-map.h | 103 +- + include/media/v4l2-ctrls.h | 87 +- + include/media/v4l2-dev.h | 7 + + include/media/v4l2-device.h | 50 +- + include/media/v4l2-fh.h | 2 - + include/media/v4l2-fwnode.h | 85 +- + include/media/v4l2-h264.h | 85 ++ + include/media/v4l2-image-sizes.h | 6 + + include/media/v4l2-jpeg.h | 135 +++ + include/media/v4l2-mc.h | 48 + + include/media/v4l2-subdev.h | 17 + + include/uapi/linux/v4l2-controls.h | 12 + + include/uapi/linux/v4l2-subdev.h | 16 + + include/uapi/linux/videodev2.h | 5 +- + 1018 files changed, 16871 insertions(+), 7132 deletions(-) + rename Documentation/{media/v4l-drivers => admin-guide/media}/au0828-cardlist.rst (100%) + create mode 100644 Documentation/admin-guide/media/avermedia.rst + create mode 100644 Documentation/admin-guide/media/bt8xx.rst + rename Documentation/{media/v4l-drivers => admin-guide/media}/bttv-cardlist.rst (99%) + rename Documentation/{media/v4l-drivers => admin-guide/media}/bttv.rst (79%) + create mode 100644 Documentation/admin-guide/media/building.rst + rename Documentation/{media/v4l-drivers => admin-guide/media}/cafe_ccic.rst (100%) + create mode 100644 Documentation/admin-guide/media/cardlist.rst + create mode 100644 Documentation/admin-guide/media/cec-drivers.rst + create mode 100644 Documentation/admin-guide/media/ci.rst + rename Documentation/{media/v4l-drivers => admin-guide/media}/cpia2.rst (66%) + create mode 100644 Documentation/admin-guide/media/cx18-cardlist.rst + create mode 100644 Documentation/admin-guide/media/cx231xx-cardlist.rst + rename Documentation/{media/v4l-drivers => admin-guide/media}/cx23885-cardlist.rst (98%) + rename Documentation/{media/v4l-drivers => admin-guide/media}/cx88-cardlist.rst (98%) + create mode 100644 Documentation/admin-guide/media/cx88.rst + rename Documentation/{media/v4l-drivers => admin-guide/media}/davinci-vpbe.rst (72%) + create mode 100644 Documentation/admin-guide/media/dvb-drivers.rst + create mode 100644 Documentation/admin-guide/media/dvb-usb-a800-cardlist.rst + create mode 100644 Documentation/admin-guide/media/dvb-usb-af9005-cardlist.rst + create mode 100644 Documentation/admin-guide/media/dvb-usb-af9015-cardlist.rst + create mode 100644 Documentation/admin-guide/media/dvb-usb-af9035-cardlist.rst + create mode 100644 Documentation/admin-guide/media/dvb-usb-anysee-cardlist.rst + create mode 100644 Documentation/admin-guide/media/dvb-usb-au6610-cardlist.rst + create mode 100644 Documentation/admin-guide/media/dvb-usb-az6007-cardlist.rst + create mode 100644 Documentation/admin-guide/media/dvb-usb-az6027-cardlist.rst + create mode 100644 Documentation/admin-guide/media/dvb-usb-ce6230-cardlist.rst + create mode 100644 Documentation/admin-guide/media/dvb-usb-cinergyT2-cardlist.rst + create mode 100644 Documentation/admin-guide/media/dvb-usb-cxusb-cardlist.rst + create mode 100644 Documentation/admin-guide/media/dvb-usb-dib0700-cardlist.rst + create mode 100644 Documentation/admin-guide/media/dvb-usb-dibusb-mb-cardlist.rst + create mode 100644 Documentation/admin-guide/media/dvb-usb-dibusb-mc-cardlist.rst + create mode 100644 Documentation/admin-guide/media/dvb-usb-digitv-cardlist.rst + create mode 100644 Documentation/admin-guide/media/dvb-usb-dtt200u-cardlist.rst + create mode 100644 Documentation/admin-guide/media/dvb-usb-dtv5100-cardlist.rst + create mode 100644 Documentation/admin-guide/media/dvb-usb-dvbsky-cardlist.rst + create mode 100644 Documentation/admin-guide/media/dvb-usb-dw2102-cardlist.rst + create mode 100644 Documentation/admin-guide/media/dvb-usb-ec168-cardlist.rst + create mode 100644 Documentation/admin-guide/media/dvb-usb-gl861-cardlist.rst + create mode 100644 Documentation/admin-guide/media/dvb-usb-gp8psk-cardlist.rst + create mode 100644 Documentation/admin-guide/media/dvb-usb-lmedm04-cardlist.rst + create mode 100644 Documentation/admin-guide/media/dvb-usb-m920x-cardlist.rst + create mode 100644 Documentation/admin-guide/media/dvb-usb-mxl111sf-cardlist.rst + create mode 100644 Documentation/admin-guide/media/dvb-usb-nova-t-usb2-cardlist.rst + create mode 100644 Documentation/admin-guide/media/dvb-usb-opera1-cardlist.rst + create mode 100644 Documentation/admin-guide/media/dvb-usb-pctv452e-cardlist.rst + create mode 100644 Documentation/admin-guide/media/dvb-usb-rtl28xxu-cardlist.rst + create mode 100644 Documentation/admin-guide/media/dvb-usb-technisat-usb2-cardlist.rst + create mode 100644 Documentation/admin-guide/media/dvb-usb-ttusb2-cardlist.rst + create mode 100644 Documentation/admin-guide/media/dvb-usb-umt-010-cardlist.rst + create mode 100644 Documentation/admin-guide/media/dvb-usb-vp702x-cardlist.rst + create mode 100644 Documentation/admin-guide/media/dvb-usb-vp7045-cardlist.rst + create mode 100644 Documentation/admin-guide/media/dvb-usb-zd1301-cardlist.rst + create mode 100644 Documentation/admin-guide/media/dvb.rst + create mode 100644 Documentation/admin-guide/media/dvb_intro.rst + create mode 100644 Documentation/admin-guide/media/dvb_references.rst + rename Documentation/{media/v4l-drivers => admin-guide/media}/em28xx-cardlist.rst (97%) + create mode 100644 Documentation/admin-guide/media/faq.rst + rename Documentation/{media/v4l-drivers => admin-guide/media}/fimc.rst (91%) + create mode 100644 Documentation/admin-guide/media/frontend-cardlist.rst + rename Documentation/{media/v4l-drivers => admin-guide/media}/gspca-cardlist.rst (100%) + create mode 100644 Documentation/admin-guide/media/i2c-cardlist.rst + rename Documentation/{media/v4l-drivers => admin-guide/media}/imx.rst (83%) + create mode 100644 Documentation/admin-guide/media/imx6q-sabreauto.dot + create mode 100644 Documentation/admin-guide/media/imx6q-sabresd.dot + rename Documentation/{media/v4l-drivers => admin-guide/media}/imx7.rst (100%) + create mode 100644 Documentation/admin-guide/media/index.rst + create mode 100644 Documentation/admin-guide/media/intro.rst + rename Documentation/{media/v4l-drivers => admin-guide/media}/ipu3.rst (88%) + rename Documentation/{media/v4l-drivers => admin-guide/media}/ipu3_rcb.svg (100%) + rename Documentation/{media/v4l-drivers => admin-guide/media}/ivtv-cardlist.rst (99%) + rename Documentation/{media/v4l-drivers => admin-guide/media}/ivtv.rst (100%) + rename Documentation/{media/dvb-drivers => admin-guide/media}/lmedm04.rst (100%) + rename Documentation/{media/v4l-drivers => admin-guide/media}/meye.rst (63%) + create mode 100644 Documentation/admin-guide/media/misc-cardlist.rst + create mode 100644 Documentation/admin-guide/media/omap3isp.rst + rename Documentation/{media/v4l-drivers => admin-guide/media}/omap4_camera.rst (100%) + rename Documentation/{media/dvb-drivers => admin-guide/media}/opera-firmware.rst (100%) + create mode 100644 Documentation/admin-guide/media/other-usb-cardlist.rst + create mode 100644 Documentation/admin-guide/media/pci-cardlist.rst + rename Documentation/{media/v4l-drivers => admin-guide/media}/philips.rst (100%) + create mode 100644 Documentation/admin-guide/media/platform-cardlist.rst + rename Documentation/{media/cec-drivers => admin-guide/media}/pulse8-cec.rst (100%) + rename Documentation/{media/v4l-drivers => admin-guide/media}/qcom_camss.rst (100%) + rename Documentation/{media/v4l-drivers => admin-guide/media}/qcom_camss_8x96_graph.dot (100%) + rename Documentation/{media/v4l-drivers => admin-guide/media}/qcom_camss_graph.dot (100%) + create mode 100644 Documentation/admin-guide/media/radio-cardlist.rst + rename Documentation/{media/v4l-drivers => admin-guide/media}/rcar-fdp1.rst (100%) + rename Documentation/{media/v4l-drivers/v4l-with-ir.rst => admin-guide/media/remote-controller.rst} (96%) + rename Documentation/{media/v4l-drivers => admin-guide/media}/saa7134-cardlist.rst (99%) + create mode 100644 Documentation/admin-guide/media/saa7134.rst + rename Documentation/{media/v4l-drivers => admin-guide/media}/saa7164-cardlist.rst (97%) + rename Documentation/{media/v4l-drivers => admin-guide/media}/si470x.rst (100%) + rename Documentation/{media/v4l-drivers => admin-guide/media}/si4713.rst (100%) + rename Documentation/{media/v4l-drivers => admin-guide/media}/si476x.rst (100%) + create mode 100644 Documentation/admin-guide/media/siano-cardlist.rst + rename Documentation/{media/dvb-drivers => admin-guide/media}/technisat.rst (100%) + rename Documentation/{media/v4l-drivers => admin-guide/media}/tm6000-cardlist.rst (100%) + rename Documentation/{media/dvb-drivers => admin-guide/media}/ttusb-dec.rst (100%) + rename Documentation/{media/v4l-drivers => admin-guide/media}/tuner-cardlist.rst (100%) + create mode 100644 Documentation/admin-guide/media/usb-cardlist.rst + rename Documentation/{media/v4l-drivers => admin-guide/media}/usbvision-cardlist.rst (100%) + create mode 100644 Documentation/admin-guide/media/v4l-drivers.rst + rename Documentation/{media/v4l-drivers => admin-guide/media}/vimc.dot (100%) + rename Documentation/{media/v4l-drivers => admin-guide/media}/vimc.rst (92%) + rename Documentation/{media/v4l-drivers => admin-guide/media}/vivid.rst (100%) + rename Documentation/{media/v4l-drivers => admin-guide/media}/zr364xx.rst (77%) + create mode 100644 Documentation/devicetree/bindings/media/rockchip,vdec.yaml + delete mode 100644 Documentation/devicetree/bindings/media/rockchip-rga.txt + create mode 100644 Documentation/devicetree/bindings/media/rockchip-rga.yaml + delete mode 100644 Documentation/devicetree/bindings/media/rockchip-vpu.txt + create mode 100644 Documentation/devicetree/bindings/media/rockchip-vpu.yaml + rename Documentation/{media/kapi => driver-api/media}/cec-core.rst (100%) + rename Documentation/{media/kapi => driver-api/media}/csi2.rst (100%) + create mode 100644 Documentation/driver-api/media/drivers/bttv-devel.rst + rename Documentation/{media/dvb-drivers => driver-api/media/drivers}/contributors.rst (100%) + create mode 100644 Documentation/driver-api/media/drivers/cpia2_devel.rst + rename Documentation/{media/v4l-drivers/cx2341x.rst => driver-api/media/drivers/cx2341x-devel.rst} (91%) + rename Documentation/{media/v4l-drivers/cx88.rst => driver-api/media/drivers/cx88-devel.rst} (66%) + create mode 100644 Documentation/driver-api/media/drivers/davinci-vpbe-devel.rst + rename Documentation/{media/dvb-drivers => driver-api/media/drivers}/dvb-usb.rst (100%) + create mode 100644 Documentation/driver-api/media/drivers/fimc-devel.rst + rename Documentation/{media/dvb-drivers => driver-api/media/drivers}/frontends.rst (100%) + create mode 100644 Documentation/driver-api/media/drivers/index.rst + rename Documentation/{media/v4l-drivers => driver-api/media/drivers}/pvrusb2.rst (100%) + rename Documentation/{media/v4l-drivers => driver-api/media/drivers}/pxa_camera.rst (100%) + rename Documentation/{media/v4l-drivers => driver-api/media/drivers}/radiotrack.rst (100%) + rename Documentation/{media/v4l-drivers/saa7134.rst => driver-api/media/drivers/saa7134-devel.rst} (56%) + rename Documentation/{media/v4l-drivers => driver-api/media/drivers}/sh_mobile_ceu_camera.rst (100%) + rename Documentation/{media/v4l-drivers => driver-api/media/drivers}/tuners.rst (100%) + create mode 100644 Documentation/driver-api/media/drivers/vimc-devel.rst + rename Documentation/{media/kapi => driver-api/media}/dtv-ca.rst (100%) + rename Documentation/{media/kapi => driver-api/media}/dtv-common.rst (100%) + rename Documentation/{media/kapi => driver-api/media}/dtv-core.rst (100%) + rename Documentation/{media/kapi => driver-api/media}/dtv-demux.rst (100%) + rename Documentation/{media/kapi => driver-api/media}/dtv-frontend.rst (100%) + rename Documentation/{media/kapi => driver-api/media}/dtv-net.rst (100%) + create mode 100644 Documentation/driver-api/media/index.rst + rename Documentation/{media/kapi => driver-api/media}/mc-core.rst (100%) + rename Documentation/{media/kapi => driver-api/media}/rc-core.rst (100%) + rename Documentation/{media/kapi => driver-api/media}/v4l2-async.rst (100%) + rename Documentation/{media/kapi => driver-api/media}/v4l2-clocks.rst (100%) + rename Documentation/{media/kapi => driver-api/media}/v4l2-common.rst (100%) + rename Documentation/{media/kapi => driver-api/media}/v4l2-controls.rst (100%) + rename Documentation/{media/kapi => driver-api/media}/v4l2-core.rst (100%) + rename Documentation/{media/kapi => driver-api/media}/v4l2-dev.rst (100%) + rename Documentation/{media/kapi => driver-api/media}/v4l2-device.rst (100%) + rename Documentation/{media/kapi => driver-api/media}/v4l2-dv-timings.rst (100%) + rename Documentation/{media/kapi => driver-api/media}/v4l2-event.rst (100%) + rename Documentation/{media/kapi => driver-api/media}/v4l2-fh.rst (100%) + rename Documentation/{media/kapi => driver-api/media}/v4l2-flash-led-class.rst (100%) + rename Documentation/{media/kapi => driver-api/media}/v4l2-fwnode.rst (100%) + rename Documentation/{media/kapi => driver-api/media}/v4l2-intro.rst (100%) + rename Documentation/{media/kapi => driver-api/media}/v4l2-mc.rst (100%) + rename Documentation/{media/kapi => driver-api/media}/v4l2-mediabus.rst (100%) + rename Documentation/{media/kapi => driver-api/media}/v4l2-mem2mem.rst (100%) + rename Documentation/{media/kapi => driver-api/media}/v4l2-rect.rst (100%) + rename Documentation/{media/kapi => driver-api/media}/v4l2-subdev.rst (88%) + rename Documentation/{media/kapi => driver-api/media}/v4l2-tuner.rst (100%) + rename Documentation/{media/kapi => driver-api/media}/v4l2-tveeprom.rst (100%) + rename Documentation/{media/kapi => driver-api/media}/v4l2-videobuf.rst (98%) + rename Documentation/{media/kapi => driver-api/media}/v4l2-videobuf2.rst (100%) + delete mode 100644 Documentation/media/.gitignore + delete mode 100644 Documentation/media/cec-drivers/index.rst + delete mode 100644 Documentation/media/dvb-drivers/avermedia.rst + delete mode 100644 Documentation/media/dvb-drivers/bt8xx.rst + delete mode 100644 Documentation/media/dvb-drivers/cards.rst + delete mode 100644 Documentation/media/dvb-drivers/faq.rst + delete mode 100644 Documentation/media/dvb-drivers/index.rst + delete mode 100644 Documentation/media/dvb-drivers/intro.rst + delete mode 100644 Documentation/media/dvb-drivers/udev.rst + delete mode 100644 Documentation/media/index.rst + delete mode 100644 Documentation/media/media_kapi.rst + delete mode 100644 Documentation/media/media_uapi.rst + delete mode 100644 Documentation/media/v4l-drivers/cardlist.rst + rename Documentation/{ => userspace-api}/media/Makefile (97%) + rename Documentation/{ => userspace-api}/media/audio.h.rst.exceptions (100%) + rename Documentation/{ => userspace-api}/media/ca.h.rst.exceptions (100%) + rename Documentation/{ => userspace-api}/media/cec.h.rst.exceptions (100%) + rename Documentation/{media/uapi => userspace-api/media}/cec/cec-api.rst (95%) + rename Documentation/{media/uapi => userspace-api/media}/cec/cec-func-close.rst (95%) + rename Documentation/{media/uapi => userspace-api/media}/cec/cec-func-ioctl.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/cec/cec-func-open.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/cec/cec-func-poll.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/cec/cec-funcs.rst (93%) + rename Documentation/{media/uapi => userspace-api/media}/cec/cec-header.rst (90%) + rename Documentation/{media/uapi => userspace-api/media}/cec/cec-intro.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/cec/cec-ioc-adap-g-caps.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/cec/cec-ioc-adap-g-conn-info.rst (100%) + rename Documentation/{media/uapi => userspace-api/media}/cec/cec-ioc-adap-g-log-addrs.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/cec/cec-ioc-adap-g-phys-addr.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/cec/cec-ioc-dqevent.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/cec/cec-ioc-g-mode.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/cec/cec-ioc-receive.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/cec/cec-pin-error-inj.rst (99%) + rename Documentation/{ => userspace-api}/media/conf_nitpick.py (100%) + rename Documentation/{ => userspace-api}/media/dmx.h.rst.exceptions (100%) + create mode 100644 Documentation/userspace-api/media/drivers/cx2341x-uapi.rst + create mode 100644 Documentation/userspace-api/media/drivers/imx-uapi.rst + rename Documentation/{media/v4l-drivers => userspace-api/media/drivers}/index.rst (73%) + rename Documentation/{media/v4l-drivers => userspace-api/media/drivers}/max2175.rst (96%) + create mode 100644 Documentation/userspace-api/media/drivers/meye-uapi.rst + rename Documentation/{media/v4l-drivers/omap3isp.rst => userspace-api/media/drivers/omap3isp-uapi.rst} (77%) + rename Documentation/{media/v4l-drivers => userspace-api/media/drivers}/uvcvideo.rst (100%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/audio-bilingual-channel-select.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/audio-channel-select.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/audio-clear-buffer.rst (95%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/audio-continue.rst (95%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/audio-fclose.rst (95%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/audio-fopen.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/audio-fwrite.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/audio-get-capabilities.rst (95%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/audio-get-status.rst (95%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/audio-pause.rst (95%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/audio-play.rst (95%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/audio-select-source.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/audio-set-av-sync.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/audio-set-bypass-mode.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/audio-set-id.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/audio-set-mixer.rst (95%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/audio-set-mute.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/audio-set-streamtype.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/audio-stop.rst (95%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/audio.rst (95%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/audio_data_types.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/audio_function_calls.rst (94%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/ca-fclose.rst (94%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/ca-fopen.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/ca-get-cap.rst (95%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/ca-get-descr-info.rst (95%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/ca-get-msg.rst (95%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/ca-get-slot-info.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/ca-reset.rst (94%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/ca-send-msg.rst (95%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/ca-set-descr.rst (95%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/ca.rst (92%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/ca_data_types.rst (90%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/ca_function_calls.rst (92%) + rename Documentation/{media/dvb-drivers/ci.rst => userspace-api/media/dvb/ca_high_level.rst} (68%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/demux.rst (94%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/dmx-add-pid.rst (95%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/dmx-expbuf.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/dmx-fclose.rst (95%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/dmx-fopen.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/dmx-fread.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/dmx-fwrite.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/dmx-get-pes-pids.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/dmx-get-stc.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/dmx-mmap.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/dmx-munmap.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/dmx-qbuf.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/dmx-querybuf.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/dmx-remove-pid.rst (95%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/dmx-reqbufs.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/dmx-set-buffer-size.rst (95%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/dmx-set-filter.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/dmx-set-pes-filter.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/dmx-start.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/dmx-stop.rst (95%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/dmx_fcalls.rst (93%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/dmx_types.rst (90%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/dvb-fe-read-status.rst (95%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/dvb-frontend-event.rst (91%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/dvb-frontend-parameters.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/dvbapi.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/dvbproperty.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/dvbstb.svg (99%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/examples.rst (93%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/fe-bandwidth-t.rst (95%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/fe-diseqc-recv-slave-reply.rst (95%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/fe-diseqc-reset-overload.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/fe-diseqc-send-burst.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/fe-diseqc-send-master-cmd.rst (95%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/fe-dishnetwork-send-legacy-cmd.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/fe-enable-high-lnb-voltage.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/fe-get-event.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/fe-get-frontend.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/fe-get-info.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/fe-get-property.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/fe-read-ber.rst (95%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/fe-read-signal-strength.rst (95%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/fe-read-snr.rst (95%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/fe-read-status.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/fe-read-uncorrected-blocks.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/fe-set-frontend-tune-mode.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/fe-set-frontend.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/fe-set-tone.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/fe-set-voltage.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/fe-type-t.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/fe_property_parameters.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/frontend-header.rst (90%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/frontend-property-cable-systems.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/frontend-property-satellite-systems.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/frontend-property-terrestrial-systems.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/frontend-stat-properties.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/frontend.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/frontend_f_close.rst (95%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/frontend_f_open.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/frontend_fcalls.rst (93%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/frontend_legacy_api.rst (95%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/frontend_legacy_dvbv3_api.rst (93%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/headers.rst (93%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/intro.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/legacy_dvb_apis.rst (95%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/net-add-if.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/net-get-if.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/net-remove-if.rst (95%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/net-types.rst (90%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/net.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/query-dvb-frontend-info.rst (93%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/video-clear-buffer.rst (95%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/video-command.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/video-continue.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/video-fast-forward.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/video-fclose.rst (94%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/video-fopen.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/video-freeze.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/video-fwrite.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/video-get-capabilities.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/video-get-event.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/video-get-frame-count.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/video-get-pts.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/video-get-size.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/video-get-status.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/video-play.rst (95%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/video-select-source.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/video-set-blank.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/video-set-display-format.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/video-set-format.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/video-set-streamtype.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/video-slowmotion.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/video-stillpicture.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/video-stop.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/video-try-command.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/video.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/video_function_calls.rst (94%) + rename Documentation/{media/uapi => userspace-api/media}/dvb/video_types.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/fdl-appendix.rst (99%) + rename Documentation/{ => userspace-api}/media/frontend.h.rst.exceptions (100%) + rename Documentation/{media/uapi => userspace-api/media}/gen-errors.rst (98%) + create mode 100644 Documentation/userspace-api/media/index.rst + rename Documentation/{ => userspace-api}/media/intro.rst (100%) + rename Documentation/{ => userspace-api}/media/lirc.h.rst.exceptions (100%) + rename Documentation/{ => userspace-api}/media/media.h.rst.exceptions (100%) + rename Documentation/{media/uapi => userspace-api/media}/mediactl/media-controller-intro.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/mediactl/media-controller-model.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/mediactl/media-controller.rst (95%) + rename Documentation/{media/uapi => userspace-api/media}/mediactl/media-func-close.rst (95%) + rename Documentation/{media/uapi => userspace-api/media}/mediactl/media-func-ioctl.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/mediactl/media-func-open.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/mediactl/media-funcs.rst (93%) + rename Documentation/{media/uapi => userspace-api/media}/mediactl/media-header.rst (90%) + rename Documentation/{media/uapi => userspace-api/media}/mediactl/media-ioc-device-info.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/mediactl/media-ioc-enum-entities.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/mediactl/media-ioc-enum-links.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/mediactl/media-ioc-g-topology.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/mediactl/media-ioc-request-alloc.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/mediactl/media-ioc-setup-link.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/mediactl/media-request-ioc-queue.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/mediactl/media-request-ioc-reinit.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/mediactl/media-types.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/mediactl/request-api.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/mediactl/request-func-close.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/mediactl/request-func-ioctl.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/mediactl/request-func-poll.rst (98%) + rename Documentation/{ => userspace-api}/media/net.h.rst.exceptions (100%) + rename Documentation/{media/uapi => userspace-api/media}/rc/keytable.c.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/rc/lirc-dev-intro.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/rc/lirc-dev.rst (90%) + rename Documentation/{media/uapi => userspace-api/media}/rc/lirc-func.rst (94%) + rename Documentation/{media/uapi => userspace-api/media}/rc/lirc-get-features.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/rc/lirc-get-rec-mode.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/rc/lirc-get-rec-resolution.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/rc/lirc-get-send-mode.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/rc/lirc-get-timeout.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/rc/lirc-header.rst (90%) + rename Documentation/{media/uapi => userspace-api/media}/rc/lirc-read.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/rc/lirc-set-measure-carrier-mode.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/rc/lirc-set-rec-carrier-range.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/rc/lirc-set-rec-carrier.rst (95%) + rename Documentation/{media/uapi => userspace-api/media}/rc/lirc-set-rec-timeout-reports.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/rc/lirc-set-rec-timeout.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/rc/lirc-set-send-carrier.rst (95%) + rename Documentation/{media/uapi => userspace-api/media}/rc/lirc-set-send-duty-cycle.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/rc/lirc-set-transmitter-mask.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/rc/lirc-set-wideband-receiver.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/rc/lirc-write.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/rc/rc-intro.rst (95%) + rename Documentation/{media/uapi => userspace-api/media}/rc/rc-protos.rst (100%) + rename Documentation/{media/uapi => userspace-api/media}/rc/rc-sysfs-nodes.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/rc/rc-table-change.rst (93%) + rename Documentation/{media/uapi => userspace-api/media}/rc/rc-tables.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/rc/remote_controllers.rst (95%) + rename Documentation/{ => userspace-api}/media/typical_media_device.svg (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/app-pri.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/async.rst (90%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/audio.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/bayer.svg (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/biblio.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/buffer.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/capture-example.rst (90%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/capture.c.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/colorspaces-defs.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/colorspaces-details.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/colorspaces.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/common-defs.rst (92%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/common.rst (95%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/compat.rst (92%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/constraints.svg (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/control.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/crop.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/crop.svg (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/depth-formats.rst (91%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/dev-capture.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/dev-decoder.rst (100%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/dev-event.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/dev-mem2mem.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/dev-meta.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/dev-osd.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/dev-output.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/dev-overlay.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/dev-radio.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/dev-raw-vbi.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/dev-rds.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/dev-sdr.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/dev-sliced-vbi.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/dev-stateless-decoder.rst (100%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/dev-subdev.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/dev-touch.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/devices.rst (92%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/diff-v4l.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/dmabuf.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/dv-timings.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/ext-ctrls-camera.rst (74%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/ext-ctrls-codec.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/ext-ctrls-detect.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/ext-ctrls-dv.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/ext-ctrls-flash.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/ext-ctrls-fm-rx.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/ext-ctrls-fm-tx.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/ext-ctrls-image-process.rst (95%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/ext-ctrls-image-source.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/ext-ctrls-jpeg.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/ext-ctrls-rf-tuner.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/extended-controls.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/field-order.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/fieldseq_bt.svg (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/fieldseq_tb.svg (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/format.rst (98%) + rename Documentation/{media/v4l-drivers => userspace-api/media/v4l}/fourcc.rst (100%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/func-close.rst (95%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/func-ioctl.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/func-mmap.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/func-munmap.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/func-open.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/func-poll.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/func-read.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/func-select.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/func-write.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/hist-v4l2.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/hsv-formats.rst (93%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/io.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/libv4l-introduction.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/libv4l.rst (90%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/meta-formats.rst (92%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/mmap.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/nv12mt.svg (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/nv12mt_example.svg (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/open.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pipeline.dot (100%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-bayer.rst (95%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-cnf4.rst (100%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-compressed.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-grey.rst (95%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-indexed.rst (95%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-intro.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-inzi.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-m420.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-meta-d4xx.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-meta-intel-ipu3.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-meta-uvc.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-meta-vivid.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-meta-vsp1-hgo.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-meta-vsp1-hgt.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-nv12.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-nv12m.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-nv12mt.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-nv16.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-nv16m.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-nv24.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-packed-hsv.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-packed-yuv.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-reserved.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-rgb.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-sdr-cs08.rst (94%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-sdr-cs14le.rst (95%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-sdr-cu08.rst (94%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-sdr-cu16le.rst (95%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-sdr-pcu16be.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-sdr-pcu18be.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-sdr-pcu20be.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-sdr-ru12le.rst (94%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-srggb10-ipu3.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-srggb10.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-srggb10alaw8.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-srggb10dpcm8.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-srggb10p.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-srggb12.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-srggb12p.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-srggb14.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-srggb14p.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-srggb16.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-srggb8.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-tch-td08.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-tch-td16.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-tch-tu08.rst (95%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-tch-tu16.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-uv8.rst (95%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-uyvy.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-v4l2-mplane.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-v4l2.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-vyuy.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-y10.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-y10b.rst (95%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-y10p.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-y12.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-y12i.rst (95%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-y14.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-y16-be.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-y16.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-y41p.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-y8i.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-yuv410.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-yuv411p.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-yuv420.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-yuv420m.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-yuv422m.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-yuv422p.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-yuv444m.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-yuyv.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-yvyu.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-z16.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/planar-apis.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/querycap.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/rw.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/sdr-formats.rst (92%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/selection-api-configuration.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/selection-api-examples.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/selection-api-intro.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/selection-api-targets.rst (92%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/selection-api-vs-crop-api.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/selection-api.rst (92%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/selection.svg (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/selections-common.rst (94%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/standard.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/streaming-par.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/subdev-formats.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/subdev-image-processing-crop.svg (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/subdev-image-processing-full.svg (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/subdev-image-processing-scaling-multi-source.svg (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/tch-formats.rst (91%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/tuner.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/user-func.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/userp.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/v4l2-selection-flags.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/v4l2-selection-targets.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/v4l2.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/v4l2grab-example.rst (93%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/v4l2grab.c.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/vbi_525.svg (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/vbi_625.svg (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/vbi_hsync.svg (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/video.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/videodev.rst (91%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-create-bufs.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-cropcap.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-dbg-g-chip-info.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-dbg-g-register.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-decoder-cmd.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-dqevent.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-dv-timings-cap.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-encoder-cmd.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-enum-dv-timings.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-enum-fmt.rst (70%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-enum-frameintervals.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-enum-framesizes.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-enum-freq-bands.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-enumaudio.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-enumaudioout.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-enuminput.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-enumoutput.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-enumstd.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-expbuf.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-g-audio.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-g-audioout.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-g-crop.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-g-ctrl.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-g-dv-timings.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-g-edid.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-g-enc-index.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-g-ext-ctrls.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-g-fbuf.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-g-fmt.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-g-frequency.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-g-input.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-g-jpegcomp.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-g-modulator.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-g-output.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-g-parm.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-g-priority.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-g-selection.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-g-sliced-vbi-cap.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-g-std.rst (90%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-g-tuner.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-log-status.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-overlay.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-prepare-buf.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-qbuf.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-query-dv-timings.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-querybuf.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-querycap.rst (96%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-queryctrl.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-querystd.rst (97%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-reqbufs.rst (99%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-s-hw-freq-seek.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-streamon.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-subdev-enum-frame-interval.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-subdev-enum-frame-size.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-subdev-enum-mbus-code.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-subdev-g-crop.rst (90%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-subdev-g-fmt.rst (91%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-subdev-g-frame-interval.rst (92%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-subdev-g-selection.rst (89%) + create mode 100644 Documentation/userspace-api/media/v4l/vidioc-subdev-querycap.rst + rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-subscribe-event.rst (98%) + rename Documentation/{media/uapi => userspace-api/media}/v4l/yuv-formats.rst (97%) + rename Documentation/{ => userspace-api}/media/video.h.rst.exceptions (100%) + rename Documentation/{ => userspace-api}/media/videodev2.h.rst.exceptions (99%) + create mode 100644 drivers/media/cec/core/Makefile + rename drivers/media/cec/{ => core}/cec-adap.c (100%) + rename drivers/media/cec/{ => core}/cec-api.c (100%) + rename drivers/media/cec/{ => core}/cec-core.c (100%) + rename drivers/media/cec/{ => core}/cec-notifier.c (100%) + rename drivers/media/cec/{ => core}/cec-pin-error-inj.c (100%) + rename drivers/media/cec/{ => core}/cec-pin-priv.h (100%) + rename drivers/media/cec/{ => core}/cec-pin.c (100%) + rename drivers/media/cec/{ => core}/cec-priv.h (100%) + create mode 100644 drivers/media/cec/platform/Kconfig + create mode 100644 drivers/media/cec/platform/Makefile + rename drivers/media/{ => cec}/platform/cec-gpio/Makefile (100%) + rename drivers/media/{ => cec}/platform/cec-gpio/cec-gpio.c (94%) + create mode 100644 drivers/media/cec/platform/cros-ec/Makefile + rename drivers/media/{platform/cros-ec-cec => cec/platform/cros-ec}/cros-ec-cec.c (100%) + create mode 100644 drivers/media/cec/platform/meson/Makefile + rename drivers/media/{ => cec}/platform/meson/ao-cec-g12a.c (100%) + rename drivers/media/{ => cec}/platform/meson/ao-cec.c (100%) + rename drivers/media/{platform/s5p-cec => cec/platform/s5p}/Makefile (63%) + rename drivers/media/{platform/s5p-cec => cec/platform/s5p}/exynos_hdmi_cec.h (100%) + rename drivers/media/{platform/s5p-cec => cec/platform/s5p}/exynos_hdmi_cecctrl.c (100%) + rename drivers/media/{platform/s5p-cec => cec/platform/s5p}/regs-cec.h (100%) + rename drivers/media/{platform/s5p-cec => cec/platform/s5p}/s5p_cec.c (100%) + rename drivers/media/{platform/s5p-cec => cec/platform/s5p}/s5p_cec.h (100%) + create mode 100644 drivers/media/cec/platform/seco/Makefile + rename drivers/media/{platform/seco-cec => cec/platform/seco}/seco-cec.c (99%) + rename drivers/media/{platform/seco-cec => cec/platform/seco}/seco-cec.h (100%) + create mode 100644 drivers/media/cec/platform/sti/Makefile + rename drivers/media/{platform/sti/cec => cec/platform/sti}/stih-cec.c (100%) + create mode 100644 drivers/media/cec/platform/stm32/Makefile + rename drivers/media/{ => cec}/platform/stm32/stm32-cec.c (100%) + create mode 100644 drivers/media/cec/platform/tegra/Makefile + rename drivers/media/{platform/tegra-cec => cec/platform/tegra}/tegra_cec.c (100%) + rename drivers/media/{platform/tegra-cec => cec/platform/tegra}/tegra_cec.h (100%) + create mode 100644 drivers/media/cec/usb/Kconfig + create mode 100644 drivers/media/cec/usb/Makefile + rename drivers/media/{usb/pulse8-cec => cec/usb/pulse8}/Kconfig (91%) + rename drivers/media/{usb/pulse8-cec => cec/usb/pulse8}/Makefile (100%) + rename drivers/media/{usb/pulse8-cec => cec/usb/pulse8}/pulse8-cec.c (100%) + rename drivers/media/{usb/rainshadow-cec => cec/usb/rainshadow}/Kconfig (92%) + rename drivers/media/{usb/rainshadow-cec => cec/usb/rainshadow}/Makefile (100%) + rename drivers/media/{usb/rainshadow-cec => cec/usb/rainshadow}/rainshadow-cec.c (100%) + create mode 100644 drivers/media/pci/ddbridge/ddbridge-dummy-fe.c + create mode 100644 drivers/media/pci/ddbridge/ddbridge-dummy-fe.h + delete mode 100644 drivers/media/platform/cros-ec-cec/Makefile + delete mode 100644 drivers/media/platform/meson/Makefile + delete mode 100644 drivers/media/platform/seco-cec/Makefile + delete mode 100644 drivers/media/platform/sh_veu.c + delete mode 100644 drivers/media/platform/sti/cec/Makefile + delete mode 100644 drivers/media/platform/tegra-cec/Makefile + create mode 100644 drivers/media/test-drivers/Kconfig + create mode 100644 drivers/media/test-drivers/Makefile + rename drivers/media/{platform => test-drivers}/vicodec/Kconfig (85%) + rename drivers/media/{platform => test-drivers}/vicodec/Makefile (100%) + rename drivers/media/{platform => test-drivers}/vicodec/codec-fwht.c (100%) + rename drivers/media/{platform => test-drivers}/vicodec/codec-fwht.h (100%) + rename drivers/media/{platform => test-drivers}/vicodec/codec-v4l2-fwht.c (100%) + rename drivers/media/{platform => test-drivers}/vicodec/codec-v4l2-fwht.h (100%) + rename drivers/media/{platform => test-drivers}/vicodec/vicodec-core.c (99%) + rename drivers/media/{platform => test-drivers}/vim2m.c (99%) + rename drivers/media/{platform => test-drivers}/vimc/Kconfig (83%) + rename drivers/media/{platform => test-drivers}/vimc/Makefile (100%) + rename drivers/media/{platform => test-drivers}/vimc/vimc-capture.c (94%) + rename drivers/media/{platform => test-drivers}/vimc/vimc-common.c (81%) + rename drivers/media/{platform => test-drivers}/vimc/vimc-common.h (78%) + rename drivers/media/{platform => test-drivers}/vimc/vimc-core.c (87%) + rename drivers/media/{platform => test-drivers}/vimc/vimc-debayer.c (88%) + rename drivers/media/{platform => test-drivers}/vimc/vimc-scaler.c (96%) + rename drivers/media/{platform => test-drivers}/vimc/vimc-sensor.c (95%) + rename drivers/media/{platform => test-drivers}/vimc/vimc-streamer.c (100%) + rename drivers/media/{platform => test-drivers}/vimc/vimc-streamer.h (85%) + rename drivers/media/{platform => test-drivers}/vivid/Kconfig (95%) + rename drivers/media/{platform => test-drivers}/vivid/Makefile (100%) + rename drivers/media/{platform => test-drivers}/vivid/vivid-cec.c (100%) + rename drivers/media/{platform => test-drivers}/vivid/vivid-cec.h (100%) + rename drivers/media/{platform => test-drivers}/vivid/vivid-core.c (100%) + rename drivers/media/{platform => test-drivers}/vivid/vivid-core.h (100%) + rename drivers/media/{platform => test-drivers}/vivid/vivid-ctrls.c (100%) + rename drivers/media/{platform => test-drivers}/vivid/vivid-ctrls.h (100%) + rename drivers/media/{platform => test-drivers}/vivid/vivid-kthread-cap.c (100%) + rename drivers/media/{platform => test-drivers}/vivid/vivid-kthread-cap.h (100%) + rename drivers/media/{platform => test-drivers}/vivid/vivid-kthread-out.c (100%) + rename drivers/media/{platform => test-drivers}/vivid/vivid-kthread-out.h (100%) + rename drivers/media/{platform => test-drivers}/vivid/vivid-kthread-touch.c (100%) + rename drivers/media/{platform => test-drivers}/vivid/vivid-kthread-touch.h (100%) + rename drivers/media/{platform => test-drivers}/vivid/vivid-meta-cap.c (100%) + rename drivers/media/{platform => test-drivers}/vivid/vivid-meta-cap.h (100%) + rename drivers/media/{platform => test-drivers}/vivid/vivid-meta-out.c (100%) + rename drivers/media/{platform => test-drivers}/vivid/vivid-meta-out.h (100%) + rename drivers/media/{platform => test-drivers}/vivid/vivid-osd.c (100%) + rename drivers/media/{platform => test-drivers}/vivid/vivid-osd.h (100%) + rename drivers/media/{platform => test-drivers}/vivid/vivid-radio-common.c (100%) + rename drivers/media/{platform => test-drivers}/vivid/vivid-radio-common.h (100%) + rename drivers/media/{platform => test-drivers}/vivid/vivid-radio-rx.c (100%) + rename drivers/media/{platform => test-drivers}/vivid/vivid-radio-rx.h (100%) + rename drivers/media/{platform => test-drivers}/vivid/vivid-radio-tx.c (100%) + rename drivers/media/{platform => test-drivers}/vivid/vivid-radio-tx.h (100%) + rename drivers/media/{platform => test-drivers}/vivid/vivid-rds-gen.c (100%) + rename drivers/media/{platform => test-drivers}/vivid/vivid-rds-gen.h (100%) + rename drivers/media/{platform => test-drivers}/vivid/vivid-sdr-cap.c (100%) + rename drivers/media/{platform => test-drivers}/vivid/vivid-sdr-cap.h (100%) + rename drivers/media/{platform => test-drivers}/vivid/vivid-touch-cap.c (100%) + rename drivers/media/{platform => test-drivers}/vivid/vivid-touch-cap.h (100%) + rename drivers/media/{platform => test-drivers}/vivid/vivid-vbi-cap.c (100%) + rename drivers/media/{platform => test-drivers}/vivid/vivid-vbi-cap.h (100%) + rename drivers/media/{platform => test-drivers}/vivid/vivid-vbi-gen.c (100%) + rename drivers/media/{platform => test-drivers}/vivid/vivid-vbi-gen.h (100%) + rename drivers/media/{platform => test-drivers}/vivid/vivid-vbi-out.c (100%) + rename drivers/media/{platform => test-drivers}/vivid/vivid-vbi-out.h (100%) + rename drivers/media/{platform => test-drivers}/vivid/vivid-vid-cap.c (100%) + rename drivers/media/{platform => test-drivers}/vivid/vivid-vid-cap.h (100%) + rename drivers/media/{platform => test-drivers}/vivid/vivid-vid-common.c (100%) + rename drivers/media/{platform => test-drivers}/vivid/vivid-vid-common.h (100%) + rename drivers/media/{platform => test-drivers}/vivid/vivid-vid-out.c (100%) + rename drivers/media/{platform => test-drivers}/vivid/vivid-vid-out.h (100%) + create mode 100644 drivers/media/v4l2-core/v4l2-h264.c + create mode 100644 drivers/media/v4l2-core/v4l2-jpeg.c + create mode 100644 drivers/staging/media/rkvdec/Kconfig + create mode 100644 drivers/staging/media/rkvdec/Makefile + create mode 100644 drivers/staging/media/rkvdec/TODO + create mode 100644 drivers/staging/media/rkvdec/rkvdec-h264.c + create mode 100644 drivers/staging/media/rkvdec/rkvdec-regs.h + create mode 100644 drivers/staging/media/rkvdec/rkvdec.c + create mode 100644 drivers/staging/media/rkvdec/rkvdec.h + rename {Documentation/media/v4l-drivers => drivers/staging/media/soc_camera}/soc-camera.rst (100%) + create mode 100644 include/media/v4l2-h264.h + create mode 100644 include/media/v4l2-jpeg.h +Merging v4l-dvb-next/master (54ecb8f7028c Linux 5.4-rc1) +$ git merge v4l-dvb-next/master +Already up to date. +Merging fbdev/fbdev-for-next (732146a3f1dc video: fbdev: imxfb: fix a typo in imxfb_probe()) +$ git merge fbdev/fbdev-for-next +Already up to date. +Merging pm/linux-next (478d8912f6a3 Merge branches 'powercap' and 'pnp' into linux-next) +$ git merge pm/linux-next +Auto-merging drivers/i2c/busses/i2c-designware-platdrv.c +Auto-merging drivers/cpufreq/Kconfig.arm +Merge made by the 'recursive' strategy. + Documentation/admin-guide/pm/intel_pstate.rst | 32 ++- + Documentation/driver-api/pm/devices.rst | 199 +++++++++------ + Documentation/power/pci.rst | 58 +++-- + drivers/acpi/acpi_dbg.c | 4 +- + drivers/acpi/acpi_lpit.c | 3 +- + drivers/acpi/acpi_lpss.c | 14 +- + drivers/acpi/acpi_tad.c | 2 +- + drivers/acpi/acpi_watchdog.c | 7 +- + drivers/acpi/acpica/acglobal.h | 1 + + drivers/acpi/acpica/acpredef.h | 4 +- + drivers/acpi/acpica/dbhistry.c | 1 - + drivers/acpi/acpica/dsfield.c | 22 +- + drivers/acpi/acpica/exfield.c | 2 +- + drivers/acpi/apei/bert.c | 6 +- + drivers/acpi/apei/einj.c | 5 +- + drivers/acpi/apei/erst.c | 4 +- + drivers/acpi/apei/hest.c | 5 +- + drivers/acpi/button.c | 1 - + drivers/acpi/cppc_acpi.c | 4 +- + drivers/acpi/device_pm.c | 31 +-- + drivers/acpi/ec.c | 27 +- + drivers/acpi/evged.c | 22 +- + drivers/acpi/pci_link.c | 2 - + drivers/acpi/power.c | 2 - + drivers/acpi/processor_idle.c | 9 +- + drivers/acpi/sbs.c | 3 - + drivers/acpi/scan.c | 15 +- + drivers/acpi/sleep.c | 19 +- + drivers/acpi/utils.c | 25 ++ + drivers/base/power/main.c | 348 ++++++++------------------ + drivers/clk/clk-qoriq.c | 30 ++- + drivers/cpufreq/Kconfig | 3 +- + drivers/cpufreq/Kconfig.arm | 1 + + drivers/cpufreq/cpufreq-dt-platdev.c | 2 + + drivers/cpufreq/imx-cpufreq-dt.c | 84 ++++++- + drivers/cpufreq/intel_pstate.c | 3 +- + drivers/cpufreq/qcom-cpufreq-nvmem.c | 2 +- + drivers/cpufreq/qoriq-cpufreq.c | 76 +++--- + drivers/cpuidle/cpuidle-psci.c | 8 +- + drivers/cpuidle/sysfs.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 2 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 2 +- + drivers/gpu/drm/radeon/radeon_kms.c | 2 +- + drivers/i2c/busses/i2c-designware-platdrv.c | 4 +- + drivers/misc/mei/pci-me.c | 2 +- + drivers/misc/mei/pci-txe.c | 2 +- + drivers/net/ethernet/intel/e1000e/netdev.c | 2 +- + drivers/net/ethernet/intel/igb/igb_main.c | 2 +- + drivers/net/ethernet/intel/igc/igc_main.c | 2 +- + drivers/pci/hotplug/acpiphp_glue.c | 13 +- + drivers/pci/hotplug/pciehp_core.c | 2 +- + drivers/pci/pci-driver.c | 34 +-- + drivers/pci/pcie/portdrv_pci.c | 2 +- + drivers/powercap/intel_rapl_common.c | 1 + + include/acpi/acpi_bus.h | 1 + + include/acpi/acpixf.h | 2 +- + include/linux/cpufreq.h | 2 +- + include/linux/pm.h | 34 +-- + 58 files changed, 632 insertions(+), 574 deletions(-) +Merging cpufreq-arm/cpufreq/arm/linux-next (6cc3d0e9a097 cpufreq: tegra186: add CPUFREQ_NEED_INITIAL_FREQ_CHECK flag) +$ git merge cpufreq-arm/cpufreq/arm/linux-next +Merge made by the 'recursive' strategy. + drivers/cpufreq/tegra186-cpufreq.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging cpupower/cpupower (7b0bf99b9ee4 cpupower: Remove unneeded semicolon) +$ git merge cpupower/cpupower +Merge made by the 'recursive' strategy. + tools/power/cpupower/utils/cpupower-info.c | 2 +- + tools/power/cpupower/utils/cpupower-set.c | 2 +- + tools/power/cpupower/utils/idle_monitor/amd_fam14h_idle.c | 2 +- + tools/power/cpupower/utils/idle_monitor/cpuidle_sysfs.c | 6 +++--- + tools/power/cpupower/utils/idle_monitor/hsw_ext_idle.c | 2 +- + tools/power/cpupower/utils/idle_monitor/nhm_idle.c | 2 +- + tools/power/cpupower/utils/idle_monitor/snb_idle.c | 2 +- + 7 files changed, 9 insertions(+), 9 deletions(-) +Merging opp/opp/linux-next (ce72229606a5 opp: core: add regulators enable and disable) +$ git merge opp/opp/linux-next +Merge made by the 'recursive' strategy. + .../bindings/interconnect/interconnect.txt | 5 + + Documentation/devicetree/bindings/opp/opp.txt | 17 +- + .../devicetree/bindings/property-units.txt | 4 + + drivers/cpufreq/cpufreq-dt.c | 4 + + drivers/interconnect/Kconfig | 2 +- + drivers/interconnect/core.c | 97 +++++++++--- + drivers/opp/core.c | 95 +++++++++-- + drivers/opp/debugfs.c | 42 +++++ + drivers/opp/of.c | 175 ++++++++++++++++++--- + drivers/opp/opp.h | 10 ++ + include/linux/interconnect.h | 12 ++ + include/linux/pm_opp.h | 18 +++ + 12 files changed, 423 insertions(+), 58 deletions(-) +Merging thermal/thermal/linux-next (79799562bf08 thermal: int3400_thermal: Statically initialize .get_mode()/.set_mode() ops) +$ git merge thermal/thermal/linux-next +Merge made by the 'recursive' strategy. + .../bindings/thermal/ti,am654-thermal.yaml | 56 +++++ + drivers/thermal/Kconfig | 10 + + drivers/thermal/Makefile | 1 + + drivers/thermal/devfreq_cooling.c | 70 ++---- + drivers/thermal/imx_sc_thermal.c | 4 + + .../intel/int340x_thermal/int3400_thermal.c | 5 +- + drivers/thermal/k3_bandgap.c | 264 +++++++++++++++++++++ + drivers/thermal/rockchip_thermal.c | 4 +- + drivers/thermal/st/st_thermal_memmap.c | 4 +- + drivers/thermal/st/stm_thermal.c | 4 +- + drivers/thermal/thermal_core.c | 6 - + drivers/thermal/thermal_core.h | 52 ++++ + drivers/thermal/thermal_helpers.c | 13 +- + drivers/thermal/ti-soc-thermal/ti-bandgap.c | 5 +- + include/linux/thermal.h | 84 +------ + 15 files changed, 432 insertions(+), 150 deletions(-) + create mode 100644 Documentation/devicetree/bindings/thermal/ti,am654-thermal.yaml + create mode 100644 drivers/thermal/k3_bandgap.c +Merging thermal-rzhang/next (54ecb8f7028c Linux 5.4-rc1) +$ git merge thermal-rzhang/next +Already up to date. +Merging thermal-soc/next (6c375eccded4 thermal: db8500: Rewrite to be a pure OF sensor) +$ git merge thermal-soc/next +Already up to date. +Merging ieee1394/for-next (67f8e65e4fc1 firewire: net: remove set but not used variable 'guid') +$ git merge ieee1394/for-next +Auto-merging drivers/firewire/net.c +Merge made by the 'recursive' strategy. + drivers/firewire/net.c | 2 -- + 1 file changed, 2 deletions(-) +Merging dlm/next (fe204591cc94 dlm: remove BUG() before panic()) +$ git merge dlm/next +Auto-merging fs/dlm/dlm_internal.h +Merge made by the 'recursive' strategy. + fs/dlm/dlm_internal.h | 1 - + fs/dlm/lockspace.c | 18 ++++-------------- + fs/dlm/rcom.c | 2 +- + 3 files changed, 5 insertions(+), 16 deletions(-) +Merging swiotlb/linux-next (4cdfb27ba80d xen/swiotlb: remember having called xen_create_contiguous_region()) +$ git merge swiotlb/linux-next +Auto-merging include/linux/page-flags.h +Auto-merging drivers/xen/swiotlb-xen.c +Merge made by the 'recursive' strategy. +Merging rdma/for-next (f11e0ec55f0c MAINTAINERS: Add maintainers for RNBD/RTRS modules) +$ git merge rdma/for-next +Auto-merging net/core/dev.c +Removing include/linux/mlx5/cmd.h +Auto-merging fs/sysfs/file.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/steering/dr_send.c +CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlx5/core/steering/dr_send.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/health.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/eswitch.h +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_main.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en.h +Auto-merging drivers/infiniband/hw/mlx5/qp.c +Auto-merging drivers/infiniband/core/uverbs_main.c +Auto-merging drivers/infiniband/core/cm.c +Auto-merging MAINTAINERS +Resolved 'drivers/net/ethernet/mellanox/mlx5/core/steering/dr_send.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master c63e5a606c86] Merge remote-tracking branch 'rdma/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-block-rnbd | 46 + + Documentation/ABI/testing/sysfs-class-rnbd-client | 111 + + Documentation/ABI/testing/sysfs-class-rnbd-server | 50 + + Documentation/ABI/testing/sysfs-class-rtrs-client | 131 + + Documentation/ABI/testing/sysfs-class-rtrs-server | 53 + + MAINTAINERS | 14 + + drivers/block/Kconfig | 2 + + drivers/block/Makefile | 1 + + drivers/block/rnbd/Kconfig | 28 + + drivers/block/rnbd/Makefile | 15 + + drivers/block/rnbd/README | 92 + + drivers/block/rnbd/rnbd-clt-sysfs.c | 636 ++++ + drivers/block/rnbd/rnbd-clt.c | 1729 +++++++++ + drivers/block/rnbd/rnbd-clt.h | 156 + + drivers/block/rnbd/rnbd-common.c | 23 + + drivers/block/rnbd/rnbd-log.h | 41 + + drivers/block/rnbd/rnbd-proto.h | 303 ++ + drivers/block/rnbd/rnbd-srv-dev.c | 134 + + drivers/block/rnbd/rnbd-srv-dev.h | 92 + + drivers/block/rnbd/rnbd-srv-sysfs.c | 215 ++ + drivers/block/rnbd/rnbd-srv.c | 844 +++++ + drivers/block/rnbd/rnbd-srv.h | 78 + + drivers/infiniband/Kconfig | 1 + + drivers/infiniband/core/Makefile | 2 +- + drivers/infiniband/core/addr.c | 4 + + drivers/infiniband/core/cm.c | 263 +- + drivers/infiniband/core/cma.c | 55 +- + drivers/infiniband/core/device.c | 16 +- + drivers/infiniband/core/lag.c | 138 + + drivers/infiniband/core/mad.c | 255 +- + drivers/infiniband/core/multicast.c | 12 +- + drivers/infiniband/core/rw.c | 2 +- + drivers/infiniband/core/sa_query.c | 37 +- + drivers/infiniband/core/ucma.c | 16 +- + drivers/infiniband/core/user_mad.c | 22 +- + drivers/infiniband/core/uverbs_main.c | 26 +- + drivers/infiniband/core/verbs.c | 73 +- + drivers/infiniband/hw/bnxt_re/ib_verbs.c | 73 +- + drivers/infiniband/hw/bnxt_re/ib_verbs.h | 12 +- + drivers/infiniband/hw/bnxt_re/qplib_fp.c | 357 +- + drivers/infiniband/hw/bnxt_re/qplib_fp.h | 42 +- + drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 88 +- + drivers/infiniband/hw/bnxt_re/qplib_rcfw.h | 91 - + drivers/infiniband/hw/bnxt_re/qplib_res.c | 1 + + drivers/infiniband/hw/bnxt_re/qplib_res.h | 53 + + drivers/infiniband/hw/bnxt_re/roce_hsi.h | 106 + + drivers/infiniband/hw/efa/efa.h | 6 +- + drivers/infiniband/hw/efa/efa_com.c | 5 +- + drivers/infiniband/hw/efa/efa_com.h | 3 +- + drivers/infiniband/hw/efa/efa_verbs.c | 19 +- + drivers/infiniband/hw/hns/hns_roce_ah.c | 5 +- + drivers/infiniband/hw/hns/hns_roce_alloc.c | 146 +- + drivers/infiniband/hw/hns/hns_roce_cq.c | 351 +- + drivers/infiniband/hw/hns/hns_roce_device.h | 223 +- + drivers/infiniband/hw/hns/hns_roce_hem.c | 114 +- + drivers/infiniband/hw/hns/hns_roce_hem.h | 11 +- + drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 180 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 1310 +++---- + drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 9 +- + drivers/infiniband/hw/hns/hns_roce_main.c | 70 +- + drivers/infiniband/hw/hns/hns_roce_mr.c | 1638 +++------ + drivers/infiniband/hw/hns/hns_roce_qp.c | 495 +-- + drivers/infiniband/hw/hns/hns_roce_srq.c | 376 +- + drivers/infiniband/hw/mlx4/ah.c | 11 +- + drivers/infiniband/hw/mlx4/mlx4_ib.h | 2 +- + drivers/infiniband/hw/mlx5/Makefile | 29 +- + drivers/infiniband/hw/mlx5/ah.c | 35 +- + drivers/infiniband/hw/mlx5/cmd.c | 131 +- + drivers/infiniband/hw/mlx5/cmd.h | 6 +- + drivers/infiniband/hw/mlx5/cong.c | 4 +- + drivers/infiniband/hw/mlx5/cq.c | 11 +- + drivers/infiniband/hw/mlx5/devx.c | 12 +- + drivers/infiniband/hw/mlx5/flow.c | 151 +- + drivers/infiniband/hw/mlx5/gsi.c | 38 +- + drivers/infiniband/hw/mlx5/ib_rep.h | 2 +- + drivers/infiniband/hw/mlx5/ib_virt.c | 2 +- + drivers/infiniband/hw/mlx5/mad.c | 5 +- + drivers/infiniband/hw/mlx5/main.c | 175 +- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 60 +- + drivers/infiniband/hw/mlx5/odp.c | 13 +- + drivers/infiniband/hw/mlx5/qp.c | 3767 +++++++------------- + drivers/infiniband/hw/mlx5/qp.h | 46 + + .../mlx5/core/qp.c => infiniband/hw/mlx5/qpc.c} | 304 +- + drivers/infiniband/hw/mlx5/srq.c | 10 +- + drivers/infiniband/hw/mlx5/srq_cmd.c | 113 +- + drivers/infiniband/hw/mlx5/wr.c | 1504 ++++++++ + drivers/infiniband/hw/mlx5/wr.h | 76 + + drivers/infiniband/hw/mthca/mthca_provider.c | 9 +- + drivers/infiniband/hw/ocrdma/ocrdma_ah.c | 3 +- + drivers/infiniband/hw/ocrdma/ocrdma_ah.h | 2 +- + drivers/infiniband/hw/qedr/verbs.c | 4 +- + drivers/infiniband/hw/qedr/verbs.h | 2 +- + drivers/infiniband/hw/qib/qib_iba7322.c | 7 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.c | 5 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.h | 2 +- + drivers/infiniband/sw/rdmavt/ah.c | 11 +- + drivers/infiniband/sw/rdmavt/ah.h | 4 +- + drivers/infiniband/sw/rxe/rxe.c | 1 + + drivers/infiniband/sw/rxe/rxe_param.h | 3 + + drivers/infiniband/sw/rxe/rxe_verbs.c | 9 +- + drivers/infiniband/ulp/Makefile | 1 + + drivers/infiniband/ulp/ipoib/ipoib_main.c | 15 +- + drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c | 12 +- + drivers/infiniband/ulp/rtrs/Kconfig | 27 + + drivers/infiniband/ulp/rtrs/Makefile | 15 + + drivers/infiniband/ulp/rtrs/README | 213 ++ + drivers/infiniband/ulp/rtrs/rtrs-clt-stats.c | 200 ++ + drivers/infiniband/ulp/rtrs/rtrs-clt-sysfs.c | 483 +++ + drivers/infiniband/ulp/rtrs/rtrs-clt.c | 2994 ++++++++++++++++ + drivers/infiniband/ulp/rtrs/rtrs-clt.h | 251 ++ + drivers/infiniband/ulp/rtrs/rtrs-log.h | 28 + + drivers/infiniband/ulp/rtrs/rtrs-pri.h | 399 +++ + drivers/infiniband/ulp/rtrs/rtrs-srv-stats.c | 38 + + drivers/infiniband/ulp/rtrs/rtrs-srv-sysfs.c | 320 ++ + drivers/infiniband/ulp/rtrs/rtrs-srv.c | 2175 +++++++++++ + drivers/infiniband/ulp/rtrs/rtrs-srv.h | 148 + + drivers/infiniband/ulp/rtrs/rtrs.c | 612 ++++ + drivers/infiniband/ulp/rtrs/rtrs.h | 195 + + drivers/infiniband/ulp/srp/ib_srp.c | 21 +- + drivers/infiniband/ulp/srpt/ib_srpt.c | 32 +- + drivers/net/bonding/bond_alb.c | 39 +- + drivers/net/bonding/bond_main.c | 268 +- + drivers/net/ethernet/mellanox/mlx5/core/Makefile | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/cq.c | 23 +- + drivers/net/ethernet/mellanox/mlx5/core/debugfs.c | 74 +- + drivers/net/ethernet/mellanox/mlx5/core/ecpf.c | 30 +- + drivers/net/ethernet/mellanox/mlx5/core/en.h | 6 +- + .../net/ethernet/mellanox/mlx5/core/en/health.c | 2 +- + .../ethernet/mellanox/mlx5/core/en/monitor_stats.c | 46 +- + drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c | 2 +- + .../net/ethernet/mellanox/mlx5/core/en_common.c | 7 +- + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 2 +- + .../ethernet/mellanox/mlx5/core/en_fs_ethtool.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 68 +- + drivers/net/ethernet/mellanox/mlx5/core/en_stats.c | 50 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 14 +- + drivers/net/ethernet/mellanox/mlx5/core/eq.c | 6 +- + .../net/ethernet/mellanox/mlx5/core/esw/chains.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 38 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 6 +- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 22 +- + drivers/net/ethernet/mellanox/mlx5/core/fpga/cmd.c | 29 +- + .../net/ethernet/mellanox/mlx5/core/fpga/conn.c | 136 +- + .../net/ethernet/mellanox/mlx5/core/fpga/conn.h | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 82 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 122 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.h | 2 + + drivers/net/ethernet/mellanox/mlx5/core/fw.c | 34 +- + drivers/net/ethernet/mellanox/mlx5/core/health.c | 1 - + .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c | 150 +- + .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.h | 6 +- + .../ethernet/mellanox/mlx5/core/ipoib/ipoib_vlan.c | 19 +- + drivers/net/ethernet/mellanox/mlx5/core/lag.c | 118 +- + drivers/net/ethernet/mellanox/mlx5/core/lib/dm.c | 15 +- + drivers/net/ethernet/mellanox/mlx5/core/lib/gid.c | 5 +- + drivers/net/ethernet/mellanox/mlx5/core/lib/mpfs.c | 10 +- + .../net/ethernet/mellanox/mlx5/core/lib/port_tun.c | 1 - + .../net/ethernet/mellanox/mlx5/core/lib/vxlan.c | 10 +- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 144 +- + drivers/net/ethernet/mellanox/mlx5/core/mcg.c | 11 +- + drivers/net/ethernet/mellanox/mlx5/core/mr.c | 21 +- + .../net/ethernet/mellanox/mlx5/core/pagealloc.c | 14 +- + drivers/net/ethernet/mellanox/mlx5/core/pd.c | 12 +- + drivers/net/ethernet/mellanox/mlx5/core/port.c | 11 +- + drivers/net/ethernet/mellanox/mlx5/core/rl.c | 22 +- + .../ethernet/mellanox/mlx5/core/steering/dr_cmd.c | 33 +- + .../mellanox/mlx5/core/steering/dr_icm_pool.c | 53 +- + .../ethernet/mellanox/mlx5/core/steering/dr_send.c | 57 +- + .../mellanox/mlx5/core/steering/dr_types.h | 2 +- + .../ethernet/mellanox/mlx5/core/steering/fs_dr.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/transobj.c | 113 +- + drivers/net/ethernet/mellanox/mlx5/core/uar.c | 12 +- + drivers/net/ethernet/mellanox/mlx5/core/vport.c | 142 +- + fs/sysfs/file.c | 1 + + include/linux/mlx5/cmd.h | 51 - + include/linux/mlx5/cq.h | 2 +- + include/linux/mlx5/device.h | 44 +- + include/linux/mlx5/driver.h | 23 +- + include/linux/mlx5/fs.h | 1 + + include/linux/mlx5/mlx5_ifc.h | 196 +- + include/linux/mlx5/qp.h | 59 +- + include/linux/mlx5/transobj.h | 19 +- + include/linux/mlx5/vport.h | 3 +- + include/linux/netdevice.h | 12 + + include/net/bond_alb.h | 4 + + include/net/bonding.h | 3 +- + include/rdma/ib_mad.h | 49 +- + include/rdma/ib_verbs.h | 58 +- + include/rdma/lag.h | 23 + + include/rdma/rdma_cm.h | 8 - + include/uapi/rdma/mlx5_user_ioctl_cmds.h | 6 + + include/uapi/rdma/rdma_user_cm.h | 4 + + net/core/dev.c | 22 + + net/rds/ib.c | 21 +- + net/smc/smc_ib.c | 13 +- + 195 files changed, 20347 insertions(+), 8623 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-block-rnbd + create mode 100644 Documentation/ABI/testing/sysfs-class-rnbd-client + create mode 100644 Documentation/ABI/testing/sysfs-class-rnbd-server + create mode 100644 Documentation/ABI/testing/sysfs-class-rtrs-client + create mode 100644 Documentation/ABI/testing/sysfs-class-rtrs-server + create mode 100644 drivers/block/rnbd/Kconfig + create mode 100644 drivers/block/rnbd/Makefile + create mode 100644 drivers/block/rnbd/README + create mode 100644 drivers/block/rnbd/rnbd-clt-sysfs.c + create mode 100644 drivers/block/rnbd/rnbd-clt.c + create mode 100644 drivers/block/rnbd/rnbd-clt.h + create mode 100644 drivers/block/rnbd/rnbd-common.c + create mode 100644 drivers/block/rnbd/rnbd-log.h + create mode 100644 drivers/block/rnbd/rnbd-proto.h + create mode 100644 drivers/block/rnbd/rnbd-srv-dev.c + create mode 100644 drivers/block/rnbd/rnbd-srv-dev.h + create mode 100644 drivers/block/rnbd/rnbd-srv-sysfs.c + create mode 100644 drivers/block/rnbd/rnbd-srv.c + create mode 100644 drivers/block/rnbd/rnbd-srv.h + create mode 100644 drivers/infiniband/core/lag.c + create mode 100644 drivers/infiniband/hw/mlx5/qp.h + rename drivers/{net/ethernet/mellanox/mlx5/core/qp.c => infiniband/hw/mlx5/qpc.c} (55%) + create mode 100644 drivers/infiniband/hw/mlx5/wr.c + create mode 100644 drivers/infiniband/hw/mlx5/wr.h + create mode 100644 drivers/infiniband/ulp/rtrs/Kconfig + create mode 100644 drivers/infiniband/ulp/rtrs/Makefile + create mode 100644 drivers/infiniband/ulp/rtrs/README + create mode 100644 drivers/infiniband/ulp/rtrs/rtrs-clt-stats.c + create mode 100644 drivers/infiniband/ulp/rtrs/rtrs-clt-sysfs.c + create mode 100644 drivers/infiniband/ulp/rtrs/rtrs-clt.c + create mode 100644 drivers/infiniband/ulp/rtrs/rtrs-clt.h + create mode 100644 drivers/infiniband/ulp/rtrs/rtrs-log.h + create mode 100644 drivers/infiniband/ulp/rtrs/rtrs-pri.h + create mode 100644 drivers/infiniband/ulp/rtrs/rtrs-srv-stats.c + create mode 100644 drivers/infiniband/ulp/rtrs/rtrs-srv-sysfs.c + create mode 100644 drivers/infiniband/ulp/rtrs/rtrs-srv.c + create mode 100644 drivers/infiniband/ulp/rtrs/rtrs-srv.h + create mode 100644 drivers/infiniband/ulp/rtrs/rtrs.c + create mode 100644 drivers/infiniband/ulp/rtrs/rtrs.h + delete mode 100644 include/linux/mlx5/cmd.h + create mode 100644 include/rdma/lag.h +Merging net-next/master (5cdfe8306631 r8169: work around an irq coalescing related tx timeout) +$ git merge net-next/master +Auto-merging scripts/mod/modpost.c +Auto-merging net/smc/smc_ib.c +Auto-merging net/ipv4/nexthop.c +Auto-merging kernel/sysctl.c +Auto-merging include/uapi/linux/ethtool_netlink.h +Auto-merging include/net/cfg80211.h +Auto-merging drivers/net/wireless/intel/iwlwifi/pcie/drv.c +Auto-merging drivers/net/wireless/intel/iwlwifi/fw/api/nvm-reg.h +Auto-merging drivers/net/wireless/intel/ipw2x00/ipw2200.c +Auto-merging drivers/net/phy/phy_device.c +Auto-merging drivers/net/ipa/gsi.c +Auto-merging drivers/net/ethernet/toshiba/ps3_gelic_net.c +Auto-merging drivers/net/ethernet/smsc/Kconfig +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/fs_core.c +Auto-merging drivers/net/ethernet/intel/igc/igc_main.c +Auto-merging drivers/net/ethernet/intel/e1000e/netdev.c +Auto-merging drivers/net/dsa/mt7530.h +Auto-merging drivers/net/dsa/mt7530.c +Auto-merging drivers/crypto/chelsio/chcr_crypto.h +Auto-merging arch/arm64/boot/dts/ti/k3-j721e-main.dtsi +Auto-merging arch/arm64/boot/dts/ti/k3-am65-main.dtsi +Auto-merging arch/arm64/boot/dts/qcom/sdm845.dtsi +Auto-merging arch/arm/boot/dts/qcom-ipq4019.dtsi +Auto-merging MAINTAINERS +Removing Documentation/networking/vrf.txt +Removing Documentation/networking/tc-actions-env-rules.txt +Removing Documentation/networking/seg6-sysctl.txt +Removing Documentation/networking/packet_mmap.txt +Removing Documentation/networking/netif-msg.txt +Removing Documentation/networking/device_drivers/ti/cpsw.txt +Removing Documentation/networking/device_drivers/smsc/smc9.txt +Removing Documentation/networking/device_drivers/sb1000.txt +Removing Documentation/networking/device_drivers/neterion/s2io.txt +Removing Documentation/networking/cops.txt +Removing Documentation/networking/caif/spi_porting.txt +Auto-merging Documentation/hwmon/index.rst +Removing Documentation/devicetree/bindings/net/ti,dp83867.txt +Removing Documentation/devicetree/bindings/net/socionext,uniphier-ave4.txt +Removing Documentation/devicetree/bindings/net/qca,ar71xx.txt +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-net | 13 + + Documentation/admin-guide/kernel-parameters.txt | 12 +- + Documentation/admin-guide/serial-console.rst | 2 +- + Documentation/admin-guide/sysctl/net.rst | 8 +- + Documentation/bpf/index.rst | 4 +- + Documentation/dev-tools/kselftest.rst | 3 +- + .../bindings/net/amlogic,meson-dwmac.yaml | 23 +- + .../devicetree/bindings/net/ethernet-phy.yaml | 3 +- + Documentation/devicetree/bindings/net/fsl-fec.txt | 1 + + Documentation/devicetree/bindings/net/mdio.yaml | 50 +- + .../devicetree/bindings/net/nxp,tja11xx.yaml | 61 + + .../devicetree/bindings/net/qca,ar71xx.txt | 45 - + .../devicetree/bindings/net/qca,ar71xx.yaml | 216 + + .../devicetree/bindings/net/qcom,ipa.yaml | 10 +- + .../devicetree/bindings/net/qcom,ipq4019-mdio.yaml | 61 + + .../devicetree/bindings/net/qualcomm-bluetooth.txt | 6 + + .../devicetree/bindings/net/realtek-bluetooth.yaml | 54 + + .../bindings/net/socionext,uniphier-ave4.txt | 64 - + .../bindings/net/socionext,uniphier-ave4.yaml | 111 + + .../devicetree/bindings/net/ti,dp83867.txt | 68 - + .../devicetree/bindings/net/ti,dp83867.yaml | 127 + + .../devicetree/bindings/net/ti,dp83869.yaml | 2 +- + .../bindings/net/ti,k3-am654-cpsw-nuss.yaml | 20 + + .../devicetree/bindings/net/ti,k3-am654-cpts.yaml | 145 + + .../bindings/net/wireless/qcom,ath10k.txt | 14 + + Documentation/filesystems/afs.rst | 2 +- + Documentation/hwmon/bcm54140.rst | 45 + + Documentation/hwmon/index.rst | 1 + + Documentation/networking/{6pack.txt => 6pack.rst} | 46 +- + .../networking/{altera_tse.txt => altera_tse.rst} | 89 +- + .../{arcnet-hardware.txt => arcnet-hardware.rst} | 2227 +-- + .../networking/{arcnet.txt => arcnet.rst} | 348 +- + Documentation/networking/{atm.txt => atm.rst} | 6 + + Documentation/networking/{ax25.txt => ax25.rst} | 6 + + .../networking/{baycom.txt => baycom.rst} | 120 +- + .../networking/{bonding.txt => bonding.rst} | 1317 +- + Documentation/networking/caif/caif.rst | 2 - + Documentation/networking/caif/index.rst | 13 + + .../caif/{Linux-CAIF.txt => linux_caif.rst} | 54 +- + Documentation/networking/caif/spi_porting.rst | 229 + + Documentation/networking/caif/spi_porting.txt | 208 - + Documentation/networking/can.rst | 2 +- + .../networking/{cdc_mbim.txt => cdc_mbim.rst} | 76 +- + Documentation/networking/checksum-offloads.rst | 2 +- + Documentation/networking/cops.rst | 80 + + Documentation/networking/cops.txt | 63 - + .../networking/{cxacru.txt => cxacru.rst} | 86 +- + Documentation/networking/{dccp.txt => dccp.rst} | 39 +- + Documentation/networking/{dctcp.txt => dctcp.rst} | 14 +- + .../networking/{decnet.txt => decnet.rst} | 77 +- + Documentation/networking/{defza.txt => defza.rst} | 8 +- + .../device_drivers/3com/{3c509.txt => 3c509.rst} | 162 +- + .../device_drivers/3com/{vortex.txt => vortex.rst} | 227 +- + .../device_drivers/amazon/{ena.txt => ena.rst} | 144 +- + .../aquantia/{atlantic.txt => atlantic.rst} | 369 +- + .../device_drivers/chelsio/{cxgb.txt => cxgb.rst} | 183 +- + .../cirrus/{cs89x0.txt => cs89x0.rst} | 559 +- + .../davicom/{dm9000.txt => dm9000.rst} | 24 +- + .../device_drivers/dec/{de4x5.txt => de4x5.rst} | 105 +- + .../device_drivers/dec/{dmfe.txt => dmfe.rst} | 35 +- + .../device_drivers/dlink/{dl2k.txt => dl2k.rst} | 228 +- + .../freescale/{dpaa.txt => dpaa.rst} | 141 +- + .../freescale/{gianfar.txt => gianfar.rst} | 21 +- + Documentation/networking/device_drivers/index.rst | 24 + + .../networking/device_drivers/intel/e100.rst | 2 +- + .../intel/{ipw2100.txt => ipw2100.rst} | 240 +- + .../intel/{ipw2200.txt => ipw2200.rst} | 414 +- + .../networking/device_drivers/intel/ixgb.rst | 2 +- + .../microsoft/{netvsc.txt => netvsc.rst} | 57 +- + .../networking/device_drivers/neterion/s2io.rst | 196 + + .../networking/device_drivers/neterion/s2io.txt | 141 - + .../device_drivers/neterion/{vxge.txt => vxge.rst} | 60 +- + .../networking/device_drivers/pensando/ionic.rst | 231 +- + .../qualcomm/{rmnet.txt => rmnet.rst} | 43 +- + Documentation/networking/device_drivers/sb1000.rst | 222 + + Documentation/networking/device_drivers/sb1000.txt | 207 - + .../networking/device_drivers/smsc/smc9.rst | 48 + + .../networking/device_drivers/smsc/smc9.txt | 42 - + .../networking/device_drivers/ti/cpsw.rst | 587 + + .../networking/device_drivers/ti/cpsw.txt | 541 - + .../ti/{cpsw_switchdev.txt => cpsw_switchdev.rst} | 243 +- + .../device_drivers/ti/{tlan.txt => tlan.rst} | 73 +- + .../toshiba/{spider_net.txt => spider_net.rst} | 60 +- + .../networking/devlink-params-sja1105.txt | 27 + + .../networking/devlink/devlink-region.rst | 11 +- + .../{dns_resolver.txt => dns_resolver.rst} | 52 +- + .../networking/{driver.txt => driver.rst} | 22 +- + Documentation/networking/dsa/sja1105.rst | 327 +- + Documentation/networking/{eql.txt => eql.rst} | 443 +- + Documentation/networking/ethtool-netlink.rst | 92 +- + .../networking/{fib_trie.txt => fib_trie.rst} | 16 +- + .../networking/{filter.txt => filter.rst} | 868 +- + .../networking/{fore200e.txt => fore200e.rst} | 8 +- + .../networking/{framerelay.txt => framerelay.rst} | 21 +- + .../networking/{gen_stats.txt => gen_stats.rst} | 98 +- + .../{generic-hdlc.txt => generic-hdlc.rst} | 86 +- + .../{generic_netlink.txt => generic_netlink.rst} | 6 + + Documentation/networking/{gtp.txt => gtp.rst} | 97 +- + Documentation/networking/{hinic.txt => hinic.rst} | 5 +- + Documentation/networking/{ila.txt => ila.rst} | 89 +- + Documentation/networking/index.rst | 87 + + .../networking/{ip-sysctl.txt => ip-sysctl.rst} | 855 +- + .../networking/{ip_dynaddr.txt => ip_dynaddr.rst} | 29 +- + Documentation/networking/{ipddp.txt => ipddp.rst} | 13 +- + .../networking/{iphase.txt => iphase.rst} | 187 +- + Documentation/networking/{ipsec.txt => ipsec.rst} | 14 +- + Documentation/networking/{ipv6.txt => ipv6.rst} | 8 +- + .../networking/{ipvlan.txt => ipvlan.rst} | 159 +- + .../{ipvs-sysctl.txt => ipvs-sysctl.rst} | 188 +- + Documentation/networking/{kcm.txt => kcm.rst} | 85 +- + Documentation/networking/{l2tp.txt => l2tp.rst} | 159 +- + .../{lapb-module.txt => lapb-module.rst} | 122 +- + Documentation/networking/{ltpc.txt => ltpc.rst} | 47 +- + ...c80211-injection.txt => mac80211-injection.rst} | 41 +- + .../{mpls-sysctl.txt => mpls-sysctl.rst} | 17 +- + .../networking/{multiqueue.txt => multiqueue.rst} | 41 +- + .../networking/{netconsole.txt => netconsole.rst} | 125 +- + .../{netdev-features.txt => netdev-features.rst} | 19 +- + .../networking/{netdevices.txt => netdevices.rst} | 21 +- + .../{netfilter-sysctl.txt => netfilter-sysctl.rst} | 11 +- + Documentation/networking/netif-msg.rst | 95 + + Documentation/networking/netif-msg.txt | 79 - + ...onntrack-sysctl.txt => nf_conntrack-sysctl.rst} | 51 +- + .../{nf_flowtable.txt => nf_flowtable.rst} | 55 +- + .../{openvswitch.txt => openvswitch.rst} | 23 +- + .../networking/{operstates.txt => operstates.rst} | 45 +- + Documentation/networking/packet_mmap.rst | 1084 ++ + Documentation/networking/packet_mmap.txt | 1061 -- + .../networking/{phonet.txt => phonet.rst} | 56 +- + .../networking/{pktgen.txt => pktgen.rst} | 320 +- + Documentation/networking/{PLIP.txt => plip.rst} | 43 +- + .../{ppp_generic.txt => ppp_generic.rst} | 52 +- + .../{proc_net_tcp.txt => proc_net_tcp.rst} | 23 +- + .../{radiotap-headers.txt => radiotap-headers.rst} | 99 +- + .../networking/{ray_cs.txt => ray_cs.rst} | 105 +- + Documentation/networking/{rds.txt => rds.rst} | 305 +- + .../networking/{regulatory.txt => regulatory.rst} | 29 +- + Documentation/networking/{rxrpc.txt => rxrpc.rst} | 306 +- + Documentation/networking/{sctp.txt => sctp.rst} | 37 +- + Documentation/networking/{secid.txt => secid.rst} | 6 + + Documentation/networking/seg6-sysctl.rst | 26 + + Documentation/networking/seg6-sysctl.txt | 18 - + Documentation/networking/{skfp.txt => skfp.rst} | 153 +- + Documentation/networking/snmp_counter.rst | 2 +- + .../networking/{strparser.txt => strparser.rst} | 85 +- + .../networking/{switchdev.txt => switchdev.rst} | 116 +- + Documentation/networking/tc-actions-env-rules.rst | 29 + + Documentation/networking/tc-actions-env-rules.txt | 24 - + .../networking/{tcp-thin.txt => tcp-thin.rst} | 5 + + Documentation/networking/{team.txt => team.rst} | 6 + + .../{timestamping.txt => timestamping.rst} | 166 +- + .../networking/{tproxy.txt => tproxy.rst} | 57 +- + .../networking/{tuntap.txt => tuntap.rst} | 200 +- + .../networking/{udplite.txt => udplite.rst} | 175 +- + Documentation/networking/vrf.rst | 451 + + Documentation/networking/vrf.txt | 418 - + Documentation/networking/{vxlan.txt => vxlan.rst} | 33 +- + .../networking/{x25-iface.txt => x25-iface.rst} | 10 +- + Documentation/networking/{x25.txt => x25.rst} | 4 + + .../{xfrm_device.txt => xfrm_device.rst} | 33 +- + .../networking/{xfrm_proc.txt => xfrm_proc.rst} | 31 + + .../networking/{xfrm_sync.txt => xfrm_sync.rst} | 66 +- + .../{xfrm_sysctl.txt => xfrm_sysctl.rst} | 7 + + .../networking/{z8530drv.txt => z8530drv.rst} | 629 +- + Documentation/timers/timers-howto.rst | 3 + + MAINTAINERS | 56 +- + arch/arm/boot/dts/qcom-ipq4019.dtsi | 28 + + arch/arm/net/bpf_jit_32.c | 14 +- + arch/arm/net/bpf_jit_32.h | 3 + + arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 22 + + arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi | 21 + + arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 12 + + arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 11 + + arch/riscv/net/bpf_jit_comp32.c | 103 +- + arch/riscv/net/bpf_jit_comp64.c | 64 +- + arch/x86/net/bpf_jit_comp32.c | 4 +- + drivers/atm/Kconfig | 4 +- + drivers/bluetooth/btbcm.c | 139 +- + drivers/bluetooth/btbcm.h | 10 +- + drivers/bluetooth/btqca.c | 18 +- + drivers/bluetooth/btqca.h | 3 +- + drivers/bluetooth/btrtl.c | 10 +- + drivers/bluetooth/btusb.c | 205 +- + drivers/bluetooth/hci_bcm.c | 35 +- + drivers/bluetooth/hci_h5.c | 2 + + drivers/bluetooth/hci_qca.c | 57 +- + drivers/bluetooth/hci_serdev.c | 4 +- + drivers/crypto/chelsio/chcr_algo.c | 89 +- + drivers/crypto/chelsio/chcr_crypto.h | 1 + + drivers/crypto/chelsio/chcr_ipsec.c | 3 - + drivers/media/rc/bpf-lirc.c | 4 +- + drivers/net/Kconfig | 12 +- + drivers/net/appletalk/Kconfig | 8 +- + drivers/net/arcnet/Kconfig | 6 +- + drivers/net/bonding/bond_alb.c | 7 +- + drivers/net/bonding/bond_main.c | 46 +- + drivers/net/bonding/bonding_priv.h | 2 +- + drivers/net/caif/Kconfig | 2 +- + drivers/net/dsa/b53/b53_common.c | 81 +- + drivers/net/dsa/b53/b53_priv.h | 8 +- + drivers/net/dsa/b53/b53_srab.c | 2 +- + drivers/net/dsa/mt7530.c | 24 +- + drivers/net/dsa/mt7530.h | 6 + + drivers/net/dsa/mv88e6xxx/chip.c | 16 +- + drivers/net/dsa/mv88e6xxx/serdes.c | 55 +- + drivers/net/dsa/mv88e6xxx/serdes.h | 7 +- + drivers/net/dsa/ocelot/felix.c | 84 + + drivers/net/dsa/ocelot/felix.h | 6 + + drivers/net/dsa/ocelot/felix_vsc9959.c | 192 +- + drivers/net/dsa/sja1105/Kconfig | 9 + + drivers/net/dsa/sja1105/Makefile | 4 + + drivers/net/dsa/sja1105/sja1105.h | 91 +- + drivers/net/dsa/sja1105/sja1105_clocking.c | 58 +- + drivers/net/dsa/sja1105/sja1105_dynamic_config.c | 84 + + drivers/net/dsa/sja1105/sja1105_ethtool.c | 144 +- + drivers/net/dsa/sja1105/sja1105_flower.c | 215 +- + drivers/net/dsa/sja1105/sja1105_main.c | 1131 +- + drivers/net/dsa/sja1105/sja1105_ptp.h | 13 + + drivers/net/dsa/sja1105/sja1105_spi.c | 10 + + drivers/net/dsa/sja1105/sja1105_static_config.c | 264 +- + drivers/net/dsa/sja1105/sja1105_static_config.h | 81 + + drivers/net/dsa/sja1105/sja1105_tas.c | 127 +- + drivers/net/dsa/sja1105/sja1105_tas.h | 36 + + drivers/net/dsa/sja1105/sja1105_vl.c | 782 + + drivers/net/dsa/sja1105/sja1105_vl.h | 72 + + drivers/net/dsa/vitesse-vsc73xx-platform.c | 10 +- + drivers/net/ethernet/3com/3c509.c | 1 - + drivers/net/ethernet/3com/3c515.c | 1 - + drivers/net/ethernet/3com/3c59x.c | 4 +- + drivers/net/ethernet/3com/Kconfig | 2 +- + drivers/net/ethernet/adaptec/starfire.c | 1 - + drivers/net/ethernet/agere/et131x.c | 4 +- + drivers/net/ethernet/allwinner/sun4i-emac.c | 4 +- + drivers/net/ethernet/altera/altera_tse_main.c | 4 +- + drivers/net/ethernet/amazon/ena/ena_admin_defs.h | 8 + + drivers/net/ethernet/amazon/ena/ena_com.c | 39 +- + drivers/net/ethernet/amazon/ena/ena_com.h | 47 +- + drivers/net/ethernet/amazon/ena/ena_ethtool.c | 66 +- + drivers/net/ethernet/amazon/ena/ena_netdev.c | 14 +- + drivers/net/ethernet/amazon/ena/ena_netdev.h | 7 +- + drivers/net/ethernet/amd/7990.c | 2 +- + drivers/net/ethernet/amd/7990.h | 2 +- + drivers/net/ethernet/amd/atarilance.c | 2 +- + drivers/net/ethernet/aquantia/atlantic/Makefile | 4 + + drivers/net/ethernet/aquantia/atlantic/aq_cfg.h | 4 +- + drivers/net/ethernet/aquantia/atlantic/aq_common.h | 40 +- + .../net/ethernet/aquantia/atlantic/aq_ethtool.c | 5 +- + drivers/net/ethernet/aquantia/atlantic/aq_hw.h | 22 +- + drivers/net/ethernet/aquantia/atlantic/aq_macsec.c | 4 +- + drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 70 +- + .../net/ethernet/aquantia/atlantic/aq_pci_func.c | 39 +- + .../ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c | 20 +- + .../ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 97 +- + .../ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.h | 42 +- + .../ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c | 18 +- + .../ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.h | 10 +- + .../aquantia/atlantic/hw_atl/hw_atl_utils.c | 60 +- + .../aquantia/atlantic/hw_atl/hw_atl_utils.h | 26 +- + .../aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c | 35 +- + .../ethernet/aquantia/atlantic/hw_atl2/hw_atl2.c | 684 + + .../ethernet/aquantia/atlantic/hw_atl2/hw_atl2.h | 14 + + .../aquantia/atlantic/hw_atl2/hw_atl2_internal.h | 137 + + .../aquantia/atlantic/hw_atl2/hw_atl2_llh.c | 208 + + .../aquantia/atlantic/hw_atl2/hw_atl2_llh.h | 91 + + .../atlantic/hw_atl2/hw_atl2_llh_internal.h | 328 + + .../aquantia/atlantic/hw_atl2/hw_atl2_utils.c | 131 + + .../aquantia/atlantic/hw_atl2/hw_atl2_utils.h | 606 + + .../aquantia/atlantic/hw_atl2/hw_atl2_utils_fw.c | 320 + + .../ethernet/aquantia/atlantic/macsec/macsec_api.c | 6 +- + drivers/net/ethernet/atheros/ag71xx.c | 43 +- + drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 8 +- + drivers/net/ethernet/atheros/atlx/atl1.c | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c | 7 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 21 - + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 100 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 24 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 261 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.h | 8 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h | 216 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c | 2 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c | 10 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h | 8 + + drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c | 1 + + drivers/net/ethernet/broadcom/cnic.c | 1 - + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 790 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.h | 23 +- + drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c | 96 +- + drivers/net/ethernet/broadcom/tg3.c | 8 +- + drivers/net/ethernet/cavium/liquidio/lio_core.c | 1 - + .../net/ethernet/cavium/liquidio/octeon_device.h | 12 - + drivers/net/ethernet/cavium/thunder/nicvf_main.c | 1 + + drivers/net/ethernet/chelsio/Kconfig | 2 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 32 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 164 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 3 +- + .../net/ethernet/chelsio/cxgb4/cxgb4_tc_mqprio.c | 17 + + .../net/ethernet/chelsio/cxgb4/cxgb4_tc_mqprio.h | 1 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h | 5 + + drivers/net/ethernet/chelsio/cxgb4/sched.c | 3 +- + drivers/net/ethernet/chelsio/cxgb4/sge.c | 40 +- + drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 8 +- + .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 2 +- + drivers/net/ethernet/cirrus/Kconfig | 2 +- + drivers/net/ethernet/cortina/gemini.c | 3 +- + drivers/net/ethernet/dec/tulip/Kconfig | 4 +- + drivers/net/ethernet/dec/tulip/de4x5.c | 10 +- + drivers/net/ethernet/dlink/dl2k.c | 2 +- + drivers/net/ethernet/dnet.c | 3 +- + drivers/net/ethernet/faraday/ftmac100.c | 3 - + drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 2 +- + .../ethernet/freescale/dpaa2/dpaa2-eth-debugfs.c | 9 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 241 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h | 16 +- + .../net/ethernet/freescale/dpaa2/dpaa2-ethtool.c | 2 +- + drivers/net/ethernet/freescale/enetc/enetc.c | 34 +- + drivers/net/ethernet/freescale/enetc/enetc.h | 86 + + drivers/net/ethernet/freescale/enetc/enetc_hw.h | 159 + + drivers/net/ethernet/freescale/enetc/enetc_pf.c | 50 +- + drivers/net/ethernet/freescale/enetc/enetc_qos.c | 1103 ++ + drivers/net/ethernet/freescale/fec.h | 4 +- + drivers/net/ethernet/freescale/fec_main.c | 95 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c | 4 +- + drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h | 7 +- + drivers/net/ethernet/hisilicon/hns3/hnae3.h | 13 +- + drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c | 4 +- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 160 +- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 31 +- + drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 88 +- + .../net/ethernet/hisilicon/hns3/hns3pf/Makefile | 1 + + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 44 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c | 195 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_err.h | 1 - + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 1717 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 34 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c | 79 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_trace.h | 87 + + .../net/ethernet/hisilicon/hns3/hns3vf/Makefile | 1 + + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 368 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h | 26 + + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_mbx.c | 7 + + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_trace.h | 87 + + drivers/net/ethernet/huawei/hinic/Makefile | 2 +- + drivers/net/ethernet/huawei/hinic/hinic_dev.h | 5 + + drivers/net/ethernet/huawei/hinic/hinic_ethtool.c | 498 +- + drivers/net/ethernet/huawei/hinic/hinic_hw_cmdq.c | 47 +- + drivers/net/ethernet/huawei/hinic/hinic_hw_cmdq.h | 2 +- + drivers/net/ethernet/huawei/hinic/hinic_hw_csr.h | 2 +- + drivers/net/ethernet/huawei/hinic/hinic_hw_dev.c | 205 +- + drivers/net/ethernet/huawei/hinic/hinic_hw_dev.h | 90 +- + drivers/net/ethernet/huawei/hinic/hinic_hw_eqs.c | 98 +- + drivers/net/ethernet/huawei/hinic/hinic_hw_eqs.h | 7 +- + drivers/net/ethernet/huawei/hinic/hinic_hw_if.c | 78 +- + drivers/net/ethernet/huawei/hinic/hinic_hw_if.h | 26 +- + drivers/net/ethernet/huawei/hinic/hinic_hw_io.c | 53 +- + drivers/net/ethernet/huawei/hinic/hinic_hw_io.h | 26 +- + drivers/net/ethernet/huawei/hinic/hinic_hw_mbox.c | 1210 ++ + drivers/net/ethernet/huawei/hinic/hinic_hw_mbox.h | 154 + + drivers/net/ethernet/huawei/hinic/hinic_hw_mgmt.c | 17 +- + drivers/net/ethernet/huawei/hinic/hinic_hw_mgmt.h | 12 +- + drivers/net/ethernet/huawei/hinic/hinic_hw_qp.c | 8 +- + drivers/net/ethernet/huawei/hinic/hinic_hw_qp.h | 7 +- + drivers/net/ethernet/huawei/hinic/hinic_hw_wq.c | 9 +- + drivers/net/ethernet/huawei/hinic/hinic_hw_wq.h | 6 +- + drivers/net/ethernet/huawei/hinic/hinic_main.c | 140 +- + drivers/net/ethernet/huawei/hinic/hinic_port.c | 207 +- + drivers/net/ethernet/huawei/hinic/hinic_port.h | 159 +- + drivers/net/ethernet/huawei/hinic/hinic_rx.c | 15 +- + drivers/net/ethernet/huawei/hinic/hinic_sriov.c | 1294 ++ + drivers/net/ethernet/huawei/hinic/hinic_sriov.h | 109 + + drivers/net/ethernet/huawei/hinic/hinic_tx.c | 17 +- + drivers/net/ethernet/intel/e1000/e1000_main.c | 4 +- + drivers/net/ethernet/intel/e1000e/netdev.c | 54 + + drivers/net/ethernet/intel/e1000e/regs.h | 3 + + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 30 +- + drivers/net/ethernet/intel/i40e/i40e_xsk.c | 2 + + drivers/net/ethernet/intel/ice/ice_flex_pipe.c | 4 +- + drivers/net/ethernet/intel/ice/ice_txrx.c | 34 +- + drivers/net/ethernet/intel/ice/ice_xsk.c | 2 + + drivers/net/ethernet/intel/igc/Makefile | 2 +- + drivers/net/ethernet/intel/igc/igc.h | 400 +- + drivers/net/ethernet/intel/igc/igc_base.c | 3 + + drivers/net/ethernet/intel/igc/igc_defines.h | 24 +- + drivers/net/ethernet/intel/igc/igc_ethtool.c | 33 +- + drivers/net/ethernet/intel/igc/igc_hw.h | 3 + + drivers/net/ethernet/intel/igc/igc_main.c | 576 +- + drivers/net/ethernet/intel/igc/igc_regs.h | 12 + + drivers/net/ethernet/intel/igc/igc_tsn.c | 157 + + drivers/net/ethernet/intel/igc/igc_tsn.h | 9 + + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 33 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c | 2 + + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 34 +- + drivers/net/ethernet/lantiq_xrx200.c | 3 +- + drivers/net/ethernet/marvell/mv643xx_eth.c | 5 - + drivers/net/ethernet/marvell/mvneta.c | 36 +- + .../ethernet/marvell/octeontx2/nic/otx2_common.c | 52 +- + .../ethernet/marvell/octeontx2/nic/otx2_common.h | 17 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 8 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.c | 3 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.h | 4 - + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 4 +- + drivers/net/ethernet/mellanox/mlx4/crdump.c | 1 + + drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 6 +- + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 3 +- + drivers/net/ethernet/mellanox/mlx4/en_rx.c | 3 +- + drivers/net/ethernet/mellanox/mlx4/en_tx.c | 20 +- + drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 4 +- + .../net/ethernet/mellanox/mlx5/core/accel/accel.h | 1 - + .../net/ethernet/mellanox/mlx5/core/accel/ipsec.c | 19 +- + .../net/ethernet/mellanox/mlx5/core/accel/ipsec.h | 8 +- + .../ethernet/mellanox/mlx5/core/diag/fw_tracer.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en.h | 88 +- + drivers/net/ethernet/mellanox/mlx5/core/en/dcbnl.h | 54 + + drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c | 315 +- + drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h | 153 +- + drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c | 60 +- + drivers/net/ethernet/mellanox/mlx5/core/en/xdp.h | 35 +- + .../mellanox/mlx5/core/en_accel/en_accel.h | 50 +- + .../ethernet/mellanox/mlx5/core/en_accel/ipsec.c | 87 +- + .../ethernet/mellanox/mlx5/core/en_accel/ipsec.h | 25 - + .../mellanox/mlx5/core/en_accel/ipsec_rxtx.c | 15 +- + .../mellanox/mlx5/core/en_accel/ipsec_rxtx.h | 6 +- + .../mellanox/mlx5/core/en_accel/ipsec_stats.c | 88 +- + .../ethernet/mellanox/mlx5/core/en_accel/ktls.c | 13 + + .../ethernet/mellanox/mlx5/core/en_accel/ktls.h | 28 +- + .../ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c | 81 +- + .../net/ethernet/mellanox/mlx5/core/en_accel/tls.c | 14 + + .../net/ethernet/mellanox/mlx5/core/en_accel/tls.h | 7 + + .../mellanox/mlx5/core/en_accel/tls_rxtx.c | 68 +- + .../mellanox/mlx5/core/en_accel/tls_rxtx.h | 13 +- + .../net/ethernet/mellanox/mlx5/core/en_common.c | 13 +- + drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c | 28 +- + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 139 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 21 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 73 +- + .../net/ethernet/mellanox/mlx5/core/en_selftest.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/en_stats.c | 29 +- + drivers/net/ethernet/mellanox/mlx5/core/en_stats.h | 2 + + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 34 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 66 +- + drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c | 7 +- + .../net/ethernet/mellanox/mlx5/core/fpga/ipsec.c | 31 +- + .../net/ethernet/mellanox/mlx5/core/fpga/ipsec.h | 18 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 13 +- + .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c | 11 +- + .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.h | 18 +- + .../ethernet/mellanox/mlx5/core/ipoib/ipoib_vlan.c | 2 +- + .../net/ethernet/mellanox/mlx5/core/lib/clock.c | 21 + + drivers/net/ethernet/mellanox/mlx5/core/lib/eq.h | 1 - + drivers/net/ethernet/mellanox/mlx5/core/main.c | 38 +- + .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 3 - + .../net/ethernet/mellanox/mlx5/core/pagealloc.c | 85 +- + drivers/net/ethernet/mellanox/mlxfw/mlxfw_fsm.c | 4 +- + drivers/net/ethernet/mellanox/mlxsw/Makefile | 1 + + drivers/net/ethernet/mellanox/mlxsw/reg.h | 2 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 463 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 181 +- + .../ethernet/mellanox/mlxsw/spectrum2_mr_tcam.c | 14 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c | 220 +- + .../mellanox/mlxsw/spectrum_acl_flex_actions.c | 31 +- + .../ethernet/mellanox/mlxsw/spectrum_acl_tcam.c | 39 +- + .../ethernet/mellanox/mlxsw/spectrum_acl_tcam.h | 3 +- + .../net/ethernet/mellanox/mlxsw/spectrum_flow.c | 305 + + .../net/ethernet/mellanox/mlxsw/spectrum_flower.c | 76 +- + .../ethernet/mellanox/mlxsw/spectrum_matchall.c | 378 + + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 8 +- + .../net/ethernet/mellanox/mlxsw/spectrum_span.c | 621 +- + .../net/ethernet/mellanox/mlxsw/spectrum_span.h | 54 +- + .../net/ethernet/mellanox/mlxsw/spectrum_trap.c | 763 +- + .../net/ethernet/mellanox/mlxsw/spectrum_trap.h | 16 +- + drivers/net/ethernet/microchip/encx24j600-regmap.c | 5 - + drivers/net/ethernet/microchip/encx24j600.c | 12 +- + drivers/net/ethernet/moxa/moxart_ether.c | 5 +- + drivers/net/ethernet/mscc/Makefile | 2 +- + drivers/net/ethernet/mscc/ocelot.c | 212 +- + drivers/net/ethernet/mscc/ocelot.h | 3 +- + drivers/net/ethernet/mscc/ocelot_ace.c | 113 +- + drivers/net/ethernet/mscc/ocelot_ace.h | 5 +- + drivers/net/ethernet/mscc/ocelot_board.c | 27 + + drivers/net/ethernet/mscc/ocelot_flower.c | 29 +- + drivers/net/ethernet/mscc/ocelot_ptp.c | 324 + + drivers/net/ethernet/mscc/ocelot_regs.c | 2 + + drivers/net/ethernet/mscc/ocelot_tc.c | 6 +- + drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 12 - + drivers/net/ethernet/neterion/Kconfig | 4 +- + drivers/net/ethernet/netronome/nfp/nfp_main.c | 3 - + .../net/ethernet/netronome/nfp/nfp_net_common.c | 6 + + .../net/ethernet/netronome/nfp/nfp_net_ethtool.c | 5 +- + drivers/net/ethernet/netronome/nfp/nfp_net_repr.c | 16 + + drivers/net/ethernet/ni/nixge.c | 3 +- + drivers/net/ethernet/nxp/lpc_eth.c | 6 +- + drivers/net/ethernet/pensando/ionic/ionic_dev.c | 14 + + drivers/net/ethernet/pensando/ionic/ionic_dev.h | 17 +- + .../net/ethernet/pensando/ionic/ionic_ethtool.c | 20 +- + drivers/net/ethernet/pensando/ionic/ionic_if.h | 1089 +- + drivers/net/ethernet/pensando/ionic/ionic_lif.c | 158 +- + drivers/net/ethernet/pensando/ionic/ionic_lif.h | 28 +- + drivers/net/ethernet/pensando/ionic/ionic_main.c | 7 +- + drivers/net/ethernet/pensando/ionic/ionic_stats.c | 136 +- + drivers/net/ethernet/pensando/ionic/ionic_stats.h | 6 + + drivers/net/ethernet/pensando/ionic/ionic_txrx.c | 49 +- + drivers/net/ethernet/qlogic/qed/qed.h | 16 +- + drivers/net/ethernet/qlogic/qed/qed_debug.c | 26 +- + drivers/net/ethernet/qlogic/qed/qed_dev.c | 8 +- + drivers/net/ethernet/qlogic/qed/qed_hsi.h | 49 +- + drivers/net/ethernet/qlogic/qed/qed_hw.c | 42 +- + drivers/net/ethernet/qlogic/qed/qed_hw.h | 15 + + drivers/net/ethernet/qlogic/qed/qed_int.c | 40 +- + drivers/net/ethernet/qlogic/qed/qed_int.h | 11 + + drivers/net/ethernet/qlogic/qed/qed_ll2.c | 2 +- + drivers/net/ethernet/qlogic/qed/qed_main.c | 43 + + drivers/net/ethernet/qlogic/qed/qed_mcp.c | 253 + + drivers/net/ethernet/qlogic/qed/qed_mcp.h | 28 + + drivers/net/ethernet/qlogic/qed/qed_roce.c | 17 +- + drivers/net/ethernet/qlogic/qed/qed_spq.c | 16 +- + drivers/net/ethernet/qlogic/qed/qed_sriov.h | 10 +- + drivers/net/ethernet/qlogic/qede/qede.h | 17 +- + drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 24 + + drivers/net/ethernet/qlogic/qede/qede_fp.c | 1 + + drivers/net/ethernet/qlogic/qede/qede_main.c | 232 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 6 - + .../ethernet/qlogic/qlcnic/qlcnic_sriov_common.c | 4 +- + drivers/net/ethernet/qualcomm/emac/emac-mac.c | 5 +- + drivers/net/ethernet/qualcomm/emac/emac-mac.h | 5 +- + drivers/net/ethernet/qualcomm/emac/emac.c | 3 +- + drivers/net/ethernet/realtek/r8169_main.c | 732 +- + drivers/net/ethernet/renesas/sh_eth.c | 3 +- + drivers/net/ethernet/seeq/ether3.c | 5 +- + drivers/net/ethernet/sfc/ef10.c | 214 +- + drivers/net/ethernet/sfc/ef10_sriov.c | 27 +- + drivers/net/ethernet/sfc/mcdi.c | 25 +- + drivers/net/ethernet/sfc/mcdi.h | 12 + + drivers/net/ethernet/sfc/mcdi_filters.c | 82 +- + drivers/net/ethernet/sfc/mcdi_filters.h | 17 +- + drivers/net/ethernet/sfc/mcdi_functions.c | 8 +- + drivers/net/ethernet/sfc/mcdi_port.c | 7 +- + drivers/net/ethernet/sfc/net_driver.h | 10 + + drivers/net/ethernet/sfc/nic.h | 11 - + drivers/net/ethernet/sfc/ptp.c | 7 +- + drivers/net/ethernet/sfc/rx.c | 1 + + drivers/net/ethernet/sfc/siena.c | 8 + + drivers/net/ethernet/smsc/Kconfig | 4 +- + drivers/net/ethernet/socionext/netsec.c | 30 +- + drivers/net/ethernet/socionext/sni_ave.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/Makefile | 4 +- + drivers/net/ethernet/stmicro/stmmac/common.h | 1 + + drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 160 +- + .../net/ethernet/stmicro/stmmac/dwmac-meson8b.c | 146 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c | 74 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 1 + + drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 67 + + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 9 - + drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 5 - + drivers/net/ethernet/sun/cassini.c | 14 +- + drivers/net/ethernet/tehuti/tehuti.c | 12 - + drivers/net/ethernet/ti/Kconfig | 25 +- + drivers/net/ethernet/ti/Makefile | 3 +- + drivers/net/ethernet/ti/am65-cpsw-ethtool.c | 36 +- + drivers/net/ethernet/ti/am65-cpsw-nuss.c | 205 +- + drivers/net/ethernet/ti/am65-cpsw-nuss.h | 13 +- + drivers/net/ethernet/ti/am65-cpsw-qos.c | 626 + + drivers/net/ethernet/ti/am65-cpsw-qos.h | 29 + + drivers/net/ethernet/ti/am65-cpts.c | 1086 ++ + drivers/net/ethernet/ti/am65-cpts.h | 74 + + drivers/net/ethernet/ti/cpmac.c | 2 +- + drivers/net/ethernet/ti/cpsw.c | 22 + + drivers/net/ethernet/ti/cpsw_new.c | 25 +- + drivers/net/ethernet/ti/cpsw_priv.c | 17 +- + drivers/net/ethernet/ti/cpsw_priv.h | 2 + + drivers/net/ethernet/ti/cpts.c | 422 +- + drivers/net/ethernet/ti/cpts.h | 27 +- + drivers/net/ethernet/ti/davinci_mdio.c | 2 + + drivers/net/ethernet/ti/k3-cppi-desc-pool.c | 4 +- + drivers/net/ethernet/ti/netcp_ethss.c | 3 +- + drivers/net/ethernet/ti/tlan.c | 2 +- + drivers/net/ethernet/toshiba/ps3_gelic_net.c | 2 +- + drivers/net/ethernet/toshiba/spider_net.c | 2 +- + drivers/net/ethernet/via/Kconfig | 1 + + drivers/net/ethernet/xilinx/ll_temac_main.c | 8 +- + drivers/net/fddi/Kconfig | 2 +- + drivers/net/hamradio/Kconfig | 14 +- + drivers/net/hamradio/bpqether.c | 20 + + drivers/net/hamradio/scc.c | 2 +- + drivers/net/hyperv/netvsc_bpf.c | 1 + + drivers/net/hyperv/netvsc_drv.c | 4 +- + drivers/net/ipa/gsi.c | 125 +- + drivers/net/ipa/gsi.h | 15 +- + drivers/net/ipa/ipa.h | 10 + + drivers/net/ipa/ipa_cmd.c | 59 - + drivers/net/ipa/ipa_cmd.h | 11 - + drivers/net/ipa/ipa_data-sc7180.c | 14 +- + drivers/net/ipa/ipa_data-sdm845.c | 15 +- + drivers/net/ipa/ipa_data.h | 29 +- + drivers/net/ipa/ipa_endpoint.c | 174 +- + drivers/net/ipa/ipa_endpoint.h | 2 - + drivers/net/ipa/ipa_main.c | 8 +- + drivers/net/ipa/ipa_mem.c | 210 +- + drivers/net/ipa/ipa_mem.h | 3 +- + drivers/net/ipvlan/ipvlan_main.c | 2 + + drivers/net/macsec.c | 2 + + drivers/net/macvlan.c | 10 +- + drivers/net/phy/Kconfig | 18 + + drivers/net/phy/Makefile | 2 + + drivers/net/phy/at803x.c | 280 + + drivers/net/phy/bcm-phy-lib.c | 339 +- + drivers/net/phy/bcm-phy-lib.h | 19 + + drivers/net/phy/bcm54140.c | 860 + + drivers/net/phy/broadcom.c | 64 +- + drivers/net/phy/cortina.c | 1 - + drivers/net/phy/dp83867.c | 4 +- + drivers/net/phy/marvell.c | 201 + + drivers/net/phy/marvell10g.c | 2 - + drivers/net/phy/mdio-bcm-iproc.c | 4 +- + drivers/net/phy/mdio-ipq4019.c | 160 + + drivers/net/phy/mdio-moxart.c | 1 - + drivers/net/phy/mdio_bus.c | 25 +- + drivers/net/phy/micrel.c | 128 +- + drivers/net/phy/mscc/mscc.h | 1 - + drivers/net/phy/mscc/mscc_main.c | 102 +- + drivers/net/phy/nxp-tja11xx.c | 386 +- + drivers/net/phy/phy-c45.c | 1 - + drivers/net/phy/phy.c | 120 +- + drivers/net/phy/phy_device.c | 260 +- + drivers/net/phy/phylink.c | 49 +- + drivers/net/phy/realtek.c | 15 +- + drivers/net/phy/teranetics.c | 1 - + drivers/net/plip/Kconfig | 2 +- + drivers/net/ppp/ppp_generic.c | 2 + + drivers/net/rionet.c | 3 +- + drivers/net/team/team.c | 1 + + drivers/net/tun.c | 2 + + drivers/net/usb/ax88179_178a.c | 79 +- + drivers/net/usb/huawei_cdc_ncm.c | 2 +- + drivers/net/usb/qmi_wwan.c | 2 +- + drivers/net/usb/r8152.c | 22 +- + drivers/net/usb/sierra_net.c | 5 - + drivers/net/veth.c | 28 +- + drivers/net/virtio_net.c | 15 +- + drivers/net/vrf.c | 1 + + drivers/net/wan/Kconfig | 4 +- + drivers/net/wireless/Kconfig | 2 +- + drivers/net/wireless/ath/ath10k/bmi.c | 1 + + drivers/net/wireless/ath/ath10k/ce.h | 2 +- + drivers/net/wireless/ath/ath10k/core.c | 31 +- + drivers/net/wireless/ath/ath10k/core.h | 36 +- + drivers/net/wireless/ath/ath10k/debug.c | 4 +- + drivers/net/wireless/ath/ath10k/debug.h | 8 + + drivers/net/wireless/ath/ath10k/hif.h | 20 +- + drivers/net/wireless/ath/ath10k/htc.c | 399 +- + drivers/net/wireless/ath/ath10k/htc.h | 40 +- + drivers/net/wireless/ath/ath10k/htt.c | 13 + + drivers/net/wireless/ath/ath10k/htt.h | 24 +- + drivers/net/wireless/ath/ath10k/htt_rx.c | 42 +- + drivers/net/wireless/ath/ath10k/htt_tx.c | 51 +- + drivers/net/wireless/ath/ath10k/hw.h | 5 +- + drivers/net/wireless/ath/ath10k/mac.c | 326 +- + drivers/net/wireless/ath/ath10k/pci.c | 71 +- + drivers/net/wireless/ath/ath10k/pci.h | 4 + + drivers/net/wireless/ath/ath10k/qmi.c | 61 +- + drivers/net/wireless/ath/ath10k/qmi.h | 3 - + drivers/net/wireless/ath/ath10k/sdio.c | 191 +- + drivers/net/wireless/ath/ath10k/sdio.h | 19 +- + drivers/net/wireless/ath/ath10k/snoc.c | 186 +- + drivers/net/wireless/ath/ath10k/snoc.h | 7 + + drivers/net/wireless/ath/ath10k/txrx.c | 2 + + drivers/net/wireless/ath/ath10k/usb.c | 12 - + drivers/net/wireless/ath/ath10k/wmi-ops.h | 30 + + drivers/net/wireless/ath/ath10k/wmi-tlv.c | 127 +- + drivers/net/wireless/ath/ath10k/wmi-tlv.h | 110 + + drivers/net/wireless/ath/ath10k/wmi.c | 52 +- + drivers/net/wireless/ath/ath10k/wmi.h | 19 +- + drivers/net/wireless/ath/ath11k/ahb.c | 2 +- + drivers/net/wireless/ath/ath11k/core.h | 15 + + drivers/net/wireless/ath/ath11k/debug.c | 9 +- + drivers/net/wireless/ath/ath11k/debug.h | 22 +- + drivers/net/wireless/ath/ath11k/debug_htt_stats.h | 8 +- + drivers/net/wireless/ath/ath11k/debugfs_sta.c | 297 + + drivers/net/wireless/ath/ath11k/dp.c | 6 +- + drivers/net/wireless/ath/ath11k/dp.h | 13 +- + drivers/net/wireless/ath/ath11k/dp_rx.c | 49 +- + drivers/net/wireless/ath/ath11k/dp_tx.c | 69 +- + drivers/net/wireless/ath/ath11k/hal.h | 2 +- + drivers/net/wireless/ath/ath11k/hal_desc.h | 4 +- + drivers/net/wireless/ath/ath11k/hal_rx.h | 2 +- + drivers/net/wireless/ath/ath11k/hw.h | 2 +- + drivers/net/wireless/ath/ath11k/mac.c | 95 +- + drivers/net/wireless/ath/ath11k/peer.c | 35 +- + drivers/net/wireless/ath/ath11k/peer.h | 1 + + drivers/net/wireless/ath/ath11k/trace.h | 12 +- + drivers/net/wireless/ath/ath11k/wmi.c | 170 +- + drivers/net/wireless/ath/ath11k/wmi.h | 88 +- + drivers/net/wireless/ath/ath5k/ani.c | 2 +- + drivers/net/wireless/ath/ath6kl/core.h | 4 +- + drivers/net/wireless/ath/ath6kl/debug.c | 2 +- + drivers/net/wireless/ath/ath6kl/hif.h | 2 +- + drivers/net/wireless/ath/ath9k/ar9002_calib.c | 49 +- + drivers/net/wireless/ath/ath9k/calib.c | 16 +- + drivers/net/wireless/ath/ath9k/hif_usb.c | 58 +- + drivers/net/wireless/ath/ath9k/hif_usb.h | 6 + + drivers/net/wireless/ath/ath9k/htc_drv_init.c | 10 +- + drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 6 +- + drivers/net/wireless/ath/ath9k/htc_hst.c | 6 +- + drivers/net/wireless/ath/ath9k/hw.h | 2 + + drivers/net/wireless/ath/ath9k/wmi.c | 6 +- + drivers/net/wireless/ath/ath9k/wmi.h | 3 +- + drivers/net/wireless/ath/carl9170/fw.c | 4 +- + drivers/net/wireless/ath/carl9170/main.c | 21 +- + drivers/net/wireless/broadcom/b43/phy_n.c | 2 +- + drivers/net/wireless/broadcom/b43/pio.c | 2 +- + drivers/net/wireless/broadcom/b43/xmit.c | 13 - + drivers/net/wireless/broadcom/b43legacy/xmit.c | 1 + + .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 2 +- + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 17 +- + .../broadcom/brcm80211/brcmfmac/cfg80211.h | 4 + + .../broadcom/brcm80211/brcmfmac/commonring.c | 8 +- + .../wireless/broadcom/brcm80211/brcmfmac/core.c | 3 - + .../wireless/broadcom/brcm80211/brcmfmac/debug.c | 9 +- + .../wireless/broadcom/brcm80211/brcmfmac/debug.h | 12 +- + .../wireless/broadcom/brcm80211/brcmfmac/feature.c | 3 +- + .../broadcom/brcm80211/brcmfmac/fwsignal.c | 2 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 115 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/p2p.h | 9 +- + .../broadcom/brcm80211/brcmsmac/mac80211_if.c | 2 + + .../wireless/broadcom/brcm80211/brcmsmac/main.c | 7 +- + .../net/wireless/broadcom/brcm80211/brcmsmac/stf.c | 7 +- + .../net/wireless/broadcom/brcm80211/brcmsmac/stf.h | 2 +- + drivers/net/wireless/intel/ipw2x00/Kconfig | 4 +- + drivers/net/wireless/intel/ipw2x00/ipw2100.c | 2 +- + drivers/net/wireless/intel/ipw2x00/ipw2200.c | 27 +- + drivers/net/wireless/intel/iwlwifi/Makefile | 3 +- + drivers/net/wireless/intel/iwlwifi/cfg/22000.c | 71 +- + drivers/net/wireless/intel/iwlwifi/fw/acpi.c | 76 + + drivers/net/wireless/intel/iwlwifi/fw/acpi.h | 17 + + drivers/net/wireless/intel/iwlwifi/fw/api/config.h | 39 +- + drivers/net/wireless/intel/iwlwifi/fw/api/d3.h | 39 +- + .../net/wireless/intel/iwlwifi/fw/api/nvm-reg.h | 15 + + drivers/net/wireless/intel/iwlwifi/fw/api/scan.h | 26 - + drivers/net/wireless/intel/iwlwifi/fw/api/soc.h | 12 +- + drivers/net/wireless/intel/iwlwifi/fw/api/sta.h | 26 - + drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 139 +- + drivers/net/wireless/intel/iwlwifi/fw/dbg.h | 11 - + drivers/net/wireless/intel/iwlwifi/fw/file.h | 1 + + drivers/net/wireless/intel/iwlwifi/fw/img.c | 99 + + drivers/net/wireless/intel/iwlwifi/fw/img.h | 19 +- + drivers/net/wireless/intel/iwlwifi/fw/runtime.h | 14 +- + drivers/net/wireless/intel/iwlwifi/iwl-config.h | 23 +- + drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c | 26 +- + drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 4 - + drivers/net/wireless/intel/iwlwifi/iwl-modparams.h | 2 - + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 3 +- + drivers/net/wireless/intel/iwlwifi/mvm/constants.h | 4 + + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 29 +- + .../net/wireless/intel/iwlwifi/mvm/ftm-initiator.c | 4 +- + .../net/wireless/intel/iwlwifi/mvm/ftm-responder.c | 4 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 113 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 1 - + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 4 +- + drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 25 +- + drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 3 +- + drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 44 +- + .../wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c | 47 +- + .../net/wireless/intel/iwlwifi/pcie/ctxt-info.c | 15 + + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 34 +- + drivers/net/wireless/intel/iwlwifi/pcie/internal.h | 16 - + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 137 +- + drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c | 8 +- + drivers/net/wireless/intersil/hostap/hostap_hw.c | 22 + + drivers/net/wireless/intersil/hostap/hostap_proc.c | 2 + + .../net/wireless/intersil/orinoco/spectrum_cs.c | 3 +- + drivers/net/wireless/intersil/p54/p54usb.c | 1 + + drivers/net/wireless/marvell/libertas/cmd.h | 2 +- + drivers/net/wireless/marvell/libertas/cmdresp.c | 5 +- + drivers/net/wireless/marvell/libertas/mesh.c | 6 +- + drivers/net/wireless/marvell/libertas/mesh.h | 2 +- + drivers/net/wireless/marvell/libertas_tf/if_usb.c | 6 +- + drivers/net/wireless/marvell/mwifiex/sta_cmd.c | 39 +- + .../wireless/quantenna/qtnfmac/pcie/pearl_pcie.c | 2 +- + .../wireless/quantenna/qtnfmac/pcie/topaz_pcie.c | 2 +- + drivers/net/wireless/ray_cs.c | 3 +- + drivers/net/wireless/realtek/rtlwifi/base.c | 2 +- + drivers/net/wireless/realtek/rtlwifi/core.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/rf.c | 4 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/sw.c | 4 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/sw.c | 4 +- + .../wireless/realtek/rtlwifi/rtl8723ae/hal_btc.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8723ae/hw.c | 10 +- + .../net/wireless/realtek/rtlwifi/rtl8723ae/sw.c | 4 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/sw.c | 4 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/sw.c | 4 +- + drivers/net/wireless/realtek/rtw88/bf.c | 7 +- + drivers/net/wireless/realtek/rtw88/bf.h | 22 + + drivers/net/wireless/realtek/rtw88/efuse.c | 26 + + drivers/net/wireless/realtek/rtw88/efuse.h | 3 + + drivers/net/wireless/realtek/rtw88/fw.c | 54 +- + drivers/net/wireless/realtek/rtw88/fw.h | 32 +- + drivers/net/wireless/realtek/rtw88/mac.c | 407 +- + drivers/net/wireless/realtek/rtw88/mac.h | 1 + + drivers/net/wireless/realtek/rtw88/mac80211.c | 40 +- + drivers/net/wireless/realtek/rtw88/main.c | 65 +- + drivers/net/wireless/realtek/rtw88/main.h | 60 +- + drivers/net/wireless/realtek/rtw88/pci.c | 39 +- + drivers/net/wireless/realtek/rtw88/phy.c | 60 +- + drivers/net/wireless/realtek/rtw88/phy.h | 6 + + drivers/net/wireless/realtek/rtw88/reg.h | 97 + + drivers/net/wireless/realtek/rtw88/rtw8723d.c | 1137 ++ + drivers/net/wireless/realtek/rtw88/rtw8723d.h | 144 + + .../net/wireless/realtek/rtw88/rtw8723d_table.c | 1196 ++ + .../net/wireless/realtek/rtw88/rtw8723d_table.h | 15 + + drivers/net/wireless/realtek/rtw88/rtw8822b.c | 23 +- + drivers/net/wireless/realtek/rtw88/rtw8822c.c | 152 + + drivers/net/wireless/realtek/rtw88/rtw8822c.h | 28 + + .../net/wireless/realtek/rtw88/rtw8822c_table.c | 16870 +++++++++++++++++-- + .../net/wireless/realtek/rtw88/rtw8822c_table.h | 1 + + drivers/net/wireless/realtek/rtw88/tx.c | 11 +- + drivers/net/wireless/realtek/rtw88/tx.h | 2 +- + drivers/net/wireless/rsi/rsi_91x_mac80211.c | 2 +- + drivers/net/wireless/st/cw1200/cw1200_spi.c | 6 +- + drivers/net/wireless/ti/wlcore/cmd.h | 1 + + drivers/net/wireless/ti/wlcore/main.c | 4 + + drivers/of/of_mdio.c | 73 +- + drivers/power/supply/test_power.c | 2 +- + drivers/ptp/ptp_chardev.c | 1 + + drivers/ptp/ptp_clock.c | 3 + + drivers/ptp/ptp_clockmatrix.c | 94 +- + drivers/ptp/ptp_clockmatrix.h | 8 +- + drivers/ptp/ptp_idt82p33.c | 6 +- + drivers/ptp/ptp_ines.c | 8 +- + drivers/ptp/ptp_kvm.c | 2 +- + drivers/s390/net/Kconfig | 9 +- + drivers/s390/net/qeth_core.h | 49 +- + drivers/s390/net/qeth_core_main.c | 465 +- + drivers/s390/net/qeth_core_mpc.h | 25 + + drivers/s390/net/qeth_core_sys.c | 15 +- + drivers/s390/net/qeth_l2_main.c | 2 + + drivers/s390/net/qeth_l3_main.c | 19 +- + drivers/soc/fsl/dpio/qbman-portal.c | 1 + + drivers/ssb/scan.c | 6 +- + drivers/ssb/sprom.c | 12 +- + drivers/staging/fsl-dpaa2/ethsw/README | 2 +- + drivers/vhost/net.c | 1 + + fs/proc/proc_net.c | 19 + + include/linux/bpf-cgroup.h | 14 - + include/linux/bpf.h | 101 +- + include/linux/bpf_types.h | 7 + + include/linux/bpf_verifier.h | 3 + + include/linux/brcmphy.h | 58 + + include/linux/capability.h | 9 + + include/linux/delay.h | 11 + + include/linux/dsa/8021q.h | 57 + + include/linux/dsa/sja1105.h | 3 + + include/linux/etherdevice.h | 12 + + include/linux/ethtool_netlink.h | 33 + + include/linux/filter.h | 8 +- + include/linux/fsl/ptp_qoriq.h | 2 +- + include/linux/if_bridge.h | 2 + + include/linux/if_team.h | 7 +- + include/linux/inet_diag.h | 6 +- + include/linux/iopoll.h | 62 +- + include/linux/mlx4/qp.h | 2 +- + include/linux/mlx5/accel.h | 12 + + include/linux/netdev_features.h | 2 +- + include/linux/netdevice.h | 70 +- + include/linux/netpoll.h | 10 +- + include/linux/of_mdio.h | 11 +- + include/linux/phy.h | 157 +- + include/linux/phylink.h | 6 +- + include/linux/proc_fs.h | 3 + + include/linux/ptp_clock_kernel.h | 6 +- + include/linux/qed/qed_if.h | 26 +- + include/linux/skbuff.h | 2 +- + include/linux/socket.h | 17 +- + include/linux/tcp.h | 4 + + include/linux/vermagic.h | 4 + + include/net/act_api.h | 2 +- + include/net/addrconf.h | 2 - + include/net/bluetooth/bluetooth.h | 19 + + include/net/bluetooth/hci.h | 27 +- + include/net/bluetooth/hci_core.h | 20 +- + include/net/bluetooth/mgmt.h | 74 +- + include/net/bonding.h | 17 +- + include/net/cfg80211.h | 2 +- + include/net/compat.h | 18 + + include/net/dsa.h | 21 +- + include/net/dst_ops.h | 4 +- + include/net/erspan.h | 19 +- + include/net/flow_offload.h | 10 + + include/net/if_inet6.h | 3 +- + include/net/inet_common.h | 8 +- + include/net/inet_connection_sock.h | 8 + + include/net/ip6_fib.h | 7 + + include/net/ip6_route.h | 5 +- + include/net/ipv6.h | 3 +- + include/net/ipv6_stubs.h | 4 +- + include/net/mptcp.h | 24 +- + include/net/netfilter/nf_tables.h | 4 + + include/net/netlink.h | 135 +- + include/net/netns/ipv4.h | 3 + + include/net/pkt_cls.h | 1 + + include/net/sch_generic.h | 9 +- + include/net/switchdev.h | 62 + + include/net/tc_act/tc_gate.h | 146 + + include/net/tcp.h | 22 +- + include/net/xdp.h | 29 +- + include/net/xdp_sock.h | 16 +- + include/soc/mscc/ocelot.h | 15 +- + .../net/ethernet => include/soc}/mscc/ocelot_ptp.h | 17 + + include/trace/events/qrtr.h | 115 + + include/uapi/linux/bpf.h | 242 +- + include/uapi/linux/capability.h | 40 +- + include/uapi/linux/errqueue.h | 2 +- + include/uapi/linux/ethtool.h | 16 +- + include/uapi/linux/ethtool_netlink.h | 73 + + include/uapi/linux/genetlink.h | 2 + + include/uapi/linux/if.h | 1 + + include/uapi/linux/if_bridge.h | 42 + + include/uapi/linux/if_ether.h | 1 + + include/uapi/linux/if_link.h | 1 + + include/uapi/linux/if_x25.h | 2 +- + include/uapi/linux/inet_diag.h | 2 + + include/uapi/linux/mii.h | 2 + + include/uapi/linux/mrp_bridge.h | 84 + + include/uapi/linux/netfilter/nf_conntrack_common.h | 8 +- + include/uapi/linux/netfilter/nf_nat.h | 4 +- + include/uapi/linux/netlink.h | 103 + + include/uapi/linux/pkt_cls.h | 1 + + include/uapi/linux/pkt_sched.h | 6 + + include/uapi/linux/ptp_clock.h | 4 +- + include/uapi/linux/rtnetlink.h | 6 + + include/uapi/linux/tc_act/tc_gate.h | 47 + + kernel/bpf/Makefile | 2 +- + kernel/bpf/arraymap.c | 10 +- + kernel/bpf/bpf_iter.c | 539 + + kernel/bpf/bpf_struct_ops.c | 2 +- + kernel/bpf/btf.c | 49 +- + kernel/bpf/cgroup.c | 111 +- + kernel/bpf/core.c | 8 +- + kernel/bpf/cpumap.c | 23 +- + kernel/bpf/devmap.c | 1 - + kernel/bpf/hashtab.c | 4 +- + kernel/bpf/helpers.c | 91 +- + kernel/bpf/inode.c | 5 +- + kernel/bpf/lpm_trie.c | 2 +- + kernel/bpf/map_in_map.c | 2 +- + kernel/bpf/map_iter.c | 102 + + kernel/bpf/queue_stack_maps.c | 4 +- + kernel/bpf/reuseport_array.c | 2 +- + kernel/bpf/stackmap.c | 2 +- + kernel/bpf/syscall.c | 558 +- + kernel/bpf/task_iter.c | 353 + + kernel/bpf/verifier.c | 155 +- + kernel/cgroup/cgroup.c | 27 - + kernel/module.c | 3 + + kernel/sysctl.c | 36 +- + kernel/trace/bpf_trace.c | 219 + + lib/nlattr.c | 248 +- + net/8021q/vlan_dev.c | 26 +- + net/Kconfig | 5 +- + net/appletalk/ddp.c | 82 +- + net/atm/Kconfig | 2 +- + net/ax25/Kconfig | 6 +- + net/batman-adv/bat_iv_ogm.c | 4 +- + net/batman-adv/bat_v_elp.c | 2 +- + net/batman-adv/bat_v_ogm.c | 4 +- + net/batman-adv/distributed-arp-table.h | 5 - + net/batman-adv/main.h | 2 +- + net/batman-adv/soft-interface.c | 30 + + net/batman-adv/trace.h | 1 - + net/batman-adv/types.h | 2 +- + net/bluetooth/6lowpan.c | 8 + + net/bluetooth/Kconfig | 26 +- + net/bluetooth/Makefile | 1 + + net/bluetooth/hci_conn.c | 25 +- + net/bluetooth/hci_core.c | 139 +- + net/bluetooth/hci_debugfs.c | 46 + + net/bluetooth/hci_event.c | 77 +- + net/bluetooth/hci_request.c | 16 +- + net/bluetooth/hci_sock.c | 12 +- + net/bluetooth/l2cap_core.c | 4 +- + net/bluetooth/l2cap_sock.c | 168 +- + net/bluetooth/lib.c | 33 + + net/bluetooth/mgmt.c | 422 +- + net/bluetooth/msft.c | 141 + + net/bluetooth/msft.h | 18 + + net/bluetooth/smp.c | 41 +- + net/bpf/test_run.c | 16 +- + net/bridge/Kconfig | 12 + + net/bridge/Makefile | 2 + + net/bridge/br_device.c | 3 + + net/bridge/br_if.c | 34 +- + net/bridge/br_input.c | 26 +- + net/bridge/br_ioctl.c | 3 +- + net/bridge/br_mrp.c | 559 + + net/bridge/br_mrp_netlink.c | 120 + + net/bridge/br_mrp_switchdev.c | 140 + + net/bridge/br_netlink.c | 12 +- + net/bridge/br_private.h | 49 +- + net/bridge/br_private_mrp.h | 63 + + net/bridge/br_stp.c | 6 + + net/bridge/br_stp_if.c | 11 +- + net/bridge/br_sysfs_br.c | 4 +- + net/caif/caif_dev.c | 8 +- + net/caif/chnl_net.c | 3 +- + net/ceph/Kconfig | 2 +- + net/compat.c | 5 +- + net/core/bpf_sk_storage.c | 4 +- + net/core/dev.c | 138 +- + net/core/devlink.c | 137 +- + net/core/dst.c | 8 +- + net/core/filter.c | 320 +- + net/core/gen_stats.c | 2 +- + net/core/link_watch.c | 12 +- + net/core/net-sysfs.c | 45 +- + net/core/netpoll.c | 38 +- + net/core/pktgen.c | 2 +- + net/core/rtnetlink.c | 11 +- + net/core/scm.c | 141 +- + net/core/skbuff.c | 10 +- + net/core/sock.c | 28 +- + net/core/sock_map.c | 18 +- + net/core/sysctl_net_core.c | 4 +- + net/core/xdp.c | 8 + + net/dccp/dccp.h | 5 - + net/dccp/ipv6.c | 1 + + net/decnet/Kconfig | 4 +- + net/dns_resolver/Kconfig | 2 +- + net/dns_resolver/dns_key.c | 2 +- + net/dns_resolver/dns_query.c | 2 +- + net/dsa/Kconfig | 1 + + net/dsa/dsa.c | 11 +- + net/dsa/dsa2.c | 21 + + net/dsa/dsa_priv.h | 5 + + net/dsa/port.c | 37 +- + net/dsa/slave.c | 61 +- + net/dsa/switch.c | 21 +- + net/dsa/tag_8021q.c | 203 +- + net/dsa/tag_ocelot.c | 2 +- + net/dsa/tag_sja1105.c | 53 +- + net/ethtool/Makefile | 2 +- + net/ethtool/cabletest.c | 201 + + net/ethtool/channels.c | 20 +- + net/ethtool/ioctl.c | 22 +- + net/ethtool/linkmodes.c | 53 + + net/ethtool/netlink.c | 9 +- + net/ethtool/netlink.h | 3 + + net/hsr/hsr_device.c | 4 +- + net/hsr/hsr_forward.c | 2 +- + net/hsr/hsr_main.c | 22 +- + net/hsr/hsr_main.h | 19 - + net/ieee802154/6lowpan/core.c | 8 + + net/ieee802154/6lowpan/rx.c | 2 +- + net/ipv4/Kconfig | 2 +- + net/ipv4/af_inet.c | 61 +- + net/ipv4/devinet.c | 23 +- + net/ipv4/fib_semantics.c | 3 + + net/ipv4/icmp.c | 2 +- + net/ipv4/inet_connection_sock.c | 6 +- + net/ipv4/inet_diag.c | 39 + + net/ipv4/ip_gre.c | 59 +- + net/ipv4/ip_sockglue.c | 3 +- + net/ipv4/nexthop.c | 5 +- + net/ipv4/sysctl_net_ipv4.c | 16 + + net/ipv4/tcp.c | 4 +- + net/ipv4/tcp_input.c | 87 +- + net/ipv4/tcp_ipv4.c | 1 + + net/ipv4/tcp_minisocks.c | 2 +- + net/ipv4/tcp_output.c | 36 +- + net/ipv4/tcp_timer.c | 8 +- + net/ipv6/Kconfig | 2 +- + net/ipv6/addrconf.c | 153 +- + net/ipv6/addrconf_core.c | 3 +- + net/ipv6/af_inet6.c | 91 +- + net/ipv6/anycast.c | 4 +- + net/ipv6/ila/ila.h | 5 - + net/ipv6/ila/ila_xlat.c | 2 - + net/ipv6/ip6_fib.c | 60 +- + net/ipv6/ipv6_sockglue.c | 1 + + net/ipv6/ndisc.c | 2 +- + net/ipv6/raw.c | 1 + + net/ipv6/route.c | 105 +- + net/l2tp/l2tp_eth.c | 1 + + net/l2tp/l2tp_ip6.c | 1 + + net/lapb/Kconfig | 2 +- + net/mac80211/tx.c | 2 +- + net/mptcp/options.c | 33 +- + net/mptcp/protocol.c | 147 +- + net/mptcp/protocol.h | 1 + + net/mptcp/subflow.c | 38 +- + net/netfilter/Kconfig | 2 +- + net/netfilter/nf_conntrack_standalone.c | 4 +- + net/netfilter/nf_flow_table_offload.c | 3 + + net/netfilter/nf_tables_api.c | 38 +- + net/netfilter/nft_nat.c | 110 +- + net/netlink/Makefile | 2 +- + net/netlink/af_netlink.c | 92 +- + net/netlink/genetlink.c | 78 + + net/netlink/policy.c | 308 + + net/netrom/af_netrom.c | 21 + + net/openvswitch/datapath.h | 2 +- + net/openvswitch/meter.c | 305 +- + net/openvswitch/meter.h | 20 +- + net/qrtr/Kconfig | 8 +- + net/qrtr/Makefile | 2 + + net/qrtr/mhi.c | 127 + + net/qrtr/ns.c | 20 +- + net/rds/info.c | 6 +- + net/rose/af_rose.c | 21 + + net/rxrpc/Kconfig | 6 +- + net/rxrpc/sysctl.c | 2 +- + net/sched/Kconfig | 12 + + net/sched/Makefile | 1 + + net/sched/act_api.c | 43 +- + net/sched/act_ct.c | 2 + + net/sched/act_gate.c | 636 + + net/sched/cls_api.c | 105 +- + net/sched/cls_flower.c | 43 + + net/sched/em_ipt.c | 2 +- + net/sched/sch_choke.c | 6 - + net/sched/sch_fq.c | 143 +- + net/sched/sch_generic.c | 34 +- + net/sched/sch_red.c | 9 +- + net/sctp/ipv6.c | 1 + + net/smc/af_smc.c | 192 +- + net/smc/smc.h | 7 + + net/smc/smc_cdc.c | 92 +- + net/smc/smc_cdc.h | 19 +- + net/smc/smc_clc.c | 12 +- + net/smc/smc_clc.h | 2 + + net/smc/smc_core.c | 1163 +- + net/smc/smc_core.h | 156 +- + net/smc/smc_ib.c | 77 +- + net/smc/smc_ib.h | 10 +- + net/smc/smc_ism.c | 9 +- + net/smc/smc_llc.c | 1645 +- + net/smc/smc_llc.h | 69 +- + net/smc/smc_pnet.c | 591 +- + net/smc/smc_pnet.h | 7 +- + net/smc/smc_tx.c | 25 +- + net/smc/smc_wr.c | 62 +- + net/smc/smc_wr.h | 3 + + net/socket.c | 113 +- + net/wireless/nl80211.c | 91 +- + net/wireless/nl80211.h | 2 - + net/wireless/pmsr.c | 3 +- + net/wireless/radiotap.c | 2 +- + net/x25/Kconfig | 4 +- + net/xdp/xdp_umem.c | 21 +- + net/xdp/xsk.c | 12 +- + net/xdp/xsk_queue.c | 4 +- + net/xdp/xsk_queue.h | 8 +- + samples/bpf/offwaketime_kern.c | 4 +- + samples/bpf/sockex2_kern.c | 4 +- + samples/bpf/sockex3_kern.c | 4 +- + samples/bpf/xdp_redirect_cpu_kern.c | 2 +- + samples/bpf/xdp_redirect_cpu_user.c | 29 +- + samples/pktgen/README.rst | 2 +- + scripts/bpf_helpers_doc.py | 8 + + scripts/checkpatch.pl | 11 + + scripts/coccinelle/misc/newline_in_nl_msg.cocci | 75 + + scripts/mod/modpost.c | 1 + + security/selinux/include/classmap.h | 4 +- + tools/bpf/bpf_asm.c | 2 +- + tools/bpf/bpf_dbg.c | 2 +- + tools/bpf/bpftool/Documentation/bpftool-btf.rst | 11 +- + tools/bpf/bpftool/Documentation/bpftool-cgroup.rst | 12 +- + .../bpf/bpftool/Documentation/bpftool-feature.rst | 24 +- + tools/bpf/bpftool/Documentation/bpftool-gen.rst | 21 +- + tools/bpf/bpftool/Documentation/bpftool-iter.rst | 81 + + tools/bpf/bpftool/Documentation/bpftool-link.rst | 121 + + tools/bpf/bpftool/Documentation/bpftool-map.rst | 37 +- + tools/bpf/bpftool/Documentation/bpftool-net.rst | 12 +- + tools/bpf/bpftool/Documentation/bpftool-perf.rst | 12 +- + tools/bpf/bpftool/Documentation/bpftool-prog.rst | 23 +- + .../bpftool/Documentation/bpftool-struct_ops.rst | 11 +- + tools/bpf/bpftool/Documentation/bpftool.rst | 11 +- + tools/bpf/bpftool/Makefile | 13 +- + tools/bpf/bpftool/bash-completion/bpftool | 54 +- + tools/bpf/bpftool/btf.c | 1 - + tools/bpf/bpftool/btf_dumper.c | 4 +- + tools/bpf/bpftool/cfg.c | 4 +- + tools/bpf/bpftool/cgroup.c | 48 +- + tools/bpf/bpftool/common.c | 2 + + tools/bpf/bpftool/feature.c | 263 +- + tools/bpf/bpftool/gen.c | 1 - + tools/bpf/bpftool/iter.c | 88 + + tools/bpf/bpftool/jit_disasm.c | 1 - + tools/bpf/bpftool/link.c | 334 + + tools/bpf/bpftool/main.c | 7 +- + tools/bpf/bpftool/main.h | 41 + + tools/bpf/bpftool/map.c | 3 +- + tools/bpf/bpftool/map_perf_ring.c | 2 +- + tools/bpf/bpftool/prog.c | 2 +- + tools/bpf/runqslower/Makefile | 3 +- + tools/include/uapi/linux/bpf.h | 238 +- + tools/include/uapi/linux/if_link.h | 1 + + tools/lib/bpf/bpf.c | 39 +- + tools/lib/bpf/bpf.h | 7 +- + tools/lib/bpf/bpf_helpers.h | 21 + + tools/lib/bpf/bpf_tracing.h | 16 + + tools/lib/bpf/btf_dump.c | 2 +- + tools/lib/bpf/hashmap.c | 7 + + tools/lib/bpf/libbpf.c | 795 +- + tools/lib/bpf/libbpf.h | 9 + + tools/lib/bpf/libbpf.map | 9 + + tools/lib/bpf/libbpf_internal.h | 2 +- + tools/perf/builtin-stat.c | 5 +- + tools/perf/util/annotate.c | 20 + + tools/perf/util/bpf-event.c | 93 + + tools/perf/util/dso.c | 1 + + tools/perf/util/dso.h | 1 + + tools/perf/util/machine.c | 12 + + tools/perf/util/symbol.c | 1 + + tools/testing/selftests/bpf/.gitignore | 5 +- + tools/testing/selftests/bpf/Makefile | 35 +- + tools/testing/selftests/bpf/README.rst | 43 + + tools/testing/selftests/bpf/bench.c | 449 + + tools/testing/selftests/bpf/bench.h | 81 + + tools/testing/selftests/bpf/benchs/bench_count.c | 91 + + tools/testing/selftests/bpf/benchs/bench_rename.c | 195 + + tools/testing/selftests/bpf/benchs/bench_trigger.c | 167 + + .../selftests/bpf/benchs/run_bench_rename.sh | 9 + + .../selftests/bpf/benchs/run_bench_trigger.sh | 9 + + tools/testing/selftests/bpf/network_helpers.c | 158 + + tools/testing/selftests/bpf/network_helpers.h | 41 + + tools/testing/selftests/bpf/prog_tests/bpf_iter.c | 409 + + .../testing/selftests/bpf/prog_tests/bpf_obj_id.c | 110 +- + .../selftests/bpf/prog_tests/btf_map_in_map.c | 49 + + .../bpf/prog_tests/cgroup_skb_sk_lookup.c | 95 + + .../selftests/bpf/prog_tests/cls_redirect.c | 456 + + .../selftests/bpf/prog_tests/connect_force_port.c | 115 + + .../testing/selftests/bpf/prog_tests/core_reloc.c | 2 +- + .../selftests/bpf/prog_tests/enable_stats.c | 45 + + .../selftests/bpf/prog_tests/fexit_bpf2bpf.c | 1 + + .../selftests/bpf/prog_tests/flow_dissector.c | 1 + + .../bpf/prog_tests/flow_dissector_load_bytes.c | 1 + + .../testing/selftests/bpf/prog_tests/global_data.c | 1 + + .../bpf/{test_hashmap.c => prog_tests/hashmap.c} | 280 +- + tools/testing/selftests/bpf/prog_tests/kfree_skb.c | 1 + + tools/testing/selftests/bpf/prog_tests/l4lb_all.c | 1 + + tools/testing/selftests/bpf/prog_tests/map_lock.c | 14 + + .../selftests/bpf/prog_tests/ns_current_pid_tgid.c | 5 +- + .../testing/selftests/bpf/prog_tests/perf_buffer.c | 5 + + .../testing/selftests/bpf/prog_tests/pkt_access.c | 1 + + .../selftests/bpf/prog_tests/pkt_md_access.c | 1 + + .../selftests/bpf/prog_tests/prog_run_xattr.c | 1 + + .../selftests/bpf/prog_tests/queue_stack_map.c | 1 + + .../selftests/bpf/prog_tests/signal_pending.c | 1 + + tools/testing/selftests/bpf/prog_tests/sk_assign.c | 21 +- + tools/testing/selftests/bpf/prog_tests/skb_ctx.c | 1 + + tools/testing/selftests/bpf/prog_tests/spinlock.c | 14 + + tools/testing/selftests/bpf/prog_tests/tcp_rtt.c | 116 +- + .../selftests/bpf/prog_tests/test_overhead.c | 14 +- + tools/testing/selftests/bpf/prog_tests/xdp.c | 1 + + .../selftests/bpf/prog_tests/xdp_adjust_tail.c | 124 +- + .../testing/selftests/bpf/prog_tests/xdp_bpf2bpf.c | 1 + + .../selftests/bpf/prog_tests/xdp_noinline.c | 1 + + .../testing/selftests/bpf/progs/bpf_iter_bpf_map.c | 28 + + .../selftests/bpf/progs/bpf_iter_ipv6_route.c | 62 + + .../testing/selftests/bpf/progs/bpf_iter_netlink.c | 66 + + tools/testing/selftests/bpf/progs/bpf_iter_task.c | 25 + + .../selftests/bpf/progs/bpf_iter_task_file.c | 26 + + .../selftests/bpf/progs/bpf_iter_test_kern1.c | 4 + + .../selftests/bpf/progs/bpf_iter_test_kern2.c | 4 + + .../selftests/bpf/progs/bpf_iter_test_kern3.c | 18 + + .../selftests/bpf/progs/bpf_iter_test_kern4.c | 52 + + .../bpf/progs/bpf_iter_test_kern_common.h | 22 + + .../bpf/progs/cgroup_skb_sk_lookup_kern.c | 97 + + tools/testing/selftests/bpf/progs/connect4_prog.c | 46 + + .../selftests/bpf/progs/connect_force_port4.c | 28 + + .../selftests/bpf/progs/connect_force_port6.c | 28 + + .../testing/selftests/bpf/progs/core_reloc_types.h | 2 +- + .../selftests/bpf/progs/test_btf_map_in_map.c | 76 + + .../selftests/bpf/progs/test_cls_redirect.c | 1058 ++ + .../selftests/bpf/progs/test_cls_redirect.h | 54 + + .../selftests/bpf/progs/test_enable_stats.c | 18 + + tools/testing/selftests/bpf/progs/test_obj_id.c | 14 +- + tools/testing/selftests/bpf/progs/test_overhead.c | 6 + + tools/testing/selftests/bpf/progs/test_sk_assign.c | 82 +- + .../testing/selftests/bpf/progs/test_sysctl_prog.c | 2 +- + .../bpf/progs/test_xdp_adjust_tail_grow.c | 33 + + ...adjust_tail.c => test_xdp_adjust_tail_shrink.c} | 12 +- + tools/testing/selftests/bpf/progs/trigger_bench.c | 47 + + tools/testing/selftests/bpf/test_progs.c | 118 +- + tools/testing/selftests/bpf/test_progs.h | 29 +- + tools/testing/selftests/bpf/test_sock_addr.c | 38 +- + tools/testing/selftests/bpf/test_verifier.c | 63 +- + tools/testing/selftests/bpf/testing_helpers.c | 66 + + tools/testing/selftests/bpf/testing_helpers.h | 5 + + tools/testing/selftests/bpf/verifier/calls.c | 16 +- + tools/testing/selftests/bpf/verifier/dead_code.c | 10 +- + .../testing/selftests/bpf/verifier/event_output.c | 24 + + .../selftests/bpf/verifier/prevent_map_lookup.c | 30 - + tools/testing/selftests/bpf/verifier/sock.c | 115 + + .../drivers/net/mlxsw/devlink_trap_acl_drops.sh | 4 +- + .../drivers/net/mlxsw/devlink_trap_l2_drops.sh | 33 +- + .../drivers/net/mlxsw/devlink_trap_l3_drops.sh | 35 +- + .../net/mlxsw/devlink_trap_l3_exceptions.sh | 20 +- + .../drivers/net/mlxsw/devlink_trap_tunnel_ipip.sh | 6 +- + .../drivers/net/mlxsw/devlink_trap_tunnel_vxlan.sh | 9 +- + ...c_flower_restrictions.sh => tc_restrictions.sh} | 132 + + .../selftests/drivers/net/netdevsim/devlink.sh | 28 + + tools/testing/selftests/kselftest_harness.h | 234 +- + tools/testing/selftests/net/Makefile | 1 + + tools/testing/selftests/net/fib_nexthops.sh | 223 +- + .../selftests/net/forwarding/devlink_lib.sh | 9 +- + .../selftests/net/forwarding/pedit_dsfield.sh | 66 + + .../testing/selftests/net/forwarding/tc_actions.sh | 26 +- + tools/testing/selftests/net/pmtu.sh | 122 + + tools/testing/selftests/net/tls.c | 93 +- + tools/testing/selftests/net/vrf-xfrm-tests.sh | 436 + + tools/testing/selftests/ptp/testptp.c | 6 +- + .../tc-testing/tc-tests/actions/pedit.json | 25 + + .../tc-testing/tc-tests/filters/tests.json | 44 +- + tools/testing/selftests/tc-testing/tdc_batch.py | 6 +- + 1313 files changed, 88724 insertions(+), 23811 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/nxp,tja11xx.yaml + delete mode 100644 Documentation/devicetree/bindings/net/qca,ar71xx.txt + create mode 100644 Documentation/devicetree/bindings/net/qca,ar71xx.yaml + create mode 100644 Documentation/devicetree/bindings/net/qcom,ipq4019-mdio.yaml + create mode 100644 Documentation/devicetree/bindings/net/realtek-bluetooth.yaml + delete mode 100644 Documentation/devicetree/bindings/net/socionext,uniphier-ave4.txt + create mode 100644 Documentation/devicetree/bindings/net/socionext,uniphier-ave4.yaml + delete mode 100644 Documentation/devicetree/bindings/net/ti,dp83867.txt + create mode 100644 Documentation/devicetree/bindings/net/ti,dp83867.yaml + create mode 100644 Documentation/devicetree/bindings/net/ti,k3-am654-cpts.yaml + create mode 100644 Documentation/hwmon/bcm54140.rst + rename Documentation/networking/{6pack.txt => 6pack.rst} (90%) + rename Documentation/networking/{altera_tse.txt => altera_tse.rst} (85%) + rename Documentation/networking/{arcnet-hardware.txt => arcnet-hardware.rst} (66%) + rename Documentation/networking/{arcnet.txt => arcnet.rst} (76%) + rename Documentation/networking/{atm.txt => atm.rst} (89%) + rename Documentation/networking/{ax25.txt => ax25.rst} (91%) + rename Documentation/networking/{baycom.txt => baycom.rst} (58%) + rename Documentation/networking/{bonding.txt => bonding.rst} (75%) + create mode 100644 Documentation/networking/caif/index.rst + rename Documentation/networking/caif/{Linux-CAIF.txt => linux_caif.rst} (90%) + create mode 100644 Documentation/networking/caif/spi_porting.rst + delete mode 100644 Documentation/networking/caif/spi_porting.txt + rename Documentation/networking/{cdc_mbim.txt => cdc_mbim.rst} (88%) + create mode 100644 Documentation/networking/cops.rst + delete mode 100644 Documentation/networking/cops.txt + rename Documentation/networking/{cxacru.txt => cxacru.rst} (66%) + rename Documentation/networking/{dccp.txt => dccp.rst} (94%) + rename Documentation/networking/{dctcp.txt => dctcp.rst} (89%) + rename Documentation/networking/{decnet.txt => decnet.rst} (87%) + rename Documentation/networking/{defza.txt => defza.rst} (91%) + rename Documentation/networking/device_drivers/3com/{3c509.txt => 3c509.rst} (68%) + rename Documentation/networking/device_drivers/3com/{vortex.txt => vortex.rst} (72%) + rename Documentation/networking/device_drivers/amazon/{ena.txt => ena.rst} (86%) + rename Documentation/networking/device_drivers/aquantia/{atlantic.txt => atlantic.rst} (63%) + rename Documentation/networking/device_drivers/chelsio/{cxgb.txt => cxgb.rst} (81%) + rename Documentation/networking/device_drivers/cirrus/{cs89x0.txt => cs89x0.rst} (61%) + rename Documentation/networking/device_drivers/davicom/{dm9000.txt => dm9000.rst} (92%) + rename Documentation/networking/device_drivers/dec/{de4x5.txt => de4x5.rst} (78%) + rename Documentation/networking/device_drivers/dec/{dmfe.txt => dmfe.rst} (68%) + rename Documentation/networking/device_drivers/dlink/{dl2k.txt => dl2k.rst} (59%) + rename Documentation/networking/device_drivers/freescale/{dpaa.txt => dpaa.rst} (79%) + rename Documentation/networking/device_drivers/freescale/{gianfar.txt => gianfar.rst} (82%) + rename Documentation/networking/device_drivers/intel/{ipw2100.txt => ipw2100.rst} (70%) + rename Documentation/networking/device_drivers/intel/{ipw2200.txt => ipw2200.rst} (64%) + rename Documentation/networking/device_drivers/microsoft/{netvsc.txt => netvsc.rst} (83%) + create mode 100644 Documentation/networking/device_drivers/neterion/s2io.rst + delete mode 100644 Documentation/networking/device_drivers/neterion/s2io.txt + rename Documentation/networking/device_drivers/neterion/{vxge.txt => vxge.rst} (80%) + rename Documentation/networking/device_drivers/qualcomm/{rmnet.txt => rmnet.rst} (73%) + create mode 100644 Documentation/networking/device_drivers/sb1000.rst + delete mode 100644 Documentation/networking/device_drivers/sb1000.txt + create mode 100644 Documentation/networking/device_drivers/smsc/smc9.rst + delete mode 100644 Documentation/networking/device_drivers/smsc/smc9.txt + create mode 100644 Documentation/networking/device_drivers/ti/cpsw.rst + delete mode 100644 Documentation/networking/device_drivers/ti/cpsw.txt + rename Documentation/networking/device_drivers/ti/{cpsw_switchdev.txt => cpsw_switchdev.rst} (51%) + rename Documentation/networking/device_drivers/ti/{tlan.txt => tlan.rst} (73%) + rename Documentation/networking/device_drivers/toshiba/{spider_net.txt => spider_net.rst} (88%) + create mode 100644 Documentation/networking/devlink-params-sja1105.txt + rename Documentation/networking/{dns_resolver.txt => dns_resolver.rst} (89%) + rename Documentation/networking/{driver.txt => driver.rst} (85%) + rename Documentation/networking/{eql.txt => eql.rst} (62%) + rename Documentation/networking/{fib_trie.txt => fib_trie.rst} (96%) + rename Documentation/networking/{filter.txt => filter.rst} (77%) + rename Documentation/networking/{fore200e.txt => fore200e.rst} (94%) + rename Documentation/networking/{framerelay.txt => framerelay.rst} (93%) + rename Documentation/networking/{gen_stats.txt => gen_stats.rst} (60%) + rename Documentation/networking/{generic-hdlc.txt => generic-hdlc.rst} (75%) + rename Documentation/networking/{generic_netlink.txt => generic_netlink.rst} (64%) + rename Documentation/networking/{gtp.txt => gtp.rst} (79%) + rename Documentation/networking/{hinic.txt => hinic.rst} (97%) + rename Documentation/networking/{ila.txt => ila.rst} (82%) + rename Documentation/networking/{ip-sysctl.txt => ip-sysctl.rst} (83%) + rename Documentation/networking/{ip_dynaddr.txt => ip_dynaddr.rst} (65%) + rename Documentation/networking/{ipddp.txt => ipddp.rst} (89%) + rename Documentation/networking/{iphase.txt => iphase.rst} (50%) + rename Documentation/networking/{ipsec.txt => ipsec.rst} (90%) + rename Documentation/networking/{ipv6.txt => ipv6.rst} (93%) + rename Documentation/networking/{ipvlan.txt => ipvlan.rst} (54%) + rename Documentation/networking/{ipvs-sysctl.txt => ipvs-sysctl.rst} (62%) + rename Documentation/networking/{kcm.txt => kcm.rst} (84%) + rename Documentation/networking/{l2tp.txt => l2tp.rst} (79%) + rename Documentation/networking/{lapb-module.txt => lapb-module.rst} (74%) + rename Documentation/networking/{ltpc.txt => ltpc.rst} (85%) + rename Documentation/networking/{mac80211-injection.txt => mac80211-injection.rst} (67%) + rename Documentation/networking/{mpls-sysctl.txt => mpls-sysctl.rst} (82%) + rename Documentation/networking/{multiqueue.txt => multiqueue.rst} (76%) + rename Documentation/networking/{netconsole.txt => netconsole.rst} (66%) + rename Documentation/networking/{netdev-features.txt => netdev-features.rst} (95%) + rename Documentation/networking/{netdevices.txt => netdevices.rst} (89%) + rename Documentation/networking/{netfilter-sysctl.txt => netfilter-sysctl.rst} (62%) + create mode 100644 Documentation/networking/netif-msg.rst + delete mode 100644 Documentation/networking/netif-msg.txt + rename Documentation/networking/{nf_conntrack-sysctl.txt => nf_conntrack-sysctl.rst} (85%) + rename Documentation/networking/{nf_flowtable.txt => nf_flowtable.rst} (76%) + rename Documentation/networking/{openvswitch.txt => openvswitch.rst} (95%) + rename Documentation/networking/{operstates.txt => operstates.rst} (87%) + create mode 100644 Documentation/networking/packet_mmap.rst + delete mode 100644 Documentation/networking/packet_mmap.txt + rename Documentation/networking/{phonet.txt => phonet.rst} (82%) + rename Documentation/networking/{pktgen.txt => pktgen.rst} (62%) + rename Documentation/networking/{PLIP.txt => plip.rst} (92%) + rename Documentation/networking/{ppp_generic.txt => ppp_generic.rst} (91%) + rename Documentation/networking/{proc_net_tcp.txt => proc_net_tcp.rst} (83%) + rename Documentation/networking/{radiotap-headers.txt => radiotap-headers.rst} (70%) + rename Documentation/networking/{ray_cs.txt => ray_cs.rst} (65%) + rename Documentation/networking/{rds.txt => rds.rst} (59%) + rename Documentation/networking/{regulatory.txt => regulatory.rst} (94%) + rename Documentation/networking/{rxrpc.txt => rxrpc.rst} (85%) + rename Documentation/networking/{sctp.txt => sctp.rst} (64%) + rename Documentation/networking/{secid.txt => secid.rst} (87%) + create mode 100644 Documentation/networking/seg6-sysctl.rst + delete mode 100644 Documentation/networking/seg6-sysctl.txt + rename Documentation/networking/{skfp.txt => skfp.rst} (68%) + rename Documentation/networking/{strparser.txt => strparser.rst} (80%) + rename Documentation/networking/{switchdev.txt => switchdev.rst} (84%) + create mode 100644 Documentation/networking/tc-actions-env-rules.rst + delete mode 100644 Documentation/networking/tc-actions-env-rules.txt + rename Documentation/networking/{tcp-thin.txt => tcp-thin.rst} (97%) + rename Documentation/networking/{team.txt => team.rst} (67%) + rename Documentation/networking/{timestamping.txt => timestamping.rst} (89%) + rename Documentation/networking/{tproxy.txt => tproxy.rst} (70%) + rename Documentation/networking/{tuntap.txt => tuntap.rst} (58%) + rename Documentation/networking/{udplite.txt => udplite.rst} (65%) + create mode 100644 Documentation/networking/vrf.rst + delete mode 100644 Documentation/networking/vrf.txt + rename Documentation/networking/{vxlan.txt => vxlan.rst} (73%) + rename Documentation/networking/{x25-iface.txt => x25-iface.rst} (96%) + rename Documentation/networking/{x25.txt => x25.rst} (96%) + rename Documentation/networking/{xfrm_device.txt => xfrm_device.rst} (92%) + rename Documentation/networking/{xfrm_proc.txt => xfrm_proc.rst} (95%) + rename Documentation/networking/{xfrm_sync.txt => xfrm_sync.rst} (82%) + rename Documentation/networking/{xfrm_sysctl.txt => xfrm_sysctl.rst} (52%) + rename Documentation/networking/{z8530drv.txt => z8530drv.rst} (57%) + create mode 100644 drivers/net/dsa/sja1105/sja1105_vl.c + create mode 100644 drivers/net/dsa/sja1105/sja1105_vl.h + create mode 100644 drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2.c + create mode 100644 drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2.h + create mode 100644 drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_internal.h + create mode 100644 drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_llh.c + create mode 100644 drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_llh.h + create mode 100644 drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_llh_internal.h + create mode 100644 drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_utils.c + create mode 100644 drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_utils.h + create mode 100644 drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_utils_fw.c + create mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_trace.h + create mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_trace.h + create mode 100644 drivers/net/ethernet/huawei/hinic/hinic_hw_mbox.c + create mode 100644 drivers/net/ethernet/huawei/hinic/hinic_hw_mbox.h + create mode 100644 drivers/net/ethernet/huawei/hinic/hinic_sriov.c + create mode 100644 drivers/net/ethernet/huawei/hinic/hinic_sriov.h + create mode 100644 drivers/net/ethernet/intel/igc/igc_tsn.c + create mode 100644 drivers/net/ethernet/intel/igc/igc_tsn.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/dcbnl.h + create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_flow.c + create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_matchall.c + create mode 100644 drivers/net/ethernet/mscc/ocelot_ptp.c + create mode 100644 drivers/net/ethernet/ti/am65-cpsw-qos.c + create mode 100644 drivers/net/ethernet/ti/am65-cpsw-qos.h + create mode 100644 drivers/net/ethernet/ti/am65-cpts.c + create mode 100644 drivers/net/ethernet/ti/am65-cpts.h + create mode 100644 drivers/net/phy/bcm54140.c + create mode 100644 drivers/net/phy/mdio-ipq4019.c + create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/img.c + create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8723d.c + create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8723d.h + create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8723d_table.c + create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8723d_table.h + create mode 100644 include/net/tc_act/tc_gate.h + rename {drivers/net/ethernet => include/soc}/mscc/ocelot_ptp.h (52%) + create mode 100644 include/trace/events/qrtr.h + create mode 100644 include/uapi/linux/mrp_bridge.h + create mode 100644 include/uapi/linux/tc_act/tc_gate.h + create mode 100644 kernel/bpf/bpf_iter.c + create mode 100644 kernel/bpf/map_iter.c + create mode 100644 kernel/bpf/task_iter.c + create mode 100644 net/bluetooth/msft.c + create mode 100644 net/bluetooth/msft.h + create mode 100644 net/bridge/br_mrp.c + create mode 100644 net/bridge/br_mrp_netlink.c + create mode 100644 net/bridge/br_mrp_switchdev.c + create mode 100644 net/bridge/br_private_mrp.h + create mode 100644 net/ethtool/cabletest.c + create mode 100644 net/netlink/policy.c + create mode 100644 net/qrtr/mhi.c + create mode 100644 net/sched/act_gate.c + create mode 100644 scripts/coccinelle/misc/newline_in_nl_msg.cocci + create mode 100644 tools/bpf/bpftool/Documentation/bpftool-iter.rst + create mode 100644 tools/bpf/bpftool/Documentation/bpftool-link.rst + create mode 100644 tools/bpf/bpftool/iter.c + create mode 100644 tools/bpf/bpftool/link.c + create mode 100644 tools/testing/selftests/bpf/README.rst + create mode 100644 tools/testing/selftests/bpf/bench.c + create mode 100644 tools/testing/selftests/bpf/bench.h + create mode 100644 tools/testing/selftests/bpf/benchs/bench_count.c + create mode 100644 tools/testing/selftests/bpf/benchs/bench_rename.c + create mode 100644 tools/testing/selftests/bpf/benchs/bench_trigger.c + create mode 100755 tools/testing/selftests/bpf/benchs/run_bench_rename.sh + create mode 100755 tools/testing/selftests/bpf/benchs/run_bench_trigger.sh + create mode 100644 tools/testing/selftests/bpf/network_helpers.c + create mode 100644 tools/testing/selftests/bpf/network_helpers.h + create mode 100644 tools/testing/selftests/bpf/prog_tests/bpf_iter.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/btf_map_in_map.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/cgroup_skb_sk_lookup.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/cls_redirect.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/connect_force_port.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/enable_stats.c + rename tools/testing/selftests/bpf/{test_hashmap.c => prog_tests/hashmap.c} (53%) + create mode 100644 tools/testing/selftests/bpf/progs/bpf_iter_bpf_map.c + create mode 100644 tools/testing/selftests/bpf/progs/bpf_iter_ipv6_route.c + create mode 100644 tools/testing/selftests/bpf/progs/bpf_iter_netlink.c + create mode 100644 tools/testing/selftests/bpf/progs/bpf_iter_task.c + create mode 100644 tools/testing/selftests/bpf/progs/bpf_iter_task_file.c + create mode 100644 tools/testing/selftests/bpf/progs/bpf_iter_test_kern1.c + create mode 100644 tools/testing/selftests/bpf/progs/bpf_iter_test_kern2.c + create mode 100644 tools/testing/selftests/bpf/progs/bpf_iter_test_kern3.c + create mode 100644 tools/testing/selftests/bpf/progs/bpf_iter_test_kern4.c + create mode 100644 tools/testing/selftests/bpf/progs/bpf_iter_test_kern_common.h + create mode 100644 tools/testing/selftests/bpf/progs/cgroup_skb_sk_lookup_kern.c + create mode 100644 tools/testing/selftests/bpf/progs/connect_force_port4.c + create mode 100644 tools/testing/selftests/bpf/progs/connect_force_port6.c + create mode 100644 tools/testing/selftests/bpf/progs/test_btf_map_in_map.c + create mode 100644 tools/testing/selftests/bpf/progs/test_cls_redirect.c + create mode 100644 tools/testing/selftests/bpf/progs/test_cls_redirect.h + create mode 100644 tools/testing/selftests/bpf/progs/test_enable_stats.c + create mode 100644 tools/testing/selftests/bpf/progs/test_xdp_adjust_tail_grow.c + rename tools/testing/selftests/bpf/progs/{test_adjust_tail.c => test_xdp_adjust_tail_shrink.c} (70%) + create mode 100644 tools/testing/selftests/bpf/progs/trigger_bench.c + create mode 100644 tools/testing/selftests/bpf/testing_helpers.c + create mode 100644 tools/testing/selftests/bpf/testing_helpers.h + rename tools/testing/selftests/drivers/net/mlxsw/{tc_flower_restrictions.sh => tc_restrictions.sh} (53%) + create mode 100755 tools/testing/selftests/net/vrf-xfrm-tests.sh +Merging bpf-next/master (96586dd9268d bpf: Selftests, add ktls tests to test_sockmap) +$ git merge bpf-next/master +Merge made by the 'recursive' strategy. + kernel/bpf/verifier.c | 3 +- + tools/lib/bpf/hashmap.c | 5 +- + tools/lib/bpf/hashmap.h | 1 - + .../bpf/{test_align.c => prog_tests/align.c} | 109 +-- + .../selftests/bpf/{ => progs}/test_sockmap_kern.h | 158 +--- + tools/testing/selftests/bpf/test_sockmap.c | 913 +++++++++++---------- + 6 files changed, 506 insertions(+), 683 deletions(-) + rename tools/testing/selftests/bpf/{test_align.c => prog_tests/align.c} (91%) + rename tools/testing/selftests/bpf/{ => progs}/test_sockmap_kern.h (61%) +Merging ipsec-next/master (7d4343d501f9 xfrm: fix unused variable warning if CONFIG_NETFILTER=n) +$ git merge ipsec-next/master +Auto-merging net/xfrm/xfrm_output.c +Auto-merging net/xfrm/xfrm_interface.c +Auto-merging net/xfrm/xfrm_input.c +Auto-merging net/xfrm/espintcp.c +Auto-merging net/ipv6/xfrm6_output.c +CONFLICT (content): Merge conflict in net/ipv6/xfrm6_output.c +Auto-merging net/ipv6/esp6_offload.c +Auto-merging net/ipv6/af_inet6.c +CONFLICT (content): Merge conflict in net/ipv6/af_inet6.c +Auto-merging net/ipv6/Kconfig +Auto-merging net/ipv4/xfrm4_output.c +CONFLICT (content): Merge conflict in net/ipv4/xfrm4_output.c +Auto-merging net/ipv4/Kconfig +Auto-merging include/net/ipv6_stubs.h +Resolved 'net/ipv4/xfrm4_output.c' using previous resolution. +Recorded preimage for 'net/ipv6/af_inet6.c' +Resolved 'net/ipv6/xfrm6_output.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'net/ipv6/af_inet6.c'. +[master 08707bb8c6a4] Merge remote-tracking branch 'ipsec-next/master' +$ git diff -M --stat --summary HEAD^.. + include/net/ipv6_stubs.h | 6 + + include/net/xfrm.h | 31 +++- + net/ipv4/Kconfig | 1 + + net/ipv4/udp.c | 10 +- + net/ipv4/xfrm4_input.c | 5 - + net/ipv4/xfrm4_output.c | 63 +------ + net/ipv4/xfrm4_state.c | 24 --- + net/ipv6/Kconfig | 12 ++ + net/ipv6/af_inet6.c | 6 + + net/ipv6/ah6.c | 1 + + net/ipv6/esp6.c | 414 +++++++++++++++++++++++++++++++++++++++++++--- + net/ipv6/esp6_offload.c | 7 +- + net/ipv6/ip6_vti.c | 18 +- + net/ipv6/ipcomp6.c | 1 + + net/ipv6/xfrm6_input.c | 111 +++++++++++-- + net/ipv6/xfrm6_output.c | 96 +---------- + net/ipv6/xfrm6_protocol.c | 48 ++++++ + net/ipv6/xfrm6_state.c | 26 --- + net/xfrm/Kconfig | 3 + + net/xfrm/Makefile | 2 +- + net/xfrm/espintcp.c | 56 +++++-- + net/xfrm/xfrm_inout.h | 32 ++++ + net/xfrm/xfrm_input.c | 21 +-- + net/xfrm/xfrm_interface.c | 5 +- + net/xfrm/xfrm_output.c | 129 ++++++++++++++- + 25 files changed, 836 insertions(+), 292 deletions(-) +$ git am -3 ../patches/0001-xfrm-merge-fixup-for-remove-output_finish-indirectio.patch +Applying: xfrm: merge fixup for "remove output_finish indirection from xfrm_state_afinfo" +$ git reset HEAD^ +Unstaged changes after reset: +M net/xfrm/xfrm_output.c +$ git add -A . +$ git commit -v -a --amend +[master 520f86b9c8cd] Merge remote-tracking branch 'ipsec-next/master' + Date: Tue May 19 13:27:06 2020 +1000 +Merging mlx5-next/mlx5-next (ecf814e0e19b net/mlx5: Add support for RDMA TX FT headers modifying) +$ git merge mlx5-next/mlx5-next +Auto-merging include/linux/mlx5/mlx5_ifc.h +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/main.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/cmd.c +Auto-merging drivers/infiniband/hw/mlx5/flow.c +Merge made by the 'recursive' strategy. + drivers/infiniband/hw/mlx5/flow.c | 5 ++++- + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 5 +++++ + drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 4 ++++ + drivers/net/ethernet/mellanox/mlx5/core/main.c | 5 +++++ + drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste.c | 1 - + drivers/net/ethernet/mellanox/mlx5/core/steering/dr_types.h | 3 +-- + include/linux/mlx5/driver.h | 10 ---------- + include/linux/mlx5/mlx5_ifc.h | 4 +--- + 8 files changed, 20 insertions(+), 17 deletions(-) +Merging netfilter-next/master (dbfe7d74376e rds: convert get_user_pages() --> pin_user_pages()) +$ git merge netfilter-next/master +Already up to date. +Merging ipvs-next/master (d54725cd11a5 netfilter: nf_tables: support for multiple devices per netdev hook) +$ git merge ipvs-next/master +Already up to date. +Merging wireless-drivers-next/master (b0a4bb7693be rtlwifi: rtl8192ee: remove redundant for-loop) +$ git merge wireless-drivers-next/master +Auto-merging drivers/net/wireless/rndis_wlan.c +Auto-merging drivers/net/wireless/intel/iwlwifi/pcie/drv.c +Auto-merging drivers/net/wireless/intel/iwlwifi/fw/debugfs.c +Auto-merging drivers/net/wireless/intel/ipw2x00/ipw2200.h +Merge made by the 'recursive' strategy. + .../bindings/net/wireless/mediatek,mt76.txt | 3 + + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 265 +- + .../broadcom/brcm80211/brcmfmac/cfg80211.h | 24 + + .../wireless/broadcom/brcm80211/brcmfmac/common.h | 4 + + .../broadcom/brcm80211/brcmfmac/flowring.c | 4 +- + .../broadcom/brcm80211/brcmfmac/fwsignal.c | 26 +- + .../broadcom/brcm80211/brcmfmac/fwsignal.h | 23 + + .../net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 38 +- + .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 17 +- + drivers/net/wireless/intel/ipw2x00/ipw2200.h | 2 +- + drivers/net/wireless/intel/iwlwifi/cfg/22000.c | 104 +- + drivers/net/wireless/intel/iwlwifi/dvm/dev.h | 3 +- + drivers/net/wireless/intel/iwlwifi/dvm/main.c | 11 +- + drivers/net/wireless/intel/iwlwifi/dvm/rs.c | 11 +- + .../net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h | 5 +- + drivers/net/wireless/intel/iwlwifi/fw/api/debug.h | 14 +- + .../net/wireless/intel/iwlwifi/fw/api/location.h | 110 +- + drivers/net/wireless/intel/iwlwifi/fw/api/rx.h | 14 +- + drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 99 +- + drivers/net/wireless/intel/iwlwifi/fw/debugfs.c | 104 +- + drivers/net/wireless/intel/iwlwifi/fw/error-dump.h | 13 +- + drivers/net/wireless/intel/iwlwifi/fw/init.c | 55 +- + drivers/net/wireless/intel/iwlwifi/fw/runtime.h | 6 +- + drivers/net/wireless/intel/iwlwifi/fw/smem.c | 14 +- + drivers/net/wireless/intel/iwlwifi/iwl-config.h | 15 +- + drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c | 44 +- + drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 14 +- + drivers/net/wireless/intel/iwlwifi/iwl-drv.h | 7 +- + drivers/net/wireless/intel/iwlwifi/iwl-fh.h | 7 +- + drivers/net/wireless/intel/iwlwifi/iwl-modparams.h | 8 +- + drivers/net/wireless/intel/iwlwifi/iwl-prph.h | 11 +- + drivers/net/wireless/intel/iwlwifi/mvm/coex.c | 7 +- + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 34 +- + drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 11 +- + .../net/wireless/intel/iwlwifi/mvm/ftm-initiator.c | 67 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 53 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 56 +- + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 8 +- + drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 13 +- + drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c | 15 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 51 +- + drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 11 +- + drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 29 +- + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 111 +- + drivers/net/wireless/intel/iwlwifi/pcie/internal.h | 5 +- + drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 32 +- + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 19 + + drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c | 33 +- + drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 12 +- + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 14 +- + drivers/net/wireless/mediatek/mt76/Kconfig | 1 + + drivers/net/wireless/mediatek/mt76/Makefile | 3 +- + drivers/net/wireless/mediatek/mt76/agg-rx.c | 12 +- + drivers/net/wireless/mediatek/mt76/debugfs.c | 21 + + drivers/net/wireless/mediatek/mt76/mac80211.c | 33 +- + drivers/net/wireless/mediatek/mt76/mcu.c | 9 +- + drivers/net/wireless/mediatek/mt76/mmio.c | 3 +- + drivers/net/wireless/mediatek/mt76/mt76.h | 60 +- + .../net/wireless/mediatek/mt76/mt7603/debugfs.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7603/eeprom.c | 5 + + drivers/net/wireless/mediatek/mt76/mt7603/init.c | 2 + + drivers/net/wireless/mediatek/mt76/mt7603/mac.c | 12 +- + drivers/net/wireless/mediatek/mt76/mt7603/mcu.c | 3 +- + drivers/net/wireless/mediatek/mt76/mt7603/mcu.h | 7 - + drivers/net/wireless/mediatek/mt76/mt7603/soc.c | 4 +- + drivers/net/wireless/mediatek/mt76/mt7615/Kconfig | 20 +- + drivers/net/wireless/mediatek/mt76/mt7615/Makefile | 10 +- + .../net/wireless/mediatek/mt76/mt7615/debugfs.c | 47 +- + drivers/net/wireless/mediatek/mt76/mt7615/dma.c | 87 +- + drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c | 87 +- + drivers/net/wireless/mediatek/mt76/mt7615/eeprom.h | 33 +- + drivers/net/wireless/mediatek/mt76/mt7615/init.c | 283 +- + drivers/net/wireless/mediatek/mt76/mt7615/mac.c | 752 +++-- + drivers/net/wireless/mediatek/mt76/mt7615/mac.h | 39 + + drivers/net/wireless/mediatek/mt76/mt7615/main.c | 331 +- + drivers/net/wireless/mediatek/mt76/mt7615/mcu.c | 1527 +++++++++- + drivers/net/wireless/mediatek/mt76/mt7615/mcu.h | 293 +- + drivers/net/wireless/mediatek/mt76/mt7615/mmio.c | 73 +- + drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h | 177 +- + drivers/net/wireless/mediatek/mt76/mt7615/pci.c | 132 +- + .../net/wireless/mediatek/mt76/mt7615/pci_init.c | 174 ++ + .../net/wireless/mediatek/mt76/mt7615/pci_mac.c | 184 ++ + drivers/net/wireless/mediatek/mt76/mt7615/regs.h | 108 +- + drivers/net/wireless/mediatek/mt76/mt7615/soc.c | 4 +- + drivers/net/wireless/mediatek/mt76/mt7615/usb.c | 446 +++ + .../net/wireless/mediatek/mt76/mt7615/usb_init.c | 145 + + .../net/wireless/mediatek/mt76/mt7615/usb_mcu.c | 93 + + drivers/net/wireless/mediatek/mt76/mt76x0/init.c | 26 +- + drivers/net/wireless/mediatek/mt76/mt76x0/pci.c | 3 + + drivers/net/wireless/mediatek/mt76/mt76x02.h | 3 + + .../net/wireless/mediatek/mt76/mt76x02_debugfs.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt76x02_mac.c | 7 +- + drivers/net/wireless/mediatek/mt76/mt76x02_mcu.c | 5 +- + drivers/net/wireless/mediatek/mt76/mt76x02_mcu.h | 6 - + drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c | 16 + + .../net/wireless/mediatek/mt76/mt76x02_usb_mcu.c | 4 +- + drivers/net/wireless/mediatek/mt76/mt76x02_util.c | 4 + + drivers/net/wireless/mediatek/mt76/mt76x2/eeprom.c | 5 + + .../net/wireless/mediatek/mt76/mt76x2/pci_init.c | 1 + + .../net/wireless/mediatek/mt76/mt76x2/pci_main.c | 21 +- + drivers/net/wireless/mediatek/mt76/mt76x2/usb.c | 2 + + drivers/net/wireless/mediatek/mt76/mt7915/Kconfig | 13 + + drivers/net/wireless/mediatek/mt76/mt7915/Makefile | 6 + + .../net/wireless/mediatek/mt76/mt7915/debugfs.c | 463 +++ + drivers/net/wireless/mediatek/mt76/mt7915/dma.c | 285 ++ + drivers/net/wireless/mediatek/mt76/mt7915/eeprom.c | 243 ++ + drivers/net/wireless/mediatek/mt76/mt7915/eeprom.h | 125 + + drivers/net/wireless/mediatek/mt76/mt7915/init.c | 701 +++++ + drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 1471 +++++++++ + drivers/net/wireless/mediatek/mt76/mt7915/mac.h | 346 +++ + drivers/net/wireless/mediatek/mt76/mt7915/main.c | 833 ++++++ + drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 3161 ++++++++++++++++++++ + drivers/net/wireless/mediatek/mt76/mt7915/mcu.h | 1033 +++++++ + drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h | 467 +++ + drivers/net/wireless/mediatek/mt76/mt7915/pci.c | 191 ++ + drivers/net/wireless/mediatek/mt76/mt7915/regs.h | 375 +++ + drivers/net/wireless/mediatek/mt76/tx.c | 4 +- + drivers/net/wireless/mediatek/mt76/usb.c | 15 +- + drivers/net/wireless/mediatek/mt76/util.c | 2 +- + .../net/wireless/realtek/rtl818x/rtl8187/rtl8225.c | 4 - + .../net/wireless/realtek/rtlwifi/rtl8192ee/phy.c | 14 +- + drivers/net/wireless/realtek/rtlwifi/usb.c | 8 +- + drivers/net/wireless/realtek/rtw88/Kconfig | 26 +- + drivers/net/wireless/realtek/rtw88/Makefile | 28 +- + drivers/net/wireless/realtek/rtw88/bf.c | 7 + + drivers/net/wireless/realtek/rtw88/coex.c | 3 + + drivers/net/wireless/realtek/rtw88/debug.c | 9 +- + drivers/net/wireless/realtek/rtw88/efuse.c | 1 + + drivers/net/wireless/realtek/rtw88/fw.c | 1 + + drivers/net/wireless/realtek/rtw88/mac.c | 30 +- + drivers/net/wireless/realtek/rtw88/main.h | 39 +- + drivers/net/wireless/realtek/rtw88/pci.c | 49 +- + drivers/net/wireless/realtek/rtw88/pci.h | 4 - + drivers/net/wireless/realtek/rtw88/phy.c | 34 +- + drivers/net/wireless/realtek/rtw88/phy.h | 1 + + drivers/net/wireless/realtek/rtw88/reg.h | 11 + + drivers/net/wireless/realtek/rtw88/rtw8723d.c | 1652 +++++++++- + drivers/net/wireless/realtek/rtw88/rtw8723d.h | 138 + + drivers/net/wireless/realtek/rtw88/rtw8723de.c | 30 + + drivers/net/wireless/realtek/rtw88/rtw8723de.h | 14 + + drivers/net/wireless/realtek/rtw88/rtw8822b.c | 124 +- + drivers/net/wireless/realtek/rtw88/rtw8822be.c | 30 + + drivers/net/wireless/realtek/rtw88/rtw8822be.h | 14 + + drivers/net/wireless/realtek/rtw88/rtw8822c.c | 49 +- + drivers/net/wireless/realtek/rtw88/rtw8822ce.c | 30 + + drivers/net/wireless/realtek/rtw88/rtw8822ce.h | 14 + + drivers/net/wireless/realtek/rtw88/rx.c | 1 + + drivers/net/wireless/realtek/rtw88/sec.c | 6 +- + drivers/net/wireless/realtek/rtw88/util.c | 20 +- + drivers/net/wireless/rndis_wlan.c | 24 +- + 150 files changed, 17292 insertions(+), 1840 deletions(-) + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7615/pci_init.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7615/pci_mac.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7615/usb.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7615/usb_init.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7615/usb_mcu.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7915/Kconfig + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7915/Makefile + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7915/dma.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7915/eeprom.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7915/eeprom.h + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7915/init.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7915/mac.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7915/mac.h + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7915/main.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7915/mcu.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7915/mcu.h + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7915/pci.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7915/regs.h + create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8723de.c + create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8723de.h + create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8822be.c + create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8822be.h + create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8822ce.c + create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8822ce.h +Merging bluetooth/master (a228f7a41029 Bluetooth: hci_qca: Enable WBS support for wcn3991) +$ git merge bluetooth/master +Merge made by the 'recursive' strategy. + drivers/bluetooth/hci_qca.c | 23 +++++++++++++++++------ + include/net/bluetooth/l2cap.h | 6 +++--- + net/bluetooth/hci_event.c | 1 + + net/bluetooth/smp.c | 4 ++++ + 4 files changed, 25 insertions(+), 9 deletions(-) +Merging mac80211-next/master (60689de46c7f mac80211: fix memory overlap due to variable length param) +$ git merge mac80211-next/master +Auto-merging net/wireless/nl80211.c +Auto-merging net/wireless/core.h +Auto-merging net/mac80211/tx.c +Auto-merging net/mac80211/rc80211_minstrel_ht.c +Auto-merging net/mac80211/main.c +Auto-merging net/mac80211/ieee80211_i.h +Auto-merging include/net/mac80211.h +Auto-merging include/net/cfg80211.h +Auto-merging include/linux/ieee80211.h +Auto-merging drivers/net/wireless/marvell/mwifiex/cfg80211.c +Auto-merging drivers/net/wireless/mac80211_hwsim.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/rs.c +Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +Auto-merging drivers/net/wireless/ath/ath11k/mac.c +Merge made by the 'recursive' strategy. + drivers/net/wireless/ath/ath11k/mac.c | 3 +- + drivers/net/wireless/ath/ath6kl/cfg80211.c | 26 ++-- + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 19 ++- + drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 6 +- + drivers/net/wireless/mac80211_hwsim.c | 63 ++++++++++ + drivers/net/wireless/mac80211_hwsim.h | 8 ++ + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 16 +-- + drivers/net/wireless/quantenna/qtnfmac/cfg80211.c | 83 +++++++------ + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 24 ---- + drivers/staging/wilc1000/cfg80211.c | 36 +++--- + drivers/staging/wilc1000/cfg80211.h | 5 +- + drivers/staging/wilc1000/netdev.c | 21 ++-- + drivers/staging/wilc1000/netdev.h | 9 +- + include/linux/ieee80211.h | 23 +++- + include/net/cfg80211.h | 134 ++++++++++++++++++--- + include/net/mac80211.h | 35 +++++- + include/net/regulatory.h | 7 -- + include/uapi/linux/nl80211.h | 23 ++++ + net/mac80211/agg-tx.c | 79 +++++++----- + net/mac80211/cfg.c | 93 +++++++++----- + net/mac80211/chan.c | 1 + + net/mac80211/debugfs_netdev.c | 2 +- + net/mac80211/he.c | 13 +- + net/mac80211/ibss.c | 5 + + net/mac80211/ieee80211_i.h | 9 +- + net/mac80211/iface.c | 5 + + net/mac80211/main.c | 11 +- + net/mac80211/mesh.c | 1 + + net/mac80211/mlme.c | 62 +++++++--- + net/mac80211/offchannel.c | 4 + + net/mac80211/rc80211_minstrel_ht.c | 3 +- + net/mac80211/rx.c | 17 ++- + net/mac80211/scan.c | 4 +- + net/mac80211/sta_info.h | 4 + + net/mac80211/tdls.c | 7 +- + net/mac80211/trace.h | 41 +++++-- + net/mac80211/tx.c | 7 +- + net/mac80211/vht.c | 10 +- + net/wireless/chan.c | 71 ++++++----- + net/wireless/core.c | 10 +- + net/wireless/core.h | 9 +- + net/wireless/mlme.c | 106 ++++++++-------- + net/wireless/nl80211.c | 44 ++++++- + net/wireless/rdev-ops.h | 11 +- + net/wireless/reg.c | 40 +++--- + net/wireless/scan.c | 4 +- + net/wireless/sme.c | 2 + + net/wireless/trace.h | 41 ++++--- + net/wireless/util.c | 58 +++++---- + 49 files changed, 873 insertions(+), 442 deletions(-) +Merging gfs2/for-next (771d0b71043f gfs2: Allow lock_nolock mount to specify jid=X) +$ git merge gfs2/for-next +Auto-merging MAINTAINERS +Auto-merging Documentation/filesystems/index.rst +Merge made by the 'recursive' strategy. + .../{gfs2-glocks.txt => gfs2-glocks.rst} | 149 ++++++++++++--------- + Documentation/filesystems/index.rst | 1 + + MAINTAINERS | 2 +- + fs/gfs2/glops.c | 8 +- + fs/gfs2/ops_fstype.c | 2 +- + 5 files changed, 93 insertions(+), 69 deletions(-) + rename Documentation/filesystems/{gfs2-glocks.txt => gfs2-glocks.rst} (63%) +Merging mtd/mtd/next (025a06c1104c mtd: Convert fallthrough comments into statements) +$ git merge mtd/mtd/next +Already up to date. +Merging nand/nand/next (0185d50c5220 mtd: rawnand: stm32_fmc2: use FMC2_TIMEOUT_MS for timeouts) +$ git merge nand/nand/next +Auto-merging drivers/mtd/mtdcore.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mtd/partition.txt | 3 + + drivers/mtd/mtdcore.c | 189 +++++++- + drivers/mtd/mtdpart.c | 54 ++- + drivers/mtd/nand/raw/atmel/nand-controller.c | 2 +- + drivers/mtd/nand/raw/au1550nd.c | 397 ++++++----------- + drivers/mtd/nand/raw/brcmnand/brcmnand.c | 3 +- + drivers/mtd/nand/raw/cadence-nand-controller.c | 10 +- + drivers/mtd/nand/raw/cafe_nand.c | 11 +- + drivers/mtd/nand/raw/cs553x_nand.c | 194 ++++++--- + drivers/mtd/nand/raw/denali.c | 47 +- + drivers/mtd/nand/raw/diskonchip.c | 475 ++++++++------------- + drivers/mtd/nand/raw/fsmc_nand.c | 12 +- + drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 3 + + drivers/mtd/nand/raw/ingenic/ingenic_nand_drv.c | 2 +- + drivers/mtd/nand/raw/internals.h | 12 + + drivers/mtd/nand/raw/marvell_nand.c | 63 +-- + drivers/mtd/nand/raw/meson_nand.c | 5 +- + drivers/mtd/nand/raw/mtk_nand.c | 2 +- + drivers/mtd/nand/raw/mxic_nand.c | 3 + + drivers/mtd/nand/raw/nand_base.c | 246 +++++++++-- + drivers/mtd/nand/raw/nand_jedec.c | 32 +- + drivers/mtd/nand/raw/nand_legacy.c | 8 +- + drivers/mtd/nand/raw/nand_micron.c | 12 +- + drivers/mtd/nand/raw/nand_onfi.c | 71 +-- + drivers/mtd/nand/raw/nand_timings.c | 11 +- + drivers/mtd/nand/raw/nand_toshiba.c | 14 + + drivers/mtd/nand/raw/nandsim.c | 3 + + drivers/mtd/nand/raw/qcom_nandc.c | 2 +- + drivers/mtd/nand/raw/stm32_fmc2_nand.c | 74 +--- + drivers/mtd/nand/raw/sunxi_nand.c | 5 +- + drivers/mtd/nand/raw/tango_nand.c | 2 +- + drivers/mtd/nand/raw/tegra_nand.c | 6 +- + drivers/mtd/nand/raw/vf610_nfc.c | 4 +- + drivers/mtd/parsers/cmdlinepart.c | 12 +- + drivers/mtd/parsers/ofpart.c | 3 + + drivers/mtd/ubi/build.c | 5 +- + include/linux/mtd/mtd.h | 7 +- + include/linux/mtd/partitions.h | 2 + + include/linux/mtd/rawnand.h | 115 ++--- + include/uapi/mtd/mtd-abi.h | 1 + + 40 files changed, 1176 insertions(+), 946 deletions(-) +Merging spi-nor/spi-nor/next (b84691596328 mtd: spi-nor: Fix description of the sr_ready() return value) +$ git merge spi-nor/spi-nor/next +Merge made by the 'recursive' strategy. + drivers/mtd/spi-nor/core.c | 18 +++++++++--------- + drivers/mtd/spi-nor/macronix.c | 6 ++++++ + drivers/mtd/spi-nor/micron-st.c | 6 +++++- + drivers/mtd/spi-nor/spansion.c | 4 +++- + include/linux/mtd/spi-nor.h | 16 ++++++++-------- + 5 files changed, 31 insertions(+), 19 deletions(-) +Merging crypto/master (2c959a33f863 crypto: hisilicon/zip - Use temporary sqe when doing work) +$ git merge crypto/master +Auto-merging net/sctp/sm_make_chunk.c +Auto-merging net/ipv6/addrconf.c +Auto-merging net/bluetooth/smp.c +Auto-merging lib/mpi/longlong.h +Auto-merging kernel/bpf/core.c +Auto-merging include/net/tcp.h +Auto-merging include/linux/filter.h +Removing include/linux/cryptohash.h +Auto-merging fs/ubifs/replay.c +Auto-merging fs/ubifs/auth.c +Auto-merging fs/f2fs/hash.c +Auto-merging drivers/crypto/chelsio/chcr_ipsec.c +Auto-merging drivers/crypto/chelsio/chcr_algo.c +Auto-merging drivers/crypto/allwinner/sun8i-ss/sun8i-ss-core.c +Auto-merging drivers/char/random.c +Auto-merging crypto/xts.c +CONFLICT (content): Merge conflict in crypto/xts.c +Auto-merging crypto/lrw.c +CONFLICT (content): Merge conflict in crypto/lrw.c +Auto-merging MAINTAINERS +Resolved 'crypto/lrw.c' using previous resolution. +Resolved 'crypto/xts.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 8b3dd8b61115] Merge remote-tracking branch 'crypto/master' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/rng/arm-cctrng.yaml | 54 + + Documentation/security/siphash.rst | 2 +- + MAINTAINERS | 9 + + arch/arm/crypto/sha1_glue.c | 1 - + arch/arm/crypto/sha1_neon_glue.c | 1 - + arch/arm/crypto/sha256_glue.c | 1 - + arch/arm/crypto/sha256_neon_glue.c | 1 - + arch/arm/kernel/armksyms.c | 1 - + arch/arm64/crypto/aes-glue.c | 4 +- + arch/arm64/crypto/crct10dif-ce-core.S | 2 +- + arch/arm64/crypto/sha256-glue.c | 1 - + arch/arm64/crypto/sha512-glue.c | 1 - + arch/microblaze/kernel/microblaze_ksyms.c | 1 - + arch/mips/cavium-octeon/crypto/octeon-md5.c | 1 - + arch/powerpc/crypto/md5-glue.c | 1 - + arch/powerpc/crypto/sha1-spe-glue.c | 1 - + arch/powerpc/crypto/sha1.c | 33 +- + arch/powerpc/crypto/sha256-spe-glue.c | 1 - + arch/s390/crypto/sha1_s390.c | 12 +- + arch/sparc/crypto/md5_glue.c | 1 - + arch/sparc/crypto/sha1_glue.c | 1 - + arch/sparc/crypto/sha256_glue.c | 1 - + arch/sparc/crypto/sha512_glue.c | 1 - + arch/unicore32/kernel/ksyms.c | 1 - + arch/x86/crypto/sha1_ssse3_glue.c | 1 - + arch/x86/crypto/sha256_ssse3_glue.c | 1 - + arch/x86/crypto/sha512_ssse3_glue.c | 1 - + crypto/Kconfig | 3 +- + crypto/algapi.c | 32 +- + crypto/algif_rng.c | 2 +- + crypto/api.c | 3 +- + crypto/blake2b_generic.c | 4 +- + crypto/crypto_engine.c | 171 +- + crypto/drbg.c | 30 +- + crypto/essiv.c | 4 +- + crypto/internal.h | 1 + + crypto/jitterentropy-kcapi.c | 27 + + crypto/jitterentropy.c | 417 +++-- + crypto/lrw.c | 6 +- + crypto/sha1_generic.c | 5 +- + crypto/sha256_generic.c | 14 +- + crypto/shash.c | 16 + + crypto/xts.c | 6 +- + drivers/char/hw_random/Kconfig | 13 + + drivers/char/hw_random/Makefile | 1 + + drivers/char/hw_random/cctrng.c | 735 ++++++++ + drivers/char/hw_random/cctrng.h | 72 + + drivers/char/hw_random/omap-rng.c | 5 +- + drivers/char/hw_random/optee-rng.c | 2 +- + drivers/char/hw_random/xgene-rng.c | 4 +- + drivers/char/random.c | 8 +- + drivers/crypto/allwinner/sun8i-ss/sun8i-ss-core.c | 4 +- + drivers/crypto/amlogic/amlogic-gxl-core.c | 4 +- + drivers/crypto/atmel-sha.c | 1 - + drivers/crypto/axis/artpec6_crypto.c | 10 +- + drivers/crypto/bcm/cipher.c | 27 +- + drivers/crypto/ccp/Kconfig | 3 +- + drivers/crypto/ccp/ccp-crypto-sha.c | 9 +- + drivers/crypto/ccp/sev-dev.c | 43 + + drivers/crypto/ccree/cc_cipher.c | 9 +- + drivers/crypto/ccree/cc_debugfs.c | 4 +- + drivers/crypto/chelsio/chcr_algo.c | 3 +- + drivers/crypto/chelsio/chcr_ipsec.c | 1 - + drivers/crypto/hisilicon/Kconfig | 4 + + drivers/crypto/hisilicon/hpre/hpre.h | 1 - + drivers/crypto/hisilicon/hpre/hpre_main.c | 285 ++- + drivers/crypto/hisilicon/qm.c | 1888 ++++++++++++++++---- + drivers/crypto/hisilicon/qm.h | 116 +- + drivers/crypto/hisilicon/sec2/sec.h | 1 - + drivers/crypto/hisilicon/sec2/sec_crypto.c | 5 +- + drivers/crypto/hisilicon/sec2/sec_main.c | 311 ++-- + drivers/crypto/hisilicon/zip/zip_crypto.c | 11 +- + drivers/crypto/hisilicon/zip/zip_main.c | 292 ++- + drivers/crypto/marvell/octeontx/otx_cptpf_main.c | 4 +- + drivers/crypto/marvell/octeontx/otx_cptpf_mbox.c | 12 +- + drivers/crypto/marvell/octeontx/otx_cptpf_ucode.c | 95 +- + drivers/crypto/marvell/octeontx/otx_cptvf_algs.c | 6 +- + drivers/crypto/marvell/octeontx/otx_cptvf_main.c | 12 +- + drivers/crypto/marvell/octeontx/otx_cptvf_reqmgr.c | 10 +- + drivers/crypto/mediatek/mtk-sha.c | 7 +- + drivers/crypto/n2_core.c | 7 +- + drivers/crypto/omap-sham.c | 21 +- + drivers/crypto/s5p-sss.c | 39 +- + drivers/crypto/stm32/stm32-hash.c | 38 +- + drivers/nfc/s3fwrn5/firmware.c | 10 +- + fs/crypto/fname.c | 7 +- + fs/crypto/hkdf.c | 6 +- + fs/ecryptfs/crypto.c | 17 +- + fs/f2fs/hash.c | 1 - + fs/nfsd/nfs4recover.c | 26 +- + fs/ubifs/auth.c | 20 +- + fs/ubifs/master.c | 9 +- + fs/ubifs/replay.c | 14 +- + include/crypto/acompress.h | 2 +- + include/crypto/algapi.h | 2 + + include/crypto/drbg.h | 6 +- + include/crypto/engine.h | 15 +- + include/crypto/hash.h | 19 + + include/crypto/sha.h | 28 +- + include/crypto/sha256_base.h | 6 +- + include/linux/cryptohash.h | 14 - + include/linux/filter.h | 4 +- + include/linux/padata.h | 6 +- + include/linux/psp-sev.h | 2 + + include/net/tcp.h | 1 - + include/uapi/linux/psp-sev.h | 2 + + kernel/bpf/core.c | 18 +- + kernel/padata.c | 14 +- + lib/crypto/chacha.c | 1 - + lib/crypto/sha256.c | 20 +- + lib/mpi/longlong.h | 2 +- + lib/sha1.c | 24 +- + net/bluetooth/smp.c | 6 +- + net/core/secure_seq.c | 1 - + net/ipv6/addrconf.c | 10 +- + net/ipv6/seg6_hmac.c | 1 - + net/mptcp/crypto.c | 4 +- + net/sctp/auth.c | 10 +- + net/sctp/sm_make_chunk.c | 23 +- + security/keys/encrypted-keys/encrypted.c | 18 +- + 120 files changed, 3756 insertions(+), 1613 deletions(-) + create mode 100644 Documentation/devicetree/bindings/rng/arm-cctrng.yaml + create mode 100644 drivers/char/hw_random/cctrng.c + create mode 100644 drivers/char/hw_random/cctrng.h + delete mode 100644 include/linux/cryptohash.h +Merging drm/drm-next (1493bddcca4d Merge tag 'drm-misc-next-2020-05-14' of git://anongit.freedesktop.org/drm/drm-misc into drm-next) +$ git merge drm/drm-next +Auto-merging mm/slub.c +Auto-merging include/uapi/drm/amdgpu_drm.h +Auto-merging include/linux/dma-buf.h +CONFLICT (content): Merge conflict in include/linux/dma-buf.h +Removing include/drm/ttm/ttm_debug.h +Removing include/drm/drm_pci.h +Auto-merging include/drm/drm_modes.h +Auto-merging include/drm/drm_displayid.h +Auto-merging drivers/gpu/drm/virtio/virtgpu_ioctl.c +Auto-merging drivers/gpu/drm/virtio/virtgpu_gem.c +Auto-merging drivers/gpu/drm/virtio/virtgpu_drv.h +Auto-merging drivers/gpu/drm/tidss/tidss_plane.c +Auto-merging drivers/gpu/drm/tidss/tidss_encoder.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/tidss/tidss_encoder.c +Auto-merging drivers/gpu/drm/tidss/tidss_crtc.c +Auto-merging drivers/gpu/drm/tegra/drm.c +Auto-merging drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c +Auto-merging drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c +Auto-merging drivers/gpu/drm/radeon/radeon_kms.c +Auto-merging drivers/gpu/drm/qxl/qxl_ioctl.c +Auto-merging drivers/gpu/drm/qxl/qxl_display.c +Removing drivers/gpu/drm/pl111/pl111_vexpress.h +Removing drivers/gpu/drm/pl111/pl111_vexpress.c +Auto-merging drivers/gpu/drm/meson/meson_dw_hdmi.c +Auto-merging drivers/gpu/drm/meson/meson_drv.c +Auto-merging drivers/gpu/drm/mediatek/mtk_dsi.c +Auto-merging drivers/gpu/drm/mediatek/mtk_drm_drv.c +Auto-merging drivers/gpu/drm/mediatek/mtk_dpi.c +Auto-merging drivers/gpu/drm/ingenic/ingenic-drm.c +Removing drivers/gpu/drm/i915/oa/i915_oa_tgl.h +Removing drivers/gpu/drm/i915/oa/i915_oa_tgl.c +Removing drivers/gpu/drm/i915/oa/i915_oa_sklgt4.h +Removing drivers/gpu/drm/i915/oa/i915_oa_sklgt4.c +Removing drivers/gpu/drm/i915/oa/i915_oa_sklgt3.h +Removing drivers/gpu/drm/i915/oa/i915_oa_sklgt3.c +Removing drivers/gpu/drm/i915/oa/i915_oa_sklgt2.h +Removing drivers/gpu/drm/i915/oa/i915_oa_sklgt2.c +Removing drivers/gpu/drm/i915/oa/i915_oa_kblgt3.h +Removing drivers/gpu/drm/i915/oa/i915_oa_kblgt3.c +Removing drivers/gpu/drm/i915/oa/i915_oa_kblgt2.h +Removing drivers/gpu/drm/i915/oa/i915_oa_kblgt2.c +Removing drivers/gpu/drm/i915/oa/i915_oa_icl.h +Removing drivers/gpu/drm/i915/oa/i915_oa_icl.c +Removing drivers/gpu/drm/i915/oa/i915_oa_hsw.h +Removing drivers/gpu/drm/i915/oa/i915_oa_hsw.c +Removing drivers/gpu/drm/i915/oa/i915_oa_glk.h +Removing drivers/gpu/drm/i915/oa/i915_oa_glk.c +Removing drivers/gpu/drm/i915/oa/i915_oa_cnl.h +Removing drivers/gpu/drm/i915/oa/i915_oa_cnl.c +Removing drivers/gpu/drm/i915/oa/i915_oa_chv.h +Removing drivers/gpu/drm/i915/oa/i915_oa_chv.c +Removing drivers/gpu/drm/i915/oa/i915_oa_cflgt3.h +Removing drivers/gpu/drm/i915/oa/i915_oa_cflgt3.c +Removing drivers/gpu/drm/i915/oa/i915_oa_cflgt2.h +Removing drivers/gpu/drm/i915/oa/i915_oa_cflgt2.c +Removing drivers/gpu/drm/i915/oa/i915_oa_bxt.h +Removing drivers/gpu/drm/i915/oa/i915_oa_bxt.c +Removing drivers/gpu/drm/i915/oa/i915_oa_bdw.h +Removing drivers/gpu/drm/i915/oa/i915_oa_bdw.c +Auto-merging drivers/gpu/drm/i915/intel_pm.c +Auto-merging drivers/gpu/drm/i915/i915_vma.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_vma.c +Auto-merging drivers/gpu/drm/i915/i915_scheduler.c +Auto-merging drivers/gpu/drm/i915/i915_request.c +Auto-merging drivers/gpu/drm/i915/i915_reg.h +Auto-merging drivers/gpu/drm/i915/i915_perf.c +Auto-merging drivers/gpu/drm/i915/i915_irq.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_irq.c +Auto-merging drivers/gpu/drm/i915/i915_gpu_error.c +Auto-merging drivers/gpu/drm/i915/i915_gem_evict.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/gvt/scheduler.c +Auto-merging drivers/gpu/drm/i915/gt/selftest_lrc.c +Auto-merging drivers/gpu/drm/i915/gt/intel_timeline.c +Auto-merging drivers/gpu/drm/i915/gt/intel_rps.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_rps.c +Auto-merging drivers/gpu/drm/i915/gt/intel_lrc.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_lrc.c +Auto-merging drivers/gpu/drm/i915/gt/intel_engine_types.h +Auto-merging drivers/gpu/drm/i915/gt/intel_engine_cs.c +Auto-merging drivers/gpu/drm/i915/gt/intel_engine.h +Auto-merging drivers/gpu/drm/i915/gt/intel_context_types.h +Auto-merging drivers/gpu/drm/i915/gem/selftests/huge_pages.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_domain.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_domain.c +Auto-merging drivers/gpu/drm/i915/display/intel_sprite.c +Auto-merging drivers/gpu/drm/i915/display/intel_hdmi.c +Auto-merging drivers/gpu/drm/i915/display/intel_fbc.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_fbc.c +Auto-merging drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c +Auto-merging drivers/gpu/drm/i915/display/intel_dp.c +Auto-merging drivers/gpu/drm/i915/display/intel_display_power.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_display_power.c +Auto-merging drivers/gpu/drm/i915/display/intel_ddi.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_ddi.c +Auto-merging drivers/gpu/drm/etnaviv/etnaviv_drv.c +Removing drivers/gpu/drm/drm_vram_helper_common.c +Auto-merging drivers/gpu/drm/drm_ioctl.c +Auto-merging drivers/gpu/drm/drm_edid.c +Auto-merging drivers/gpu/drm/drm_dp_mst_topology.c +Removing drivers/gpu/drm/cirrus/Makefile +Removing drivers/gpu/drm/cirrus/Kconfig +Auto-merging drivers/gpu/drm/armada/armada_drv.c +Auto-merging drivers/gpu/drm/amd/powerplay/renoir_ppt.c +Auto-merging drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +Auto-merging drivers/gpu/drm/amd/powerplay/amd_powerplay.c +Removing drivers/gpu/drm/amd/display/modules/stats/stats.c +Auto-merging drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h +Auto-merging drivers/gpu/drm/amd/display/dc/dml/dcn21/display_rq_dlg_calc_21.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn20/dcn20_mpc.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +Auto-merging drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu.h +Auto-merging drivers/gpu/drm/Kconfig +Auto-merging drivers/dma-buf/dma-buf.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Removing Documentation/devicetree/bindings/display/rockchip/rockchip-vop.txt +Removing Documentation/devicetree/bindings/display/rockchip/rockchip,rk3066-hdmi.txt +Removing Documentation/devicetree/bindings/display/panel/tpo,td043mtea1.txt +Removing Documentation/devicetree/bindings/display/panel/tpo,td028ttec1.txt +Removing Documentation/devicetree/bindings/display/panel/startek,startek-kd050c.txt +Removing Documentation/devicetree/bindings/display/panel/sony,acx565akm.txt +Removing Documentation/devicetree/bindings/display/panel/sitronix,st7789v.txt +Removing Documentation/devicetree/bindings/display/panel/sitronix,st7701.txt +Removing Documentation/devicetree/bindings/display/panel/simple-panel.txt +Removing Documentation/devicetree/bindings/display/panel/sharp,ls043t1le01.txt +Removing Documentation/devicetree/bindings/display/panel/sharp,ls037v7dw01.txt +Removing Documentation/devicetree/bindings/display/panel/sharp,lq150x1lg11.txt +Removing Documentation/devicetree/bindings/display/panel/seiko,43wvf1g.txt +Removing Documentation/devicetree/bindings/display/panel/samsung,s6e63m0.txt +Removing Documentation/devicetree/bindings/display/panel/samsung,s6e63j0x03.txt +Removing Documentation/devicetree/bindings/display/panel/samsung,s6e3ha2.txt +Removing Documentation/devicetree/bindings/display/panel/samsung,s6d16d0.txt +Removing Documentation/devicetree/bindings/display/panel/samsung,ld9040.txt +Removing Documentation/devicetree/bindings/display/panel/raydium,rm67191.txt +Removing Documentation/devicetree/bindings/display/panel/osddisplays,osd101t2587-53ts.txt +Removing Documentation/devicetree/bindings/display/panel/olimex,lcd-olinuxino.txt +Removing Documentation/devicetree/bindings/display/panel/lgphilips,lb035q02.txt +Removing Documentation/devicetree/bindings/display/panel/lg,lh500wx1-sd03.txt +Removing Documentation/devicetree/bindings/display/panel/lg,lg4573.txt +Removing Documentation/devicetree/bindings/display/panel/lg,ld070wx3-sl01.txt +Removing Documentation/devicetree/bindings/display/panel/lg,acx467akm-7.txt +Removing Documentation/devicetree/bindings/display/panel/kingdisplay,kd097d04.txt +Removing Documentation/devicetree/bindings/display/panel/kingdisplay,kd035g6-54nt.txt +Removing Documentation/devicetree/bindings/display/panel/jdi,lt070me05000.txt +Removing Documentation/devicetree/bindings/display/panel/innolux,p120zdg-bf1.txt +Removing Documentation/devicetree/bindings/display/panel/innolux,p097pfg.txt +Removing Documentation/devicetree/bindings/display/panel/ilitek,ili9881c.txt +Removing Documentation/devicetree/bindings/display/panel/ilitek,ili9322.txt +Removing Documentation/devicetree/bindings/display/panel/feiyang,fy07024di26a30d.txt +Removing Documentation/devicetree/bindings/display/panel/boe,himax8279d.txt +Removing Documentation/devicetree/bindings/display/panel/arm,versatile-tft-panel.txt +Removing Documentation/devicetree/bindings/display/bridge/ti,ths813x.txt +Removing Documentation/devicetree/bindings/display/bridge/thine,thc63lvd1024.txt +Removing Documentation/devicetree/bindings/display/bridge/dw_mipi_dsi.txt +Removing Documentation/devicetree/bindings/display/bridge/dumb-vga-dac.txt +Removing Documentation/devicetree/bindings/display/bridge/adi,adv7123.txt +Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/display/intel_ddi.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/display/intel_display_power.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/display/intel_fbc.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/gem/i915_gem_domain.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/gt/intel_lrc.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/gt/intel_rps.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/i915_irq.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/i915_vma.c' using previous resolution. +Resolved 'drivers/gpu/drm/tidss/tidss_encoder.c' using previous resolution. +Resolved 'include/linux/dma-buf.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master f2e33a667b56] Merge remote-tracking branch 'drm/drm-next' +$ git diff -M --stat --summary HEAD^.. + .../display/allwinner,sun6i-a31-mipi-dsi.yaml | 2 +- + .../bindings/display/bridge/adi,adv7123.txt | 50 - + .../bindings/display/bridge/anx6345.yaml | 8 + + .../bindings/display/bridge/chrontel,ch7033.yaml | 77 + + .../bindings/display/bridge/dumb-vga-dac.txt | 50 - + .../bindings/display/bridge/dw_mipi_dsi.txt | 32 - + .../bindings/display/bridge/ite,it6505.yaml | 91 + + .../bindings/display/bridge/lvds-codec.yaml | 8 + + .../bindings/display/bridge/nwl-dsi.yaml | 226 ++ + .../devicetree/bindings/display/bridge/ps8640.yaml | 8 + + .../bindings/display/bridge/simple-bridge.yaml | 99 + + .../bindings/display/bridge/snps,dw-mipi-dsi.yaml | 68 + + .../bindings/display/bridge/thine,thc63lvd1024.txt | 66 - + .../display/bridge/thine,thc63lvd1024.yaml | 121 + + .../bindings/display/bridge/ti,ths813x.txt | 51 - + .../bindings/display/dsi-controller.yaml | 4 +- + .../display/panel/arm,versatile-tft-panel.txt | 31 - + .../display/panel/arm,versatile-tft-panel.yaml | 54 + + .../display/panel/asus,z00t-tm5p5-nt35596.yaml | 56 + + .../bindings/display/panel/boe,himax8279d.txt | 24 - + .../bindings/display/panel/boe,himax8279d.yaml | 59 + + .../bindings/display/panel/boe,tv101wum-nl6.yaml | 2 + + .../bindings/display/panel/display-timings.yaml | 8 +- + .../display/panel/feiyang,fy07024di26a30d.txt | 20 - + .../display/panel/feiyang,fy07024di26a30d.yaml | 58 + + .../bindings/display/panel/ilitek,ili9322.txt | 49 - + .../bindings/display/panel/ilitek,ili9322.yaml | 71 + + .../bindings/display/panel/ilitek,ili9881c.txt | 20 - + .../bindings/display/panel/ilitek,ili9881c.yaml | 50 + + .../bindings/display/panel/innolux,p097pfg.txt | 24 - + .../bindings/display/panel/innolux,p097pfg.yaml | 56 + + .../bindings/display/panel/innolux,p120zdg-bf1.txt | 22 - + .../display/panel/innolux,p120zdg-bf1.yaml | 43 + + .../bindings/display/panel/jdi,lt070me05000.txt | 31 - + .../bindings/display/panel/jdi,lt070me05000.yaml | 69 + + .../display/panel/kingdisplay,kd035g6-54nt.txt | 42 - + .../display/panel/kingdisplay,kd035g6-54nt.yaml | 65 + + .../display/panel/kingdisplay,kd097d04.txt | 22 - + .../display/panel/leadtek,ltk050h3146w.yaml | 51 + + .../bindings/display/panel/lg,acx467akm-7.txt | 7 - + .../bindings/display/panel/lg,ld070wx3-sl01.txt | 7 - + .../bindings/display/panel/lg,lg4573.txt | 19 - + .../bindings/display/panel/lg,lg4573.yaml | 45 + + .../bindings/display/panel/lg,lh500wx1-sd03.txt | 7 - + .../bindings/display/panel/lgphilips,lb035q02.txt | 33 - + .../bindings/display/panel/lgphilips,lb035q02.yaml | 59 + + .../display/panel/olimex,lcd-olinuxino.txt | 42 - + .../display/panel/olimex,lcd-olinuxino.yaml | 70 + + .../display/panel/osddisplays,osd101t2587-53ts.txt | 14 - + .../bindings/display/panel/panel-common.yaml | 17 +- + .../bindings/display/panel/panel-simple-dsi.yaml | 14 + + .../bindings/display/panel/panel-simple.yaml | 22 +- + .../bindings/display/panel/raydium,rm67191.txt | 41 - + .../bindings/display/panel/raydium,rm67191.yaml | 75 + + .../display/panel/samsung,amoled-mipi-dsi.yaml | 65 + + .../bindings/display/panel/samsung,ld9040.txt | 66 - + .../bindings/display/panel/samsung,ld9040.yaml | 107 + + .../bindings/display/panel/samsung,s6d16d0.txt | 30 - + .../bindings/display/panel/samsung,s6d16d0.yaml | 56 + + .../bindings/display/panel/samsung,s6e3ha2.txt | 31 - + .../bindings/display/panel/samsung,s6e63j0x03.txt | 24 - + .../bindings/display/panel/samsung,s6e63m0.txt | 33 - + .../bindings/display/panel/samsung,s6e63m0.yaml | 60 + + .../bindings/display/panel/seiko,43wvf1g.txt | 23 - + .../bindings/display/panel/seiko,43wvf1g.yaml | 50 + + .../bindings/display/panel/sharp,lq150x1lg11.txt | 36 - + .../bindings/display/panel/sharp,lq150x1lg11.yaml | 58 + + .../bindings/display/panel/sharp,ls037v7dw01.txt | 43 - + .../bindings/display/panel/sharp,ls037v7dw01.yaml | 68 + + .../bindings/display/panel/sharp,ls043t1le01.txt | 22 - + .../bindings/display/panel/sharp,ls043t1le01.yaml | 51 + + .../bindings/display/panel/simple-panel.txt | 1 - + .../bindings/display/panel/sitronix,st7701.txt | 30 - + .../bindings/display/panel/sitronix,st7701.yaml | 69 + + .../bindings/display/panel/sitronix,st7789v.txt | 37 - + .../bindings/display/panel/sitronix,st7789v.yaml | 63 + + .../bindings/display/panel/sony,acx565akm.txt | 30 - + .../bindings/display/panel/sony,acx565akm.yaml | 57 + + .../display/panel/startek,startek-kd050c.txt | 4 - + .../display/panel/startek,startek-kd050c.yaml | 33 + + .../devicetree/bindings/display/panel/tpo,td.yaml | 65 + + .../bindings/display/panel/tpo,td028ttec1.txt | 32 - + .../bindings/display/panel/tpo,td043mtea1.txt | 33 - + .../bindings/display/panel/visionox,rm69299.yaml | 57 + + .../devicetree/bindings/display/renesas,du.txt | 10 + + .../display/rockchip/rockchip,rk3066-hdmi.txt | 72 - + .../display/rockchip/rockchip,rk3066-hdmi.yaml | 140 + + .../bindings/display/rockchip/rockchip-vop.txt | 74 - + .../bindings/display/rockchip/rockchip-vop.yaml | 134 + + .../devicetree/bindings/vendor-prefixes.yaml | 8 +- + Documentation/gpu/amdgpu.rst | 88 + + Documentation/gpu/drm-internals.rst | 12 + + Documentation/gpu/drm-kms.rst | 5 +- + Documentation/gpu/drm-mm.rst | 9 - + Documentation/gpu/i915.rst | 6 +- + Documentation/gpu/todo.rst | 12 - + MAINTAINERS | 23 +- + arch/arm/mach-sa1100/shannon.c | 9 + + drivers/char/agp/intel-gtt.c | 21 +- + drivers/dma-buf/Makefile | 3 +- + drivers/dma-buf/dma-buf.c | 2 + + drivers/dma-buf/dma-fence-chain.c | 10 +- + drivers/dma-buf/dma-fence.c | 2 +- + drivers/dma-buf/selftests.h | 1 + + drivers/dma-buf/st-dma-fence-chain.c | 715 +++++ + drivers/gpu/drm/Kconfig | 2 - + drivers/gpu/drm/Makefile | 7 +- + drivers/gpu/drm/amd/amdgpu/Makefile | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 77 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 22 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 7 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 56 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 160 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.h | 3 - + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 73 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 394 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_df.h | 3 - + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 68 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 61 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 26 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c | 185 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.h | 29 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 55 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 60 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 47 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 88 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.h | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h | 2 - + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 11 + + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 53 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 446 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 56 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 139 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 61 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 5 + + drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 342 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 20 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 103 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 32 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 87 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 20 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 109 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 24 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 28 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 142 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 121 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h | 10 +- + drivers/gpu/drm/amd/amdgpu/atom.c | 7 +- + drivers/gpu/drm/amd/amdgpu/cik.c | 8 - + drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 11 +- + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 8 +- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 8 +- + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 14 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 14 +- + drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 13 +- + drivers/gpu/drm/amd/amdgpu/df_v3_6.c | 54 - + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 2862 +++++++++++++++++++- + drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 15 +- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 35 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 42 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 152 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4.c | 35 +- + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 14 +- + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 13 +- + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 11 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 3 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 12 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.h | 5 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c | 97 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_nv.h | 46 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_vi.h | 3 +- + drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 302 ++- + drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 18 - + drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c | 18 - + drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c | 7 - + drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 36 +- + drivers/gpu/drm/amd/amdgpu/nv.c | 20 +- + drivers/gpu/drm/amd/amdgpu/nvd.h | 1 + + drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 141 +- + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 419 +-- + drivers/gpu/drm/amd/amdgpu/psp_v12_0.c | 172 +- + drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 262 +- + drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 11 +- + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 11 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 41 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 129 +- + drivers/gpu/drm/amd/amdgpu/si.c | 8 - + drivers/gpu/drm/amd/amdgpu/si_dma.c | 10 +- + drivers/gpu/drm/amd/amdgpu/si_dpm.c | 20 - + drivers/gpu/drm/amd/amdgpu/soc15.c | 3 +- + drivers/gpu/drm/amd/amdgpu/soc15_common.h | 3 + + drivers/gpu/drm/amd/amdgpu/soc15d.h | 1 + + drivers/gpu/drm/amd/amdgpu/ta_ras_if.h | 59 +- + drivers/gpu/drm/amd/amdgpu/umc_v6_1.c | 112 +- + drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 6 +- + drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 16 +- + drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 23 +- + drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 7 +- + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 9 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 80 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 474 ++-- + drivers/gpu/drm/amd/amdgpu/vi.c | 24 - + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 55 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 40 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 47 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 23 + + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 62 +- + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 9 + + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 11 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 6 +- + drivers/gpu/drm/amd/display/Kconfig | 8 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 106 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 27 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 73 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 42 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 88 +- + drivers/gpu/drm/amd/display/dc/basics/Makefile | 3 +- + .../gpu/drm/amd/display/dc/bios/command_table2.c | 62 +- + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 2 +- + .../amd/display/dc/clk_mgr/dce100/dce_clk_mgr.c | 2 +- + .../dc/clk_mgr/dcn10/rv1_clk_mgr_vbios_smu.c | 3 - + drivers/gpu/drm/amd/display/dc/core/dc.c | 30 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 636 +++-- + drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 2 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 22 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 2 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 79 +- + drivers/gpu/drm/amd/display/dc/core/dc_sink.c | 1 + + drivers/gpu/drm/amd/display/dc/dc.h | 100 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 4 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 5 +- + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 6 + + drivers/gpu/drm/amd/display/dc/dc_helper.c | 6 +- + drivers/gpu/drm/amd/display/dc/dc_link.h | 30 +- + drivers/gpu/drm/amd/display/dc/dc_stream.h | 2 - + drivers/gpu/drm/amd/display/dc/dc_types.h | 5 + + drivers/gpu/drm/amd/display/dc/dce/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/dce/dce_abm.c | 225 +- + drivers/gpu/drm/amd/display/dc/dce/dce_abm.h | 30 +- + .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 33 - + drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h | 65 +- + .../gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 20 +- + .../gpu/drm/amd/display/dc/dce/dce_link_encoder.h | 3 + + .../gpu/drm/amd/display/dc/dce/dce_panel_cntl.c | 299 ++ + .../gpu/drm/amd/display/dc/dce/dce_panel_cntl.h | 125 + + .../drm/amd/display/dc/dce/dce_stream_encoder.c | 2 - + drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c | 319 +++ + .../dc/{basics/log_helpers.c => dce/dmub_abm.h} | 25 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 76 +- + .../drm/amd/display/dc/dce100/dce100_resource.c | 31 + + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 110 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.h | 7 +- + .../drm/amd/display/dc/dce110/dce110_opp_csc_v.c | 3 +- + .../drm/amd/display/dc/dce110/dce110_resource.c | 31 + + .../drm/amd/display/dc/dce112/dce112_resource.c | 31 + + .../drm/amd/display/dc/dce120/dce120_resource.c | 31 + + .../drm/amd/display/dc/dce80/dce80_hw_sequencer.c | 28 - + .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 31 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c | 7 - + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 18 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 121 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.c | 4 +- + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.c | 20 +- + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.h | 3 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 6 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h | 7 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 83 +- + .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 2 - + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 21 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.c | 4 +- + .../drm/amd/display/dc/dcn20/dcn20_link_encoder.c | 40 + + .../drm/amd/display/dc/dcn20/dcn20_link_encoder.h | 4 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_mpc.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c | 14 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.h | 7 + + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 223 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.h | 3 +- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubp.c | 33 +- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.c | 10 +- + .../drm/amd/display/dc/dcn21/dcn21_link_encoder.c | 27 +- + .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 119 +- + .../display/dc/dml/dcn20/display_mode_vba_20v2.c | 32 +- + .../amd/display/dc/dml/dcn21/display_mode_vba_21.c | 30 +- + .../display/dc/dml/dcn21/display_rq_dlg_calc_21.c | 17 +- + .../drm/amd/display/dc/dml/display_mode_structs.h | 2 + + .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 2 + + .../gpu/drm/amd/display/dc/dml/display_mode_vba.h | 2 + + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 2 +- + drivers/gpu/drm/amd/display/dc/hdcp/hdcp_msg.c | 89 + + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 3 + + drivers/gpu/drm/amd/display/dc/inc/hw/abm.h | 21 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 2 + + drivers/gpu/drm/amd/display/dc/inc/hw/panel_cntl.h | 67 + + .../drm/amd/display/dc/inc/hw/timing_generator.h | 3 + + drivers/gpu/drm/amd/display/dc/inc/hw/transform.h | 2 + + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 10 + + .../drm/amd/display/dc/inc/hw_sequencer_private.h | 2 - + drivers/gpu/drm/amd/display/dc/inc/resource.h | 3 - + .../amd/display/dc/virtual/virtual_link_encoder.c | 9 + + .../gpu/drm/amd/display/dmub/{inc => }/dmub_srv.h | 23 +- + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 14 + + .../gpu/drm/amd/display/dmub/inc/dmub_cmd_dal.h | 15 +- + drivers/gpu/drm/amd/display/dmub/inc/dmub_rb.h | 6 +- + drivers/gpu/drm/amd/display/dmub/inc/dmub_types.h | 11 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.c | 26 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn21.c | 2 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_reg.c | 2 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 33 +- + drivers/gpu/drm/amd/display/include/hdcp_types.h | 7 + + .../gpu/drm/amd/display/include/logger_interface.h | 4 - + .../drm/amd/display/modules/color/color_gamma.c | 33 +- + .../drm/amd/display/modules/color/color_gamma.h | 4 +- + .../drm/amd/display/modules/freesync/freesync.c | 101 +- + drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c | 5 +- + drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h | 30 +- + .../drm/amd/display/modules/hdcp/hdcp1_execution.c | 2 +- + .../drm/amd/display/modules/hdcp/hdcp2_execution.c | 2 +- + .../gpu/drm/amd/display/modules/hdcp/hdcp_log.c | 8 +- + .../gpu/drm/amd/display/modules/hdcp/hdcp_psp.c | 482 ++-- + .../gpu/drm/amd/display/modules/inc/mod_freesync.h | 3 + + drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h | 5 +- + .../gpu/drm/amd/display/modules/inc/mod_shared.h | 5 +- + .../amd/display/modules/info_packet/info_packet.c | 2 +- + .../drm/amd/display/modules/power/power_helpers.c | 103 +- + .../drm/amd/display/modules/power/power_helpers.h | 3 + + drivers/gpu/drm/amd/display/modules/stats/stats.c | 448 --- + .../amd/include/asic_reg/gc/gc_10_1_0_sh_mask.h | 4 + + .../amd/include/asic_reg/nbif/nbif_6_1_offset.h | 2 + + .../amd/include/asic_reg/nbio/nbio_7_0_offset.h | 2 + + .../amd/include/asic_reg/nbio/nbio_7_4_offset.h | 2 + + .../drm/amd/include/asic_reg/pwr/pwr_10_0_offset.h | 27 + + .../amd/include/asic_reg/pwr/pwr_10_0_sh_mask.h | 30 + + .../include/asic_reg/smuio/smuio_12_0_0_offset.h | 30 + + .../include/asic_reg/smuio/smuio_12_0_0_sh_mask.h | 33 + + drivers/gpu/drm/amd/include/atomfirmware.h | 114 +- + drivers/gpu/drm/amd/include/cgs_common.h | 1 - + drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 3 + + drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 306 ++- + drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 12 +- + drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c | 175 +- + .../amd/powerplay/hwmgr/smu7_clockpowergating.c | 61 +- + drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 135 +- + .../gpu/drm/amd/powerplay/hwmgr/smu7_powertune.c | 40 +- + drivers/gpu/drm/amd/powerplay/hwmgr/smu7_thermal.c | 17 +- + drivers/gpu/drm/amd/powerplay/hwmgr/smu8_hwmgr.c | 157 +- + drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.c | 4 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_baco.c | 2 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 141 +- + .../gpu/drm/amd/powerplay/hwmgr/vega10_powertune.c | 32 +- + .../gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c | 6 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega12_baco.c | 2 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c | 149 +- + .../gpu/drm/amd/powerplay/hwmgr/vega12_thermal.c | 7 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega20_baco.c | 8 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 181 +- + .../gpu/drm/amd/powerplay/hwmgr/vega20_powertune.c | 6 +- + .../gpu/drm/amd/powerplay/hwmgr/vega20_thermal.c | 7 +- + drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 9 +- + drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 1 + + .../amd/powerplay/inc/smu11_driver_if_arcturus.h | 15 +- + .../gpu/drm/amd/powerplay/inc/smu12_driver_if.h | 40 +- + drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 5 +- + drivers/gpu/drm/amd/powerplay/inc/smumgr.h | 7 +- + drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 107 +- + drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 8 +- + drivers/gpu/drm/amd/powerplay/smu_internal.h | 5 + + drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 79 +- + drivers/gpu/drm/amd/powerplay/smu_v12_0.c | 16 +- + drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c | 18 +- + drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c | 35 +- + .../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c | 1 + + .../drm/amd/powerplay/smumgr/polaris10_smumgr.c | 31 +- + .../gpu/drm/amd/powerplay/smumgr/smu10_smumgr.c | 39 +- + drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c | 48 +- + drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.h | 4 +- + drivers/gpu/drm/amd/powerplay/smumgr/smu8_smumgr.c | 69 +- + drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | 56 +- + .../gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c | 15 +- + .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c | 56 +- + .../gpu/drm/amd/powerplay/smumgr/vega12_smumgr.c | 68 +- + .../gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c | 106 +- + .../gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c | 18 +- + drivers/gpu/drm/amd/powerplay/vega20_ppt.c | 4 +- + drivers/gpu/drm/arc/arcpgu_drv.c | 7 +- + drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 16 +- + drivers/gpu/drm/arm/hdlcd_drv.c | 7 +- + drivers/gpu/drm/arm/malidp_drv.c | 3 +- + drivers/gpu/drm/armada/armada_drv.c | 2 + + drivers/gpu/drm/aspeed/aspeed_gfx.h | 3 +- + drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c | 2 +- + drivers/gpu/drm/aspeed/aspeed_gfx_drv.c | 31 +- + drivers/gpu/drm/aspeed/aspeed_gfx_out.c | 2 +- + drivers/gpu/drm/ast/ast_drv.c | 3 + + drivers/gpu/drm/ast/ast_main.c | 5 - + drivers/gpu/drm/ast/ast_mode.c | 25 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c | 12 +- + drivers/gpu/drm/bochs/bochs.h | 1 - + drivers/gpu/drm/bochs/bochs_drv.c | 6 +- + drivers/gpu/drm/bochs/bochs_kms.c | 16 +- + drivers/gpu/drm/bridge/Kconfig | 26 + + drivers/gpu/drm/bridge/Makefile | 2 + + drivers/gpu/drm/bridge/adv7511/Kconfig | 2 +- + drivers/gpu/drm/bridge/adv7511/adv7511_audio.c | 26 +- + drivers/gpu/drm/bridge/chrontel-ch7033.c | 620 +++++ + drivers/gpu/drm/bridge/nwl-dsi.c | 1213 +++++++++ + drivers/gpu/drm/bridge/nwl-dsi.h | 144 + + drivers/gpu/drm/bridge/panel.c | 7 +- + drivers/gpu/drm/bridge/parade-ps8640.c | 2 - + drivers/gpu/drm/bridge/sii9234.c | 3 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 86 +- + drivers/gpu/drm/bridge/tc358768.c | 4 +- + drivers/gpu/drm/cirrus/Kconfig | 19 - + drivers/gpu/drm/cirrus/Makefile | 2 - + drivers/gpu/drm/drm_atomic.c | 8 +- + drivers/gpu/drm/drm_auth.c | 69 +- + drivers/gpu/drm/drm_blend.c | 16 +- + drivers/gpu/drm/drm_bufs.c | 2 +- + drivers/gpu/drm/drm_client.c | 8 +- + drivers/gpu/drm/drm_connector.c | 6 +- + drivers/gpu/drm/drm_crtc_internal.h | 4 +- + drivers/gpu/drm/drm_debugfs.c | 45 +- + drivers/gpu/drm/drm_dma.c | 2 +- + drivers/gpu/drm/drm_dp_helper.c | 96 + + drivers/gpu/drm/drm_dp_mst_topology.c | 402 ++- + drivers/gpu/drm/drm_drv.c | 230 +- + drivers/gpu/drm/drm_edid.c | 111 +- + drivers/gpu/drm/drm_fb_cma_helper.c | 2 +- + drivers/gpu/drm/drm_fb_helper.c | 31 +- + drivers/gpu/drm/drm_file.c | 6 +- + drivers/gpu/drm/drm_framebuffer.c | 8 +- + drivers/gpu/drm/drm_gem.c | 23 +- + drivers/gpu/drm/drm_gem_framebuffer_helper.c | 224 +- + drivers/gpu/drm/drm_gem_vram_helper.c | 124 +- + drivers/gpu/drm/drm_internal.h | 7 +- + drivers/gpu/drm/drm_ioctl.c | 4 +- + drivers/gpu/drm/drm_managed.c | 275 ++ + drivers/gpu/drm/drm_mipi_dbi.c | 33 +- + drivers/gpu/drm/drm_mm.c | 133 +- + drivers/gpu/drm/drm_mode_config.c | 110 +- + drivers/gpu/drm/drm_mode_object.c | 10 +- + drivers/gpu/drm/drm_modes.c | 26 - + drivers/gpu/drm/drm_pci.c | 4 +- + drivers/gpu/drm/drm_plane.c | 9 + + drivers/gpu/drm/drm_vblank.c | 94 +- + drivers/gpu/drm/drm_vm.c | 4 +- + drivers/gpu/drm/drm_vram_helper_common.c | 94 - + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 18 +- + drivers/gpu/drm/exynos/exynos_dp.c | 8 +- + drivers/gpu/drm/exynos/exynos_drm_dpi.c | 8 +- + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 8 +- + drivers/gpu/drm/exynos/exynos_drm_vidi.c | 8 +- + drivers/gpu/drm/exynos/exynos_hdmi.c | 8 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 14 +- + drivers/gpu/drm/gma500/cdv_intel_crt.c | 14 +- + drivers/gpu/drm/gma500/cdv_intel_dp.c | 47 +- + drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 4 +- + drivers/gpu/drm/gma500/cdv_intel_lvds.c | 100 +- + drivers/gpu/drm/gma500/framebuffer.c | 16 +- + drivers/gpu/drm/gma500/mdfld_dsi_dpi.c | 11 +- + drivers/gpu/drm/gma500/mdfld_intel_display.c | 31 - + drivers/gpu/drm/gma500/mdfld_output.h | 1 - + drivers/gpu/drm/gma500/mdfld_tmd_vid.c | 6 - + drivers/gpu/drm/gma500/mdfld_tpo_vid.c | 6 - + drivers/gpu/drm/gma500/oaktrail_hdmi.c | 19 +- + drivers/gpu/drm/gma500/oaktrail_lvds.c | 5 +- + drivers/gpu/drm/gma500/psb_intel_drv.h | 1 - + drivers/gpu/drm/gma500/psb_intel_lvds.c | 18 +- + drivers/gpu/drm/gma500/psb_intel_sdvo.c | 99 - + drivers/gpu/drm/gma500/tc35876x-dsi-lvds.c | 13 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 9 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 8 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 2 +- + drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c | 9 +- + drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 1 - + drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 43 - + drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h | 1 - + drivers/gpu/drm/i2c/sil164_drv.c | 7 +- + drivers/gpu/drm/i2c/tda998x_drv.c | 23 +- + drivers/gpu/drm/i915/Makefile | 29 +- + drivers/gpu/drm/i915/display/icl_dsi.c | 188 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 25 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.h | 2 + + drivers/gpu/drm/i915/display/intel_audio.c | 163 +- + drivers/gpu/drm/i915/display/intel_bw.c | 33 +- + drivers/gpu/drm/i915/display/intel_bw.h | 9 + + drivers/gpu/drm/i915/display/intel_color.c | 121 +- + drivers/gpu/drm/i915/display/intel_connector.c | 5 +- + drivers/gpu/drm/i915/display/intel_crt.c | 40 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 748 +++-- + drivers/gpu/drm/i915/display/intel_ddi.h | 9 +- + drivers/gpu/drm/i915/display/intel_display.c | 845 +++--- + drivers/gpu/drm/i915/display/intel_display.h | 11 +- + .../gpu/drm/i915/display/intel_display_debugfs.c | 130 +- + .../gpu/drm/i915/display/intel_display_debugfs.h | 4 +- + drivers/gpu/drm/i915/display/intel_display_power.c | 558 ++-- + drivers/gpu/drm/i915/display/intel_display_power.h | 5 +- + drivers/gpu/drm/i915/display/intel_display_types.h | 47 +- + drivers/gpu/drm/i915/display/intel_dp.c | 1517 ++++++++--- + drivers/gpu/drm/i915/display/intel_dp.h | 4 + + .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 84 +- + .../gpu/drm/i915/display/intel_dp_link_training.c | 9 +- + .../gpu/drm/i915/display/intel_dp_link_training.h | 4 + + drivers/gpu/drm/i915/display/intel_dp_mst.c | 157 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 8 +- + drivers/gpu/drm/i915/display/intel_dsb.c | 6 +- + drivers/gpu/drm/i915/display/intel_dsi.c | 9 +- + drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 13 +- + drivers/gpu/drm/i915/display/intel_dvo.c | 9 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 84 +- + drivers/gpu/drm/i915/display/intel_fbdev.c | 96 +- + drivers/gpu/drm/i915/display/intel_frontbuffer.c | 6 +- + drivers/gpu/drm/i915/display/intel_global_state.c | 9 +- + drivers/gpu/drm/i915/display/intel_gmbus.c | 3 +- + drivers/gpu/drm/i915/display/intel_hdcp.c | 29 +- + drivers/gpu/drm/i915/display/intel_hdcp.h | 4 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 299 +- + drivers/gpu/drm/i915/display/intel_hotplug.c | 16 +- + drivers/gpu/drm/i915/display/intel_hotplug.h | 3 +- + drivers/gpu/drm/i915/display/intel_lvds.c | 38 +- + drivers/gpu/drm/i915/display/intel_overlay.c | 8 +- + drivers/gpu/drm/i915/display/intel_panel.c | 162 +- + drivers/gpu/drm/i915/display/intel_panel.h | 13 +- + drivers/gpu/drm/i915/display/intel_psr.c | 47 +- + drivers/gpu/drm/i915/display/intel_sdvo.c | 22 +- + drivers/gpu/drm/i915/display/intel_sprite.c | 8 + + drivers/gpu/drm/i915/display/intel_tc.c | 142 +- + drivers/gpu/drm/i915/display/intel_tv.c | 15 +- + drivers/gpu/drm/i915/display/vlv_dsi.c | 26 +- + drivers/gpu/drm/i915/gem/i915_gem_context.c | 89 +- + drivers/gpu/drm/i915/gem/i915_gem_context.h | 4 + + drivers/gpu/drm/i915/gem/i915_gem_domain.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 365 ++- + drivers/gpu/drm/i915/gem/i915_gem_object.c | 5 +- + drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 3 - + drivers/gpu/drm/i915/gem/i915_gem_pages.c | 2 - + drivers/gpu/drm/i915/gem/i915_gem_phys.c | 2 - + drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 18 +- + drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 4 +- + .../gpu/drm/i915/gem/selftests/huge_gem_object.c | 3 +- + drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 83 +- + .../drm/i915/gem/selftests/i915_gem_client_blt.c | 595 ++++ + .../gpu/drm/i915/gem/selftests/i915_gem_context.c | 3 +- + drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 4 - + .../gpu/drm/i915/gem/selftests/i915_gem_object.c | 2 +- + drivers/gpu/drm/i915/gt/debugfs_engines.c | 2 +- + drivers/gpu/drm/i915/gt/debugfs_gt.c | 15 +- + drivers/gpu/drm/i915/gt/debugfs_gt.h | 9 +- + drivers/gpu/drm/i915/gt/debugfs_gt_pm.c | 74 +- + drivers/gpu/drm/i915/gt/intel_breadcrumbs.c | 6 +- + drivers/gpu/drm/i915/gt/intel_context.c | 5 + + drivers/gpu/drm/i915/gt/intel_context_sseu.c | 3 +- + drivers/gpu/drm/i915/gt/intel_context_types.h | 2 + + drivers/gpu/drm/i915/gt/intel_engine.h | 5 +- + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 199 +- + drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c | 2 +- + drivers/gpu/drm/i915/gt/intel_engine_pm.c | 12 +- + drivers/gpu/drm/i915/gt/intel_engine_pm.h | 6 + + drivers/gpu/drm/i915/gt/intel_engine_types.h | 36 +- + drivers/gpu/drm/i915/gt/intel_ggtt.c | 59 +- + .../intel_ggtt_fencing.c} | 170 +- + .../intel_ggtt_fencing.h} | 17 +- + drivers/gpu/drm/i915/gt/intel_gpu_commands.h | 3 +- + drivers/gpu/drm/i915/gt/intel_gt.c | 66 +- + drivers/gpu/drm/i915/gt/intel_gt_clock_utils.c | 102 + + drivers/gpu/drm/i915/gt/intel_gt_clock_utils.h | 27 + + drivers/gpu/drm/i915/gt/intel_gt_pm.c | 15 +- + drivers/gpu/drm/i915/gt/intel_gt_requests.c | 20 +- + drivers/gpu/drm/i915/gt/intel_gt_types.h | 9 +- + drivers/gpu/drm/i915/gt/intel_gtt.h | 5 +- + drivers/gpu/drm/i915/gt/intel_lrc.c | 785 ++++-- + drivers/gpu/drm/i915/gt/intel_lrc.h | 1 + + drivers/gpu/drm/i915/gt/intel_lrc_reg.h | 6 +- + drivers/gpu/drm/i915/gt/intel_rc6.c | 39 +- + drivers/gpu/drm/i915/gt/intel_renderstate.c | 6 +- + drivers/gpu/drm/i915/gt/intel_reset.c | 16 +- + drivers/gpu/drm/i915/gt/intel_ring.h | 5 +- + drivers/gpu/drm/i915/gt/intel_ring_submission.c | 49 +- + drivers/gpu/drm/i915/gt/intel_rps.c | 446 ++- + drivers/gpu/drm/i915/gt/intel_rps.h | 60 + + drivers/gpu/drm/i915/gt/intel_rps_types.h | 14 +- + drivers/gpu/drm/i915/gt/intel_sseu.c | 33 +- + drivers/gpu/drm/i915/gt/intel_timeline.c | 29 +- + drivers/gpu/drm/i915/gt/intel_timeline.h | 2 + + drivers/gpu/drm/i915/gt/intel_workarounds.c | 21 +- + drivers/gpu/drm/i915/gt/selftest_context.c | 2 +- + drivers/gpu/drm/i915/gt/selftest_gt_pm.c | 8 + + drivers/gpu/drm/i915/gt/selftest_lrc.c | 613 ++++- + drivers/gpu/drm/i915/gt/selftest_rc6.c | 30 +- + drivers/gpu/drm/i915/gt/selftest_rps.c | 1303 +++++++++ + drivers/gpu/drm/i915/gt/selftest_rps.h | 17 + + drivers/gpu/drm/i915/gt/shmem_utils.c | 173 ++ + drivers/gpu/drm/i915/gt/shmem_utils.h | 23 + + drivers/gpu/drm/i915/gt/st_shmem_utils.c | 63 + + drivers/gpu/drm/i915/gt/uc/intel_guc.c | 46 +- + drivers/gpu/drm/i915/gt/uc/intel_guc.h | 7 + + drivers/gpu/drm/i915/gt/uc/intel_guc_debugfs.c | 42 + + drivers/gpu/drm/i915/gt/uc/intel_guc_debugfs.h | 14 + + drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c | 14 - + drivers/gpu/drm/i915/gt/uc/intel_guc_fw.h | 1 - + drivers/gpu/drm/i915/gt/uc/intel_guc_log.c | 97 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_log.h | 4 + + drivers/gpu/drm/i915/gt/uc/intel_guc_log_debugfs.c | 124 + + drivers/gpu/drm/i915/gt/uc/intel_guc_log_debugfs.h | 15 + + drivers/gpu/drm/i915/gt/uc/intel_huc.c | 53 +- + drivers/gpu/drm/i915/gt/uc/intel_huc.h | 2 + + drivers/gpu/drm/i915/gt/uc/intel_huc_debugfs.c | 36 + + drivers/gpu/drm/i915/gt/uc/intel_huc_debugfs.h | 14 + + drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c | 17 - + drivers/gpu/drm/i915/gt/uc/intel_huc_fw.h | 1 - + drivers/gpu/drm/i915/gt/uc/intel_uc.c | 35 +- + drivers/gpu/drm/i915/gt/uc/intel_uc.h | 1 + + drivers/gpu/drm/i915/gt/uc/intel_uc_debugfs.c | 30 + + drivers/gpu/drm/i915/gt/uc/intel_uc_debugfs.h | 14 + + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 56 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h | 3 +- + drivers/gpu/drm/i915/gvt/aperture_gm.c | 2 +- + drivers/gpu/drm/i915/gvt/gtt.c | 15 + + drivers/gpu/drm/i915/gvt/gvt.c | 1 - + drivers/gpu/drm/i915/gvt/gvt.h | 5 + + drivers/gpu/drm/i915/gvt/hypercall.h | 2 - + drivers/gpu/drm/i915/gvt/scheduler.c | 132 +- + drivers/gpu/drm/i915/i915_active.c | 137 +- + drivers/gpu/drm/i915/i915_active.h | 14 +- + drivers/gpu/drm/i915/i915_debugfs.c | 345 +-- + drivers/gpu/drm/i915/i915_debugfs.h | 4 +- + drivers/gpu/drm/i915/i915_drv.c | 156 +- + drivers/gpu/drm/i915/i915_drv.h | 14 +- + drivers/gpu/drm/i915/i915_gem.c | 20 +- + drivers/gpu/drm/i915/i915_gem_evict.c | 7 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 33 +- + drivers/gpu/drm/i915/i915_gpu_error.h | 1 - + drivers/gpu/drm/i915/i915_irq.c | 8 +- + drivers/gpu/drm/i915/i915_pci.c | 39 +- + drivers/gpu/drm/i915/i915_perf.c | 565 ++-- + drivers/gpu/drm/i915/i915_perf_types.h | 46 +- + drivers/gpu/drm/i915/i915_pmu.c | 36 +- + drivers/gpu/drm/i915/i915_reg.h | 179 +- + drivers/gpu/drm/i915/i915_request.c | 29 +- + drivers/gpu/drm/i915/i915_request.h | 2 + + drivers/gpu/drm/i915/i915_scheduler.c | 10 + + drivers/gpu/drm/i915/i915_sw_fence.c | 2 +- + drivers/gpu/drm/i915/i915_sw_fence_work.c | 5 +- + drivers/gpu/drm/i915/i915_sw_fence_work.h | 23 + + drivers/gpu/drm/i915/i915_switcheroo.c | 4 +- + drivers/gpu/drm/i915/i915_utils.c | 3 +- + drivers/gpu/drm/i915/i915_vma.c | 96 +- + drivers/gpu/drm/i915/i915_vma.h | 4 +- + drivers/gpu/drm/i915/intel_device_info.c | 42 +- + drivers/gpu/drm/i915/intel_device_info.h | 3 + + drivers/gpu/drm/i915/intel_dram.c | 3 +- + drivers/gpu/drm/i915/intel_pm.c | 100 +- + drivers/gpu/drm/i915/intel_pm.h | 2 + + drivers/gpu/drm/i915/intel_sideband.c | 4 +- + drivers/gpu/drm/i915/intel_uncore.c | 55 +- + drivers/gpu/drm/i915/intel_uncore.h | 6 +- + drivers/gpu/drm/i915/intel_wakeref.c | 12 +- + drivers/gpu/drm/i915/intel_wakeref.h | 22 +- + drivers/gpu/drm/i915/intel_wopcm.c | 44 +- + drivers/gpu/drm/i915/oa/i915_oa_bdw.c | 90 - + drivers/gpu/drm/i915/oa/i915_oa_bdw.h | 16 - + drivers/gpu/drm/i915/oa/i915_oa_bxt.c | 88 - + drivers/gpu/drm/i915/oa/i915_oa_bxt.h | 16 - + drivers/gpu/drm/i915/oa/i915_oa_cflgt2.c | 89 - + drivers/gpu/drm/i915/oa/i915_oa_cflgt2.h | 16 - + drivers/gpu/drm/i915/oa/i915_oa_cflgt3.c | 89 - + drivers/gpu/drm/i915/oa/i915_oa_cflgt3.h | 16 - + drivers/gpu/drm/i915/oa/i915_oa_chv.c | 89 - + drivers/gpu/drm/i915/oa/i915_oa_chv.h | 16 - + drivers/gpu/drm/i915/oa/i915_oa_cnl.c | 101 - + drivers/gpu/drm/i915/oa/i915_oa_cnl.h | 16 - + drivers/gpu/drm/i915/oa/i915_oa_glk.c | 88 - + drivers/gpu/drm/i915/oa/i915_oa_glk.h | 16 - + drivers/gpu/drm/i915/oa/i915_oa_hsw.c | 118 - + drivers/gpu/drm/i915/oa/i915_oa_hsw.h | 16 - + drivers/gpu/drm/i915/oa/i915_oa_icl.c | 98 - + drivers/gpu/drm/i915/oa/i915_oa_icl.h | 16 - + drivers/gpu/drm/i915/oa/i915_oa_kblgt2.c | 89 - + drivers/gpu/drm/i915/oa/i915_oa_kblgt2.h | 16 - + drivers/gpu/drm/i915/oa/i915_oa_kblgt3.c | 89 - + drivers/gpu/drm/i915/oa/i915_oa_kblgt3.h | 16 - + drivers/gpu/drm/i915/oa/i915_oa_sklgt2.c | 88 - + drivers/gpu/drm/i915/oa/i915_oa_sklgt2.h | 16 - + drivers/gpu/drm/i915/oa/i915_oa_sklgt3.c | 89 - + drivers/gpu/drm/i915/oa/i915_oa_sklgt3.h | 16 - + drivers/gpu/drm/i915/oa/i915_oa_sklgt4.c | 89 - + drivers/gpu/drm/i915/oa/i915_oa_sklgt4.h | 16 - + drivers/gpu/drm/i915/oa/i915_oa_tgl.c | 121 - + drivers/gpu/drm/i915/oa/i915_oa_tgl.h | 16 - + drivers/gpu/drm/i915/selftests/i915_active.c | 12 +- + drivers/gpu/drm/i915/selftests/i915_gem.c | 2 - + drivers/gpu/drm/i915/selftests/i915_gem_evict.c | 26 +- + drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 33 +- + .../gpu/drm/i915/selftests/i915_mock_selftests.h | 1 + + drivers/gpu/drm/i915/selftests/i915_perf.c | 98 +- + .../gpu/drm/i915/selftests/i915_perf_selftests.h | 1 + + drivers/gpu/drm/i915/selftests/i915_request.c | 586 +++- + .../gpu/drm/i915/selftests/intel_memory_region.c | 5 +- + drivers/gpu/drm/i915/selftests/librapl.c | 24 + + drivers/gpu/drm/i915/selftests/librapl.h | 13 + + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 38 +- + drivers/gpu/drm/imx/dw_hdmi-imx.c | 8 +- + drivers/gpu/drm/imx/imx-drm-core.c | 10 +- + drivers/gpu/drm/imx/imx-drm.h | 1 - + drivers/gpu/drm/imx/imx-ldb.c | 8 +- + drivers/gpu/drm/imx/imx-tve.c | 8 +- + drivers/gpu/drm/imx/parallel-display.c | 8 +- + drivers/gpu/drm/ingenic/ingenic-drm.c | 43 +- + drivers/gpu/drm/lima/Kconfig | 2 + + drivers/gpu/drm/lima/Makefile | 4 +- + drivers/gpu/drm/lima/lima_bcast.c | 25 +- + drivers/gpu/drm/lima/lima_bcast.h | 2 + + drivers/gpu/drm/lima/lima_ctx.c | 3 + + drivers/gpu/drm/lima/lima_ctx.h | 5 + + drivers/gpu/drm/lima/lima_devfreq.c | 257 ++ + drivers/gpu/drm/lima/lima_devfreq.h | 44 + + drivers/gpu/drm/lima/lima_device.c | 228 +- + drivers/gpu/drm/lima/lima_device.h | 17 +- + drivers/gpu/drm/lima/lima_dlbu.c | 17 +- + drivers/gpu/drm/lima/lima_dlbu.h | 2 + + drivers/gpu/drm/lima/lima_drv.c | 141 +- + drivers/gpu/drm/lima/lima_drv.h | 1 + + drivers/gpu/drm/lima/lima_dump.h | 77 + + drivers/gpu/drm/lima/lima_gp.c | 21 +- + drivers/gpu/drm/lima/lima_gp.h | 2 + + drivers/gpu/drm/lima/lima_l2_cache.c | 38 +- + drivers/gpu/drm/lima/lima_l2_cache.h | 2 + + drivers/gpu/drm/lima/lima_mmu.c | 49 +- + drivers/gpu/drm/lima/lima_mmu.h | 2 + + drivers/gpu/drm/lima/lima_pmu.c | 77 +- + drivers/gpu/drm/lima/lima_pmu.h | 2 + + drivers/gpu/drm/lima/lima_pp.c | 31 +- + drivers/gpu/drm/lima/lima_pp.h | 4 + + drivers/gpu/drm/lima/lima_sched.c | 193 +- + drivers/gpu/drm/lima/lima_sched.h | 11 + + drivers/gpu/drm/lima/lima_trace.c | 7 + + drivers/gpu/drm/lima/lima_trace.h | 50 + + drivers/gpu/drm/lima/lima_vm.h | 3 +- + drivers/gpu/drm/mcde/mcde_display.c | 10 +- + drivers/gpu/drm/mcde/mcde_drm.h | 2 + + drivers/gpu/drm/mcde/mcde_drv.c | 52 +- + drivers/gpu/drm/mcde/mcde_dsi.c | 9 +- + drivers/gpu/drm/mediatek/mtk_dpi.c | 14 +- + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 13 +- + drivers/gpu/drm/mediatek/mtk_dsi.c | 14 +- + drivers/gpu/drm/meson/meson_drv.c | 34 +- + drivers/gpu/drm/meson/meson_drv.h | 6 + + drivers/gpu/drm/meson/meson_dw_hdmi.c | 2 +- + drivers/gpu/drm/meson/meson_plane.c | 2 +- + drivers/gpu/drm/meson/meson_vclk.c | 16 +- + drivers/gpu/drm/meson/meson_vclk.h | 3 +- + drivers/gpu/drm/mgag200/mgag200_cursor.c | 4 +- + drivers/gpu/drm/mgag200/mgag200_drv.c | 4 +- + drivers/gpu/drm/mgag200/mgag200_drv.h | 15 +- + drivers/gpu/drm/mgag200/mgag200_i2c.c | 10 +- + drivers/gpu/drm/mgag200/mgag200_main.c | 119 +- + drivers/gpu/drm/mgag200/mgag200_mode.c | 127 +- + drivers/gpu/drm/msm/adreno/a5xx_debugfs.c | 18 +- + drivers/gpu/drm/msm/adreno/a5xx_gpu.h | 2 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 14 +- + drivers/gpu/drm/msm/msm_debugfs.c | 23 +- + drivers/gpu/drm/msm/msm_debugfs.h | 2 +- + drivers/gpu/drm/msm/msm_gpu.h | 2 +- + drivers/gpu/drm/nouveau/nouveau_debugfs.c | 6 +- + drivers/gpu/drm/nouveau/nouveau_debugfs.h | 8 +- + drivers/gpu/drm/nouveau/nvkm/subdev/therm/ic.c | 4 +- + drivers/gpu/drm/omapdrm/dss/dispc.c | 33 +- + drivers/gpu/drm/omapdrm/dss/venc.c | 43 - + drivers/gpu/drm/omapdrm/omap_debugfs.c | 29 +- + drivers/gpu/drm/omapdrm/omap_drv.h | 2 +- + drivers/gpu/drm/panel/Kconfig | 29 + + drivers/gpu/drm/panel/Makefile | 3 + + .../gpu/drm/panel/panel-asus-z00t-tm5p5-n35596.c | 367 +++ + drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c | 31 + + drivers/gpu/drm/panel/panel-ilitek-ili9322.c | 4 +- + drivers/gpu/drm/panel/panel-leadtek-ltk050h3146w.c | 691 +++++ + drivers/gpu/drm/panel/panel-leadtek-ltk500hd1829.c | 2 +- + drivers/gpu/drm/panel/panel-novatek-nt39016.c | 46 +- + drivers/gpu/drm/panel/panel-simple.c | 247 +- + drivers/gpu/drm/panel/panel-truly-nt35597.c | 2 - + drivers/gpu/drm/panel/panel-visionox-rm69299.c | 303 +++ + drivers/gpu/drm/pl111/Makefile | 1 - + drivers/gpu/drm/pl111/pl111_debugfs.c | 8 +- + drivers/gpu/drm/pl111/pl111_drm.h | 2 +- + drivers/gpu/drm/pl111/pl111_drv.c | 13 +- + drivers/gpu/drm/pl111/pl111_versatile.c | 148 +- + drivers/gpu/drm/pl111/pl111_vexpress.c | 138 - + drivers/gpu/drm/pl111/pl111_vexpress.h | 29 - + drivers/gpu/drm/qxl/qxl_debugfs.c | 28 +- + drivers/gpu/drm/qxl/qxl_display.c | 32 +- + drivers/gpu/drm/qxl/qxl_drv.c | 25 +- + drivers/gpu/drm/qxl/qxl_drv.h | 20 +- + drivers/gpu/drm/qxl/qxl_dumb.c | 2 +- + drivers/gpu/drm/qxl/qxl_gem.c | 2 +- + drivers/gpu/drm/qxl/qxl_ioctl.c | 14 +- + drivers/gpu/drm/qxl/qxl_irq.c | 2 +- + drivers/gpu/drm/qxl/qxl_kms.c | 15 +- + drivers/gpu/drm/qxl/qxl_object.c | 2 +- + drivers/gpu/drm/qxl/qxl_release.c | 2 +- + drivers/gpu/drm/qxl/qxl_ttm.c | 8 +- + drivers/gpu/drm/r128/ati_pcigart.c | 3 +- + drivers/gpu/drm/radeon/Makefile | 35 +- + drivers/gpu/drm/radeon/atom.c | 3 +- + drivers/gpu/drm/radeon/ci_dpm.c | 14 - + drivers/gpu/drm/radeon/radeon_atombios.c | 4 +- + drivers/gpu/drm/radeon/radeon_combios.c | 4 +- + drivers/gpu/drm/radeon/radeon_drv.c | 2 +- + drivers/gpu/drm/radeon/radeon_kms.c | 4 +- + drivers/gpu/drm/radeon/si_dpm.c | 18 - + drivers/gpu/drm/rcar-du/rcar_du_drv.c | 1 - + drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 14 +- + drivers/gpu/drm/rcar-du/rcar_du_kms.c | 4 +- + drivers/gpu/drm/rcar-du/rcar_du_plane.c | 16 +- + drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 14 +- + drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 9 +- + drivers/gpu/drm/rockchip/cdn-dp-core.c | 13 +- + drivers/gpu/drm/rockchip/cdn-dp-reg.c | 6 +- + drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 8 +- + drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 8 +- + drivers/gpu/drm/rockchip/inno_hdmi.c | 8 +- + drivers/gpu/drm/rockchip/rk3066_hdmi.c | 8 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 14 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 1 + + drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 43 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 137 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 17 + + drivers/gpu/drm/rockchip/rockchip_lvds.c | 10 +- + drivers/gpu/drm/rockchip/rockchip_rgb.c | 8 +- + drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 83 +- + drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 14 +- + drivers/gpu/drm/shmobile/shmob_drm_drv.c | 2 - + drivers/gpu/drm/shmobile/shmob_drm_kms.c | 6 +- + drivers/gpu/drm/sti/sti_compositor.c | 6 +- + drivers/gpu/drm/sti/sti_compositor.h | 4 +- + drivers/gpu/drm/sti/sti_crtc.c | 2 +- + drivers/gpu/drm/sti/sti_cursor.c | 14 +- + drivers/gpu/drm/sti/sti_drv.c | 16 +- + drivers/gpu/drm/sti/sti_dvo.c | 13 +- + drivers/gpu/drm/sti/sti_gdp.c | 7 +- + drivers/gpu/drm/sti/sti_hda.c | 13 +- + drivers/gpu/drm/sti/sti_hdmi.c | 13 +- + drivers/gpu/drm/sti/sti_hqvdp.c | 12 +- + drivers/gpu/drm/sti/sti_mixer.c | 10 +- + drivers/gpu/drm/sti/sti_mixer.h | 2 +- + drivers/gpu/drm/sti/sti_tvout.c | 13 +- + drivers/gpu/drm/sti/sti_vid.c | 8 +- + drivers/gpu/drm/sti/sti_vid.h | 2 +- + drivers/gpu/drm/stm/drv.c | 10 +- + drivers/gpu/drm/stm/ltdc.c | 102 +- + drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 12 +- + drivers/gpu/drm/sun4i/sun4i_lvds.c | 12 +- + drivers/gpu/drm/sun4i/sun4i_rgb.c | 17 +- + drivers/gpu/drm/sun4i/sun4i_tcon.c | 4 +- + drivers/gpu/drm/sun4i/sun4i_tv.c | 17 +- + drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 12 +- + drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c | 8 +- + drivers/gpu/drm/sun4i/sun8i_mixer.c | 111 +- + drivers/gpu/drm/sun4i/sun8i_mixer.h | 10 +- + drivers/gpu/drm/sun4i/sun8i_ui_layer.c | 14 +- + drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 40 +- + drivers/gpu/drm/tegra/dc.c | 11 +- + drivers/gpu/drm/tegra/dpaux.c | 2 - + drivers/gpu/drm/tegra/drm.c | 8 +- + drivers/gpu/drm/tegra/drm.h | 4 +- + drivers/gpu/drm/tegra/dsi.c | 21 +- + drivers/gpu/drm/tegra/fb.c | 2 +- + drivers/gpu/drm/tegra/hdmi.c | 21 +- + drivers/gpu/drm/tegra/output.c | 6 +- + drivers/gpu/drm/tegra/rgb.c | 8 +- + drivers/gpu/drm/tegra/sor.c | 20 +- + drivers/gpu/drm/tidss/tidss_crtc.c | 16 +- + drivers/gpu/drm/tidss/tidss_dispc.c | 11 +- + drivers/gpu/drm/tidss/tidss_dispc.h | 6 - + drivers/gpu/drm/tidss/tidss_drv.c | 25 +- + drivers/gpu/drm/tidss/tidss_drv.h | 4 +- + drivers/gpu/drm/tidss/tidss_encoder.c | 22 +- + drivers/gpu/drm/tidss/tidss_irq.c | 12 +- + drivers/gpu/drm/tidss/tidss_kms.c | 21 +- + drivers/gpu/drm/tidss/tidss_kms.h | 1 - + drivers/gpu/drm/tidss/tidss_plane.c | 6 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 20 +- + drivers/gpu/drm/tilcdc/tilcdc_external.c | 10 +- + drivers/gpu/drm/tilcdc/tilcdc_panel.c | 8 +- + drivers/gpu/drm/tiny/Kconfig | 19 + + drivers/gpu/drm/tiny/Makefile | 1 + + drivers/gpu/drm/{cirrus => tiny}/cirrus.c | 82 +- + drivers/gpu/drm/tiny/gm12u320.c | 242 +- + drivers/gpu/drm/tiny/hx8357d.c | 16 +- + drivers/gpu/drm/tiny/ili9225.c | 16 +- + drivers/gpu/drm/tiny/ili9341.c | 16 +- + drivers/gpu/drm/tiny/ili9486.c | 16 +- + drivers/gpu/drm/tiny/mi0283qt.c | 16 +- + drivers/gpu/drm/tiny/repaper.c | 28 +- + drivers/gpu/drm/tiny/st7586.c | 16 +- + drivers/gpu/drm/tiny/st7735r.c | 16 +- + drivers/gpu/drm/ttm/ttm_bo.c | 4 +- + drivers/gpu/drm/udl/udl_connector.c | 4 +- + drivers/gpu/drm/udl/udl_drv.c | 45 +- + drivers/gpu/drm/udl/udl_drv.h | 2 - + drivers/gpu/drm/udl/udl_main.c | 10 - + drivers/gpu/drm/udl/udl_modeset.c | 31 +- + drivers/gpu/drm/v3d/v3d_debugfs.c | 20 +- + drivers/gpu/drm/v3d/v3d_drv.c | 53 +- + drivers/gpu/drm/v3d/v3d_drv.h | 9 +- + drivers/gpu/drm/v3d/v3d_gem.c | 17 +- + drivers/gpu/drm/v3d/v3d_irq.c | 16 +- + drivers/gpu/drm/v3d/v3d_mmu.c | 10 +- + drivers/gpu/drm/v3d/v3d_sched.c | 10 +- + drivers/gpu/drm/vboxvideo/vbox_drv.c | 32 +- + drivers/gpu/drm/vboxvideo/vbox_drv.h | 1 + + drivers/gpu/drm/vboxvideo/vbox_irq.c | 2 +- + drivers/gpu/drm/vboxvideo/vbox_main.c | 29 +- + drivers/gpu/drm/vboxvideo/vbox_mode.c | 10 +- + drivers/gpu/drm/vboxvideo/vbox_ttm.c | 12 - + drivers/gpu/drm/vc4/vc4_debugfs.c | 11 +- + drivers/gpu/drm/vc4/vc4_dpi.c | 8 +- + drivers/gpu/drm/vc4/vc4_drv.h | 2 +- + drivers/gpu/drm/vc4/vc4_dsi.c | 15 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 17 +- + drivers/gpu/drm/vc4/vc4_vec.c | 8 +- + drivers/gpu/drm/vgem/vgem_drv.c | 15 +- + drivers/gpu/drm/virtio/virtgpu_debugfs.c | 3 +- + drivers/gpu/drm/virtio/virtgpu_display.c | 8 +- + drivers/gpu/drm/virtio/virtgpu_drv.h | 36 +- + drivers/gpu/drm/virtio/virtgpu_gem.c | 13 +- + drivers/gpu/drm/virtio/virtgpu_ioctl.c | 1 - + drivers/gpu/drm/virtio/virtgpu_object.c | 7 +- + drivers/gpu/drm/virtio/virtgpu_vq.c | 9 +- + drivers/gpu/drm/vkms/vkms_drv.c | 21 +- + drivers/gpu/drm/vkms/vkms_drv.h | 5 - + drivers/gpu/drm/vkms/vkms_gem.c | 11 +- + drivers/gpu/drm/vkms/vkms_output.c | 8 +- + drivers/gpu/drm/xen/xen_drm_front.c | 4 +- + drivers/gpu/drm/zte/zx_hdmi.c | 8 +- + drivers/gpu/drm/zte/zx_tvenc.c | 8 +- + drivers/gpu/drm/zte/zx_vga.c | 8 +- + drivers/video/fbdev/Kconfig | 2 +- + drivers/video/fbdev/arcfb.c | 10 +- + drivers/video/fbdev/atmel_lcdfb.c | 1 - + drivers/video/fbdev/aty/aty128fb.c | 14 - + drivers/video/fbdev/aty/atyfb_base.c | 6 +- + drivers/video/fbdev/controlfb.c | 825 +++--- + drivers/video/fbdev/core/fbmon.c | 2 +- + drivers/video/fbdev/cyber2000fb.c | 2 + + drivers/video/fbdev/i810/i810_main.c | 10 +- + drivers/video/fbdev/imxfb.c | 27 +- + drivers/video/fbdev/matrox/g450_pll.c | 22 - + drivers/video/fbdev/matrox/matroxfb_base.h | 2 +- + drivers/video/fbdev/mb862xx/mb862xxfb_accel.c | 2 - + drivers/video/fbdev/mx3fb.c | 20 +- + drivers/video/fbdev/omap/omapfb_main.c | 14 +- + drivers/video/fbdev/omap2/omapfb/dss/dispc.c | 114 - + drivers/video/fbdev/omap2/omapfb/dss/dss.h | 20 - + drivers/video/fbdev/omap2/omapfb/dss/venc.c | 43 - + drivers/video/fbdev/omap2/omapfb/omapfb-sysfs.c | 8 +- + drivers/video/fbdev/pm2fb.c | 2 +- + drivers/video/fbdev/pm3fb.c | 8 +- + drivers/video/fbdev/pxa168fb.c | 5 +- + drivers/video/fbdev/riva/riva_hw.c | 18 - + drivers/video/fbdev/s1d13xxxfb.c | 14 +- + drivers/video/fbdev/sa1100fb.c | 20 +- + drivers/video/fbdev/sa1100fb.h | 3 + + drivers/video/fbdev/savage/savagefb.h | 2 +- + drivers/video/fbdev/ssd1307fb.c | 102 +- + drivers/video/fbdev/udlfb.c | 6 +- + drivers/video/fbdev/uvesafb.c | 14 +- + drivers/video/fbdev/valkyriefb.c | 4 +- + drivers/video/fbdev/vesafb.c | 16 +- + drivers/video/fbdev/via/debug.h | 6 +- + drivers/video/fbdev/via/viafbdev.c | 2 +- + drivers/video/fbdev/vt8500lcdfb.c | 1 + + drivers/video/fbdev/w100fb.c | 2 + + include/drm/drm_client.h | 4 +- + include/drm/drm_connector.h | 4 +- + include/drm/drm_debugfs.h | 16 +- + include/drm/drm_device.h | 24 +- + include/drm/drm_displayid.h | 2 +- + include/drm/drm_dp_helper.h | 174 +- + include/drm/drm_dp_mst_helper.h | 86 +- + include/drm/drm_drv.h | 44 +- + include/drm/drm_encoder.h | 8 +- + include/drm/drm_fb_helper.h | 6 +- + include/drm/drm_file.h | 11 + + include/drm/drm_framebuffer.h | 38 + + include/drm/drm_gem_framebuffer_helper.h | 15 + + include/drm/drm_gem_vram_helper.h | 2 +- + include/drm/drm_legacy.h | 15 + + include/drm/drm_managed.h | 109 + + include/drm/drm_mipi_dbi.h | 8 +- + include/drm/drm_mm.h | 1 + + include/drm/drm_mode_config.h | 18 +- + include/drm/drm_modes.h | 11 - + include/drm/drm_modeset_helper_vtables.h | 27 + + include/drm/drm_pci.h | 63 - + include/drm/drm_print.h | 6 + + include/drm/drm_writeback.h | 9 + + include/drm/gpu_scheduler.h | 1 + + include/drm/i915_pciids.h | 8 +- + include/drm/ttm/ttm_bo_driver.h | 1 - + include/drm/ttm/ttm_debug.h | 31 - + include/linux/dma-buf.h | 10 + + include/uapi/drm/amdgpu_drm.h | 11 +- + include/uapi/drm/drm_fourcc.h | 18 +- + include/uapi/drm/i915_drm.h | 24 + + include/uapi/linux/kfd_ioctl.h | 21 +- + mm/slob.c | 2 + + mm/slub.c | 2 + + 1045 files changed, 35478 insertions(+), 17909 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/display/bridge/adi,adv7123.txt + create mode 100644 Documentation/devicetree/bindings/display/bridge/chrontel,ch7033.yaml + delete mode 100644 Documentation/devicetree/bindings/display/bridge/dumb-vga-dac.txt + delete mode 100644 Documentation/devicetree/bindings/display/bridge/dw_mipi_dsi.txt + create mode 100644 Documentation/devicetree/bindings/display/bridge/ite,it6505.yaml + create mode 100644 Documentation/devicetree/bindings/display/bridge/nwl-dsi.yaml + create mode 100644 Documentation/devicetree/bindings/display/bridge/simple-bridge.yaml + create mode 100644 Documentation/devicetree/bindings/display/bridge/snps,dw-mipi-dsi.yaml + delete mode 100644 Documentation/devicetree/bindings/display/bridge/thine,thc63lvd1024.txt + create mode 100644 Documentation/devicetree/bindings/display/bridge/thine,thc63lvd1024.yaml + delete mode 100644 Documentation/devicetree/bindings/display/bridge/ti,ths813x.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/arm,versatile-tft-panel.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/arm,versatile-tft-panel.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/asus,z00t-tm5p5-nt35596.yaml + delete mode 100644 Documentation/devicetree/bindings/display/panel/boe,himax8279d.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/boe,himax8279d.yaml + delete mode 100644 Documentation/devicetree/bindings/display/panel/feiyang,fy07024di26a30d.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/feiyang,fy07024di26a30d.yaml + delete mode 100644 Documentation/devicetree/bindings/display/panel/ilitek,ili9322.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/ilitek,ili9322.yaml + delete mode 100644 Documentation/devicetree/bindings/display/panel/ilitek,ili9881c.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/ilitek,ili9881c.yaml + delete mode 100644 Documentation/devicetree/bindings/display/panel/innolux,p097pfg.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/innolux,p097pfg.yaml + delete mode 100644 Documentation/devicetree/bindings/display/panel/innolux,p120zdg-bf1.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/innolux,p120zdg-bf1.yaml + delete mode 100644 Documentation/devicetree/bindings/display/panel/jdi,lt070me05000.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/jdi,lt070me05000.yaml + delete mode 100644 Documentation/devicetree/bindings/display/panel/kingdisplay,kd035g6-54nt.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/kingdisplay,kd035g6-54nt.yaml + delete mode 100644 Documentation/devicetree/bindings/display/panel/kingdisplay,kd097d04.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/leadtek,ltk050h3146w.yaml + delete mode 100644 Documentation/devicetree/bindings/display/panel/lg,acx467akm-7.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/lg,ld070wx3-sl01.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/lg,lg4573.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/lg,lg4573.yaml + delete mode 100644 Documentation/devicetree/bindings/display/panel/lg,lh500wx1-sd03.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/lgphilips,lb035q02.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/lgphilips,lb035q02.yaml + delete mode 100644 Documentation/devicetree/bindings/display/panel/olimex,lcd-olinuxino.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/olimex,lcd-olinuxino.yaml + delete mode 100644 Documentation/devicetree/bindings/display/panel/osddisplays,osd101t2587-53ts.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/raydium,rm67191.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/raydium,rm67191.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/samsung,amoled-mipi-dsi.yaml + delete mode 100644 Documentation/devicetree/bindings/display/panel/samsung,ld9040.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/samsung,ld9040.yaml + delete mode 100644 Documentation/devicetree/bindings/display/panel/samsung,s6d16d0.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/samsung,s6d16d0.yaml + delete mode 100644 Documentation/devicetree/bindings/display/panel/samsung,s6e3ha2.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/samsung,s6e63j0x03.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/samsung,s6e63m0.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/samsung,s6e63m0.yaml + delete mode 100644 Documentation/devicetree/bindings/display/panel/seiko,43wvf1g.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/seiko,43wvf1g.yaml + delete mode 100644 Documentation/devicetree/bindings/display/panel/sharp,lq150x1lg11.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/sharp,lq150x1lg11.yaml + delete mode 100644 Documentation/devicetree/bindings/display/panel/sharp,ls037v7dw01.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/sharp,ls037v7dw01.yaml + delete mode 100644 Documentation/devicetree/bindings/display/panel/sharp,ls043t1le01.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/sharp,ls043t1le01.yaml + delete mode 100644 Documentation/devicetree/bindings/display/panel/simple-panel.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/sitronix,st7701.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/sitronix,st7701.yaml + delete mode 100644 Documentation/devicetree/bindings/display/panel/sitronix,st7789v.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/sitronix,st7789v.yaml + delete mode 100644 Documentation/devicetree/bindings/display/panel/sony,acx565akm.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/sony,acx565akm.yaml + delete mode 100644 Documentation/devicetree/bindings/display/panel/startek,startek-kd050c.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/startek,startek-kd050c.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/tpo,td.yaml + delete mode 100644 Documentation/devicetree/bindings/display/panel/tpo,td028ttec1.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/tpo,td043mtea1.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/visionox,rm69299.yaml + delete mode 100644 Documentation/devicetree/bindings/display/rockchip/rockchip,rk3066-hdmi.txt + create mode 100644 Documentation/devicetree/bindings/display/rockchip/rockchip,rk3066-hdmi.yaml + delete mode 100644 Documentation/devicetree/bindings/display/rockchip/rockchip-vop.txt + create mode 100644 Documentation/devicetree/bindings/display/rockchip/rockchip-vop.yaml + create mode 100644 drivers/dma-buf/st-dma-fence-chain.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.h + mode change 100644 => 100755 drivers/gpu/drm/amd/amdgpu/gfx_v9_4.c + mode change 100644 => 100755 drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dce_panel_cntl.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dce_panel_cntl.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c + rename drivers/gpu/drm/amd/display/dc/{basics/log_helpers.c => dce/dmub_abm.h} (75%) + create mode 100644 drivers/gpu/drm/amd/display/dc/inc/hw/panel_cntl.h + rename drivers/gpu/drm/amd/display/dmub/{inc => }/dmub_srv.h (97%) + delete mode 100644 drivers/gpu/drm/amd/display/modules/stats/stats.c + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/pwr/pwr_10_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/pwr/pwr_10_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_12_0_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_12_0_0_sh_mask.h + create mode 100644 drivers/gpu/drm/bridge/chrontel-ch7033.c + create mode 100644 drivers/gpu/drm/bridge/nwl-dsi.c + create mode 100644 drivers/gpu/drm/bridge/nwl-dsi.h + delete mode 100644 drivers/gpu/drm/cirrus/Kconfig + delete mode 100644 drivers/gpu/drm/cirrus/Makefile + create mode 100644 drivers/gpu/drm/drm_managed.c + delete mode 100644 drivers/gpu/drm/drm_vram_helper_common.c + rename drivers/gpu/drm/i915/{i915_gem_fence_reg.c => gt/intel_ggtt_fencing.c} (88%) + rename drivers/gpu/drm/i915/{i915_gem_fence_reg.h => gt/intel_ggtt_fencing.h} (86%) + create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_clock_utils.c + create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_clock_utils.h + create mode 100644 drivers/gpu/drm/i915/gt/selftest_rps.c + create mode 100644 drivers/gpu/drm/i915/gt/selftest_rps.h + create mode 100644 drivers/gpu/drm/i915/gt/shmem_utils.c + create mode 100644 drivers/gpu/drm/i915/gt/shmem_utils.h + create mode 100644 drivers/gpu/drm/i915/gt/st_shmem_utils.c + create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_guc_debugfs.c + create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_guc_debugfs.h + create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_guc_log_debugfs.c + create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_guc_log_debugfs.h + create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_huc_debugfs.c + create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_huc_debugfs.h + create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_uc_debugfs.c + create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_uc_debugfs.h + delete mode 100644 drivers/gpu/drm/i915/oa/i915_oa_bdw.c + delete mode 100644 drivers/gpu/drm/i915/oa/i915_oa_bdw.h + delete mode 100644 drivers/gpu/drm/i915/oa/i915_oa_bxt.c + delete mode 100644 drivers/gpu/drm/i915/oa/i915_oa_bxt.h + delete mode 100644 drivers/gpu/drm/i915/oa/i915_oa_cflgt2.c + delete mode 100644 drivers/gpu/drm/i915/oa/i915_oa_cflgt2.h + delete mode 100644 drivers/gpu/drm/i915/oa/i915_oa_cflgt3.c + delete mode 100644 drivers/gpu/drm/i915/oa/i915_oa_cflgt3.h + delete mode 100644 drivers/gpu/drm/i915/oa/i915_oa_chv.c + delete mode 100644 drivers/gpu/drm/i915/oa/i915_oa_chv.h + delete mode 100644 drivers/gpu/drm/i915/oa/i915_oa_cnl.c + delete mode 100644 drivers/gpu/drm/i915/oa/i915_oa_cnl.h + delete mode 100644 drivers/gpu/drm/i915/oa/i915_oa_glk.c + delete mode 100644 drivers/gpu/drm/i915/oa/i915_oa_glk.h + delete mode 100644 drivers/gpu/drm/i915/oa/i915_oa_hsw.c + delete mode 100644 drivers/gpu/drm/i915/oa/i915_oa_hsw.h + delete mode 100644 drivers/gpu/drm/i915/oa/i915_oa_icl.c + delete mode 100644 drivers/gpu/drm/i915/oa/i915_oa_icl.h + delete mode 100644 drivers/gpu/drm/i915/oa/i915_oa_kblgt2.c + delete mode 100644 drivers/gpu/drm/i915/oa/i915_oa_kblgt2.h + delete mode 100644 drivers/gpu/drm/i915/oa/i915_oa_kblgt3.c + delete mode 100644 drivers/gpu/drm/i915/oa/i915_oa_kblgt3.h + delete mode 100644 drivers/gpu/drm/i915/oa/i915_oa_sklgt2.c + delete mode 100644 drivers/gpu/drm/i915/oa/i915_oa_sklgt2.h + delete mode 100644 drivers/gpu/drm/i915/oa/i915_oa_sklgt3.c + delete mode 100644 drivers/gpu/drm/i915/oa/i915_oa_sklgt3.h + delete mode 100644 drivers/gpu/drm/i915/oa/i915_oa_sklgt4.c + delete mode 100644 drivers/gpu/drm/i915/oa/i915_oa_sklgt4.h + delete mode 100644 drivers/gpu/drm/i915/oa/i915_oa_tgl.c + delete mode 100644 drivers/gpu/drm/i915/oa/i915_oa_tgl.h + create mode 100644 drivers/gpu/drm/i915/selftests/librapl.c + create mode 100644 drivers/gpu/drm/i915/selftests/librapl.h + create mode 100644 drivers/gpu/drm/lima/lima_devfreq.c + create mode 100644 drivers/gpu/drm/lima/lima_devfreq.h + create mode 100644 drivers/gpu/drm/lima/lima_dump.h + create mode 100644 drivers/gpu/drm/lima/lima_trace.c + create mode 100644 drivers/gpu/drm/lima/lima_trace.h + create mode 100644 drivers/gpu/drm/panel/panel-asus-z00t-tm5p5-n35596.c + create mode 100644 drivers/gpu/drm/panel/panel-leadtek-ltk050h3146w.c + create mode 100644 drivers/gpu/drm/panel/panel-visionox-rm69299.c + delete mode 100644 drivers/gpu/drm/pl111/pl111_vexpress.c + delete mode 100644 drivers/gpu/drm/pl111/pl111_vexpress.h + rename drivers/gpu/drm/{cirrus => tiny}/cirrus.c (91%) + create mode 100644 include/drm/drm_managed.h + delete mode 100644 include/drm/drm_pci.h + delete mode 100644 include/drm/ttm/ttm_debug.h +Merging amdgpu/drm-next (78046a887686 drm/amdgpu: add apu flags) +$ git merge amdgpu/drm-next +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 73 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 78 +++- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.h | 6 + + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 21 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c | 10 + + drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 494 +++++++++------------ + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.h | 46 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 30 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 16 + + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 8 + + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 2 +- + drivers/gpu/drm/amd/amdgpu/cikd.h | 2 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 45 +- + drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 20 +- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 34 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 36 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 43 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/nvd.h | 48 ++ + drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 7 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 17 +- + drivers/gpu/drm/amd/amdgpu/soc15d.h | 25 +- + drivers/gpu/drm/amd/amdgpu/vid.h | 2 +- + drivers/gpu/drm/amd/amdkfd/Makefile | 1 + + drivers/gpu/drm/amd/amdkfd/cik_event_interrupt.c | 2 + + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 18 + + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 7 + + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 2 + + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 4 + + drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c | 214 +++++++++ + drivers/gpu/drm/amd/amdkfd/kfd_smi_events.h | 29 ++ + drivers/gpu/drm/amd/display/dc/core/dc.c | 4 +- + drivers/gpu/drm/amd/include/amd_shared.h | 7 + + drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 22 + + drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 31 ++ + drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c | 3 +- + drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.c | 37 +- + drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 2 + + drivers/gpu/drm/amd/powerplay/inc/arcturus_ppsmc.h | 3 +- + drivers/gpu/drm/amd/powerplay/inc/smu_types.h | 1 + + drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 46 +- + .../gpu/drm/amd/powerplay/smumgr/smu10_smumgr.c | 3 +- + drivers/gpu/drm/ttm/ttm_bo.c | 2 +- + include/uapi/drm/amdgpu_drm.h | 4 + + include/uapi/linux/kfd_ioctl.h | 22 +- + 56 files changed, 1160 insertions(+), 400 deletions(-) + create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c + create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_smi_events.h +Merging drm-intel/for-linux-next (cba597ac4517 drm/i915/display: Return error from dbuf allocation failure) +$ git merge drm-intel/for-linux-next +Auto-merging include/drm/drm_dp_helper.h +Auto-merging drivers/gpu/drm/i915/intel_pm.c +Auto-merging drivers/gpu/drm/i915/i915_scheduler_types.h +Auto-merging drivers/gpu/drm/i915/i915_scheduler.c +Auto-merging drivers/gpu/drm/i915/i915_request.c +Auto-merging drivers/gpu/drm/i915/i915_pci.c +Auto-merging drivers/gpu/drm/i915/i915_irq.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/i915_debugfs.c +Auto-merging drivers/gpu/drm/i915/gvt/scheduler.c +Auto-merging drivers/gpu/drm/i915/gt/intel_lrc.c +Auto-merging drivers/gpu/drm/i915/gt/intel_engine_types.h +Removing drivers/gpu/drm/i915/gt/intel_engine_pool.h +Auto-merging drivers/gpu/drm/i915/gt/intel_engine.h +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +Auto-merging drivers/gpu/drm/i915/display/intel_dp_mst.c +Auto-merging drivers/gpu/drm/i915/display/intel_display_types.h +Auto-merging drivers/gpu/drm/i915/display/intel_display.c +Merge made by the 'recursive' strategy. + Documentation/gpu/i915.rst | 46 ++ + drivers/gpu/drm/drm_dp_helper.c | 174 ++++++ + drivers/gpu/drm/i915/Kconfig.profile | 12 + + drivers/gpu/drm/i915/Makefile | 3 +- + drivers/gpu/drm/i915/display/intel_audio.c | 77 +-- + drivers/gpu/drm/i915/display/intel_bw.c | 161 ++++-- + drivers/gpu/drm/i915/display/intel_bw.h | 18 + + drivers/gpu/drm/i915/display/intel_ddi.c | 60 ++- + drivers/gpu/drm/i915/display/intel_display.c | 144 +++-- + drivers/gpu/drm/i915/display/intel_display_power.c | 76 ++- + drivers/gpu/drm/i915/display/intel_display_power.h | 6 +- + drivers/gpu/drm/i915/display/intel_display_types.h | 16 +- + drivers/gpu/drm/i915/display/intel_dp.c | 594 ++++++++------------ + drivers/gpu/drm/i915/display/intel_dp.h | 15 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 9 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 12 +- + drivers/gpu/drm/i915/display/intel_lspcon.c | 2 +- + drivers/gpu/drm/i915/display/intel_overlay.c | 30 +- + drivers/gpu/drm/i915/display/intel_panel.c | 20 +- + drivers/gpu/drm/i915/display/intel_psr.c | 58 +- + drivers/gpu/drm/i915/display/intel_psr.h | 6 +- + drivers/gpu/drm/i915/display/intel_tc.c | 7 +- + drivers/gpu/drm/i915/display/intel_tc.h | 3 +- + drivers/gpu/drm/i915/display/intel_vbt_defs.h | 4 +- + drivers/gpu/drm/i915/gem/i915_gem_clflush.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_client_blt.c | 4 +- + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 478 ++++++++++------ + drivers/gpu/drm/i915/gem/i915_gem_fence.c | 4 +- + drivers/gpu/drm/i915/gem/i915_gem_mman.c | 36 +- + drivers/gpu/drm/i915/gem/i915_gem_object.c | 3 - + drivers/gpu/drm/i915/gem/i915_gem_object_blt.c | 26 +- + drivers/gpu/drm/i915/gem/i915_gem_object_blt.h | 1 - + drivers/gpu/drm/i915/gem/i915_gem_pages.c | 1 + + .../drm/i915/gem/selftests/i915_gem_client_blt.c | 31 +- + .../drm/i915/gem/selftests/i915_gem_coherency.c | 2 + + .../gpu/drm/i915/gem/selftests/i915_gem_context.c | 49 +- + .../drm/i915/gem/selftests/i915_gem_execbuffer.c | 171 ++++++ + drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 124 +++++ + drivers/gpu/drm/i915/gem/selftests/igt_gem_utils.c | 26 +- + drivers/gpu/drm/i915/gt/gen8_ppgtt.c | 15 +- + drivers/gpu/drm/i915/gt/intel_breadcrumbs.c | 52 +- + drivers/gpu/drm/i915/gt/intel_engine.h | 37 +- + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 6 +- + drivers/gpu/drm/i915/gt/intel_engine_pm.c | 16 +- + drivers/gpu/drm/i915/gt/intel_engine_pool.h | 34 -- + drivers/gpu/drm/i915/gt/intel_engine_types.h | 18 +- + drivers/gpu/drm/i915/gt/intel_gpu_commands.h | 3 +- + drivers/gpu/drm/i915/gt/intel_gt.c | 3 + + ...{intel_engine_pool.c => intel_gt_buffer_pool.c} | 114 ++-- + drivers/gpu/drm/i915/gt/intel_gt_buffer_pool.h | 37 ++ + ...e_pool_types.h => intel_gt_buffer_pool_types.h} | 15 +- + drivers/gpu/drm/i915/gt/intel_gt_pm.c | 10 +- + drivers/gpu/drm/i915/gt/intel_gt_types.h | 11 + + drivers/gpu/drm/i915/gt/intel_lrc.c | 316 +++++++---- + drivers/gpu/drm/i915/gt/intel_rc6.c | 8 +- + drivers/gpu/drm/i915/gt/intel_renderstate.c | 16 +- + drivers/gpu/drm/i915/gt/intel_rps.c | 5 +- + drivers/gpu/drm/i915/gt/intel_rps.h | 1 + + drivers/gpu/drm/i915/gt/intel_timeline.c | 8 +- + drivers/gpu/drm/i915/gt/intel_timeline.h | 5 - + drivers/gpu/drm/i915/gt/intel_workarounds.c | 28 +- + drivers/gpu/drm/i915/gt/mock_engine.c | 2 - + drivers/gpu/drm/i915/gt/selftest_context.c | 12 +- + drivers/gpu/drm/i915/gt/selftest_lrc.c | 154 +++--- + drivers/gpu/drm/i915/gt/selftest_ring_submission.c | 2 + + drivers/gpu/drm/i915/gt/selftest_rps.c | 56 +- + drivers/gpu/drm/i915/gt/sysfs_engines.c | 94 ++++ + drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 2 +- + drivers/gpu/drm/i915/gvt/cmd_parser.c | 45 ++ + drivers/gpu/drm/i915/gvt/execlist.c | 2 - + drivers/gpu/drm/i915/gvt/gtt.c | 1 + + drivers/gpu/drm/i915/gvt/gtt.h | 1 + + drivers/gpu/drm/i915/gvt/handlers.c | 2 +- + drivers/gpu/drm/i915/gvt/scheduler.c | 115 +++- + drivers/gpu/drm/i915/gvt/scheduler.h | 1 + + drivers/gpu/drm/i915/i915_config.c | 15 + + drivers/gpu/drm/i915/i915_debugfs.c | 11 +- + drivers/gpu/drm/i915/i915_drv.h | 48 +- + drivers/gpu/drm/i915/i915_getparam.c | 2 +- + drivers/gpu/drm/i915/i915_gpu_error.h | 2 +- + drivers/gpu/drm/i915/i915_irq.c | 211 +++++--- + drivers/gpu/drm/i915/i915_pci.c | 2 +- + drivers/gpu/drm/i915/i915_perf.c | 12 +- + drivers/gpu/drm/i915/i915_pmu.c | 5 +- + drivers/gpu/drm/i915/i915_priolist_types.h | 7 +- + drivers/gpu/drm/i915/i915_reg.h | 13 + + drivers/gpu/drm/i915/i915_request.c | 115 ++-- + drivers/gpu/drm/i915/i915_request.h | 28 +- + drivers/gpu/drm/i915/i915_scheduler.c | 23 +- + drivers/gpu/drm/i915/i915_scheduler_types.h | 2 +- + drivers/gpu/drm/i915/i915_selftest.h | 2 + + drivers/gpu/drm/i915/i915_sw_fence.c | 10 +- + drivers/gpu/drm/i915/intel_device_info.c | 34 +- + drivers/gpu/drm/i915/intel_device_info.h | 2 +- + drivers/gpu/drm/i915/intel_pm.c | 599 ++++++++++++++++----- + drivers/gpu/drm/i915/intel_pm.h | 29 +- + drivers/gpu/drm/i915/intel_sideband.c | 4 +- + drivers/gpu/drm/i915/intel_uncore.c | 5 - + drivers/gpu/drm/i915/intel_wopcm.c | 3 +- + .../gpu/drm/i915/selftests/i915_live_selftests.h | 1 + + drivers/gpu/drm/i915/selftests/i915_perf.c | 6 +- + drivers/gpu/drm/i915/selftests/i915_request.c | 37 +- + drivers/gpu/drm/i915/selftests/i915_selftest.c | 29 + + drivers/gpu/drm/i915/selftests/igt_spinner.c | 3 +- + drivers/video/hdmi.c | 65 ++- + include/drm/drm_dp_helper.h | 3 + + include/linux/hdmi.h | 2 + + 107 files changed, 3403 insertions(+), 1685 deletions(-) + create mode 100644 drivers/gpu/drm/i915/gem/selftests/i915_gem_execbuffer.c + delete mode 100644 drivers/gpu/drm/i915/gt/intel_engine_pool.h + rename drivers/gpu/drm/i915/gt/{intel_engine_pool.c => intel_gt_buffer_pool.c} (53%) + create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_buffer_pool.h + rename drivers/gpu/drm/i915/gt/{intel_engine_pool_types.h => intel_gt_buffer_pool_types.h} (54%) + create mode 100644 drivers/gpu/drm/i915/i915_config.c +Merging drm-tegra/drm/tegra/for-next (f923db184ca3 gpu: host1x: Clean up debugfs in error handling path) +$ git merge drm-tegra/drm/tegra/for-next +Auto-merging drivers/gpu/drm/tegra/sor.c +Auto-merging drivers/gpu/drm/tegra/hdmi.c +Auto-merging drivers/gpu/drm/tegra/drm.h +Merge made by the 'recursive' strategy. + drivers/gpu/host1x/dev.c | 1 + + 1 file changed, 1 insertion(+) +Merging drm-misc/for-linux-next (5bebaeadb30e drm/bridge: ti-sn65dsi86: Implement lane reordering + polarity) +$ git merge drm-misc/for-linux-next +Auto-merging include/drm/drm_modes.h +Auto-merging drivers/gpu/drm/drm_dp_mst_topology.c +Auto-merging drivers/gpu/drm/drm_dp_helper.c +Removing Documentation/devicetree/bindings/display/bridge/ti,sn65dsi86.txt +Merge made by the 'recursive' strategy. + .../display/allwinner,sun8i-a83t-de2-mixer.yaml | 3 + + .../bindings/display/bridge/ti,sn65dsi86.txt | 87 ------ + .../bindings/display/bridge/ti,sn65dsi86.yaml | 293 ++++++++++++++++++++ + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 305 ++++++++++++++++++++- + drivers/gpu/drm/drm_client_modeset.c | 5 +- + drivers/gpu/drm/drm_debugfs.c | 8 +- + drivers/gpu/drm/drm_dp_helper.c | 1 + + drivers/gpu/drm/drm_dp_mst_topology.c | 10 +- + drivers/gpu/drm/drm_encoder_slave.c | 15 +- + drivers/gpu/drm/drm_gem.c | 4 +- + drivers/gpu/drm/drm_managed.c | 2 + + drivers/gpu/drm/drm_probe_helper.c | 2 + + drivers/gpu/drm/drm_vblank.c | 2 - + drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c | 18 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 4 +- + drivers/gpu/drm/sun4i/sun8i_mixer.c | 13 + + drivers/gpu/drm/tilcdc/tilcdc_panel.c | 17 +- + drivers/video/fbdev/amba-clcd.c | 19 +- + include/drm/drm_modes.h | 3 +- + 19 files changed, 651 insertions(+), 160 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/display/bridge/ti,sn65dsi86.txt + create mode 100644 Documentation/devicetree/bindings/display/bridge/ti,sn65dsi86.yaml +Merging drm-msm/msm-next (d3b68ddf1d38 drm/msm/a4xx: add a405_registers for a405 device) +$ git merge drm-msm/msm-next +Auto-merging drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c +Auto-merging drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h +Merge made by the 'recursive' strategy. + drivers/gpu/drm/msm/Makefile | 1 + + drivers/gpu/drm/msm/adreno/a4xx_gpu.c | 82 ++++- + drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 6 + + drivers/gpu/drm/msm/adreno/a6xx.xml.h | 14 + + drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 424 +++++++++++++++++++------ + drivers/gpu/drm/msm/adreno/a6xx_gmu.h | 37 ++- + drivers/gpu/drm/msm/adreno/a6xx_gmu.xml.h | 48 +-- + drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 69 +++- + drivers/gpu/drm/msm/adreno/a6xx_hfi.c | 123 ++++++- + drivers/gpu/drm/msm/adreno/a6xx_hfi.h | 50 ++- + drivers/gpu/drm/msm/adreno/adreno_device.c | 35 ++ + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 4 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.h | 15 + + drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c | 125 +++++--- + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 95 ++++-- + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h | 2 + + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 12 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 53 +++- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 43 +++ + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 26 ++ + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.h | 3 + + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c | 129 ++++++++ + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.h | 100 ++++++ + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h | 2 + + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 37 ++- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 5 + + drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c | 9 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 82 +++++ + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.h | 4 + + drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 58 +++- + drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h | 2 + + drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c | 76 +++++ + drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 4 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 3 +- + drivers/gpu/drm/msm/msm_drv.c | 6 +- + drivers/gpu/drm/msm/msm_drv.h | 7 +- + drivers/gpu/drm/msm/msm_gem.c | 31 +- + drivers/gpu/drm/msm/msm_gem.h | 1 + + drivers/gpu/drm/msm/msm_gem_submit.c | 232 +++++++++++++- + drivers/gpu/drm/msm/msm_gem_vma.c | 6 +- + drivers/gpu/drm/msm/msm_rd.c | 4 +- + include/uapi/drm/msm_drm.h | 24 +- + 42 files changed, 1835 insertions(+), 254 deletions(-) + create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c + create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.h +$ git am -3 ../patches/0001-drm-msm-dpu-fix-up-u64-u32-division-for-32-bit-archi.patch +Applying: drm/msm/dpu: fix up u64/u32 division for 32 bit architectures +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c +M drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c +$ git add -A . +$ git commit -v -a --amend +[master cecddf30b055] Merge remote-tracking branch 'drm-msm/msm-next' + Date: Tue May 19 14:00:59 2020 +1000 +Merging mali-dp/for-upstream/mali-dp (f634c6a80287 dt/bindings: display: Add optional property node define for Mali DP500) +$ git merge mali-dp/for-upstream/mali-dp +Merge made by the 'recursive' strategy. +Merging imx-drm/imx-drm/next (2c76b324c794 drm/imx: parallel-display: Adjust bus_flags handling) +$ git merge imx-drm/imx-drm/next +Auto-merging drivers/gpu/drm/imx/parallel-display.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/imx/parallel-display.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging etnaviv/etnaviv/next (f232d9ec029c drm/etnaviv: fix TS cache flushing on GPUs with BLT engine) +$ git merge etnaviv/etnaviv/next +Already up to date. +Merging regmap/for-next (6c9147d991fb Merge remote-tracking branch 'regmap/for-5.8' into regmap-next) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + drivers/base/regmap/regmap-i2c.c | 61 +++++++++++++++++++++++++++++ + drivers/base/regmap/regmap-irq.c | 84 ++++++++++++++++++++++++++++++++-------- + drivers/base/regmap/regmap.c | 1 + + include/linux/regmap.h | 65 +++++++++++++------------------ + 4 files changed, 156 insertions(+), 55 deletions(-) +Merging sound/for-next (b9f2d35f0530 ALSA: hda: Unexport some local helper functions) +$ git merge sound/for-next +Auto-merging sound/usb/quirks.c +Auto-merging sound/pci/hda/patch_realtek.c +Auto-merging sound/pci/hda/patch_hdmi.c +Merge made by the 'recursive' strategy. + include/sound/control.h | 2 +- + include/sound/hda_codec.h | 11 +- + include/sound/hdaudio.h | 10 +- + include/sound/intel-nhlt.h | 6 +- + sound/core/oss/pcm_plugin.h | 2 +- + sound/core/seq/oss/seq_oss_timer.h | 10 - + sound/drivers/portman2x4.c | 2 +- + sound/firewire/Kconfig | 8 +- + sound/firewire/amdtp-am824.c | 3 +- + sound/firewire/amdtp-stream.c | 326 ++++++++++++--------- + sound/firewire/amdtp-stream.h | 20 +- + sound/firewire/fireface/ff-protocol-latter.c | 58 ++-- + sound/firewire/fireface/ff-stream.c | 10 +- + sound/firewire/fireface/ff.c | 61 +++- + sound/firewire/fireface/ff.h | 11 +- + sound/firewire/fireworks/fireworks.h | 2 +- + sound/hda/ext/hdac_ext_bus.c | 2 +- + sound/hda/hdac_bus.c | 6 +- + sound/hda/hdac_controller.c | 13 + + sound/hda/hdac_device.c | 2 +- + sound/hda/hdac_stream.c | 2 +- + sound/hda/intel-dsp-config.c | 117 ++++++-- + sound/hda/intel-nhlt.c | 49 +--- + sound/hda/local.h | 3 + + sound/isa/ad1816a/ad1816a.c | 2 +- + sound/isa/wavefront/wavefront_synth.c | 8 +- + sound/pci/ac97/ac97_patch.c | 2 +- + sound/pci/hda/Kconfig | 4 +- + sound/pci/hda/hda_tegra.c | 50 ++++ + sound/pci/hda/patch_hdmi.c | 12 +- + sound/pci/hda/patch_realtek.c | 51 +++- + sound/pci/oxygen/xonar_pcm179x.c | 4 +- + sound/ppc/pmac.c | 4 +- + sound/soc/codecs/hdac_hda.h | 4 - + sound/usb/card.h | 5 + + sound/usb/endpoint.c | 244 +++++++++++++++- + sound/usb/endpoint.h | 1 + + sound/usb/line6/driver.c | 20 ++ + sound/usb/line6/driver.h | 1 + + sound/usb/mixer_quirks.c | 418 +++++++++++++++++++++++++++ + sound/usb/pcm.c | 7 + + sound/usb/proc.c | 53 ++++ + sound/usb/quirks.c | 14 - + sound/usb/usx2y/usbusx2y.h | 2 +- + 44 files changed, 1317 insertions(+), 325 deletions(-) +Merging sound-asoc/for-next (0c111965c32c Merge remote-tracking branch 'asoc/for-5.8' into asoc-next) +$ git merge sound-asoc/for-next +Auto-merging sound/soc/sof/probe.h +Auto-merging sound/soc/intel/skylake/skl-topology.h +Auto-merging sound/pci/hda/patch_hdmi.c +Auto-merging sound/hda/intel-nhlt.c +Removing Documentation/devicetree/bindings/sound/simple-card.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/dsp/fsl,dsp.yaml | 2 + + Documentation/devicetree/bindings/sound/da7213.txt | 8 +- + .../devicetree/bindings/sound/fsl,asrc.txt | 4 + + .../devicetree/bindings/sound/fsl,easrc.yaml | 101 + + .../devicetree/bindings/sound/fsl,esai.txt | 1 + + .../bindings/sound/nvidia,tegra-audio-wm8903.txt | 1 + + .../devicetree/bindings/sound/qcom,lpass-cpu.txt | 25 + + .../devicetree/bindings/sound/qcom,q6adm.txt | 2 +- + .../devicetree/bindings/sound/qcom,q6afe.txt | 46 +- + .../devicetree/bindings/sound/qcom,q6asm.txt | 7 +- + .../devicetree/bindings/sound/qcom,q6core.txt | 2 +- + .../devicetree/bindings/sound/rockchip-i2s.yaml | 12 +- + Documentation/devicetree/bindings/sound/rt1016.txt | 17 + + .../devicetree/bindings/sound/simple-card.txt | 351 ---- + .../devicetree/bindings/sound/simple-card.yaml | 484 +++++ + .../devicetree/bindings/sound/tlv320adcx140.yaml | 24 + + Documentation/devicetree/bindings/sound/wm8994.txt | 18 +- + .../devicetree/bindings/sound/zl38060.yaml | 69 + + drivers/soundwire/intel.c | 4 +- + include/sound/soc-acpi.h | 2 +- + include/sound/soc-component.h | 46 +- + include/sound/soc-dai.h | 62 +- + include/sound/soc-dapm.h | 2 +- + include/sound/soc.h | 49 +- + include/sound/sof.h | 5 +- + include/sound/sof/channel_map.h | 2 +- + include/sound/sof/control.h | 2 +- + include/sound/sof/dai-imx.h | 2 +- + include/sound/sof/dai-intel.h | 22 +- + include/sound/sof/dai.h | 2 +- + include/sound/sof/header.h | 2 +- + include/sound/sof/info.h | 28 +- + include/sound/sof/pm.h | 2 +- + include/sound/sof/stream.h | 2 +- + include/sound/sof/topology.h | 20 +- + include/sound/sof/trace.h | 4 +- + include/sound/sof/xtensa.h | 2 +- + include/uapi/sound/skl-tplg-interface.h | 2 + + include/uapi/sound/sof/abi.h | 2 +- + include/uapi/sound/sof/tokens.h | 8 + + sound/hda/intel-nhlt.c | 2 +- + sound/pci/hda/patch_hdmi.c | 1 + + sound/soc/amd/raven/acp3x-i2s.c | 6 +- + sound/soc/amd/raven/acp3x-pcm-dma.c | 4 +- + sound/soc/atmel/atmel_ssc_dai.c | 4 +- + sound/soc/bcm/bcm2835-i2s.c | 6 +- + sound/soc/bcm/cygnus-ssp.c | 4 +- + sound/soc/cirrus/ep93xx-i2s.c | 4 +- + sound/soc/codecs/Kconfig | 27 +- + sound/soc/codecs/Makefile | 2 + + sound/soc/codecs/ad1980.c | 2 +- + sound/soc/codecs/ad73311.c | 2 +- + sound/soc/codecs/adav80x.c | 4 +- + sound/soc/codecs/arizona.c | 2 +- + sound/soc/codecs/cros_ec_codec.c | 22 +- + sound/soc/codecs/cs4271.c | 4 +- + sound/soc/codecs/cs47l15.c | 9 +- + sound/soc/codecs/cs47l24.c | 8 +- + sound/soc/codecs/cs47l35.c | 9 +- + sound/soc/codecs/cs47l85.c | 9 +- + sound/soc/codecs/cs47l90.c | 9 +- + sound/soc/codecs/cs47l92.c | 9 +- + sound/soc/codecs/da7213.c | 102 +- + sound/soc/codecs/da7213.h | 9 + + sound/soc/codecs/dmic.c | 4 +- + sound/soc/codecs/madera.c | 2 +- + sound/soc/codecs/max98090.c | 6 +- + sound/soc/codecs/nau8810.c | 35 +- + sound/soc/codecs/nau8810.h | 8 + + sound/soc/codecs/rl6231.c | 29 +- + sound/soc/codecs/rl6231.h | 1 + + sound/soc/codecs/rt1015.c | 27 + + sound/soc/codecs/rt1015.h | 1 + + sound/soc/codecs/rt1016.c | 695 +++++++ + sound/soc/codecs/rt1016.h | 232 +++ + sound/soc/codecs/rt1308-sdw.c | 15 +- + sound/soc/codecs/rt5677-spi.c | 12 +- + sound/soc/codecs/rt5682-sdw.c | 3 - + sound/soc/codecs/rt5682.c | 201 +- + sound/soc/codecs/rt700-sdw.c | 3 - + sound/soc/codecs/rt700.c | 3 + + sound/soc/codecs/rt711-sdw.c | 3 - + sound/soc/codecs/rt711.c | 3 + + sound/soc/codecs/rt715-sdw.c | 3 - + sound/soc/codecs/rt715.c | 3 + + sound/soc/codecs/tlv320adcx140.c | 41 + + sound/soc/codecs/tlv320adcx140.h | 3 + + sound/soc/codecs/tlv320aic23.c | 2 +- + sound/soc/codecs/tlv320dac33.c | 2 +- + sound/soc/codecs/uda1380.c | 2 +- + sound/soc/codecs/wcd9335.c | 44 +- + sound/soc/codecs/wcd934x.c | 30 +- + sound/soc/codecs/wl1273.c | 2 +- + sound/soc/codecs/wm5102.c | 9 +- + sound/soc/codecs/wm5110.c | 8 +- + sound/soc/codecs/wm8524.c | 4 +- + sound/soc/codecs/wm8711.c | 2 +- + sound/soc/codecs/wm8753.c | 4 +- + sound/soc/codecs/wm8782.c | 2 +- + sound/soc/codecs/wm8900.c | 6 - + sound/soc/codecs/wm8990.c | 98 - + sound/soc/codecs/wm8991.c | 8 - + sound/soc/codecs/wm8994.c | 8 - + sound/soc/codecs/wm_adsp.c | 18 +- + sound/soc/codecs/wm_adsp.h | 18 +- + sound/soc/codecs/zl38060.c | 638 ++++++ + sound/soc/dwc/dwc-i2s.c | 2 +- + sound/soc/fsl/Kconfig | 11 + + sound/soc/fsl/Makefile | 2 + + sound/soc/fsl/fsl-asoc-card.c | 24 +- + sound/soc/fsl/fsl_asrc.c | 309 +-- + sound/soc/fsl/fsl_asrc.h | 74 +- + sound/soc/fsl/fsl_asrc_common.h | 106 + + sound/soc/fsl/fsl_asrc_dma.c | 54 +- + sound/soc/fsl/fsl_easrc.c | 2117 ++++++++++++++++++++ + sound/soc/fsl/fsl_easrc.h | 651 ++++++ + sound/soc/fsl/fsl_esai.c | 48 +- + sound/soc/fsl/fsl_micfil.c | 9 +- + sound/soc/fsl/fsl_spdif.c | 4 +- + sound/soc/hisilicon/hi6210-i2s.c | 16 +- + sound/soc/intel/Kconfig | 8 +- + sound/soc/intel/Makefile | 2 +- + sound/soc/intel/atom/Makefile | 2 +- + sound/soc/intel/atom/sst-mfld-platform-compress.c | 43 +- + sound/soc/intel/atom/sst-mfld-platform-pcm.c | 16 +- + sound/soc/intel/atom/sst-mfld-platform.h | 2 +- + sound/soc/intel/atom/sst/Makefile | 2 +- + sound/soc/intel/boards/Kconfig | 59 +- + sound/soc/intel/boards/Makefile | 6 +- + sound/soc/intel/boards/bdw-rt5650.c | 29 + + sound/soc/intel/boards/bdw-rt5677.c | 26 + + sound/soc/intel/boards/broadwell.c | 26 + + sound/soc/intel/boards/bytcht_cx2072x.c | 2 +- + sound/soc/intel/boards/cht_bsw_nau8824.c | 4 +- + sound/soc/intel/boards/cml_rt1011_rt5682.c | 224 ++- + sound/soc/intel/boards/ehl_rt5660.c | 323 +++ + sound/soc/intel/boards/glk_rt5682_max98357a.c | 2 +- + sound/soc/intel/boards/hda_dsp_common.c | 2 +- + sound/soc/intel/boards/hda_dsp_common.h | 2 +- + sound/soc/intel/boards/kbl_da7219_max98357a.c | 2 +- + sound/soc/intel/boards/kbl_da7219_max98927.c | 2 +- + sound/soc/intel/boards/kbl_rt5660.c | 2 +- + sound/soc/intel/boards/skl_hda_dsp_common.c | 2 +- + sound/soc/intel/boards/skl_hda_dsp_common.h | 2 +- + sound/soc/intel/boards/skl_hda_dsp_generic.c | 33 +- + sound/soc/intel/boards/sof_da7219_max98373.c | 23 +- + sound/soc/intel/boards/sof_maxim_common.c | 2 +- + sound/soc/intel/boards/sof_maxim_common.h | 2 +- + sound/soc/intel/boards/sof_pcm512x.c | 2 +- + sound/soc/intel/boards/sof_rt5682.c | 2 +- + sound/soc/intel/boards/sof_sdw.c | 57 +- + sound/soc/intel/boards/sof_sdw_common.h | 2 +- + sound/soc/intel/boards/sof_sdw_dmic.c | 2 +- + sound/soc/intel/boards/sof_sdw_hdmi.c | 6 +- + sound/soc/intel/boards/sof_sdw_rt1308.c | 4 +- + sound/soc/intel/boards/sof_sdw_rt5682.c | 5 +- + sound/soc/intel/boards/sof_sdw_rt700.c | 13 +- + sound/soc/intel/boards/sof_sdw_rt711.c | 13 +- + sound/soc/intel/boards/sof_sdw_rt715.c | 2 +- + sound/soc/intel/boards/sof_wm8804.c | 298 +++ + sound/soc/intel/common/Makefile | 2 +- + sound/soc/intel/common/soc-acpi-intel-bxt-match.c | 4 +- + sound/soc/intel/common/soc-acpi-intel-cfl-match.c | 2 +- + sound/soc/intel/common/soc-acpi-intel-cml-match.c | 2 +- + sound/soc/intel/common/soc-acpi-intel-cnl-match.c | 2 +- + sound/soc/intel/common/soc-acpi-intel-ehl-match.c | 9 +- + sound/soc/intel/common/soc-acpi-intel-glk-match.c | 2 +- + sound/soc/intel/common/soc-acpi-intel-hda-match.c | 2 +- + sound/soc/intel/common/soc-acpi-intel-icl-match.c | 2 +- + sound/soc/intel/common/soc-acpi-intel-jsl-match.c | 2 +- + sound/soc/intel/common/soc-acpi-intel-kbl-match.c | 2 +- + sound/soc/intel/common/soc-acpi-intel-skl-match.c | 2 +- + sound/soc/intel/common/soc-acpi-intel-tgl-match.c | 2 +- + sound/soc/intel/common/soc-intel-quirks.h | 2 +- + sound/soc/intel/haswell/sst-haswell-dsp.c | 185 +- + sound/soc/intel/skylake/Makefile | 2 +- + sound/soc/intel/skylake/skl-ssp-clk.c | 2 +- + sound/soc/intel/skylake/skl-sst-utils.c | 2 +- + sound/soc/intel/skylake/skl-topology.c | 184 +- + sound/soc/intel/skylake/skl-topology.h | 1 + + sound/soc/jz4740/jz4740-i2s.c | 8 +- + sound/soc/mediatek/mt6797/mt6797-afe-pcm.c | 7 +- + sound/soc/mediatek/mt8173/mt8173-afe-pcm.c | 8 +- + sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c | 16 +- + sound/soc/meson/axg-tdm-interface.c | 2 +- + sound/soc/mxs/mxs-saif.c | 5 +- + sound/soc/pxa/mmp-sspa.c | 349 ++-- + sound/soc/pxa/mmp-sspa.h | 4 +- + sound/soc/pxa/pxa-ssp.c | 8 +- + sound/soc/pxa/pxa2xx-i2s.c | 2 +- + sound/soc/qcom/lpass-apq8016.c | 9 +- + sound/soc/qcom/lpass-cpu.c | 235 ++- + sound/soc/qcom/lpass-lpaif-reg.h | 30 +- + sound/soc/qcom/lpass.h | 4 + + sound/soc/qcom/qdsp6/q6asm-dai.c | 51 +- + sound/soc/sh/rcar/gen.c | 8 + + sound/soc/sh/rcar/rsnd.h | 9 + + sound/soc/sh/rcar/ssi.c | 145 ++ + sound/soc/soc-compress.c | 235 +-- + sound/soc/soc-core.c | 156 +- + sound/soc/soc-dai.c | 476 ++++- + sound/soc/soc-dapm.c | 12 +- + sound/soc/soc-generic-dmaengine-pcm.c | 6 +- + sound/soc/soc-pcm.c | 144 +- + sound/soc/soc-topology.c | 2 +- + sound/soc/sof/Makefile | 2 +- + sound/soc/sof/compress.c | 9 +- + sound/soc/sof/compress.h | 9 +- + sound/soc/sof/control.c | 2 +- + sound/soc/sof/core.c | 9 +- + sound/soc/sof/debug.c | 2 +- + sound/soc/sof/imx/Kconfig | 34 +- + sound/soc/sof/imx/Makefile | 4 +- + sound/soc/sof/imx/imx8.c | 4 +- + sound/soc/sof/imx/imx8m.c | 285 +++ + sound/soc/sof/intel/Makefile | 2 +- + sound/soc/sof/intel/apl.c | 2 +- + sound/soc/sof/intel/bdw.c | 2 +- + sound/soc/sof/intel/byt.c | 56 +- + sound/soc/sof/intel/cnl.c | 2 +- + sound/soc/sof/intel/hda-bus.c | 2 +- + sound/soc/sof/intel/hda-codec.c | 7 +- + sound/soc/sof/intel/hda-compress.c | 2 +- + sound/soc/sof/intel/hda-ctrl.c | 2 +- + sound/soc/sof/intel/hda-dai.c | 2 +- + sound/soc/sof/intel/hda-dsp.c | 10 +- + sound/soc/sof/intel/hda-ipc.c | 2 +- + sound/soc/sof/intel/hda-ipc.h | 2 +- + sound/soc/sof/intel/hda-loader.c | 11 +- + sound/soc/sof/intel/hda-pcm.c | 2 +- + sound/soc/sof/intel/hda-stream.c | 2 +- + sound/soc/sof/intel/hda-trace.c | 2 +- + sound/soc/sof/intel/hda.c | 28 +- + sound/soc/sof/intel/hda.h | 2 +- + sound/soc/sof/intel/intel-ipc.c | 2 +- + sound/soc/sof/intel/shim.h | 2 +- + sound/soc/sof/ipc.c | 2 +- + sound/soc/sof/loader.c | 39 +- + sound/soc/sof/nocodec.c | 8 +- + sound/soc/sof/ops.c | 2 +- + sound/soc/sof/ops.h | 2 +- + sound/soc/sof/pcm.c | 18 +- + sound/soc/sof/pm.c | 21 +- + sound/soc/sof/probe.c | 2 +- + sound/soc/sof/probe.h | 2 +- + sound/soc/sof/sof-acpi-dev.c | 2 +- + sound/soc/sof/sof-audio.c | 2 +- + sound/soc/sof/sof-audio.h | 2 +- + sound/soc/sof/sof-of-dev.c | 16 +- + sound/soc/sof/sof-pci-dev.c | 4 +- + sound/soc/sof/sof-priv.h | 5 +- + sound/soc/sof/topology.c | 483 +++-- + sound/soc/sof/trace.c | 2 +- + sound/soc/sof/utils.c | 2 +- + sound/soc/sof/xtensa/Makefile | 2 +- + sound/soc/sof/xtensa/core.c | 2 +- + sound/soc/sprd/sprd-pcm-compress.c | 49 +- + sound/soc/sprd/sprd-pcm-dma.c | 2 +- + sound/soc/sprd/sprd-pcm-dma.h | 2 +- + sound/soc/tegra/tegra_wm8903.c | 20 +- + sound/soc/ti/davinci-mcasp.c | 2 +- + sound/soc/ti/omap-dmic.c | 4 +- + sound/soc/ti/omap-mcbsp.c | 14 +- + sound/soc/ti/omap-mcpdm.c | 8 +- + sound/soc/uniphier/aio-compress.c | 45 +- + sound/soc/uniphier/aio-cpu.c | 4 +- + sound/soc/uniphier/aio-dma.c | 2 +- + sound/soc/uniphier/aio.h | 2 +- + sound/soc/ux500/mop500.c | 11 +- + 269 files changed, 9652 insertions(+), 2606 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/fsl,easrc.yaml + create mode 100644 Documentation/devicetree/bindings/sound/rt1016.txt + delete mode 100644 Documentation/devicetree/bindings/sound/simple-card.txt + create mode 100644 Documentation/devicetree/bindings/sound/simple-card.yaml + create mode 100644 Documentation/devicetree/bindings/sound/zl38060.yaml + create mode 100644 sound/soc/codecs/rt1016.c + create mode 100644 sound/soc/codecs/rt1016.h + create mode 100644 sound/soc/codecs/zl38060.c + create mode 100644 sound/soc/fsl/fsl_asrc_common.h + create mode 100644 sound/soc/fsl/fsl_easrc.c + create mode 100644 sound/soc/fsl/fsl_easrc.h + create mode 100644 sound/soc/intel/boards/ehl_rt5660.c + create mode 100644 sound/soc/intel/boards/sof_wm8804.c + create mode 100644 sound/soc/sof/imx/imx8m.c +Merging modules/modules-next (5c3a7db0c7ec module: Harden STRICT_MODULE_RWX) +$ git merge modules/modules-next +Auto-merging kernel/module.c +Merge made by the 'recursive' strategy. + kernel/module.c | 51 +++++++++++++++++++++++++++++++++++++++++---------- + 1 file changed, 41 insertions(+), 10 deletions(-) +Merging input/next (918e2844d940 Input: elants - refactor elants_i2c_execute_command()) +$ git merge input/next +Removing include/linux/input/gp2ap002a00f.h +Removing drivers/input/misc/msm-vibrator.c +Removing drivers/input/misc/gp2ap002a00f.c +Auto-merging drivers/input/keyboard/Kconfig +Auto-merging drivers/hid/hid-multitouch.c +Auto-merging drivers/hid/hid-alps.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/input/msm-vibrator.txt +Removing Documentation/devicetree/bindings/input/elants_i2c.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/input/elants_i2c.txt | 34 - + .../devicetree/bindings/input/iqs269a.yaml | 581 +++++++ + .../devicetree/bindings/input/msm-vibrator.txt | 36 - + .../input/touchscreen/cypress,cy8ctma140.yaml | 72 + + .../input/touchscreen/elan,elants_i2c.yaml | 69 + + .../bindings/input/touchscreen/mms114.txt | 3 +- + MAINTAINERS | 6 + + drivers/hid/hid-alps.c | 3 +- + drivers/hid/hid-multitouch.c | 6 +- + drivers/input/evdev.c | 7 +- + drivers/input/keyboard/Kconfig | 2 +- + drivers/input/keyboard/atkbd.c | 97 +- + drivers/input/keyboard/imx_sc_key.c | 33 +- + drivers/input/keyboard/tca6416-keypad.c | 2 +- + drivers/input/misc/Kconfig | 31 +- + drivers/input/misc/Makefile | 3 +- + drivers/input/misc/gp2ap002a00f.c | 281 --- + drivers/input/misc/iqs269a.c | 1833 ++++++++++++++++++++ + drivers/input/misc/msm-vibrator.c | 281 --- + drivers/input/misc/xen-kbdfront.c | 2 +- + drivers/input/mouse/elan_i2c_core.c | 2 +- + drivers/input/serio/i8042-x86ia64io.h | 1 + + drivers/input/serio/i8042.c | 3 + + drivers/input/touchscreen/Kconfig | 12 + + drivers/input/touchscreen/Makefile | 1 + + drivers/input/touchscreen/atmel_mxt_ts.c | 7 +- + drivers/input/touchscreen/cy8ctma140.c | 353 ++++ + drivers/input/touchscreen/cyttsp4_core.c | 5 +- + drivers/input/touchscreen/cyttsp_core.c | 2 +- + drivers/input/touchscreen/edt-ft5x06.c | 198 ++- + drivers/input/touchscreen/elants_i2c.c | 247 +-- + drivers/input/touchscreen/melfas_mip4.c | 4 +- + drivers/input/touchscreen/mms114.c | 19 +- + drivers/input/touchscreen/raspberrypi-ts.c | 2 +- + drivers/input/touchscreen/stmfts.c | 2 +- + include/linux/input/gp2ap002a00f.h | 23 - + include/linux/input/mt.h | 5 + + 37 files changed, 3395 insertions(+), 873 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/input/elants_i2c.txt + create mode 100644 Documentation/devicetree/bindings/input/iqs269a.yaml + delete mode 100644 Documentation/devicetree/bindings/input/msm-vibrator.txt + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/cypress,cy8ctma140.yaml + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/elan,elants_i2c.yaml + delete mode 100644 drivers/input/misc/gp2ap002a00f.c + create mode 100644 drivers/input/misc/iqs269a.c + delete mode 100644 drivers/input/misc/msm-vibrator.c + create mode 100644 drivers/input/touchscreen/cy8ctma140.c + delete mode 100644 include/linux/input/gp2ap002a00f.h +Merging block/for-next (a3abcba6e2c2 Merge branch 'for-5.8/io_uring' into for-next) +$ git merge block/for-next +Auto-merging include/linux/nvme.h +Auto-merging include/linux/libata.h +Auto-merging include/linux/fs.h +Auto-merging fs/zonefs/super.c +Auto-merging fs/super.c +Auto-merging fs/io_uring.c +Removing drivers/scsi/lpfc/lpfc_nvmet.h +Auto-merging drivers/nvme/host/pci.c +Auto-merging drivers/nvme/host/fc.c +Auto-merging drivers/mtd/mtdcore.c +Auto-merging drivers/cdrom/cdrom.c +Auto-merging drivers/base/core.c +Merge made by the 'recursive' strategy. + Documentation/block/index.rst | 1 + + Documentation/block/inline-encryption.rst | 263 +++++++++ + arch/alpha/include/asm/floppy.h | 4 +- + arch/arm/include/asm/floppy.h | 8 +- + arch/m68k/include/asm/floppy.h | 27 +- + arch/mips/include/asm/mach-generic/floppy.h | 8 +- + arch/mips/include/asm/mach-jazz/floppy.h | 8 +- + arch/parisc/include/asm/floppy.h | 19 +- + arch/powerpc/include/asm/floppy.h | 19 +- + arch/sparc/include/asm/floppy_32.h | 50 +- + arch/sparc/include/asm/floppy_64.h | 59 +- + arch/x86/include/asm/floppy.h | 19 +- + block/Kconfig | 18 + + block/Makefile | 2 + + block/bio-integrity.c | 3 + + block/bio.c | 135 ++++- + block/blk-cgroup.c | 6 + + block/blk-core.c | 226 +++++--- + block/blk-crypto-fallback.c | 657 +++++++++++++++++++++++ + block/blk-crypto-internal.h | 201 +++++++ + block/blk-crypto.c | 404 ++++++++++++++ + block/blk-integrity.c | 7 + + block/blk-iocost.c | 86 ++- + block/blk-map.c | 15 +- + block/blk-merge.c | 61 +-- + block/blk-mq-debugfs.c | 1 - + block/blk-mq-sched.c | 82 ++- + block/blk-mq.c | 122 +++-- + block/blk-settings.c | 68 ++- + block/blk-sysfs.c | 13 + + block/blk-zoned.c | 23 +- + block/blk.h | 64 +-- + block/bounce.c | 2 + + block/genhd.c | 62 ++- + block/ioctl.c | 150 +----- + block/keyslot-manager.c | 397 ++++++++++++++ + block/partitions/core.c | 182 ++++++- + drivers/ata/libata-scsi.c | 30 +- + drivers/base/core.c | 37 +- + drivers/block/aoe/aoeblk.c | 1 - + drivers/block/floppy.c | 456 ++++++++-------- + drivers/block/null_blk_zoned.c | 37 +- + drivers/block/paride/pcd.c | 2 +- + drivers/block/swim.c | 6 +- + drivers/cdrom/cdrom.c | 85 +-- + drivers/cdrom/gdrom.c | 2 +- + drivers/ide/ide-cd.c | 17 +- + drivers/ide/ide-io.c | 7 +- + drivers/md/bcache/request.c | 1 - + drivers/md/dm-table.c | 17 - + drivers/md/dm.c | 6 + + drivers/md/md.c | 71 ++- + drivers/md/md.h | 1 + + drivers/md/raid1.c | 13 +- + drivers/md/raid5.c | 22 +- + drivers/mtd/mtdcore.c | 3 +- + drivers/nvme/host/core.c | 235 ++++---- + drivers/nvme/host/fc.c | 571 ++++++++++++++++---- + drivers/nvme/host/fc.h | 227 ++++++++ + drivers/nvme/host/multipath.c | 16 +- + drivers/nvme/host/nvme.h | 10 +- + drivers/nvme/host/pci.c | 89 ++- + drivers/nvme/host/tcp.c | 53 +- + drivers/nvme/target/admin-cmd.c | 5 + + drivers/nvme/target/configfs.c | 184 +++---- + drivers/nvme/target/fc.c | 805 ++++++++++++++++++++-------- + drivers/nvme/target/fcloop.c | 155 +++++- + drivers/nvme/target/io-cmd-bdev.c | 5 + + drivers/nvme/target/io-cmd-file.c | 17 +- + drivers/nvme/target/nvmet.h | 2 + + drivers/nvme/target/rdma.c | 178 ++++-- + drivers/s390/block/dasd_genhd.c | 20 +- + drivers/scsi/lpfc/lpfc.h | 2 +- + drivers/scsi/lpfc/lpfc_attr.c | 3 - + drivers/scsi/lpfc/lpfc_crtn.h | 9 +- + drivers/scsi/lpfc/lpfc_ct.c | 1 - + drivers/scsi/lpfc/lpfc_debugfs.c | 5 +- + drivers/scsi/lpfc/lpfc_hbadisc.c | 8 +- + drivers/scsi/lpfc/lpfc_init.c | 7 +- + drivers/scsi/lpfc/lpfc_mem.c | 4 - + drivers/scsi/lpfc/lpfc_nportdisc.c | 13 +- + drivers/scsi/lpfc/lpfc_nvme.c | 491 +++++++++++------ + drivers/scsi/lpfc/lpfc_nvme.h | 180 +++++++ + drivers/scsi/lpfc/lpfc_nvmet.c | 804 ++++++++++++++++----------- + drivers/scsi/lpfc/lpfc_nvmet.h | 158 ------ + drivers/scsi/lpfc/lpfc_sli.c | 126 ++++- + drivers/scsi/scsi_lib.c | 87 +-- + drivers/scsi/sd.c | 16 +- + drivers/scsi/sd.h | 43 +- + drivers/scsi/sd_zbc.c | 399 ++++++++++++-- + drivers/scsi/sr.c | 3 +- + fs/block_dev.c | 23 +- + fs/direct-io.c | 2 +- + fs/fs-writeback.c | 2 +- + fs/hfs/mdb.c | 32 +- + fs/hfsplus/wrapper.c | 33 +- + fs/io_uring.c | 519 +++++++++++------- + fs/iomap/direct-io.c | 2 +- + fs/isofs/inode.c | 54 +- + fs/splice.c | 3 +- + fs/super.c | 4 +- + fs/udf/lowlevel.c | 29 +- + fs/zonefs/super.c | 80 ++- + include/linux/backing-dev-defs.h | 2 - + include/linux/backing-dev.h | 8 +- + include/linux/blk-cgroup.h | 53 +- + include/linux/blk-crypto.h | 123 +++++ + include/linux/blk-mq.h | 3 + + include/linux/blk_types.h | 24 +- + include/linux/blkdev.h | 89 ++- + include/linux/cdrom.h | 7 +- + include/linux/device.h | 4 - + include/linux/fs.h | 2 - + include/linux/genhd.h | 35 +- + include/linux/keyslot-manager.h | 106 ++++ + include/linux/libata.h | 2 + + include/linux/nvme-fc-driver.h | 368 +++++++++---- + include/linux/nvme-fc.h | 11 +- + include/linux/nvme.h | 8 + + include/linux/splice.h | 3 + + include/scsi/scsi_cmnd.h | 1 + + include/scsi/scsi_device.h | 3 + + include/scsi/scsi_host.h | 7 + + include/uapi/linux/fd.h | 26 +- + include/uapi/linux/fdreg.h | 16 +- + include/uapi/linux/io_uring.h | 12 +- + kernel/trace/blktrace.c | 4 +- + mm/backing-dev.c | 21 +- + tools/cgroup/iocost_monitor.py | 48 +- + 129 files changed, 8062 insertions(+), 2924 deletions(-) + create mode 100644 Documentation/block/inline-encryption.rst + create mode 100644 block/blk-crypto-fallback.c + create mode 100644 block/blk-crypto-internal.h + create mode 100644 block/blk-crypto.c + create mode 100644 block/keyslot-manager.c + create mode 100644 drivers/nvme/host/fc.h + delete mode 100644 drivers/scsi/lpfc/lpfc_nvmet.h + create mode 100644 include/linux/blk-crypto.h + create mode 100644 include/linux/keyslot-manager.h +Merging device-mapper/for-next (81a3a1453ec4 dm zoned: Avoid 64-bit division error in dmz_fixup_devices) +$ git merge device-mapper/for-next +Auto-merging drivers/md/persistent-data/dm-btree-internal.h +Auto-merging drivers/md/dm.c +Auto-merging drivers/md/dm-integrity.c +Auto-merging drivers/md/dm-crypt.c +Merge made by the 'recursive' strategy. + Documentation/admin-guide/device-mapper/dm-ebs.rst | 51 ++ + .../admin-guide/device-mapper/dm-zoned.rst | 62 +- + drivers/md/Kconfig | 20 + + drivers/md/Makefile | 3 + + drivers/md/dm-bufio.c | 69 ++- + drivers/md/dm-crypt.c | 76 ++- + drivers/md/dm-ebs-target.c | 471 +++++++++++++++ + drivers/md/dm-historical-service-time.c | 561 +++++++++++++++++ + drivers/md/dm-integrity.c | 4 - + drivers/md/dm-mpath.c | 23 +- + drivers/md/dm-path-selector.h | 2 +- + drivers/md/dm-queue-length.c | 2 +- + drivers/md/dm-service-time.c | 2 +- + drivers/md/dm-writecache.c | 42 +- + drivers/md/dm-zoned-metadata.c | 664 ++++++++++++++++----- + drivers/md/dm-zoned-reclaim.c | 88 +-- + drivers/md/dm-zoned-target.c | 377 ++++++++---- + drivers/md/dm-zoned.h | 35 +- + drivers/md/dm.c | 11 +- + drivers/md/persistent-data/dm-btree-internal.h | 2 +- + drivers/md/persistent-data/dm-btree-spine.c | 6 +- + include/linux/device-mapper.h | 9 +- + include/linux/dm-bufio.h | 12 + + 23 files changed, 2189 insertions(+), 403 deletions(-) + create mode 100644 Documentation/admin-guide/device-mapper/dm-ebs.rst + create mode 100644 drivers/md/dm-ebs-target.c + create mode 100644 drivers/md/dm-historical-service-time.c +Merging pcmcia/pcmcia-next (46d079790663 pcmcia: make pccard_loop_tuple() static) +$ git merge pcmcia/pcmcia-next +Merge made by the 'recursive' strategy. + drivers/pcmcia/cs_internal.h | 6 ------ + drivers/pcmcia/pcmcia_cis.c | 6 +++--- + 2 files changed, 3 insertions(+), 9 deletions(-) +Merging mmc/next (50e41371f66e Merge branch 'fixes' into next) +$ git merge mmc/next +Auto-merging drivers/mmc/host/Kconfig +Merge made by the 'recursive' strategy. + .../bindings/mmc/amlogic,meson-mx-sdhc.yaml | 68 ++ + .../devicetree/bindings/mmc/arasan,sdhci.txt | 15 + + .../devicetree/bindings/mmc/renesas,mmcif.txt | 5 +- + drivers/mmc/core/core.c | 6 +- + drivers/mmc/core/debugfs.c | 6 +- + drivers/mmc/core/mmc.c | 6 + + drivers/mmc/core/regulator.c | 17 +- + drivers/mmc/core/sd.c | 4 +- + drivers/mmc/core/sdio.c | 116 ++- + drivers/mmc/host/Kconfig | 16 +- + drivers/mmc/host/Makefile | 2 + + drivers/mmc/host/android-goldfish.c | 10 +- + drivers/mmc/host/atmel-mci.c | 12 +- + drivers/mmc/host/au1xmmc.c | 20 +- + drivers/mmc/host/bcm2835.c | 3 +- + drivers/mmc/host/cavium.c | 3 +- + drivers/mmc/host/cb710-mmc.c | 8 + + drivers/mmc/host/dw_mmc-k3.c | 2 +- + drivers/mmc/host/dw_mmc.c | 9 +- + drivers/mmc/host/jz4740_mmc.c | 13 +- + drivers/mmc/host/meson-gx-mmc.c | 5 +- + drivers/mmc/host/meson-mx-sdhc-clkc.c | 158 ++++ + drivers/mmc/host/meson-mx-sdhc-mmc.c | 914 +++++++++++++++++++++ + drivers/mmc/host/meson-mx-sdhc.h | 141 ++++ + drivers/mmc/host/meson-mx-sdio.c | 5 +- + drivers/mmc/host/mmc_hsq.c | 29 +- + drivers/mmc/host/mmc_hsq.h | 1 + + drivers/mmc/host/mmc_spi.c | 20 +- + drivers/mmc/host/mmci.c | 30 +- + drivers/mmc/host/mmci_stm32_sdmmc.c | 1 + + drivers/mmc/host/mtk-sd.c | 21 +- + drivers/mmc/host/mvsdio.c | 2 - + drivers/mmc/host/mxs-mmc.c | 3 +- + drivers/mmc/host/omap.c | 2 +- + drivers/mmc/host/omap_hsmmc.c | 2 +- + drivers/mmc/host/owl-mmc.c | 8 +- + drivers/mmc/host/renesas_sdhi.h | 5 +- + drivers/mmc/host/renesas_sdhi_core.c | 133 ++- + drivers/mmc/host/rtsx_pci_sdmmc.c | 2 +- + drivers/mmc/host/rtsx_usb_sdmmc.c | 2 +- + drivers/mmc/host/s3cmci.c | 7 - + drivers/mmc/host/sdhci-esdhc-imx.c | 11 +- + drivers/mmc/host/sdhci-esdhc.h | 2 +- + drivers/mmc/host/sdhci-msm.c | 53 +- + drivers/mmc/host/sdhci-of-arasan.c | 471 ++++++++--- + drivers/mmc/host/sdhci-of-at91.c | 5 +- + drivers/mmc/host/sdhci-of-dwcmshc.c | 74 +- + drivers/mmc/host/sdhci-pci-core.c | 9 +- + drivers/mmc/host/sdhci-pci-gli.c | 106 +++ + drivers/mmc/host/sdhci-pci-o2micro.c | 8 +- + drivers/mmc/host/sdhci-pci.h | 2 + + drivers/mmc/host/sdhci-sprd.c | 28 +- + drivers/mmc/host/sdhci.c | 271 ++++-- + drivers/mmc/host/sdhci.h | 34 +- + drivers/mmc/host/sdricoh_cs.c | 105 +-- + drivers/mmc/host/sunxi-mmc.c | 10 +- + drivers/mmc/host/tifm_sd.c | 9 +- + drivers/mmc/host/tmio_mmc_core.c | 2 +- + drivers/mmc/host/uniphier-sd.c | 12 +- + drivers/mmc/host/usdhi6rol0.c | 9 +- + drivers/mmc/host/via-sdmmc.c | 7 +- + drivers/mmc/host/wbsd.c | 26 +- + drivers/staging/greybus/sdio.c | 11 +- + include/linux/memstick.h | 2 +- + include/linux/mmc/card.h | 1 + + include/linux/mmc/host.h | 4 +- + include/linux/mmc/mmc.h | 1 + + include/linux/platform_data/mmc-esdhc-imx.h | 2 +- + include/uapi/linux/mmc/ioctl.h | 1 + + 69 files changed, 2541 insertions(+), 567 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mmc/amlogic,meson-mx-sdhc.yaml + create mode 100644 drivers/mmc/host/meson-mx-sdhc-clkc.c + create mode 100644 drivers/mmc/host/meson-mx-sdhc-mmc.c + create mode 100644 drivers/mmc/host/meson-mx-sdhc.h +Merging md/for-next (e820d55cb99d md: fix raid10 hang issue caused by barrier) +$ git merge md/for-next +Already up to date. +Merging mfd/for-mfd-next (6130fbfa94be mfd: intel-lpss: Update LPSS UART #2 PCI ID for Jasper Lake) +$ git merge mfd/for-mfd-next +Auto-merging drivers/usb/typec/mux/intel_pmc_mux.c +Removing drivers/platform/x86/intel_pmc_ipc.c +Auto-merging drivers/mfd/Kconfig +Removing arch/x86/include/asm/intel_pmc_ipc.h +Auto-merging arch/x86/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../ABI/obsolete/sysfs-driver-intel_pmc_bxt | 22 + + MAINTAINERS | 23 +- + arch/x86/Kconfig | 2 +- + arch/x86/include/asm/intel-mid.h | 9 +- + arch/x86/include/asm/intel_pmc_ipc.h | 59 -- + arch/x86/include/asm/intel_scu_ipc.h | 114 +-- + arch/x86/include/asm/intel_scu_ipc_legacy.h | 91 ++ + arch/x86/include/asm/intel_telemetry.h | 6 +- + drivers/mfd/Kconfig | 20 +- + drivers/mfd/Makefile | 1 + + drivers/mfd/htc-i2cpld.c | 6 +- + drivers/mfd/intel-lpss-pci.c | 2 +- + drivers/mfd/intel_pmc_bxt.c | 468 ++++++++++ + drivers/mfd/intel_soc_pmic_bxtwc.c | 34 +- + drivers/mfd/intel_soc_pmic_mrfld.c | 10 +- + drivers/mfd/max77620.c | 1 + + drivers/mfd/stpmic1.c | 2 +- + drivers/mfd/tqmx86.c | 2 +- + drivers/mfd/wcd934x.c | 1 - + drivers/platform/x86/Kconfig | 46 +- + drivers/platform/x86/Makefile | 2 +- + drivers/platform/x86/intel_mid_powerbtn.c | 15 +- + drivers/platform/x86/intel_pmc_ipc.c | 949 --------------------- + drivers/platform/x86/intel_scu_ipc.c | 447 +++++++--- + drivers/platform/x86/intel_scu_ipcutil.c | 43 +- + drivers/platform/x86/intel_scu_pcidrv.c | 68 ++ + drivers/platform/x86/intel_telemetry_core.c | 17 +- + drivers/platform/x86/intel_telemetry_debugfs.c | 15 +- + drivers/platform/x86/intel_telemetry_pltdrv.c | 97 ++- + drivers/usb/typec/mux/Kconfig | 2 +- + drivers/usb/typec/mux/intel_pmc_mux.c | 12 +- + drivers/usb/typec/tcpm/Kconfig | 2 +- + drivers/watchdog/iTCO_wdt.c | 25 +- + drivers/watchdog/intel-mid_wdt.c | 53 +- + include/linux/mfd/intel_pmc_bxt.h | 53 ++ + include/linux/mfd/intel_soc_pmic.h | 15 + + include/linux/platform_data/itco_wdt.h | 11 +- + 37 files changed, 1418 insertions(+), 1327 deletions(-) + create mode 100644 Documentation/ABI/obsolete/sysfs-driver-intel_pmc_bxt + delete mode 100644 arch/x86/include/asm/intel_pmc_ipc.h + create mode 100644 arch/x86/include/asm/intel_scu_ipc_legacy.h + create mode 100644 drivers/mfd/intel_pmc_bxt.c + delete mode 100644 drivers/platform/x86/intel_pmc_ipc.c + create mode 100644 drivers/platform/x86/intel_scu_pcidrv.c + create mode 100644 include/linux/mfd/intel_pmc_bxt.h +Merging backlight/for-backlight-next (479da1f538a2 backlight: Add backlight_device_get_by_name()) +$ git merge backlight/for-backlight-next +Removing include/linux/spi/l4f00242t03.h +Removing Documentation/devicetree/bindings/leds/backlight/qcom-wled.txt +Merge made by the 'recursive' strategy. + .../bindings/leds/backlight/qcom-wled.txt | 154 ------ + .../bindings/leds/backlight/qcom-wled.yaml | 261 +++++++++ + arch/arm/mach-imx/mach-mx27_3ds.c | 21 +- + arch/arm/mach-imx/mach-mx31_3ds.c | 24 +- + drivers/video/backlight/backlight.c | 21 + + drivers/video/backlight/l4f00242t03.c | 45 +- + drivers/video/backlight/lp855x_bl.c | 20 +- + drivers/video/backlight/qcom-wled.c | 589 ++++++++++++++++++--- + include/linux/backlight.h | 1 + + include/linux/spi/l4f00242t03.h | 17 - + 10 files changed, 867 insertions(+), 286 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/leds/backlight/qcom-wled.txt + create mode 100644 Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml + delete mode 100644 include/linux/spi/l4f00242t03.h +Merging battery/for-next (eda8ffcc5edf dt-bindings: power: Convert bq27xxx dt to yaml) +$ git merge battery/for-next +Auto-merging lib/Kconfig.debug +Auto-merging lib/Kconfig +Auto-merging drivers/regulator/qcom-rpmh-regulator.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Removing Documentation/devicetree/bindings/power/supply/bq27xxx.txt +Removing Documentation/devicetree/bindings/power/reset/syscon-reboot-mode.txt +Merge made by the 'recursive' strategy. + .../bindings/power/reset/syscon-reboot-mode.txt | 35 - + .../bindings/power/reset/syscon-reboot-mode.yaml | 55 + + .../devicetree/bindings/power/supply/battery.txt | 6 + + .../devicetree/bindings/power/supply/bq27xxx.txt | 56 - + .../devicetree/bindings/power/supply/bq27xxx.yaml | 91 ++ + .../bindings/power/supply/cw2015_battery.yaml | 82 ++ + .../bindings/power/supply/power-supply.yaml | 40 + + .../bindings/power/supply/power_supply.txt | 25 +- + .../bindings/power/supply/rohm,bd99954.yaml | 155 +++ + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + MAINTAINERS | 7 + + arch/x86/platform/olpc/olpc-xo1-sci.c | 4 +- + arch/x86/platform/olpc/olpc-xo15-sci.c | 4 +- + drivers/platform/olpc/olpc-xo175-ec.c | 4 +- + drivers/power/reset/Kconfig | 7 + + drivers/power/reset/Makefile | 1 + + drivers/power/reset/ltc2952-poweroff.c | 3 +- + drivers/power/reset/oxnas-restart.c | 233 ++++ + drivers/power/reset/qcom-pon.c | 3 +- + drivers/power/supply/88pm860x_battery.c | 8 +- + drivers/power/supply/Kconfig | 49 +- + drivers/power/supply/Makefile | 2 + + drivers/power/supply/ab8500_fg.c | 2 +- + drivers/power/supply/axp288_charger.c | 5 +- + drivers/power/supply/axp288_fuel_gauge.c | 6 + + drivers/power/supply/bd70528-charger.c | 140 +-- + drivers/power/supply/bd99954-charger.c | 1142 ++++++++++++++++++++ + drivers/power/supply/bd99954-charger.h | 1075 ++++++++++++++++++ + drivers/power/supply/bq24190_charger.c | 2 +- + drivers/power/supply/bq25890_charger.c | 200 ++-- + drivers/power/supply/charger-manager.c | 40 +- + drivers/power/supply/cw2015_battery.c | 749 +++++++++++++ + drivers/power/supply/generic-adc-battery.c | 22 +- + drivers/power/supply/lp8788-charger.c | 18 +- + drivers/power/supply/max14656_charger_detector.c | 5 +- + drivers/power/supply/max17040_battery.c | 2 +- + drivers/power/supply/max17042_battery.c | 8 + + drivers/power/supply/olpc_battery.c | 4 +- + drivers/power/supply/power_supply_core.c | 8 + + drivers/power/supply/power_supply_hwmon.c | 64 +- + drivers/power/supply/power_supply_sysfs.c | 479 ++++---- + drivers/power/supply/sc27xx_fuel_gauge.c | 77 +- + drivers/power/supply/smb347-charger.c | 5 + + drivers/regulator/88pg86x.c | 4 +- + drivers/regulator/88pm800-regulator.c | 4 +- + drivers/regulator/Kconfig | 1 + + drivers/regulator/act8865-regulator.c | 4 +- + drivers/regulator/act8945a-regulator.c | 2 +- + drivers/regulator/arizona-ldo1.c | 2 +- + drivers/regulator/arizona-micsupp.c | 4 +- + drivers/regulator/as3711-regulator.c | 6 +- + drivers/regulator/as3722-regulator.c | 4 +- + drivers/regulator/axp20x-regulator.c | 16 +- + drivers/regulator/bcm590xx-regulator.c | 8 +- + drivers/regulator/bd70528-regulator.c | 8 +- + drivers/regulator/bd71828-regulator.c | 10 +- + drivers/regulator/bd718x7-regulator.c | 26 +- + drivers/regulator/da903x.c | 2 +- + drivers/regulator/helpers.c | 130 +-- + drivers/regulator/hi6421-regulator.c | 4 +- + drivers/regulator/lochnagar-regulator.c | 4 +- + drivers/regulator/lp873x-regulator.c | 4 +- + drivers/regulator/lp87565-regulator.c | 2 +- + drivers/regulator/lp8788-buck.c | 2 +- + drivers/regulator/max77650-regulator.c | 2 +- + drivers/regulator/mcp16502.c | 4 +- + drivers/regulator/mp8859.c | 2 +- + drivers/regulator/mt6323-regulator.c | 6 +- + drivers/regulator/mt6358-regulator.c | 8 +- + drivers/regulator/mt6380-regulator.c | 6 +- + drivers/regulator/mt6397-regulator.c | 6 +- + drivers/regulator/palmas-regulator.c | 4 +- + drivers/regulator/qcom-rpmh-regulator.c | 2 +- + drivers/regulator/qcom_rpm-regulator.c | 14 +- + drivers/regulator/qcom_smd-regulator.c | 78 +- + drivers/regulator/rk808-regulator.c | 10 +- + drivers/regulator/s2mps11.c | 14 +- + drivers/regulator/sky81452-regulator.c | 2 +- + drivers/regulator/stpmic1_regulator.c | 18 +- + drivers/regulator/tps65086-regulator.c | 10 +- + drivers/regulator/tps65217-regulator.c | 4 +- + drivers/regulator/tps65218-regulator.c | 6 +- + drivers/regulator/tps65912-regulator.c | 4 +- + drivers/regulator/twl-regulator.c | 4 +- + drivers/regulator/twl6030-regulator.c | 2 +- + drivers/regulator/wm831x-dcdc.c | 2 +- + drivers/regulator/wm831x-ldo.c | 4 +- + drivers/regulator/wm8350-regulator.c | 2 +- + drivers/regulator/wm8400-regulator.c | 2 +- + include/linux/linear_range.h | 48 + + include/linux/power_supply.h | 8 +- + include/linux/regulator/driver.h | 27 +- + lib/Kconfig | 3 + + lib/Kconfig.debug | 12 + + lib/Makefile | 2 + + lib/linear_ranges.c | 241 +++++ + lib/test_linear_ranges.c | 228 ++++ + 97 files changed, 5086 insertions(+), 871 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/power/reset/syscon-reboot-mode.txt + create mode 100644 Documentation/devicetree/bindings/power/reset/syscon-reboot-mode.yaml + delete mode 100644 Documentation/devicetree/bindings/power/supply/bq27xxx.txt + create mode 100644 Documentation/devicetree/bindings/power/supply/bq27xxx.yaml + create mode 100644 Documentation/devicetree/bindings/power/supply/cw2015_battery.yaml + create mode 100644 Documentation/devicetree/bindings/power/supply/power-supply.yaml + create mode 100644 Documentation/devicetree/bindings/power/supply/rohm,bd99954.yaml + create mode 100644 drivers/power/reset/oxnas-restart.c + create mode 100644 drivers/power/supply/bd99954-charger.c + create mode 100644 drivers/power/supply/bd99954-charger.h + create mode 100644 drivers/power/supply/cw2015_battery.c + create mode 100644 include/linux/linear_range.h + create mode 100644 lib/linear_ranges.c + create mode 100644 lib/test_linear_ranges.c +Merging regulator/for-next (33fdc0fcaafa Merge remote-tracking branch 'regulator/for-5.8' into regulator-next) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + .../bindings/regulator/maxim,max77826.yaml | 68 +++++ + drivers/regulator/Kconfig | 10 + + drivers/regulator/Makefile | 1 + + drivers/regulator/ab8500.c | 22 -- + drivers/regulator/bd718x7-regulator.c | 212 ++++++++++++++- + drivers/regulator/core.c | 1 + + drivers/regulator/db8500-prcmu.c | 2 +- + drivers/regulator/max77826-regulator.c | 301 +++++++++++++++++++++ + drivers/regulator/qcom_rpm-regulator.c | 10 - + drivers/regulator/tps80031-regulator.c | 7 +- + lib/linear_ranges.c | 4 + + 11 files changed, 587 insertions(+), 51 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regulator/maxim,max77826.yaml + create mode 100644 drivers/regulator/max77826-regulator.c +Merging security/next-testing (60cf7c5ed5f7 lockdown: Allow unprivileged users to see lockdown status) +$ git merge security/next-testing +Auto-merging security/lockdown/lockdown.c +Merge made by the 'recursive' strategy. + security/lockdown/lockdown.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging apparmor/apparmor-next (e37986097ba6 apparmor: Use true and false for bool variable) +$ git merge apparmor/apparmor-next +Auto-merging security/apparmor/policy_unpack.c +Auto-merging security/apparmor/apparmorfs.c +Auto-merging fs/proc/base.c +Merge made by the 'recursive' strategy. + fs/proc/base.c | 13 +++++++++ + security/apparmor/apparmorfs.c | 54 ++++++++---------------------------- + security/apparmor/domain.c | 39 ++++++++++---------------- + security/apparmor/file.c | 12 ++++---- + security/apparmor/include/label.h | 1 + + security/apparmor/include/match.h | 11 ++++++++ + security/apparmor/label.c | 43 +++++++++++++++++++++++------ + security/apparmor/match.c | 58 ++++++++++++++++++++++++++++++++++++++- + security/apparmor/path.c | 2 +- + security/apparmor/policy_unpack.c | 58 +++++++++++++++++++++------------------ + 10 files changed, 181 insertions(+), 110 deletions(-) +Merging integrity/next-integrity (0c4395fb2aa7 evm: Fix possible memory leak in evm_calc_hmac_or_hash()) +$ git merge integrity/next-integrity +Auto-merging security/integrity/ima/ima_fs.c +Auto-merging security/integrity/ima/ima_crypto.c +Auto-merging security/integrity/ima/ima.h +Auto-merging security/integrity/evm/evm_crypto.c +Merge made by the 'recursive' strategy. + security/integrity/evm/evm_crypto.c | 2 +- + security/integrity/ima/ima.h | 17 ++- + security/integrity/ima/ima_api.c | 22 +-- + security/integrity/ima/ima_crypto.c | 248 +++++++++++++++++++++++++++++----- + security/integrity/ima/ima_fs.c | 4 +- + security/integrity/ima/ima_init.c | 22 ++- + security/integrity/ima/ima_main.c | 3 + + security/integrity/ima/ima_policy.c | 9 +- + security/integrity/ima/ima_queue.c | 36 +++-- + security/integrity/ima/ima_template.c | 25 +++- + 10 files changed, 308 insertions(+), 80 deletions(-) +Merging keys/keys-next (85e2de360ac2 KEYS: Replace zero-length array with flexible-array) +$ git merge keys/keys-next +Merge made by the 'recursive' strategy. + Documentation/security/keys/core.rst | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) +Merging selinux/next (fe5a90b8c149 selinux: netlabel: Remove unused inline function) +$ git merge selinux/next +Auto-merging security/selinux/ss/policydb.c +Merge made by the 'recursive' strategy. + security/selinux/Makefile | 2 +- + security/selinux/include/netlabel.h | 6 - + security/selinux/include/security.h | 3 +- + security/selinux/ss/context.c | 32 +++ + security/selinux/ss/context.h | 11 +- + security/selinux/ss/ebitmap.c | 14 ++ + security/selinux/ss/ebitmap.h | 1 + + security/selinux/ss/hashtab.c | 51 ++-- + security/selinux/ss/hashtab.h | 13 +- + security/selinux/ss/mls.c | 16 +- + security/selinux/ss/mls.h | 11 + + security/selinux/ss/policydb.c | 451 +++++++++++++++++++++++++----------- + security/selinux/ss/policydb.h | 15 +- + security/selinux/ss/services.c | 153 +++++------- + security/selinux/ss/services.h | 3 - + security/selinux/ss/sidtab.c | 35 +-- + security/selinux/ss/sidtab.h | 1 + + security/selinux/ss/symtab.c | 5 +- + security/selinux/ss/symtab.h | 2 +- + 19 files changed, 499 insertions(+), 326 deletions(-) + create mode 100644 security/selinux/ss/context.c +Merging smack/next (ef26650a201f Smack: Remove unused inline function smk_ad_setfield_u_fs_path_mnt) +$ git merge smack/next +Merge made by the 'recursive' strategy. + security/smack/smack.h | 12 ------------ + security/smack/smack_lsm.c | 42 +++++++++++------------------------------- + security/smack/smackfs.c | 10 ++++++++++ + 3 files changed, 21 insertions(+), 43 deletions(-) +Merging tomoyo/master (27acbf41be39 tomoyo: use true for bool variable) +$ git merge tomoyo/master +Merge made by the 'recursive' strategy. + security/tomoyo/common.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging tpmdd/next (47c18d91f4ad tpm: eventlog: Replace zero-length array with flexible-array member) +$ git merge tpmdd/next +Merge made by the 'recursive' strategy. + drivers/char/tpm/eventlog/tpm2.c | 12 +++++------- + drivers/char/tpm/tpm_ftpm_tee.c | 2 +- + include/linux/tpm_eventlog.h | 2 +- + 3 files changed, 7 insertions(+), 9 deletions(-) +Merging watchdog/master (152036d1379f Merge tag 'nfsd-5.7-rc-2' of git://git.linux-nfs.org/projects/cel/cel-2.6) +$ git merge watchdog/master +Already up to date. +Merging iommu/next (26d2ceb4ab6b Merge branches 'iommu/fixes', 'arm/msm', 'arm/allwinner', 'x86/vt-d' and 'x86/amd' into next) +$ git merge iommu/next +Auto-merging include/linux/iommu.h +Auto-merging drivers/iommu/s390-iommu.c +CONFLICT (content): Merge conflict in drivers/iommu/s390-iommu.c +Resolved 'drivers/iommu/s390-iommu.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master f74794b89196] Merge remote-tracking branch 'iommu/next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/iommu/allwinner,sun50i-h6-iommu.yaml | 61 ++ + drivers/iommu/Kconfig | 9 + + drivers/iommu/Makefile | 1 + + drivers/iommu/amd_iommu.c | 103 +- + drivers/iommu/amd_iommu_init.c | 9 +- + drivers/iommu/amd_iommu_types.h | 9 +- + drivers/iommu/arm-smmu-v3.c | 38 +- + drivers/iommu/arm-smmu.c | 39 +- + drivers/iommu/exynos-iommu.c | 24 +- + drivers/iommu/fsl_pamu_domain.c | 22 +- + drivers/iommu/intel-iommu.c | 463 +-------- + drivers/iommu/iommu.c | 482 ++++++--- + drivers/iommu/iova.c | 6 +- + drivers/iommu/ipmmu-vmsa.c | 59 +- + drivers/iommu/msm_iommu.c | 36 +- + drivers/iommu/mtk_iommu.c | 24 +- + drivers/iommu/mtk_iommu_v1.c | 50 +- + drivers/iommu/omap-iommu.c | 99 +- + drivers/iommu/qcom_iommu.c | 24 +- + drivers/iommu/rockchip-iommu.c | 26 +- + drivers/iommu/s390-iommu.c | 22 +- + drivers/iommu/sun50i-iommu.c | 1023 ++++++++++++++++++++ + drivers/iommu/tegra-gart.c | 24 +- + drivers/iommu/tegra-smmu.c | 31 +- + drivers/iommu/virtio-iommu.c | 41 +- + include/linux/iommu.h | 33 +- + 26 files changed, 1690 insertions(+), 1068 deletions(-) + create mode 100644 Documentation/devicetree/bindings/iommu/allwinner,sun50i-h6-iommu.yaml + create mode 100644 drivers/iommu/sun50i-iommu.c +Merging vfio/next (f44efca0493d vfio: Ignore -ENODEV when getting MSI cookie) +$ git merge vfio/next +Already up to date. +Merging audit/next (0090c1edebf4 audit: Replace zero-length array with flexible-array) +$ git merge audit/next +Auto-merging kernel/audit.c +Merge made by the 'recursive' strategy. + include/linux/audit.h | 24 +++++++++- + include/uapi/linux/audit.h | 1 + + kernel/audit.c | 100 +++++++++++++++++++++++++++++----------- + kernel/audit.h | 2 +- + kernel/auditfilter.c | 16 +++---- + kernel/auditsc.c | 25 ++++++++++ + net/bridge/netfilter/ebtables.c | 14 +++--- + net/netfilter/x_tables.c | 14 ++---- + 8 files changed, 142 insertions(+), 54 deletions(-) +Merging devicetree/for-next (59ffe4ed0725 dt-bindings: ehci/ohci: Allow iommus property) +$ git merge devicetree/for-next +Auto-merging scripts/checkpatch.pl +Auto-merging MAINTAINERS +Auto-merging Documentation/index.rst +Removing Documentation/devicetree/bindings/watchdog/renesas,wdt.txt +Removing Documentation/devicetree/bindings/watchdog/fsl-imx7ulp-wdt.txt +Removing Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.txt +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging Documentation/devicetree/bindings/usb/renesas,usbhs.yaml +Auto-merging Documentation/devicetree/bindings/usb/renesas,usb3-peri.yaml +Removing Documentation/devicetree/bindings/timer/renesas,ostm.txt +Removing Documentation/devicetree/bindings/timer/ingenic,tcu.txt +Removing Documentation/devicetree/bindings/timer/cadence,ttc-timer.txt +Removing Documentation/devicetree/bindings/thermal/uniphier-thermal.txt +Removing Documentation/devicetree/bindings/thermal/imx8mm-thermal.txt +Removing Documentation/devicetree/bindings/sram/rockchip-pmu-sram.txt +Auto-merging Documentation/devicetree/bindings/sound/tlv320adcx140.yaml +Auto-merging Documentation/devicetree/bindings/sound/rockchip-i2s.yaml +Removing Documentation/devicetree/bindings/serial/mrvl-serial.txt +Removing Documentation/devicetree/bindings/serial/ingenic,uart.txt +Removing Documentation/devicetree/bindings/serial/8250.txt +Removing Documentation/devicetree/bindings/phy/uniphier-usb3-ssphy.txt +Removing Documentation/devicetree/bindings/phy/uniphier-usb3-hsphy.txt +Removing Documentation/devicetree/bindings/phy/uniphier-usb2-phy.txt +Removing Documentation/devicetree/bindings/phy/uniphier-pcie-phy.txt +Removing Documentation/devicetree/bindings/phy/calxeda-combophy.txt +Removing Documentation/devicetree/bindings/nvmem/rockchip-efuse.txt +Removing Documentation/devicetree/bindings/nvmem/mxs-ocotp.txt +Removing Documentation/devicetree/bindings/nvmem/imx-ocotp.txt +Removing Documentation/devicetree/bindings/nvmem/imx-iim.txt +Auto-merging Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml +Removing Documentation/devicetree/bindings/net/stm32-dwmac.txt +Auto-merging Documentation/devicetree/bindings/net/qcom,ipa.yaml +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/net/qcom,ipa.yaml +Removing Documentation/devicetree/bindings/net/calxeda-xgmac.txt +Removing Documentation/devicetree/bindings/mmc/jz4740.txt +Removing Documentation/devicetree/bindings/memory-controllers/calxeda-ddr-ctrlr.txt +Removing Documentation/devicetree/bindings/ipmi/ipmi-smic.txt +Removing Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.txt +Auto-merging Documentation/devicetree/bindings/iommu/arm,smmu.yaml +Removing Documentation/devicetree/bindings/interrupt-controller/renesas,intc-irqpin.txt +Removing Documentation/devicetree/bindings/interrupt-controller/ingenic,intc.txt +Removing Documentation/devicetree/bindings/input/gpio-keys.txt +Removing Documentation/devicetree/bindings/input/gpio-keys-polled.txt +Auto-merging Documentation/devicetree/bindings/iio/adc/st,stm32-adc.yaml +Auto-merging Documentation/devicetree/bindings/i2c/st,stm32-i2c.yaml +Removing Documentation/devicetree/bindings/i2c/i2c-xiic.txt +Removing Documentation/devicetree/bindings/i2c/i2c-jz4780.txt +Removing Documentation/devicetree/bindings/i2c/i2c-cadence.txt +Auto-merging Documentation/devicetree/bindings/gpu/arm,mali-utgard.yaml +Removing Documentation/devicetree/bindings/gpio/renesas,gpio-rcar.txt +Removing Documentation/devicetree/bindings/gpio/fsl-imx-gpio.txt +Removing Documentation/devicetree/bindings/dma/jz4780-dma.txt +Auto-merging Documentation/devicetree/bindings/display/panel/xinpeng,xpp055c272.yaml +Auto-merging Documentation/devicetree/bindings/display/panel/panel-common.yaml +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/display/panel/panel-common.yaml +Auto-merging Documentation/devicetree/bindings/display/bridge/lvds-codec.yaml +Auto-merging Documentation/devicetree/bindings/display/allwinner,sun6i-a31-mipi-dsi.yaml +Auto-merging Documentation/devicetree/bindings/clock/qcom,mmcc.yaml +Removing Documentation/devicetree/bindings/clock/ingenic,cgu.txt +Removing Documentation/devicetree/bindings/clock/calxeda.txt +Removing Documentation/devicetree/bindings/ata/sata_highbank.txt +Auto-merging Documentation/devicetree/bindings/arm/cpus.yaml +Removing Documentation/devicetree/bindings/arm/calxeda/l2ecc.txt +Resolved 'Documentation/devicetree/bindings/display/panel/panel-common.yaml' using previous resolution. +Resolved 'Documentation/devicetree/bindings/net/qcom,ipa.yaml' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master b0652fa42e3e] Merge remote-tracking branch 'devicetree/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/arm/microchip.rst | 2 +- + .../devicetree/bindings/{ABI.txt => ABI.rst} | 5 +- + Documentation/devicetree/bindings/Makefile | 14 +- + Documentation/devicetree/bindings/arm/altera.yaml | 6 +- + Documentation/devicetree/bindings/arm/amlogic.yaml | 2 +- + .../arm/amlogic/amlogic,meson-gx-ao-secure.yaml | 2 +- + .../devicetree/bindings/arm/arm,vexpress-juno.yaml | 34 ++- + Documentation/devicetree/bindings/arm/bitmain.yaml | 2 +- + .../devicetree/bindings/arm/calxeda/hb-sregs.yaml | 49 ++++ + .../devicetree/bindings/arm/calxeda/l2ecc.txt | 15 -- + .../devicetree/bindings/arm/calxeda/l2ecc.yaml | 42 ++++ + .../devicetree/bindings/arm/coresight-cti.yaml | 20 +- + Documentation/devicetree/bindings/arm/cpus.yaml | 85 ++++--- + Documentation/devicetree/bindings/arm/l2c2x0.yaml | 87 +++---- + .../devicetree/bindings/arm/nxp/lpc32xx.yaml | 9 +- + Documentation/devicetree/bindings/arm/psci.yaml | 16 +- + .../devicetree/bindings/arm/renesas,prr.yaml | 2 +- + .../bindings/arm/samsung/exynos-chipid.yaml | 5 +- + .../bindings/arm/socionext/uniphier.yaml | 26 +- + .../devicetree/bindings/arm/stm32/st,mlahb.yaml | 2 +- + .../bindings/arm/stm32/st,stm32-syscon.yaml | 6 +- + Documentation/devicetree/bindings/arm/syna.txt | 2 +- + .../bindings/arm/tegra/nvidia,tegra20-pmc.yaml | 2 +- + .../devicetree/bindings/ata/faraday,ftide010.yaml | 4 +- + .../devicetree/bindings/ata/sata_highbank.txt | 44 ---- + .../devicetree/bindings/ata/sata_highbank.yaml | 95 +++++++ + .../bindings/bus/allwinner,sun50i-a64-de2.yaml | 5 +- + .../bindings/bus/allwinner,sun8i-a23-rsb.yaml | 4 +- + .../clock/allwinner,sun4i-a10-gates-clk.yaml | 8 +- + .../bindings/clock/bitmain,bm1880-clk.yaml | 2 +- + .../devicetree/bindings/clock/calxeda.txt | 17 -- + .../devicetree/bindings/clock/calxeda.yaml | 82 ++++++ + .../bindings/clock/fixed-factor-clock.yaml | 5 +- + .../devicetree/bindings/clock/fsl,plldig.yaml | 19 +- + .../devicetree/bindings/clock/ingenic,cgu.txt | 57 ----- + .../devicetree/bindings/clock/ingenic,cgu.yaml | 122 +++++++++ + .../devicetree/bindings/clock/qcom,gcc-sc7180.yaml | 2 +- + .../devicetree/bindings/clock/qcom,gcc-sm8150.yaml | 2 +- + .../devicetree/bindings/clock/qcom,gcc-sm8250.yaml | 2 +- + .../devicetree/bindings/clock/qcom,mmcc.yaml | 16 +- + .../bindings/clock/qcom,sc7180-dispcc.yaml | 2 +- + .../bindings/clock/qcom,sc7180-gpucc.yaml | 2 +- + .../devicetree/bindings/clock/qcom,sc7180-mss.yaml | 2 +- + .../bindings/clock/qcom,sc7180-videocc.yaml | 2 +- + .../bindings/clock/qcom,sdm845-dispcc.yaml | 2 +- + .../bindings/clock/qcom,sdm845-gpucc.yaml | 2 +- + .../bindings/clock/qcom,sdm845-videocc.yaml | 2 +- + .../bindings/clock/sprd,sc9863a-clk.yaml | 29 +-- + .../bindings/connector/usb-connector.yaml | 34 ++- + .../crypto/allwinner,sun4i-a10-crypto.yaml | 14 +- + .../bindings/crypto/allwinner,sun8i-ce.yaml | 16 +- + .../bindings/crypto/amlogic,gxl-crypto.yaml | 4 +- + .../devicetree/bindings/crypto/st,stm32-hash.yaml | 9 +- + .../allwinner,sun4i-a10-display-engine.yaml | 7 +- + .../bindings/display/allwinner,sun4i-a10-hdmi.yaml | 40 +-- + .../bindings/display/allwinner,sun4i-a10-tcon.yaml | 63 +++-- + .../display/allwinner,sun6i-a31-mipi-dsi.yaml | 28 +-- + .../display/allwinner,sun8i-a83t-dw-hdmi.yaml | 10 +- + .../bindings/display/bridge/lvds-codec.yaml | 18 +- + .../bindings/display/panel/panel-common.yaml | 11 +- + .../bindings/display/panel/panel-timing.yaml | 120 ++++----- + .../bindings/display/panel/sony,acx424akp.yaml | 2 +- + .../bindings/display/panel/xinpeng,xpp055c272.yaml | 4 +- + .../devicetree/bindings/display/renesas,cmm.yaml | 18 +- + .../bindings/display/ti/ti,am65x-dss.yaml | 19 +- + .../bindings/display/ti/ti,j721e-dss.yaml | 34 +-- + .../devicetree/bindings/dma/dma-common.yaml | 3 +- + .../devicetree/bindings/dma/ingenic,dma.yaml | 80 ++++++ + .../devicetree/bindings/dma/jz4780-dma.txt | 64 ----- + .../bindings/dma/sifive,fu540-c000-pdma.yaml | 2 +- + .../devicetree/bindings/dma/ti/k3-udma.yaml | 29 +-- + Documentation/devicetree/bindings/eeprom/at24.yaml | 13 +- + .../devicetree/bindings/example-schema.yaml | 17 +- + .../bindings/extcon/extcon-usbc-cros-ec.yaml | 3 +- + .../bindings/gpio/brcm,xgs-iproc-gpio.yaml | 2 +- + .../devicetree/bindings/gpio/fsl-imx-gpio.txt | 35 --- + .../devicetree/bindings/gpio/fsl-imx-gpio.yaml | 68 +++++ + .../devicetree/bindings/gpio/renesas,gpio-rcar.txt | 94 ------- + .../bindings/gpio/renesas,rcar-gpio.yaml | 143 +++++++++++ + .../devicetree/bindings/gpio/sifive,gpio.yaml | 2 +- + .../devicetree/bindings/gpu/arm,mali-bifrost.yaml | 6 + + .../devicetree/bindings/gpu/arm,mali-midgard.yaml | 20 +- + .../devicetree/bindings/gpu/arm,mali-utgard.yaml | 4 + + .../devicetree/bindings/gpu/vivante,gc.yaml | 2 +- + .../bindings/hwmon/adi,axi-fan-control.yaml | 3 +- + .../devicetree/bindings/hwmon/adi,ltc2947.yaml | 32 ++- + .../devicetree/bindings/hwmon/adt7475.yaml | 18 +- + .../devicetree/bindings/hwmon/ti,tmp513.yaml | 21 +- + .../devicetree/bindings/i2c/cdns,i2c-r1p10.yaml | 58 +++++ + .../devicetree/bindings/i2c/i2c-cadence.txt | 28 --- + .../devicetree/bindings/i2c/i2c-jz4780.txt | 33 --- + .../devicetree/bindings/i2c/i2c-rk3x.yaml | 10 +- + Documentation/devicetree/bindings/i2c/i2c-xiic.txt | 25 -- + .../devicetree/bindings/i2c/ingenic,i2c.yaml | 88 +++++++ + .../devicetree/bindings/i2c/st,stm32-i2c.yaml | 15 +- + .../bindings/i2c/xlnx,xps-iic-2.00.a.yaml | 49 ++++ + .../devicetree/bindings/iio/adc/adi,ad7124.yaml | 9 +- + .../devicetree/bindings/iio/adc/lltc,ltc2496.yaml | 9 +- + .../bindings/iio/adc/microchip,mcp3911.yaml | 7 +- + .../devicetree/bindings/iio/adc/st,stm32-adc.yaml | 35 ++- + .../bindings/iio/adc/st,stm32-dfsdm-adc.yaml | 27 +- + .../devicetree/bindings/iio/light/tsl2772.yaml | 13 +- + .../bindings/iio/temperature/adi,ltc2983.yaml | 60 ++--- + Documentation/devicetree/bindings/index.rst | 12 + + .../input/allwinner,sun4i-a10-lradc-keys.yaml | 9 +- + .../devicetree/bindings/input/gpio-keys-polled.txt | 45 ---- + .../devicetree/bindings/input/gpio-keys.txt | 58 ----- + .../devicetree/bindings/input/gpio-keys.yaml | 149 +++++++++++ + Documentation/devicetree/bindings/input/input.yaml | 9 +- + .../devicetree/bindings/input/iqs62x-keys.yaml | 7 +- + .../bindings/input/touchscreen/edt-ft5x06.yaml | 28 +-- + .../bindings/input/touchscreen/goodix.yaml | 2 +- + .../bindings/interconnect/qcom,msm8916.yaml | 4 +- + .../bindings/interconnect/qcom,msm8974.yaml | 4 +- + .../bindings/interconnect/qcom,qcs404.yaml | 4 +- + .../bindings/interconnect/qcom,sc7180.yaml | 6 +- + .../bindings/interconnect/qcom,sdm845.yaml | 4 +- + .../allwinner,sun7i-a20-sc-nmi.yaml | 12 +- + .../bindings/interrupt-controller/arm,gic-v3.yaml | 39 ++- + .../bindings/interrupt-controller/arm,gic.yaml | 6 + + .../bindings/interrupt-controller/ingenic,intc.txt | 28 --- + .../interrupt-controller/ingenic,intc.yaml | 63 +++++ + .../intel,ixp4xx-interrupt.yaml | 8 +- + .../interrupt-controller/loongson,liointc.yaml | 8 +- + .../interrupt-controller/renesas,intc-irqpin.txt | 62 ----- + .../interrupt-controller/renesas,intc-irqpin.yaml | 107 ++++++++ + .../interrupt-controller/renesas,irqc.yaml | 3 +- + .../interrupt-controller/st,stm32-exti.yaml | 12 +- + .../devicetree/bindings/iommu/arm,smmu.yaml | 3 +- + .../bindings/iommu/renesas,ipmmu-vmsa.txt | 73 ------ + .../bindings/iommu/renesas,ipmmu-vmsa.yaml | 98 ++++++++ + .../devicetree/bindings/iommu/samsung,sysmmu.yaml | 10 +- + .../devicetree/bindings/ipmi/ipmi-smic.txt | 25 -- + .../devicetree/bindings/ipmi/ipmi-smic.yaml | 63 +++++ + Documentation/devicetree/bindings/leds/common.yaml | 13 +- + .../devicetree/bindings/leds/leds-gpio.yaml | 3 +- + .../bindings/leds/rohm,bd71828-leds.yaml | 9 +- + .../devicetree/bindings/mailbox/fsl,mu.txt | 2 +- + .../devicetree/bindings/mailbox/st,stm32-ipcc.yaml | 7 +- + .../bindings/media/allwinner,sun4i-a10-csi.yaml | 28 +-- + .../devicetree/bindings/media/amlogic,gx-vdec.yaml | 20 +- + .../bindings/media/amlogic,meson-gx-ao-cec.yaml | 5 +- + .../devicetree/bindings/media/i2c/imx219.yaml | 3 +- + .../bindings/media/qcom,sc7180-venus.yaml | 2 +- + .../bindings/media/qcom,sdm845-venus-v2.yaml | 2 +- + .../bindings/media/qcom,sdm845-venus.yaml | 2 +- + Documentation/devicetree/bindings/media/rc.yaml | 265 ++++++++++--------- + .../devicetree/bindings/media/renesas,ceu.yaml | 28 +-- + .../devicetree/bindings/media/renesas,csi2.yaml | 2 +- + .../devicetree/bindings/media/renesas,vin.yaml | 21 +- + .../devicetree/bindings/media/ti,vpe.yaml | 2 +- + .../memory-controllers/calxeda-ddr-ctrlr.txt | 16 -- + .../memory-controllers/calxeda-ddr-ctrlr.yaml | 42 ++++ + .../bindings/memory-controllers/exynos-srom.yaml | 13 +- + .../memory-controllers/fsl/imx8m-ddrc.yaml | 6 +- + .../memory-controllers/nvidia,tegra124-emc.yaml | 13 +- + .../memory-controllers/nvidia,tegra124-mc.yaml | 5 +- + .../memory-controllers/nvidia,tegra30-emc.yaml | 9 +- + .../memory-controllers/nvidia,tegra30-mc.yaml | 3 +- + .../bindings/mfd/allwinner,sun4i-a10-ts.yaml | 20 +- + .../devicetree/bindings/mfd/st,stm32-lptimer.yaml | 4 +- + .../devicetree/bindings/mfd/st,stm32-timers.yaml | 37 ++- + .../devicetree/bindings/mfd/st,stpmic1.yaml | 9 +- + Documentation/devicetree/bindings/mfd/syscon.yaml | 17 +- + .../devicetree/bindings/mips/ingenic/devices.yaml | 4 + + .../devicetree/bindings/mmc/aspeed,sdhci.yaml | 4 +- + .../devicetree/bindings/mmc/cdns,sdhci.yaml | 79 +++--- + .../devicetree/bindings/mmc/ingenic,mmc.yaml | 79 ++++++ + Documentation/devicetree/bindings/mmc/jz4740.txt | 41 --- + .../devicetree/bindings/mmc/mmc-controller.yaml | 37 ++- + Documentation/devicetree/bindings/mmc/owl-mmc.yaml | 2 +- + .../devicetree/bindings/mmc/rockchip-dw-mshc.yaml | 24 +- + .../bindings/mmc/socionext,uniphier-sd.yaml | 14 +- + .../bindings/mmc/synopsys-dw-mshc-common.yaml | 14 +- + .../bindings/mtd/allwinner,sun4i-a10-nand.yaml | 13 +- + .../devicetree/bindings/mtd/denali,nand.yaml | 4 +- + .../devicetree/bindings/mtd/nand-controller.yaml | 27 +- + .../bindings/net/allwinner,sun8i-a83t-emac.yaml | 4 +- + .../devicetree/bindings/net/calxeda-xgmac.txt | 18 -- + .../devicetree/bindings/net/calxeda-xgmac.yaml | 49 ++++ + .../devicetree/bindings/net/can/bosch,m_can.yaml | 111 ++++---- + .../bindings/net/ethernet-controller.yaml | 34 ++- + .../devicetree/bindings/net/qca,ar803x.yaml | 17 +- + .../devicetree/bindings/net/qcom,ipa.yaml | 12 +- + .../devicetree/bindings/net/renesas,ether.yaml | 8 +- + .../devicetree/bindings/net/snps,dwmac.yaml | 30 +-- + .../devicetree/bindings/net/stm32-dwmac.txt | 44 ---- + .../devicetree/bindings/net/stm32-dwmac.yaml | 148 +++++++++++ + .../devicetree/bindings/net/ti,cpsw-switch.yaml | 18 +- + .../devicetree/bindings/net/ti,davinci-mdio.yaml | 34 ++- + .../bindings/net/ti,k3-am654-cpsw-nuss.yaml | 98 ++++---- + .../devicetree/bindings/nvmem/imx-iim.txt | 22 -- + .../devicetree/bindings/nvmem/imx-iim.yaml | 57 +++++ + .../devicetree/bindings/nvmem/imx-ocotp.txt | 50 ---- + .../devicetree/bindings/nvmem/imx-ocotp.yaml | 95 +++++++ + .../devicetree/bindings/nvmem/mxs-ocotp.txt | 24 -- + .../devicetree/bindings/nvmem/mxs-ocotp.yaml | 50 ++++ + .../devicetree/bindings/nvmem/rockchip-efuse.txt | 54 ---- + .../devicetree/bindings/nvmem/rockchip-efuse.yaml | 70 ++++++ + .../devicetree/bindings/pci/cdns-pcie-host.yaml | 3 +- + .../devicetree/bindings/pci/cdns-pcie.yaml | 3 +- + .../devicetree/bindings/pci/intel-gw-pcie.yaml | 7 +- + Documentation/devicetree/bindings/pci/pci-ep.yaml | 9 +- + .../phy/amlogic,meson-axg-mipi-pcie-analog.yaml | 2 +- + .../bindings/phy/amlogic,meson-axg-pcie.yaml | 2 +- + .../devicetree/bindings/phy/calxeda-combophy.txt | 17 -- + .../devicetree/bindings/phy/calxeda-combophy.yaml | 51 ++++ + .../bindings/phy/intel,lgm-emmc-phy.yaml | 2 +- + .../bindings/phy/phy-cadence-torrent.yaml | 59 ++--- + .../devicetree/bindings/phy/qcom,qusb2-phy.yaml | 65 +++-- + .../bindings/phy/rockchip,px30-dsi-dphy.yaml | 2 +- + .../bindings/phy/socionext,uniphier-pcie-phy.yaml | 77 ++++++ + .../bindings/phy/socionext,uniphier-usb2-phy.yaml | 85 +++++++ + .../phy/socionext,uniphier-usb3hs-phy.yaml | 103 ++++++++ + .../phy/socionext,uniphier-usb3ss-phy.yaml | 96 +++++++ + .../devicetree/bindings/phy/uniphier-pcie-phy.txt | 36 --- + .../devicetree/bindings/phy/uniphier-usb2-phy.txt | 45 ---- + .../bindings/phy/uniphier-usb3-hsphy.txt | 69 ----- + .../bindings/phy/uniphier-usb3-ssphy.txt | 58 ----- + .../pinctrl/allwinner,sun4i-a10-pinctrl.yaml | 12 +- + .../bindings/pinctrl/aspeed,ast2400-pinctrl.yaml | 37 ++- + .../bindings/pinctrl/aspeed,ast2500-pinctrl.yaml | 46 ++-- + .../bindings/pinctrl/aspeed,ast2600-pinctrl.yaml | 108 ++++---- + .../bindings/pinctrl/fsl,imx8mm-pinctrl.yaml | 31 ++- + .../bindings/pinctrl/fsl,imx8mn-pinctrl.yaml | 31 ++- + .../bindings/pinctrl/fsl,imx8mp-pinctrl.yaml | 31 ++- + .../bindings/pinctrl/fsl,imx8mq-pinctrl.yaml | 31 ++- + .../devicetree/bindings/pinctrl/intel,lgm-io.yaml | 4 +- + .../devicetree/bindings/pinctrl/pinmux-node.yaml | 3 +- + .../bindings/pinctrl/qcom,ipq6018-pinctrl.yaml | 3 +- + .../bindings/pinctrl/st,stm32-pinctrl.yaml | 54 ++-- + .../bindings/power/amlogic,meson-ee-pwrc.yaml | 3 +- + .../devicetree/bindings/pwm/pwm-samsung.yaml | 27 +- + .../devicetree/bindings/pwm/renesas,pwm-rcar.yaml | 2 +- + .../bindings/regulator/gpio-regulator.yaml | 35 ++- + .../devicetree/bindings/regulator/mps,mp5416.yaml | 6 +- + .../devicetree/bindings/regulator/mps,mpq7920.yaml | 28 +-- + .../devicetree/bindings/regulator/regulator.yaml | 5 +- + .../bindings/regulator/rohm,bd71828-regulator.yaml | 34 ++- + .../bindings/regulator/rohm,bd71837-regulator.yaml | 27 +- + .../bindings/regulator/st,stm32-booster.yaml | 3 +- + .../bindings/regulator/st,stm32mp1-pwr-reg.yaml | 3 +- + .../bindings/remoteproc/st,stm32-rproc.yaml | 11 +- + .../bindings/reserved-memory/reserved-memory.txt | 2 + + .../reset/brcm,bcm7216-pcie-sata-rescal.yaml | 4 +- + .../devicetree/bindings/reset/intel,rcu-gw.yaml | 3 +- + Documentation/devicetree/bindings/riscv/cpus.yaml | 20 +- + .../devicetree/bindings/rtc/st,stm32-rtc.yaml | 47 ++-- + Documentation/devicetree/bindings/serial/8250.txt | 100 -------- + Documentation/devicetree/bindings/serial/8250.yaml | 233 +++++++++++++++++ + .../bindings/serial/amlogic,meson-uart.yaml | 16 +- + .../devicetree/bindings/serial/ingenic,uart.txt | 28 --- + .../devicetree/bindings/serial/ingenic,uart.yaml | 94 +++++++ + .../devicetree/bindings/serial/mrvl-serial.txt | 4 - + .../devicetree/bindings/serial/pl011.yaml | 10 +- + .../devicetree/bindings/serial/renesas,hscif.yaml | 1 + + .../devicetree/bindings/serial/renesas,scif.yaml | 1 + + .../devicetree/bindings/serial/renesas,scifb.yaml | 1 + + .../devicetree/bindings/serial/rs485.yaml | 43 ++-- + .../devicetree/bindings/serial/samsung_uart.yaml | 5 +- + .../devicetree/bindings/serial/sifive-serial.yaml | 2 +- + .../bindings/soc/amlogic/amlogic,canvas.yaml | 10 +- + .../devicetree/bindings/sound/adi,adau7118.yaml | 20 +- + .../bindings/sound/allwinner,sun4i-a10-codec.yaml | 51 ++-- + .../devicetree/bindings/sound/amlogic,aiu.yaml | 3 +- + .../bindings/sound/amlogic,g12a-toacodec.yaml | 2 +- + .../devicetree/bindings/sound/amlogic,t9015.yaml | 3 +- + .../devicetree/bindings/sound/qcom,wcd934x.yaml | 3 +- + .../devicetree/bindings/sound/renesas,fsi.yaml | 16 +- + .../devicetree/bindings/sound/rockchip-i2s.yaml | 6 +- + .../devicetree/bindings/sound/tlv320adcx140.yaml | 10 +- + .../bindings/spi/qcom,spi-qcom-qspi.yaml | 10 +- + .../devicetree/bindings/spi/renesas,hspi.yaml | 4 +- + .../devicetree/bindings/spi/renesas,sh-msiof.yaml | 44 ++-- + .../devicetree/bindings/spi/spi-controller.yaml | 14 +- + .../devicetree/bindings/spi/spi-pl022.yaml | 57 ++--- + .../devicetree/bindings/spi/spi-sifive.yaml | 25 +- + .../devicetree/bindings/spi/st,stm32-qspi.yaml | 4 +- + .../sram/allwinner,sun4i-a10-system-control.yaml | 64 ++--- + .../devicetree/bindings/sram/rockchip-pmu-sram.txt | 16 -- + Documentation/devicetree/bindings/sram/sram.yaml | 28 ++- + ...bmitting-patches.txt => submitting-patches.rst} | 12 +- + .../bindings/thermal/amlogic,thermal.yaml | 10 +- + .../devicetree/bindings/thermal/imx8mm-thermal.txt | 15 -- + .../bindings/thermal/imx8mm-thermal.yaml | 58 +++++ + .../devicetree/bindings/thermal/qcom-tsens.yaml | 7 +- + .../devicetree/bindings/thermal/rcar-thermal.yaml | 6 +- + .../thermal/socionext,uniphier-thermal.yaml | 59 +++++ + .../devicetree/bindings/thermal/sprd-thermal.yaml | 2 +- + .../bindings/thermal/uniphier-thermal.txt | 65 ----- + .../devicetree/bindings/timer/arm,arch_timer.yaml | 10 +- + .../bindings/timer/arm,arch_timer_mmio.yaml | 11 +- + .../bindings/timer/cadence,ttc-timer.txt | 21 -- + .../devicetree/bindings/timer/cdns,ttc.yaml | 48 ++++ + .../devicetree/bindings/timer/ingenic,tcu.txt | 138 ---------- + .../devicetree/bindings/timer/ingenic,tcu.yaml | 280 +++++++++++++++++++++ + .../devicetree/bindings/timer/renesas,ostm.txt | 31 --- + .../devicetree/bindings/timer/renesas,ostm.yaml | 59 +++++ + .../devicetree/bindings/ufs/ti,j721e-ufs.yaml | 65 +++-- + .../bindings/usb/amlogic,meson-g12a-usb-ctrl.yaml | 3 +- + .../devicetree/bindings/usb/aspeed,usb-vhub.yaml | 18 +- + Documentation/devicetree/bindings/usb/dwc2.yaml | 11 +- + .../devicetree/bindings/usb/generic-ehci.yaml | 27 +- + .../devicetree/bindings/usb/generic-ohci.yaml | 6 + + .../devicetree/bindings/usb/ingenic,musb.yaml | 3 + + .../devicetree/bindings/usb/nvidia,tegra-xudc.yaml | 6 +- + .../devicetree/bindings/usb/renesas,usb3-peri.yaml | 2 +- + .../devicetree/bindings/usb/renesas,usbhs.yaml | 2 +- + .../devicetree/bindings/usb/ti,j721e-usb.yaml | 54 ++-- + .../devicetree/bindings/vendor-prefixes.yaml | 16 ++ + .../devicetree/bindings/watchdog/fsl-imx-wdt.txt | 24 -- + .../devicetree/bindings/watchdog/fsl-imx-wdt.yaml | 54 ++++ + .../bindings/watchdog/fsl-imx7ulp-wdt.txt | 22 -- + .../bindings/watchdog/fsl-imx7ulp-wdt.yaml | 60 +++++ + .../devicetree/bindings/watchdog/renesas,wdt.txt | 50 ---- + .../devicetree/bindings/watchdog/renesas,wdt.yaml | 100 ++++++++ + .../devicetree/bindings/watchdog/ti,rti-wdt.yaml | 2 +- + .../{writing-bindings.txt => writing-bindings.rst} | 9 +- + .../devicetree/{changesets.txt => changesets.rst} | 24 +- + ...tion-notes.txt => dynamic-resolution-notes.rst} | 5 +- + Documentation/devicetree/index.rst | 17 ++ + .../{of_unittest.txt => of_unittest.rst} | 192 +++++++------- + .../{overlay-notes.txt => overlay-notes.rst} | 119 ++++----- + .../{usage-model.txt => usage-model.rst} | 35 +-- + Documentation/index.rst | 3 + + Documentation/process/submitting-patches.rst | 2 +- + .../it_IT/process/submitting-patches.rst | 2 +- + MAINTAINERS | 8 +- + drivers/of/dynamic.c | 3 +- + drivers/of/fdt.c | 2 +- + drivers/of/property.c | 20 +- + include/linux/mfd/core.h | 2 +- + scripts/checkpatch.pl | 2 +- + 333 files changed, 5637 insertions(+), 4035 deletions(-) + rename Documentation/devicetree/bindings/{ABI.txt => ABI.rst} (94%) + create mode 100644 Documentation/devicetree/bindings/arm/calxeda/hb-sregs.yaml + delete mode 100644 Documentation/devicetree/bindings/arm/calxeda/l2ecc.txt + create mode 100644 Documentation/devicetree/bindings/arm/calxeda/l2ecc.yaml + delete mode 100644 Documentation/devicetree/bindings/ata/sata_highbank.txt + create mode 100644 Documentation/devicetree/bindings/ata/sata_highbank.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/calxeda.txt + create mode 100644 Documentation/devicetree/bindings/clock/calxeda.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/ingenic,cgu.txt + create mode 100644 Documentation/devicetree/bindings/clock/ingenic,cgu.yaml + create mode 100644 Documentation/devicetree/bindings/dma/ingenic,dma.yaml + delete mode 100644 Documentation/devicetree/bindings/dma/jz4780-dma.txt + delete mode 100644 Documentation/devicetree/bindings/gpio/fsl-imx-gpio.txt + create mode 100644 Documentation/devicetree/bindings/gpio/fsl-imx-gpio.yaml + delete mode 100644 Documentation/devicetree/bindings/gpio/renesas,gpio-rcar.txt + create mode 100644 Documentation/devicetree/bindings/gpio/renesas,rcar-gpio.yaml + create mode 100644 Documentation/devicetree/bindings/i2c/cdns,i2c-r1p10.yaml + delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-cadence.txt + delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-jz4780.txt + delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-xiic.txt + create mode 100644 Documentation/devicetree/bindings/i2c/ingenic,i2c.yaml + create mode 100644 Documentation/devicetree/bindings/i2c/xlnx,xps-iic-2.00.a.yaml + create mode 100644 Documentation/devicetree/bindings/index.rst + delete mode 100644 Documentation/devicetree/bindings/input/gpio-keys-polled.txt + delete mode 100644 Documentation/devicetree/bindings/input/gpio-keys.txt + create mode 100644 Documentation/devicetree/bindings/input/gpio-keys.yaml + delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/ingenic,intc.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/ingenic,intc.yaml + delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/renesas,intc-irqpin.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/renesas,intc-irqpin.yaml + delete mode 100644 Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.txt + create mode 100644 Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.yaml + delete mode 100644 Documentation/devicetree/bindings/ipmi/ipmi-smic.txt + create mode 100644 Documentation/devicetree/bindings/ipmi/ipmi-smic.yaml + delete mode 100644 Documentation/devicetree/bindings/memory-controllers/calxeda-ddr-ctrlr.txt + create mode 100644 Documentation/devicetree/bindings/memory-controllers/calxeda-ddr-ctrlr.yaml + create mode 100644 Documentation/devicetree/bindings/mmc/ingenic,mmc.yaml + delete mode 100644 Documentation/devicetree/bindings/mmc/jz4740.txt + delete mode 100644 Documentation/devicetree/bindings/net/calxeda-xgmac.txt + create mode 100644 Documentation/devicetree/bindings/net/calxeda-xgmac.yaml + delete mode 100644 Documentation/devicetree/bindings/net/stm32-dwmac.txt + create mode 100644 Documentation/devicetree/bindings/net/stm32-dwmac.yaml + delete mode 100644 Documentation/devicetree/bindings/nvmem/imx-iim.txt + create mode 100644 Documentation/devicetree/bindings/nvmem/imx-iim.yaml + delete mode 100644 Documentation/devicetree/bindings/nvmem/imx-ocotp.txt + create mode 100644 Documentation/devicetree/bindings/nvmem/imx-ocotp.yaml + delete mode 100644 Documentation/devicetree/bindings/nvmem/mxs-ocotp.txt + create mode 100644 Documentation/devicetree/bindings/nvmem/mxs-ocotp.yaml + delete mode 100644 Documentation/devicetree/bindings/nvmem/rockchip-efuse.txt + create mode 100644 Documentation/devicetree/bindings/nvmem/rockchip-efuse.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/calxeda-combophy.txt + create mode 100644 Documentation/devicetree/bindings/phy/calxeda-combophy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/socionext,uniphier-pcie-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/socionext,uniphier-usb2-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/socionext,uniphier-usb3hs-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/socionext,uniphier-usb3ss-phy.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/uniphier-pcie-phy.txt + delete mode 100644 Documentation/devicetree/bindings/phy/uniphier-usb2-phy.txt + delete mode 100644 Documentation/devicetree/bindings/phy/uniphier-usb3-hsphy.txt + delete mode 100644 Documentation/devicetree/bindings/phy/uniphier-usb3-ssphy.txt + delete mode 100644 Documentation/devicetree/bindings/serial/8250.txt + create mode 100644 Documentation/devicetree/bindings/serial/8250.yaml + delete mode 100644 Documentation/devicetree/bindings/serial/ingenic,uart.txt + create mode 100644 Documentation/devicetree/bindings/serial/ingenic,uart.yaml + delete mode 100644 Documentation/devicetree/bindings/serial/mrvl-serial.txt + delete mode 100644 Documentation/devicetree/bindings/sram/rockchip-pmu-sram.txt + rename Documentation/devicetree/bindings/{submitting-patches.txt => submitting-patches.rst} (92%) + delete mode 100644 Documentation/devicetree/bindings/thermal/imx8mm-thermal.txt + create mode 100644 Documentation/devicetree/bindings/thermal/imx8mm-thermal.yaml + create mode 100644 Documentation/devicetree/bindings/thermal/socionext,uniphier-thermal.yaml + delete mode 100644 Documentation/devicetree/bindings/thermal/uniphier-thermal.txt + delete mode 100644 Documentation/devicetree/bindings/timer/cadence,ttc-timer.txt + create mode 100644 Documentation/devicetree/bindings/timer/cdns,ttc.yaml + delete mode 100644 Documentation/devicetree/bindings/timer/ingenic,tcu.txt + create mode 100644 Documentation/devicetree/bindings/timer/ingenic,tcu.yaml + delete mode 100644 Documentation/devicetree/bindings/timer/renesas,ostm.txt + create mode 100644 Documentation/devicetree/bindings/timer/renesas,ostm.yaml + delete mode 100644 Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.txt + create mode 100644 Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.yaml + delete mode 100644 Documentation/devicetree/bindings/watchdog/fsl-imx7ulp-wdt.txt + create mode 100644 Documentation/devicetree/bindings/watchdog/fsl-imx7ulp-wdt.yaml + delete mode 100644 Documentation/devicetree/bindings/watchdog/renesas,wdt.txt + create mode 100644 Documentation/devicetree/bindings/watchdog/renesas,wdt.yaml + rename Documentation/devicetree/bindings/{writing-bindings.txt => writing-bindings.rst} (89%) + rename Documentation/devicetree/{changesets.txt => changesets.rst} (59%) + rename Documentation/devicetree/{dynamic-resolution-notes.txt => dynamic-resolution-notes.rst} (90%) + create mode 100644 Documentation/devicetree/index.rst + rename Documentation/devicetree/{of_unittest.txt => of_unittest.rst} (54%) + rename Documentation/devicetree/{overlay-notes.txt => overlay-notes.rst} (50%) + rename Documentation/devicetree/{usage-model.txt => usage-model.rst} (97%) +Merging mailbox/mailbox-for-next (0a67003b1985 mailbox: imx: add SCU MU support) +$ git merge mailbox/mailbox-for-next +Already up to date. +Merging spi/for-next (81919bfd45ed Merge remote-tracking branch 'spi/for-5.8' into spi-next) +$ git merge spi/for-next +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/spi/spi-uniphier.txt +Removing Documentation/devicetree/bindings/spi/spi-rspi.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/spi/brcm,spi-bcm-qspi.txt | 10 + + .../devicetree/bindings/spi/renesas,rspi.yaml | 144 ++++++++++ + .../devicetree/bindings/spi/snps,dw-apb-ssi.txt | 5 +- + .../bindings/spi/socionext,uniphier-spi.yaml | 57 ++++ + Documentation/devicetree/bindings/spi/spi-rspi.txt | 73 ----- + .../devicetree/bindings/spi/spi-uniphier.txt | 28 -- + MAINTAINERS | 5 + + drivers/spi/Kconfig | 7 + + drivers/spi/Makefile | 1 + + drivers/spi/spi-amd.c | 315 +++++++++++++++++++++ + drivers/spi/spi-armada-3700.c | 10 +- + drivers/spi/spi-atmel.c | 1 + + drivers/spi/spi-bcm-qspi.c | 138 ++++++++- + drivers/spi/spi-bcm2835.c | 8 +- + drivers/spi/spi-dw-mid.c | 107 +++++-- + drivers/spi/spi-dw-mmio.c | 69 ++++- + drivers/spi/spi-dw-pci.c | 6 +- + drivers/spi/spi-dw.c | 141 +++++---- + drivers/spi/spi-dw.h | 45 +-- + drivers/spi/spi-fsl-dspi.c | 23 ++ + drivers/spi/spi-fsl-lpspi.c | 15 +- + drivers/spi/spi-fsl-qspi.c | 11 +- + drivers/spi/spi-fsl-spi.c | 2 +- + drivers/spi/spi-hisi-sfc-v3xx.c | 26 +- + drivers/spi/spi-mem.c | 10 +- + drivers/spi/spi-mtk-nor.c | 2 +- + drivers/spi/spi-orion.c | 70 ++--- + drivers/spi/spi-pxa2xx.c | 1 + + drivers/spi/spi-rockchip.c | 229 ++++++++------- + drivers/spi/spi-sh-msiof.c | 2 +- + drivers/spi/spi-sprd-adi.c | 2 +- + drivers/spi/spi-stm32-qspi.c | 62 +++- + drivers/spi/spi-sun6i.c | 1 + + drivers/spi/spi-uniphier.c | 11 +- + drivers/spi/spi.c | 2 +- + drivers/spi/spidev.c | 3 +- + tools/spi/Makefile | 4 +- + tools/spi/spidev_test.c | 21 +- + 38 files changed, 1236 insertions(+), 431 deletions(-) + create mode 100644 Documentation/devicetree/bindings/spi/renesas,rspi.yaml + create mode 100644 Documentation/devicetree/bindings/spi/socionext,uniphier-spi.yaml + delete mode 100644 Documentation/devicetree/bindings/spi/spi-rspi.txt + delete mode 100644 Documentation/devicetree/bindings/spi/spi-uniphier.txt + create mode 100644 drivers/spi/spi-amd.c +Merging tip/auto-latest (bba413deb106 Merge branch 'core/core') +$ git merge tip/auto-latest +Auto-merging scripts/checkpatch.pl +Auto-merging scripts/Makefile.lib +Auto-merging lib/usercopy.c +Auto-merging lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging kernel/trace/bpf_trace.c +Auto-merging kernel/sched/topology.c +Auto-merging kernel/sched/sched.h +Auto-merging kernel/sched/fair.c +Auto-merging kernel/sched/core.c +Auto-merging kernel/module.c +Auto-merging kernel/kprobes.c +Removing kernel/gcov/gcc_3_4.c +Auto-merging kernel/exit.c +Auto-merging kernel/events/core.c +Auto-merging init/Kconfig +Auto-merging include/linux/uaccess.h +Auto-merging include/linux/perf_event.h +Auto-merging include/linux/mod_devicetable.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/efi.h +Auto-merging fs/proc/task_mmu.c +Auto-merging fs/compat_binfmt_elf.c +Auto-merging drivers/perf/arm_spe_pmu.c +Auto-merging drivers/gpu/drm/i915/i915_perf.c +Auto-merging drivers/gpu/drm/drm_dp_mst_topology.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_dp_mst_topology.c +Auto-merging crypto/Kconfig +Auto-merging arch/x86/kernel/signal.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/arm64/include/asm/elf.h +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/boot/compressed/vmlinux.lds.S +Auto-merging arch/arm/Kconfig +Auto-merging Makefile +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/sysctl/kernel.rst +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Recorded preimage for 'drivers/gpu/drm/drm_dp_mst_topology.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/gpu/drm/drm_dp_mst_topology.c'. +[master 60051f94683f] Merge remote-tracking branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + .../RCU/Design/Requirements/Requirements.rst | 61 +- + Documentation/admin-guide/kernel-parameters.txt | 26 + + Documentation/admin-guide/perf-security.rst | 86 +- + Documentation/admin-guide/sysctl/kernel.rst | 16 +- + Documentation/dev-tools/index.rst | 1 + + Documentation/dev-tools/kcsan.rst | 328 +++ + Documentation/fb/efifb.rst | 33 +- + Documentation/power/suspend-and-cpuhotplug.rst | 6 +- + Documentation/process/changes.rst | 2 +- + MAINTAINERS | 13 +- + Makefile | 3 +- + arch/arm/Kconfig | 2 +- + arch/arm/boot/compressed/vmlinux.lds.S | 2 +- + arch/arm/crypto/Kconfig | 12 +- + arch/arm/include/asm/efi.h | 8 - + arch/arm/kernel/elf.c | 27 +- + arch/arm64/Kconfig | 2 +- + arch/arm64/include/asm/atomic.h | 6 +- + arch/arm64/include/asm/barrier.h | 16 +- + arch/arm64/include/asm/efi.h | 8 - + arch/arm64/include/asm/elf.h | 23 +- + arch/arm64/lib/csum.c | 20 +- + arch/ia64/kernel/efi.c | 12 +- + arch/parisc/kernel/perf.c | 2 +- + arch/powerpc/perf/imc-pmu.c | 4 +- + arch/powerpc/platforms/powernv/smp.c | 1 - + arch/x86/Kconfig | 1 + + arch/x86/Kconfig.assembler | 4 + + arch/x86/Makefile | 6 +- + arch/x86/boot/Makefile | 9 +- + arch/x86/boot/compressed/Makefile | 2 + + arch/x86/boot/compressed/acpi.c | 7 +- + arch/x86/boot/compressed/head_64.S | 8 + + arch/x86/boot/compressed/vmlinux.lds.S | 1 + + arch/x86/boot/string.c | 43 +- + arch/x86/boot/string.h | 1 + + arch/x86/crypto/aesni-intel_asm.S | 4 +- + arch/x86/crypto/camellia-aesni-avx-asm_64.S | 2 +- + arch/x86/crypto/camellia-aesni-avx2-asm_64.S | 2 +- + arch/x86/crypto/crc32c-pcl-intel-asm_64.S | 26 +- + arch/x86/entry/entry_32.S | 6 +- + arch/x86/entry/entry_64.S | 4 +- + arch/x86/entry/vdso/Makefile | 21 +- + arch/x86/entry/vdso/vdso2c.c | 4 +- + arch/x86/entry/vdso/vdso2c.h | 16 +- + arch/x86/events/Makefile | 2 + + arch/x86/events/core.c | 15 +- + arch/x86/events/intel/pt.c | 2 - + arch/x86/events/perf_event.h | 10 + + arch/x86/events/zhaoxin/Makefile | 2 + + arch/x86/events/zhaoxin/core.c | 613 ++++++ + arch/x86/include/asm/GEN-for-each-reg.h | 25 + + arch/x86/include/asm/amd_nb.h | 1 + + arch/x86/include/asm/asm-prototypes.h | 35 +- + arch/x86/include/asm/atomic.h | 17 +- + arch/x86/include/asm/atomic64_32.h | 9 + + arch/x86/include/asm/atomic64_64.h | 15 +- + arch/x86/include/asm/bitops.h | 6 +- + arch/x86/include/asm/cpu_device_id.h | 31 +- + arch/x86/include/asm/delay.h | 4 +- + arch/x86/include/asm/efi.h | 29 +- + arch/x86/include/asm/elf.h | 22 +- + arch/x86/include/asm/fpu/internal.h | 10 +- + arch/x86/include/asm/fpu/xstate.h | 52 +- + arch/x86/include/asm/invpcid.h | 7 +- + arch/x86/include/asm/mce.h | 28 +- + arch/x86/include/asm/memtype.h | 3 + + arch/x86/include/asm/mmu_context.h | 88 +- + arch/x86/include/asm/mwait.h | 24 +- + arch/x86/include/asm/nospec-branch.h | 76 +- + arch/x86/include/asm/orc_types.h | 3 +- + arch/x86/include/asm/paravirt.h | 12 +- + arch/x86/include/asm/pgtable_32.h | 2 +- + arch/x86/include/asm/pgtable_types.h | 44 +- + arch/x86/include/asm/processor.h | 5 +- + .../x86/include/asm/{resctrl_sched.h => resctrl.h} | 9 +- + arch/x86/include/asm/smap.h | 11 +- + arch/x86/include/asm/tlbflush.h | 441 +--- + arch/x86/include/asm/unwind_hints.h | 31 +- + arch/x86/include/asm/uv/bios.h | 7 - + arch/x86/include/asm/uv/uv.h | 3 +- + arch/x86/include/asm/uv/uv_hub.h | 54 - + arch/x86/include/asm/uv/uv_mmrs.h | 7 - + arch/x86/include/uapi/asm/mce.h | 1 + + arch/x86/kernel/Makefile | 4 + + arch/x86/kernel/alternative.c | 55 + + arch/x86/kernel/apic/apic.c | 57 +- + arch/x86/kernel/apic/x2apic_uv_x.c | 32 +- + arch/x86/kernel/cpu/Makefile | 3 + + arch/x86/kernel/cpu/amd.c | 6 +- + arch/x86/kernel/cpu/common.c | 65 +- + arch/x86/kernel/cpu/intel.c | 8 + + arch/x86/kernel/cpu/match.c | 7 +- + arch/x86/kernel/cpu/mce/amd.c | 233 +- + arch/x86/kernel/cpu/mce/core.c | 84 +- + arch/x86/kernel/cpu/mce/dev-mcelog.c | 6 + + arch/x86/kernel/cpu/mce/internal.h | 10 +- + arch/x86/kernel/cpu/mce/severity.c | 6 +- + arch/x86/kernel/cpu/microcode/core.c | 15 +- + arch/x86/kernel/cpu/mtrr/generic.c | 4 +- + arch/x86/kernel/cpu/perfctr-watchdog.c | 8 + + arch/x86/kernel/cpu/resctrl/core.c | 32 +- + arch/x86/kernel/cpu/resctrl/ctrlmondata.c | 8 +- + arch/x86/kernel/cpu/resctrl/internal.h | 15 +- + arch/x86/kernel/cpu/resctrl/monitor.c | 27 +- + arch/x86/kernel/cpu/resctrl/pseudo_lock.c | 2 +- + arch/x86/kernel/cpu/resctrl/rdtgroup.c | 4 +- + arch/x86/kernel/e820.c | 18 +- + arch/x86/kernel/early_printk.c | 3 - + arch/x86/kernel/fpu/core.c | 53 +- + arch/x86/kernel/fpu/init.c | 3 +- + arch/x86/kernel/fpu/regset.c | 2 +- + arch/x86/kernel/fpu/signal.c | 144 +- + arch/x86/kernel/fpu/xstate.c | 199 +- + arch/x86/kernel/ftrace.c | 14 +- + arch/x86/kernel/ftrace_32.S | 2 +- + arch/x86/kernel/ftrace_64.S | 44 +- + arch/x86/kernel/idt.c | 26 +- + arch/x86/kernel/nmi.c | 4 - + arch/x86/kernel/paravirt.c | 21 +- + arch/x86/kernel/process.c | 13 +- + arch/x86/kernel/process_32.c | 2 +- + arch/x86/kernel/process_64.c | 2 +- + arch/x86/kernel/setup.c | 6 + + arch/x86/kernel/signal.c | 2 +- + arch/x86/kernel/smpboot.c | 21 +- + arch/x86/kernel/tboot.c | 8 +- + arch/x86/kernel/time.c | 3 + + arch/x86/lib/Makefile | 9 + + arch/x86/lib/checksum_32.S | 4 +- + arch/x86/lib/delay.c | 114 +- + arch/x86/lib/retpoline.S | 63 +- + arch/x86/mm/Makefile | 4 + + arch/x86/mm/init.c | 44 +- + arch/x86/mm/init_64.c | 4 +- + arch/x86/mm/ioremap.c | 10 +- + arch/x86/mm/kmmio.c | 2 +- + arch/x86/mm/mem_encrypt.c | 2 +- + arch/x86/mm/mmap.c | 2 + + arch/x86/mm/pat/set_memory.c | 7 +- + arch/x86/mm/pgtable.c | 16 +- + arch/x86/mm/pgtable_32.c | 2 +- + arch/x86/mm/tlb.c | 384 +++- + arch/x86/platform/efi/efi.c | 8 +- + arch/x86/platform/efi/efi_stub_64.S | 2 +- + arch/x86/platform/uv/bios_uv.c | 16 +- + arch/x86/platform/uv/tlb_uv.c | 4 +- + arch/x86/platform/uv/uv_sysfs.c | 2 +- + arch/x86/power/cpu.c | 2 +- + arch/x86/purgatory/.gitignore | 1 + + arch/x86/purgatory/Makefile | 21 +- + arch/x86/realmode/Makefile | 3 + + arch/x86/realmode/rm/Makefile | 3 + + arch/x86/xen/suspend_hvm.c | 2 +- + arch/x86/xen/xen-ops.h | 2 +- + crypto/Kconfig | 1 - + drivers/acpi/acpi_extlog.c | 19 +- + drivers/acpi/nfit/mce.c | 1 + + drivers/edac/amd64_edac.c | 8 - + drivers/edac/edac_mc.c | 61 - + drivers/edac/i7core_edac.c | 5 +- + drivers/edac/mce_amd.c | 28 +- + drivers/edac/mce_amd.h | 2 - + drivers/edac/pnd2_edac.c | 8 +- + drivers/edac/sb_edac.c | 7 +- + drivers/edac/skx_common.c | 3 +- + drivers/firmware/efi/Kconfig | 15 +- + drivers/firmware/efi/arm-init.c | 4 +- + drivers/firmware/efi/efi.c | 44 +- + drivers/firmware/efi/libstub/Makefile | 44 +- + drivers/firmware/efi/libstub/alignedmem.c | 57 + + drivers/firmware/efi/libstub/arm64-stub.c | 94 +- + drivers/firmware/efi/libstub/efi-stub-helper.c | 47 +- + .../efi/libstub/{arm-stub.c => efi-stub.c} | 23 +- + drivers/firmware/efi/libstub/efistub.h | 96 +- + drivers/firmware/efi/libstub/fdt.c | 8 +- + drivers/firmware/efi/libstub/file.c | 34 +- + drivers/firmware/efi/libstub/gop.c | 492 ++++- + drivers/firmware/efi/libstub/mem.c | 191 +- + drivers/firmware/efi/libstub/randomalloc.c | 6 +- + drivers/firmware/efi/libstub/relocate.c | 174 ++ + drivers/firmware/efi/libstub/x86-stub.c | 35 +- + drivers/gpu/drm/i915/i915_perf.c | 13 +- + drivers/oprofile/event_buffer.c | 2 +- + drivers/perf/arm_spe_pmu.c | 4 +- + drivers/ras/cec.c | 33 +- + drivers/xen/events/events_base.c | 28 +- + drivers/xen/privcmd.c | 1 - + drivers/xen/time.c | 2 +- + fs/compat_binfmt_elf.c | 5 + + fs/proc/task_mmu.c | 3 - + include/asm-generic/atomic-instrumented.h | 711 +++--- + include/asm-generic/atomic-long.h | 331 +-- + include/asm-generic/barrier.h | 16 +- + include/asm-generic/bitops/instrumented-atomic.h | 14 +- + include/asm-generic/bitops/instrumented-lock.h | 10 +- + .../asm-generic/bitops/instrumented-non-atomic.h | 16 +- + include/linux/atomic-arch-fallback.h | 2291 ++++++++++++++++++++ + include/linux/atomic-fallback.h | 346 ++- + include/linux/atomic.h | 11 + + include/linux/compiler-clang.h | 11 +- + include/linux/compiler-gcc.h | 11 +- + include/linux/compiler.h | 197 +- + include/linux/compiler_types.h | 26 + + include/linux/cpu.h | 19 +- + include/linux/crash_dump.h | 2 - + include/linux/edac.h | 8 - + include/linux/efi.h | 2 +- + include/linux/frame.h | 11 + + include/linux/instrumented.h | 109 + + include/linux/kcsan-checks.h | 430 ++++ + include/linux/kcsan.h | 59 + + include/linux/mm.h | 7 - + include/linux/mod_devicetable.h | 2 + + include/linux/module.h | 6 + + include/linux/perf_event.h | 6 +- + include/linux/ras.h | 5 - + include/linux/rculist.h | 4 +- + include/linux/rcupdate.h | 53 +- + include/linux/rcupdate_trace.h | 88 + + include/linux/rcupdate_wait.h | 19 + + include/linux/rcutiny.h | 3 +- + include/linux/rcutree.h | 1 + + include/linux/sched.h | 24 +- + include/linux/sched/mm.h | 2 + + include/linux/sched/topology.h | 29 +- + include/linux/seqlock.h | 51 +- + include/linux/smp.h | 4 +- + include/linux/swait.h | 23 +- + include/linux/tboot.h | 8 +- + include/linux/torture.h | 2 +- + include/linux/uaccess.h | 14 +- + include/linux/wait.h | 2 + + init/Kconfig | 1 - + init/do_mounts_initrd.c | 13 +- + init/init_task.c | 15 + + init/main.c | 2 + + kernel/Makefile | 6 + + kernel/cpu.c | 38 +- + kernel/crash_dump.c | 6 - + kernel/events/core.c | 29 +- + kernel/exit.c | 25 +- + kernel/fork.c | 5 + + kernel/gcov/Kconfig | 24 - + kernel/gcov/Makefile | 3 +- + kernel/gcov/gcc_3_4.c | 573 ----- + kernel/kcsan/Makefile | 14 + + kernel/kcsan/atomic.h | 20 + + kernel/kcsan/core.c | 807 +++++++ + kernel/kcsan/debugfs.c | 349 +++ + kernel/kcsan/encoding.h | 95 + + kernel/kcsan/kcsan.h | 142 ++ + kernel/kcsan/report.c | 634 ++++++ + kernel/kcsan/test.c | 131 ++ + kernel/kprobes.c | 67 +- + kernel/locking/Makefile | 3 + + kernel/locking/rtmutex.c | 2 - + kernel/module.c | 7 + + kernel/rcu/Kconfig | 46 +- + kernel/rcu/Kconfig.debug | 4 + + kernel/rcu/rcu.h | 7 + + kernel/rcu/rcuperf.c | 5 +- + kernel/rcu/rcutorture.c | 155 +- + kernel/rcu/srcutree.c | 21 +- + kernel/rcu/tasks.h | 1193 ++++++++++ + kernel/rcu/tree.c | 179 +- + kernel/rcu/tree.h | 3 + + kernel/rcu/tree_exp.h | 50 +- + kernel/rcu/tree_plugin.h | 86 +- + kernel/rcu/tree_stall.h | 144 +- + kernel/rcu/update.c | 394 +--- + kernel/sched/Makefile | 6 + + kernel/sched/core.c | 162 +- + kernel/sched/debug.c | 8 +- + kernel/sched/fair.c | 149 +- + kernel/sched/sched.h | 11 +- + kernel/sched/topology.c | 31 +- + kernel/smp.c | 2 +- + kernel/trace/Kconfig | 1 + + kernel/trace/Makefile | 3 + + kernel/trace/bpf_trace.c | 2 +- + kernel/trace/ftrace.c | 17 +- + lib/Kconfig.debug | 7 + + lib/Kconfig.kcsan | 181 ++ + lib/Makefile | 4 + + lib/fault-inject.c | 4 +- + lib/iov_iter.c | 7 +- + lib/usercopy.c | 7 +- + mm/Makefile | 8 + + net/netfilter/core.c | 2 +- + net/tls/tls_main.c | 2 +- + samples/kprobes/kprobe_example.c | 6 +- + samples/kprobes/kretprobe_example.c | 2 + + scripts/Makefile.kcsan | 6 + + scripts/Makefile.lib | 10 + + scripts/atomic/fallbacks/acquire | 6 +- + scripts/atomic/fallbacks/add_negative | 8 +- + scripts/atomic/fallbacks/add_unless | 8 +- + scripts/atomic/fallbacks/andnot | 6 +- + scripts/atomic/fallbacks/dec | 6 +- + scripts/atomic/fallbacks/dec_and_test | 8 +- + scripts/atomic/fallbacks/dec_if_positive | 8 +- + scripts/atomic/fallbacks/dec_unless_positive | 8 +- + scripts/atomic/fallbacks/fence | 6 +- + scripts/atomic/fallbacks/fetch_add_unless | 10 +- + scripts/atomic/fallbacks/inc | 6 +- + scripts/atomic/fallbacks/inc_and_test | 8 +- + scripts/atomic/fallbacks/inc_not_zero | 8 +- + scripts/atomic/fallbacks/inc_unless_negative | 8 +- + scripts/atomic/fallbacks/read_acquire | 4 +- + scripts/atomic/fallbacks/release | 6 +- + scripts/atomic/fallbacks/set_release | 4 +- + scripts/atomic/fallbacks/sub_and_test | 8 +- + scripts/atomic/fallbacks/try_cmpxchg | 6 +- + scripts/atomic/gen-atomic-fallback.sh | 31 +- + scripts/atomic/gen-atomic-instrumented.sh | 9 +- + scripts/atomic/gen-atomic-long.sh | 3 +- + scripts/atomic/gen-atomics.sh | 5 +- + scripts/checkpatch.pl | 8 + + scripts/gcc-plugins/Kconfig | 2 +- + scripts/link-vmlinux.sh | 24 + + tools/arch/x86/include/asm/orc_types.h | 3 +- + tools/build/Makefile.feature | 3 +- + tools/build/feature/Makefile | 6 +- + tools/build/feature/test-libopencsd.c | 4 +- + tools/build/feature/test-libpfm4.c | 9 + + tools/lib/api/fs/fs.c | 17 + + tools/lib/api/fs/fs.h | 12 + + tools/lib/api/io.h | 115 + + tools/lib/perf/cpumap.c | 2 +- + tools/lib/perf/evlist.c | 4 +- + tools/lib/subcmd/parse-options.h | 2 + + tools/lib/symbol/kallsyms.c | 86 +- + tools/lib/symbol/kallsyms.h | 2 - + tools/lib/traceevent/kbuffer-parse.c | 2 +- + tools/lib/traceevent/parse-filter.c | 29 +- + tools/objtool/Documentation/stack-validation.txt | 41 + + tools/objtool/Makefile | 5 +- + tools/objtool/arch.h | 15 +- + tools/objtool/arch/x86/decode.c | 302 ++- + tools/objtool/arch/x86/include/cfi_regs.h | 25 + + tools/objtool/builtin-check.c | 11 +- + tools/objtool/builtin.h | 2 +- + tools/objtool/cfi.h | 35 +- + tools/objtool/check.c | 818 ++++--- + tools/objtool/check.h | 23 +- + tools/objtool/elf.c | 102 +- + tools/objtool/elf.h | 37 +- + tools/objtool/orc_gen.c | 11 +- + tools/perf/Documentation/Makefile | 4 +- + tools/perf/Documentation/itrace.txt | 6 + + tools/perf/Documentation/perf-bench.txt | 8 + + tools/perf/Documentation/perf-c2c.txt | 11 + + tools/perf/Documentation/perf-intel-pt.txt | 53 +- + tools/perf/Documentation/perf-list.txt | 8 + + tools/perf/Documentation/perf-record.txt | 17 + + tools/perf/Documentation/perf-report.txt | 11 + + tools/perf/Documentation/perf-script.txt | 11 + + tools/perf/Documentation/perf-stat.txt | 2 + + tools/perf/Documentation/perf-top.txt | 9 + + tools/perf/Documentation/perf.data-file-format.txt | 16 + + tools/perf/Makefile.perf | 6 +- + tools/perf/arch/arm/util/cs-etm.c | 7 +- + tools/perf/arch/arm64/util/arm-spe.c | 12 +- + tools/perf/arch/powerpc/util/header.c | 8 + + tools/perf/arch/powerpc/util/kvm-stat.c | 2 +- + tools/perf/arch/s390/util/kvm-stat.c | 8 +- + tools/perf/arch/x86/tests/perf-time-to-tsc.c | 6 +- + tools/perf/arch/x86/util/intel-bts.c | 2 +- + tools/perf/arch/x86/util/intel-pt.c | 21 +- + tools/perf/arch/x86/util/kvm-stat.c | 12 +- + tools/perf/bench/Build | 3 +- + tools/perf/bench/bench.h | 3 +- + tools/perf/bench/epoll-wait.c | 3 +- + tools/perf/bench/futex-hash.c | 3 +- + tools/perf/bench/futex-lock-pi.c | 3 +- + tools/perf/bench/kallsyms-parse.c | 75 + + tools/perf/bench/synthesize.c | 262 +++ + tools/perf/builtin-annotate.c | 15 +- + tools/perf/builtin-bench.c | 7 + + tools/perf/builtin-c2c.c | 21 +- + tools/perf/builtin-diff.c | 8 +- + tools/perf/builtin-ftrace.c | 5 +- + tools/perf/builtin-inject.c | 19 +- + tools/perf/builtin-kmem.c | 65 +- + tools/perf/builtin-kvm.c | 23 +- + tools/perf/builtin-lock.c | 42 +- + tools/perf/builtin-mem.c | 2 +- + tools/perf/builtin-record.c | 117 +- + tools/perf/builtin-report.c | 36 +- + tools/perf/builtin-sched.c | 78 +- + tools/perf/builtin-script.c | 391 +--- + tools/perf/builtin-stat.c | 31 +- + tools/perf/builtin-timechart.c | 52 +- + tools/perf/builtin-top.c | 47 +- + tools/perf/builtin-trace.c | 115 +- + tools/perf/design.txt | 3 +- + .../arch/powerpc/power9/nest_metrics.json | 19 + + tools/perf/pmu-events/pmu-events.h | 2 +- + tools/perf/scripts/python/bin/flamegraph-record | 2 + + tools/perf/scripts/python/bin/flamegraph-report | 3 + + tools/perf/scripts/python/flamegraph.py | 124 ++ + tools/perf/tests/Build | 1 + + tools/perf/tests/api-io.c | 304 +++ + tools/perf/tests/builtin-test.c | 4 + + tools/perf/tests/event-times.c | 8 +- + tools/perf/tests/event_update.c | 2 +- + tools/perf/tests/evsel-roundtrip-name.c | 20 +- + tools/perf/tests/evsel-tp-sched.c | 2 +- + tools/perf/tests/expr.c | 20 +- + tools/perf/tests/hists_cumulate.c | 8 +- + tools/perf/tests/mmap-basic.c | 4 +- + tools/perf/tests/openat-syscall-all-cpus.c | 6 +- + tools/perf/tests/openat-syscall-tp-fields.c | 6 +- + tools/perf/tests/openat-syscall.c | 8 +- + tools/perf/tests/parse-events.c | 155 +- + tools/perf/tests/perf-record.c | 6 +- + tools/perf/tests/sample-parsing.c | 6 +- + tools/perf/tests/switch-tracking.c | 14 +- + tools/perf/tests/tests.h | 1 + + tools/perf/tests/topology.c | 12 +- + tools/perf/ui/browsers/hists.c | 18 +- + tools/perf/ui/gtk/annotate.c | 2 +- + tools/perf/ui/gtk/hists.c | 6 +- + tools/perf/ui/hist.c | 16 +- + tools/perf/util/Build | 2 + + tools/perf/util/annotate.c | 20 +- + tools/perf/util/arm-spe.c | 9 + + tools/perf/util/auxtrace.c | 125 +- + tools/perf/util/auxtrace.h | 16 + + tools/perf/util/bpf-event.c | 3 +- + tools/perf/util/bpf-event.h | 7 +- + tools/perf/util/bpf-loader.c | 2 +- + tools/perf/util/branch.h | 19 +- + tools/perf/util/callchain.h | 8 + + tools/perf/util/cap.h | 4 + + tools/perf/util/cgroup.c | 3 +- + tools/perf/util/cloexec.c | 2 +- + tools/perf/util/cs-etm-decoder/cs-etm-decoder.c | 2 + + tools/perf/util/cs-etm.c | 14 + + tools/perf/util/cs-etm.h | 3 - + tools/perf/util/data-convert-bt.c | 6 +- + tools/perf/util/env.h | 3 + + tools/perf/util/event.c | 2 +- + tools/perf/util/evlist.c | 159 +- + tools/perf/util/evlist.h | 9 +- + tools/perf/util/evsel.c | 343 ++- + tools/perf/util/evsel.h | 194 +- + tools/perf/util/evsel_config.h | 2 +- + tools/perf/util/evsel_fprintf.c | 8 +- + tools/perf/util/expr.c | 25 +- + tools/perf/util/expr.h | 19 +- + tools/perf/util/expr.l | 37 +- + tools/perf/util/expr.y | 6 +- + tools/perf/util/header.c | 121 +- + tools/perf/util/header.h | 1 + + tools/perf/util/hist.c | 31 +- + tools/perf/util/intel-bts.c | 16 +- + .../util/intel-pt-decoder/intel-pt-pkt-decoder.c | 2 +- + tools/perf/util/intel-pt.c | 306 +-- + tools/perf/util/machine.c | 424 +++- + tools/perf/util/mem2node.c | 3 +- + tools/perf/util/metricgroup.c | 78 +- + tools/perf/util/metricgroup.h | 2 + + tools/perf/util/ordered-events.c | 2 +- + tools/perf/util/parse-events.c | 39 +- + tools/perf/util/parse-events.h | 1 + + tools/perf/util/parse-events.l | 1 + + tools/perf/util/parse-events.y | 12 +- + tools/perf/util/perf_api_probe.c | 164 ++ + tools/perf/util/perf_api_probe.h | 14 + + tools/perf/util/pmu.c | 113 + + tools/perf/util/pmu.h | 10 + + tools/perf/util/python.c | 4 +- + tools/perf/util/record.c | 185 +- + tools/perf/util/record.h | 1 + + tools/perf/util/s390-cpumcf-kernel.h | 1 + + tools/perf/util/s390-cpumsf.c | 12 +- + .../util/scripting-engines/trace-event-python.c | 6 +- + tools/perf/util/session.c | 9 +- + tools/perf/util/sideband_evlist.c | 148 ++ + tools/perf/util/smt.c | 10 +- + tools/perf/util/sort.c | 12 +- + tools/perf/util/sort.h | 2 + + tools/perf/util/stat-display.c | 23 +- + tools/perf/util/stat-shadow.c | 55 +- + tools/perf/util/stat.c | 24 +- + tools/perf/util/symbol.c | 14 + + tools/perf/util/synthetic-events.c | 179 +- + tools/perf/util/thread-stack.c | 274 ++- + tools/perf/util/thread-stack.h | 11 +- + tools/perf/util/thread.c | 24 + + tools/perf/util/thread.h | 15 + + tools/perf/util/top.c | 2 +- + tools/perf/util/top.h | 3 +- + tools/perf/util/trace-event-read.c | 2 +- + tools/perf/util/util.c | 1 + + .../pm-graph/config/custom-timeline-functions.cfg | 2 +- + tools/power/pm-graph/sleepgraph.py | 2 +- + .../selftests/rcutorture/bin/kcsan-collapse.sh | 22 + + .../selftests/rcutorture/bin/kvm-recheck-rcu.sh | 16 +- + .../selftests/rcutorture/bin/kvm-recheck.sh | 9 + + .../selftests/rcutorture/bin/kvm-test-1-run.sh | 52 +- + tools/testing/selftests/rcutorture/bin/kvm.sh | 11 + + .../selftests/rcutorture/configs/rcu/CFLIST | 3 + + .../selftests/rcutorture/configs/rcu/RUDE01 | 10 + + .../selftests/rcutorture/configs/rcu/RUDE01.boot | 1 + + .../selftests/rcutorture/configs/rcu/TRACE01 | 11 + + .../selftests/rcutorture/configs/rcu/TRACE01.boot | 1 + + .../selftests/rcutorture/configs/rcu/TRACE02 | 11 + + .../selftests/rcutorture/configs/rcu/TRACE02.boot | 1 + + .../selftests/rcutorture/configs/rcu/TREE10 | 2 +- + 512 files changed, 18063 insertions(+), 7060 deletions(-) + create mode 100644 Documentation/dev-tools/kcsan.rst + create mode 100644 arch/x86/events/zhaoxin/Makefile + create mode 100644 arch/x86/events/zhaoxin/core.c + create mode 100644 arch/x86/include/asm/GEN-for-each-reg.h + rename arch/x86/include/asm/{resctrl_sched.h => resctrl.h} (92%) + create mode 100644 arch/x86/purgatory/.gitignore + create mode 100644 drivers/firmware/efi/libstub/alignedmem.c + rename drivers/firmware/efi/libstub/{arm-stub.c => efi-stub.c} (96%) + create mode 100644 drivers/firmware/efi/libstub/relocate.c + create mode 100644 include/linux/atomic-arch-fallback.h + create mode 100644 include/linux/instrumented.h + create mode 100644 include/linux/kcsan-checks.h + create mode 100644 include/linux/kcsan.h + create mode 100644 include/linux/rcupdate_trace.h + delete mode 100644 kernel/gcov/gcc_3_4.c + create mode 100644 kernel/kcsan/Makefile + create mode 100644 kernel/kcsan/atomic.h + create mode 100644 kernel/kcsan/core.c + create mode 100644 kernel/kcsan/debugfs.c + create mode 100644 kernel/kcsan/encoding.h + create mode 100644 kernel/kcsan/kcsan.h + create mode 100644 kernel/kcsan/report.c + create mode 100644 kernel/kcsan/test.c + create mode 100644 kernel/rcu/tasks.h + create mode 100644 lib/Kconfig.kcsan + create mode 100644 scripts/Makefile.kcsan + create mode 100644 tools/build/feature/test-libpfm4.c + create mode 100644 tools/lib/api/io.h + create mode 100644 tools/objtool/arch/x86/include/cfi_regs.h + create mode 100644 tools/perf/bench/kallsyms-parse.c + create mode 100644 tools/perf/bench/synthesize.c + create mode 100644 tools/perf/pmu-events/arch/powerpc/power9/nest_metrics.json + create mode 100755 tools/perf/scripts/python/bin/flamegraph-record + create mode 100755 tools/perf/scripts/python/bin/flamegraph-report + create mode 100755 tools/perf/scripts/python/flamegraph.py + create mode 100644 tools/perf/tests/api-io.c + create mode 100644 tools/perf/util/perf_api_probe.c + create mode 100644 tools/perf/util/perf_api_probe.h + create mode 100644 tools/perf/util/sideband_evlist.c + create mode 100755 tools/testing/selftests/rcutorture/bin/kcsan-collapse.sh + create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/RUDE01 + create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/RUDE01.boot + create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TRACE01 + create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TRACE01.boot + create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TRACE02 + create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TRACE02.boot +Merging clockevents/timers/drivers/next (4c2fe4d88a8d Merge branch 'timers/drivers/timer-ti' into timers/drivers/next) +$ git merge clockevents/timers/drivers/next +Removing Documentation/devicetree/bindings/mfd/atmel-tcb.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mfd/atmel-tcb.txt | 56 -- + .../soc/microchip/atmel,at91rm9200-tcb.yaml | 150 +++++ + arch/arm/boot/dts/sama5d2.dtsi | 12 +- + drivers/clocksource/Kconfig | 7 +- + drivers/clocksource/Makefile | 1 + + drivers/clocksource/arc_timer.c | 4 +- + drivers/clocksource/arm_arch_timer.c | 4 +- + drivers/clocksource/timer-atmel-st.c | 3 +- + drivers/clocksource/timer-atmel-tcb.c | 101 +-- + drivers/clocksource/timer-davinci.c | 24 +- + drivers/clocksource/timer-imx-tpm.c | 8 +- + drivers/clocksource/timer-ti-32k.c | 48 +- + drivers/clocksource/timer-ti-dm-systimer.c | 731 +++++++++++++++++++++ + include/soc/at91/atmel_tcb.h | 5 + + 14 files changed, 1021 insertions(+), 133 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/mfd/atmel-tcb.txt + create mode 100644 Documentation/devicetree/bindings/soc/microchip/atmel,at91rm9200-tcb.yaml + create mode 100644 drivers/clocksource/timer-ti-dm-systimer.c +Merging edac/edac-for-next (dc63e28efa19 Merge branch 'edac-i10nm' into edac-for-next) +$ git merge edac/edac-for-next +Auto-merging drivers/edac/skx_common.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 - + drivers/edac/amd8131_edac.c | 8 -------- + drivers/edac/armada_xp_edac.c | 14 +++++++------- + drivers/edac/i10nm_base.c | 27 +++++++++++++++++++++++---- + drivers/edac/skx_base.c | 13 +++++++++++-- + drivers/edac/skx_common.c | 11 +++++------ + drivers/edac/skx_common.h | 11 +++++++++-- + drivers/edac/thunderx_edac.c | 8 ++++---- + drivers/edac/xgene_edac.c | 3 --- + 9 files changed, 59 insertions(+), 37 deletions(-) +Merging irqchip/irq/irqchip-next (f068a62c548c irqchip/gic-v3-its: Balance initial LPI affinity across CPUs) +$ git merge irqchip/irq/irqchip-next +Merge made by the 'recursive' strategy. + drivers/base/platform-msi.c | 2 +- + drivers/gpio/gpio-mockup.c | 53 +++++-- + drivers/iio/dummy/iio_dummy_evgen.c | 34 +++-- + drivers/irqchip/irq-gic-v3-its.c | 170 +++++++++++++++++++---- + drivers/irqchip/irq-gic-v3.c | 2 +- + drivers/irqchip/irq-sifive-plic.c | 2 - + include/linux/irq_sim.h | 33 ++--- + include/linux/irqdomain.h | 2 +- + kernel/irq/Kconfig | 1 + + kernel/irq/irq_sim.c | 267 ++++++++++++++++++++++-------------- + kernel/irq/irqdomain.c | 24 ++-- + 11 files changed, 395 insertions(+), 195 deletions(-) +Merging ftrace/for-next (d013496f99c5 tracing: Convert local functions in tracing_map.c to static) +$ git merge ftrace/for-next +Already up to date. +Merging rcu/rcu/next (68cd9f4e7238 tick/nohz: Narrow down noise while setting current task's tick dependency) +$ git merge rcu/rcu/next +Auto-merging scripts/mod/modpost.c +Auto-merging net/core/sock.c +Auto-merging kernel/locking/lockdep.c +Auto-merging kernel/fork.c +Auto-merging include/linux/sched.h +Auto-merging include/linux/compiler_types.h +Auto-merging include/linux/compiler.h +Auto-merging fs/btrfs/extent_io.c +Auto-merging arch/x86/mm/pat/set_memory.c +Auto-merging arch/x86/kvm/svm/svm.c +Auto-merging arch/x86/kernel/traps.c +Auto-merging arch/x86/kernel/cpu/mce/core.c +Auto-merging arch/x86/kernel/Makefile +Auto-merging arch/x86/include/asm/traps.h +Auto-merging arch/x86/Kconfig +Auto-merging arch/powerpc/kernel/traps.c +CONFLICT (content): Merge conflict in arch/powerpc/kernel/traps.c +Auto-merging arch/arm64/kernel/traps.c +Auto-merging arch/arm64/kernel/sdei.c +Auto-merging MAINTAINERS +Auto-merging Documentation/locking/locktorture.rst +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Removing Documentation/RCU/rculist_nulls.txt +Recorded preimage for 'arch/powerpc/kernel/traps.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'arch/powerpc/kernel/traps.c'. +[master 69f324b3b41f] Merge remote-tracking branch 'rcu/rcu/next' +$ git diff -M --stat --summary HEAD^.. + .../RCU/Design/Data-Structures/Data-Structures.rst | 31 +- + .../RCU/Design/Requirements/Requirements.rst | 7 +- + Documentation/RCU/{checklist.txt => checklist.rst} | 17 +- + Documentation/RCU/index.rst | 9 + + .../RCU/{lockdep-splat.txt => lockdep-splat.rst} | 109 +- + Documentation/RCU/{lockdep.txt => lockdep.rst} | 12 +- + Documentation/RCU/rculist_nulls.rst | 200 ++++ + Documentation/RCU/rculist_nulls.txt | 172 ---- + Documentation/RCU/{rcuref.txt => rcuref.rst} | 199 ++-- + Documentation/RCU/{stallwarn.txt => stallwarn.rst} | 68 +- + Documentation/RCU/{torture.txt => torture.rst} | 117 ++- + Documentation/admin-guide/kernel-parameters.txt | 14 + + Documentation/atomic_t.txt | 24 +- + Documentation/litmus-tests/README | 34 + + ...b__after_atomic-is-stronger-than-acquire.litmus | 32 + + ...Atomic-RMW-ops-are-atomic-WRT-atomic_set.litmus | 24 + + .../litmus-tests/rcu/RCU+sync+free.litmus | 42 + + .../litmus-tests/rcu/RCU+sync+read.litmus | 37 + + Documentation/locking/locktorture.rst | 2 +- + Documentation/trace/ftrace-design.rst | 8 - + MAINTAINERS | 6 +- + arch/arm64/include/asm/hardirq.h | 78 +- + arch/arm64/kernel/sdei.c | 14 +- + arch/arm64/kernel/traps.c | 8 +- + arch/powerpc/kernel/traps.c | 11 +- + arch/powerpc/kernel/vmlinux.lds.S | 1 + + arch/sh/Kconfig | 1 - + arch/sh/kernel/traps.c | 12 + + arch/x86/Kconfig | 1 + + arch/x86/include/asm/traps.h | 5 - + arch/x86/kernel/cpu/mce/core.c | 65 +- + arch/x86/kernel/cpu/mce/p5.c | 5 +- + arch/x86/kernel/cpu/mce/winchip.c | 5 +- + arch/x86/kernel/traps.c | 108 +- + arch/x86/kvm/svm/svm.c | 2 +- + arch/x86/mm/pat/set_memory.c | 2 +- + fs/btrfs/extent_io.c | 2 + + include/asm-generic/sections.h | 3 + + include/asm-generic/vmlinux.lds.h | 10 + + include/linux/compiler.h | 17 + + include/linux/compiler_types.h | 4 + + include/linux/ftrace_irq.h | 11 - + include/linux/hardirq.h | 18 +- + include/linux/lockdep.h | 23 +- + include/linux/preempt.h | 4 +- + include/linux/rculist.h | 2 + + include/linux/rculist_nulls.h | 2 +- + include/linux/rcutiny.h | 5 +- + include/linux/rcutree.h | 2 + + include/linux/sched.h | 6 + + include/linux/torture.h | 5 + + include/trace/events/rcu.h | 29 +- + kernel/fork.c | 8 +- + kernel/kcsan/Makefile | 3 + + kernel/kcsan/kcsan-test.c | 1084 ++++++++++++++++++++ + kernel/locking/lockdep.c | 19 - + kernel/locking/locktorture.c | 14 +- + kernel/locking/osq_lock.c | 6 +- + kernel/printk/internal.h | 8 +- + kernel/printk/printk_safe.c | 9 +- + kernel/rcu/rcu.h | 4 - + kernel/rcu/rcutorture.c | 108 +- + kernel/rcu/srcutree.c | 2 +- + kernel/rcu/tasks.h | 6 +- + kernel/rcu/tree.c | 353 +++---- + kernel/rcu/tree.h | 9 +- + kernel/rcu/tree_exp.h | 2 +- + kernel/rcu/tree_plugin.h | 8 +- + kernel/rcu/tree_stall.h | 11 +- + kernel/rcu/update.c | 16 +- + kernel/time/tick-sched.c | 22 +- + kernel/trace/Kconfig | 10 - + lib/Kconfig.kcsan | 34 +- + lib/Kconfig.ubsan | 11 + + mm/mmap.c | 1 + + net/core/sock.c | 4 +- + scripts/mod/modpost.c | 2 +- + tools/memory-model/Documentation/explanation.txt | 83 +- + tools/memory-model/Documentation/recipes.txt | 2 +- + tools/memory-model/Documentation/references.txt | 21 +- + tools/memory-model/README | 10 +- + tools/memory-model/litmus-tests/.gitignore | 2 +- + tools/memory-model/scripts/README | 16 +- + tools/memory-model/scripts/checkalllitmus.sh | 29 +- + tools/memory-model/scripts/checkghlitmus.sh | 11 +- + tools/memory-model/scripts/checklitmus.sh | 25 +- + tools/memory-model/scripts/checklitmushist.sh | 2 +- + tools/memory-model/scripts/checktheselitmus.sh | 43 + + tools/memory-model/scripts/cmplitmushist.sh | 49 +- + tools/memory-model/scripts/hwfnseg.sh | 20 + + tools/memory-model/scripts/initlitmushist.sh | 2 +- + tools/memory-model/scripts/judgelitmus.sh | 120 ++- + tools/memory-model/scripts/newlitmushist.sh | 4 +- + tools/memory-model/scripts/parseargs.sh | 21 +- + tools/memory-model/scripts/runlitmus.sh | 80 ++ + tools/memory-model/scripts/runlitmushist.sh | 29 +- + tools/memory-model/scripts/simpletest.sh | 35 + + .../testing/selftests/rcutorture/bin/functions.sh | 23 +- + .../selftests/rcutorture/bin/kvm-check-branches.sh | 108 ++ + .../selftests/rcutorture/bin/kvm-recheck.sh | 1 + + .../selftests/rcutorture/bin/kvm-test-1-run.sh | 1 + + tools/testing/selftests/rcutorture/bin/kvm.sh | 4 + + .../selftests/rcutorture/bin/parse-console.sh | 18 +- + 103 files changed, 3055 insertions(+), 1083 deletions(-) + rename Documentation/RCU/{checklist.txt => checklist.rst} (98%) + rename Documentation/RCU/{lockdep-splat.txt => lockdep-splat.rst} (54%) + rename Documentation/RCU/{lockdep.txt => lockdep.rst} (96%) + create mode 100644 Documentation/RCU/rculist_nulls.rst + delete mode 100644 Documentation/RCU/rculist_nulls.txt + rename Documentation/RCU/{rcuref.txt => rcuref.rst} (50%) + rename Documentation/RCU/{stallwarn.txt => stallwarn.rst} (87%) + rename Documentation/RCU/{torture.txt => torture.rst} (76%) + create mode 100644 Documentation/litmus-tests/README + create mode 100644 Documentation/litmus-tests/atomic/Atomic-RMW+mb__after_atomic-is-stronger-than-acquire.litmus + create mode 100644 Documentation/litmus-tests/atomic/Atomic-RMW-ops-are-atomic-WRT-atomic_set.litmus + create mode 100644 Documentation/litmus-tests/rcu/RCU+sync+free.litmus + create mode 100644 Documentation/litmus-tests/rcu/RCU+sync+read.litmus + create mode 100644 kernel/kcsan/kcsan-test.c + create mode 100755 tools/memory-model/scripts/checktheselitmus.sh + create mode 100755 tools/memory-model/scripts/hwfnseg.sh + create mode 100755 tools/memory-model/scripts/runlitmus.sh + create mode 100755 tools/memory-model/scripts/simpletest.sh + create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-check-branches.sh +Merging kvm/linux-next (cb953129bfe5 kvm: add halt-polling cpu usage stats) +$ git merge kvm/linux-next +Removing tools/testing/selftests/kvm/x86_64/set_memory_region_test.c +Auto-merging tools/testing/selftests/kvm/Makefile +Auto-merging kernel/exit.c +Auto-merging include/uapi/linux/kvm.h +Auto-merging include/linux/kvm_host.h +Auto-merging arch/x86/kvm/x86.c +Auto-merging arch/x86/kvm/svm/svm.c +CONFLICT (content): Merge conflict in arch/x86/kvm/svm/svm.c +Auto-merging arch/x86/kvm/mmu/mmu.c +Auto-merging arch/powerpc/kvm/book3s_hv.c +Auto-merging arch/powerpc/include/asm/kvm_book3s.h +Auto-merging arch/mips/kvm/mips.c +Auto-merging arch/arm64/include/asm/kvm_host.h +Auto-merging Documentation/virt/kvm/api.rst +Resolved 'arch/x86/kvm/svm/svm.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 10cd01bf4c27] Merge remote-tracking branch 'kvm/linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/virt/kvm/api.rst | 17 + + Documentation/virt/kvm/cpuid.rst | 2 +- + Documentation/virt/kvm/nested-vmx.rst | 5 +- + arch/arm64/include/asm/kvm_host.h | 2 + + arch/arm64/kvm/guest.c | 25 +- + arch/mips/include/asm/kvm_host.h | 2 + + arch/mips/kvm/mips.c | 72 +-- + arch/powerpc/include/asm/kvm_book3s.h | 2 +- + arch/powerpc/include/asm/kvm_host.h | 2 +- + arch/powerpc/kvm/book3s.c | 61 +- + arch/powerpc/kvm/book3s_hv.c | 23 +- + arch/powerpc/kvm/booke.c | 43 +- + arch/powerpc/kvm/powerpc.c | 5 +- + arch/s390/include/asm/kvm_host.h | 2 + + arch/s390/kvm/kvm-s390.c | 208 +++---- + arch/x86/include/asm/kvm_host.h | 101 ++-- + arch/x86/include/asm/vmx.h | 10 +- + arch/x86/include/uapi/asm/vmx.h | 3 + + arch/x86/kvm/cpuid.c | 10 +- + arch/x86/kvm/emulate.c | 2 + + arch/x86/kvm/hyperv.c | 7 +- + arch/x86/kvm/irq.c | 2 + + arch/x86/kvm/kvm_cache_regs.h | 10 +- + arch/x86/kvm/lapic.c | 94 ++- + arch/x86/kvm/lapic.h | 9 +- + arch/x86/kvm/mmu/mmu.c | 438 +++++++------- + arch/x86/kvm/mmu/page_track.c | 4 +- + arch/x86/kvm/mmu/paging_tmpl.h | 20 +- + arch/x86/kvm/mmu_audit.c | 6 +- + arch/x86/kvm/svm/nested.c | 76 ++- + arch/x86/kvm/svm/svm.c | 233 +++++--- + arch/x86/kvm/svm/svm.h | 36 +- + arch/x86/kvm/trace.h | 32 +- + arch/x86/kvm/vmx/evmcs.c | 32 +- + arch/x86/kvm/vmx/nested.c | 637 +++++++++++++-------- + arch/x86/kvm/vmx/nested.h | 49 +- + arch/x86/kvm/vmx/ops.h | 32 +- + arch/x86/kvm/vmx/vmcs12.c | 4 - + arch/x86/kvm/vmx/vmcs12.h | 10 +- + arch/x86/kvm/vmx/vmenter.S | 14 +- + arch/x86/kvm/vmx/vmx.c | 506 ++++++++++------ + arch/x86/kvm/vmx/vmx.h | 62 +- + arch/x86/kvm/x86.c | 319 ++++++----- + arch/x86/kvm/x86.h | 9 +- + include/linux/kvm_host.h | 24 +- + include/linux/rcuwait.h | 32 +- + include/uapi/linux/kvm.h | 1 + + kernel/exit.c | 9 +- + tools/kvm/kvm_stat/kvm_stat | 84 ++- + tools/kvm/kvm_stat/kvm_stat.service | 16 + + tools/kvm/kvm_stat/kvm_stat.txt | 15 +- + tools/testing/selftests/kvm/.gitignore | 2 +- + tools/testing/selftests/kvm/Makefile | 4 +- + tools/testing/selftests/kvm/include/kvm_util.h | 28 +- + tools/testing/selftests/kvm/lib/kvm_util.c | 154 ++--- + .../testing/selftests/kvm/lib/kvm_util_internal.h | 8 +- + tools/testing/selftests/kvm/lib/s390x/processor.c | 5 +- + .../testing/selftests/kvm/set_memory_region_test.c | 408 +++++++++++++ + .../selftests/kvm/x86_64/set_memory_region_test.c | 141 ----- + virt/kvm/arm/arch_timer.c | 3 +- + virt/kvm/arm/arm.c | 15 +- + virt/kvm/async_pf.c | 3 +- + virt/kvm/eventfd.c | 2 +- + virt/kvm/kvm_main.c | 76 +-- + 64 files changed, 2636 insertions(+), 1632 deletions(-) + create mode 100644 tools/kvm/kvm_stat/kvm_stat.service + create mode 100644 tools/testing/selftests/kvm/set_memory_region_test.c + delete mode 100644 tools/testing/selftests/kvm/x86_64/set_memory_region_test.c +Merging kvm-arm/next (5107000faa6e KVM: arm64: Make KVM_CAP_MAX_VCPUS compatible with the selected GIC version) +$ git merge kvm-arm/next +Auto-merging virt/kvm/kvm_main.c +Auto-merging virt/kvm/eventfd.c +Auto-merging arch/arm64/kvm/reset.c +Auto-merging arch/arm64/kvm/guest.c +Auto-merging arch/arm64/kvm/arm.c +Auto-merging arch/arm64/kvm/arch_timer.c +Auto-merging arch/arm64/kernel/smp.c +Auto-merging arch/arm64/kernel/cpu_errata.c +Auto-merging arch/arm64/kernel/asm-offsets.c +Auto-merging arch/arm64/include/asm/kvm_host.h +Auto-merging MAINTAINERS +Auto-merging Documentation/virt/kvm/api.rst +Merge made by the 'recursive' strategy. + Documentation/virt/kvm/api.rst | 2 +- + MAINTAINERS | 1 - + arch/arm64/include/asm/kvm_asm.h | 2 +- + arch/arm64/include/asm/kvm_host.h | 3 + + arch/arm64/include/asm/virt.h | 2 +- + arch/arm64/kernel/asm-offsets.c | 2 +- + arch/arm64/kernel/cpu_errata.c | 2 +- + arch/arm64/kernel/smp.c | 2 +- + arch/arm64/kvm/Kconfig | 22 +-- + arch/arm64/kvm/Makefile | 46 ++--- + {virt/kvm/arm => arch/arm64/kvm}/aarch32.c | 0 + {virt/kvm/arm => arch/arm64/kvm}/arch_timer.c | 12 +- + {virt/kvm/arm => arch/arm64/kvm}/arm.c | 28 ++- + arch/arm64/kvm/guest.c | 4 +- + arch/arm64/kvm/handle_exit.c | 2 +- + arch/arm64/kvm/hyp/Makefile | 16 +- + {virt/kvm/arm => arch/arm64/kvm}/hyp/aarch32.c | 0 + {virt/kvm/arm => arch/arm64/kvm}/hyp/timer-sr.c | 3 +- + {virt/kvm/arm => arch/arm64/kvm}/hyp/vgic-v3-sr.c | 6 +- + {virt/kvm/arm => arch/arm64/kvm}/hypercalls.c | 0 + {virt/kvm/arm => arch/arm64/kvm}/mmio.c | 2 +- + {virt/kvm/arm => arch/arm64/kvm}/mmu.c | 142 ++++++++------ + {virt/kvm/arm => arch/arm64/kvm}/perf.c | 0 + virt/kvm/arm/pmu.c => arch/arm64/kvm/pmu-emul.c | 0 + {virt/kvm/arm => arch/arm64/kvm}/psci.c | 6 +- + {virt/kvm/arm => arch/arm64/kvm}/pvtime.c | 0 + arch/arm64/kvm/reset.c | 6 +- + arch/arm64/kvm/sys_regs.c | 6 +- + arch/arm64/kvm/trace.h | 216 +-------------------- + virt/kvm/arm/trace.h => arch/arm64/kvm/trace_arm.h | 11 +- + arch/arm64/kvm/trace_handle_exit.h | 215 ++++++++++++++++++++ + arch/arm64/kvm/vgic-sys-reg-v3.c | 2 +- + {virt/kvm/arm => arch/arm64/kvm}/vgic/trace.h | 2 +- + {virt/kvm/arm => arch/arm64/kvm}/vgic/vgic-debug.c | 0 + {virt/kvm/arm => arch/arm64/kvm}/vgic/vgic-init.c | 0 + {virt/kvm/arm => arch/arm64/kvm}/vgic/vgic-irqfd.c | 0 + {virt/kvm/arm => arch/arm64/kvm}/vgic/vgic-its.c | 0 + .../arm => arch/arm64/kvm}/vgic/vgic-kvm-device.c | 0 + .../kvm/arm => arch/arm64/kvm}/vgic/vgic-mmio-v2.c | 0 + .../kvm/arm => arch/arm64/kvm}/vgic/vgic-mmio-v3.c | 0 + {virt/kvm/arm => arch/arm64/kvm}/vgic/vgic-mmio.c | 0 + {virt/kvm/arm => arch/arm64/kvm}/vgic/vgic-mmio.h | 0 + {virt/kvm/arm => arch/arm64/kvm}/vgic/vgic-v2.c | 0 + {virt/kvm/arm => arch/arm64/kvm}/vgic/vgic-v3.c | 4 +- + {virt/kvm/arm => arch/arm64/kvm}/vgic/vgic-v4.c | 0 + {virt/kvm/arm => arch/arm64/kvm}/vgic/vgic.c | 0 + {virt/kvm/arm => arch/arm64/kvm}/vgic/vgic.h | 0 + virt/kvm/coalesced_mmio.c | 2 +- + virt/kvm/eventfd.c | 2 +- + virt/kvm/kvm_main.c | 2 +- + 50 files changed, 384 insertions(+), 389 deletions(-) + rename {virt/kvm/arm => arch/arm64/kvm}/aarch32.c (100%) + rename {virt/kvm/arm => arch/arm64/kvm}/arch_timer.c (98%) + rename {virt/kvm/arm => arch/arm64/kvm}/arm.c (98%) + rename {virt/kvm/arm => arch/arm64/kvm}/hyp/aarch32.c (100%) + rename {virt/kvm/arm => arch/arm64/kvm}/hyp/timer-sr.c (89%) + rename {virt/kvm/arm => arch/arm64/kvm}/hyp/vgic-v3-sr.c (99%) + rename {virt/kvm/arm => arch/arm64/kvm}/hypercalls.c (100%) + rename {virt/kvm/arm => arch/arm64/kvm}/mmio.c (98%) + rename {virt/kvm/arm => arch/arm64/kvm}/mmu.c (97%) + rename {virt/kvm/arm => arch/arm64/kvm}/perf.c (100%) + rename virt/kvm/arm/pmu.c => arch/arm64/kvm/pmu-emul.c (100%) + rename {virt/kvm/arm => arch/arm64/kvm}/psci.c (98%) + rename {virt/kvm/arm => arch/arm64/kvm}/pvtime.c (100%) + rename virt/kvm/arm/trace.h => arch/arm64/kvm/trace_arm.h (97%) + create mode 100644 arch/arm64/kvm/trace_handle_exit.h + rename {virt/kvm/arm => arch/arm64/kvm}/vgic/trace.h (93%) + rename {virt/kvm/arm => arch/arm64/kvm}/vgic/vgic-debug.c (100%) + rename {virt/kvm/arm => arch/arm64/kvm}/vgic/vgic-init.c (100%) + rename {virt/kvm/arm => arch/arm64/kvm}/vgic/vgic-irqfd.c (100%) + rename {virt/kvm/arm => arch/arm64/kvm}/vgic/vgic-its.c (100%) + rename {virt/kvm/arm => arch/arm64/kvm}/vgic/vgic-kvm-device.c (100%) + rename {virt/kvm/arm => arch/arm64/kvm}/vgic/vgic-mmio-v2.c (100%) + rename {virt/kvm/arm => arch/arm64/kvm}/vgic/vgic-mmio-v3.c (100%) + rename {virt/kvm/arm => arch/arm64/kvm}/vgic/vgic-mmio.c (100%) + rename {virt/kvm/arm => arch/arm64/kvm}/vgic/vgic-mmio.h (100%) + rename {virt/kvm/arm => arch/arm64/kvm}/vgic/vgic-v2.c (100%) + rename {virt/kvm/arm => arch/arm64/kvm}/vgic/vgic-v3.c (99%) + rename {virt/kvm/arm => arch/arm64/kvm}/vgic/vgic-v4.c (100%) + rename {virt/kvm/arm => arch/arm64/kvm}/vgic/vgic.c (100%) + rename {virt/kvm/arm => arch/arm64/kvm}/vgic/vgic.h (100%) +Merging kvm-ppc/kvm-ppc-next (9a5788c615f5 KVM: PPC: Book3S HV: Add a capability for enabling secure guests) +$ git merge kvm-ppc/kvm-ppc-next +Already up to date. +Merging kvms390/next (0b545fd17f84 KVM: s390: remove unneeded semicolon in gisa_vcpu_kicker()) +$ git merge kvms390/next +Merge made by the 'recursive' strategy. + arch/s390/kvm/interrupt.c | 2 +- + arch/s390/kvm/vsie.c | 3 +-- + arch/s390/mm/gmap.c | 10 +++++----- + 3 files changed, 7 insertions(+), 8 deletions(-) +Merging xen-tip/linux-next (74f4c438f22c arm/xen: make _xen_start_info static) +$ git merge xen-tip/linux-next +Already up to date. +Merging percpu/for-next (dedac37ea96b Merge branch 'for-5.7' into for-next) +$ git merge percpu/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging workqueues/for-next (b92b36eadf4d workqueue: Fix an use after free in init_rescuer()) +$ git merge workqueues/for-next +Merge made by the 'recursive' strategy. + kernel/workqueue.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging drivers-x86/for-next (f441d66a6ee9 platform/x86: dell-wmi: Ignore keyboard attached / detached events) +$ git merge drivers-x86/for-next +Auto-merging drivers/platform/x86/thinkpad_acpi.c +Auto-merging drivers/platform/x86/asus-nb-wmi.c +Auto-merging drivers/base/core.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../testing/sysfs-platform-intel-wmi-sbl-fw-update | 12 ++ + MAINTAINERS | 13 ++ + drivers/base/core.c | 1 + + drivers/base/swnode.c | 48 ++++++ + drivers/platform/x86/Kconfig | 19 +++ + drivers/platform/x86/Makefile | 2 + + drivers/platform/x86/asus-laptop.c | 25 ++- + drivers/platform/x86/asus-nb-wmi.c | 1 + + drivers/platform/x86/asus-wmi.c | 115 ++++++++------ + drivers/platform/x86/dell-laptop.c | 11 +- + drivers/platform/x86/dell-wmi.c | 10 ++ + drivers/platform/x86/eeepc-laptop.c | 4 +- + drivers/platform/x86/intel-vbtn.c | 107 +++++++++---- + drivers/platform/x86/intel-wmi-sbl-fw-update.c | 145 +++++++++++++++++ + drivers/platform/x86/intel_cht_int33fe_typec.c | 106 +++++++------ + drivers/platform/x86/intel_scu_pltdrv.c | 60 +++++++ + drivers/platform/x86/lg-laptop.c | 18 +-- + drivers/platform/x86/samsung-laptop.c | 3 +- + drivers/platform/x86/sony-laptop.c | 60 ++++--- + drivers/platform/x86/thinkpad_acpi.c | 173 ++++++++++----------- + drivers/platform/x86/toshiba_acpi.c | 26 +--- + drivers/platform/x86/touchscreen_dmi.c | 100 +++++++++++- + drivers/platform/x86/wmi.c | 45 +++--- + drivers/watchdog/Kconfig | 1 + + include/linux/platform_data/x86/asus-wmi.h | 3 + + include/linux/property.h | 3 + + tools/power/x86/intel-speed-select/isst-config.c | 45 +++++- + tools/power/x86/intel-speed-select/isst-core.c | 6 +- + tools/power/x86/intel-speed-select/isst-display.c | 2 +- + 29 files changed, 824 insertions(+), 340 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-platform-intel-wmi-sbl-fw-update + create mode 100644 drivers/platform/x86/intel-wmi-sbl-fw-update.c + create mode 100644 drivers/platform/x86/intel_scu_pltdrv.c +Merging chrome-platform/for-next (bbb7ad49b835 platform/chrome: cros_usbpd_logger: Add __printf annotation to append_str()) +$ git merge chrome-platform/for-next +Auto-merging drivers/platform/chrome/chromeos_pstore.c +CONFLICT (content): Merge conflict in drivers/platform/chrome/chromeos_pstore.c +Resolved 'drivers/platform/chrome/chromeos_pstore.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 3e0ed11079f3] Merge remote-tracking branch 'chrome-platform/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/platform/chrome/Kconfig | 1 + + drivers/platform/chrome/chromeos_pstore.c | 1 + + drivers/platform/chrome/cros_ec_i2c.c | 2 +- + drivers/platform/chrome/cros_ec_ishtp.c | 45 ++++++++--- + drivers/platform/chrome/cros_ec_typec.c | 119 ++++++++++++++++++++++++---- + drivers/platform/chrome/cros_usbpd_logger.c | 1 + + drivers/platform/chrome/wilco_ec/debugfs.c | 7 +- + 7 files changed, 145 insertions(+), 31 deletions(-) +Merging hsi/for-next (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge hsi/for-next +Already up to date. +Merging leds/for-next (c85c7cdef3c9 leds: trigger: remove redundant assignment to variable ret) +$ git merge leds/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/leds/leds-sgm3140.yaml | 62 ++++ + drivers/leds/Kconfig | 19 ++ + drivers/leds/Makefile | 2 + + drivers/leds/leds-ariel.c | 133 +++++++++ + drivers/leds/leds-lm355x.c | 1 - + drivers/leds/leds-lp3952.c | 2 +- + drivers/leds/leds-lt3593.c | 1 - + drivers/leds/leds-netxbig.c | 148 +++++----- + drivers/leds/leds-pwm.c | 16 +- + drivers/leds/leds-sgm3140.c | 320 +++++++++++++++++++++ + drivers/leds/leds-tca6507.c | 2 +- + drivers/leds/leds-tlc591xx.c | 5 +- + drivers/leds/trigger/ledtrig-timer.c | 4 +- + 13 files changed, 635 insertions(+), 80 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/leds-sgm3140.yaml + create mode 100644 drivers/leds/leds-ariel.c + create mode 100644 drivers/leds/leds-sgm3140.c +Merging ipmi/for-next (e641abd3c726 Try to load acpi_ipmi when an SSIF ACPI IPMI interface is added) +$ git merge ipmi/for-next +Merge made by the 'recursive' strategy. + drivers/char/ipmi/bt-bmc.c | 21 +++++++++------------ + drivers/char/ipmi/ipmi_msghandler.c | 9 +++++---- + drivers/char/ipmi/ipmi_si_platform.c | 2 ++ + drivers/char/ipmi/ipmi_ssif.c | 1 + + 4 files changed, 17 insertions(+), 16 deletions(-) +Merging driver-core/driver-core-next (93d2e4322aa7 of: platform: Batch fwnode parsing when adding all top level devices) +$ git merge driver-core/driver-core-next +Auto-merging drivers/base/platform.c +Auto-merging drivers/base/core.c +Merge made by the 'recursive' strategy. + Documentation/driver-api/driver-model/driver.rst | 32 +++- + drivers/base/base.h | 1 + + drivers/base/core.c | 193 ++++++++++++++++++----- + drivers/base/dd.c | 36 +++-- + drivers/base/firmware_loader/fallback.c | 3 + + drivers/base/firmware_loader/fallback_table.c | 2 +- + drivers/base/firmware_loader/main.c | 3 - + drivers/base/platform.c | 4 +- + drivers/base/soc.c | 2 +- + drivers/of/platform.c | 2 + + fs/debugfs/internal.h | 2 +- + fs/kernfs/file.c | 2 +- + include/linux/firmware.h | 1 - + include/linux/fwnode.h | 2 + + lib/test_firmware.c | 26 +-- + 15 files changed, 217 insertions(+), 94 deletions(-) +Merging usb/usb-next (16bdc04cc98a usb/ehci-platform: Set PM runtime as active on resume) +$ git merge usb/usb-next +Auto-merging drivers/usb/typec/mux/intel_pmc_mux.c +Auto-merging drivers/usb/host/pci-quirks.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/usb/brcm,bcm7445-ehci.yaml | 59 ++ + .../devicetree/bindings/usb/ti,tps6598x.yaml | 64 ++ + Documentation/devicetree/bindings/usb/usb-xhci.txt | 1 + + .../firmware-guide/acpi/intel-pmc-mux.rst | 153 +++++ + MAINTAINERS | 15 + + drivers/gpio/gpiolib-of.c | 21 + + drivers/usb/cdns3/core.c | 47 +- + drivers/usb/cdns3/core.h | 2 - + drivers/usb/cdns3/drd.c | 4 +- + drivers/usb/cdns3/gadget.c | 2 +- + drivers/usb/class/usblp.c | 5 +- + drivers/usb/core/hcd-pci.c | 7 +- + drivers/usb/core/hub.c | 2 +- + drivers/usb/core/hub.h | 2 +- + drivers/usb/core/otg_whitelist.h | 2 +- + drivers/usb/core/sysfs.c | 6 +- + drivers/usb/core/usb.h | 2 +- + drivers/usb/dwc2/core.h | 2 +- + drivers/usb/dwc2/debug.h | 2 +- + drivers/usb/dwc2/hcd.h | 2 +- + drivers/usb/dwc2/hw.h | 2 +- + drivers/usb/early/xhci-dbc.c | 1 - + drivers/usb/early/xhci-dbc.h | 2 +- + drivers/usb/gadget/udc/gr_udc.c | 1 - + drivers/usb/host/Kconfig | 29 + + drivers/usb/host/Makefile | 2 + + drivers/usb/host/ehci-brcm.c | 280 +++++++++ + drivers/usb/host/ehci-fsl.h | 2 +- + drivers/usb/host/ehci-mv.c | 9 +- + drivers/usb/host/ehci-mxc.c | 13 +- + drivers/usb/host/ehci-pci.c | 6 +- + drivers/usb/host/ehci-platform.c | 4 + + drivers/usb/host/ehci-tegra.c | 1 - + drivers/usb/host/ehci.h | 2 +- + drivers/usb/host/fhci.h | 2 +- + drivers/usb/host/imx21-hcd.h | 2 +- + drivers/usb/host/ohci-pci.c | 9 +- + drivers/usb/host/ohci-platform.c | 5 + + drivers/usb/host/ohci-sm501.c | 7 +- + drivers/usb/host/ohci.h | 2 +- + drivers/usb/host/pci-quirks.c | 8 +- + drivers/usb/host/r8a66597.h | 2 +- + drivers/usb/host/u132-hcd.c | 10 - + drivers/usb/host/uhci-pci.c | 8 +- + drivers/usb/host/xhci-debugfs.h | 2 +- + drivers/usb/host/xhci-ext-caps.h | 2 +- + drivers/usb/host/xhci-mtk.h | 2 +- + drivers/usb/host/xhci-mvebu.h | 2 +- + drivers/usb/host/xhci-pci-renesas.c | 645 +++++++++++++++++++++ + drivers/usb/host/xhci-pci.c | 47 +- + drivers/usb/host/xhci-pci.h | 28 + + drivers/usb/host/xhci-plat.c | 20 +- + drivers/usb/host/xhci-plat.h | 2 +- + drivers/usb/host/xhci-rcar.h | 2 +- + drivers/usb/host/xhci-trace.h | 2 +- + drivers/usb/host/xhci.h | 3 +- + drivers/usb/isp1760/isp1760-core.h | 2 +- + drivers/usb/isp1760/isp1760-regs.h | 2 +- + drivers/usb/isp1760/isp1760-udc.h | 2 +- + drivers/usb/misc/sisusbvga/sisusb.h | 2 +- + drivers/usb/misc/sisusbvga/sisusb_init.h | 2 +- + drivers/usb/misc/sisusbvga/sisusb_struct.h | 2 +- + drivers/usb/misc/usb_u132.h | 2 +- + drivers/usb/mtu3/mtu3.h | 2 +- + drivers/usb/mtu3/mtu3_debug.h | 2 +- + drivers/usb/mtu3/mtu3_dr.h | 2 +- + drivers/usb/mtu3/mtu3_hw_regs.h | 2 +- + drivers/usb/mtu3/mtu3_qmu.h | 2 +- + drivers/usb/mtu3/mtu3_trace.h | 2 +- + drivers/usb/musb/davinci.h | 2 +- + drivers/usb/musb/musb_core.h | 2 +- + drivers/usb/musb/musb_debug.h | 2 +- + drivers/usb/musb/musb_dma.h | 2 +- + drivers/usb/musb/musb_gadget.h | 2 +- + drivers/usb/musb/musb_host.h | 2 +- + drivers/usb/musb/musb_io.h | 2 +- + drivers/usb/musb/musb_regs.h | 2 +- + drivers/usb/musb/musb_trace.h | 2 +- + drivers/usb/musb/omap2430.h | 2 +- + drivers/usb/musb/tusb6010.h | 2 +- + drivers/usb/phy/phy-fsl-usb.h | 2 +- + drivers/usb/phy/phy-jz4770.c | 12 +- + drivers/usb/phy/phy-mv-usb.h | 2 +- + drivers/usb/renesas_usbhs/common.h | 2 +- + drivers/usb/renesas_usbhs/fifo.h | 2 +- + drivers/usb/renesas_usbhs/mod.h | 2 +- + drivers/usb/renesas_usbhs/pipe.h | 2 +- + drivers/usb/renesas_usbhs/rcar2.h | 2 +- + drivers/usb/renesas_usbhs/rcar3.h | 2 +- + drivers/usb/renesas_usbhs/rza.h | 2 +- + drivers/usb/roles/class.c | 4 +- + drivers/usb/storage/debug.h | 2 +- + drivers/usb/storage/initializers.h | 2 +- + drivers/usb/storage/protocol.h | 2 +- + drivers/usb/storage/scsiglue.h | 2 +- + drivers/usb/storage/sierra_ms.c | 4 - + drivers/usb/storage/transport.h | 2 +- + drivers/usb/storage/unusual_alauda.h | 2 +- + drivers/usb/storage/unusual_cypress.h | 2 +- + drivers/usb/storage/unusual_datafab.h | 2 +- + drivers/usb/storage/unusual_devs.h | 2 +- + drivers/usb/storage/unusual_ene_ub6250.h | 2 +- + drivers/usb/storage/unusual_freecom.h | 2 +- + drivers/usb/storage/unusual_isd200.h | 2 +- + drivers/usb/storage/unusual_jumpshot.h | 2 +- + drivers/usb/storage/unusual_karma.h | 2 +- + drivers/usb/storage/unusual_onetouch.h | 2 +- + drivers/usb/storage/unusual_realtek.h | 2 +- + drivers/usb/storage/unusual_sddr09.h | 2 +- + drivers/usb/storage/unusual_sddr55.h | 2 +- + drivers/usb/storage/unusual_uas.h | 2 +- + drivers/usb/storage/unusual_usbat.h | 2 +- + drivers/usb/storage/usb.h | 2 +- + drivers/usb/typec/class.c | 36 +- + drivers/usb/typec/mux/intel_pmc_mux.c | 42 +- + drivers/usb/typec/tcpm/fusb302.c | 32 +- + drivers/usb/typec/tcpm/fusb302_reg.h | 2 +- + drivers/usb/typec/tps6598x.c | 64 +- + drivers/usb/typec/ucsi/Makefile | 4 + + drivers/usb/typec/ucsi/psy.c | 241 ++++++++ + drivers/usb/typec/ucsi/trace.c | 10 +- + drivers/usb/typec/ucsi/ucsi.c | 41 +- + drivers/usb/typec/ucsi/ucsi.h | 26 +- + include/linux/usb/hcd.h | 3 +- + include/linux/usb/typec.h | 1 + + 125 files changed, 1946 insertions(+), 250 deletions(-) + create mode 100644 Documentation/devicetree/bindings/usb/brcm,bcm7445-ehci.yaml + create mode 100644 Documentation/devicetree/bindings/usb/ti,tps6598x.yaml + create mode 100644 Documentation/firmware-guide/acpi/intel-pmc-mux.rst + create mode 100644 drivers/usb/host/ehci-brcm.c + create mode 100644 drivers/usb/host/xhci-pci-renesas.c + create mode 100644 drivers/usb/host/xhci-pci.h + create mode 100644 drivers/usb/typec/ucsi/psy.c +Merging usb-gadget/next (4a5dbd900957 dt-bindings: usb: add documentation for aspeed usb-vhub) +$ git merge usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (986c1748c84d USB: serial: usb_wwan: do not resubmit rx urb on fatal errors) +$ git merge usb-serial/usb-next +Merge made by the 'recursive' strategy. + drivers/usb/serial/belkin_sa.h | 2 +- + drivers/usb/serial/io_16654.h | 2 +- + drivers/usb/serial/io_edgeport.h | 2 +- + drivers/usb/serial/io_ionsp.h | 2 +- + drivers/usb/serial/io_ti.h | 2 +- + drivers/usb/serial/io_usbvend.h | 2 +- + drivers/usb/serial/iuu_phoenix.h | 2 +- + drivers/usb/serial/mct_u232.h | 2 +- + drivers/usb/serial/oti6858.h | 2 +- + drivers/usb/serial/pl2303.h | 2 +- + drivers/usb/serial/usb_wwan.c | 4 ++++ + drivers/usb/serial/visor.h | 2 +- + drivers/usb/serial/whiteheat.h | 2 +- + 13 files changed, 16 insertions(+), 12 deletions(-) +Merging usb-chipidea-next/ci-for-usb-next (6dbbbccdba61 usb: chipidea: Enable user-space triggered role-switching) +$ git merge usb-chipidea-next/ci-for-usb-next +Removing drivers/usb/chipidea/ci_hdrc_zevio.c +Auto-merging drivers/usb/chipidea/ci_hdrc_imx.c +Merge made by the 'recursive' strategy. + drivers/usb/chipidea/Kconfig | 37 ++-- + drivers/usb/chipidea/Makefile | 13 +- + drivers/usb/chipidea/ci.h | 1 + + drivers/usb/chipidea/ci_hdrc_imx.c | 13 +- + drivers/usb/chipidea/ci_hdrc_imx.h | 2 + + drivers/usb/chipidea/ci_hdrc_usb2.c | 30 ++-- + drivers/usb/chipidea/ci_hdrc_zevio.c | 67 ------- + drivers/usb/chipidea/core.c | 48 ++--- + drivers/usb/chipidea/udc.c | 170 ++++++++++++++---- + drivers/usb/chipidea/udc.h | 6 +- + drivers/usb/chipidea/usbmisc_imx.c | 334 ++++++++++++++++++++++++++++++++++- + include/linux/usb/chipidea.h | 1 + + 12 files changed, 546 insertions(+), 176 deletions(-) + delete mode 100644 drivers/usb/chipidea/ci_hdrc_zevio.c +Merging phy-next/next (d30b16a556b6 phy: qcom-qmp: Add QMP V3 USB3 PHY support for SC7180) +$ git merge phy-next/next +Removing Documentation/devicetree/bindings/phy/rcar-gen3-phy-usb3.txt +Removing Documentation/devicetree/bindings/phy/rcar-gen3-phy-usb2.txt +Removing Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt +Removing Documentation/devicetree/bindings/phy/meson8b-usb2-phy.txt +Merge made by the 'recursive' strategy. + .../bindings/phy/amlogic,meson8b-usb2-phy.yaml | 64 ++++ + .../devicetree/bindings/phy/cdns,salvo-phy.yaml | 52 ++++ + .../devicetree/bindings/phy/meson8b-usb2-phy.txt | 28 -- + .../devicetree/bindings/phy/qcom,qmp-phy.yaml | 313 ++++++++++++++++++++ + .../bindings/phy/qcom,qmp-usb3-dp-phy.yaml | 136 +++++++++ + .../bindings/phy/qcom,usb-snps-femto-v2.yaml | 80 +++++ + .../devicetree/bindings/phy/qcom-qmp-phy.txt | 242 --------------- + .../bindings/phy/qcom-usb-ipq4019-phy.yaml | 50 ++++ + .../devicetree/bindings/phy/rcar-gen3-phy-usb2.txt | 70 ----- + .../devicetree/bindings/phy/rcar-gen3-phy-usb3.txt | 52 ---- + .../devicetree/bindings/phy/renesas,usb2-phy.yaml | 117 ++++++++ + .../devicetree/bindings/phy/renesas,usb3-phy.yaml | 79 +++++ + drivers/phy/amlogic/Kconfig | 3 +- + drivers/phy/amlogic/phy-meson8b-usb2.c | 149 ++++++---- + drivers/phy/broadcom/phy-bcm-ns2-usbdrd.c | 2 +- + drivers/phy/broadcom/phy-bcm-sr-usb.c | 57 +--- + drivers/phy/broadcom/phy-brcm-usb.c | 16 +- + drivers/phy/cadence/Kconfig | 9 + + drivers/phy/cadence/Makefile | 1 + + drivers/phy/cadence/phy-cadence-salvo.c | 325 +++++++++++++++++++++ + drivers/phy/cadence/phy-cadence-sierra.c | 27 +- + drivers/phy/intel/Kconfig | 1 + + drivers/phy/motorola/phy-cpcap-usb.c | 2 - + drivers/phy/qualcomm/Kconfig | 17 ++ + drivers/phy/qualcomm/Makefile | 2 + + drivers/phy/qualcomm/phy-qcom-ipq4019-usb.c | 148 ++++++++++ + drivers/phy/qualcomm/phy-qcom-qmp.c | 254 ++++++++++++++-- + drivers/phy/qualcomm/phy-qcom-qmp.h | 238 +++++++++++++-- + drivers/phy/qualcomm/phy-qcom-snps-femto-v2.c | 287 ++++++++++++++++++ + drivers/phy/samsung/phy-s5pv210-usb2.c | 4 + + drivers/phy/ti/phy-am654-serdes.c | 104 ++++++- + drivers/phy/ti/phy-j721e-wiz.c | 65 ++++- + drivers/phy/ti/phy-omap-usb2.c | 60 +++- + include/linux/phy/omap_usb.h | 69 +---- + 34 files changed, 2479 insertions(+), 644 deletions(-) + create mode 100644 Documentation/devicetree/bindings/phy/amlogic,meson8b-usb2-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/cdns,salvo-phy.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/meson8b-usb2-phy.txt + create mode 100644 Documentation/devicetree/bindings/phy/qcom,qmp-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/qcom,qmp-usb3-dp-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/qcom,usb-snps-femto-v2.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt + create mode 100644 Documentation/devicetree/bindings/phy/qcom-usb-ipq4019-phy.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/rcar-gen3-phy-usb2.txt + delete mode 100644 Documentation/devicetree/bindings/phy/rcar-gen3-phy-usb3.txt + create mode 100644 Documentation/devicetree/bindings/phy/renesas,usb2-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/renesas,usb3-phy.yaml + create mode 100644 drivers/phy/cadence/phy-cadence-salvo.c + create mode 100644 drivers/phy/qualcomm/phy-qcom-ipq4019-usb.c + create mode 100644 drivers/phy/qualcomm/phy-qcom-snps-femto-v2.c +Merging tty/tty-next (b14109f302d0 tty: serial: fsl_lpuart: Use __maybe_unused instead of #if CONFIG_PM_SLEEP) +$ git merge tty/tty-next +Auto-merging kernel/rcu/tree_stall.h +Auto-merging kernel/debug/debug_core.c +Auto-merging drivers/gpu/drm/drm_fb_helper.c +Auto-merging arch/powerpc/xmon/xmon.c +Auto-merging Documentation/devicetree/bindings/serial/samsung_uart.yaml +Merge made by the 'recursive' strategy. + Documentation/admin-guide/sysrq.rst | 10 +- + .../devicetree/bindings/serial/samsung_uart.yaml | 8 ++ + .../devicetree/bindings/serial/st,stm32-uart.yaml | 14 +++ + arch/alpha/kernel/setup.c | 13 +- + arch/mips/kernel/sysrq.c | 2 +- + arch/powerpc/xmon/xmon.c | 2 +- + arch/sparc/kernel/process_64.c | 4 +- + drivers/gpu/drm/drm_fb_helper.c | 4 +- + drivers/tty/hvc/hvcs.c | 2 - + drivers/tty/mxser.c | 7 +- + drivers/tty/n_gsm.c | 48 ++++---- + drivers/tty/rocket.c | 10 +- + drivers/tty/serial/8250/8250_core.c | 18 ++- + drivers/tty/serial/8250/8250_exar.c | 65 +++++----- + drivers/tty/serial/8250/8250_port.c | 4 +- + drivers/tty/serial/8250/serial_cs.c | 6 +- + drivers/tty/serial/Kconfig | 16 ++- + drivers/tty/serial/amba-pl011.c | 1 + + drivers/tty/serial/ar933x_uart.c | 6 +- + drivers/tty/serial/atmel_serial.c | 6 +- + drivers/tty/serial/fsl_lpuart.c | 27 ++--- + drivers/tty/serial/imx.c | 8 +- + drivers/tty/serial/lantiq.c | 40 ++++++- + drivers/tty/serial/lpc32xx_hs.c | 1 - + drivers/tty/serial/omap-serial.c | 52 ++++---- + drivers/tty/serial/samsung_tty.c | 84 ++++++++++--- + drivers/tty/serial/serial_core.c | 6 +- + drivers/tty/serial/sh-sci.h | 1 - + drivers/tty/serial/stm32-usart.c | 61 +++++++++- + drivers/tty/serial/stm32-usart.h | 1 + + drivers/tty/serial/xilinx_uartps.c | 12 +- + drivers/tty/sysrq.c | 68 ++++++----- + drivers/tty/vt/selection.c | 133 +++++++++++---------- + include/linux/serial_core.h | 2 +- + include/linux/sysrq.h | 18 +-- + kernel/debug/debug_core.c | 2 +- + kernel/power/poweroff.c | 2 +- + kernel/rcu/tree_stall.h | 2 +- + 38 files changed, 488 insertions(+), 278 deletions(-) +Merging char-misc/char-misc-next (57c76221d5af w1_therm: adding bulk read support to trigger multiple conversion on bus) +$ git merge char-misc/char-misc-next +Auto-merging drivers/parport/procfs.c +Auto-merging drivers/mmc/host/sdhci-of-arasan.c +Auto-merging drivers/fpga/dfl.h +Auto-merging drivers/fpga/Kconfig +Merge made by the 'recursive' strategy. + .../ABI/stable/sysfs-driver-firmware-zynqmp | 103 ++ + .../testing/sysfs-bus-event_source-devices-dfl_fme | 104 ++ + Documentation/ABI/testing/sysfs-driver-w1_therm | 116 ++ + .../bindings/firmware/intel,stratix10-svc.txt | 2 +- + .../bindings/fpga/intel-stratix10-soc-fpga-mgr.txt | 3 +- + Documentation/fpga/dfl.rst | 84 + + Documentation/w1/slaves/w1_therm.rst | 50 +- + arch/arm64/boot/dts/intel/socfpga_agilex.dtsi | 4 +- + drivers/android/binderfs.c | 4 +- + drivers/bus/mhi/core/main.c | 3 +- + drivers/bus/mhi/core/pm.c | 143 ++ + drivers/char/tlclk.c | 17 +- + drivers/clk/zynqmp/clk-gate-zynqmp.c | 9 +- + drivers/clk/zynqmp/clk-mux-zynqmp.c | 6 +- + drivers/clk/zynqmp/clkc.c | 17 +- + drivers/clk/zynqmp/divider.c | 12 +- + drivers/clk/zynqmp/pll.c | 29 +- + drivers/crypto/xilinx/zynqmp-aes-gcm.c | 22 +- + drivers/dca/dca-sysfs.c | 4 +- + drivers/firmware/stratix10-rsu.c | 10 +- + drivers/firmware/stratix10-svc.c | 62 +- + drivers/firmware/xilinx/zynqmp-debug.c | 5 +- + drivers/firmware/xilinx/zynqmp.c | 607 +++++-- + drivers/fpga/Kconfig | 2 +- + drivers/fpga/Makefile | 1 + + drivers/fpga/dfl-afu-main.c | 35 +- + drivers/fpga/dfl-fme-main.c | 23 +- + drivers/fpga/dfl-fme-perf.c | 1020 ++++++++++++ + drivers/fpga/dfl-fme.h | 2 + + drivers/fpga/dfl.c | 15 +- + drivers/fpga/dfl.h | 37 +- + drivers/fpga/ice40-spi.c | 10 +- + drivers/fpga/machxo2-spi.c | 12 +- + drivers/fpga/stratix10-soc.c | 28 +- + drivers/fpga/zynqmp-fpga.c | 14 +- + drivers/greybus/Kconfig | 6 +- + drivers/greybus/arpc.h | 2 +- + drivers/misc/cardreader/rts5261.c | 9 +- + drivers/misc/fastrpc.c | 13 +- + drivers/misc/lkdtm/bugs.c | 2 +- + drivers/misc/mic/scif/scif_nodeqp.c | 2 +- + drivers/misc/sgi-xp/xpc_main.c | 10 +- + drivers/misc/sgi-xp/xpnet.c | 8 +- + drivers/misc/vmw_vmci/vmci_host.c | 2 - + drivers/misc/xilinx_sdfec.c | 31 +- + drivers/mmc/host/sdhci-of-arasan.c | 38 +- + drivers/nvmem/core.c | 104 +- + drivers/nvmem/imx-ocotp.c | 9 +- + drivers/nvmem/jz4780-efuse.c | 4 +- + drivers/nvmem/zynqmp_nvmem.c | 11 +- + drivers/parport/daisy.c | 29 +- + drivers/parport/ieee1284.c | 94 +- + drivers/parport/ieee1284_ops.c | 70 +- + drivers/parport/parport_amiga.c | 22 +- + drivers/parport/parport_atari.c | 2 +- + drivers/parport/parport_cs.c | 6 +- + drivers/parport/parport_gsc.c | 25 +- + drivers/parport/parport_gsc.h | 21 +- + drivers/parport/parport_ip32.c | 117 +- + drivers/parport/parport_mfc3.c | 21 +- + drivers/parport/parport_pc.c | 263 ++-- + drivers/parport/parport_sunbpp.c | 2 +- + drivers/parport/probe.c | 34 +- + drivers/parport/procfs.c | 6 +- + drivers/parport/share.c | 292 +--- + drivers/reset/reset-zynqmp.c | 26 +- + drivers/slimbus/core.c | 6 +- + drivers/slimbus/qcom-ngd-ctrl.c | 5 +- + drivers/soc/xilinx/zynqmp_pm_domains.c | 26 +- + drivers/soc/xilinx/zynqmp_power.c | 17 +- + drivers/spi/spi-zynqmp-gqspi.c | 5 - + drivers/uio/uio.c | 2 +- + drivers/uio/uio_dmem_genirq.c | 3 +- + drivers/uio/uio_hv_generic.c | 1 + + drivers/visorbus/controlvmchannel.h | 2 +- + drivers/visorbus/vbuschannel.h | 2 +- + drivers/visorbus/visorbus_private.h | 2 +- + drivers/w1/slaves/w1_ds2430.c | 2 +- + drivers/w1/slaves/w1_therm.c | 1665 ++++++++++++++++---- + include/linux/firmware/intel/stratix10-smc.h | 49 +- + .../linux/firmware/intel/stratix10-svc-client.h | 71 +- + include/linux/firmware/xlnx-zynqmp.h | 237 ++- + include/linux/greybus/greybus_protocols.h | 44 +- + include/linux/mhi.h | 19 + + include/linux/parport.h | 16 +- + 85 files changed, 4455 insertions(+), 1615 deletions(-) + create mode 100644 Documentation/ABI/stable/sysfs-driver-firmware-zynqmp + create mode 100644 Documentation/ABI/testing/sysfs-bus-event_source-devices-dfl_fme + create mode 100644 Documentation/ABI/testing/sysfs-driver-w1_therm + create mode 100644 drivers/fpga/dfl-fme-perf.c +Merging extcon/extcon-next (6581cc1b6221 extcon: adc-jack: Fix an error handling path in 'adc_jack_probe()') +$ git merge extcon/extcon-next +Merge made by the 'recursive' strategy. + drivers/extcon/extcon-adc-jack.c | 3 +-- + drivers/extcon/extcon.c | 2 +- + 2 files changed, 2 insertions(+), 3 deletions(-) +Merging soundwire/next (26d970225d87 soundwire: master: add runtime pm support) +$ git merge soundwire/next +Auto-merging drivers/soundwire/intel.c +Merge made by the 'recursive' strategy. + Documentation/driver-api/soundwire/stream.rst | 89 +++++++++++++++++++++++++- + Documentation/driver-api/soundwire/summary.rst | 7 +- + drivers/soundwire/Makefile | 2 +- + drivers/soundwire/bus.c | 70 ++++++++++++++------ + drivers/soundwire/bus.h | 3 + + drivers/soundwire/bus_type.c | 19 ++++-- + drivers/soundwire/cadence_master.c | 8 ++- + drivers/soundwire/debugfs.c | 2 +- + drivers/soundwire/intel.c | 9 ++- + drivers/soundwire/intel_init.c | 4 +- + drivers/soundwire/master.c | 88 +++++++++++++++++++++++++ + drivers/soundwire/qcom.c | 34 ++++++---- + drivers/soundwire/slave.c | 10 ++- + include/linux/soundwire/sdw.h | 24 ++++++- + include/linux/soundwire/sdw_type.h | 9 ++- + 15 files changed, 320 insertions(+), 58 deletions(-) + create mode 100644 drivers/soundwire/master.c +Merging thunderbolt/next (eb4a6de4962e thunderbolt: Update Kconfig to allow building on other architectures.) +$ git merge thunderbolt/next +Merge made by the 'recursive' strategy. + drivers/thunderbolt/Kconfig | 1 - + drivers/thunderbolt/icm.c | 22 ++++++++++++++++++++++ + drivers/thunderbolt/nhi.c | 4 ++++ + drivers/thunderbolt/nhi.h | 2 ++ + drivers/thunderbolt/switch.c | 7 ------- + include/linux/thunderbolt.h | 2 +- + 6 files changed, 29 insertions(+), 9 deletions(-) +Merging staging/staging-next (cef077e6aa4c Merge tag 'iio-for-5.8b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next) +$ git merge staging/staging-next +Auto-merging drivers/staging/wfx/scan.c +Removing drivers/staging/vt6656/firmware.h +Removing drivers/staging/vt6656/firmware.c +Auto-merging drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +Removing drivers/staging/mt7621-pci-phy/mediatek,mt7621-pci-phy.txt +Auto-merging drivers/staging/greybus/uart.c +Auto-merging drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c +Auto-merging drivers/iio/chemical/atlas-sensor.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/iio/light/vcnl4000.txt +Removing Documentation/devicetree/bindings/iio/light/tsl2563.txt +Removing Documentation/devicetree/bindings/iio/dac/st,stm32-dac.txt +Removing Documentation/devicetree/bindings/iio/adc/rockchip-saradc.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-bus-iio-proximity | 10 + + Documentation/ABI/testing/sysfs-bus-iio-sx9310 | 10 + + Documentation/ABI/testing/sysfs-bus-most | 104 +- + .../devicetree/bindings/iio/adc/adi,ad9467.yaml | 65 + + .../devicetree/bindings/iio/adc/adi,axi-adc.yaml | 62 + + .../devicetree/bindings/iio/adc/maxim,max1241.yaml | 63 + + .../bindings/iio/adc/rockchip-saradc.txt | 37 - + .../bindings/iio/adc/rockchip-saradc.yaml | 80 ++ + .../bindings/iio/chemical/ams,ccs811.yaml | 53 + + .../bindings/iio/chemical/atlas,sensor.yaml | 2 + + Documentation/devicetree/bindings/iio/common.yaml | 35 + + .../devicetree/bindings/iio/dac/ltc2632.txt | 8 +- + .../devicetree/bindings/iio/dac/st,stm32-dac.txt | 63 - + .../devicetree/bindings/iio/dac/st,stm32-dac.yaml | 110 ++ + .../devicetree/bindings/iio/gyroscope/bmg160.txt | 2 +- + .../devicetree/bindings/iio/imu/adi,adis16475.yaml | 137 ++ + .../bindings/iio/light/amstaos,tsl2563.yaml | 49 + + .../devicetree/bindings/iio/light/tsl2563.txt | 19 - + .../devicetree/bindings/iio/light/vcnl4000.txt | 24 - + .../bindings/iio/light/vishay,vcnl4000.yaml | 50 + + .../bindings/iio/magnetometer/ak8974.txt | 4 +- + .../devicetree/bindings/iio/st-sensors.txt | 1 + + Documentation/driver-api/driver-model/devres.rst | 8 - + Documentation/driver-api/iio/triggers.rst | 2 - + MAINTAINERS | 10 + + drivers/iio/accel/Kconfig | 2 +- + drivers/iio/accel/dmard06.c | 3 +- + drivers/iio/accel/hid-sensor-accel-3d.c | 18 +- + drivers/iio/accel/kxsd9-i2c.c | 11 +- + drivers/iio/accel/mxc4005.c | 4 +- + drivers/iio/accel/st_accel.h | 2 + + drivers/iio/accel/st_accel_buffer.c | 3 +- + drivers/iio/accel/st_accel_core.c | 83 +- + drivers/iio/accel/st_accel_i2c.c | 5 + + drivers/iio/adc/Kconfig | 45 + + drivers/iio/adc/Makefile | 3 + + drivers/iio/adc/ad7476.c | 59 +- + drivers/iio/adc/ad7780.c | 27 +- + drivers/iio/adc/ad7791.c | 64 +- + drivers/iio/adc/ad7793.c | 144 ++- + drivers/iio/adc/ad9467.c | 422 ++++++ + drivers/iio/adc/ad_sigma_delta.c | 8 +- + drivers/iio/adc/adi-axi-adc.c | 482 +++++++ + drivers/iio/adc/at91-sama5d2_adc.c | 233 ++-- + drivers/iio/adc/at91_adc.c | 5 +- + drivers/iio/adc/fsl-imx25-gcq.c | 4 +- + drivers/iio/adc/intel_mrfld_adc.c | 6 +- + drivers/iio/adc/max1241.c | 227 ++++ + drivers/iio/adc/max1363.c | 32 +- + drivers/iio/adc/mcp3422.c | 5 +- + drivers/iio/adc/sun4i-gpadc-iio.c | 4 +- + drivers/iio/adc/ti-ads124s08.c | 7 +- + drivers/iio/adc/xilinx-xadc-core.c | 4 +- + drivers/iio/adc/xilinx-xadc-events.c | 2 +- + drivers/iio/adc/xilinx-xadc.h | 2 +- + drivers/iio/buffer/industrialio-buffer-dma.c | 1 - + drivers/iio/buffer/industrialio-buffer-dmaengine.c | 41 +- + drivers/iio/buffer/industrialio-hw-consumer.c | 31 - + drivers/iio/buffer/industrialio-triggered-buffer.c | 11 - + drivers/iio/buffer/kfifo_buf.c | 22 - + drivers/iio/chemical/atlas-sensor.c | 36 +- + drivers/iio/chemical/bme680_core.c | 36 +- + drivers/iio/chemical/ccs811.c | 112 +- + .../iio/common/hid-sensors/hid-sensor-trigger.c | 18 +- + .../iio/common/hid-sensors/hid-sensor-trigger.h | 3 +- + drivers/iio/common/st_sensors/st_sensors_core.c | 13 +- + drivers/iio/common/st_sensors/st_sensors_i2c.c | 4 +- + drivers/iio/common/st_sensors/st_sensors_spi.c | 6 +- + drivers/iio/common/st_sensors/st_sensors_trigger.c | 13 +- + drivers/iio/dac/Kconfig | 6 +- + drivers/iio/dac/ad5446.c | 6 +- + drivers/iio/dac/ad5592r.c | 4 +- + drivers/iio/dac/ad5593r.c | 2 +- + drivers/iio/dac/ad5624r_spi.c | 8 +- + drivers/iio/dac/ltc2632.c | 67 +- + drivers/iio/gyro/Kconfig | 2 +- + drivers/iio/gyro/adis16130.c | 4 +- + drivers/iio/gyro/adis16136.c | 10 +- + drivers/iio/gyro/bmg160_i2c.c | 6 +- + drivers/iio/gyro/bmg160_spi.c | 5 +- + drivers/iio/gyro/hid-sensor-gyro-3d.c | 18 +- + drivers/iio/gyro/mpu3050-i2c.c | 4 +- + drivers/iio/gyro/st_gyro_buffer.c | 3 +- + drivers/iio/gyro/st_gyro_core.c | 9 +- + drivers/iio/health/afe4403.c | 14 +- + drivers/iio/health/max30100.c | 7 +- + drivers/iio/humidity/hid-sensor-humidity.c | 12 +- + drivers/iio/humidity/hts221_buffer.c | 6 +- + drivers/iio/humidity/hts221_i2c.c | 6 +- + drivers/iio/humidity/hts221_spi.c | 6 +- + drivers/iio/imu/Kconfig | 13 + + drivers/iio/imu/Makefile | 1 + + drivers/iio/imu/adis.c | 27 +- + drivers/iio/imu/adis16400.c | 21 +- + drivers/iio/imu/adis16460.c | 27 +- + drivers/iio/imu/adis16475.c | 1338 ++++++++++++++++++++ + drivers/iio/imu/adis16480.c | 16 +- + drivers/iio/imu/adis_buffer.c | 58 +- + drivers/iio/imu/adis_trigger.c | 72 +- + drivers/iio/imu/bmi160/bmi160_i2c.c | 4 +- + drivers/iio/imu/bmi160/bmi160_spi.c | 4 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_acpi.c | 8 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 23 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c | 4 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_spi.c | 4 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 2 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 21 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c | 96 ++ + drivers/iio/industrialio-buffer.c | 79 +- + drivers/iio/industrialio-core.c | 126 +- + drivers/iio/industrialio-trigger.c | 53 - + drivers/iio/inkern.c | 27 - + drivers/iio/light/Kconfig | 2 + + drivers/iio/light/bh1780.c | 6 +- + drivers/iio/light/cm32181.c | 271 +++- + drivers/iio/light/cm3232.c | 3 +- + drivers/iio/light/gp2ap020a00f.c | 6 +- + drivers/iio/light/hid-sensor-als.c | 18 +- + drivers/iio/light/hid-sensor-prox.c | 18 +- + drivers/iio/light/isl29125.c | 28 +- + drivers/iio/light/ltr501.c | 41 +- + drivers/iio/light/opt3001.c | 3 +- + drivers/iio/light/si1133.c | 18 +- + drivers/iio/light/st_uvis25_i2c.c | 7 +- + drivers/iio/light/st_uvis25_spi.c | 7 +- + drivers/iio/light/tsl2563.c | 2 +- + drivers/iio/light/tsl2772.c | 6 +- + drivers/iio/light/vcnl4000.c | 746 ++++++++++- + drivers/iio/light/vl6180.c | 3 +- + drivers/iio/light/zopt2201.c | 4 +- + drivers/iio/magnetometer/ak8974.c | 201 ++- + drivers/iio/magnetometer/bmc150_magn_spi.c | 4 +- + drivers/iio/magnetometer/hid-sensor-magn-3d.c | 18 +- + drivers/iio/magnetometer/mmc35240.c | 4 +- + drivers/iio/magnetometer/rm3100-core.c | 5 +- + drivers/iio/magnetometer/st_magn_core.c | 3 +- + drivers/iio/orientation/hid-sensor-incl-3d.c | 18 +- + drivers/iio/orientation/hid-sensor-rotation.c | 18 +- + drivers/iio/pressure/bmp280-core.c | 100 +- + drivers/iio/pressure/hid-sensor-press.c | 18 +- + drivers/iio/pressure/hp206c.c | 8 +- + drivers/iio/pressure/ms5611_i2c.c | 4 +- + drivers/iio/pressure/ms5611_spi.c | 4 +- + drivers/iio/pressure/st_pressure_core.c | 7 +- + drivers/iio/pressure/zpa2326.c | 9 +- + drivers/iio/proximity/Kconfig | 13 + + drivers/iio/proximity/Makefile | 1 + + drivers/iio/proximity/sx9310.c | 1069 ++++++++++++++++ + drivers/iio/temperature/hid-sensor-temperature.c | 12 +- + drivers/iio/temperature/ltc2983.c | 4 +- + drivers/iio/temperature/max31856.c | 5 +- + drivers/iio/trigger/iio-trig-hrtimer.c | 2 +- + drivers/staging/android/ion/ion_page_pool.c | 4 +- + drivers/staging/axis-fifo/axis-fifo.c | 12 +- + drivers/staging/comedi/comedi_internal.h | 4 +- + drivers/staging/comedi/drivers/ni_pcimio.c | 4 +- + drivers/staging/fbtft/fb_st7789v.c | 32 +- + drivers/staging/fsl-dpaa2/ethsw/ethsw.c | 6 +- + drivers/staging/gasket/gasket_page_table.c | 2 +- + drivers/staging/gasket/gasket_sysfs.c | 2 + + drivers/staging/gdm724x/gdm_lte.c | 2 +- + drivers/staging/greybus/hid.c | 3 +- + drivers/staging/greybus/light.c | 3 +- + drivers/staging/greybus/uart.c | 19 +- + drivers/staging/iio/Documentation/overview.txt | 2 +- + drivers/staging/iio/impedance-analyzer/ad5933.c | 77 +- + drivers/staging/most/usb/Kconfig | 2 +- + drivers/staging/most/usb/usb.c | 231 ++-- + drivers/staging/mt7621-dts/mt7621.dtsi | 9 +- + .../mt7621-pci-phy/mediatek,mt7621-pci-phy.txt | 28 - + .../mt7621-pci-phy/mediatek,mt7621-pci-phy.yaml | 36 + + drivers/staging/mt7621-pci/pci-mt7621.c | 64 +- + drivers/staging/mt7621-pinctrl/pinctrl-rt2880.c | 2 +- + drivers/staging/pi433/pi433_if.c | 1 + + drivers/staging/qlge/qlge_dbg.c | 7 +- + drivers/staging/qlge/qlge_main.c | 473 ++++--- + drivers/staging/rtl8188eu/core/rtw_ap.c | 99 +- + drivers/staging/rtl8188eu/core/rtw_efuse.c | 33 +- + drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 4 +- + drivers/staging/rtl8188eu/core/rtw_led.c | 17 +- + drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 6 +- + drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 2 +- + drivers/staging/rtl8188eu/core/rtw_recv.c | 19 +- + drivers/staging/rtl8188eu/hal/fw.c | 7 +- + drivers/staging/rtl8188eu/hal/odm.c | 54 +- + drivers/staging/rtl8188eu/hal/odm_hwconfig.c | 2 - + drivers/staging/rtl8188eu/hal/phy.c | 8 +- + drivers/staging/rtl8188eu/hal/rf.c | 2 +- + drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c | 2 +- + drivers/staging/rtl8188eu/hal/rtl8188e_dm.c | 3 - + drivers/staging/rtl8188eu/include/osdep_service.h | 2 +- + drivers/staging/rtl8188eu/include/rtl8188e_spec.h | 2 +- + drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 116 +- + drivers/staging/rtl8188eu/os_dep/rtw_android.c | 2 +- + drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 8 +- + drivers/staging/rtl8712/rtl871x_xmit.c | 158 ++- + drivers/staging/rtl8712/rtl871x_xmit.h | 2 +- + drivers/staging/rtl8712/usb_halinit.c | 2 +- + drivers/staging/rtl8723bs/core/rtw_cmd.c | 2 +- + drivers/staging/rtl8723bs/core/rtw_mlme.c | 6 +- + drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 7 +- + drivers/staging/rtl8723bs/core/rtw_sta_mgt.c | 2 - + drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 22 +- + drivers/staging/rtl8723bs/hal/hal_btcoex.c | 45 +- + drivers/staging/rtl8723bs/hal/hal_com_phycfg.c | 8 +- + drivers/staging/rtl8723bs/hal/odm.c | 13 - + drivers/staging/rtl8723bs/hal/odm.h | 2 +- + drivers/staging/rtl8723bs/hal/odm_RegDefine11N.h | 4 +- + drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c | 44 +- + drivers/staging/rtl8723bs/hal/sdio_halinit.c | 4 - + drivers/staging/rtl8723bs/include/hal_data.h | 8 +- + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 34 +- + drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 6 +- + drivers/staging/rtl8723bs/os_dep/recv_linux.c | 21 +- + drivers/staging/sm750fb/sm750.c | 154 ++- + drivers/staging/sm750fb/sm750.h | 23 +- + drivers/staging/sm750fb/sm750_hw.c | 2 +- + drivers/staging/speakup/speakup_decext.c | 4 + + drivers/staging/speakup/speakup_decpc.c | 4 + + drivers/staging/speakup/speakup_dectlk.c | 5 +- + drivers/staging/speakup/speakup_dummy.c | 4 + + drivers/staging/speakup/speakup_soft.c | 4 + + drivers/staging/speakup/spk_types.h | 3 +- + drivers/staging/speakup/spkguide.txt | 7 +- + drivers/staging/speakup/sysfs-driver-speakup | 6 + + drivers/staging/speakup/varhandlers.c | 1 + + drivers/staging/unisys/visorhba/visorhba_main.c | 2 +- + .../vc04_services/bcm2835-audio/bcm2835-pcm.c | 4 +- + .../vc04_services/bcm2835-camera/bcm2835-camera.c | 383 +++--- + .../vc04_services/bcm2835-camera/bcm2835-camera.h | 62 +- + .../vc04_services/bcm2835-camera/controls.c | 97 +- + .../vc04_services/bcm2835-camera/mmal-common.h | 18 +- + .../vc04_services/bcm2835-camera/mmal-parameters.h | 14 +- + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 4 +- + .../interface/vchiq_arm/vchiq_connected.c | 33 +- + drivers/staging/vt6655/Makefile | 3 - + drivers/staging/vt6655/baseband.c | 320 +++-- + drivers/staging/vt6655/baseband.h | 37 +- + drivers/staging/vt6655/card.c | 145 +-- + drivers/staging/vt6655/card.h | 4 - + drivers/staging/vt6655/channel.c | 4 +- + drivers/staging/vt6655/device_main.c | 37 +- + drivers/staging/vt6655/rf.c | 4 +- + drivers/staging/vt6655/rxtx.c | 252 ++-- + drivers/staging/vt6656/Makefile | 6 +- + drivers/staging/vt6656/baseband.c | 620 ++------- + drivers/staging/vt6656/baseband.h | 17 +- + drivers/staging/vt6656/card.c | 570 ++------- + drivers/staging/vt6656/card.h | 20 +- + drivers/staging/vt6656/device.h | 10 +- + drivers/staging/vt6656/firmware.c | 106 -- + drivers/staging/vt6656/firmware.h | 25 - + drivers/staging/vt6656/key.c | 47 +- + drivers/staging/vt6656/key.h | 13 +- + drivers/staging/vt6656/mac.c | 128 +- + drivers/staging/vt6656/mac.h | 28 +- + drivers/staging/vt6656/main_usb.c | 161 ++- + drivers/staging/vt6656/power.c | 34 +- + drivers/staging/vt6656/power.h | 2 +- + drivers/staging/vt6656/rf.c | 463 +++---- + drivers/staging/vt6656/rf.h | 3 +- + drivers/staging/vt6656/rxtx.c | 382 +++--- + drivers/staging/vt6656/rxtx.h | 7 + + drivers/staging/vt6656/usbpipe.c | 34 +- + drivers/staging/vt6656/usbpipe.h | 2 +- + drivers/staging/vt6656/wcmd.c | 3 +- + drivers/staging/wfx/Makefile | 1 + + drivers/staging/wfx/TODO | 51 +- + drivers/staging/wfx/bh.c | 50 +- + drivers/staging/wfx/bh.h | 1 + + drivers/staging/wfx/bus.h | 2 + + drivers/staging/wfx/bus_sdio.c | 86 +- + drivers/staging/wfx/bus_spi.c | 44 +- + drivers/staging/wfx/data_rx.c | 16 +- + drivers/staging/wfx/data_rx.h | 3 +- + drivers/staging/wfx/data_tx.c | 341 +++-- + drivers/staging/wfx/data_tx.h | 8 +- + drivers/staging/wfx/debug.c | 44 +- + drivers/staging/wfx/fwio.c | 14 +- + drivers/staging/wfx/hif_api_cmd.h | 623 +++++---- + drivers/staging/wfx/hif_api_general.h | 483 +++---- + drivers/staging/wfx/hif_api_mib.h | 671 ++++------ + drivers/staging/wfx/hif_rx.c | 214 ++-- + drivers/staging/wfx/hif_tx.c | 119 +- + drivers/staging/wfx/hif_tx.h | 10 +- + drivers/staging/wfx/hif_tx_mib.c | 386 ++++++ + drivers/staging/wfx/hif_tx_mib.h | 436 +------ + drivers/staging/wfx/hwio.c | 18 +- + drivers/staging/wfx/key.c | 71 +- + drivers/staging/wfx/key.h | 2 - + drivers/staging/wfx/main.c | 76 +- + drivers/staging/wfx/main.h | 4 +- + drivers/staging/wfx/queue.c | 532 +++----- + drivers/staging/wfx/queue.h | 41 +- + drivers/staging/wfx/scan.c | 13 +- + drivers/staging/wfx/sta.c | 828 ++++-------- + drivers/staging/wfx/sta.h | 38 +- + drivers/staging/wfx/traces.h | 25 +- + drivers/staging/wfx/wfx.h | 45 +- + drivers/staging/wilc1000/hif.c | 4 +- + include/linux/fpga/adi-axi-common.h | 6 +- + include/linux/iio/adc/ad_sigma_delta.h | 58 - + include/linux/iio/adc/adi-axi-adc.h | 64 + + include/linux/iio/buffer-dma.h | 2 +- + include/linux/iio/buffer-dmaengine.h | 3 + + include/linux/iio/buffer_impl.h | 9 - + include/linux/iio/consumer.h | 18 - + include/linux/iio/hw-consumer.h | 1 - + include/linux/iio/iio.h | 10 +- + include/linux/iio/imu/adis.h | 87 +- + include/linux/iio/kfifo_buf.h | 1 - + include/linux/iio/trigger.h | 3 - + include/linux/iio/triggered_buffer.h | 2 - + 313 files changed, 11740 insertions(+), 8164 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-proximity + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-sx9310 + create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,ad9467.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,axi-adc.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/maxim,max1241.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/adc/rockchip-saradc.txt + create mode 100644 Documentation/devicetree/bindings/iio/adc/rockchip-saradc.yaml + create mode 100644 Documentation/devicetree/bindings/iio/chemical/ams,ccs811.yaml + create mode 100644 Documentation/devicetree/bindings/iio/common.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/dac/st,stm32-dac.txt + create mode 100644 Documentation/devicetree/bindings/iio/dac/st,stm32-dac.yaml + create mode 100644 Documentation/devicetree/bindings/iio/imu/adi,adis16475.yaml + create mode 100644 Documentation/devicetree/bindings/iio/light/amstaos,tsl2563.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/light/tsl2563.txt + delete mode 100644 Documentation/devicetree/bindings/iio/light/vcnl4000.txt + create mode 100644 Documentation/devicetree/bindings/iio/light/vishay,vcnl4000.yaml + create mode 100644 drivers/iio/adc/ad9467.c + create mode 100644 drivers/iio/adc/adi-axi-adc.c + create mode 100644 drivers/iio/adc/max1241.c + create mode 100644 drivers/iio/imu/adis16475.c + create mode 100644 drivers/iio/proximity/sx9310.c + delete mode 100644 drivers/staging/mt7621-pci-phy/mediatek,mt7621-pci-phy.txt + create mode 100644 drivers/staging/mt7621-pci-phy/mediatek,mt7621-pci-phy.yaml + delete mode 100644 drivers/staging/vt6656/firmware.c + delete mode 100644 drivers/staging/vt6656/firmware.h + create mode 100644 drivers/staging/wfx/hif_tx_mib.c + create mode 100644 include/linux/iio/adc/adi-axi-adc.h +Merging mux/for-next (f356d58c3a04 Merge branch 'i2c-mux/for-next' into for-next) +$ git merge mux/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging icc/icc-next (b35da2e86f25 Merge branch 'icc-get-by-index' into icc-next) +$ git merge icc/icc-next +Auto-merging include/linux/interconnect.h +Auto-merging drivers/interconnect/core.c +Merge made by the 'recursive' strategy. + .../bindings/interconnect/fsl,imx8m-noc.yaml | 101 ++++++++ + drivers/interconnect/Kconfig | 1 + + drivers/interconnect/Makefile | 1 + + drivers/interconnect/core.c | 64 ++++- + drivers/interconnect/imx/Kconfig | 17 ++ + drivers/interconnect/imx/Makefile | 9 + + drivers/interconnect/imx/imx.c | 284 +++++++++++++++++++++ + drivers/interconnect/imx/imx.h | 61 +++++ + drivers/interconnect/imx/imx8mm.c | 105 ++++++++ + drivers/interconnect/imx/imx8mn.c | 94 +++++++ + drivers/interconnect/imx/imx8mq.c | 103 ++++++++ + drivers/interconnect/internal.h | 2 + + include/dt-bindings/interconnect/imx8mm.h | 50 ++++ + include/dt-bindings/interconnect/imx8mn.h | 41 +++ + include/dt-bindings/interconnect/imx8mq.h | 48 ++++ + include/linux/interconnect.h | 19 ++ + 16 files changed, 999 insertions(+), 1 deletion(-) + create mode 100644 Documentation/devicetree/bindings/interconnect/fsl,imx8m-noc.yaml + create mode 100644 drivers/interconnect/imx/Kconfig + create mode 100644 drivers/interconnect/imx/Makefile + create mode 100644 drivers/interconnect/imx/imx.c + create mode 100644 drivers/interconnect/imx/imx.h + create mode 100644 drivers/interconnect/imx/imx8mm.c + create mode 100644 drivers/interconnect/imx/imx8mn.c + create mode 100644 drivers/interconnect/imx/imx8mq.c + create mode 100644 include/dt-bindings/interconnect/imx8mm.h + create mode 100644 include/dt-bindings/interconnect/imx8mn.h + create mode 100644 include/dt-bindings/interconnect/imx8mq.h +Merging slave-dma/next (be4cf718cd99 dmaengine: imx-sdma: initialize all script addresses) +$ git merge slave-dma/next +Auto-merging drivers/dma/ti/k3-udma.c +Auto-merging drivers/dma/moxart-dma.c +Auto-merging drivers/dma/mmp_tdma.c +Auto-merging drivers/dma/dmatest.c +Auto-merging drivers/dma/dmaengine.c +Auto-merging drivers/dma/Kconfig +Removing Documentation/devicetree/bindings/dma/renesas,usb-dmac.txt +Removing Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/stable/sysfs-driver-dma-idxd | 6 + + .../devicetree/bindings/dma/renesas,rcar-dmac.txt | 117 ---------------- + .../devicetree/bindings/dma/renesas,rcar-dmac.yaml | 150 +++++++++++++++++++++ + .../devicetree/bindings/dma/renesas,usb-dmac.txt | 55 -------- + .../devicetree/bindings/dma/renesas,usb-dmac.yaml | 102 ++++++++++++++ + .../devicetree/bindings/dma/st,stm32-dma.yaml | 5 + + drivers/dma/Kconfig | 4 +- + drivers/dma/at_hdmac_regs.h | 2 +- + drivers/dma/at_xdmac.c | 2 +- + drivers/dma/dmaengine.c | 98 +++++++------- + drivers/dma/dmatest.c | 24 ++-- + drivers/dma/dw-edma/dw-edma-core.c | 65 ++++++--- + drivers/dma/dw-edma/dw-edma-core.h | 4 + + drivers/dma/dw-edma/dw-edma-pcie.c | 10 ++ + drivers/dma/idxd/sysfs.c | 11 ++ + drivers/dma/imx-sdma.c | 2 +- + drivers/dma/ioat/dma.c | 85 +++++++----- + drivers/dma/ioat/dma.h | 10 +- + drivers/dma/ioat/init.c | 2 +- + drivers/dma/mmp_tdma.c | 26 +++- + drivers/dma/moxart-dma.c | 2 +- + drivers/dma/qcom/bam_dma.c | 2 +- + drivers/dma/qcom/hidma.c | 3 +- + drivers/dma/sf-pdma/sf-pdma.c | 25 +--- + drivers/dma/stm32-dma.c | 41 ++++-- + drivers/dma/ti/Kconfig | 4 +- + drivers/dma/ti/k3-udma.c | 34 ++--- + 27 files changed, 535 insertions(+), 356 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt + create mode 100644 Documentation/devicetree/bindings/dma/renesas,rcar-dmac.yaml + delete mode 100644 Documentation/devicetree/bindings/dma/renesas,usb-dmac.txt + create mode 100644 Documentation/devicetree/bindings/dma/renesas,usb-dmac.yaml +Merging cgroup/for-next (eec8fd0277e3 device_cgroup: Cleanup cgroup eBPF device filter code) +$ git merge cgroup/for-next +Auto-merging security/device_cgroup.c +Auto-merging include/linux/device_cgroup.h +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_priv.h +Merge made by the 'recursive' strategy. + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 2 +- + fs/xattr.c | 6 +++--- + include/linux/device_cgroup.h | 14 +++++--------- + kernel/cgroup/rstat.c | 16 +++------------- + security/Makefile | 2 +- + security/device_cgroup.c | 19 ++++++++++++++++--- + 6 files changed, 29 insertions(+), 30 deletions(-) +Merging scsi/for-next (8833ab64899e Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Auto-merging include/scsi/scsi_cmnd.h +Auto-merging include/linux/qed/qed_if.h +Auto-merging drivers/target/target_core_transport.c +Auto-merging drivers/scsi/sr.c +Auto-merging drivers/scsi/scsi_lib.c +Auto-merging drivers/scsi/lpfc/lpfc_sli.c +Auto-merging drivers/scsi/lpfc/lpfc_nvmet.c +Auto-merging drivers/scsi/lpfc/lpfc_nvme.c +Auto-merging drivers/scsi/lpfc/lpfc_init.c +Auto-merging drivers/scsi/lpfc/lpfc_hbadisc.c +Auto-merging drivers/scsi/lpfc/lpfc_debugfs.c +Auto-merging drivers/scsi/lpfc/lpfc_ct.c +Auto-merging drivers/scsi/lpfc/lpfc_attr.c +Auto-merging drivers/scsi/lpfc/lpfc.h +Auto-merging drivers/net/ethernet/qlogic/qed/qed_main.c +Auto-merging drivers/net/ethernet/qlogic/qed/qed.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + drivers/message/fusion/mptbase.c | 8 +- + drivers/net/ethernet/qlogic/qed/qed.h | 1 + + drivers/net/ethernet/qlogic/qed/qed_main.c | 9 + + drivers/s390/scsi/zfcp_aux.c | 5 +- + drivers/s390/scsi/zfcp_diag.h | 6 +- + drivers/s390/scsi/zfcp_erp.c | 84 +- + drivers/s390/scsi/zfcp_ext.h | 11 + + drivers/s390/scsi/zfcp_fsf.c | 76 +- + drivers/s390/scsi/zfcp_qdio.c | 19 +- + drivers/s390/scsi/zfcp_scsi.c | 131 +- + drivers/s390/scsi/zfcp_sysfs.c | 16 +- + drivers/scsi/BusLogic.c | 2 +- + drivers/scsi/aacraid/aachba.c | 1 - + drivers/scsi/aacraid/commctrl.c | 12 +- + drivers/scsi/aacraid/commsup.c | 4 +- + drivers/scsi/aacraid/linit.c | 16 +- + drivers/scsi/aic7xxx/aic79xx_core.c | 18 +- + drivers/scsi/aic7xxx/aic7xxx_core.c | 19 +- + drivers/scsi/aic94xx/aic94xx_sds.c | 14 +- + drivers/scsi/bfa/bfa_core.c | 2 +- + drivers/scsi/bfa/bfa_fcpim.c | 4 +- + drivers/scsi/bfa/bfa_fcs_lport.c | 4 +- + drivers/scsi/bfa/bfa_fcs_rport.c | 4 +- + drivers/scsi/bfa/bfa_ioc_ct.c | 4 +- + drivers/scsi/bfa/bfa_svc.c | 7 +- + drivers/scsi/bfa/bfad.c | 2 +- + drivers/scsi/bfa/bfad_attr.c | 4 +- + drivers/scsi/bfa/bfad_bsg.c | 2 +- + drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 4 +- + drivers/scsi/bnx2fc/bnx2fc_io.c | 1 + + drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 7 +- + drivers/scsi/dpt_i2o.c | 2 +- + drivers/scsi/fcoe/fcoe.c | 4 +- + drivers/scsi/fnic/fnic_main.c | 4 +- + drivers/scsi/fnic/fnic_scsi.c | 6 +- + drivers/scsi/fnic/vnic_dev.c | 12 +- + drivers/scsi/fnic/vnic_wq.c | 4 +- + drivers/scsi/gdth.c | 4 +- + drivers/scsi/ipr.c | 5 +- + drivers/scsi/isci/isci.h | 6 +- + drivers/scsi/libsas/sas_ata.c | 1 + + drivers/scsi/lpfc/lpfc.h | 23 +- + drivers/scsi/lpfc/lpfc_attr.c | 108 +- + drivers/scsi/lpfc/lpfc_ct.c | 1 - + drivers/scsi/lpfc/lpfc_debugfs.c | 3 +- + drivers/scsi/lpfc/lpfc_els.c | 10 +- + drivers/scsi/lpfc/lpfc_hbadisc.c | 8 +- + drivers/scsi/lpfc/lpfc_hw4.h | 2 +- + drivers/scsi/lpfc/lpfc_init.c | 82 +- + drivers/scsi/lpfc/lpfc_mbox.c | 3 +- + drivers/scsi/lpfc/lpfc_nvme.c | 37 - + drivers/scsi/lpfc/lpfc_nvmet.c | 8 - + drivers/scsi/lpfc/lpfc_sli.c | 45 +- + drivers/scsi/lpfc/lpfc_sli4.h | 2 +- + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/megaraid/megaraid_mbox.c | 6 +- + drivers/scsi/megaraid/megaraid_sas.h | 8 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 10 +- + drivers/scsi/megaraid/megaraid_sas_fp.c | 12 +- + drivers/scsi/megaraid/megaraid_sas_fusion.c | 81 +- + drivers/scsi/megaraid/megaraid_sas_fusion.h | 6 +- + drivers/scsi/mpt3sas/Makefile | 3 +- + drivers/scsi/mpt3sas/mpt3sas_base.c | 265 ++-- + drivers/scsi/mpt3sas/mpt3sas_base.h | 21 +- + drivers/scsi/mpt3sas/mpt3sas_debugfs.c | 157 ++ + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 8 +- + drivers/scsi/mvsas/mv_init.c | 6 +- + drivers/scsi/pmcraid.c | 4 +- + drivers/scsi/qedf/qedf.h | 6 +- + drivers/scsi/qedf/qedf_els.c | 10 +- + drivers/scsi/qedf/qedf_io.c | 48 +- + drivers/scsi/qedf/qedf_main.c | 135 +- + drivers/scsi/qedi/qedi_iscsi.c | 21 +- + drivers/scsi/qedi/qedi_main.c | 22 +- + drivers/scsi/qla1280.c | 4 +- + drivers/scsi/qla2xxx/qla_attr.c | 37 +- + drivers/scsi/qla2xxx/qla_dbg.c | 40 +- + drivers/scsi/qla2xxx/qla_def.h | 13 +- + drivers/scsi/qla2xxx/qla_gbl.h | 5 +- + drivers/scsi/qla2xxx/qla_init.c | 94 +- + drivers/scsi/qla2xxx/qla_isr.c | 54 +- + drivers/scsi/qla2xxx/qla_mr.c | 5 +- + drivers/scsi/qla2xxx/qla_nx.c | 4 +- + drivers/scsi/qla2xxx/qla_nx2.c | 8 +- + drivers/scsi/qla2xxx/qla_os.c | 9 +- + drivers/scsi/qla2xxx/qla_target.c | 7 +- + drivers/scsi/qla2xxx/qla_tmpl.c | 123 +- + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 2 + + drivers/scsi/qla4xxx/ql4_os.c | 2 +- + drivers/scsi/scsi_debug.c | 2111 ++++++++++++++++++++++----- + drivers/scsi/scsi_lib.c | 203 ++- + drivers/scsi/sgiwd93.c | 2 +- + drivers/scsi/snic/snic.h | 2 +- + drivers/scsi/snic/snic_ctl.c | 5 +- + drivers/scsi/sr.c | 26 +- + drivers/scsi/st.c | 5 +- + drivers/scsi/ufs/ufs-mediatek.c | 25 +- + drivers/scsi/ufs/ufs-qcom.c | 4 +- + drivers/scsi/ufs/ufs-sysfs.c | 50 +- + drivers/scsi/ufs/ufs.h | 46 +- + drivers/scsi/ufs/ufs_quirks.h | 7 + + drivers/scsi/ufs/ufshcd.c | 370 ++++- + drivers/scsi/ufs/ufshcd.h | 33 +- + drivers/scsi/vmw_pvscsi.c | 2 +- + drivers/target/iscsi/iscsi_target_util.c | 30 +- + drivers/target/loopback/tcm_loop.c | 36 +- + drivers/target/target_core_alua.c | 10 +- + drivers/target/target_core_configfs.c | 82 +- + drivers/target/target_core_device.c | 3 +- + drivers/target/target_core_pr.c | 2 +- + drivers/target/target_core_pscsi.c | 6 +- + drivers/target/target_core_tpg.c | 3 +- + drivers/target/target_core_transport.c | 6 +- + drivers/target/target_core_user.c | 23 +- + include/linux/qed/qed_if.h | 1 + + include/scsi/sas.h | 8 +- + include/scsi/scsi_cmnd.h | 1 - + include/target/iscsi/iscsi_target_core.h | 10 - + include/target/target_core_backend.h | 4 +- + include/target/target_core_base.h | 1 + + 121 files changed, 3895 insertions(+), 1339 deletions(-) + create mode 100644 drivers/scsi/mpt3sas/mpt3sas_debugfs.c +Merging scsi-mkp/for-next (f48b285ae658 scsi: ufs-mediatek: Customize WriteBooster flush policy) +$ git merge scsi-mkp/for-next +Auto-merging drivers/scsi/sd.c +Merge made by the 'recursive' strategy. + drivers/scsi/aacraid/commctrl.c | 1 + + drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 1 + + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 1 + + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 1 + + drivers/scsi/sd.c | 3 +++ + drivers/scsi/ufs/ufs-mediatek.c | 7 +++--- + drivers/scsi/ufs/ufs.h | 5 +--- + drivers/scsi/ufs/ufshcd.c | 45 ++++++++++++++-------------------- + drivers/scsi/ufs/ufshcd.h | 9 ++++++- + 9 files changed, 39 insertions(+), 34 deletions(-) +Merging vhost/linux-next (bf338dcc28f3 virtio_net: CTRL_GUEST_OFFLOADS depends on CTRL_VQ) +$ git merge vhost/linux-next +Auto-merging drivers/net/virtio_net.c +Auto-merging drivers/net/caif/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 11 +- + drivers/misc/mic/Kconfig | 2 +- + drivers/net/caif/Kconfig | 2 +- + drivers/net/virtio_net.c | 9 ++ + drivers/vdpa/Kconfig | 2 +- + drivers/vdpa/vdpa_sim/vdpa_sim.c | 15 +- + drivers/vhost/Kconfig | 17 +-- + drivers/vhost/test.c | 2 +- + drivers/vhost/vhost.c | 279 ++++++++++++++++++++++++------------- + drivers/vhost/vhost.h | 23 ++- + drivers/vhost/vringh.c | 6 +- + drivers/virtio/virtio_mmio.c | 4 +- + drivers/virtio/virtio_pci_modern.c | 1 + + include/linux/ptr_ring.h | 79 ++++++++++- + include/linux/vringh.h | 6 +- + include/uapi/linux/virtio_ring.h | 48 +++++-- + 16 files changed, 356 insertions(+), 150 deletions(-) +Merging rpmsg/for-next (4b53f1435f9d Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Auto-merging drivers/soc/qcom/Kconfig +Auto-merging drivers/remoteproc/stm32_rproc.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/remoteproc/ingenic,vpu.yaml | 77 ++++++ + .../devicetree/bindings/remoteproc/qcom,adsp.txt | 12 + + .../devicetree/bindings/remoteproc/qcom,q6v5.txt | 22 +- + MAINTAINERS | 1 + + drivers/hwspinlock/Kconfig | 10 +- + drivers/remoteproc/Kconfig | 9 + + drivers/remoteproc/Makefile | 1 + + drivers/remoteproc/ingenic_rproc.c | 280 +++++++++++++++++++++ + drivers/remoteproc/mtk_scp.c | 4 +- + drivers/remoteproc/qcom_common.c | 17 +- + drivers/remoteproc/qcom_common.h | 5 +- + drivers/remoteproc/qcom_q6v5_adsp.c | 3 +- + drivers/remoteproc/qcom_q6v5_mss.c | 173 +++++-------- + drivers/remoteproc/qcom_q6v5_pas.c | 68 ++++- + drivers/remoteproc/qcom_q6v5_wcss.c | 6 + + drivers/remoteproc/qcom_sysmon.c | 116 +++++++-- + drivers/remoteproc/qcom_wcnss.c | 1 + + drivers/remoteproc/remoteproc_core.c | 243 ++++++++++++++---- + drivers/remoteproc/remoteproc_debugfs.c | 28 +-- + drivers/remoteproc/remoteproc_elf_loader.c | 24 -- + drivers/remoteproc/remoteproc_internal.h | 17 +- + drivers/remoteproc/remoteproc_virtio.c | 15 +- + drivers/remoteproc/st_remoteproc.c | 2 +- + drivers/remoteproc/st_slim_rproc.c | 2 +- + drivers/remoteproc/stm32_rproc.c | 3 +- + drivers/rpmsg/Kconfig | 6 +- + drivers/rpmsg/Makefile | 3 +- + .../qcom/glink_ssr.c => rpmsg/qcom_glink_ssr.c} | 28 ++- + drivers/rpmsg/rpmsg_core.c | 2 +- + drivers/rpmsg/virtio_rpmsg_bus.c | 2 +- + drivers/soc/qcom/Kconfig | 9 - + drivers/soc/qcom/Makefile | 1 - + include/linux/remoteproc.h | 19 +- + include/linux/rpmsg/qcom_glink.h | 3 +- + 34 files changed, 927 insertions(+), 285 deletions(-) + create mode 100644 Documentation/devicetree/bindings/remoteproc/ingenic,vpu.yaml + create mode 100644 drivers/remoteproc/ingenic_rproc.c + rename drivers/{soc/qcom/glink_ssr.c => rpmsg/qcom_glink_ssr.c} (83%) +Merging gpio/for-next (a3bc02eb6fe3 Merge branch 'devel' into for-next) +$ git merge gpio/for-next +Auto-merging drivers/gpio/gpiolib-of.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/gpio/snps-dwapb-gpio.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/gpio/gpio-aggregator.rst | 111 ++++ + Documentation/admin-guide/gpio/index.rst | 1 + + .../devicetree/bindings/gpio/snps,dw-apb-gpio.yaml | 134 +++++ + .../devicetree/bindings/gpio/snps-dwapb-gpio.txt | 65 --- + Documentation/driver-api/gpio/board.rst | 15 +- + MAINTAINERS | 8 + + drivers/gpio/Kconfig | 16 +- + drivers/gpio/Makefile | 1 + + drivers/gpio/TODO | 4 + + drivers/gpio/gpio-aggregator.c | 568 +++++++++++++++++++++ + drivers/gpio/gpio-dwapb.c | 219 ++++---- + drivers/gpio/gpio-exar.c | 7 +- + drivers/gpio/gpio-f7188x.c | 33 +- + drivers/gpio/gpio-ftgpio010.c | 2 +- + drivers/gpio/gpio-ich.c | 2 +- + drivers/gpio/gpio-mb86s7x.c | 28 +- + drivers/gpio/gpio-merrifield.c | 10 +- + drivers/gpio/gpio-mlxbf2.c | 5 +- + drivers/gpio/gpio-mm-lantiq.c | 2 +- + drivers/gpio/gpio-mvebu.c | 15 +- + drivers/gpio/gpio-pca953x.c | 94 ++-- + drivers/gpio/gpio-pch.c | 73 +-- + drivers/gpio/gpio-pl061.c | 9 +- + drivers/gpio/gpio-tegra186.c | 1 + + drivers/gpio/gpio-xgene-sb.c | 14 +- + drivers/gpio/gpiolib-acpi.c | 6 +- + drivers/gpio/gpiolib-devprop.c | 5 +- + drivers/gpio/gpiolib-of.c | 10 + + drivers/gpio/gpiolib.c | 72 ++- + drivers/gpio/gpiolib.h | 27 +- + drivers/mfd/sm501.c | 24 +- + include/linux/gpio/driver.h | 32 +- + include/linux/gpio/machine.h | 17 +- + tools/gpio/lsgpio.c | 12 + + 34 files changed, 1242 insertions(+), 400 deletions(-) + create mode 100644 Documentation/admin-guide/gpio/gpio-aggregator.rst + create mode 100644 Documentation/devicetree/bindings/gpio/snps,dw-apb-gpio.yaml + delete mode 100644 Documentation/devicetree/bindings/gpio/snps-dwapb-gpio.txt + create mode 100644 drivers/gpio/gpio-aggregator.c +Merging gpio-brgl/gpio/for-next (3831c051dfbf tools: gpio: add bias flags to lsgpio) +$ git merge gpio-brgl/gpio/for-next +Already up to date. +Merging gpio-intel/for-next (7e73aa90a38c gpio: merrifield: Better show how GPIO and IRQ bases are derived from hardware) +$ git merge gpio-intel/for-next +Already up to date. +Merging pinctrl/for-next (c22ea274178f Merge branch 'devel' into for-next) +$ git merge pinctrl/for-next +Removing include/linux/spi/mcp23s08.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/freescale/fsl,scu.txt | 6 +- + .../bindings/pinctrl/mscc,ocelot-pinctrl.txt | 4 +- + .../bindings/pinctrl/qcom,sm8250-pinctrl.yaml | 147 +++ + .../bindings/pinctrl/rockchip,pinctrl.txt | 4 +- + MAINTAINERS | 1 + + drivers/pinctrl/Kconfig | 15 +- + drivers/pinctrl/Makefile | 2 + + drivers/pinctrl/freescale/Kconfig | 7 + + drivers/pinctrl/freescale/Makefile | 1 + + drivers/pinctrl/freescale/pinctrl-imx1-core.c | 2 +- + drivers/pinctrl/freescale/pinctrl-imx8dxl.c | 193 +++ + drivers/pinctrl/intel/Kconfig | 8 + + drivers/pinctrl/intel/Makefile | 1 + + drivers/pinctrl/intel/pinctrl-baytrail.c | 9 +- + drivers/pinctrl/intel/pinctrl-cannonlake.c | 58 +- + drivers/pinctrl/intel/pinctrl-cherryview.c | 278 ++-- + drivers/pinctrl/intel/pinctrl-icelake.c | 30 +- + drivers/pinctrl/intel/pinctrl-intel.c | 22 +- + drivers/pinctrl/intel/pinctrl-intel.h | 27 +- + drivers/pinctrl/intel/pinctrl-jasperlake.c | 344 +++++ + drivers/pinctrl/intel/pinctrl-lynxpoint.c | 10 +- + drivers/pinctrl/intel/pinctrl-tigerlake.c | 32 +- + drivers/pinctrl/mediatek/Kconfig | 13 +- + drivers/pinctrl/mediatek/Makefile | 5 +- + drivers/pinctrl/mediatek/mtk-eint.c | 9 + + drivers/pinctrl/mediatek/pinctrl-mt6765.c | 4 + + drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c | 28 + + drivers/pinctrl/mediatek/pinctrl-paris.c | 6 + + drivers/pinctrl/meson/pinctrl-meson.c | 14 + + drivers/pinctrl/nomadik/pinctrl-ab8505.c | 1 + + drivers/pinctrl/nomadik/pinctrl-nomadik-db8500.c | 6 +- + drivers/pinctrl/nomadik/pinctrl-nomadik.c | 4 +- + drivers/pinctrl/pinctrl-bm1880.c | 1 + + drivers/pinctrl/pinctrl-ingenic.c | 21 + + drivers/pinctrl/pinctrl-lantiq.c | 2 +- + drivers/pinctrl/pinctrl-mcp23s08.c | 514 +------- + drivers/pinctrl/pinctrl-mcp23s08.h | 52 + + drivers/pinctrl/pinctrl-mcp23s08_i2c.c | 124 ++ + drivers/pinctrl/pinctrl-mcp23s08_spi.c | 262 ++++ + drivers/pinctrl/pinctrl-ocelot.c | 127 +- + drivers/pinctrl/pinctrl-rk805.c | 4 +- + drivers/pinctrl/pinctrl-rockchip.c | 11 +- + drivers/pinctrl/pinctrl-rza1.c | 2 +- + drivers/pinctrl/pinctrl-stmfx.c | 6 +- + drivers/pinctrl/pinctrl-sx150x.c | 2 +- + drivers/pinctrl/qcom/Kconfig | 9 + + drivers/pinctrl/qcom/Makefile | 1 + + drivers/pinctrl/qcom/pinctrl-msm.c | 1 - + drivers/pinctrl/qcom/pinctrl-sm8250.c | 1361 ++++++++++++++++++++ + drivers/pinctrl/sh-pfc/pfc-sh7269.c | 5 +- + drivers/pinctrl/sprd/pinctrl-sprd.c | 4 +- + drivers/pinctrl/sunxi/pinctrl-sun8i-a23-r.c | 7 +- + drivers/pinctrl/tegra/pinctrl-tegra-xusb.c | 2 +- + drivers/pinctrl/zte/pinctrl-zx.c | 2 +- + include/dt-bindings/pinctrl/pads-imx8dxl.h | 639 +++++++++ + include/linux/spi/mcp23s08.h | 18 - + 56 files changed, 3573 insertions(+), 895 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sm8250-pinctrl.yaml + create mode 100644 drivers/pinctrl/freescale/pinctrl-imx8dxl.c + create mode 100644 drivers/pinctrl/intel/pinctrl-jasperlake.c + create mode 100644 drivers/pinctrl/pinctrl-mcp23s08.h + create mode 100644 drivers/pinctrl/pinctrl-mcp23s08_i2c.c + create mode 100644 drivers/pinctrl/pinctrl-mcp23s08_spi.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-sm8250.c + create mode 100644 include/dt-bindings/pinctrl/pads-imx8dxl.h + delete mode 100644 include/linux/spi/mcp23s08.h +Merging pinctrl-intel/for-next (6d649fca3491 pinctrl: intel: Move npins closer to pin_base in struct intel_community) +$ git merge pinctrl-intel/for-next +Already up to date. +Merging pinctrl-samsung/for-next (f354157a7d18 pinctrl: samsung: Save/restore eint_mask over suspend for EINT_TYPE GPIOs) +$ git merge pinctrl-samsung/for-next +Merge made by the 'recursive' strategy. + drivers/pinctrl/samsung/pinctrl-exynos.c | 82 ++++++++++++++++++++++---------- + 1 file changed, 58 insertions(+), 24 deletions(-) +Merging pwm/for-next (6f0841a8197b pwm: Add support for Azoteq IQS620A PWM generator) +$ git merge pwm/for-next +Auto-merging Documentation/devicetree/bindings/pwm/renesas,pwm-rcar.yaml +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pwm/renesas,pwm-rcar.yaml | 1 + + drivers/pwm/Kconfig | 10 + + drivers/pwm/Makefile | 1 + + drivers/pwm/core.c | 2 +- + drivers/pwm/pwm-iqs620a.c | 270 +++++++++++++++++++++ + 5 files changed, 283 insertions(+), 1 deletion(-) + create mode 100644 drivers/pwm/pwm-iqs620a.c +Merging userns/for-next (8d243345fa85 Merge proc-next and exec-next for testing in linux-next) +$ git merge userns/for-next +Auto-merging kernel/events/core.c +Auto-merging include/linux/rculist.h +Auto-merging include/linux/proc_fs.h +Auto-merging include/linux/pid.h +Auto-merging fs/proc_namespace.c +Auto-merging fs/proc/base.c +Auto-merging fs/locks.c +Auto-merging fs/exec.c +Auto-merging fs/binfmt_elf_fdpic.c +Auto-merging fs/binfmt_elf.c +Auto-merging Documentation/filesystems/proc.rst +Merge made by the 'recursive' strategy. + Documentation/filesystems/proc.rst | 92 ++++++++-- + Documentation/trace/ftrace.rst | 2 +- + arch/x86/ia32/ia32_aout.c | 4 +- + fs/binfmt_aout.c | 3 +- + fs/binfmt_elf.c | 3 +- + fs/binfmt_elf_fdpic.c | 3 +- + fs/binfmt_flat.c | 4 +- + fs/exec.c | 202 ++++++++++----------- + fs/locks.c | 4 +- + fs/proc/base.c | 64 ++++--- + fs/proc/generic.c | 9 + + fs/proc/inode.c | 30 ++- + fs/proc/root.c | 131 +++++++++---- + fs/proc/self.c | 6 +- + fs/proc/thread_self.c | 6 +- + fs/proc_namespace.c | 14 +- + include/linux/binfmts.h | 10 +- + include/linux/pid.h | 1 + + include/linux/pid_namespace.h | 12 -- + include/linux/proc_fs.h | 30 ++- + include/linux/rculist.h | 21 +++ + include/linux/sched/signal.h | 11 -- + kernel/events/core.c | 2 +- + kernel/pid.c | 22 ++- + kernel/time/posix-cpu-timers.c | 111 +++++------ + security/tomoyo/realpath.c | 4 +- + tools/testing/selftests/proc/.gitignore | 2 + + tools/testing/selftests/proc/Makefile | 2 + + .../testing/selftests/proc/proc-fsconfig-hidepid.c | 50 +++++ + .../testing/selftests/proc/proc-multiple-procfs.c | 48 +++++ + 30 files changed, 591 insertions(+), 312 deletions(-) + create mode 100644 tools/testing/selftests/proc/proc-fsconfig-hidepid.c + create mode 100644 tools/testing/selftests/proc/proc-multiple-procfs.c +Merging ktest/for-next (1091c8fce8aa ktest: Fix typos in ktest.pl) +$ git merge ktest/for-next +Already up to date. +Merging random/dev (ab9a7e27044b random: avoid warnings for !CONFIG_NUMA builds) +$ git merge random/dev +Already up to date. +Merging kselftest/next (2ef96a5bb12b Linux 5.7-rc5) +$ git merge kselftest/next +Already up to date. +Merging y2038/y2038 (c4e71212a245 Revert "drm/etnaviv: reject timeouts with tv_nsec >= NSEC_PER_SEC") +$ git merge y2038/y2038 +Already up to date. +Merging livepatching/for-next (8631420cac7d Merge branch 'for-5.8/klp-module-fixups' into for-next) +$ git merge livepatching/for-next +Auto-merging kernel/module.c +CONFLICT (content): Merge conflict in kernel/module.c +Auto-merging include/linux/module.h +Removing arch/x86/kernel/livepatch.c +Auto-merging arch/x86/kernel/Makefile +Auto-merging MAINTAINERS +Resolved 'kernel/module.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 29ef974870f0] Merge remote-tracking branch 'livepatching/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/livepatch/module-elf-format.rst | 15 +-- + MAINTAINERS | 4 +- + arch/s390/include/asm/uaccess.h | 2 +- + arch/s390/kernel/module.c | 147 ++++++++++++--------- + arch/s390/mm/maccess.c | 9 +- + arch/um/kernel/um_arch.c | 16 +++ + arch/x86/kernel/Makefile | 1 - + arch/x86/kernel/livepatch.c | 53 -------- + arch/x86/kernel/module.c | 43 ++++++- + include/linux/livepatch.h | 17 ++- + include/linux/module.h | 8 -- + kernel/livepatch/core.c | 178 ++++++++++++++++---------- + kernel/module.c | 26 ++-- + 13 files changed, 283 insertions(+), 236 deletions(-) + delete mode 100644 arch/x86/kernel/livepatch.c +Merging coresight/next (35cfcf2c7a46 coresight: cti: Add CPU idle pm notifer to CTI devices) +$ git merge coresight/next +Auto-merging drivers/hwtracing/coresight/coresight-cti-platform.c +Auto-merging Documentation/trace/coresight/coresight-ect.rst +Merge made by the 'recursive' strategy. + Documentation/trace/coresight/coresight-ect.rst | 5 +- + Documentation/trace/coresight/coresight.rst | 85 ++++++++ + drivers/hwtracing/coresight/Makefile | 3 +- + .../hwtracing/coresight/coresight-cti-platform.c | 11 +- + drivers/hwtracing/coresight/coresight-cti-sysfs.c | 16 +- + drivers/hwtracing/coresight/coresight-cti.c | 232 ++++++++++++++++++++- + drivers/hwtracing/coresight/coresight-cti.h | 8 +- + drivers/hwtracing/coresight/coresight-etb10.c | 2 +- + drivers/hwtracing/coresight/coresight-etm3x.c | 2 +- + .../hwtracing/coresight/coresight-etm4x-sysfs.c | 2 +- + drivers/hwtracing/coresight/coresight-etm4x.c | 33 ++- + drivers/hwtracing/coresight/coresight-platform.c | 91 +++++--- + drivers/hwtracing/coresight/coresight-priv.h | 21 +- + drivers/hwtracing/coresight/coresight-sysfs.c | 204 ++++++++++++++++++ + drivers/hwtracing/coresight/coresight-tmc-etf.c | 16 +- + drivers/hwtracing/coresight/coresight-tmc.c | 2 +- + drivers/hwtracing/coresight/coresight.c | 82 +++++--- + include/linux/coresight.h | 32 ++- + include/linux/cpuhotplug.h | 1 + + 19 files changed, 737 insertions(+), 111 deletions(-) + create mode 100644 drivers/hwtracing/coresight/coresight-sysfs.c +Merging rtc/rtc-next (378252b6e24f rtc: ingenic: Reset regulator register in probe) +$ git merge rtc/rtc-next +Merge made by the 'recursive' strategy. + drivers/rtc/Kconfig | 1 + + drivers/rtc/rtc-88pm860x.c | 6 -- + drivers/rtc/rtc-fsl-ftm-alarm.c | 4 +- + drivers/rtc/rtc-jz4740.c | 173 +++++++++++++++++++--------------------- + drivers/rtc/rtc-lpc24xx.c | 4 +- + drivers/rtc/rtc-max77686.c | 22 +++-- + drivers/rtc/rtc-mc13xxx.c | 4 +- + drivers/rtc/rtc-mt2712.c | 16 +--- + drivers/rtc/rtc-pcf2127.c | 30 ++++--- + drivers/rtc/rtc-rc5t619.c | 4 +- + drivers/rtc/rtc-stmp3xxx.c | 2 +- + include/uapi/linux/rtc.h | 1 + + 12 files changed, 131 insertions(+), 136 deletions(-) +Merging nvdimm/libnvdimm-for-next (f6d2b802f80d Merge branch 'for-5.7/libnvdimm' into libnvdimm-for-next) +$ git merge nvdimm/libnvdimm-for-next +Already up to date. +Merging at24/at24/for-next (8f3d9f354286 Linux 5.7-rc1) +$ git merge at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (1b3fb49ac27b NTB: ntb_test: Fix bug when counting remote files) +$ git merge ntb/ntb-next +Merge made by the 'recursive' strategy. + drivers/ntb/core.c | 9 +- + drivers/ntb/hw/amd/ntb_hw_amd.c | 4 - + drivers/ntb/hw/idt/ntb_hw_idt.c | 6 - + drivers/ntb/hw/intel/Makefile | 2 +- + drivers/ntb/hw/intel/ntb_hw_gen1.c | 49 ++-- + drivers/ntb/hw/intel/ntb_hw_gen3.c | 13 +- + drivers/ntb/hw/intel/ntb_hw_gen3.h | 8 + + drivers/ntb/hw/intel/ntb_hw_gen4.c | 500 ++++++++++++++++++++++++++++++++ + drivers/ntb/hw/intel/ntb_hw_gen4.h | 87 ++++++ + drivers/ntb/hw/intel/ntb_hw_intel.h | 12 + + drivers/ntb/test/ntb_perf.c | 33 ++- + drivers/ntb/test/ntb_pingpong.c | 14 +- + drivers/ntb/test/ntb_tool.c | 9 +- + include/linux/ntb.h | 2 +- + tools/testing/selftests/ntb/ntb_test.sh | 2 +- + 15 files changed, 678 insertions(+), 72 deletions(-) + create mode 100644 drivers/ntb/hw/intel/ntb_hw_gen4.c + create mode 100644 drivers/ntb/hw/intel/ntb_hw_gen4.h +Merging kspp/for-next/kspp (c7527373fe28 gcc-common.h: Update for GCC 10) +$ git merge kspp/for-next/kspp +Already up to date. +Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge cisco/for-next +Already up to date. +Merging gnss/gnss-next (9b5816b56af6 gnss: replace zero-length array with flexible-array) +$ git merge gnss/gnss-next +Merge made by the 'recursive' strategy. + drivers/gnss/serial.h | 2 +- + drivers/gnss/sirf.c | 8 ++++++-- + 2 files changed, 7 insertions(+), 3 deletions(-) +Merging fsi/next (2c01397b71c5 fsi: aspeed: Fix OPB0 byte order register values) +$ git merge fsi/next +Auto-merging drivers/fsi/Kconfig +CONFLICT (content): Merge conflict in drivers/fsi/Kconfig +Resolved 'drivers/fsi/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master fd605f0ed9d8] Merge remote-tracking branch 'fsi/next' +$ git diff -M --stat --summary HEAD^.. +Merging slimbus/for-next (f9a478d658a2 slimbus: core: Fix mismatch in of_node_get/put) +$ git merge slimbus/for-next +Merge made by the 'recursive' strategy. +Merging nvmem/for-next (780a19892c90 nvmem: jz4780-efuse: Use PTR_ERR_OR_ZERO() to simplify code) +$ git merge nvmem/for-next +Merge made by the 'recursive' strategy. +Merging xarray/xarray (27586ca786a7 XArray: Handle retry entries within xas_find_marked) +$ git merge xarray/xarray +Auto-merging drivers/infiniband/core/device.c +Merge made by the 'recursive' strategy. + Documentation/core-api/xarray.rst | 13 +++++++------ + drivers/infiniband/core/device.c | 6 +----- + include/linux/xarray.h | 23 +++++++++++++++++++++- + lib/idr.c | 1 + + lib/test_xarray.c | 20 +++++++++++++++++++ + lib/xarray.c | 39 +++++++++++++++++++++++++++++++------ + tools/testing/radix-tree/idr-test.c | 29 +++++++++++++++++++++++++++ + 7 files changed, 113 insertions(+), 18 deletions(-) +Merging hyperv/hyperv-next (f69bc337f7bd vmbus: Replace zero-length array with flexible-array) +$ git merge hyperv/hyperv-next +Auto-merging include/linux/mod_devicetable.h +Auto-merging drivers/pci/controller/pci-hyperv.c +Auto-merging drivers/hv/vmbus_drv.c +Auto-merging drivers/hv/hv_trace.h +Auto-merging drivers/hv/hv.c +Auto-merging arch/x86/kvm/hyperv.c +Auto-merging arch/x86/include/asm/kvm_host.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + arch/x86/include/asm/hyperv-tlfs.h | 472 +++------------------------------- + arch/x86/include/asm/kvm_host.h | 2 +- + arch/x86/kvm/hyperv.c | 4 +- + drivers/hv/channel.c | 58 +++-- + drivers/hv/channel_mgmt.c | 411 ++++++++++++++++-------------- + drivers/hv/connection.c | 58 +---- + drivers/hv/hv.c | 16 +- + drivers/hv/hv_fcopy.c | 2 +- + drivers/hv/hv_snapshot.c | 2 +- + drivers/hv/hv_trace.h | 25 +- + drivers/hv/hyperv_vmbus.h | 33 ++- + drivers/hv/vmbus_drv.c | 307 ++++++++++++++++------ + drivers/net/hyperv/netvsc.c | 7 +- + drivers/pci/controller/pci-hyperv.c | 44 ++-- + drivers/scsi/storvsc_drv.c | 95 ++++++- + include/asm-generic/hyperv-tlfs.h | 493 ++++++++++++++++++++++++++++++++++++ + include/linux/hyperv.h | 63 ++--- + include/linux/mod_devicetable.h | 2 +- + 19 files changed, 1233 insertions(+), 862 deletions(-) + create mode 100644 include/asm-generic/hyperv-tlfs.h +Merging auxdisplay/auxdisplay (2f920c0f0e29 auxdisplay: charlcd: replace zero-length array with flexible-array member) +$ git merge auxdisplay/auxdisplay +Already up to date. +Merging kgdb/kgdb/for-next (3dc6a1ac3f70 serial: amba-pl011: Support kgdboc_earlycon) +$ git merge kgdb/kgdb/for-next +Auto-merging kernel/debug/debug_core.c +Auto-merging drivers/tty/serial/amba-pl011.c +Auto-merging arch/x86/Kconfig +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 20 ++ + Documentation/dev-tools/kgdb.rst | 24 +++ + arch/x86/Kconfig | 1 + + drivers/tty/serial/8250/8250_early.c | 23 ++ + drivers/tty/serial/amba-pl011.c | 32 +++ + drivers/tty/serial/kgdboc.c | 268 +++++++++++++++++++++--- + drivers/tty/serial/qcom_geni_serial.c | 32 +++ + include/linux/kgdb.h | 8 +- + kernel/debug/debug_core.c | 56 +++-- + lib/Kconfig.kgdb | 18 ++ + 10 files changed, 432 insertions(+), 50 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at f72a7318e052 Merge remote-tracking branch 'hyperv/hyperv-next' +Merging next-20200518 version of kgdb +$ git merge -m next-20200518/kgdb 1137a96f9b5a8615296bd319151896c859ead292 +Auto-merging kernel/debug/debug_core.c +Merge made by the 'recursive' strategy. + include/linux/kgdb.h | 4 ++-- + kernel/debug/debug_core.c | 4 +--- + 2 files changed, 3 insertions(+), 5 deletions(-) +Merging pidfd/for-next (2b40c5db73e2 selftests/pidfd: add pidfd setns tests) +$ git merge pidfd/for-next +Auto-merging kernel/pid_namespace.c +Auto-merging include/linux/proc_fs.h +Auto-merging fs/namespace.c +Merge made by the 'recursive' strategy. + fs/namespace.c | 15 +- + fs/nsfs.c | 5 + + include/linux/mnt_namespace.h | 2 + + include/linux/nsproxy.h | 24 ++ + include/linux/proc_fs.h | 2 + + include/linux/proc_ns.h | 4 +- + ipc/namespace.c | 7 +- + kernel/cgroup/namespace.c | 5 +- + kernel/nsproxy.c | 305 +++++++++++++-- + kernel/pid_namespace.c | 5 +- + kernel/time/namespace.c | 5 +- + kernel/user_namespace.c | 8 +- + kernel/utsname.c | 5 +- + net/core/net_namespace.c | 5 +- + tools/testing/selftests/pidfd/.gitignore | 1 + + tools/testing/selftests/pidfd/Makefile | 3 +- + tools/testing/selftests/pidfd/config | 6 + + tools/testing/selftests/pidfd/pidfd_setns_test.c | 473 +++++++++++++++++++++++ + 18 files changed, 833 insertions(+), 47 deletions(-) + create mode 100644 tools/testing/selftests/pidfd/config + create mode 100644 tools/testing/selftests/pidfd/pidfd_setns_test.c +Merging devfreq/devfreq-next (869cad3992bf PM / devfreq: Use lockdep asserts instead of manual checks for locked mutex) +$ git merge devfreq/devfreq-next +Merge made by the 'recursive' strategy. + drivers/devfreq/Kconfig | 8 ++ + drivers/devfreq/Makefile | 1 + + drivers/devfreq/devfreq.c | 19 ++-- + drivers/devfreq/imx-bus.c | 179 ++++++++++++++++++++++++++++++++++++++ + drivers/devfreq/tegra30-devfreq.c | 7 +- + 5 files changed, 199 insertions(+), 15 deletions(-) + create mode 100644 drivers/devfreq/imx-bus.c +Merging hmm/hmm (f76c1477c6ed MAINTAINERS: add HMM selftests) +$ git merge hmm/hmm +Auto-merging lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/vm/hmm.rst | 30 +- + MAINTAINERS | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 56 +- + drivers/gpu/drm/nouveau/nouveau_dmem.c | 27 +- + drivers/gpu/drm/nouveau/nouveau_dmem.h | 3 +- + drivers/gpu/drm/nouveau/nouveau_svm.c | 94 ++- + include/linux/hmm.h | 111 +-- + lib/Kconfig.debug | 13 + + lib/Makefile | 1 + + lib/test_hmm.c | 1162 ++++++++++++++++++++++++++ + lib/test_hmm_uapi.h | 59 ++ + mm/hmm.c | 185 ++--- + tools/testing/selftests/vm/.gitignore | 1 + + tools/testing/selftests/vm/Makefile | 3 + + tools/testing/selftests/vm/config | 2 + + tools/testing/selftests/vm/hmm-tests.c | 1359 +++++++++++++++++++++++++++++++ + tools/testing/selftests/vm/run_vmtests | 16 + + tools/testing/selftests/vm/test_hmm.sh | 97 +++ + 18 files changed, 2932 insertions(+), 289 deletions(-) + create mode 100644 lib/test_hmm.c + create mode 100644 lib/test_hmm_uapi.h + create mode 100644 tools/testing/selftests/vm/hmm-tests.c + create mode 100755 tools/testing/selftests/vm/test_hmm.sh +Merging fpga/for-next (a2b9d4eadb77 fpga: dfl: afu: support debug access to memory-mapped afu regions) +$ git merge fpga/for-next +Already up to date. +Merging kunit/test (0e698dfa2822 Linux 5.7-rc4) +$ git merge kunit/test +Already up to date. +Merging cel/cel-next (0a8e7b7d0846 SUNRPC: Revert 241b1f419f0e ("SUNRPC: Remove xdr_buf_trim()")) +$ git merge cel/cel-next +Already up to date. +Merging generic-ioremap/for-next (4bdc0d676a64 remove ioremap_nocache and devm_ioremap_nocache) +$ git merge generic-ioremap/for-next +Already up to date. +Merging cfi/cfi/next (b359ed5184ae mtd: cfi_cmdset_0001: Support the absence of protection registers) +$ git merge cfi/cfi/next +Merge made by the 'recursive' strategy. + drivers/mtd/chips/cfi_cmdset_0001.c | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) +Merging kunit-next/kunit (45ba7a893ad8 kunit: kunit_tool: Separate out config/build/exec/parse) +$ git merge kunit-next/kunit +Merge made by the 'recursive' strategy. + tools/testing/kunit/kunit.py | 293 ++++++++++++++++++++++++++------- + tools/testing/kunit/kunit_tool_test.py | 63 ++++++- + 2 files changed, 296 insertions(+), 60 deletions(-) +Merging trivial/for-next (c1a371cf80fb printk: fix global comment) +$ git merge trivial/for-next +Auto-merging lib/bitmap.c +Auto-merging kernel/printk/printk_safe.c +Merge made by the 'recursive' strategy. + fs/vboxsf/dir.c | 2 +- + kernel/printk/printk_safe.c | 2 +- + lib/bitmap.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) +Merging zx2c4/for-next (16fbf79b0f83 Linux 5.6-rc7) +$ git merge zx2c4/for-next +Already up to date. +Merging mhi/mhi-next (3781a7a11294 bus: mhi: core: Handle syserr during power_up) +$ git merge mhi/mhi-next +Auto-merging include/linux/mhi.h +Auto-merging drivers/bus/mhi/core/pm.c +Auto-merging drivers/bus/mhi/core/main.c +Auto-merging drivers/bus/mhi/core/internal.h +Auto-merging drivers/bus/mhi/core/init.c +Merge made by the 'recursive' strategy. + drivers/bus/mhi/core/boot.c | 75 ++++++++-------- + drivers/bus/mhi/core/init.c | 8 +- + drivers/bus/mhi/core/internal.h | 9 +- + drivers/bus/mhi/core/main.c | 194 ++++++++++++++++++++++------------------ + drivers/bus/mhi/core/pm.c | 86 ++++++++++++------ + include/linux/mhi.h | 4 - + 6 files changed, 217 insertions(+), 159 deletions(-) +Merging notifications/notifications-pipe-core (0c5c93119aa0 watch_queue: sample: Display superblock notifications) +$ git merge notifications/notifications-pipe-core +Auto-merging security/smack/smack_lsm.c +Auto-merging security/selinux/hooks.c +Auto-merging samples/Makefile +CONFLICT (content): Merge conflict in samples/Makefile +Auto-merging samples/Kconfig +CONFLICT (content): Merge conflict in samples/Kconfig +Auto-merging kernel/Makefile +Auto-merging init/Kconfig +Auto-merging include/uapi/asm-generic/unistd.h +CONFLICT (content): Merge conflict in include/uapi/asm-generic/unistd.h +Auto-merging include/linux/syscalls.h +Auto-merging include/linux/security.h +Auto-merging include/linux/lsm_hooks.h +Auto-merging include/linux/lsm_hook_defs.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/dcache.h +Auto-merging fs/super.c +Auto-merging fs/splice.c +CONFLICT (content): Merge conflict in fs/splice.c +Auto-merging fs/namespace.c +Auto-merging fs/mount.h +CONFLICT (content): Merge conflict in fs/mount.h +Auto-merging fs/io_uring.c +CONFLICT (content): Merge conflict in fs/io_uring.c +Auto-merging fs/internal.h +Auto-merging fs/Kconfig +Auto-merging arch/xtensa/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/xtensa/kernel/syscalls/syscall.tbl +Auto-merging arch/x86/entry/syscalls/syscall_64.tbl +CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_64.tbl +Auto-merging arch/x86/entry/syscalls/syscall_32.tbl +CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_32.tbl +Auto-merging arch/sparc/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/sparc/kernel/syscalls/syscall.tbl +Auto-merging arch/sh/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/sh/kernel/syscalls/syscall.tbl +Auto-merging arch/s390/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/s390/kernel/syscalls/syscall.tbl +Auto-merging arch/powerpc/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/powerpc/kernel/syscalls/syscall.tbl +Auto-merging arch/parisc/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/parisc/kernel/syscalls/syscall.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_o32.tbl +CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_o32.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_n64.tbl +CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_n64.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_n32.tbl +CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_n32.tbl +Auto-merging arch/microblaze/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/microblaze/kernel/syscalls/syscall.tbl +Auto-merging arch/m68k/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/m68k/kernel/syscalls/syscall.tbl +Auto-merging arch/ia64/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/ia64/kernel/syscalls/syscall.tbl +Auto-merging arch/arm64/include/asm/unistd32.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/unistd32.h +Auto-merging arch/arm64/include/asm/unistd.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/unistd.h +Auto-merging arch/arm/tools/syscall.tbl +CONFLICT (content): Merge conflict in arch/arm/tools/syscall.tbl +Auto-merging arch/alpha/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/alpha/kernel/syscalls/syscall.tbl +Auto-merging Documentation/userspace-api/ioctl/ioctl-number.rst +Auto-merging Documentation/security/keys/core.rst +Resolved 'arch/alpha/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/arm/tools/syscall.tbl' using previous resolution. +Resolved 'arch/arm64/include/asm/unistd.h' using previous resolution. +Resolved 'arch/arm64/include/asm/unistd32.h' using previous resolution. +Resolved 'arch/ia64/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/m68k/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/microblaze/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/mips/kernel/syscalls/syscall_n32.tbl' using previous resolution. +Resolved 'arch/mips/kernel/syscalls/syscall_n64.tbl' using previous resolution. +Resolved 'arch/mips/kernel/syscalls/syscall_o32.tbl' using previous resolution. +Resolved 'arch/parisc/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/powerpc/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/s390/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/sh/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/sparc/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/x86/entry/syscalls/syscall_32.tbl' using previous resolution. +Resolved 'arch/x86/entry/syscalls/syscall_64.tbl' using previous resolution. +Resolved 'arch/xtensa/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'fs/io_uring.c' using previous resolution. +Resolved 'fs/mount.h' using previous resolution. +Resolved 'fs/splice.c' using previous resolution. +Resolved 'include/uapi/asm-generic/unistd.h' using previous resolution. +Resolved 'samples/Kconfig' using previous resolution. +Resolved 'samples/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 56e8538bfcc9] Merge remote-tracking branch 'notifications/notifications-pipe-core' +$ git diff -M --stat --summary HEAD^.. + Documentation/security/keys/core.rst | 57 ++ + Documentation/userspace-api/ioctl/ioctl-number.rst | 1 + + Documentation/watch_queue.rst | 361 +++++++++++ + arch/alpha/kernel/syscalls/syscall.tbl | 2 + + arch/arm/tools/syscall.tbl | 2 + + arch/arm64/include/asm/unistd.h | 2 +- + arch/arm64/include/asm/unistd32.h | 4 + + arch/ia64/kernel/syscalls/syscall.tbl | 2 + + arch/m68k/kernel/syscalls/syscall.tbl | 2 + + arch/microblaze/kernel/syscalls/syscall.tbl | 2 + + arch/mips/kernel/syscalls/syscall_n32.tbl | 2 + + arch/mips/kernel/syscalls/syscall_n64.tbl | 2 + + arch/mips/kernel/syscalls/syscall_o32.tbl | 2 + + arch/parisc/kernel/syscalls/syscall.tbl | 2 + + arch/powerpc/kernel/syscalls/syscall.tbl | 2 + + arch/s390/kernel/syscalls/syscall.tbl | 2 + + arch/sh/kernel/syscalls/syscall.tbl | 2 + + arch/sparc/kernel/syscalls/syscall.tbl | 2 + + arch/x86/entry/syscalls/syscall_32.tbl | 2 + + arch/x86/entry/syscalls/syscall_64.tbl | 2 + + arch/xtensa/kernel/syscalls/syscall.tbl | 2 + + fs/Kconfig | 21 + + fs/Makefile | 1 + + fs/internal.h | 1 + + fs/mount.h | 21 + + fs/mount_notify.c | 228 +++++++ + fs/namespace.c | 22 + + fs/pipe.c | 242 +++++--- + fs/splice.c | 15 +- + fs/super.c | 205 +++++++ + include/linux/dcache.h | 1 + + include/linux/fs.h | 62 ++ + include/linux/key.h | 33 +- + include/linux/lsm_audit.h | 1 + + include/linux/lsm_hook_defs.h | 15 + + include/linux/lsm_hooks.h | 26 + + include/linux/pipe_fs_i.h | 27 +- + include/linux/security.h | 46 +- + include/linux/syscalls.h | 4 + + include/linux/watch_queue.h | 127 ++++ + include/uapi/asm-generic/unistd.h | 6 +- + include/uapi/linux/keyctl.h | 2 + + include/uapi/linux/watch_queue.h | 167 ++++++ + init/Kconfig | 12 + + kernel/Makefile | 1 + + kernel/sys_ni.c | 6 + + kernel/watch_queue.c | 659 +++++++++++++++++++++ + samples/Kconfig | 7 + + samples/Makefile | 1 + + samples/watch_queue/Makefile | 7 + + samples/watch_queue/watch_test.c | 267 +++++++++ + security/keys/Kconfig | 9 + + security/keys/compat.c | 3 + + security/keys/gc.c | 5 + + security/keys/internal.h | 38 +- + security/keys/key.c | 38 +- + security/keys/keyctl.c | 115 +++- + security/keys/keyring.c | 20 +- + security/keys/permission.c | 31 +- + security/keys/process_keys.c | 46 +- + security/keys/request_key.c | 4 +- + security/security.c | 36 +- + security/selinux/hooks.c | 51 +- + security/smack/smack_lsm.c | 112 +++- + 64 files changed, 3017 insertions(+), 181 deletions(-) + create mode 100644 Documentation/watch_queue.rst + create mode 100644 fs/mount_notify.c + create mode 100644 include/linux/watch_queue.h + create mode 100644 include/uapi/linux/watch_queue.h + create mode 100644 kernel/watch_queue.c + create mode 100644 samples/watch_queue/Makefile + create mode 100644 samples/watch_queue/watch_test.c +Merging fsinfo/fsinfo-core (702c6a07c77e fsinfo: Add an attribute that lists all the visible mounts in a namespace) +$ git merge fsinfo/fsinfo-core +Auto-merging samples/vfs/Makefile +CONFLICT (content): Merge conflict in samples/vfs/Makefile +Auto-merging include/uapi/asm-generic/unistd.h +Auto-merging include/linux/syscalls.h +Auto-merging include/linux/fs.h +Auto-merging fs/namespace.c +Auto-merging fs/mount.h +Auto-merging fs/internal.h +Auto-merging fs/Kconfig +Auto-merging arch/xtensa/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/xtensa/kernel/syscalls/syscall.tbl +Auto-merging arch/x86/entry/syscalls/syscall_64.tbl +CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_64.tbl +Auto-merging arch/x86/entry/syscalls/syscall_32.tbl +CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_32.tbl +Auto-merging arch/sparc/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/sparc/kernel/syscalls/syscall.tbl +Auto-merging arch/sh/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/sh/kernel/syscalls/syscall.tbl +Auto-merging arch/s390/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/s390/kernel/syscalls/syscall.tbl +Auto-merging arch/powerpc/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/powerpc/kernel/syscalls/syscall.tbl +Auto-merging arch/parisc/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/parisc/kernel/syscalls/syscall.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_o32.tbl +CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_o32.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_n64.tbl +CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_n64.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_n32.tbl +CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_n32.tbl +Auto-merging arch/microblaze/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/microblaze/kernel/syscalls/syscall.tbl +Auto-merging arch/m68k/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/m68k/kernel/syscalls/syscall.tbl +Auto-merging arch/ia64/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/ia64/kernel/syscalls/syscall.tbl +Auto-merging arch/arm64/include/asm/unistd32.h +Auto-merging arch/arm/tools/syscall.tbl +CONFLICT (content): Merge conflict in arch/arm/tools/syscall.tbl +Auto-merging arch/alpha/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/alpha/kernel/syscalls/syscall.tbl +Resolved 'arch/alpha/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/arm/tools/syscall.tbl' using previous resolution. +Resolved 'arch/ia64/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/m68k/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/microblaze/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/mips/kernel/syscalls/syscall_n32.tbl' using previous resolution. +Resolved 'arch/mips/kernel/syscalls/syscall_n64.tbl' using previous resolution. +Resolved 'arch/mips/kernel/syscalls/syscall_o32.tbl' using previous resolution. +Resolved 'arch/parisc/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/powerpc/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/s390/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/sh/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/sparc/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/x86/entry/syscalls/syscall_32.tbl' using previous resolution. +Resolved 'arch/x86/entry/syscalls/syscall_64.tbl' using previous resolution. +Resolved 'arch/xtensa/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'samples/vfs/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master cee6d59a5ad1] Merge remote-tracking branch 'fsinfo/fsinfo-core' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/fsinfo.rst | 574 +++++++++++++++++++ + arch/alpha/kernel/syscalls/syscall.tbl | 1 + + arch/arm/tools/syscall.tbl | 1 + + arch/arm64/include/asm/unistd32.h | 2 + + arch/ia64/kernel/syscalls/syscall.tbl | 1 + + arch/m68k/kernel/syscalls/syscall.tbl | 1 + + arch/microblaze/kernel/syscalls/syscall.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n32.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n64.tbl | 1 + + arch/mips/kernel/syscalls/syscall_o32.tbl | 1 + + arch/parisc/kernel/syscalls/syscall.tbl | 1 + + arch/powerpc/kernel/syscalls/syscall.tbl | 1 + + arch/s390/kernel/syscalls/syscall.tbl | 1 + + arch/sh/kernel/syscalls/syscall.tbl | 1 + + arch/sparc/kernel/syscalls/syscall.tbl | 1 + + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + arch/xtensa/kernel/syscalls/syscall.tbl | 1 + + fs/Kconfig | 7 + + fs/Makefile | 1 + + fs/afs/internal.h | 1 + + fs/afs/super.c | 216 ++++++- + fs/d_path.c | 2 +- + fs/ext4/Makefile | 1 + + fs/ext4/ext4.h | 6 + + fs/ext4/fsinfo.c | 97 ++++ + fs/ext4/super.c | 3 + + fs/fsinfo.c | 737 ++++++++++++++++++++++++ + fs/internal.h | 15 + + fs/mount.h | 3 + + fs/mount_notify.c | 2 + + fs/namespace.c | 438 +++++++++++++- + include/linux/fs.h | 4 + + include/linux/fsinfo.h | 112 ++++ + include/linux/syscalls.h | 4 + + include/uapi/asm-generic/unistd.h | 2 + + include/uapi/linux/fsinfo.h | 335 +++++++++++ + include/uapi/linux/mount.h | 10 +- + kernel/sys_ni.c | 1 + + samples/vfs/Makefile | 2 +- + samples/vfs/test-fsinfo.c | 852 ++++++++++++++++++++++++++++ + samples/vfs/test-mntinfo.c | 279 +++++++++ + 42 files changed, 3714 insertions(+), 8 deletions(-) + create mode 100644 Documentation/filesystems/fsinfo.rst + create mode 100644 fs/ext4/fsinfo.c + create mode 100644 fs/fsinfo.c + create mode 100644 include/linux/fsinfo.h + create mode 100644 include/uapi/linux/fsinfo.h + create mode 100644 samples/vfs/test-fsinfo.c + create mode 100644 samples/vfs/test-mntinfo.c +$ git am -3 ../patches/0001-extra-syscall-updates.patch +Applying: extra syscall updates +$ git reset HEAD^ +Unstaged changes after reset: +M arch/arm64/include/asm/unistd.h +M arch/arm64/include/asm/unistd32.h +M include/uapi/asm-generic/unistd.h +$ git add -A . +$ git commit -v -a --amend +[master e6b4656be07a] Merge remote-tracking branch 'fsinfo/fsinfo-core' + Date: Wed May 20 01:11:28 2020 +1000 +Merging akpm-current/current (e051d3cd65e7 ipc-convert-ipcs_idr-to-xarray-update-fix) +$ git merge --no-ff akpm-current/current +Removing tools/testing/selftests/x86/pkey-helpers.h +Auto-merging tools/testing/selftests/vm/Makefile +CONFLICT (content): Merge conflict in tools/testing/selftests/vm/Makefile +Auto-merging tools/testing/selftests/vm/.gitignore +Auto-merging security/keys/keyctl.c +Auto-merging security/keys/internal.h +Auto-merging scripts/checkpatch.pl +Auto-merging net/bridge/netfilter/ebtables.c +Auto-merging mm/vmstat.c +Auto-merging mm/util.c +Auto-merging mm/slub.c +Auto-merging mm/slab.h +Auto-merging mm/page_alloc.c +Auto-merging mm/page-writeback.c +Auto-merging mm/mmap.c +Auto-merging mm/hugetlb.c +Auto-merging mm/huge_memory.c +Auto-merging mm/gup.c +Auto-merging mm/compaction.c +Auto-merging mm/Makefile +Auto-merging lib/strncpy_from_user.c +Auto-merging lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging kernel/watchdog.c +Auto-merging kernel/trace/trace.c +Auto-merging kernel/relay.c +Auto-merging kernel/module.c +Auto-merging kernel/kprobes.c +CONFLICT (content): Merge conflict in kernel/kprobes.c +Auto-merging kernel/dma/remap.c +Auto-merging kernel/bpf/syscall.c +Auto-merging kernel/bpf/core.c +Auto-merging ipc/namespace.c +Auto-merging ipc/ipc_sysctl.c +Auto-merging init/Kconfig +Auto-merging include/trace/events/f2fs.h +Auto-merging include/rdma/ib_verbs.h +Auto-merging include/linux/wait.h +Auto-merging include/linux/vmstat.h +Auto-merging include/linux/sched.h +CONFLICT (content): Merge conflict in include/linux/sched.h +Auto-merging include/linux/printk.h +CONFLICT (content): Merge conflict in include/linux/printk.h +Auto-merging include/linux/nmi.h +Auto-merging include/linux/netdevice.h +Auto-merging include/linux/mmzone.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/hugetlb.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/compaction.h +Auto-merging include/linux/binfmts.h +CONFLICT (content): Merge conflict in include/linux/binfmts.h +Auto-merging include/asm-generic/pgtable.h +Auto-merging fs/zonefs/super.c +Auto-merging fs/xfs/xfs_buf.c +Auto-merging fs/sync.c +Auto-merging fs/proc/task_mmu.c +Auto-merging fs/open.c +Auto-merging fs/isofs/inode.c +Auto-merging fs/fuse/file.c +Auto-merging fs/file_table.c +Auto-merging fs/f2fs/f2fs.h +Auto-merging fs/f2fs/data.c +Auto-merging fs/ext4/ext4.h +Auto-merging fs/exfat/inode.c +Auto-merging fs/exec.c +Auto-merging fs/erofs/zdata.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/extent_io.h +Auto-merging fs/btrfs/extent_io.c +Auto-merging fs/block_dev.c +Auto-merging fs/binfmt_elf.c +Auto-merging fs/aio.c +Auto-merging drivers/tty/serial/sh-sci.c +Auto-merging drivers/scsi/sd_zbc.c +Auto-merging drivers/md/dm-bufio.c +Auto-merging block/blk-core.c +Auto-merging arch/x86/mm/tlb.c +Auto-merging arch/x86/mm/kmmio.c +Auto-merging arch/x86/mm/init_64.c +Auto-merging arch/x86/mm/init.c +Auto-merging arch/x86/include/asm/pgtable_types.h +Auto-merging arch/x86/include/asm/kvm_host.h +Auto-merging arch/x86/include/asm/bitops.h +Auto-merging arch/x86/hyperv/hv_init.c +Auto-merging arch/x86/Kconfig.debug +CONFLICT (content): Merge conflict in arch/x86/Kconfig.debug +Auto-merging arch/x86/Kconfig +Auto-merging arch/sparc/mm/srmmu.c +Auto-merging arch/sparc/mm/init_64.c +Auto-merging arch/sh/Kconfig +Auto-merging arch/riscv/mm/init.c +Auto-merging arch/riscv/include/asm/pgtable.h +Auto-merging arch/riscv/Kconfig +CONFLICT (content): Merge conflict in arch/riscv/Kconfig +Auto-merging arch/powerpc/mm/hugetlbpage.c +Auto-merging arch/powerpc/kernel/pci_64.c +Auto-merging arch/powerpc/include/asm/book3s/64/pgtable.h +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/mips/mm/cache.c +Auto-merging arch/mips/include/asm/pgtable.h +Auto-merging arch/mips/Kconfig +Auto-merging arch/arm64/mm/init.c +Auto-merging arch/arm64/include/asm/pgtable.h +Auto-merging arch/arm64/Kconfig +CONFLICT (content): Merge conflict in arch/arm64/Kconfig +Auto-merging arch/arm/configs/omap2plus_defconfig +Auto-merging Makefile +CONFLICT (content): Merge conflict in Makefile +Auto-merging Documentation/filesystems/locking.rst +Removing Documentation/features/vm/numa-memblock/arch-support.txt +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Resolved 'Makefile' using previous resolution. +Resolved 'arch/arm64/Kconfig' using previous resolution. +Resolved 'arch/riscv/Kconfig' using previous resolution. +Resolved 'arch/x86/Kconfig.debug' using previous resolution. +Resolved 'include/linux/binfmts.h' using previous resolution. +Resolved 'include/linux/printk.h' using previous resolution. +Recorded preimage for 'include/linux/sched.h' +Recorded preimage for 'kernel/kprobes.c' +Resolved 'tools/testing/selftests/vm/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'include/linux/sched.h'. +Recorded resolution for 'kernel/kprobes.c'. +[master c6aaabb2e3e1] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/cgroup-v1/memory.rst | 19 +- + Documentation/admin-guide/cgroup-v2.rst | 4 + + Documentation/admin-guide/dynamic-debug-howto.rst | 5 + + Documentation/admin-guide/kernel-parameters.txt | 40 +- + Documentation/admin-guide/mm/hugetlbpage.rst | 35 + + Documentation/admin-guide/mm/transhuge.rst | 7 + + Documentation/core-api/cachetlb.rst | 2 +- + Documentation/dev-tools/kcov.rst | 17 +- + .../debug/debug-vm-pgtable/arch-support.txt | 34 + + .../features/vm/numa-memblock/arch-support.txt | 34 - + Documentation/filesystems/locking.rst | 6 +- + Documentation/filesystems/vfs.rst | 15 + + Documentation/lzo.txt | 8 +- + Documentation/vm/memory-model.rst | 9 +- + Documentation/vm/page_owner.rst | 3 +- + Documentation/vm/slub.rst | 4 +- + Makefile | 2 +- + arch/alpha/mm/init.c | 16 +- + arch/alpha/mm/numa.c | 22 +- + arch/arc/Kconfig | 1 + + arch/arc/include/asm/highmem.h | 18 - + arch/arc/include/asm/hugepage.h | 2 +- + arch/arc/mm/highmem.c | 28 +- + arch/arc/mm/init.c | 41 +- + arch/arm/configs/omap2plus_defconfig | 2 +- + arch/arm/include/asm/highmem.h | 9 - + arch/arm/include/asm/hugetlb.h | 7 +- + arch/arm/include/asm/pgtable-3level.h | 2 +- + arch/arm/mm/highmem.c | 35 +- + arch/arm/mm/init.c | 66 +- + arch/arm64/Kconfig | 3 +- + arch/arm64/Kconfig.debug | 29 - + arch/arm64/include/asm/hugetlb.h | 13 +- + arch/arm64/include/asm/pgtable.h | 5 +- + arch/arm64/include/asm/vmap_stack.h | 6 +- + arch/arm64/mm/hugetlbpage.c | 30 +- + arch/arm64/mm/init.c | 56 +- + arch/arm64/mm/numa.c | 9 +- + arch/c6x/mm/init.c | 8 +- + arch/csky/include/asm/highmem.h | 12 +- + arch/csky/kernel/setup.c | 26 +- + arch/csky/mm/highmem.c | 56 +- + arch/h8300/mm/init.c | 6 +- + arch/hexagon/mm/init.c | 6 +- + arch/ia64/Kconfig | 1 - + arch/ia64/include/asm/hugetlb.h | 5 +- + arch/ia64/mm/contig.c | 2 +- + arch/ia64/mm/discontig.c | 2 +- + arch/m68k/mm/init.c | 6 +- + arch/m68k/mm/mcfmmu.c | 9 +- + arch/m68k/mm/motorola.c | 15 +- + arch/m68k/mm/sun3mmu.c | 10 +- + arch/microblaze/Kconfig | 1 - + arch/microblaze/include/asm/highmem.h | 27 - + arch/microblaze/mm/highmem.c | 16 +- + arch/microblaze/mm/init.c | 5 +- + arch/mips/Kconfig | 1 - + arch/mips/include/asm/highmem.h | 11 +- + arch/mips/include/asm/hugetlb.h | 11 - + arch/mips/include/asm/pgtable.h | 2 +- + arch/mips/loongson64/numa.c | 2 +- + arch/mips/mm/cache.c | 6 +- + arch/mips/mm/highmem.c | 49 +- + arch/mips/mm/init.c | 2 +- + arch/mips/sgi-ip27/ip27-memory.c | 2 +- + arch/nds32/include/asm/highmem.h | 9 - + arch/nds32/mm/highmem.c | 41 +- + arch/nds32/mm/init.c | 11 +- + arch/nios2/mm/init.c | 8 +- + arch/openrisc/mm/init.c | 9 +- + arch/parisc/include/asm/cacheflush.h | 30 +- + arch/parisc/include/asm/hugetlb.h | 10 - + arch/parisc/mm/init.c | 22 +- + arch/powerpc/Kconfig | 11 +- + arch/powerpc/include/asm/book3s/64/pgtable.h | 4 - + arch/powerpc/include/asm/highmem.h | 28 - + arch/powerpc/include/asm/hugetlb.h | 5 +- + arch/powerpc/include/asm/io.h | 10 +- + arch/powerpc/include/asm/pci-bridge.h | 2 +- + arch/powerpc/kernel/irq.c | 5 +- + arch/powerpc/kernel/isa-bridge.c | 28 +- + arch/powerpc/kernel/pci_64.c | 54 +- + arch/powerpc/mm/highmem.c | 21 +- + arch/powerpc/mm/hugetlbpage.c | 30 +- + arch/powerpc/mm/ioremap_64.c | 50 - + arch/powerpc/mm/mem.c | 5 +- + arch/powerpc/platforms/pseries/hotplug-memory.c | 26 +- + arch/riscv/Kconfig | 2 +- + arch/riscv/include/asm/hugetlb.h | 10 - + arch/riscv/include/asm/pgtable.h | 4 +- + arch/riscv/include/asm/ptdump.h | 11 + + arch/riscv/mm/hugetlbpage.c | 24 +- + arch/riscv/mm/init.c | 5 +- + arch/s390/Kconfig | 2 +- + arch/s390/include/asm/hugetlb.h | 8 +- + arch/s390/kernel/setup.c | 9 +- + arch/s390/mm/hugetlbpage.c | 24 +- + arch/s390/mm/init.c | 2 +- + arch/sh/Kconfig | 1 - + arch/sh/include/asm/hugetlb.h | 7 +- + arch/sh/kernel/cpu/sh4/sq.c | 3 +- + arch/sh/mm/init.c | 2 +- + arch/sparc/Kconfig | 10 - + arch/sparc/include/asm/highmem.h | 25 +- + arch/sparc/include/asm/hugetlb.h | 10 - + arch/sparc/mm/highmem.c | 20 +- + arch/sparc/mm/init_64.c | 45 +- + arch/sparc/mm/io-unit.c | 1 - + arch/sparc/mm/iommu.c | 1 - + arch/sparc/mm/srmmu.c | 21 +- + arch/um/kernel/mem.c | 12 +- + arch/unicore32/include/asm/memory.h | 2 +- + arch/unicore32/include/mach/memory.h | 6 +- + arch/unicore32/kernel/pci.c | 14 +- + arch/unicore32/mm/init.c | 43 +- + arch/x86/Kconfig | 12 +- + arch/x86/Kconfig.debug | 27 - + arch/x86/hyperv/hv_init.c | 5 +- + arch/x86/include/asm/bitops.h | 12 +- + arch/x86/include/asm/fixmap.h | 1 - + arch/x86/include/asm/highmem.h | 9 - + arch/x86/include/asm/hugetlb.h | 10 - + arch/x86/include/asm/kvm_host.h | 3 +- + arch/x86/include/asm/pgtable-2level_types.h | 2 + + arch/x86/include/asm/pgtable-3level_types.h | 2 + + arch/x86/include/asm/pgtable.h | 2 +- + arch/x86/include/asm/pgtable_64.h | 6 + + arch/x86/include/asm/pgtable_64_types.h | 2 + + arch/x86/include/asm/pgtable_types.h | 8 +- + arch/x86/include/asm/switch_to.h | 23 - + arch/x86/kernel/irq_64.c | 2 +- + arch/x86/kernel/setup_percpu.c | 6 +- + arch/x86/kvm/svm/sev.c | 3 +- + arch/x86/mm/fault.c | 176 +--- + arch/x86/mm/highmem_32.c | 50 +- + arch/x86/mm/hugetlbpage.c | 23 +- + arch/x86/mm/init.c | 2 +- + arch/x86/mm/init_64.c | 5 + + arch/x86/mm/kmmio.c | 2 +- + arch/x86/mm/numa.c | 11 +- + arch/x86/mm/pti.c | 8 +- + arch/x86/mm/tlb.c | 37 - + arch/xtensa/include/asm/highmem.h | 27 - + arch/xtensa/mm/highmem.c | 22 +- + arch/xtensa/mm/init.c | 8 +- + block/blk-core.c | 1 + + drivers/acpi/apei/ghes.c | 6 - + drivers/base/memory.c | 44 +- + drivers/block/drbd/drbd_bitmap.c | 4 +- + drivers/block/zram/zcomp.c | 7 +- + drivers/dax/dax-private.h | 1 + + drivers/dax/device.c | 1 + + drivers/dax/kmem.c | 42 +- + drivers/gpu/drm/drm_scatter.c | 11 +- + drivers/gpu/drm/etnaviv/etnaviv_dump.c | 4 +- + drivers/gpu/drm/i915/gem/selftests/mock_dmabuf.c | 2 +- + drivers/gpu/drm/ttm/ttm_bo_util.c | 56 +- + drivers/gpu/drm/vmwgfx/vmwgfx_blit.c | 17 +- + drivers/lightnvm/pblk-init.c | 5 +- + drivers/md/dm-bufio.c | 4 +- + drivers/media/common/videobuf2/videobuf2-dma-sg.c | 3 +- + drivers/media/common/videobuf2/videobuf2-vmalloc.c | 3 +- + drivers/mtd/ubi/io.c | 4 +- + drivers/pcmcia/electra_cf.c | 45 +- + drivers/rapidio/devices/rio_mport_cdev.c | 14 +- + drivers/scsi/sd_zbc.c | 3 +- + drivers/staging/android/ion/ion_heap.c | 4 +- + drivers/staging/media/ipu3/ipu3-css-pool.h | 4 +- + drivers/staging/media/ipu3/ipu3-dmamap.c | 30 +- + drivers/tty/serial/sh-sci.c | 2 +- + drivers/tty/vt/keyboard.c | 2 + + drivers/usb/core/hcd.c | 3 + + fs/aio.c | 9 +- + fs/binfmt_elf.c | 6 +- + fs/binfmt_em86.c | 6 +- + fs/binfmt_misc.c | 4 +- + fs/binfmt_script.c | 6 +- + fs/block_dev.c | 7 +- + fs/btrfs/extent_io.c | 43 +- + fs/btrfs/extent_io.h | 3 +- + fs/btrfs/inode.c | 16 +- + fs/buffer.c | 63 +- + fs/erofs/data.c | 39 +- + fs/erofs/decompressor.c | 2 +- + fs/erofs/zdata.c | 29 +- + fs/exec.c | 66 +- + fs/exfat/inode.c | 7 +- + fs/ext2/inode.c | 10 +- + fs/ext4/ext4.h | 5 +- + fs/ext4/inode.c | 21 +- + fs/ext4/readpage.c | 25 +- + fs/ext4/verity.c | 35 +- + fs/f2fs/data.c | 50 +- + fs/f2fs/f2fs.h | 3 - + fs/f2fs/verity.c | 35 +- + fs/fat/fatent.c | 103 +- + fs/fat/inode.c | 13 +- + fs/file_table.c | 1 + + fs/fuse/file.c | 100 +- + fs/gfs2/aops.c | 23 +- + fs/gfs2/dir.c | 9 +- + fs/gfs2/quota.c | 2 +- + fs/hpfs/file.c | 7 +- + fs/iomap/buffered-io.c | 92 +- + fs/iomap/trace.h | 2 +- + fs/isofs/inode.c | 7 +- + fs/jfs/inode.c | 7 +- + fs/mpage.c | 38 +- + fs/nfs/blocklayout/extent_tree.c | 2 +- + fs/nilfs2/inode.c | 15 +- + fs/ntfs/malloc.h | 2 +- + fs/ocfs2/aops.c | 34 +- + fs/ocfs2/dlm/dlmmaster.c | 1 + + fs/ocfs2/ocfs2.h | 4 +- + fs/ocfs2/slot_map.c | 46 +- + fs/ocfs2/super.c | 21 + + fs/omfs/file.c | 7 +- + fs/open.c | 3 +- + fs/proc/array.c | 8 +- + fs/proc/page.c | 40 +- + fs/proc/task_mmu.c | 16 +- + fs/qnx6/inode.c | 7 +- + fs/ramfs/inode.c | 12 + + fs/reiserfs/inode.c | 8 +- + fs/seq_file.c | 7 +- + fs/squashfs/block.c | 273 +++--- + fs/squashfs/decompressor.h | 5 +- + fs/squashfs/decompressor_multi.c | 9 +- + fs/squashfs/decompressor_multi_percpu.c | 17 +- + fs/squashfs/decompressor_single.c | 9 +- + fs/squashfs/lz4_wrapper.c | 17 +- + fs/squashfs/lzo_wrapper.c | 17 +- + fs/squashfs/squashfs.h | 4 +- + fs/squashfs/xz_wrapper.c | 51 +- + fs/squashfs/zlib_wrapper.c | 63 +- + fs/squashfs/zstd_wrapper.c | 64 +- + fs/sync.c | 6 +- + fs/ubifs/debug.c | 2 +- + fs/ubifs/lprops.c | 2 +- + fs/ubifs/lpt_commit.c | 4 +- + fs/ubifs/orphan.c | 2 +- + fs/udf/inode.c | 7 +- + fs/xfs/kmem.c | 2 +- + fs/xfs/xfs_aops.c | 13 +- + fs/xfs/xfs_buf.c | 2 +- + fs/zonefs/super.c | 7 +- + include/asm-generic/5level-fixup.h | 5 +- + include/asm-generic/hugetlb.h | 2 +- + include/asm-generic/pgtable.h | 27 + + include/drm/ttm/ttm_bo_api.h | 4 - + include/linux/binfmts.h | 3 +- + include/linux/bitops.h | 2 +- + include/linux/compaction.h | 9 +- + include/linux/dev_printk.h | 6 +- + include/linux/dynamic_debug.h | 2 +- + include/linux/elfnote.h | 2 +- + include/linux/fs.h | 18 + + include/linux/gfp.h | 7 +- + include/linux/highmem.h | 81 +- + include/linux/hugetlb.h | 16 +- + include/linux/iomap.h | 3 +- + include/linux/ioport.h | 1 + + include/linux/ipc_namespace.h | 12 +- + include/linux/memblock.h | 12 +- + include/linux/memcontrol.h | 128 ++- + include/linux/memory_hotplug.h | 9 +- + include/linux/memremap.h | 6 + + include/linux/mm.h | 106 +- + include/linux/mmzone.h | 25 +- + include/linux/mpage.h | 4 +- + include/linux/net.h | 3 +- + include/linux/netdevice.h | 6 +- + include/linux/nmi.h | 1 + + include/linux/pagemap.h | 156 ++- + include/linux/printk.h | 9 +- + include/linux/sched.h | 11 + + include/linux/seq_file.h | 19 + + include/linux/slab.h | 2 + + include/linux/string.h | 60 +- + include/linux/swap.h | 21 +- + include/linux/vmalloc.h | 49 +- + include/linux/vmstat.h | 1 + + include/linux/wait.h | 4 +- + include/linux/zsmalloc.h | 2 +- + include/rdma/ib_verbs.h | 6 +- + include/trace/events/compaction.h | 22 +- + include/trace/events/erofs.h | 6 +- + include/trace/events/f2fs.h | 6 +- + include/trace/events/huge_memory.h | 3 +- + include/trace/events/vmscan.h | 14 +- + init/Kconfig | 17 +- + ipc/ipc_sysctl.c | 14 +- + ipc/msg.c | 3 +- + ipc/namespace.c | 37 +- + ipc/sem.c | 1 - + ipc/shm.c | 60 +- + ipc/util.c | 175 ++-- + ipc/util.h | 4 +- + kernel/bpf/core.c | 6 +- + kernel/bpf/syscall.c | 25 +- + kernel/dma/remap.c | 48 +- + kernel/events/uprobes.c | 10 +- + kernel/groups.c | 2 +- + kernel/hung_task.c | 44 + + kernel/kcov.c | 266 +++-- + kernel/kexec_file.c | 5 + + kernel/kprobes.c | 33 +- + kernel/module.c | 3 +- + kernel/notifier.c | 1 - + kernel/relay.c | 17 +- + kernel/trace/trace.c | 12 - + kernel/user.c | 2 +- + kernel/watchdog.c | 22 + + kernel/watchdog_hld.c | 1 + + lib/Kconfig.debug | 51 + + lib/Kconfig.twist | 26 + + lib/Makefile | 2 +- + lib/cpumask.c | 102 +- + lib/dynamic_debug.c | 9 +- + lib/flex_proportions.c | 7 +- + lib/ioremap.c | 46 +- + lib/lzo/lzo1x_compress.c | 13 + + lib/math/prime_numbers.c | 10 +- + lib/percpu-refcount.c | 6 +- + lib/strncpy_from_user.c | 1 + + lib/test_kasan.c | 29 +- + lib/test_lockup.c | 2 +- + lib/test_vmalloc.c | 26 +- + lib/ubsan.c | 33 +- + lib/zlib_inflate/inffast.c | 91 +- + mm/Kconfig | 10 +- + mm/Kconfig.debug | 32 + + mm/Makefile | 1 + + mm/compaction.c | 85 +- + mm/debug.c | 56 +- + mm/debug_vm_pgtable.c | 382 ++++++++ + mm/fadvise.c | 6 +- + mm/filemap.c | 45 +- + mm/frontswap.c | 6 +- + mm/gup.c | 65 +- + mm/huge_memory.c | 272 +---- + mm/hugetlb.c | 224 +++-- + mm/internal.h | 37 +- + mm/kasan/common.c | 19 - + mm/kasan/report.c | 22 +- + mm/khugepaged.c | 249 +++-- + mm/ksm.c | 10 +- + mm/list_lru.c | 2 +- + mm/memblock.c | 21 +- + mm/memcontrol.c | 553 ++++------- + mm/memory.c | 55 +- + mm/memory_hotplug.c | 169 ++-- + mm/mempolicy.c | 5 +- + mm/memremap.c | 20 + + mm/migrate.c | 22 +- + mm/mm_init.c | 16 +- + mm/mmap.c | 45 +- + mm/mremap.c | 2 +- + mm/nommu.c | 46 +- + mm/oom_kill.c | 4 +- + mm/page-writeback.c | 2 +- + mm/page_alloc.c | 522 ++++------ + mm/page_owner.c | 7 +- + mm/percpu.c | 2 +- + mm/pgtable-generic.c | 2 +- + mm/readahead.c | 275 +++--- + mm/rmap.c | 53 +- + mm/shmem.c | 104 +- + mm/slab.c | 4 +- + mm/slab.h | 3 +- + mm/slab_common.c | 3 +- + mm/slub.c | 117 ++- + mm/sparse.c | 2 +- + mm/swap_cgroup.c | 6 - + mm/swap_state.c | 94 +- + mm/swapfile.c | 138 ++- + mm/userfaultfd.c | 5 +- + mm/util.c | 20 +- + mm/vmalloc.c | 363 +++---- + mm/vmscan.c | 186 ++-- + mm/vmstat.c | 44 +- + mm/zbud.c | 2 +- + mm/zsmalloc.c | 12 +- + net/bridge/netfilter/ebtables.c | 6 +- + net/ceph/ceph_common.c | 3 +- + scripts/checkpatch.pl | 74 +- + scripts/get_maintainer.pl | 46 +- + scripts/tags.sh | 39 +- + security/keys/internal.h | 11 - + security/keys/keyctl.c | 16 +- + sound/core/memalloc.c | 2 +- + sound/core/pcm_memory.c | 2 +- + tools/testing/selftests/vm/.gitignore | 1 + + tools/testing/selftests/vm/Makefile | 74 ++ + tools/testing/selftests/vm/khugepaged.c | 1035 ++++++++++++++++++++ + tools/testing/selftests/vm/mremap_dontunmap.c | 1 - + tools/testing/selftests/vm/pkey-helpers.h | 225 +++++ + tools/testing/selftests/vm/pkey-powerpc.h | 133 +++ + tools/testing/selftests/vm/pkey-x86.h | 181 ++++ + .../selftests/{x86 => vm}/protection_keys.c | 696 +++++++------ + tools/testing/selftests/vm/write_to_hugetlbfs.c | 2 - + tools/testing/selftests/x86/.gitignore | 1 - + tools/testing/selftests/x86/Makefile | 2 +- + tools/testing/selftests/x86/pkey-helpers.h | 219 ----- + tools/vm/page_owner_sort.c | 5 +- + 405 files changed, 7464 insertions(+), 6127 deletions(-) + create mode 100644 Documentation/features/debug/debug-vm-pgtable/arch-support.txt + delete mode 100644 Documentation/features/vm/numa-memblock/arch-support.txt + create mode 100644 lib/Kconfig.twist + create mode 100644 mm/debug_vm_pgtable.c + create mode 100644 tools/testing/selftests/vm/khugepaged.c + create mode 100644 tools/testing/selftests/vm/pkey-helpers.h + create mode 100644 tools/testing/selftests/vm/pkey-powerpc.h + create mode 100644 tools/testing/selftests/vm/pkey-x86.h + rename tools/testing/selftests/{x86 => vm}/protection_keys.c (74%) + delete mode 100644 tools/testing/selftests/x86/pkey-helpers.h +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +Rebasing (1/139)
Rebasing (2/139)
Rebasing (3/139)
Rebasing (4/139)
Rebasing (5/139)
Rebasing (6/139)
Rebasing (7/139)
Rebasing (8/139)
Rebasing (9/139)
Rebasing (10/139)
Rebasing (11/139)
Rebasing (12/139)
Rebasing (13/139)
Rebasing (14/139)
Rebasing (15/139)
Rebasing (16/139)
Rebasing (17/139)
Rebasing (18/139)
Rebasing (19/139)
Rebasing (20/139)
Rebasing (21/139)
Rebasing (22/139)
Rebasing (23/139)
Rebasing (24/139)
Rebasing (25/139)
Rebasing (26/139)
Rebasing (27/139)
Rebasing (28/139)
Rebasing (29/139)
Rebasing (30/139)
Rebasing (31/139)
Rebasing (32/139)
Rebasing (33/139)
Rebasing (34/139)
Rebasing (35/139)
Rebasing (36/139)
Rebasing (37/139)
Rebasing (38/139)
Rebasing (39/139)
Rebasing (40/139)
Rebasing (41/139)
Rebasing (42/139)
Rebasing (43/139)
Rebasing (44/139)
Rebasing (45/139)
Rebasing (46/139)
Rebasing (47/139)
Rebasing (48/139)
Rebasing (49/139)
Rebasing (50/139)
Rebasing (51/139)
Rebasing (52/139)
Rebasing (53/139)
Rebasing (54/139)
Rebasing (55/139)
Rebasing (56/139)
Rebasing (57/139)
Rebasing (58/139)
Rebasing (59/139)
Rebasing (60/139)
Rebasing (61/139)
Rebasing (62/139)
Rebasing (63/139)
Rebasing (64/139)
Rebasing (65/139)
Rebasing (66/139)
Rebasing (67/139)
Rebasing (68/139)
Rebasing (69/139)
Rebasing (70/139)
Rebasing (71/139)
Rebasing (72/139)
Rebasing (73/139)
Rebasing (74/139)
Rebasing (75/139)
Rebasing (76/139)
Rebasing (77/139)
Rebasing (78/139)
Rebasing (79/139)
Rebasing (80/139)
Rebasing (81/139)
Rebasing (82/139)
Rebasing (83/139)
Rebasing (84/139)
Rebasing (85/139)
Rebasing (86/139)
Rebasing (87/139)
Rebasing (88/139)
Rebasing (89/139)
Rebasing (90/139)
Rebasing (91/139)
Rebasing (92/139)
Rebasing (93/139)
Rebasing (94/139)
Rebasing (95/139)
Rebasing (96/139)
Rebasing (97/139)
Rebasing (98/139)
Rebasing (99/139)
Rebasing (100/139)
Rebasing (101/139)
Rebasing (102/139)
Rebasing (103/139)
Rebasing (104/139)
Rebasing (105/139)
Rebasing (106/139)
Rebasing (107/139)
Rebasing (108/139)
Rebasing (109/139)
Rebasing (110/139)
Rebasing (111/139)
Rebasing (112/139)
Rebasing (113/139)
Rebasing (114/139)
Rebasing (115/139)
Rebasing (116/139)
Rebasing (117/139)
Rebasing (118/139)
Rebasing (119/139)
Rebasing (120/139)
Rebasing (121/139)
Rebasing (122/139)
Rebasing (123/139)
Rebasing (124/139)
Rebasing (125/139)
Rebasing (126/139)
Rebasing (127/139)
Rebasing (128/139)
Rebasing (129/139)
Rebasing (130/139)
Rebasing (131/139)
Rebasing (132/139)
Rebasing (133/139)
Rebasing (134/139)
Rebasing (135/139)
Rebasing (136/139)
Rebasing (137/139)
Rebasing (138/139)
Rebasing (139/139)
[KSuccessfully rebased and updated refs/heads/akpm. +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 799eb5ea91e0...5a3b590e2e7b akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (5a3b590e2e7b drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow) +$ git merge --no-ff akpm/master +Removing mm/mmu_context.c +Removing include/asm-generic/pgtable-nop4d-hack.h +Removing include/asm-generic/5level-fixup.h +Merge made by the 'recursive' strategy. + Documentation/admin-guide/cgroup-v2.rst | 17 +- + Documentation/admin-guide/kernel-parameters.txt | 21 +- + Documentation/admin-guide/sysctl/kernel.rst | 30 +++ + arch/alpha/boot/bootp.c | 1 - + arch/alpha/boot/bootpz.c | 1 - + arch/alpha/boot/main.c | 1 - + arch/alpha/include/asm/io.h | 1 - + arch/alpha/include/asm/pgtable.h | 16 +- + arch/alpha/kernel/process.c | 1 - + arch/alpha/kernel/proto.h | 2 - + arch/alpha/kernel/ptrace.c | 1 - + arch/alpha/kernel/setup.c | 1 - + arch/alpha/kernel/smp.c | 1 - + arch/alpha/kernel/sys_alcor.c | 1 - + arch/alpha/kernel/sys_cabriolet.c | 1 - + arch/alpha/kernel/sys_dp264.c | 1 - + arch/alpha/kernel/sys_eb64p.c | 1 - + arch/alpha/kernel/sys_eiger.c | 1 - + arch/alpha/kernel/sys_jensen.c | 1 - + arch/alpha/kernel/sys_marvel.c | 1 - + arch/alpha/kernel/sys_miata.c | 1 - + arch/alpha/kernel/sys_mikasa.c | 1 - + arch/alpha/kernel/sys_nautilus.c | 1 - + arch/alpha/kernel/sys_noritake.c | 1 - + arch/alpha/kernel/sys_rawhide.c | 1 - + arch/alpha/kernel/sys_ruffian.c | 1 - + arch/alpha/kernel/sys_rx164.c | 1 - + arch/alpha/kernel/sys_sable.c | 1 - + arch/alpha/kernel/sys_sio.c | 1 - + arch/alpha/kernel/sys_sx164.c | 1 - + arch/alpha/kernel/sys_takara.c | 1 - + arch/alpha/kernel/sys_titan.c | 1 - + arch/alpha/kernel/sys_wildfire.c | 1 - + arch/alpha/kernel/syscalls/syscall.tbl | 1 + + arch/alpha/kernel/traps.c | 22 +-- + arch/alpha/mm/init.c | 1 - + arch/arc/include/asm/bug.h | 3 +- + arch/arc/include/asm/pgtable.h | 24 --- + arch/arc/kernel/stacktrace.c | 17 +- + arch/arc/kernel/troubleshoot.c | 2 +- + arch/arc/mm/highmem.c | 12 +- + arch/arc/mm/tlbex.S | 2 +- + arch/arm/include/asm/bug.h | 3 +- + arch/arm/include/asm/efi.h | 1 - + arch/arm/include/asm/fixmap.h | 2 +- + arch/arm/include/asm/idmap.h | 2 +- + arch/arm/include/asm/pgtable-2level.h | 1 + + arch/arm/include/asm/pgtable-3level.h | 7 - + arch/arm/include/asm/pgtable-nommu.h | 3 - + arch/arm/include/asm/pgtable.h | 26 --- + arch/arm/include/asm/traps.h | 3 +- + arch/arm/include/asm/unwind.h | 3 +- + arch/arm/kernel/head.S | 2 +- + arch/arm/kernel/machine_kexec.c | 1 - + arch/arm/kernel/module.c | 1 - + arch/arm/kernel/ptrace.c | 1 - + arch/arm/kernel/smp.c | 1 - + arch/arm/kernel/suspend.c | 2 +- + arch/arm/kernel/traps.c | 39 ++-- + arch/arm/kernel/unwind.c | 5 +- + arch/arm/kernel/vmlinux.lds.S | 2 +- + arch/arm/lib/backtrace-clang.S | 9 +- + arch/arm/lib/backtrace.S | 14 +- + arch/arm/lib/uaccess_with_memcpy.c | 7 +- + arch/arm/mach-ebsa110/core.c | 1 - + arch/arm/mach-footbridge/common.c | 1 - + arch/arm/mach-imx/mm-imx21.c | 1 - + arch/arm/mach-imx/mm-imx27.c | 1 - + arch/arm/mach-imx/mm-imx3.c | 1 - + arch/arm/mach-integrator/core.c | 2 +- + arch/arm/mach-iop32x/i2c.c | 1 - + arch/arm/mach-iop32x/iq31244.c | 1 - + arch/arm/mach-iop32x/iq80321.c | 1 - + arch/arm/mach-iop32x/n2100.c | 1 - + arch/arm/mach-ixp4xx/common.c | 1 - + arch/arm/mach-keystone/platsmp.c | 2 +- + arch/arm/mach-sa1100/assabet.c | 3 +- + arch/arm/mach-sa1100/hackkit.c | 2 +- + arch/arm/mach-tegra/iomap.h | 2 +- + arch/arm/mach-zynq/common.c | 2 +- + arch/arm/mm/copypage-v4mc.c | 1 - + arch/arm/mm/copypage-v6.c | 1 - + arch/arm/mm/copypage-xscale.c | 1 - + arch/arm/mm/dump.c | 30 ++- + arch/arm/mm/fault-armv.c | 8 +- + arch/arm/mm/fault.c | 23 ++- + arch/arm/mm/highmem.c | 4 +- + arch/arm/mm/idmap.c | 5 +- + arch/arm/mm/init.c | 2 +- + arch/arm/mm/ioremap.c | 25 +-- + arch/arm/mm/mm.h | 8 +- + arch/arm/mm/mmu.c | 38 +++- + arch/arm/mm/pageattr.c | 1 - + arch/arm/mm/pgd.c | 40 +++- + arch/arm/mm/proc-arm1020.S | 2 +- + arch/arm/mm/proc-arm1020e.S | 2 +- + arch/arm/mm/proc-arm1022.S | 2 +- + arch/arm/mm/proc-arm1026.S | 2 +- + arch/arm/mm/proc-arm720.S | 2 +- + arch/arm/mm/proc-arm740.S | 2 +- + arch/arm/mm/proc-arm7tdmi.S | 2 +- + arch/arm/mm/proc-arm920.S | 2 +- + arch/arm/mm/proc-arm922.S | 2 +- + arch/arm/mm/proc-arm925.S | 2 +- + arch/arm/mm/proc-arm926.S | 2 +- + arch/arm/mm/proc-arm940.S | 2 +- + arch/arm/mm/proc-arm946.S | 2 +- + arch/arm/mm/proc-arm9tdmi.S | 2 +- + arch/arm/mm/proc-fa526.S | 2 +- + arch/arm/mm/proc-feroceon.S | 2 +- + arch/arm/mm/proc-mohawk.S | 2 +- + arch/arm/mm/proc-sa110.S | 2 +- + arch/arm/mm/proc-sa1100.S | 2 +- + arch/arm/mm/proc-v6.S | 2 +- + arch/arm/mm/proc-v7.S | 2 +- + arch/arm/mm/proc-xsc3.S | 2 +- + arch/arm/mm/proc-xscale.S | 2 +- + arch/arm/mm/pv-fixup-asm.S | 2 +- + arch/arm/tools/syscall.tbl | 1 + + arch/arm64/include/asm/io.h | 2 +- + arch/arm64/include/asm/kernel-pgtable.h | 2 +- + arch/arm64/include/asm/kvm_mmu.h | 12 +- + arch/arm64/include/asm/mmu_context.h | 2 +- + arch/arm64/include/asm/pgalloc.h | 10 +- + arch/arm64/include/asm/pgtable-types.h | 5 +- + arch/arm64/include/asm/pgtable.h | 77 ++++---- + arch/arm64/include/asm/stacktrace.h | 3 +- + arch/arm64/include/asm/stage2_pgtable.h | 50 +++-- + arch/arm64/include/asm/unistd.h | 2 +- + arch/arm64/include/asm/unistd32.h | 2 + + arch/arm64/include/asm/vmap_stack.h | 2 +- + arch/arm64/kernel/acpi.c | 2 +- + arch/arm64/kernel/head.S | 2 +- + arch/arm64/kernel/hibernate.c | 49 ++++- + arch/arm64/kernel/kaslr.c | 2 +- + arch/arm64/kernel/process.c | 2 +- + arch/arm64/kernel/ptrace.c | 1 - + arch/arm64/kernel/smp.c | 1 - + arch/arm64/kernel/suspend.c | 2 +- + arch/arm64/kernel/traps.c | 17 +- + arch/arm64/kernel/vmlinux.lds.S | 1 - + arch/arm64/kvm/mmu.c | 209 +++++++++++++++++--- + arch/arm64/mm/dump.c | 1 - + arch/arm64/mm/fault.c | 10 +- + arch/arm64/mm/hugetlbpage.c | 15 +- + arch/arm64/mm/kasan_init.c | 29 ++- + arch/arm64/mm/mmu.c | 60 +++--- + arch/arm64/mm/pageattr.c | 8 +- + arch/arm64/mm/proc.S | 2 +- + arch/c6x/include/asm/pgtable.h | 3 - + arch/c6x/kernel/traps.c | 16 +- + arch/csky/include/asm/io.h | 2 +- + arch/csky/include/asm/pgtable.h | 33 ---- + arch/csky/kernel/module.c | 1 - + arch/csky/kernel/ptrace.c | 5 +- + arch/csky/kernel/stacktrace.c | 6 +- + arch/csky/mm/fault.c | 2 +- + arch/csky/mm/highmem.c | 2 +- + arch/csky/mm/init.c | 7 +- + arch/csky/mm/tlb.c | 1 - + arch/h8300/include/asm/pgtable.h | 2 - + arch/h8300/kernel/process.c | 1 - + arch/h8300/kernel/setup.c | 1 - + arch/h8300/kernel/signal.c | 1 - + arch/h8300/kernel/traps.c | 12 +- + arch/h8300/mm/fault.c | 1 - + arch/h8300/mm/init.c | 1 - + arch/h8300/mm/memory.c | 1 - + arch/hexagon/include/asm/fixmap.h | 4 - + arch/hexagon/include/asm/pgtable.h | 56 +----- + arch/hexagon/kernel/traps.c | 25 ++- + arch/hexagon/mm/uaccess.c | 2 +- + arch/hexagon/mm/vm_fault.c | 1 - + arch/ia64/include/asm/pgalloc.h | 4 +- + arch/ia64/include/asm/pgtable.h | 49 +---- + arch/ia64/include/asm/ptrace.h | 1 - + arch/ia64/include/asm/uaccess.h | 2 +- + arch/ia64/kernel/efi.c | 1 - + arch/ia64/kernel/entry.S | 2 +- + arch/ia64/kernel/head.S | 3 +- + arch/ia64/kernel/irq_ia64.c | 2 +- + arch/ia64/kernel/ivt.S | 2 +- + arch/ia64/kernel/kprobes.c | 2 +- + arch/ia64/kernel/mca.c | 2 +- + arch/ia64/kernel/mca_asm.S | 2 +- + arch/ia64/kernel/process.c | 17 +- + arch/ia64/kernel/ptrace.c | 1 - + arch/ia64/kernel/relocate_kernel.S | 4 +- + arch/ia64/kernel/setup.c | 2 +- + arch/ia64/kernel/smp.c | 1 - + arch/ia64/kernel/smpboot.c | 1 - + arch/ia64/kernel/syscalls/syscall.tbl | 1 + + arch/ia64/kernel/uncached.c | 2 +- + arch/ia64/kernel/vmlinux.lds.S | 2 +- + arch/ia64/mm/contig.c | 1 - + arch/ia64/mm/fault.c | 8 +- + arch/ia64/mm/hugetlbpage.c | 18 +- + arch/ia64/mm/init.c | 28 ++- + arch/m68k/68000/m68EZ328.c | 2 +- + arch/m68k/68000/m68VZ328.c | 2 +- + arch/m68k/68000/timers.c | 1 - + arch/m68k/amiga/config.c | 1 - + arch/m68k/apollo/config.c | 1 - + arch/m68k/atari/atasound.c | 1 - + arch/m68k/atari/stram.c | 1 - + arch/m68k/bvme6000/config.c | 1 - + arch/m68k/include/asm/mcf_pgtable.h | 63 +----- + arch/m68k/include/asm/motorola_pgalloc.h | 8 +- + arch/m68k/include/asm/motorola_pgtable.h | 84 +------- + arch/m68k/include/asm/pgtable_mm.h | 1 - + arch/m68k/include/asm/pgtable_no.h | 2 - + arch/m68k/include/asm/sun3_pgtable.h | 24 +-- + arch/m68k/include/asm/sun3xflop.h | 2 +- + arch/m68k/kernel/head.S | 2 +- + arch/m68k/kernel/process.c | 1 - + arch/m68k/kernel/ptrace.c | 1 - + arch/m68k/kernel/setup_no.c | 1 - + arch/m68k/kernel/signal.c | 1 - + arch/m68k/kernel/syscalls/syscall.tbl | 1 + + arch/m68k/kernel/traps.c | 13 +- + arch/m68k/kernel/uboot.c | 1 - + arch/m68k/mac/config.c | 1 - + arch/m68k/mm/init.c | 2 +- + arch/m68k/mm/mcfmmu.c | 1 - + arch/m68k/mm/motorola.c | 25 +++ + arch/m68k/mm/sun3kmap.c | 1 - + arch/m68k/mm/sun3mmu.c | 1 - + arch/m68k/mvme147/config.c | 1 - + arch/m68k/mvme16x/config.c | 1 - + arch/m68k/q40/config.c | 1 - + arch/m68k/sun3/config.c | 1 - + arch/m68k/sun3/dvma.c | 1 - + arch/m68k/sun3/mmu_emu.c | 1 - + arch/m68k/sun3/sun3dvma.c | 1 - + arch/m68k/sun3x/dvma.c | 1 - + arch/m68k/sun3x/prom.c | 1 - + arch/microblaze/include/asm/pgalloc.h | 2 +- + arch/microblaze/include/asm/pgtable.h | 23 +-- + arch/microblaze/include/asm/uaccess.h | 2 +- + arch/microblaze/include/asm/unwind.h | 3 +- + arch/microblaze/kernel/hw_exception_handler.S | 2 +- + arch/microblaze/kernel/module.c | 2 +- + arch/microblaze/kernel/setup.c | 2 +- + arch/microblaze/kernel/signal.c | 9 +- + arch/microblaze/kernel/stacktrace.c | 4 +- + arch/microblaze/kernel/syscalls/syscall.tbl | 1 + + arch/microblaze/kernel/traps.c | 12 +- + arch/microblaze/kernel/unwind.c | 40 ++-- + arch/microblaze/mm/fault.c | 1 - + arch/microblaze/mm/init.c | 9 - + arch/microblaze/mm/pgtable.c | 2 +- + arch/mips/fw/arc/memory.c | 1 - + arch/mips/include/asm/fixmap.h | 3 - + arch/mips/include/asm/mach-generic/floppy.h | 1 - + arch/mips/include/asm/mach-jazz/floppy.h | 1 - + arch/mips/include/asm/pgtable-32.h | 22 --- + arch/mips/include/asm/pgtable-64.h | 32 --- + arch/mips/include/asm/pgtable.h | 2 - + arch/mips/jazz/irq.c | 2 +- + arch/mips/jazz/jazzdma.c | 1 - + arch/mips/jazz/setup.c | 2 +- + arch/mips/kernel/module.c | 1 - + arch/mips/kernel/process.c | 1 - + arch/mips/kernel/ptrace.c | 1 - + arch/mips/kernel/ptrace32.c | 1 - + arch/mips/kernel/smp-bmips.c | 1 - + arch/mips/kernel/syscalls/syscall_n32.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n64.tbl | 1 + + arch/mips/kernel/syscalls/syscall_o32.tbl | 1 + + arch/mips/kernel/traps.c | 36 ++-- + arch/mips/kvm/mips.c | 2 +- + arch/mips/kvm/mmu.c | 20 +- + arch/mips/kvm/tlb.c | 1 - + arch/mips/kvm/trap_emul.c | 2 +- + arch/mips/lib/dump_tlb.c | 1 - + arch/mips/lib/r3k_dump_tlb.c | 1 - + arch/mips/mm/c-octeon.c | 1 - + arch/mips/mm/c-r3k.c | 11 +- + arch/mips/mm/c-r4k.c | 11 +- + arch/mips/mm/c-tx39.c | 11 +- + arch/mips/mm/highmem.c | 2 +- + arch/mips/mm/init.c | 1 - + arch/mips/mm/page.c | 1 - + arch/mips/mm/pgtable-32.c | 1 - + arch/mips/mm/pgtable-64.c | 1 - + arch/mips/mm/sc-ip22.c | 1 - + arch/mips/mm/sc-mips.c | 1 - + arch/mips/mm/sc-r5k.c | 1 - + arch/mips/mm/tlb-r3k.c | 1 - + arch/mips/mm/tlb-r4k.c | 1 - + arch/mips/mm/tlbex.c | 2 +- + arch/mips/sgi-ip27/ip27-init.c | 1 - + arch/mips/sgi-ip27/ip27-timer.c | 1 - + arch/mips/sgi-ip32/ip32-memory.c | 1 - + arch/nds32/include/asm/highmem.h | 1 - + arch/nds32/include/asm/pgtable.h | 22 +-- + arch/nds32/kernel/head.S | 2 +- + arch/nds32/kernel/module.c | 2 +- + arch/nds32/kernel/traps.c | 15 +- + arch/nds32/mm/fault.c | 1 - + arch/nds32/mm/init.c | 13 +- + arch/nds32/mm/proc.c | 7 +- + arch/nios2/include/asm/pgtable.h | 27 +-- + arch/nios2/kernel/module.c | 1 - + arch/nios2/kernel/nios2_ksyms.c | 2 +- + arch/nios2/kernel/traps.c | 17 +- + arch/nios2/mm/fault.c | 9 +- + arch/nios2/mm/init.c | 1 - + arch/nios2/mm/ioremap.c | 6 +- + arch/nios2/mm/pgtable.c | 1 - + arch/nios2/mm/tlb.c | 1 - + arch/openrisc/include/asm/io.h | 1 - + arch/openrisc/include/asm/pgtable.h | 34 +--- + arch/openrisc/include/asm/tlbflush.h | 1 - + arch/openrisc/kernel/asm-offsets.c | 1 - + arch/openrisc/kernel/entry.S | 2 +- + arch/openrisc/kernel/head.S | 2 +- + arch/openrisc/kernel/or32_ksyms.c | 2 +- + arch/openrisc/kernel/process.c | 1 - + arch/openrisc/kernel/ptrace.c | 1 - + arch/openrisc/kernel/setup.c | 1 - + arch/openrisc/kernel/traps.c | 13 +- + arch/openrisc/mm/fault.c | 10 +- + arch/openrisc/mm/init.c | 5 +- + arch/openrisc/mm/ioremap.c | 2 +- + arch/openrisc/mm/tlb.c | 1 - + arch/parisc/include/asm/io.h | 2 +- + arch/parisc/include/asm/mmu_context.h | 1 - + arch/parisc/include/asm/pgtable.h | 33 +--- + arch/parisc/kernel/asm-offsets.c | 2 +- + arch/parisc/kernel/entry.S | 2 +- + arch/parisc/kernel/head.S | 2 +- + arch/parisc/kernel/module.c | 1 - + arch/parisc/kernel/pacache.S | 2 +- + arch/parisc/kernel/pci-dma.c | 2 +- + arch/parisc/kernel/pdt.c | 2 +- + arch/parisc/kernel/ptrace.c | 1 - + arch/parisc/kernel/smp.c | 1 - + arch/parisc/kernel/syscalls/syscall.tbl | 1 + + arch/parisc/kernel/traps.c | 24 +-- + arch/parisc/mm/fixmap.c | 6 +- + arch/parisc/mm/init.c | 1 - + arch/powerpc/include/asm/book3s/32/pgtable.h | 21 +- + arch/powerpc/include/asm/book3s/64/hash.h | 4 +- + arch/powerpc/include/asm/book3s/64/pgalloc.h | 4 +- + arch/powerpc/include/asm/book3s/64/pgtable.h | 84 +++----- + arch/powerpc/include/asm/book3s/64/radix.h | 6 +- + arch/powerpc/include/asm/fixmap.h | 2 +- + arch/powerpc/include/asm/io.h | 1 - + arch/powerpc/include/asm/kup.h | 2 +- + arch/powerpc/include/asm/nohash/32/pgtable.h | 21 +- + arch/powerpc/include/asm/nohash/64/pgalloc.h | 2 +- + arch/powerpc/include/asm/nohash/64/pgtable-4k.h | 32 ++- + arch/powerpc/include/asm/nohash/64/pgtable.h | 28 +-- + arch/powerpc/include/asm/nohash/pgtable.h | 2 +- + arch/powerpc/include/asm/pgtable.h | 34 +--- + arch/powerpc/include/asm/tlb.h | 2 +- + arch/powerpc/kernel/asm-offsets.c | 1 - + arch/powerpc/kernel/btext.c | 2 +- + arch/powerpc/kernel/fpu.S | 1 - + arch/powerpc/kernel/head_32.S | 2 +- + arch/powerpc/kernel/head_40x.S | 2 +- + arch/powerpc/kernel/head_44x.S | 2 +- + arch/powerpc/kernel/head_8xx.S | 2 +- + arch/powerpc/kernel/head_fsl_booke.S | 2 +- + arch/powerpc/kernel/io-workarounds.c | 2 +- + arch/powerpc/kernel/irq.c | 2 +- + arch/powerpc/kernel/mce_power.c | 2 +- + arch/powerpc/kernel/paca.c | 2 +- + arch/powerpc/kernel/process.c | 16 +- + arch/powerpc/kernel/prom.c | 2 +- + arch/powerpc/kernel/prom_init.c | 2 +- + arch/powerpc/kernel/rtas_pci.c | 2 +- + arch/powerpc/kernel/setup-common.c | 2 +- + arch/powerpc/kernel/setup_32.c | 2 +- + arch/powerpc/kernel/setup_64.c | 2 +- + arch/powerpc/kernel/signal_32.c | 1 - + arch/powerpc/kernel/signal_64.c | 1 - + arch/powerpc/kernel/smp.c | 2 +- + arch/powerpc/kernel/stacktrace.c | 2 +- + arch/powerpc/kernel/syscalls/syscall.tbl | 1 + + arch/powerpc/kernel/traps.c | 1 - + arch/powerpc/kernel/vdso.c | 1 - + arch/powerpc/kvm/book3s_64_mmu_radix.c | 34 ++-- + arch/powerpc/kvm/book3s_hv_nested.c | 2 +- + arch/powerpc/kvm/book3s_hv_rm_xics.c | 2 +- + arch/powerpc/kvm/book3s_hv_rm_xive.c | 2 +- + arch/powerpc/kvm/fpu.S | 2 +- + arch/powerpc/lib/code-patching.c | 8 +- + arch/powerpc/mm/book3s32/hash_low.S | 2 +- + arch/powerpc/mm/book3s32/mmu.c | 2 +- + arch/powerpc/mm/book3s32/tlb.c | 4 +- + arch/powerpc/mm/book3s64/hash_hugetlbpage.c | 1 - + arch/powerpc/mm/book3s64/hash_native.c | 2 +- + arch/powerpc/mm/book3s64/hash_pgtable.c | 5 +- + arch/powerpc/mm/book3s64/hash_utils.c | 2 +- + arch/powerpc/mm/book3s64/radix_hugetlbpage.c | 1 - + arch/powerpc/mm/book3s64/radix_pgtable.c | 27 ++- + arch/powerpc/mm/book3s64/slb.c | 2 +- + arch/powerpc/mm/book3s64/subpage_prot.c | 8 +- + arch/powerpc/mm/fault.c | 1 - + arch/powerpc/mm/hugetlbpage.c | 29 +-- + arch/powerpc/mm/init-common.c | 2 +- + arch/powerpc/mm/init_32.c | 1 - + arch/powerpc/mm/init_64.c | 1 - + arch/powerpc/mm/kasan/kasan_init_32.c | 10 +- + arch/powerpc/mm/mem.c | 1 - + arch/powerpc/mm/nohash/40x.c | 5 +- + arch/powerpc/mm/nohash/book3e_pgtable.c | 15 +- + arch/powerpc/mm/nohash/fsl_booke.c | 1 - + arch/powerpc/mm/nohash/tlb_low_64e.S | 2 +- + arch/powerpc/mm/pgtable.c | 30 +-- + arch/powerpc/mm/pgtable_32.c | 3 +- + arch/powerpc/mm/pgtable_64.c | 11 +- + arch/powerpc/mm/ptdump/8xx.c | 2 +- + arch/powerpc/mm/ptdump/bats.c | 2 +- + arch/powerpc/mm/ptdump/book3s64.c | 2 +- + arch/powerpc/mm/ptdump/hashpagetable.c | 21 +- + arch/powerpc/mm/ptdump/ptdump.c | 15 +- + arch/powerpc/mm/ptdump/shared.c | 2 +- + arch/powerpc/perf/callchain.c | 1 - + arch/powerpc/perf/callchain_32.c | 1 - + arch/powerpc/perf/callchain_64.c | 1 - + arch/powerpc/platforms/85xx/corenet_generic.c | 2 +- + arch/powerpc/platforms/85xx/mpc85xx_cds.c | 2 +- + arch/powerpc/platforms/85xx/qemu_e500.c | 2 +- + arch/powerpc/platforms/85xx/sbc8548.c | 2 +- + arch/powerpc/platforms/85xx/smp.c | 2 +- + arch/powerpc/platforms/86xx/mpc86xx_smp.c | 2 +- + arch/powerpc/platforms/8xx/cpm1.c | 1 - + arch/powerpc/platforms/8xx/micropatch.c | 1 - + arch/powerpc/platforms/cell/cbe_regs.c | 2 +- + arch/powerpc/platforms/cell/interrupt.c | 2 +- + arch/powerpc/platforms/cell/pervasive.c | 2 +- + arch/powerpc/platforms/cell/setup.c | 1 - + arch/powerpc/platforms/cell/smp.c | 2 +- + arch/powerpc/platforms/cell/spider-pic.c | 2 +- + arch/powerpc/platforms/chrp/pci.c | 2 +- + arch/powerpc/platforms/chrp/setup.c | 1 - + arch/powerpc/platforms/chrp/smp.c | 2 +- + arch/powerpc/platforms/maple/setup.c | 1 - + arch/powerpc/platforms/maple/time.c | 1 - + arch/powerpc/platforms/powermac/setup.c | 1 - + arch/powerpc/platforms/powermac/smp.c | 2 +- + arch/powerpc/platforms/powermac/time.c | 1 - + arch/powerpc/platforms/powernv/vas-fault.c | 4 +- + arch/powerpc/platforms/pseries/lpar.c | 2 +- + arch/powerpc/platforms/pseries/setup.c | 1 - + arch/powerpc/platforms/pseries/smp.c | 2 +- + arch/powerpc/sysdev/cpm2.c | 1 - + arch/powerpc/sysdev/fsl_85xx_cache_sram.c | 2 +- + arch/powerpc/sysdev/mpic.c | 2 +- + arch/powerpc/xmon/xmon.c | 19 +- + arch/riscv/include/asm/fixmap.h | 2 +- + arch/riscv/include/asm/io.h | 2 +- + arch/riscv/include/asm/kasan.h | 2 - + arch/riscv/include/asm/pgtable-64.h | 7 - + arch/riscv/include/asm/pgtable.h | 22 --- + arch/riscv/kernel/module.c | 2 +- + arch/riscv/kernel/setup.c | 1 - + arch/riscv/kernel/soc.c | 2 +- + arch/riscv/kernel/stacktrace.c | 9 +- + arch/riscv/mm/cacheflush.c | 1 - + arch/riscv/mm/init.c | 31 ++- + arch/riscv/mm/kasan_init.c | 2 +- + arch/riscv/mm/pageattr.c | 2 +- + arch/riscv/mm/ptdump.c | 2 +- + arch/s390/boot/ipl_parm.c | 2 +- + arch/s390/boot/kaslr.c | 2 +- + arch/s390/include/asm/hugetlb.h | 2 +- + arch/s390/include/asm/kasan.h | 2 - + arch/s390/include/asm/pgtable.h | 15 +- + arch/s390/include/asm/tlbflush.h | 1 - + arch/s390/kernel/asm-offsets.c | 2 +- + arch/s390/kernel/dumpstack.c | 13 +- + arch/s390/kernel/machine_kexec.c | 1 - + arch/s390/kernel/ptrace.c | 1 - + arch/s390/kernel/syscalls/syscall.tbl | 1 + + arch/s390/kernel/vdso.c | 1 - + arch/s390/kvm/gaccess.c | 2 +- + arch/s390/kvm/kvm-s390.c | 2 +- + arch/s390/kvm/priv.c | 2 +- + arch/s390/mm/dump_pagetables.c | 1 - + arch/s390/mm/extmem.c | 2 +- + arch/s390/mm/fault.c | 1 - + arch/s390/mm/gmap.c | 2 +- + arch/s390/mm/init.c | 1 - + arch/s390/mm/kasan_init.c | 2 +- + arch/s390/mm/pageattr.c | 13 +- + arch/s390/mm/pgtable.c | 1 - + arch/s390/mm/vmem.c | 1 - + arch/sh/include/asm/io.h | 2 +- + arch/sh/include/asm/kdebug.h | 6 +- + arch/sh/include/asm/pgtable-2level.h | 1 - + arch/sh/include/asm/pgtable-3level.h | 8 - + arch/sh/include/asm/pgtable.h | 2 - + arch/sh/include/asm/pgtable_32.h | 26 +-- + arch/sh/include/asm/pgtable_64.h | 27 --- + arch/sh/include/asm/processor_32.h | 2 +- + arch/sh/kernel/dumpstack.c | 36 ++-- + arch/sh/kernel/io_trapped.c | 7 +- + arch/sh/kernel/machine_kexec.c | 1 - + arch/sh/kernel/process_32.c | 2 +- + arch/sh/kernel/process_64.c | 4 +- + arch/sh/kernel/ptrace_32.c | 1 - + arch/sh/kernel/ptrace_64.c | 1 - + arch/sh/kernel/signal_32.c | 1 - + arch/sh/kernel/signal_64.c | 1 - + arch/sh/kernel/syscalls/syscall.tbl | 1 + + arch/sh/kernel/traps.c | 4 +- + arch/sh/kernel/traps_64.c | 1 - + arch/sh/mm/cache-sh3.c | 1 - + arch/sh/mm/cache-sh4.c | 7 +- + arch/sh/mm/cache-sh5.c | 7 +- + arch/sh/mm/cache-sh7705.c | 1 - + arch/sh/mm/fault.c | 66 ++++--- + arch/sh/mm/hugetlbpage.c | 28 ++- + arch/sh/mm/init.c | 15 +- + arch/sh/mm/kmap.c | 5 +- + arch/sh/mm/nommu.c | 1 - + arch/sh/mm/pmb.c | 2 +- + arch/sh/mm/tlbex_32.c | 6 +- + arch/sh/mm/tlbex_64.c | 7 +- + arch/sparc/include/asm/floppy_32.h | 2 +- + arch/sparc/include/asm/highmem.h | 2 +- + arch/sparc/include/asm/ide.h | 2 +- + arch/sparc/include/asm/io-unit.h | 2 +- + arch/sparc/include/asm/pgalloc_32.h | 2 +- + arch/sparc/include/asm/pgalloc_64.h | 2 +- + arch/sparc/include/asm/pgtable_32.h | 34 +--- + arch/sparc/include/asm/pgtable_64.h | 32 +-- + arch/sparc/kernel/cpu.c | 2 +- + arch/sparc/kernel/entry.S | 2 +- + arch/sparc/kernel/head_64.S | 2 +- + arch/sparc/kernel/ktlb.S | 2 +- + arch/sparc/kernel/leon_smp.c | 1 - + arch/sparc/kernel/pci.c | 2 +- + arch/sparc/kernel/process_32.c | 11 +- + arch/sparc/kernel/process_64.c | 3 +- + arch/sparc/kernel/ptrace_32.c | 1 - + arch/sparc/kernel/ptrace_64.c | 1 - + arch/sparc/kernel/setup_32.c | 1 - + arch/sparc/kernel/setup_64.c | 1 - + arch/sparc/kernel/signal32.c | 1 - + arch/sparc/kernel/signal_32.c | 1 - + arch/sparc/kernel/signal_64.c | 1 - + arch/sparc/kernel/smp_32.c | 1 - + arch/sparc/kernel/smp_64.c | 1 - + arch/sparc/kernel/sun4m_irq.c | 2 +- + arch/sparc/kernel/syscalls/syscall.tbl | 1 + + arch/sparc/kernel/trampoline_64.S | 2 +- + arch/sparc/kernel/traps_32.c | 2 +- + arch/sparc/kernel/traps_64.c | 10 +- + arch/sparc/lib/clear_page.S | 2 +- + arch/sparc/lib/copy_page.S | 2 +- + arch/sparc/mm/fault_32.c | 1 - + arch/sparc/mm/fault_64.c | 1 - + arch/sparc/mm/highmem.c | 12 +- + arch/sparc/mm/hugetlbpage.c | 1 - + arch/sparc/mm/init_32.c | 1 - + arch/sparc/mm/init_64.c | 7 +- + arch/sparc/mm/io-unit.c | 11 +- + arch/sparc/mm/iommu.c | 9 +- + arch/sparc/mm/srmmu.c | 45 +---- + arch/sparc/mm/tlb.c | 1 - + arch/sparc/mm/tsb.c | 2 +- + arch/sparc/mm/ultra.S | 2 +- + arch/um/drivers/mconsole_kern.c | 2 +- + arch/um/include/asm/pgtable-3level.h | 4 - + arch/um/include/asm/pgtable.h | 69 ++----- + arch/um/kernel/mem.c | 10 +- + arch/um/kernel/process.c | 1 - + arch/um/kernel/skas/mmu.c | 1 - + arch/um/kernel/skas/uaccess.c | 1 - + arch/um/kernel/sysrq.c | 23 +-- + arch/um/kernel/tlb.c | 1 - + arch/um/kernel/trap.c | 9 +- + arch/um/kernel/um_arch.c | 1 - + arch/unicore32/include/asm/pgtable.h | 20 -- + arch/unicore32/kernel/hibernate.c | 6 +- + arch/unicore32/kernel/hibernate_asm.S | 2 +- + arch/unicore32/kernel/module.c | 1 - + arch/unicore32/kernel/setup.h | 2 +- + arch/unicore32/kernel/traps.c | 34 ++-- + arch/unicore32/lib/backtrace.S | 24 ++- + arch/unicore32/mm/alignment.c | 2 +- + arch/unicore32/mm/fault.c | 1 - + arch/unicore32/mm/mm.h | 10 - + arch/unicore32/mm/proc-ucv2.S | 2 +- + arch/x86/boot/compressed/kaslr_64.c | 2 +- + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 2 + + arch/x86/include/asm/agp.h | 2 +- + arch/x86/include/asm/asm-prototypes.h | 2 +- + arch/x86/include/asm/efi.h | 2 +- + arch/x86/include/asm/iomap.h | 1 - + arch/x86/include/asm/kaslr.h | 2 + + arch/x86/include/asm/pgtable.h | 89 +-------- + arch/x86/include/asm/pgtable_32.h | 11 -- + arch/x86/include/asm/pgtable_64.h | 4 - + arch/x86/include/asm/setup.h | 9 + + arch/x86/include/asm/stacktrace.h | 2 +- + arch/x86/include/asm/xen/hypercall.h | 2 +- + arch/x86/include/asm/xen/page.h | 1 - + arch/x86/kernel/acpi/boot.c | 2 +- + arch/x86/kernel/acpi/sleep.c | 2 +- + arch/x86/kernel/alternative.c | 1 - + arch/x86/kernel/amd_gart_64.c | 3 +- + arch/x86/kernel/apic/apic_numachip.c | 2 +- + arch/x86/kernel/cpu/bugs.c | 2 +- + arch/x86/kernel/cpu/common.c | 2 +- + arch/x86/kernel/cpu/intel.c | 2 +- + arch/x86/kernel/crash_core_32.c | 2 +- + arch/x86/kernel/crash_core_64.c | 2 +- + arch/x86/kernel/doublefault_32.c | 1 - + arch/x86/kernel/dumpstack.c | 9 +- + arch/x86/kernel/early_printk.c | 2 +- + arch/x86/kernel/espfix_64.c | 2 +- + arch/x86/kernel/head64.c | 2 +- + arch/x86/kernel/head_64.S | 2 +- + arch/x86/kernel/i8259.c | 2 +- + arch/x86/kernel/irqinit.c | 2 +- + arch/x86/kernel/kprobes/core.c | 2 +- + arch/x86/kernel/kprobes/opt.c | 2 +- + arch/x86/kernel/machine_kexec_32.c | 1 - + arch/x86/kernel/machine_kexec_64.c | 1 - + arch/x86/kernel/module.c | 1 - + arch/x86/kernel/paravirt.c | 2 +- + arch/x86/kernel/process_32.c | 1 - + arch/x86/kernel/process_64.c | 1 - + arch/x86/kernel/ptrace.c | 1 - + arch/x86/kernel/reboot.c | 2 +- + arch/x86/kernel/smpboot.c | 2 +- + arch/x86/kernel/tboot.c | 1 - + arch/x86/mm/cpu_entry_area.c | 2 +- + arch/x86/mm/debug_pagetables.c | 2 +- + arch/x86/mm/dump_pagetables.c | 1 - + arch/x86/mm/init.c | 22 +++ + arch/x86/mm/init_32.c | 27 +-- + arch/x86/mm/init_64.c | 1 - + arch/x86/mm/ioremap.c | 2 +- + arch/x86/mm/kasan_init_64.c | 1 - + arch/x86/mm/kaslr.c | 35 +--- + arch/x86/mm/mem_encrypt_boot.S | 2 +- + arch/x86/mm/mmio-mod.c | 2 +- + arch/x86/mm/pat/cpa-test.c | 1 - + arch/x86/mm/pat/memtype.c | 1 - + arch/x86/mm/pat/memtype_interval.c | 2 +- + arch/x86/mm/pgtable.c | 1 - + arch/x86/mm/pgtable_32.c | 1 - + arch/x86/mm/pti.c | 1 - + arch/x86/mm/setup_nx.c | 2 +- + arch/x86/platform/efi/efi_32.c | 2 +- + arch/x86/platform/efi/efi_64.c | 1 - + arch/x86/platform/olpc/olpc_ofw.c | 2 +- + arch/x86/power/cpu.c | 2 +- + arch/x86/power/hibernate.c | 2 +- + arch/x86/power/hibernate_32.c | 2 +- + arch/x86/power/hibernate_64.c | 2 +- + arch/x86/realmode/init.c | 2 +- + arch/x86/xen/enlighten_pv.c | 1 - + arch/x86/xen/grant-table.c | 1 - + arch/x86/xen/mmu_pv.c | 2 +- + arch/x86/xen/smp_pv.c | 2 +- + arch/xtensa/include/asm/fixmap.h | 10 +- + arch/xtensa/include/asm/highmem.h | 2 +- + arch/xtensa/include/asm/initialize_mmu.h | 2 +- + arch/xtensa/include/asm/mmu_context.h | 2 +- + arch/xtensa/include/asm/pgtable.h | 20 +- + arch/xtensa/kernel/entry.S | 2 +- + arch/xtensa/kernel/process.c | 1 - + arch/xtensa/kernel/ptrace.c | 1 - + arch/xtensa/kernel/setup.c | 1 - + arch/xtensa/kernel/syscalls/syscall.tbl | 1 + + arch/xtensa/kernel/traps.c | 24 ++- + arch/xtensa/kernel/vectors.S | 2 +- + arch/xtensa/mm/cache.c | 2 +- + arch/xtensa/mm/highmem.c | 2 +- + arch/xtensa/mm/ioremap.c | 2 +- + arch/xtensa/mm/kasan_init.c | 10 +- + arch/xtensa/mm/misc.S | 2 +- + arch/xtensa/mm/mmu.c | 5 +- + drivers/acpi/scan.c | 3 +- + drivers/atm/fore200e.c | 2 +- + drivers/base/power/main.c | 2 +- + drivers/block/z2ram.c | 2 +- + drivers/char/agp/frontend.c | 1 - + drivers/char/agp/generic.c | 1 - + drivers/char/bsr.c | 1 - + drivers/char/mspec.c | 1 - + drivers/firmware/efi/arm-runtime.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 7 +- + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 2 - + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 2 - + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 2 - + drivers/gpu/drm/drm_vm.c | 2 +- + drivers/gpu/drm/i915/gvt/kvmgt.c | 2 +- + drivers/gpu/drm/i915/i915_mm.c | 1 - + drivers/infiniband/hw/qib/qib_file_ops.c | 2 +- + drivers/infiniband/sw/rdmavt/mmap.c | 1 - + drivers/infiniband/sw/rxe/rxe_mmap.c | 1 - + drivers/macintosh/macio-adb.c | 2 +- + drivers/macintosh/mediabay.c | 2 +- + drivers/macintosh/via-pmu.c | 2 +- + drivers/media/pci/bt8xx/bt878.c | 2 +- + drivers/media/pci/bt8xx/btcx-risc.c | 2 +- + drivers/media/pci/bt8xx/bttv-risc.c | 2 +- + drivers/media/platform/davinci/vpbe_display.c | 1 - + drivers/media/platform/sti/delta/delta-ipc.c | 4 +- + drivers/media/v4l2-core/v4l2-common.c | 1 - + drivers/media/v4l2-core/videobuf-dma-sg.c | 2 +- + drivers/media/v4l2-core/videobuf-vmalloc.c | 2 +- + drivers/misc/genwqe/card_utils.c | 2 +- + drivers/misc/sgi-gru/grufault.c | 1 - + drivers/mtd/ubi/ubi.h | 2 +- + drivers/net/ethernet/amd/7990.c | 2 +- + drivers/net/ethernet/amd/hplance.c | 2 +- + drivers/net/ethernet/amd/mvme147.c | 2 +- + drivers/net/ethernet/amd/sun3lance.c | 2 +- + drivers/net/ethernet/amd/sunlance.c | 2 +- + drivers/net/ethernet/apple/bmac.c | 2 +- + drivers/net/ethernet/apple/mace.c | 2 +- + .../net/ethernet/freescale/fs_enet/fs_enet-main.c | 2 +- + drivers/net/ethernet/freescale/fs_enet/mac-fcc.c | 2 +- + drivers/net/ethernet/freescale/fs_enet/mii-fec.c | 2 +- + drivers/net/ethernet/i825xx/82596.c | 2 +- + drivers/net/ethernet/korina.c | 2 +- + drivers/net/ethernet/marvell/pxa168_eth.c | 2 +- + drivers/net/ethernet/natsemi/jazzsonic.c | 2 +- + drivers/net/ethernet/natsemi/macsonic.c | 2 +- + drivers/net/ethernet/natsemi/xtsonic.c | 2 +- + drivers/net/ethernet/sun/sunbmac.c | 2 +- + drivers/net/ethernet/sun/sunhme.c | 1 - + drivers/net/ethernet/sun/sunqe.c | 2 +- + drivers/sbus/char/flash.c | 1 - + drivers/sbus/char/uctrl.c | 1 - + drivers/scsi/53c700.c | 2 +- + drivers/scsi/a2091.c | 1 - + drivers/scsi/a3000.c | 1 - + drivers/scsi/arm/cumana_2.c | 2 +- + drivers/scsi/arm/eesox.c | 2 +- + drivers/scsi/arm/powertec.c | 2 +- + drivers/scsi/dpt_i2o.c | 2 +- + drivers/scsi/gvp11.c | 1 - + drivers/scsi/lasi700.c | 1 - + drivers/scsi/mac53c94.c | 2 +- + drivers/scsi/mesh.c | 2 +- + drivers/scsi/mvme147.c | 1 - + drivers/scsi/qlogicpti.c | 2 +- + drivers/scsi/sni_53c710.c | 1 - + drivers/scsi/zorro_esp.c | 2 +- + drivers/tty/sysrq.c | 2 +- + drivers/usb/gadget/function/f_fs.c | 10 +- + drivers/usb/gadget/legacy/inode.c | 6 +- + drivers/vfio/vfio_iommu_type1.c | 6 +- + drivers/vhost/vhost.c | 8 +- + drivers/video/console/newport_con.c | 1 - + drivers/video/fbdev/acornfb.c | 1 - + drivers/video/fbdev/atafb.c | 1 - + drivers/video/fbdev/cirrusfb.c | 1 - + drivers/video/fbdev/cyber2000fb.c | 1 - + drivers/video/fbdev/fb-puv3.c | 1 - + drivers/video/fbdev/hitfb.c | 1 - + drivers/video/fbdev/neofb.c | 1 - + drivers/video/fbdev/q40fb.c | 1 - + drivers/video/fbdev/savage/savagefb_driver.c | 1 - + drivers/xen/balloon.c | 1 - + drivers/xen/grant-table.c | 1 - + drivers/xen/privcmd.c | 1 - + drivers/xen/xenbus/xenbus_probe.c | 1 - + drivers/xen/xenbus/xenbus_probe_backend.c | 1 - + drivers/xen/xenbus/xenbus_probe_frontend.c | 1 - + fs/aio.c | 1 - + fs/io-wq.c | 15 +- + fs/io_uring.c | 11 +- + fs/proc/array.c | 1 - + fs/proc/meminfo.c | 1 - + fs/proc/nommu.c | 1 - + fs/proc/proc_sysctl.c | 145 ++++++++++++++ + fs/proc/vmcore.c | 1 - + include/asm-generic/5level-fixup.h | 59 ------ + include/asm-generic/io.h | 2 +- + include/asm-generic/pgtable-nop4d-hack.h | 64 ------ + include/asm-generic/pgtable-nopmd.h | 1 + + include/asm-generic/pgtable-nopud.h | 5 +- + include/linux/cache.h | 10 +- + include/linux/compat.h | 4 + + include/linux/crash_dump.h | 3 +- + include/linux/dax.h | 1 - + include/linux/dma-noncoherent.h | 2 +- + include/linux/hmm.h | 2 +- + include/linux/hugetlb.h | 2 +- + include/linux/io-mapping.h | 2 +- + include/linux/kallsyms.h | 4 +- + include/linux/kasan.h | 2 +- + include/linux/kernel.h | 6 + + include/linux/kthread.h | 5 + + include/linux/memcontrol.h | 2 +- + include/linux/mm.h | 13 +- + include/linux/mmu_context.h | 5 - + include/{asm-generic => linux}/pgtable.h | 123 +++++++++++- + include/linux/pid.h | 1 + + include/linux/sched/debug.h | 3 +- + include/linux/sched/sysctl.h | 7 + + include/linux/stacktrace.h | 2 +- + include/linux/syscalls.h | 3 + + include/linux/sysctl.h | 4 + + include/linux/xarray.h | 4 +- + include/uapi/asm-generic/unistd.h | 5 +- + include/xen/arm/page.h | 2 +- + init/init_task.c | 1 - + init/main.c | 2 + + kernel/bpf/syscall.c | 2 +- + kernel/debug/kdb/kdb_bt.c | 15 +- + kernel/exit.c | 18 -- + kernel/fork.c | 1 - + kernel/hung_task.c | 30 +-- + kernel/kthread.c | 61 ++++++ + kernel/locking/lockdep.c | 4 +- + kernel/locking/rtmutex-debug.c | 2 +- + kernel/panic.c | 11 ++ + kernel/pid.c | 17 ++ + kernel/power/snapshot.c | 1 - + kernel/sched/core.c | 8 +- + kernel/sys_ni.c | 2 + + kernel/sysctl.c | 27 ++- + kernel/trace/ftrace.c | 8 +- + kernel/watchdog.c | 38 +--- + lib/dump_stack.c | 2 +- + lib/ioremap.c | 1 - + lib/test_sysctl.c | 13 ++ + mm/Makefile | 2 +- + mm/debug_vm_pgtable.c | 1 - + mm/filemap.c | 20 +- + mm/frontswap.c | 8 +- + mm/gup.c | 1 - + mm/hugetlb.c | 1 - + mm/init-mm.c | 2 +- + mm/kasan/init.c | 11 -- + mm/kmemleak.c | 2 + + mm/list_lru.c | 2 +- + mm/madvise.c | 214 ++++++++++++++++++--- + mm/memory.c | 13 +- + mm/mempool.c | 2 +- + mm/mincore.c | 2 +- + mm/mmap.c | 28 +-- + mm/mmu_context.c | 64 ------ + mm/mprotect.c | 2 +- + mm/oom_kill.c | 6 +- + mm/page_alloc.c | 9 - + mm/page_counter.c | 13 +- + mm/page_io.c | 9 +- + mm/page_reporting.h | 2 +- + mm/pgtable-generic.c | 6 +- + mm/rmap.c | 2 +- + mm/shmem.c | 1 - + mm/sparse-vmemmap.c | 1 - + mm/sparse.c | 1 - + mm/swap.c | 5 +- + mm/swap_state.c | 5 +- + mm/swapfile.c | 32 +-- + mm/util.c | 8 +- + mm/vmacache.c | 5 +- + mm/zsmalloc.c | 2 +- + net/ipv4/tcp.c | 70 ++++++- + sound/core/sgbuf.c | 1 - + sound/pci/hda/hda_intel.c | 2 +- + sound/soc/intel/common/sst-firmware.c | 2 +- + sound/soc/intel/haswell/sst-haswell-pcm.c | 2 +- + tools/include/linux/kallsyms.h | 2 +- + tools/testing/selftests/sysctl/sysctl.sh | 48 ++++- + virt/kvm/kvm_main.c | 1 - + 874 files changed, 2735 insertions(+), 3142 deletions(-) + delete mode 100644 include/asm-generic/5level-fixup.h + delete mode 100644 include/asm-generic/pgtable-nop4d-hack.h + rename include/{asm-generic => linux}/pgtable.h (91%) + delete mode 100644 mm/mmu_context.c |