--- /dev/null
+$ date -R
+Thu, 03 Jun 2021 08:58:19 +1000
+$ git checkout master
+Already on 'master'
+$ git reset --hard stable
+HEAD is now at c2131f7e73c9 Merge tag 'gfs2-v5.13-rc2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2
+Merging origin/master (324c92e5e0ee Merge tag 'efi-urgent-2021-06-02' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
+$ git merge origin/master
+Updating c2131f7e73c9..324c92e5e0ee
+Fast-forward
+ drivers/acpi/acpica/utdelete.c | 8 ++++++
+ drivers/bluetooth/btusb.c | 2 ++
+ drivers/firmware/efi/cper.c | 4 +--
+ drivers/firmware/efi/fdtparams.c | 3 ++
+ drivers/firmware/efi/libstub/file.c | 2 +-
+ drivers/firmware/efi/memattr.c | 5 ----
+ drivers/hid/Kconfig | 19 ++++++++++--
+ drivers/hid/Makefile | 1 +
+ drivers/hid/amd-sfh-hid/amd_sfh_client.c | 19 ++++++------
+ drivers/hid/amd-sfh-hid/amd_sfh_hid.c | 3 --
+ drivers/hid/hid-a4tech.c | 2 ++
+ drivers/hid/hid-asus.c | 32 +++++++++++++--------
+ drivers/hid/hid-core.c | 4 ++-
+ drivers/hid/hid-debug.c | 3 ++
+ drivers/hid/hid-ft260.c | 29 ++++++++++---------
+ drivers/hid/hid-gt683r.c | 1 +
+ drivers/hid/hid-ids.h | 9 ++++--
+ drivers/hid/hid-input.c | 3 ++
+ drivers/hid/hid-logitech-hidpp.c | 1 +
+ drivers/hid/hid-magicmouse.c | 7 +++--
+ drivers/hid/hid-multitouch.c | 46 ++++++++++++++++++++++++------
+ drivers/hid/hid-quirks.c | 4 +++
+ drivers/hid/hid-semitek.c | 40 ++++++++++++++++++++++++++
+ drivers/hid/hid-sensor-custom.c | 8 ++++--
+ drivers/hid/hid-sensor-hub.c | 13 ++++++---
+ drivers/hid/hid-thrustmaster.c | 2 +-
+ drivers/hid/i2c-hid/i2c-hid-core.c | 13 +++++++--
+ drivers/hid/intel-ish-hid/ipc/hw-ish.h | 2 ++
+ drivers/hid/intel-ish-hid/ipc/pci-ish.c | 2 ++
+ drivers/hid/surface-hid/surface_hid_core.c | 6 ++--
+ drivers/hid/usbhid/hid-core.c | 2 +-
+ drivers/hid/usbhid/hid-pidff.c | 1 +
+ drivers/hwmon/dell-smm-hwmon.c | 4 +--
+ drivers/hwmon/pmbus/fsp-3y.c | 32 ++++++++++++++++-----
+ drivers/hwmon/pmbus/isl68137.c | 4 +--
+ drivers/hwmon/pmbus/q54sj108a2.c | 2 +-
+ fs/gfs2/file.c | 4 +--
+ include/linux/hid.h | 3 +-
+ include/uapi/linux/input-event-codes.h | 1 +
+ 39 files changed, 252 insertions(+), 94 deletions(-)
+ create mode 100644 drivers/hid/hid-semitek.c
+Merging fixes/fixes (c06a2ba62fc4 Merge tag 'docs-5.13-3' of git://git.lwn.net/linux)
+$ git merge fixes/fixes
+Already up to date.
+Merging kbuild-current/fixes (c4681547bcce Linux 5.13-rc3)
+$ git merge kbuild-current/fixes
+Already up to date.
+Merging arc-current/for-curr (d07f6ca923ea Linux 5.13-rc2)
+$ git merge arc-current/for-curr
+Already up to date.
+Merging arm-current/fixes (d2f7eca60b29 ARM: 9071/1: uprobes: Don't hook on thumb instructions)
+$ git merge arm-current/fixes
+Already up to date.
+Merging arm64-fixes/for-next/fixes (e69012400b0c arm64: mm: don't use CON and BLK mapping if KFENCE is enabled)
+$ git merge arm64-fixes/for-next/fixes
+Already up to date.
+Merging arm-soc-fixes/arm/fixes (d37316b72e8b ARM: npcm: wpcm450: select interrupt controller driver)
+$ git merge arm-soc-fixes/arm/fixes
+Already up to date.
+Merging drivers-memory-fixes/fixes (6efb943b8616 Linux 5.13-rc1)
+$ git merge drivers-memory-fixes/fixes
+Already up to date.
+Merging m68k-current/for-linus (34e5269bf987 m68k: sun3x: Remove unneeded semicolon)
+$ git merge m68k-current/for-linus
+Already up to date.
+Merging powerpc-fixes/fixes (d72500f99284 powerpc/64s/syscall: Fix ptrace syscall info with scv syscalls)
+$ git merge powerpc-fixes/fixes
+Already up to date.
+Merging s390-fixes/fixes (8124c8a6b353 Linux 5.13-rc4)
+$ git merge s390-fixes/fixes
+Already up to date.
+Merging sparc/master (05a59d79793d Merge git://git.kernel.org:/pub/scm/linux/kernel/git/netdev/net)
+$ git merge sparc/master
+Already up to date.
+Merging fscrypt-current/for-stable (d19d8d345eec fscrypt: fix inline encryption not used on new files)
+$ git merge fscrypt-current/for-stable
+Already up to date.
+Merging net/master (ab00f3e051e8 net: stmmac: fix issue where clk is being unprepared twice)
+$ git merge net/master
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 10 +--
+ .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 12 +++-
+ drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 77 ++++++++++++++++----
+ drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 9 +++
+ .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 3 +-
+ drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c | 3 +
+ .../ethernet/mellanox/mlx5/core/lib/fs_chains.c | 2 +-
+ .../ethernet/mellanox/mlx5/core/lib/fs_chains.h | 5 ++
+ .../ethernet/mellanox/mlx5/core/steering/dr_fw.c | 3 +-
+ drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 1 +
+ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 6 +-
+ drivers/net/virtio_net.c | 20 +++---
+ include/linux/mlx5/mlx5_ifc.h | 2 +
+ include/net/netfilter/nf_tables.h | 6 --
+ include/net/tls.h | 10 ++-
+ net/core/devlink.c | 4 +-
+ net/core/sock.c | 16 +++--
+ net/dsa/tag_8021q.c | 2 +-
+ net/ipv4/ipconfig.c | 13 ++--
+ net/mptcp/protocol.c | 16 ++++-
+ net/mptcp/subflow.c | 79 ++++++++++----------
+ net/netfilter/ipvs/ip_vs_ctl.c | 2 +-
+ net/netfilter/nf_conntrack_proto.c | 2 +-
+ net/netfilter/nf_tables_api.c | 84 +++++++++++++++-------
+ net/nfc/llcp_sock.c | 2 +
+ net/sched/act_ct.c | 10 ++-
+ net/tls/tls_device.c | 60 +++++++++++++---
+ net/tls/tls_device_fallback.c | 7 ++
+ net/tls/tls_main.c | 1 +
+ tools/testing/selftests/net/mptcp/mptcp_connect.sh | 13 ++--
+ 30 files changed, 331 insertions(+), 149 deletions(-)
+Merging bpf/master (ff40e51043af bpf, lockdown, audit: Fix buggy SELinux lockdown permission checks)
+$ git merge bpf/master
+Merge made by the 'recursive' strategy.
+ kernel/bpf/helpers.c | 7 +++++--
+ kernel/trace/bpf_trace.c | 32 ++++++++++++--------------------
+ scripts/Makefile.modfinal | 2 +-
+ scripts/link-vmlinux.sh | 2 +-
+ 4 files changed, 19 insertions(+), 24 deletions(-)
+Merging ipsec/master (b515d2637276 xfrm: xfrm_state_mtu should return at least 1280 for ipv6)
+$ git merge ipsec/master
+Auto-merging net/ipv6/esp6.c
+Auto-merging net/ipv4/esp4.c
+Merge made by the 'recursive' strategy.
+ include/net/xfrm.h | 1 +
+ net/ipv4/esp4.c | 2 +-
+ net/ipv6/esp6.c | 2 +-
+ net/xfrm/xfrm_state.c | 14 ++++++++++++--
+ 4 files changed, 15 insertions(+), 4 deletions(-)
+Merging netfilter/master (8971ee8b0877 netfilter: nfnetlink_cthelper: hit EBUSY on updates if size mismatches)
+$ git merge netfilter/master
+Merge made by the 'recursive' strategy.
+ net/netfilter/nfnetlink_cthelper.c | 8 ++++++--
+ net/netfilter/nft_ct.c | 2 +-
+ 2 files changed, 7 insertions(+), 3 deletions(-)
+Merging ipvs/master (56e4ee82e850 ipvs: ignore IP_VS_SVC_F_HASHED flag when adding service)
+$ git merge ipvs/master
+Already up to date.
+Merging wireless-drivers/master (d4826d17b393 mt76: mt7921: remove leftover 80+80 HE capability)
+$ git merge wireless-drivers/master
+Merge made by the 'recursive' strategy.
+ drivers/net/wireless/mediatek/mt76/mac80211.c | 26 +++++++
+ drivers/net/wireless/mediatek/mt76/mt7615/init.c | 1 -
+ drivers/net/wireless/mediatek/mt76/mt7615/mac.c | 5 +-
+ .../net/wireless/mediatek/mt76/mt7615/sdio_mcu.c | 19 +++--
+ .../net/wireless/mediatek/mt76/mt7615/usb_mcu.c | 3 -
+ .../net/wireless/mediatek/mt76/mt76_connac_mcu.c | 4 ++
+ drivers/net/wireless/mediatek/mt76/mt76x0/pci.c | 81 ++++++++++++++++++++--
+ drivers/net/wireless/mediatek/mt76/mt7921/init.c | 4 +-
+ drivers/net/wireless/mediatek/mt76/mt7921/mac.c | 5 +-
+ drivers/net/wireless/mediatek/mt76/mt7921/main.c | 3 +-
+ drivers/net/wireless/mediatek/mt76/mt7921/mcu.c | 17 +++--
+ 11 files changed, 138 insertions(+), 30 deletions(-)
+Merging mac80211/master (bddc0c411a45 mac80211: Fix NULL ptr deref for injected rate info)
+$ git merge mac80211/master
+Merge made by the 'recursive' strategy.
+ drivers/net/wireless/mac80211_hwsim.c | 5 +++
+ drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 4 +-
+ include/net/mac80211.h | 9 +++-
+ net/mac80211/ieee80211_i.h | 2 +-
+ net/mac80211/scan.c | 21 ++++++---
+ net/mac80211/tx.c | 52 ++++++++++++++++-------
+ net/wireless/util.c | 3 ++
+ 7 files changed, 70 insertions(+), 26 deletions(-)
+Merging rdma-fixes/for-rc (8124c8a6b353 Linux 5.13-rc4)
+$ git merge rdma-fixes/for-rc
+Already up to date.
+Merging sound-current/for-linus (ae352822321d ALSA: timer: Fix master timer notification)
+$ git merge sound-current/for-linus
+Merge made by the 'recursive' strategy.
+ sound/core/control_led.c | 33 ++++++++++++++++++++++++++-------
+ sound/core/timer.c | 3 ++-
+ sound/hda/intel-dsp-config.c | 4 ++++
+ sound/pci/hda/hda_generic.c | 1 +
+ sound/pci/hda/hda_intel.c | 3 +++
+ sound/pci/hda/patch_cirrus.c | 7 +++----
+ sound/pci/hda/patch_realtek.c | 1 +
+ 7 files changed, 40 insertions(+), 12 deletions(-)
+Merging sound-asoc-fixes/for-linus (810e72a0e620 Merge remote-tracking branch 'asoc/for-5.13' into asoc-linus)
+$ git merge sound-asoc-fixes/for-linus
+Merge made by the 'recursive' strategy.
+ sound/soc/amd/renoir/rn-pci-acp3x.c | 35 +++++++++++++++++++++++++++++++++++
+ sound/soc/codecs/rt5659.c | 26 +++++++++++++++++++++-----
+ sound/soc/fsl/fsl-asoc-card.c | 1 +
+ sound/soc/soc-core.c | 2 ++
+ sound/soc/soc-topology.c | 6 +++---
+ sound/soc/sof/pm.c | 1 +
+ 6 files changed, 63 insertions(+), 8 deletions(-)
+Merging regmap-fixes/for-linus (8124c8a6b353 Linux 5.13-rc4)
+$ git merge regmap-fixes/for-linus
+Already up to date.
+Merging regulator-fixes/for-linus (8df4fb4ae8f4 Merge remote-tracking branch 'regulator/for-5.13' into regulator-linus)
+$ git merge regulator-fixes/for-linus
+Merge made by the 'recursive' strategy.
+ drivers/regulator/Kconfig | 2 +-
+ drivers/regulator/atc260x-regulator.c | 19 +++++++-------
+ drivers/regulator/bd718x7-regulator.c | 2 +-
+ drivers/regulator/core.c | 6 +++++
+ drivers/regulator/cros-ec-regulator.c | 3 ++-
+ drivers/regulator/da9121-regulator.c | 10 +++++---
+ drivers/regulator/fan53555.c | 3 +--
+ drivers/regulator/fan53880.c | 3 +++
+ drivers/regulator/fixed.c | 7 ++++-
+ drivers/regulator/helpers.c | 2 +-
+ drivers/regulator/hi6421v600-regulator.c | 2 +-
+ drivers/regulator/hi655x-regulator.c | 2 +-
+ drivers/regulator/max77620-regulator.c | 17 +++++++-----
+ drivers/regulator/mt6315-regulator.c | 2 +-
+ drivers/regulator/rtmv20-regulator.c | 44 ++++++++++++++++++++++++++++++--
+ drivers/regulator/scmi-regulator.c | 2 +-
+ include/linux/mfd/rohm-bd70528.h | 4 +--
+ include/linux/mfd/rohm-bd71828.h | 10 ++++----
+ 18 files changed, 101 insertions(+), 39 deletions(-)
+Merging spi-fixes/for-linus (7ddc37efc148 Merge remote-tracking branch 'spi/for-5.13' into spi-linus)
+$ git merge spi-fixes/for-linus
+Merge made by the 'recursive' strategy.
+ drivers/spi/spi-bcm2835.c | 10 ++++++++--
+ drivers/spi/spi-bitbang.c | 18 ++++++++++++++----
+ drivers/spi/spi-fsl-spi.c | 4 ++++
+ drivers/spi/spi-omap-uwire.c | 9 ++++++++-
+ drivers/spi/spi-omap2-mcspi.c | 33 ++++++++++++++++++++-------------
+ drivers/spi/spi-pxa2xx.c | 9 ++++++++-
+ drivers/spi/spi-zynq-qspi.c | 7 ++++---
+ drivers/spi/spi.c | 8 +++++---
+ 8 files changed, 71 insertions(+), 27 deletions(-)
+Merging pci-current/for-linus (85aabbd7b315 PCI/MSI: Fix MSIs for generic hosts that use device-tree's "msi-map")
+$ git merge pci-current/for-linus
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 2 ++
+ drivers/pci/of.c | 7 +++++++
+ drivers/pci/probe.c | 3 ++-
+ include/linux/pci.h | 2 ++
+ 4 files changed, 13 insertions(+), 1 deletion(-)
+Merging driver-core.current/driver-core-linus (8124c8a6b353 Linux 5.13-rc4)
+$ git merge driver-core.current/driver-core-linus
+Already up to date.
+Merging tty.current/tty-linus (8124c8a6b353 Linux 5.13-rc4)
+$ git merge tty.current/tty-linus
+Already up to date.
+Merging usb.current/usb-linus (6490fa565534 usb: pd: Set PD_T_SINK_WAIT_CAP to 310ms)
+$ git merge usb.current/usb-linus
+Merge made by the 'recursive' strategy.
+ drivers/usb/dwc3/gadget.c | 15 +++++++++------
+ drivers/usb/musb/musb_core.c | 3 +--
+ include/linux/usb/pd.h | 2 +-
+ 3 files changed, 11 insertions(+), 9 deletions(-)
+Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6)
+$ git merge usb-gadget-fixes/fixes
+Already up to date.
+Merging usb-serial-fixes/usb-linus (56df0c758aff USB: serial: omninet: update driver description)
+$ git merge usb-serial-fixes/usb-linus
+Merge made by the 'recursive' strategy.
+ drivers/usb/serial/omninet.c | 8 +++++---
+ drivers/usb/serial/quatech2.c | 6 +++---
+ 2 files changed, 8 insertions(+), 6 deletions(-)
+Merging usb-chipidea-fixes/for-usb-fixes (a9aecef198fa usb: cdnsp: Fix deadlock issue in cdnsp_thread_irq_handler)
+$ git merge usb-chipidea-fixes/for-usb-fixes
+Merge made by the 'recursive' strategy.
+ drivers/usb/cdns3/cdns3-gadget.c | 8 +++-----
+ drivers/usb/cdns3/cdnsp-ring.c | 7 ++++---
+ 2 files changed, 7 insertions(+), 8 deletions(-)
+Merging phy/fixes (b8203ec7f58a phy: ti: Fix an error code in wiz_probe())
+$ git merge phy/fixes
+Merge made by the 'recursive' strategy.
+ drivers/phy/broadcom/phy-brcm-usb-init.h | 4 ++--
+ drivers/phy/cadence/phy-cadence-sierra.c | 1 +
+ drivers/phy/mediatek/phy-mtk-tphy.c | 2 ++
+ drivers/phy/ti/phy-j721e-wiz.c | 1 +
+ 4 files changed, 6 insertions(+), 2 deletions(-)
+Merging staging.current/staging-linus (8124c8a6b353 Linux 5.13-rc4)
+$ git merge staging.current/staging-linus
+Already up to date.
+Merging iio-fixes/fixes-togreg (ad873b492222 iio: accel: bmc150: Don't make the remove function of the second accelerometer unregister itself)
+$ git merge iio-fixes/fixes-togreg
+Merge made by the 'recursive' strategy.
+ drivers/iio/accel/bmc150-accel-core.c | 12 ++++--------
+ drivers/iio/accel/bmc150-accel-i2c.c | 2 +-
+ drivers/iio/accel/bmc150-accel.h | 2 +-
+ 3 files changed, 6 insertions(+), 10 deletions(-)
+Merging char-misc.current/char-misc-linus (8124c8a6b353 Linux 5.13-rc4)
+$ git merge char-misc.current/char-misc-linus
+Already up to date.
+Merging soundwire-fixes/fixes (da096fbccd52 soundwire: qcom: fix handling of qcom,ports-block-pack-mode)
+$ git merge soundwire-fixes/fixes
+Already up to date.
+Merging thunderbolt-fixes/fixes (8124c8a6b353 Linux 5.13-rc4)
+$ git merge thunderbolt-fixes/fixes
+Already up to date.
+Merging input-current/for-linus (45a4b68354ff Input: elants_i2c - switch to probe_new)
+$ git merge input-current/for-linus
+Merge made by the 'recursive' strategy.
+ drivers/input/joystick/xpad.c | 6 ++++++
+ drivers/input/touchscreen/elants_i2c.c | 11 +++++------
+ drivers/input/touchscreen/usbtouchscreen.c | 8 ++++----
+ 3 files changed, 15 insertions(+), 10 deletions(-)
+Merging crypto-current/master (e3a606f2c544 fsverity: relax build time dependency on CRYPTO_SHA256)
+$ git merge crypto-current/master
+Already up to date.
+Merging ide/master (6800cd8cbc6e ide-acpi: use %*ph to print small buffer)
+$ git merge ide/master
+Auto-merging include/linux/ide.h
+Auto-merging drivers/ide/sis5513.c
+Auto-merging drivers/ide/ide-acpi.c
+Auto-merging drivers/ide/hpt366.c
+Auto-merging drivers/ide/Kconfig
+Merge made by the 'recursive' strategy.
+ drivers/ide/Kconfig | 2 +-
+ drivers/ide/aec62xx.c | 3 +--
+ drivers/ide/alim15x3.c | 3 +--
+ drivers/ide/amd74xx.c | 3 +--
+ drivers/ide/atiixp.c | 3 +--
+ drivers/ide/cmd64x.c | 3 +--
+ drivers/ide/cs5520.c | 3 +--
+ drivers/ide/cs5530.c | 3 +--
+ drivers/ide/cs5535.c | 3 +--
+ drivers/ide/cs5536.c | 3 +--
+ drivers/ide/cy82c693.c | 3 +--
+ drivers/ide/delkin_cb.c | 32 ++++++--------------------------
+ drivers/ide/hpt366.c | 5 ++---
+ drivers/ide/ide-acpi.c | 5 +----
+ drivers/ide/ide-pci-generic.c | 3 +--
+ drivers/ide/it8172.c | 3 +--
+ drivers/ide/it8213.c | 3 +--
+ drivers/ide/it821x.c | 3 +--
+ drivers/ide/jmicron.c | 3 +--
+ drivers/ide/ns87415.c | 3 +--
+ drivers/ide/opti621.c | 3 +--
+ drivers/ide/pdc202xx_new.c | 3 +--
+ drivers/ide/pdc202xx_old.c | 3 +--
+ drivers/ide/piix.c | 3 +--
+ drivers/ide/sc1200.c | 43 ++++++++++++++-----------------------------
+ drivers/ide/serverworks.c | 3 +--
+ drivers/ide/setup-pci.c | 29 ++++++-----------------------
+ drivers/ide/siimage.c | 3 +--
+ drivers/ide/sis5513.c | 3 +--
+ drivers/ide/sl82c105.c | 3 +--
+ drivers/ide/slc90e66.c | 3 +--
+ drivers/ide/triflex.c | 24 ++++++++----------------
+ drivers/ide/via82cxxx.c | 3 +--
+ include/linux/ide.h | 8 +-------
+ 34 files changed, 65 insertions(+), 161 deletions(-)
+Merging vfio-fixes/for-linus (dc51ff91cf2d vfio/platform: fix module_put call in error flow)
+$ git merge vfio-fixes/for-linus
+Merge made by the 'recursive' strategy.
+ drivers/vfio/pci/Kconfig | 1 +
+ drivers/vfio/pci/vfio_pci_config.c | 2 +-
+ drivers/vfio/platform/vfio_platform_common.c | 2 +-
+ drivers/vfio/vfio_iommu_type1.c | 2 +-
+ samples/vfio-mdev/mdpy-fb.c | 13 +++++++++----
+ 5 files changed, 13 insertions(+), 7 deletions(-)
+Merging kselftest-fixes/fixes (d07f6ca923ea Linux 5.13-rc2)
+$ git merge kselftest-fixes/fixes
+Already up to date.
+Merging modules-fixes/modules-linus (055f23b74b20 module: check for exit sections in layout_sections() instead of module_init_section())
+$ git merge modules-fixes/modules-linus
+Already up to date.
+Merging dmaengine-fixes/fixes (fffdaba402ce dmaengine: stedma40: add missing iounmap() on error in d40_probe())
+$ git merge dmaengine-fixes/fixes
+Merge made by the 'recursive' strategy.
+ drivers/dma/Kconfig | 2 ++
+ drivers/dma/fsl-dpaa2-qdma/dpaa2-qdma.c | 3 ++
+ drivers/dma/idxd/init.c | 63 +++++++++++++++++++++++++++++++--
+ drivers/dma/pl330.c | 6 ++--
+ drivers/dma/qcom/Kconfig | 1 +
+ drivers/dma/sf-pdma/Kconfig | 1 +
+ drivers/dma/ste_dma40.c | 3 ++
+ drivers/dma/stm32-mdma.c | 4 +--
+ drivers/dma/xilinx/xilinx_dpdma.c | 31 ++++++++++++++--
+ drivers/dma/xilinx/zynqmp_dma.c | 2 +-
+ 10 files changed, 105 insertions(+), 11 deletions(-)
+Merging backlight-fixes/for-backlight-fixes (a38fd8748464 Linux 5.12-rc2)
+$ git merge backlight-fixes/for-backlight-fixes
+Already up to date.
+Merging mtd-fixes/mtd/fixes (562b4e91d3b2 mtd: parsers: ofpart: fix parsing subpartitions)
+$ git merge mtd-fixes/mtd/fixes
+Already up to date.
+Merging mfd-fixes/for-mfd-fixes (a61f4661fba4 mfd: intel_quark_i2c_gpio: Revert "Constify static struct resources")
+$ git merge mfd-fixes/for-mfd-fixes
+Already up to date.
+Merging v4l-dvb-fixes/fixes (1e67a81775cb media: s5p-mfc: Fix display delay control creation)
+$ git merge v4l-dvb-fixes/fixes
+Merge made by the 'recursive' strategy.
+ drivers/media/platform/mtk-vpu/mtk_vpu.c | 6 ++++++
+ drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 1 +
+ drivers/media/platform/video-mux.c | 10 +++++++++-
+ 3 files changed, 16 insertions(+), 1 deletion(-)
+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 (78cf0eb926cb MIPS: Fix kernel hang under FUNCTION_GRAPH_TRACER and PREEMPT_TRACER)
+$ git merge mips-fixes/mips-fixes
+Already up to date.
+Merging at91-fixes/at91-fixes (6efb943b8616 Linux 5.13-rc1)
+$ git merge at91-fixes/at91-fixes
+Already up to date.
+Merging omap-fixes/fixes (bae989c4bc53 ARM: OMAP1: ams-delta: remove unused function ams_delta_camera_power)
+$ git merge omap-fixes/fixes
+Merge made by the 'recursive' strategy.
+ arch/arm/mach-omap1/board-ams-delta.c | 14 --------
+ arch/arm/mach-omap1/board-h2.c | 4 ++-
+ arch/arm/mach-omap1/pm.c | 10 ++++--
+ arch/arm/mach-omap2/board-n8x0.c | 2 +-
+ drivers/bus/ti-sysc.c | 60 +++++++++++++++++++++++++++++++----
+ include/linux/platform_data/ti-sysc.h | 1 +
+ 6 files changed, 66 insertions(+), 25 deletions(-)
+Merging kvm-fixes/master (000ac4295339 selftests: kvm: fix overlapping addresses in memslot_perf_test)
+$ git merge kvm-fixes/master
+Already up to date.
+Merging kvms390-fixes/master (735931f9a51a MAINTAINERS: add uv.c also to KVM/s390)
+$ git merge kvms390-fixes/master
+Already up to date.
+Merging hwmon-fixes/hwmon (f0fb26c456a3 hwmon/pmbus: (q54sj108a2) The PMBUS_MFR_ID is actually 6 chars instead of 5)
+$ git merge hwmon-fixes/hwmon
+Already up to date.
+Merging nvdimm-fixes/libnvdimm-fixes (de80d5781136 Merge branch 'for-5.13/dax' into libnvdimm-fixes)
+$ git merge nvdimm-fixes/libnvdimm-fixes
+Merge made by the 'recursive' strategy.
+Merging cxl-fixes/fixes (fae8817ae804 cxl/mem: Fix memory device capacity probing)
+$ git merge cxl-fixes/fixes
+Already up to date.
+Merging btrfs-fixes/next-fixes (4ef0676a1677 Merge branch 'misc-5.13' into next-fixes)
+$ git merge btrfs-fixes/next-fixes
+Merge made by the 'recursive' strategy.
+ fs/btrfs/compression.c | 17 +++++---
+ fs/btrfs/extent-tree.c | 2 +-
+ fs/btrfs/file-item.c | 108 ++++++++++++++++++++++++++++++++++++-------------
+ fs/btrfs/inode.c | 19 ++++++++-
+ fs/btrfs/reflink.c | 38 +++++++++--------
+ fs/btrfs/tree-log.c | 21 ++++++----
+ 6 files changed, 147 insertions(+), 58 deletions(-)
+Merging vfs-fixes/fixes (173e84953eaa fs: fix reporting supported extra file attributes for statx())
+$ git merge vfs-fixes/fixes
+Merge made by the 'recursive' strategy.
+Merging dma-mapping-fixes/for-linus (18a3c5f7abfd Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost)
+$ git merge dma-mapping-fixes/for-linus
+Already up to date.
+Merging i3c-fixes/i3c/fixes (fe07bfda2fb9 Linux 5.12-rc1)
+$ git merge i3c-fixes/i3c/fixes
+Already up to date.
+Merging drivers-x86-fixes/fixes (c0e0436cb4f6 platform/x86: thinkpad_acpi: Add X1 Carbon Gen 9 second fan support)
+$ git merge drivers-x86-fixes/fixes
+Merge made by the 'recursive' strategy.
+ drivers/platform/surface/surface_aggregator_registry.c | 7 +++++--
+ drivers/platform/x86/thinkpad_acpi.c | 1 +
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+Merging samsung-krzk-fixes/fixes (6efb943b8616 Linux 5.13-rc1)
+$ git merge samsung-krzk-fixes/fixes
+Already up to date.
+Merging pinctrl-samsung-fixes/fixes (6efb943b8616 Linux 5.13-rc1)
+$ git merge pinctrl-samsung-fixes/fixes
+Already up to date.
+Merging devicetree-fixes/dt/linus (c17611592d96 dt-bindings: More removals of type references on common properties)
+$ git merge devicetree-fixes/dt/linus
+Already up to date.
+Merging scsi-fixes/fixes (e57f5cd99ca6 scsi: scsi_devinfo: Add blacklist entry for HPE OPEN-V)
+$ git merge scsi-fixes/fixes
+Merge made by the 'recursive' strategy.
+ drivers/scsi/lpfc/lpfc_sli.c | 4 +---
+ drivers/scsi/qedf/qedf_main.c | 20 +++++++++-----------
+ drivers/scsi/scsi_devinfo.c | 1 +
+ drivers/scsi/ufs/ufs-mediatek.c | 15 ++++++++++++++-
+ drivers/target/target_core_transport.c | 4 +---
+ 5 files changed, 26 insertions(+), 18 deletions(-)
+Merging drm-fixes/drm-fixes (8124c8a6b353 Linux 5.13-rc4)
+$ 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 (b87482dfe800 Revert "i915: use io_mapping_map_user")
+$ git merge drm-intel-fixes/for-linux-next-fixes
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/i915/Kconfig | 1 -
+ drivers/gpu/drm/i915/gem/i915_gem_mman.c | 9 +++---
+ drivers/gpu/drm/i915/i915_drv.h | 3 ++
+ drivers/gpu/drm/i915/i915_mm.c | 44 +++++++++++++++++++++++++++
+ drivers/gpu/drm/i915/selftests/i915_request.c | 4 +--
+ 5 files changed, 54 insertions(+), 7 deletions(-)
+Merging mmc-fixes/fixes (c4681547bcce Linux 5.13-rc3)
+$ git merge mmc-fixes/fixes
+Already up to date.
+Merging rtc-fixes/rtc-fixes (bd33335aa93d rtc: cmos: Disable irq around direct invocation of cmos_interrupt())
+$ git merge rtc-fixes/rtc-fixes
+Merge made by the 'recursive' strategy.
+ drivers/rtc/rtc-cmos.c | 2 ++
+ 1 file changed, 2 insertions(+)
+Merging gnss-fixes/gnss-linus (a38fd8748464 Linux 5.12-rc2)
+$ git merge gnss-fixes/gnss-linus
+Already up to date.
+Merging hyperv-fixes/hyperv-fixes (6efb943b8616 Linux 5.13-rc1)
+$ git merge hyperv-fixes/hyperv-fixes
+Already up to date.
+Merging soc-fsl-fixes/fix (2663b3388551 soc: fsl: dpio: Get the cpumask through cpumask_of(cpu))
+$ git merge soc-fsl-fixes/fix
+Already up to date.
+Merging risc-v-fixes/fixes (160ce364167f Merge remote-tracking branch 'riscv/riscv-wx-mappings' into fixes)
+$ git merge risc-v-fixes/fixes
+Merge made by the 'recursive' strategy.
+ arch/riscv/Makefile | 9 +++++++++
+ arch/riscv/errata/sifive/Makefile | 2 +-
+ arch/riscv/kernel/setup.c | 4 ++--
+ arch/riscv/mm/init.c | 8 ++++++--
+ 4 files changed, 18 insertions(+), 5 deletions(-)
+Merging pidfd-fixes/fixes (03ba0fe4d09f file: simplify logic in __close_range())
+$ git merge pidfd-fixes/fixes
+Auto-merging fs/file.c
+Merge made by the 'recursive' strategy.
+ fs/file.c | 64 +++++++++++++++++++++++++++++++++++++++------------------------
+ 1 file changed, 40 insertions(+), 24 deletions(-)
+Merging fpga-fixes/fixes (2e8496f31d0b firmware: stratix10-svc: reset COMMAND_RECONFIG_FLAG_PARTIAL to 0)
+$ git merge fpga-fixes/fixes
+Already up to date.
+Merging spdx/spdx-linus (6799d4f2da49 Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi)
+$ git merge spdx/spdx-linus
+Already up to date.
+Merging gpio-brgl-fixes/gpio/for-current (dbec64b11c65 gpio: wcd934x: Fix shift-out-of-bounds error)
+$ git merge gpio-brgl-fixes/gpio/for-current
+Merge made by the 'recursive' strategy.
+ drivers/gpio/gpio-wcd934x.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging gpio-intel-fixes/fixes (6efb943b8616 Linux 5.13-rc1)
+$ git merge gpio-intel-fixes/fixes
+Already up to date.
+Merging pinctrl-intel-fixes/fixes (6efb943b8616 Linux 5.13-rc1)
+$ git merge pinctrl-intel-fixes/fixes
+Already up to date.
+Merging erofs-fixes/fixes (0852b6ca941e erofs: fix 1 lcluster-sized pcluster for big pcluster)
+$ 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 kunit-fixes/kunit-fixes (d7eab3df8f39 Documentation: kunit: Update kunit_tool page)
+$ git merge kunit-fixes/kunit-fixes
+Merge made by the 'recursive' strategy.
+ Documentation/dev-tools/kunit/index.rst | 1 +
+ Documentation/dev-tools/kunit/kunit-tool.rst | 140 ++++++++++++-
+ Documentation/dev-tools/kunit/running_tips.rst | 259 +++++++++++++++++++++++++
+ Documentation/dev-tools/kunit/start.rst | 2 +
+ 4 files changed, 394 insertions(+), 8 deletions(-)
+ create mode 100644 Documentation/dev-tools/kunit/running_tips.rst
+Merging ubifs-fixes/fixes (78c7d49f55d8 ubifs: journal: Make sure to not dirty twice for auth nodes)
+$ git merge ubifs-fixes/fixes
+Already up to date.
+Merging memblock-fixes/fixes (17cbe03872be mm/memblock: Fix typo in comment of memblock_phys_alloc_try_nid())
+$ git merge memblock-fixes/fixes
+Already up to date.
+Merging cel-fixes/for-rc (9f4ad9e425a1 Linux 5.12)
+$ git merge cel-fixes/for-rc
+Already up to date.
+Merging drm-misc-fixes/for-linux-next-fixes (0b78f8bcf495 Revert "fb_defio: Remove custom address_space_operations")
+$ git merge drm-misc-fixes/for-linux-next-fixes
+Merge made by the 'recursive' strategy.
+ drivers/video/fbdev/core/fb_defio.c | 35 +++++++++++++++++++++++++++++++++++
+ drivers/video/fbdev/core/fbmem.c | 4 ++++
+ include/linux/fb.h | 3 +++
+ 3 files changed, 42 insertions(+)
+Merging kspp-gustavo/for-next/kspp (53004ee78d62 xfs: Fix fall-through warnings for Clang)
+$ git merge kspp-gustavo/for-next/kspp
+Auto-merging net/tipc/link.c
+Auto-merging net/packet/af_packet.c
+Auto-merging net/ipv4/esp4.c
+Auto-merging fs/xfs/xfs_ioctl.c
+Auto-merging fs/xfs/xfs_inode.c
+Auto-merging fs/xfs/xfs_bmap_util.c
+Auto-merging fs/xfs/scrub/common.c
+Auto-merging fs/xfs/libxfs/xfs_ag_resv.c
+Auto-merging drivers/net/ethernet/broadcom/bnxt/bnxt.c
+Auto-merging drivers/ide/siimage.c
+Merge made by the 'recursive' strategy.
+ drivers/accessibility/braille/braille_console.c | 1 +
+ drivers/atm/fore200e.c | 1 +
+ drivers/firewire/core-topology.c | 1 +
+ drivers/hwmon/corsair-cpro.c | 1 +
+ drivers/hwmon/max6621.c | 2 +-
+ drivers/ide/siimage.c | 1 +
+ drivers/net/ethernet/broadcom/bnxt/bnxt.c | 1 +
+ drivers/net/ethernet/neterion/vxge/vxge-config.c | 1 +
+ drivers/net/ethernet/netronome/nfp/nfp_net_repr.c | 1 +
+ drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c | 1 +
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | 1 +
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 1 +
+ drivers/tee/tee_core.c | 1 +
+ drivers/watchdog/machzwd.c | 1 +
+ fs/reiserfs/namei.c | 1 +
+ fs/xfs/libxfs/xfs_ag_resv.c | 4 ++--
+ fs/xfs/libxfs/xfs_alloc.c | 2 +-
+ fs/xfs/libxfs/xfs_da_btree.c | 2 +-
+ fs/xfs/scrub/agheader.c | 1 +
+ fs/xfs/scrub/bmap.c | 2 +-
+ fs/xfs/scrub/btree.c | 2 +-
+ fs/xfs/scrub/common.c | 6 +++---
+ fs/xfs/scrub/dabtree.c | 2 +-
+ fs/xfs/scrub/repair.c | 2 +-
+ fs/xfs/xfs_bmap_util.c | 2 +-
+ fs/xfs/xfs_export.c | 4 ++--
+ fs/xfs/xfs_file.c | 2 +-
+ fs/xfs/xfs_inode.c | 2 +-
+ fs/xfs/xfs_ioctl.c | 4 ++--
+ fs/xfs/xfs_iomap.c | 2 +-
+ fs/xfs/xfs_log.c | 1 +
+ fs/xfs/xfs_trans_buf.c | 2 +-
+ net/ipv4/ah4.c | 1 +
+ net/ipv4/esp4.c | 1 +
+ net/ipv4/fib_semantics.c | 1 +
+ net/ipv4/ip_vti.c | 1 +
+ net/ipv4/ipcomp.c | 1 +
+ net/netrom/nr_route.c | 4 ++++
+ net/packet/af_packet.c | 1 +
+ net/rds/tcp_connect.c | 1 +
+ net/rds/threads.c | 2 ++
+ net/sctp/input.c | 3 ++-
+ net/tipc/link.c | 1 +
+ net/xfrm/xfrm_interface.c | 1 +
+ 44 files changed, 54 insertions(+), 22 deletions(-)
+Merging kbuild/for-next (c39013ee64b5 kbuild: clean up ${quiet} checks in shell scripts)
+$ git merge kbuild/for-next
+Removing scripts/mkmakefile
+Auto-merging scripts/link-vmlinux.sh
+Auto-merging scripts/Makefile.modfinal
+Auto-merging arch/riscv/Makefile
+Auto-merging Makefile
+Merge made by the 'recursive' strategy.
+ Makefile | 125 +++++++++++++++++++---------------------------
+ arch/alpha/Kbuild | 3 ++
+ arch/alpha/Makefile | 2 -
+ arch/arc/Makefile | 3 --
+ arch/arm/Makefile | 1 -
+ arch/arm64/Makefile | 1 -
+ arch/csky/Kbuild | 1 +
+ arch/h8300/Kbuild | 2 +
+ arch/h8300/Makefile | 3 --
+ arch/hexagon/Kbuild | 2 +
+ arch/hexagon/Makefile | 4 --
+ arch/ia64/Kbuild | 1 +
+ arch/m68k/Makefile | 1 -
+ arch/microblaze/Kbuild | 1 +
+ arch/mips/Makefile | 3 --
+ arch/nds32/Kbuild | 1 +
+ arch/nios2/Kbuild | 1 +
+ arch/openrisc/Makefile | 1 -
+ arch/parisc/Kbuild | 1 +
+ arch/powerpc/Makefile | 3 --
+ arch/riscv/Makefile | 1 -
+ arch/s390/Makefile | 3 --
+ arch/sh/Kbuild | 4 ++
+ arch/sh/Makefile | 5 --
+ arch/sparc/Makefile | 3 --
+ arch/um/Kbuild | 1 +
+ arch/x86/Makefile | 3 --
+ arch/xtensa/Kbuild | 1 +
+ init/Makefile | 12 ++---
+ kernel/gen_kheaders.sh | 4 +-
+ lib/Kconfig.debug | 4 +-
+ scripts/Kbuild.include | 7 ++-
+ scripts/Makefile.build | 2 -
+ scripts/Makefile.modfinal | 2 -
+ scripts/link-vmlinux.sh | 4 +-
+ scripts/mkcompile_h | 4 +-
+ scripts/mkmakefile | 17 -------
+ 37 files changed, 86 insertions(+), 151 deletions(-)
+ create mode 100644 arch/alpha/Kbuild
+ create mode 100644 arch/csky/Kbuild
+ create mode 100644 arch/h8300/Kbuild
+ create mode 100644 arch/hexagon/Kbuild
+ create mode 100644 arch/ia64/Kbuild
+ create mode 100644 arch/microblaze/Kbuild
+ create mode 100644 arch/nds32/Kbuild
+ create mode 100644 arch/nios2/Kbuild
+ create mode 100644 arch/parisc/Kbuild
+ create mode 100644 arch/sh/Kbuild
+ create mode 100644 arch/um/Kbuild
+ create mode 100644 arch/xtensa/Kbuild
+ delete mode 100755 scripts/mkmakefile
+Merging compiler-attributes/compiler-attributes (ca0760e7d79e Compiler Attributes: Add continue in comment)
+$ git merge compiler-attributes/compiler-attributes
+Merge made by the 'recursive' strategy.
+ include/linux/compiler_attributes.h | 1 +
+ 1 file changed, 1 insertion(+)
+Merging dma-mapping/for-next (a7f3d3d3600c dma-mapping: add unlikely hint to error path in dma_mapping_error)
+$ git merge dma-mapping/for-next
+Already up to date.
+Merging asm-generic/master (14462376858e Merge branch 'asm-generic-unaligned' into asm-generic)
+$ git merge asm-generic/master
+Removing include/linux/unaligned/memmove.h
+Removing include/linux/unaligned/le_struct.h
+Removing include/linux/unaligned/le_memmove.h
+Removing include/linux/unaligned/le_byteshift.h
+Removing include/linux/unaligned/generic.h
+Removing include/linux/unaligned/be_struct.h
+Removing include/linux/unaligned/be_memmove.h
+Removing include/linux/unaligned/be_byteshift.h
+Removing include/linux/unaligned/access_ok.h
+Removing arch/xtensa/include/asm/unaligned.h
+Removing arch/x86/include/asm/unaligned.h
+Removing arch/sparc/include/asm/unaligned.h
+Removing arch/sh/include/asm/unaligned.h
+Removing arch/sh/include/asm/unaligned-sh4a.h
+Removing arch/powerpc/include/asm/unaligned.h
+Removing arch/openrisc/include/asm/unaligned.h
+Removing arch/microblaze/include/asm/unaligned.h
+Removing arch/m68k/include/asm/unaligned.h
+Removing arch/ia64/include/asm/unaligned.h
+Removing arch/arm/include/asm/unaligned.h
+Removing arch/alpha/include/asm/unaligned.h
+Merge made by the 'recursive' strategy.
+ arch/alpha/include/asm/unaligned.h | 12 --
+ arch/arm/include/asm/unaligned.h | 27 ----
+ arch/ia64/include/asm/unaligned.h | 12 --
+ arch/m68k/Kconfig | 1 +
+ arch/m68k/include/asm/unaligned.h | 26 ----
+ arch/microblaze/include/asm/unaligned.h | 27 ----
+ arch/mips/crypto/crc32-mips.c | 2 +-
+ arch/openrisc/include/asm/unaligned.h | 47 -------
+ arch/parisc/include/asm/unaligned.h | 6 +-
+ arch/powerpc/include/asm/unaligned.h | 22 ---
+ arch/riscv/include/asm/io.h | 5 +-
+ arch/sh/include/asm/unaligned-sh4a.h | 199 ----------------------------
+ arch/sh/include/asm/unaligned.h | 13 --
+ arch/sparc/include/asm/io.h | 8 ++
+ arch/sparc/include/asm/unaligned.h | 11 --
+ arch/x86/include/asm/unaligned.h | 15 ---
+ arch/xtensa/include/asm/unaligned.h | 29 ----
+ block/partitions/ldm.c | 2 +-
+ block/partitions/ldm.h | 3 -
+ block/partitions/msdos.c | 24 ++--
+ drivers/net/wireless/marvell/mwifiex/pcie.c | 10 +-
+ include/asm-generic/io.h | 68 +++++++++-
+ include/asm-generic/uaccess.h | 4 +-
+ include/asm-generic/unaligned.h | 141 ++++++++++++++++----
+ include/linux/unaligned/access_ok.h | 68 ----------
+ include/linux/unaligned/be_byteshift.h | 71 ----------
+ include/linux/unaligned/be_memmove.h | 37 ------
+ include/linux/unaligned/be_struct.h | 37 ------
+ include/linux/unaligned/generic.h | 115 ----------------
+ include/linux/unaligned/le_byteshift.h | 71 ----------
+ include/linux/unaligned/le_memmove.h | 37 ------
+ include/linux/unaligned/le_struct.h | 37 ------
+ include/linux/unaligned/memmove.h | 46 -------
+ net/core/netpoll.c | 4 +-
+ security/apparmor/policy_unpack.c | 2 +-
+ 35 files changed, 216 insertions(+), 1023 deletions(-)
+ delete mode 100644 arch/alpha/include/asm/unaligned.h
+ delete mode 100644 arch/arm/include/asm/unaligned.h
+ delete mode 100644 arch/ia64/include/asm/unaligned.h
+ delete mode 100644 arch/m68k/include/asm/unaligned.h
+ delete mode 100644 arch/microblaze/include/asm/unaligned.h
+ delete mode 100644 arch/openrisc/include/asm/unaligned.h
+ delete mode 100644 arch/powerpc/include/asm/unaligned.h
+ delete mode 100644 arch/sh/include/asm/unaligned-sh4a.h
+ delete mode 100644 arch/sh/include/asm/unaligned.h
+ delete mode 100644 arch/sparc/include/asm/unaligned.h
+ delete mode 100644 arch/x86/include/asm/unaligned.h
+ delete mode 100644 arch/xtensa/include/asm/unaligned.h
+ delete mode 100644 include/linux/unaligned/access_ok.h
+ delete mode 100644 include/linux/unaligned/be_byteshift.h
+ delete mode 100644 include/linux/unaligned/be_memmove.h
+ delete mode 100644 include/linux/unaligned/be_struct.h
+ delete mode 100644 include/linux/unaligned/generic.h
+ delete mode 100644 include/linux/unaligned/le_byteshift.h
+ delete mode 100644 include/linux/unaligned/le_memmove.h
+ delete mode 100644 include/linux/unaligned/le_struct.h
+ delete mode 100644 include/linux/unaligned/memmove.h
+Merging arc/for-next (def9d2780727 Linux 5.5-rc7)
+$ git merge arc/for-next
+Already up to date.
+Merging arm/for-next (d3506d256d94 Merge branch 'misc' into for-next)
+$ git merge arm/for-next
+Merge made by the 'recursive' strategy.
+Merging arm64/for-next/core (f80ccaffe0b8 Merge branch 'for-next/sve' into for-next/core)
+$ git merge arm64/for-next/core
+Auto-merging arch/arm64/mm/mmu.c
+Removing arch/arm64/lib/memmove.S
+Auto-merging arch/arm64/kvm/hyp/nvhe/setup.c
+Auto-merging arch/arm64/kvm/arm.c
+Merge made by the 'recursive' strategy.
+ Documentation/arm64/booting.rst | 6 +
+ arch/arm/kernel/perf_event_v7.c | 4 +-
+ arch/arm64/include/asm/alternative-macros.h | 5 -
+ arch/arm64/include/asm/arch_gicv3.h | 3 +-
+ arch/arm64/include/asm/asm-prototypes.h | 6 +
+ arch/arm64/include/asm/assembler.h | 98 +++---
+ arch/arm64/include/asm/cache.h | 2 +-
+ arch/arm64/include/asm/cacheflush.h | 71 ++--
+ arch/arm64/include/asm/cpu.h | 11 +-
+ arch/arm64/include/asm/cpufeature.h | 7 +
+ arch/arm64/include/asm/efi.h | 2 +-
+ arch/arm64/include/asm/fpsimd.h | 2 +-
+ arch/arm64/include/asm/fpsimdmacros.h | 4 +-
+ arch/arm64/include/asm/insn.h | 66 +++-
+ arch/arm64/include/asm/kvm_mmu.h | 7 +-
+ arch/arm64/include/asm/linkage.h | 8 +
+ arch/arm64/include/asm/memory.h | 6 +-
+ arch/arm64/include/asm/module.lds.h | 17 +-
+ arch/arm64/include/asm/mte-kasan.h | 93 ++++--
+ arch/arm64/include/asm/patching.h | 15 +
+ arch/arm64/include/asm/pgtable-prot.h | 1 -
+ arch/arm64/include/asm/pgtable.h | 5 +-
+ arch/arm64/include/asm/processor.h | 12 +-
+ arch/arm64/include/asm/scs.h | 8 +-
+ arch/arm64/include/asm/sdei.h | 7 +-
+ arch/arm64/include/asm/smp.h | 2 -
+ arch/arm64/include/asm/stacktrace.h | 32 +-
+ arch/arm64/include/asm/sysreg.h | 2 -
+ arch/arm64/kernel/Makefile | 4 +-
+ arch/arm64/kernel/acpi.c | 22 +-
+ arch/arm64/kernel/alternative.c | 2 +-
+ arch/arm64/kernel/asm-offsets.c | 11 +-
+ arch/arm64/kernel/cpufeature.c | 21 ++
+ arch/arm64/kernel/cpuinfo.c | 5 +-
+ arch/arm64/kernel/efi-entry.S | 9 +-
+ arch/arm64/kernel/entry-fpsimd.S | 22 +-
+ arch/arm64/kernel/entry.S | 10 +-
+ arch/arm64/kernel/fpsimd.c | 6 +-
+ arch/arm64/kernel/head.S | 71 ++--
+ arch/arm64/kernel/hibernate-asm.S | 7 +-
+ arch/arm64/kernel/hibernate.c | 20 +-
+ arch/arm64/kernel/idreg-override.c | 3 +-
+ arch/arm64/kernel/image-vars.h | 2 +-
+ arch/arm64/kernel/kaslr.c | 12 +-
+ arch/arm64/kernel/machine_kexec.c | 30 +-
+ arch/arm64/kernel/patching.c | 148 +++++++++
+ arch/arm64/kernel/perf_callchain.c | 2 +-
+ arch/arm64/kernel/perf_event.c | 2 +-
+ arch/arm64/kernel/probes/simulate-insn.c | 1 +
+ arch/arm64/kernel/probes/uprobes.c | 2 +-
+ arch/arm64/kernel/process.c | 5 +
+ arch/arm64/kernel/ptrace.c | 2 +-
+ arch/arm64/kernel/sdei.c | 16 +-
+ arch/arm64/kernel/setup.c | 6 -
+ arch/arm64/kernel/smccc-call.S | 57 ++++
+ arch/arm64/kernel/smp.c | 14 +-
+ arch/arm64/kernel/smp_spin_table.c | 7 +-
+ arch/arm64/kernel/stacktrace.c | 18 +-
+ arch/arm64/kernel/sys_compat.c | 2 +-
+ arch/arm64/kernel/traps.c | 99 +++++-
+ arch/arm64/kvm/arm.c | 2 +-
+ arch/arm64/kvm/hyp/nvhe/cache.S | 4 +-
+ arch/arm64/kvm/hyp/nvhe/setup.c | 3 +-
+ arch/arm64/kvm/hyp/nvhe/tlb.c | 2 +-
+ arch/arm64/kvm/hyp/pgtable.c | 13 +-
+ arch/arm64/lib/Makefile | 4 +-
+ arch/arm64/lib/clear_user.S | 47 +--
+ arch/arm64/{kernel => lib}/insn.c | 249 +-------------
+ arch/arm64/lib/kasan_sw_tags.S | 76 +++++
+ arch/arm64/lib/memchr.S | 65 +++-
+ arch/arm64/lib/memcmp.S | 346 +++++++------------
+ arch/arm64/lib/memcpy.S | 272 ++++++++++++---
+ arch/arm64/lib/memmove.S | 189 -----------
+ arch/arm64/lib/strcmp.S | 289 +++++++---------
+ arch/arm64/lib/strlen.S | 258 +++++++++-----
+ arch/arm64/lib/strncmp.S | 406 ++++++++++-------------
+ arch/arm64/lib/uaccess_flushcache.c | 4 +-
+ arch/arm64/mm/cache.S | 158 ++++-----
+ arch/arm64/mm/context.c | 6 +-
+ arch/arm64/mm/flush.c | 29 +-
+ arch/arm64/mm/init.c | 7 +
+ arch/arm64/mm/mmu.c | 5 +-
+ arch/arm64/mm/proc.S | 14 +-
+ arch/arm64/mm/ptdump.c | 4 -
+ drivers/perf/arm-cci.c | 4 +-
+ drivers/perf/arm-ccn.c | 6 +-
+ drivers/perf/arm-cmn.c | 11 +-
+ drivers/perf/arm_dmc620_pmu.c | 5 +-
+ drivers/perf/arm_dsu_pmu.c | 8 +-
+ drivers/perf/arm_pmu.c | 16 +-
+ drivers/perf/arm_smmuv3_pmu.c | 10 +-
+ drivers/perf/arm_spe_pmu.c | 12 +-
+ drivers/perf/fsl_imx8_ddr_perf.c | 5 +-
+ drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c | 5 +-
+ drivers/perf/hisilicon/hisi_uncore_hha_pmu.c | 5 +-
+ drivers/perf/hisilicon/hisi_uncore_l3c_pmu.c | 5 +-
+ drivers/perf/hisilicon/hisi_uncore_pa_pmu.c | 3 -
+ drivers/perf/hisilicon/hisi_uncore_pmu.c | 6 +-
+ drivers/perf/hisilicon/hisi_uncore_pmu.h | 2 +-
+ drivers/perf/hisilicon/hisi_uncore_sllc_pmu.c | 5 +-
+ drivers/perf/qcom_l2_pmu.c | 4 +-
+ drivers/perf/qcom_l3_pmu.c | 6 +-
+ drivers/perf/thunderx2_pmu.c | 4 +-
+ drivers/perf/xgene_pmu.c | 6 +-
+ include/linux/arm-smccc.h | 55 +++
+ include/linux/interrupt.h | 35 +-
+ kernel/irq/manage.c | 33 +-
+ mm/kasan/sw_tags.c | 7 +
+ scripts/Makefile.kasan | 1 +
+ tools/testing/selftests/arm64/fp/sve-probe-vls.c | 2 +-
+ 110 files changed, 2114 insertions(+), 1739 deletions(-)
+ create mode 100644 arch/arm64/include/asm/patching.h
+ create mode 100644 arch/arm64/kernel/patching.c
+ rename arch/arm64/{kernel => lib}/insn.c (86%)
+ create mode 100644 arch/arm64/lib/kasan_sw_tags.S
+ delete mode 100644 arch/arm64/lib/memmove.S
+Merging arm-perf/for-next/perf (0d0f144a8f5f perf: qcom_l2_pmu: move to use request_irq by IRQF_NO_AUTOEN flag)
+$ git merge arm-perf/for-next/perf
+Already up to date.
+Merging arm-soc/for-next (b433d090ac63 MAINTAINERS: ARM/Amlogic SoCs: add Neil as primary maintainer)
+$ git merge arm-soc/for-next
+Already up to date.
+Merging actions/for-next (444d018d8d38 ARM: dts: owl-s500-roseapplepi: Add ATC2603C PMIC)
+$ git merge actions/for-next
+Merge made by the 'recursive' strategy.
+Merging amlogic/for-next (b813db6e4b65 Merge branches 'v5.14/drivers' and 'v5.14/dt64' into for-next)
+$ git merge amlogic/for-next
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/arm/amlogic.yaml | 1 +
+ arch/arm64/boot/dts/amlogic/Makefile | 1 +
+ arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 1 +
+ arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 1 +
+ arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 1 +
+ arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi | 41 +-
+ .../boot/dts/amlogic/meson-sm1-bananapi-m5.dts | 646 +++++++++++++++++++++
+ .../boot/dts/amlogic/meson-sm1-khadas-vim3l.dts | 13 +
+ arch/arm64/boot/dts/amlogic/meson-sm1.dtsi | 10 +
+ drivers/soc/amlogic/meson-ee-pwrc.c | 46 +-
+ 10 files changed, 734 insertions(+), 27 deletions(-)
+ create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts
+Merging aspeed/for-next (61fbc42084f4 Merge branches 'wpcm450-for-v5.13', 'dt-for-v5.13' and 'lpc-for-v5.13' into for-next)
+$ git merge aspeed/for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging at91/at91-next (253adffb0e98 ARM: dts: at91: sama5d4: fix pinctrl muxing)
+$ git merge at91/at91-next
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/sama5d4.dtsi | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging drivers-memory/for-next (76e5624f3f93 memory: pl353: Fix error return code in pl353_smc_probe())
+$ git merge drivers-memory/for-next
+Merge made by the 'recursive' strategy.
+ drivers/memory/atmel-ebi.c | 4 +++-
+ drivers/memory/pl353-smc.c | 1 +
+ drivers/memory/stm32-fmc2-ebi.c | 4 ++++
+ 3 files changed, 8 insertions(+), 1 deletion(-)
+Merging imx-mxs/for-next (2f875c387c54 Merge branch 'imx/defconfig' into for-next)
+$ git merge imx-mxs/for-next
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/arm/fsl.yaml | 2 +
+ .../devicetree/bindings/power/fsl,imx-gpcv2.yaml | 12 +
+ .../devicetree/bindings/vendor-prefixes.yaml | 2 +
+ arch/arm/boot/dts/Makefile | 4 +-
+ arch/arm/boot/dts/imx25-pinfunc.h | 12 +-
+ arch/arm/boot/dts/imx28-lwe.dtsi | 170 ++++
+ arch/arm/boot/dts/imx28-xea.dts | 99 ++
+ arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi | 2 +-
+ arch/arm/boot/dts/imx53-ard.dts | 2 +-
+ arch/arm/boot/dts/imx6dl-riotboard.dts | 2 +
+ arch/arm/boot/dts/imx6dl-yapp4-common.dtsi | 9 +-
+ arch/arm/boot/dts/imx6q-dhcom-som.dtsi | 12 +
+ arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts | 2 +-
+ arch/arm/boot/dts/imx6q-ds.dts | 17 +
+ arch/arm/boot/dts/imx6qdl-ds.dtsi | 458 +++++++++
+ arch/arm/boot/dts/imx6qdl-emcon-avari.dtsi | 2 +-
+ arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 5 +-
+ arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 10 +
+ arch/arm/boot/dts/imx6qdl-wandboard-revd1.dtsi | 1 -
+ arch/arm/boot/dts/imx6ul-14x14-evk.dtsi | 50 +-
+ arch/arm/boot/dts/imx7d-meerkat96.dts | 2 +-
+ arch/arm/boot/dts/imx7d-pico.dtsi | 2 +-
+ arch/arm/boot/dts/imx7d-sdb.dts | 7 +
+ arch/arm/mach-imx/mach-imx50.c | 7 +
+ arch/arm/mach-imx/mach-imx6q.c | 85 --
+ arch/arm/mach-imx/mach-imx6sx.c | 26 -
+ arch/arm/mach-imx/mach-imx7d.c | 22 -
+ arch/arm/mach-imx/pm-imx27.c | 1 +
+ arch/arm/mach-imx/suspend-imx53.S | 4 +-
+ arch/arm64/boot/dts/freescale/Makefile | 1 +
+ arch/arm64/boot/dts/freescale/fsl-ls1012a-frwy.dts | 4 +
+ .../freescale/fsl-ls1028a-kontron-sl28-var1.dts | 3 +-
+ .../freescale/fsl-ls1028a-kontron-sl28-var4.dts | 5 +-
+ arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts | 4 +
+ arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 20 +-
+ arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 1 -
+ arch/arm64/boot/dts/freescale/imx8-ss-conn.dtsi | 50 +-
+ .../boot/dts/freescale/imx8mm-venice-gw7901.dts | 1019 ++++++++++++++++++++
+ arch/arm64/boot/dts/freescale/imx8mm.dtsi | 363 +++----
+ .../boot/dts/freescale/imx8mn-beacon-som.dtsi | 3 +
+ arch/arm64/boot/dts/freescale/imx8mn.dtsi | 147 +--
+ arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 139 +++
+ .../boot/dts/freescale/imx8mp-phycore-som.dtsi | 25 +
+ arch/arm64/boot/dts/freescale/imx8mp.dtsi | 18 +-
+ arch/arm64/boot/dts/freescale/imx8mq-evk.dts | 1 +
+ arch/arm64/boot/dts/freescale/imx8mq-nitrogen.dts | 182 ++++
+ .../boot/dts/freescale/imx8mq-zii-ultra-rmb3.dts | 10 +-
+ .../arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi | 23 +-
+ arch/arm64/boot/dts/freescale/imx8mq.dtsi | 16 +
+ arch/arm64/configs/defconfig | 2 +
+ drivers/soc/imx/gpcv2.c | 542 ++++++++---
+ drivers/soc/imx/soc-imx.c | 3 +
+ include/dt-bindings/power/imx8mm-power.h | 22 +
+ include/soc/imx/cpu.h | 1 +
+ 54 files changed, 3039 insertions(+), 594 deletions(-)
+ create mode 100644 arch/arm/boot/dts/imx28-lwe.dtsi
+ create mode 100644 arch/arm/boot/dts/imx28-xea.dts
+ create mode 100644 arch/arm/boot/dts/imx6q-ds.dts
+ create mode 100644 arch/arm/boot/dts/imx6qdl-ds.dtsi
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-venice-gw7901.dts
+ create mode 100644 include/dt-bindings/power/imx8mm-power.h
+Merging keystone/next (9d2e21ed98a2 Merge branch 'for_5.12/drivers-soc' into next)
+$ git merge keystone/next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging mediatek/for-next (fd450fd2a4fb Merge branch 'v5.13-next/soc' into for-next)
+$ git merge mediatek/for-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/arm/mediatek.yaml | 29 ++++-
+ arch/arm64/boot/dts/mediatek/Makefile | 8 ++
+ arch/arm64/boot/dts/mediatek/mt8167.dtsi | 121 +++++++++++++++++++++
+ arch/arm64/boot/dts/mediatek/mt8173.dtsi | 60 +++++-----
+ .../dts/mediatek/mt8183-kukui-jacuzzi-burnet.dts | 30 +++++
+ .../mediatek/mt8183-kukui-jacuzzi-fennel-sku1.dts | 44 ++++++++
+ .../mediatek/mt8183-kukui-jacuzzi-fennel-sku6.dts | 32 ++++++
+ .../dts/mediatek/mt8183-kukui-jacuzzi-fennel.dtsi | 27 +++++
+ .../dts/mediatek/mt8183-kukui-jacuzzi-fennel14.dts | 16 +++
+ .../dts/mediatek/mt8183-kukui-jacuzzi-kappa.dts | 16 +++
+ .../dts/mediatek/mt8183-kukui-jacuzzi-kenzo.dts | 12 ++
+ .../mediatek/mt8183-kukui-jacuzzi-willow-sku0.dts | 13 +++
+ .../mediatek/mt8183-kukui-jacuzzi-willow-sku1.dts | 12 ++
+ .../dts/mediatek/mt8183-kukui-jacuzzi-willow.dtsi | 26 +++++
+ .../boot/dts/mediatek/mt8183-kukui-jacuzzi.dtsi | 8 ++
+ drivers/soc/mediatek/mtk-devapc.c | 1 +
+ 16 files changed, 424 insertions(+), 31 deletions(-)
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-burnet.dts
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku1.dts
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku6.dts
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel.dtsi
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel14.dts
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-kappa.dts
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-kenzo.dts
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-willow-sku0.dts
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-willow-sku1.dts
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-willow.dtsi
+Merging mvebu/for-next (79e93f9dc81a Merge branch 'mvebu/dt64' into mvebu/for-next)
+$ git merge mvebu/for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging omap/for-next (3f89af8097bd Merge branch 'omap-for-v5.14/dt' into for-next)
+$ git merge omap/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 6 -
+ arch/arm/boot/dts/am335x-baltos.dtsi | 4 +-
+ arch/arm/boot/dts/am335x-boneblack-wireless.dts | 2 +-
+ arch/arm/boot/dts/am335x-boneblue.dts | 2 +-
+ arch/arm/boot/dts/am335x-bonegreen-wireless.dts | 4 +-
+ arch/arm/boot/dts/am335x-evmsk.dts | 2 +-
+ arch/arm/boot/dts/am335x-icev2.dts | 4 +-
+ arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi | 2 +-
+ arch/arm/boot/dts/am335x-moxa-uc-8100-common.dtsi | 2 +-
+ arch/arm/boot/dts/am335x-osd3358-sm-red.dts | 132 ++++++++++------------
+ arch/arm/boot/dts/am335x-shc.dts | 8 +-
+ arch/arm/boot/dts/am33xx-l4.dtsi | 4 +-
+ arch/arm/boot/dts/am437x-gp-evm.dts | 9 +-
+ arch/arm/boot/dts/am437x-l4.dtsi | 16 +--
+ arch/arm/boot/dts/am43x-epos-evm.dts | 2 +-
+ arch/arm/boot/dts/am57xx-cl-som-am57x.dts | 13 +--
+ arch/arm/boot/dts/dm816x.dtsi | 2 +-
+ arch/arm/boot/dts/dra7-evm.dts | 2 +-
+ arch/arm/boot/dts/dra7-ipu-dsp-common.dtsi | 6 +-
+ arch/arm/boot/dts/dra7-l4.dtsi | 24 ++--
+ arch/arm/boot/dts/dra71-evm.dts | 2 +-
+ arch/arm/boot/dts/dra72-evm-common.dtsi | 2 +-
+ arch/arm/boot/dts/dra72x.dtsi | 6 +-
+ arch/arm/boot/dts/dra74-ipu-dsp-common.dtsi | 2 +-
+ arch/arm/boot/dts/dra74x.dtsi | 8 +-
+ arch/arm/boot/dts/dra76-evm.dts | 37 +-----
+ arch/arm/boot/dts/omap2420.dtsi | 5 +-
+ arch/arm/boot/dts/omap2430.dtsi | 2 +-
+ arch/arm/boot/dts/omap3-evm-processor-common.dtsi | 2 +-
+ arch/arm/boot/dts/omap3-gta04a5.dts | 2 +-
+ arch/arm/boot/dts/omap3.dtsi | 2 +-
+ arch/arm/boot/dts/omap4-l4.dtsi | 4 +-
+ arch/arm/boot/dts/omap5-board-common.dtsi | 2 +-
+ arch/arm/boot/dts/omap5-l4.dtsi | 4 +-
+ arch/arm/configs/omap2plus_defconfig | 5 +
+ arch/arm/mach-omap1/Kconfig | 12 +-
+ arch/arm/mach-omap2/cm.h | 1 -
+ arch/arm/mach-omap2/cm_common.c | 13 ---
+ arch/arm/mach-omap2/control.c | 5 -
+ arch/arm/mach-omap2/control.h | 1 -
+ 40 files changed, 150 insertions(+), 213 deletions(-)
+Merging qcom/for-next (55ac24b7e577 Merge branches 'arm64-defconfig-for-5.14', 'arm64-for-5.14', 'drivers-for-5.14' and 'dts-for-5.14' into for-next)
+$ git merge qcom/for-next
+Auto-merging arch/arm64/configs/defconfig
+Removing arch/arm64/boot/dts/qcom/msm8996-pins.dtsi
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/arm/qcom.yaml | 1 +
+ .../devicetree/bindings/power/qcom,rpmpd.yaml | 1 +
+ .../devicetree/bindings/soc/qcom/qcom,smd-rpm.yaml | 2 +
+ arch/arm/boot/dts/qcom-ipq8064-rb3011.dts | 58 ++
+ arch/arm/boot/dts/qcom-ipq8064.dtsi | 425 ++++++++
+ arch/arm/boot/dts/qcom-sdx55-t55.dts | 2 +-
+ arch/arm/boot/dts/qcom-sdx55-telit-fn980-tlb.dts | 4 +-
+ arch/arm64/boot/dts/qcom/Makefile | 8 +-
+ arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 93 +-
+ arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts | 24 +-
+ arch/arm64/boot/dts/qcom/ipq8074-hk10-c1.dts | 11 +
+ arch/arm64/boot/dts/qcom/ipq8074-hk10-c2.dts | 10 +
+ arch/arm64/boot/dts/qcom/ipq8074-hk10.dtsi | 76 ++
+ arch/arm64/boot/dts/qcom/ipq8074.dtsi | 5 +-
+ .../boot/dts/qcom/msm8916-alcatel-idol347.dts | 26 +
+ .../arm64/boot/dts/qcom/msm8994-angler-rev-101.dts | 4 +
+ arch/arm64/boot/dts/qcom/msm8996-mtp.dtsi | 2 +-
+ arch/arm64/boot/dts/qcom/msm8996-pins.dtsi | 653 ------------
+ arch/arm64/boot/dts/qcom/msm8996.dtsi | 999 +++++++++++++++++-
+ arch/arm64/boot/dts/qcom/msm8998.dtsi | 2 +-
+ arch/arm64/boot/dts/qcom/pm7325.dtsi | 53 +
+ arch/arm64/boot/dts/qcom/pm8350c.dtsi | 32 +-
+ arch/arm64/boot/dts/qcom/pm8994.dtsi | 8 +-
+ arch/arm64/boot/dts/qcom/pmi8994.dtsi | 13 +
+ arch/arm64/boot/dts/qcom/pmk8350.dtsi | 51 +-
+ arch/arm64/boot/dts/qcom/pmr735a.dtsi | 32 +-
+ arch/arm64/boot/dts/qcom/qcs404-evb.dtsi | 2 +-
+ arch/arm64/boot/dts/qcom/qcs404.dtsi | 4 +-
+ arch/arm64/boot/dts/qcom/sc7180-idp.dts | 67 +-
+ .../boot/dts/qcom/sc7180-trogdor-coachz-r1-lte.dts | 4 +-
+ .../boot/dts/qcom/sc7180-trogdor-coachz-r1.dts | 22 +-
+ ...r2-lte.dts => sc7180-trogdor-coachz-r3-lte.dts} | 6 +-
+ ...-coachz-r2.dts => sc7180-trogdor-coachz-r3.dts} | 4 +-
+ .../arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi | 63 ++
+ .../boot/dts/qcom/sc7180-trogdor-lazor-r0.dts | 9 -
+ .../boot/dts/qcom/sc7180-trogdor-lazor-r1.dts | 9 -
+ .../boot/dts/qcom/sc7180-trogdor-lazor-r3.dts | 9 -
+ arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 9 +
+ .../boot/dts/qcom/sc7180-trogdor-pompom-r1.dts | 12 +
+ .../boot/dts/qcom/sc7180-trogdor-pompom-r2-lte.dts | 4 +-
+ .../boot/dts/qcom/sc7180-trogdor-pompom-r2.dts | 38 +-
+ .../boot/dts/qcom/sc7180-trogdor-pompom-r3-lte.dts | 14 +
+ .../boot/dts/qcom/sc7180-trogdor-pompom-r3.dts | 15 +
+ .../arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi | 29 +
+ arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 9 +-
+ arch/arm64/boot/dts/qcom/sc7180.dtsi | 10 +-
+ arch/arm64/boot/dts/qcom/sc7280-idp.dts | 36 +-
+ arch/arm64/boot/dts/qcom/sc7280.dtsi | 1084 ++++++++++++++++++++
+ .../arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 18 +
+ .../boot/dts/qcom/sdm845-xiaomi-beryllium.dts | 114 ++
+ arch/arm64/boot/dts/qcom/sdm845.dtsi | 4 +-
+ .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 2 +
+ arch/arm64/boot/dts/qcom/sm8150.dtsi | 72 +-
+ arch/arm64/boot/dts/qcom/sm8250.dtsi | 4 +-
+ arch/arm64/boot/dts/qcom/sm8350-mtp.dts | 6 +
+ arch/arm64/boot/dts/qcom/sm8350.dtsi | 64 +-
+ arch/arm64/configs/defconfig | 1 +
+ drivers/bus/qcom-ebi2.c | 4 +-
+ drivers/soc/qcom/rpmhpd.c | 21 +
+ drivers/soc/qcom/smd-rpm.c | 2 +
+ drivers/soc/qcom/socinfo.c | 56 +-
+ include/dt-bindings/mailbox/qcom-ipcc.h | 1 +
+ include/dt-bindings/power/qcom-rpmpd.h | 13 +
+ 63 files changed, 3563 insertions(+), 873 deletions(-)
+ create mode 100644 arch/arm64/boot/dts/qcom/ipq8074-hk10-c1.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/ipq8074-hk10-c2.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/ipq8074-hk10.dtsi
+ delete mode 100644 arch/arm64/boot/dts/qcom/msm8996-pins.dtsi
+ create mode 100644 arch/arm64/boot/dts/qcom/pm7325.dtsi
+ rename arch/arm64/boot/dts/qcom/{sc7180-trogdor-coachz-r2-lte.dts => sc7180-trogdor-coachz-r3-lte.dts} (69%)
+ rename arch/arm64/boot/dts/qcom/{sc7180-trogdor-coachz-r2.dts => sc7180-trogdor-coachz-r3.dts} (75%)
+ create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r3-lte.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r3.dts
+Merging raspberrypi/for-next (fbdcf1d20126 ARM: dts: bcm2711: Add the CEC interrupt controller)
+$ git merge raspberrypi/for-next
+Auto-merging arch/arm64/configs/defconfig
+Auto-merging arch/arm64/Kconfig.platforms
+Auto-merging arch/arm/configs/multi_v7_defconfig
+Auto-merging arch/arm/boot/dts/bcm2711.dtsi
+CONFLICT (content): Merge conflict in arch/arm/boot/dts/bcm2711.dtsi
+Resolved 'arch/arm/boot/dts/bcm2711.dtsi' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master b5dc5b52fa1f] Merge remote-tracking branch 'raspberrypi/for-next'
+$ git diff -M --stat --summary HEAD^..
+Merging renesas/next (acad452912fc Merge branch 'renesas-arm-dt-for-v5.14' into renesas-next)
+$ git merge renesas/next
+Auto-merging arch/arm64/configs/defconfig
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/r8a7742.dtsi | 6 +++-
+ arch/arm/boot/dts/r8a7743.dtsi | 4 ++-
+ arch/arm/boot/dts/r8a7744.dtsi | 4 ++-
+ arch/arm/boot/dts/r8a7745.dtsi | 4 ++-
+ arch/arm/boot/dts/r8a77470.dtsi | 4 ++-
+ arch/arm/boot/dts/r8a7778.dtsi | 3 ++
+ arch/arm/boot/dts/r8a7779-marzen.dts | 2 +-
+ arch/arm/boot/dts/r8a7779.dtsi | 4 +++
+ arch/arm/boot/dts/r8a7790-lager.dts | 8 +++++
+ arch/arm/boot/dts/r8a7790.dtsi | 10 +++++-
+ arch/arm/boot/dts/r8a7791-koelsch.dts | 4 +--
+ arch/arm/boot/dts/r8a7791.dtsi | 4 ++-
+ arch/arm/boot/dts/r8a7792-blanche.dts | 8 +++++
+ arch/arm/boot/dts/r8a7792.dtsi | 4 ++-
+ arch/arm/boot/dts/r8a7793-gose.dts | 10 +++++-
+ arch/arm/boot/dts/r8a7793.dtsi | 3 +-
+ arch/arm/boot/dts/r8a7794-alt.dts | 42 ++++++++++++++++++++++
+ arch/arm/boot/dts/r8a7794-silk.dts | 10 +++++-
+ arch/arm/boot/dts/r8a7794.dtsi | 4 ++-
+ arch/arm/configs/shmobile_defconfig | 1 -
+ .../boot/dts/renesas/beacon-renesom-baseboard.dtsi | 4 +--
+ .../arm64/boot/dts/renesas/beacon-renesom-som.dtsi | 8 +++--
+ arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 2 ++
+ arch/arm64/boot/dts/renesas/r8a774b1.dtsi | 1 +
+ arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 1 +
+ arch/arm64/boot/dts/renesas/r8a774e1.dtsi | 1 +
+ arch/arm64/boot/dts/renesas/r8a77951.dtsi | 1 +
+ arch/arm64/boot/dts/renesas/r8a77960.dtsi | 8 +++--
+ arch/arm64/boot/dts/renesas/r8a77961.dtsi | 8 +++--
+ arch/arm64/boot/dts/renesas/r8a77965.dtsi | 1 +
+ arch/arm64/boot/dts/renesas/r8a77970-eagle.dts | 8 +++++
+ arch/arm64/boot/dts/renesas/r8a77970-v3msk.dts | 2 +-
+ arch/arm64/boot/dts/renesas/r8a77970.dtsi | 1 +
+ arch/arm64/boot/dts/renesas/r8a77980-condor.dts | 8 +----
+ arch/arm64/boot/dts/renesas/r8a77980.dtsi | 1 +
+ arch/arm64/boot/dts/renesas/r8a77990.dtsi | 1 +
+ arch/arm64/boot/dts/renesas/r8a77995.dtsi | 1 +
+ .../boot/dts/renesas/r8a779a0-falcon-csi-dsi.dtsi | 21 +++++++++++
+ arch/arm64/boot/dts/renesas/r8a779a0.dtsi | 6 ++++
+ arch/arm64/configs/defconfig | 1 +
+ 40 files changed, 190 insertions(+), 34 deletions(-)
+Merging reset/reset/next (e207457f9045 reset: brcmstb: Add missing MODULE_DEVICE_TABLE)
+$ git merge reset/reset/next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/reset/microchip,rst.yaml | 58 ++++++++
+ drivers/reset/Kconfig | 12 +-
+ drivers/reset/Makefile | 1 +
+ drivers/reset/core.c | 20 +--
+ drivers/reset/reset-a10sr.c | 1 +
+ drivers/reset/reset-bcm6345.c | 2 +-
+ drivers/reset/reset-berlin.c | 2 +-
+ drivers/reset/reset-brcmstb.c | 1 +
+ drivers/reset/reset-microchip-sparx5.c | 146 +++++++++++++++++++++
+ drivers/reset/reset-oxnas.c | 2 +-
+ drivers/reset/reset-ti-syscon.c | 4 +-
+ drivers/reset/reset-uniphier.c | 2 +-
+ drivers/reset/reset-zynqmp.c | 4 +-
+ drivers/reset/sti/reset-syscfg.c | 2 +-
+ 14 files changed, 237 insertions(+), 20 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/reset/microchip,rst.yaml
+ create mode 100644 drivers/reset/reset-microchip-sparx5.c
+Merging rockchip/for-next (8c149afdaa9a Merge branch 'v5.14-armsoc/drivers' into for-next)
+$ git merge rockchip/for-next
+Removing Documentation/devicetree/bindings/soc/rockchip/power_domain.txt
+Removing Documentation/devicetree/bindings/soc/rockchip/grf.txt
+Removing Documentation/devicetree/bindings/arm/rockchip/pmu.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/arm/rockchip/pmu.txt | 16 --
+ .../devicetree/bindings/arm/rockchip/pmu.yaml | 55 +++++
+ .../bindings/power/rockchip,power-controller.yaml | 248 ++++++++++++++++++++
+ .../devicetree/bindings/soc/rockchip/grf.txt | 61 -----
+ .../devicetree/bindings/soc/rockchip/grf.yaml | 260 +++++++++++++++++++++
+ .../bindings/soc/rockchip/power_domain.txt | 136 -----------
+ arch/arm/boot/dts/rk3036-kylin.dts | 2 +-
+ arch/arm/boot/dts/rk3036.dtsi | 1 -
+ arch/arm/boot/dts/rk3066a-bqcurie2.dts | 5 +
+ arch/arm/boot/dts/rk3066a-marsboard.dts | 4 +
+ arch/arm/boot/dts/rk3066a-mk808.dts | 5 +
+ arch/arm/boot/dts/rk3066a-rayeager.dts | 8 +-
+ arch/arm/boot/dts/rk3066a.dtsi | 62 ++---
+ arch/arm/boot/dts/rk3188-bqedison2qc.dts | 6 +
+ arch/arm/boot/dts/rk3188-px3-evb.dts | 5 +
+ arch/arm/boot/dts/rk3188-radxarock.dts | 4 +
+ arch/arm/boot/dts/rk3188.dtsi | 70 +++---
+ arch/arm/boot/dts/rk322x.dtsi | 16 +-
+ arch/arm/boot/dts/rk3288.dtsi | 18 +-
+ arch/arm/boot/dts/rk3xxx.dtsi | 5 +-
+ arch/arm64/boot/dts/rockchip/px30.dtsi | 26 ++-
+ arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts | 4 +-
+ arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts | 36 ++-
+ arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts | 9 +-
+ arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts | 7 +-
+ arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 5 +
+ arch/arm64/boot/dts/rockchip/rk3328.dtsi | 11 +-
+ arch/arm64/boot/dts/rockchip/rk3368.dtsi | 2 +
+ .../boot/dts/rockchip/rk3399-gru-scarlet.dtsi | 2 +-
+ arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 4 +-
+ .../boot/dts/rockchip/rk3399-kobol-helios64.dts | 77 ++++++
+ arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts | 2 +-
+ arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi | 1 -
+ arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi | 1 -
+ arch/arm64/boot/dts/rockchip/rk3399.dtsi | 62 +++--
+ .../boot/dts/rockchip/rk3399pro-vmarc-som.dtsi | 1 -
+ drivers/clk/rockchip/clk-rk3036.c | 2 +-
+ drivers/clk/rockchip/clk-rk3568.c | 10 +-
+ drivers/clk/rockchip/clk.h | 29 ++-
+ drivers/soc/rockchip/pm_domains.c | 252 +++++++++++---------
+ include/dt-bindings/power/rk3568-power.h | 32 +++
+ 41 files changed, 1091 insertions(+), 471 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/arm/rockchip/pmu.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/rockchip/pmu.yaml
+ create mode 100644 Documentation/devicetree/bindings/power/rockchip,power-controller.yaml
+ delete mode 100644 Documentation/devicetree/bindings/soc/rockchip/grf.txt
+ create mode 100644 Documentation/devicetree/bindings/soc/rockchip/grf.yaml
+ delete mode 100644 Documentation/devicetree/bindings/soc/rockchip/power_domain.txt
+ create mode 100644 include/dt-bindings/power/rk3568-power.h
+Merging samsung-krzk/for-next (fc14c3f36825 Merge branch 'next/defconfig' into for-next)
+$ git merge samsung-krzk/for-next
+Auto-merging arch/arm64/configs/defconfig
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 3 +++
+ arch/arm/boot/dts/exynos3250-rinato.dts | 2 +-
+ arch/arm/boot/dts/exynos4210-i9100.dts | 8 +++++---
+ arch/arm/boot/dts/exynos4210-trats.dts | 2 +-
+ arch/arm/boot/dts/exynos4210-universal_c210.dts | 2 +-
+ arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi | 1 +
+ arch/arm/boot/dts/exynos4412-midas.dtsi | 1 +
+ arch/arm/boot/dts/exynos4412-n710x.dts | 4 ++--
+ arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 1 +
+ arch/arm/boot/dts/exynos4412-origen.dts | 1 +
+ arch/arm/boot/dts/exynos4412-p4note.dtsi | 1 +
+ arch/arm/boot/dts/exynos5250-arndale.dts | 1 +
+ arch/arm/boot/dts/exynos5410-odroidxu.dts | 1 +
+ arch/arm/boot/dts/exynos5420-arndale-octa.dts | 1 +
+ arch/arm/boot/dts/exynos5420-smdk5420.dts | 1 +
+ arch/arm/boot/dts/exynos5422-odroid-core.dtsi | 1 +
+ arch/arm/boot/dts/exynos5422-odroidhc1.dts | 2 +-
+ arch/arm/boot/dts/exynos5422-odroidxu4.dts | 2 +-
+ arch/arm/boot/dts/exynos54xx-odroidxu-leds.dtsi | 4 ++--
+ arch/arm/boot/dts/s5pv210-goni.dts | 9 ---------
+ arch/arm/mach-exynos/exynos.c | 2 ++
+ arch/arm/mach-s3c/mach-rx1950.c | 1 -
+ arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi | 1 +
+ arch/arm64/configs/defconfig | 2 ++
+ include/linux/soc/samsung/exynos-regs-pmu.h | 6 ------
+ 25 files changed, 32 insertions(+), 28 deletions(-)
+Merging scmi/for-linux-next (81bc41a2c168 Merge branch 'for-next/scmi' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next)
+$ git merge scmi/for-linux-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 7 +
+ drivers/firmware/Kconfig | 3 +-
+ drivers/firmware/Makefile | 1 +
+ drivers/firmware/arm_ffa/Kconfig | 21 +
+ drivers/firmware/arm_ffa/Makefile | 6 +
+ drivers/firmware/arm_ffa/bus.c | 210 +++++++++
+ drivers/firmware/arm_ffa/common.h | 31 ++
+ drivers/firmware/arm_ffa/driver.c | 731 +++++++++++++++++++++++++++++
+ drivers/firmware/arm_ffa/smccc.c | 39 ++
+ drivers/firmware/arm_scmi/common.h | 2 +-
+ drivers/firmware/arm_scmi/driver.c | 4 +
+ drivers/firmware/arm_scmi/scmi_pm_domain.c | 26 +
+ include/linux/arm_ffa.h | 267 +++++++++++
+ 13 files changed, 1346 insertions(+), 2 deletions(-)
+ create mode 100644 drivers/firmware/arm_ffa/Kconfig
+ create mode 100644 drivers/firmware/arm_ffa/Makefile
+ create mode 100644 drivers/firmware/arm_ffa/bus.c
+ create mode 100644 drivers/firmware/arm_ffa/common.h
+ create mode 100644 drivers/firmware/arm_ffa/driver.c
+ create mode 100644 drivers/firmware/arm_ffa/smccc.c
+ create mode 100644 include/linux/arm_ffa.h
+Merging stm32/stm32-next (3dab3e1862cf ARM: dts: stm32: fix ltdc pinctrl on microdev2.0-of7)
+$ git merge stm32/stm32-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/mfd/st,stm32-timers.yaml | 2 -
+ .../devicetree/bindings/net/stm32-dwmac.yaml | 6 +-
+ arch/arm/boot/dts/stm32429i-eval.dts | 8 +--
+ arch/arm/boot/dts/stm32746g-eval.dts | 6 +-
+ arch/arm/boot/dts/stm32f4-pinctrl.dtsi | 2 +-
+ arch/arm/boot/dts/stm32f429-disco.dts | 6 +-
+ arch/arm/boot/dts/stm32f429-pinctrl.dtsi | 72 ++++++++++-----------
+ arch/arm/boot/dts/stm32f429.dtsi | 10 +--
+ arch/arm/boot/dts/stm32f469-disco.dts | 6 +-
+ arch/arm/boot/dts/stm32f469-pinctrl.dtsi | 74 ++++++++++------------
+ arch/arm/boot/dts/stm32f7-pinctrl.dtsi | 2 +-
+ arch/arm/boot/dts/stm32f746.dtsi | 12 +---
+ arch/arm/boot/dts/stm32f769-disco.dts | 6 +-
+ arch/arm/boot/dts/stm32h743.dtsi | 4 --
+ arch/arm/boot/dts/stm32mp151.dtsi | 16 ++---
+ ...m32mp157a-microgea-stm32mp1-microdev2.0-of7.dts | 2 +-
+ arch/arm/boot/dts/stm32mp157c-odyssey.dts | 2 +-
+ arch/arm/boot/dts/stm32mp15xx-dhcom-pdk2.dtsi | 6 +-
+ arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi | 8 ++-
+ 19 files changed, 108 insertions(+), 142 deletions(-)
+Merging sunxi/sunxi/for-next (2b4f0bf55549 Merge branches 'sunxi/clk-fixes-for-5.13', 'sunxi/dt-for-5.14' and 'sunxi/fixes-for-5.13' into sunxi/for-next)
+$ git merge sunxi/sunxi/for-next
+Auto-merging arch/arm/boot/dts/Makefile
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/arm/sunxi.yaml | 11 ++
+ .../bindings/pwm/allwinner,sun4i-a10-pwm.yaml | 3 +
+ .../bindings/sound/allwinner,sun4i-a10-i2s.yaml | 3 +
+ .../sound/allwinner,sun8i-a23-codec-analog.yaml | 9 +-
+ .../bindings/sound/allwinner,sun8i-a33-codec.yaml | 8 +-
+ .../bindings/timer/allwinner,sun4i-a10-timer.yaml | 42 ++---
+ .../devicetree/bindings/vendor-prefixes.yaml | 2 +
+ arch/arm/boot/dts/Makefile | 1 +
+ arch/arm/boot/dts/sun8i-a33.dtsi | 4 +-
+ arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts | 2 +-
+ arch/arm/boot/dts/sun8i-r40-feta40i.dtsi | 106 +++++++++++
+ arch/arm/boot/dts/sun8i-r40-oka40i-c.dts | 203 +++++++++++++++++++++
+ arch/arm/boot/dts/sun8i-r40.dtsi | 56 ++++++
+ arch/arm/boot/dts/sun8i-v3.dtsi | 31 ++++
+ arch/arm/boot/dts/sun8i-v3s.dtsi | 48 +++++
+ arch/arm64/Kconfig.platforms | 1 +
+ arch/arm64/boot/dts/allwinner/Makefile | 1 +
+ .../boot/dts/allwinner/sun50i-a64-pinephone.dtsi | 25 +++
+ arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 62 +++++--
+ .../boot/dts/allwinner/sun50i-h5-nanopi-r1s-h5.dts | 195 ++++++++++++++++++++
+ arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 9 +
+ drivers/clk/sunxi-ng/ccu-sun8i-v3s.c | 4 +-
+ 22 files changed, 775 insertions(+), 51 deletions(-)
+ create mode 100644 arch/arm/boot/dts/sun8i-r40-feta40i.dtsi
+ create mode 100644 arch/arm/boot/dts/sun8i-r40-oka40i-c.dts
+ create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-r1s-h5.dts
+Merging tegra/for-next (d34628844904 Merge branch for-5.14/arm64/dt into for-next)
+$ git merge tegra/for-next
+Auto-merging drivers/regulator/core.c
+Removing Documentation/devicetree/bindings/clock/nvidia,tegra30-car.txt
+Removing Documentation/devicetree/bindings/clock/nvidia,tegra210-car.txt
+Removing Documentation/devicetree/bindings/clock/nvidia,tegra20-car.txt
+Removing Documentation/devicetree/bindings/clock/nvidia,tegra124-car.txt
+Removing Documentation/devicetree/bindings/clock/nvidia,tegra114-car.txt
+Merge made by the 'recursive' strategy.
+ .../bindings/arm/tegra/nvidia,tegra20-pmc.yaml | 35 +++++
+ .../bindings/clock/nvidia,tegra114-car.txt | 63 ---------
+ .../bindings/clock/nvidia,tegra124-car.txt | 107 ---------------
+ .../bindings/clock/nvidia,tegra124-car.yaml | 115 ++++++++++++++++
+ .../bindings/clock/nvidia,tegra20-car.txt | 63 ---------
+ .../bindings/clock/nvidia,tegra20-car.yaml | 69 ++++++++++
+ .../bindings/clock/nvidia,tegra210-car.txt | 56 --------
+ .../bindings/clock/nvidia,tegra30-car.txt | 63 ---------
+ arch/arm/boot/dts/tegra124.dtsi | 3 +-
+ arch/arm/boot/dts/tegra20-acer-a500-picasso.dts | 21 ++-
+ arch/arm/boot/dts/tegra20-harmony.dts | 2 +-
+ arch/arm/boot/dts/tegra20-medcom-wide.dts | 2 +-
+ arch/arm/boot/dts/tegra20-paz00.dts | 43 +++++-
+ arch/arm/boot/dts/tegra20-plutux.dts | 2 +-
+ arch/arm/boot/dts/tegra20-seaboard.dts | 2 +-
+ arch/arm/boot/dts/tegra20-tec.dts | 2 +-
+ arch/arm/boot/dts/tegra20-ventana.dts | 2 +-
+ .../dts/tegra30-asus-nexus7-grouper-common.dtsi | 16 +--
+ .../tegra30-asus-nexus7-grouper-maxim-pmic.dtsi | 9 ++
+ .../dts/tegra30-asus-nexus7-grouper-ti-pmic.dtsi | 11 +-
+ arch/arm/boot/dts/tegra30-cardhu.dtsi | 2 +-
+ arch/arm/boot/dts/tegra30-ouya.dts | 4 +-
+ arch/arm/boot/dts/tegra30.dtsi | 3 +-
+ arch/arm/configs/tegra_defconfig | 1 +
+ arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts | 4 +-
+ arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts | 4 +-
+ .../arm64/boot/dts/nvidia/tegra194-p3509-0000.dtsi | 2 +-
+ arch/arm64/boot/dts/nvidia/tegra194.dtsi | 14 ++
+ arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts | 2 +-
+ arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi | 2 +-
+ arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts | 4 +-
+ drivers/clk/tegra/clk-periph-gate.c | 80 ++++++-----
+ drivers/clk/tegra/clk-periph.c | 11 ++
+ drivers/clk/tegra/clk-pll.c | 12 +-
+ drivers/clk/tegra/clk-tegra-periph.c | 6 +-
+ drivers/clk/tegra/clk-tegra-super-cclk.c | 16 ++-
+ drivers/clk/tegra/clk-tegra124-emc.c | 4 +-
+ drivers/clk/tegra/clk-tegra20.c | 6 +-
+ drivers/clk/tegra/clk-tegra30.c | 6 +-
+ drivers/clk/tegra/clk.h | 4 -
+ drivers/firmware/tegra/bpmp-tegra210.c | 2 +-
+ drivers/memory/tegra/Kconfig | 16 ++-
+ drivers/memory/tegra/tegra124-emc.c | 4 +-
+ drivers/memory/tegra/tegra20-emc.c | 48 +------
+ drivers/memory/tegra/tegra30-emc.c | 52 +------
+ drivers/regulator/core.c | 23 ++++
+ drivers/soc/tegra/Kconfig | 2 +
+ drivers/soc/tegra/common.c | 97 ++++++++++++++
+ drivers/soc/tegra/fuse/fuse-tegra.c | 6 +-
+ drivers/soc/tegra/pmc.c | 149 ++++++++++++++++++++-
+ drivers/soc/tegra/regulators-tegra20.c | 94 ++++++++++++-
+ drivers/soc/tegra/regulators-tegra30.c | 93 ++++++++++++-
+ include/linux/clk/tegra.h | 100 +++++++++++---
+ include/linux/regulator/driver.h | 1 +
+ include/soc/tegra/common.h | 31 +++++
+ include/soc/tegra/fuse.h | 20 ++-
+ include/soc/tegra/pmc.h | 7 +
+ 57 files changed, 1036 insertions(+), 582 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/clock/nvidia,tegra114-car.txt
+ delete mode 100644 Documentation/devicetree/bindings/clock/nvidia,tegra124-car.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/nvidia,tegra124-car.yaml
+ delete mode 100644 Documentation/devicetree/bindings/clock/nvidia,tegra20-car.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/nvidia,tegra20-car.yaml
+ delete mode 100644 Documentation/devicetree/bindings/clock/nvidia,tegra210-car.txt
+ delete mode 100644 Documentation/devicetree/bindings/clock/nvidia,tegra30-car.txt
+Merging ti-k3/ti-k3-next (1e3d655fe7b4 Merge branch 'ti-k3-config-next' into ti-k3-next)
+$ git merge ti-k3/ti-k3-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging ti-k3-new/ti-k3-next (69db725cdb2b arm64: dts: ti: k3-am654x/j721e/j7200-common-proc-board: Fix MCU_RGMII1_TXC direction)
+$ git merge ti-k3-new/ti-k3-next
+Merge made by the 'recursive' strategy.
+ arch/arm64/boot/dts/ti/k3-am64-main.dtsi | 11 ++---
+ arch/arm64/boot/dts/ti/k3-am64-mcu.dtsi | 5 ++-
+ arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi | 48 ++++++++++++++++++++++
+ arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 10 +++--
+ arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi | 4 +-
+ arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi | 13 +++---
+ arch/arm64/boot/dts/ti/k3-am654-base-board.dts | 33 +--------------
+ .../boot/dts/ti/k3-j7200-common-proc-board.dts | 2 +-
+ arch/arm64/boot/dts/ti/k3-j7200-main.dtsi | 13 +++---
+ arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi | 9 ++--
+ .../boot/dts/ti/k3-j721e-common-proc-board.dts | 2 +-
+ arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 10 +++--
+ arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 11 ++---
+ 13 files changed, 98 insertions(+), 73 deletions(-)
+Merging xilinx/for-next (6efb943b8616 Linux 5.13-rc1)
+$ git merge xilinx/for-next
+Already up to date.
+Merging clk/clk-next (6efb943b8616 Linux 5.13-rc1)
+$ git merge clk/clk-next
+Already up to date.
+Merging clk-imx/for-next (faa1847d03a2 clk: imx: scu: add enet rgmii gpr clocks)
+$ git merge clk-imx/for-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/arm/freescale/fsl,scu.txt | 10 +-
+ drivers/clk/imx/Makefile | 3 +-
+ drivers/clk/imx/clk-imx8mp.c | 1 -
+ drivers/clk/imx/clk-imx8qm-rsrc.c | 116 +++++++++++
+ drivers/clk/imx/clk-imx8qxp-rsrc.c | 89 ++++++++
+ drivers/clk/imx/clk-imx8qxp.c | 225 +++++++++------------
+ drivers/clk/imx/clk-scu.c | 219 +++++++++++++++++++-
+ drivers/clk/imx/clk-scu.h | 56 +++--
+ include/dt-bindings/clock/imx8-clock.h | 128 ------------
+ 9 files changed, 569 insertions(+), 278 deletions(-)
+ create mode 100644 drivers/clk/imx/clk-imx8qm-rsrc.c
+ create mode 100644 drivers/clk/imx/clk-imx8qxp-rsrc.c
+Merging clk-renesas/renesas-clk (790c06cc5df2 clk: renesas: r8a77995: Add ZA2 clock)
+$ git merge clk-renesas/renesas-clk
+Merge made by the 'recursive' strategy.
+ drivers/clk/renesas/clk-div6.c | 80 ++++++++-----
+ drivers/clk/renesas/r8a77995-cpg-mssr.c | 1 +
+ drivers/clk/renesas/r8a779a0-cpg-mssr.c | 4 +
+ drivers/clk/renesas/r9a06g032-clocks.c | 25 ++--
+ drivers/clk/renesas/rcar-gen3-cpg.c | 183 +++++++++++++++++++++++++-----
+ drivers/clk/renesas/rcar-usb2-clock-sel.c | 24 ++--
+ drivers/clk/renesas/renesas-cpg-mssr.c | 10 +-
+ 7 files changed, 244 insertions(+), 83 deletions(-)
+Merging clk-samsung/for-next (a38fd8748464 Linux 5.12-rc2)
+$ git merge clk-samsung/for-next
+Already up to date.
+Merging csky/linux-next (280af034a71d csky: Kconfig: Remove unused selects)
+$ git merge csky/linux-next
+Merge made by the 'recursive' strategy.
+ arch/csky/Kconfig | 3 ---
+ arch/csky/mm/syscache.c | 12 +++++++-----
+ 2 files changed, 7 insertions(+), 8 deletions(-)
+Merging h8300/h8300-next (6e5e55227c95 Merge tag 'v5.11' into h8300-next)
+$ git merge h8300/h8300-next
+Auto-merging drivers/tty/serial/sh-sci.c
+Auto-merging drivers/net/ethernet/smsc/smc91x.c
+Merge made by the 'recursive' strategy.
+ arch/h8300/Kconfig.cpu | 4 ++
+ arch/h8300/boot/dts/edosk2674.dts | 10 ++++-
+ arch/h8300/boot/dts/h8300h_sim.dts | 2 +-
+ arch/h8300/boot/dts/h8s_sim.dts | 2 +-
+ arch/h8300/configs/edosk2674_defconfig | 10 ++---
+ arch/h8300/configs/h8300h-sim_defconfig | 8 +---
+ arch/h8300/configs/h8s-sim_defconfig | 8 +---
+ arch/h8300/kernel/setup.c | 2 +-
+ 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 +--
+ 15 files changed, 123 insertions(+), 62 deletions(-)
+Merging m68k/for-next (b44bf9410a69 m68k: defconfig: Update defconfigs for v5.13-rc1)
+$ git merge m68k/for-next
+Auto-merging arch/m68k/Makefile
+Auto-merging MAINTAINERS
+Auto-merging .mailmap
+Merge made by the 'recursive' strategy.
+ .mailmap | 1 +
+ MAINTAINERS | 4 ++--
+ arch/m68k/Makefile | 3 +--
+ arch/m68k/configs/amiga_defconfig | 5 +++--
+ arch/m68k/configs/apollo_defconfig | 5 +++--
+ arch/m68k/configs/atari_defconfig | 5 +++--
+ arch/m68k/configs/bvme6000_defconfig | 5 +++--
+ arch/m68k/configs/hp300_defconfig | 5 +++--
+ arch/m68k/configs/mac_defconfig | 5 +++--
+ arch/m68k/configs/multi_defconfig | 5 +++--
+ arch/m68k/configs/mvme147_defconfig | 5 +++--
+ arch/m68k/configs/mvme16x_defconfig | 5 +++--
+ arch/m68k/configs/q40_defconfig | 5 +++--
+ arch/m68k/configs/sun3_defconfig | 5 +++--
+ arch/m68k/configs/sun3x_defconfig | 5 +++--
+ arch/m68k/kernel/dma.c | 3 ---
+ 16 files changed, 40 insertions(+), 31 deletions(-)
+Merging m68knommu/for-next (8124c8a6b353 Linux 5.13-rc4)
+$ git merge m68knommu/for-next
+Already up to date.
+Merging microblaze/next (14a832498c23 arch: microblaze: Fix spelling mistake "vesion" -> "version")
+$ git merge microblaze/next
+Merge made by the 'recursive' strategy.
+ arch/microblaze/Makefile | 2 +-
+ arch/microblaze/include/asm/page.h | 3 ---
+ 2 files changed, 1 insertion(+), 4 deletions(-)
+Merging mips/mips-next (0fe0fbc86711 MIPS: ingenic: rs90: Add dedicated VRAM memory region)
+$ git merge mips/mips-next
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/vendor-prefixes.yaml | 2 +
+ arch/mips/Kconfig | 7 +-
+ arch/mips/Kconfig.debug | 8 ++
+ arch/mips/boot/compressed/uart-16550.c | 4 +-
+ arch/mips/boot/dts/ingenic/gcw0.dts | 5 +-
+ arch/mips/boot/dts/ingenic/jz4780.dtsi | 10 +-
+ arch/mips/boot/dts/ingenic/rs90.dts | 14 +++
+ arch/mips/boot/dts/loongson/loongson64-2k1000.dtsi | 18 ++--
+ .../boot/dts/loongson/loongson64g-package.dtsi | 4 +-
+ .../boot/dts/loongson/loongson64v_4core_virtio.dts | 2 +-
+ arch/mips/boot/dts/loongson/ls7a-pch.dtsi | 2 +-
+ arch/mips/boot/dts/loongson/rs780e-pch.dtsi | 2 +-
+ arch/mips/boot/dts/mti/sead3.dts | 2 +-
+ arch/mips/boot/dts/qca/Makefile | 1 +
+ arch/mips/boot/dts/qca/ar9331.dtsi | 2 +
+ .../dts/qca/ar9331_openembed_som9331_board.dts | 110 +++++++++++++++++++++
+ arch/mips/configs/loongson3_defconfig | 12 +--
+ arch/mips/include/asm/hugetlb.h | 8 +-
+ arch/mips/include/asm/unistd.h | 4 +
+ arch/mips/ingenic/Kconfig | 2 +
+ arch/mips/kernel/cpu-probe.c | 5 +
+ arch/mips/kernel/syscalls/Makefile | 34 +------
+ arch/mips/kernel/syscalls/syscallnr.sh | 2 -
+ arch/mips/loongson64/env.c | 3 +-
+ arch/mips/loongson64/reset.c | 5 +-
+ arch/mips/loongson64/smp.c | 10 +-
+ arch/mips/mm/dma-noncoherent.c | 1 +
+ 27 files changed, 199 insertions(+), 80 deletions(-)
+ create mode 100644 arch/mips/boot/dts/qca/ar9331_openembed_som9331_board.dts
+Merging nds32/next (40e0dd851e7b nds32: Fix bogus reference to <asm/procinfo.h>)
+$ git merge nds32/next
+Already up to date.
+Merging nios2/for-next (7f7bc20bc41a nios2: Don't use _end for calculating min_low_pfn)
+$ git merge nios2/for-next
+Already up to date.
+Merging openrisc/for-next (8b549c18ae81 openrisc: Define memory barrier mb)
+$ git merge openrisc/for-next
+Already up to date.
+Merging parisc-hd/for-next (9f4ad9e425a1 Linux 5.12)
+$ git merge parisc-hd/for-next
+Already up to date.
+Merging powerpc/next (b73c8cccd72a powerpc/kprobes: Replace ppc_optinsn by common optinsn)
+$ git merge powerpc/next
+Auto-merging arch/powerpc/include/asm/ptrace.h
+Removing arch/powerpc/include/asm/book3s/32/hash.h
+Auto-merging arch/powerpc/Makefile
+Merge made by the 'recursive' strategy.
+ arch/powerpc/Kconfig | 1 +
+ arch/powerpc/Makefile | 10 +++
+ arch/powerpc/boot/decompress.c | 4 +-
+ arch/powerpc/configs/32-bit.config | 1 +
+ arch/powerpc/configs/64-bit.config | 1 +
+ arch/powerpc/configs/mpc885_ads_defconfig | 25 ++++++++
+ arch/powerpc/include/asm/book3s/32/hash.h | 45 -------------
+ arch/powerpc/include/asm/book3s/32/kup.h | 6 +-
+ arch/powerpc/include/asm/book3s/32/pgtable.h | 38 ++++++++++-
+ arch/powerpc/include/asm/mmu.h | 14 +---
+ arch/powerpc/include/asm/paca.h | 2 -
+ arch/powerpc/include/asm/ppc-opcode.h | 1 +
+ arch/powerpc/include/asm/ptrace.h | 3 +-
+ arch/powerpc/kernel/asm-offsets.c | 52 +--------------
+ arch/powerpc/kernel/head_book3s_32.S | 54 ++++------------
+ arch/powerpc/kernel/optprobes.c | 23 ++-----
+ arch/powerpc/kernel/paca.c | 2 -
+ arch/powerpc/lib/sstep.c | 22 +++++++
+ arch/powerpc/lib/test_emulate_step.c | 29 +++++++++
+ arch/powerpc/platforms/Kconfig.cputype | 6 +-
+ arch/powerpc/platforms/powernv/pci.c | 2 +-
+ arch/powerpc/platforms/pseries/hotplug-memory.c | 58 +++++++++++------
+ arch/powerpc/platforms/pseries/papr_scm.c | 7 ++
+ arch/powerpc/platforms/pseries/ras.c | 2 -
+ include/linux/kprobes.h | 3 +
+ kernel/kprobes.c | 14 +++-
+ tools/testing/selftests/powerpc/security/Makefile | 2 +
+ .../powerpc/security/mitigation-patching.sh | 75 ++++++++++++++++++++++
+ .../testing/selftests/powerpc/tm/tm-vmx-unavail.c | 1 -
+ 29 files changed, 299 insertions(+), 204 deletions(-)
+ create mode 100644 arch/powerpc/configs/32-bit.config
+ create mode 100644 arch/powerpc/configs/64-bit.config
+ delete mode 100644 arch/powerpc/include/asm/book3s/32/hash.h
+ create mode 100755 tools/testing/selftests/powerpc/security/mitigation-patching.sh
+Merging soc-fsl/next (242b0b398ccd soc: fsl: enable acpi support in RCPM driver)
+$ git merge soc-fsl/next
+Already up to date.
+Merging risc-v/for-next (cba43c31f14b riscv: Use global mappings for kernel pages)
+$ git merge risc-v/for-next
+Auto-merging arch/riscv/mm/init.c
+Auto-merging arch/riscv/kernel/setup.c
+Auto-merging arch/riscv/kernel/probes/kprobes.c
+Auto-merging arch/riscv/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/riscv/Kconfig | 3 +
+ arch/riscv/include/asm/kprobes.h | 7 --
+ arch/riscv/include/asm/pci.h | 2 +
+ arch/riscv/include/asm/pgtable-64.h | 3 +-
+ arch/riscv/include/asm/pgtable-bits.h | 5 +
+ arch/riscv/include/asm/pgtable.h | 179 ++++++++++++++++++++++++++++++++--
+ arch/riscv/include/asm/set_memory.h | 2 +-
+ arch/riscv/include/asm/switch_to.h | 11 ++-
+ arch/riscv/kernel/cpufeature.c | 6 +-
+ arch/riscv/kernel/probes/kprobes.c | 40 ++------
+ arch/riscv/kernel/process.c | 2 +-
+ arch/riscv/kernel/setup.c | 1 -
+ arch/riscv/kernel/signal.c | 4 +-
+ arch/riscv/mm/context.c | 9 +-
+ arch/riscv/mm/init.c | 53 +++++-----
+ arch/riscv/mm/tlbflush.c | 17 +++-
+ 16 files changed, 246 insertions(+), 98 deletions(-)
+Merging s390/for-next (2417ce7ef477 Merge branch 'features' into for-next)
+$ git merge s390/for-next
+Auto-merging arch/s390/Makefile
+Merge made by the 'recursive' strategy.
+ arch/s390/Kconfig | 1 +
+ arch/s390/Makefile | 1 +
+ arch/s390/boot/als.c | 6 +-
+ arch/s390/boot/head.S | 3 +
+ arch/s390/boot/ipl_parm.c | 14 ++--
+ arch/s390/boot/startup.c | 3 +
+ arch/s390/include/asm/ccwgroup.h | 3 +-
+ arch/s390/include/asm/cpu_mcf.h | 3 +-
+ arch/s390/include/asm/facility.h | 13 +++-
+ arch/s390/include/asm/lowcore.h | 58 +++++++++++----
+ arch/s390/include/asm/mmu_context.h | 15 +++-
+ arch/s390/include/asm/pgtable.h | 19 +++++
+ arch/s390/include/asm/processor.h | 2 +-
+ arch/s390/include/asm/setup.h | 2 +
+ arch/s390/kernel/alternative.c | 3 +-
+ arch/s390/kernel/asm-offsets.c | 7 +-
+ arch/s390/kernel/early.c | 6 +-
+ arch/s390/kernel/entry.S | 1 +
+ arch/s390/kernel/irq.c | 7 +-
+ arch/s390/kernel/nospec-branch.c | 14 ++--
+ arch/s390/kernel/nospec-sysfs.c | 2 +-
+ arch/s390/kernel/perf_cpum_cf.c | 92 +----------------------
+ arch/s390/kernel/perf_cpum_cf_common.c | 1 -
+ arch/s390/kernel/processor.c | 4 +-
+ arch/s390/kernel/ptrace.c | 4 +-
+ arch/s390/kernel/setup.c | 31 +-------
+ arch/s390/kernel/smp.c | 131 ++++++++++++++++++++++-----------
+ arch/s390/kernel/syscall.c | 5 +-
+ arch/s390/kernel/traps.c | 4 +-
+ arch/s390/kvm/kvm-s390.c | 12 +--
+ arch/s390/purgatory/Makefile | 1 +
+ drivers/s390/char/sclp_vt220.c | 4 +-
+ drivers/s390/cio/ccwgroup.c | 60 +++++----------
+ drivers/s390/cio/cio.h | 12 ---
+ drivers/s390/cio/trace.h | 3 +-
+ drivers/s390/crypto/ap_bus.c | 84 +++++++++++++++++----
+ drivers/s390/crypto/ap_bus.h | 3 +
+ drivers/s390/crypto/ap_card.c | 2 +
+ drivers/s390/crypto/vfio_ap_drv.c | 13 ++--
+ drivers/s390/crypto/zcrypt_api.c | 1 -
+ drivers/s390/crypto/zcrypt_api.h | 1 -
+ drivers/s390/crypto/zcrypt_card.c | 2 +
+ drivers/s390/crypto/zcrypt_ccamisc.c | 8 +-
+ drivers/s390/crypto/zcrypt_ccamisc.h | 4 +-
+ drivers/s390/crypto/zcrypt_msgtype50.c | 2 +
+ drivers/s390/crypto/zcrypt_msgtype6.c | 5 ++
+ drivers/s390/crypto/zcrypt_queue.c | 13 ++--
+ 47 files changed, 357 insertions(+), 328 deletions(-)
+Merging sh/for-next (2882b7626f49 sh: kernel: traps: remove unused variable)
+$ git merge sh/for-next
+Auto-merging drivers/sh/maple/maple.c
+Merge made by the 'recursive' strategy.
+ arch/sh/boards/mach-landisk/irq.c | 4 ++--
+ arch/sh/boot/Makefile | 4 ++--
+ arch/sh/boot/compressed/.gitignore | 5 -----
+ arch/sh/boot/compressed/Makefile | 32 +++++++++++++-------------------
+ arch/sh/boot/compressed/ashiftrt.S | 2 ++
+ arch/sh/boot/compressed/ashldi3.c | 2 ++
+ arch/sh/boot/compressed/ashlsi3.S | 2 ++
+ arch/sh/boot/compressed/ashrsi3.S | 2 ++
+ arch/sh/boot/compressed/lshrsi3.S | 2 ++
+ arch/sh/include/asm/checksum_32.h | 5 +++--
+ arch/sh/include/asm/uaccess.h | 4 ++--
+ arch/sh/kernel/cpu/sh4a/smp-shx3.c | 5 +++--
+ arch/sh/kernel/crash_dump.c | 4 ++--
+ arch/sh/kernel/traps_32.c | 8 ++++----
+ arch/sh/math-emu/math.c | 4 ++--
+ arch/sh/mm/nommu.c | 4 ++--
+ drivers/sh/maple/maple.c | 5 ++++-
+ 17 files changed, 49 insertions(+), 45 deletions(-)
+ create mode 100644 arch/sh/boot/compressed/ashiftrt.S
+ create mode 100644 arch/sh/boot/compressed/ashldi3.c
+ create mode 100644 arch/sh/boot/compressed/ashlsi3.S
+ create mode 100644 arch/sh/boot/compressed/ashrsi3.S
+ create mode 100644 arch/sh/boot/compressed/lshrsi3.S
+Merging sparc-next/master (dd0d718152e4 Merge tag 'spi-fix-v5.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi)
+$ git merge sparc-next/master
+Already up to date.
+Merging uml/linux-next (ed102bf2afed um: Fix W=1 missing-include-dirs warnings)
+$ git merge uml/linux-next
+Already up to date.
+Merging xtensa/xtensa-for-next (21e0c3d5f633 xtensa: fix kconfig unmet dependency warning for HAVE_FUTEX_CMPXCHG)
+$ git merge xtensa/xtensa-for-next
+Merge made by the 'recursive' strategy.
+ arch/xtensa/Kconfig | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging pidfd/for-next (15845cbcd12a test: add openat2() test for invalid upper 32 bit flag value)
+$ git merge pidfd/for-next
+Merge made by the 'recursive' strategy.
+ fs/open.c | 14 +++++++++++---
+ include/linux/fcntl.h | 4 ----
+ tools/testing/selftests/openat2/openat2_test.c | 7 ++++++-
+ 3 files changed, 17 insertions(+), 8 deletions(-)
+Merging fscrypt/master (a14d0b676491 fscrypt: allow deleting files with unsupported encryption policy)
+$ git merge fscrypt/master
+Already up to date.
+Merging fscache/fscache-next (3003bbd0697b afs: Use the netfs_write_begin() helper)
+$ git merge fscache/fscache-next
+Already up to date.
+Merging afs/afs-next (7af08140979a Revert "gcov: clang: fix clang-11+ build")
+$ git merge afs/afs-next
+Already up to date.
+Merging btrfs/for-next (e1bde17d1592 Merge branch 'for-next-next-v5.13-20210601' into for-next-20210601)
+$ git merge btrfs/for-next
+Merge made by the 'recursive' strategy.
+ fs/btrfs/block-group.c | 18 +-
+ fs/btrfs/compression.c | 43 +-
+ fs/btrfs/compression.h | 26 +-
+ fs/btrfs/ctree.c | 5 +-
+ fs/btrfs/ctree.h | 69 ++-
+ fs/btrfs/delalloc-space.c | 6 +-
+ fs/btrfs/delayed-inode.c | 38 +-
+ fs/btrfs/disk-io.c | 62 ++-
+ fs/btrfs/extent-tree.c | 1 -
+ fs/btrfs/extent_io.c | 1007 +++++++++++++++++++++++---------------
+ fs/btrfs/extent_io.h | 29 +-
+ fs/btrfs/file.c | 33 +-
+ fs/btrfs/free-space-cache.c | 2 +-
+ fs/btrfs/inode.c | 539 +++++++++++---------
+ fs/btrfs/ioctl.c | 180 +++++--
+ fs/btrfs/ordered-data.c | 253 +++++++---
+ fs/btrfs/ordered-data.h | 10 +-
+ fs/btrfs/reflink.c | 14 +-
+ fs/btrfs/relocation.c | 60 ++-
+ fs/btrfs/scrub.c | 159 ++++--
+ fs/btrfs/space-info.c | 85 +++-
+ fs/btrfs/subpage.c | 136 ++++-
+ fs/btrfs/subpage.h | 24 +
+ fs/btrfs/super.c | 13 +-
+ fs/btrfs/sysfs.c | 32 +-
+ fs/btrfs/tests/extent-io-tests.c | 2 +-
+ fs/btrfs/tests/inode-tests.c | 31 +-
+ fs/btrfs/transaction.c | 25 +-
+ fs/btrfs/transaction.h | 1 -
+ fs/btrfs/tree-log.c | 54 +-
+ fs/btrfs/volumes.c | 8 +-
+ fs/btrfs/volumes.h | 5 +-
+ fs/btrfs/zoned.c | 62 ++-
+ fs/btrfs/zoned.h | 9 +
+ include/trace/events/btrfs.h | 20 +-
+ 35 files changed, 2005 insertions(+), 1056 deletions(-)
+Merging ceph/master (f9f9eb473076 libceph: fix some spelling mistakes)
+$ git merge ceph/master
+Merge made by the 'recursive' strategy.
+ fs/ceph/addr.c | 12 ++----------
+ fs/ceph/snap.c | 2 +-
+ fs/ceph/super.h | 1 -
+ net/ceph/auth_none.c | 4 ++--
+ net/ceph/auth_none.h | 1 -
+ net/ceph/auth_x_protocol.h | 2 +-
+ net/ceph/mon_client.c | 2 +-
+ net/ceph/osdmap.c | 4 ++--
+ 8 files changed, 9 insertions(+), 19 deletions(-)
+Merging cifs/for-next (00ebb243da7f cifs: fix ipv6 formating in cifs_ses_add_channel)
+$ git merge cifs/for-next
+Merge made by the 'recursive' strategy.
+ fs/cifs/sess.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging cifsd/cifsd-for-next (ce95240b5d8c Merge pull request #53 from namjaejeon/cifsd-for-next)
+$ git merge cifsd/cifsd-for-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/filesystems/cifs/cifsd.rst | 164 +
+ Documentation/filesystems/cifs/index.rst | 10 +
+ Documentation/filesystems/index.rst | 2 +-
+ MAINTAINERS | 12 +-
+ fs/Kconfig | 1 +
+ fs/Makefile | 1 +
+ fs/cifsd/Kconfig | 68 +
+ fs/cifsd/Makefile | 17 +
+ fs/cifsd/asn1.c | 339 ++
+ fs/cifsd/asn1.h | 21 +
+ fs/cifsd/auth.c | 1355 +++++
+ fs/cifsd/auth.h | 65 +
+ fs/cifsd/buffer_pool.c | 265 +
+ fs/cifsd/buffer_pool.h | 17 +
+ fs/cifsd/connection.c | 411 ++
+ fs/cifsd/connection.h | 204 +
+ fs/cifsd/crypto_ctx.c | 283 ++
+ fs/cifsd/crypto_ctx.h | 74 +
+ fs/cifsd/glob.h | 64 +
+ fs/cifsd/ksmbd_server.h | 283 ++
+ fs/cifsd/ksmbd_work.c | 93 +
+ fs/cifsd/ksmbd_work.h | 110 +
+ fs/cifsd/mgmt/ksmbd_ida.c | 46 +
+ fs/cifsd/mgmt/ksmbd_ida.h | 34 +
+ fs/cifsd/mgmt/share_config.c | 239 +
+ fs/cifsd/mgmt/share_config.h | 81 +
+ fs/cifsd/mgmt/tree_connect.c | 122 +
+ fs/cifsd/mgmt/tree_connect.h | 56 +
+ fs/cifsd/mgmt/user_config.c | 70 +
+ fs/cifsd/mgmt/user_config.h | 66 +
+ fs/cifsd/mgmt/user_session.c | 328 ++
+ fs/cifsd/mgmt/user_session.h | 101 +
+ fs/cifsd/misc.c | 338 ++
+ fs/cifsd/misc.h | 35 +
+ fs/cifsd/ndr.c | 348 ++
+ fs/cifsd/ndr.h | 22 +
+ fs/cifsd/nterr.h | 543 ++
+ fs/cifsd/ntlmssp.h | 169 +
+ fs/cifsd/oplock.c | 1661 ++++++
+ fs/cifsd/oplock.h | 132 +
+ fs/cifsd/server.c | 627 +++
+ fs/cifsd/server.h | 60 +
+ fs/cifsd/smb2misc.c | 435 ++
+ fs/cifsd/smb2ops.c | 300 ++
+ fs/cifsd/smb2pdu.c | 8166 ++++++++++++++++++++++++++++++
+ fs/cifsd/smb2pdu.h | 1664 ++++++
+ fs/cifsd/smb_common.c | 655 +++
+ fs/cifsd/smb_common.h | 544 ++
+ fs/cifsd/smbacl.c | 1321 +++++
+ fs/cifsd/smbacl.h | 202 +
+ fs/cifsd/smbfsctl.h | 91 +
+ fs/cifsd/smbstatus.h | 1822 +++++++
+ fs/cifsd/spnego_negtokeninit.asn1 | 43 +
+ fs/cifsd/spnego_negtokentarg.asn1 | 19 +
+ fs/cifsd/transport_ipc.c | 880 ++++
+ fs/cifsd/transport_ipc.h | 47 +
+ fs/cifsd/transport_rdma.c | 2040 ++++++++
+ fs/cifsd/transport_rdma.h | 61 +
+ fs/cifsd/transport_tcp.c | 620 +++
+ fs/cifsd/transport_tcp.h | 13 +
+ fs/cifsd/unicode.c | 384 ++
+ fs/cifsd/unicode.h | 357 ++
+ fs/cifsd/uniupr.h | 268 +
+ fs/cifsd/vfs.c | 2015 ++++++++
+ fs/cifsd/vfs.h | 275 +
+ fs/cifsd/vfs_cache.c | 685 +++
+ fs/cifsd/vfs_cache.h | 185 +
+ 67 files changed, 32027 insertions(+), 2 deletions(-)
+ create mode 100644 Documentation/filesystems/cifs/cifsd.rst
+ create mode 100644 Documentation/filesystems/cifs/index.rst
+ create mode 100644 fs/cifsd/Kconfig
+ create mode 100644 fs/cifsd/Makefile
+ create mode 100644 fs/cifsd/asn1.c
+ create mode 100644 fs/cifsd/asn1.h
+ create mode 100644 fs/cifsd/auth.c
+ create mode 100644 fs/cifsd/auth.h
+ create mode 100644 fs/cifsd/buffer_pool.c
+ create mode 100644 fs/cifsd/buffer_pool.h
+ create mode 100644 fs/cifsd/connection.c
+ create mode 100644 fs/cifsd/connection.h
+ create mode 100644 fs/cifsd/crypto_ctx.c
+ create mode 100644 fs/cifsd/crypto_ctx.h
+ create mode 100644 fs/cifsd/glob.h
+ create mode 100644 fs/cifsd/ksmbd_server.h
+ create mode 100644 fs/cifsd/ksmbd_work.c
+ create mode 100644 fs/cifsd/ksmbd_work.h
+ create mode 100644 fs/cifsd/mgmt/ksmbd_ida.c
+ create mode 100644 fs/cifsd/mgmt/ksmbd_ida.h
+ create mode 100644 fs/cifsd/mgmt/share_config.c
+ create mode 100644 fs/cifsd/mgmt/share_config.h
+ create mode 100644 fs/cifsd/mgmt/tree_connect.c
+ create mode 100644 fs/cifsd/mgmt/tree_connect.h
+ create mode 100644 fs/cifsd/mgmt/user_config.c
+ create mode 100644 fs/cifsd/mgmt/user_config.h
+ create mode 100644 fs/cifsd/mgmt/user_session.c
+ create mode 100644 fs/cifsd/mgmt/user_session.h
+ create mode 100644 fs/cifsd/misc.c
+ create mode 100644 fs/cifsd/misc.h
+ create mode 100644 fs/cifsd/ndr.c
+ create mode 100644 fs/cifsd/ndr.h
+ create mode 100644 fs/cifsd/nterr.h
+ create mode 100644 fs/cifsd/ntlmssp.h
+ create mode 100644 fs/cifsd/oplock.c
+ create mode 100644 fs/cifsd/oplock.h
+ create mode 100644 fs/cifsd/server.c
+ create mode 100644 fs/cifsd/server.h
+ create mode 100644 fs/cifsd/smb2misc.c
+ create mode 100644 fs/cifsd/smb2ops.c
+ create mode 100644 fs/cifsd/smb2pdu.c
+ create mode 100644 fs/cifsd/smb2pdu.h
+ create mode 100644 fs/cifsd/smb_common.c
+ create mode 100644 fs/cifsd/smb_common.h
+ create mode 100644 fs/cifsd/smbacl.c
+ create mode 100644 fs/cifsd/smbacl.h
+ create mode 100644 fs/cifsd/smbfsctl.h
+ create mode 100644 fs/cifsd/smbstatus.h
+ create mode 100644 fs/cifsd/spnego_negtokeninit.asn1
+ create mode 100644 fs/cifsd/spnego_negtokentarg.asn1
+ create mode 100644 fs/cifsd/transport_ipc.c
+ create mode 100644 fs/cifsd/transport_ipc.h
+ create mode 100644 fs/cifsd/transport_rdma.c
+ create mode 100644 fs/cifsd/transport_rdma.h
+ create mode 100644 fs/cifsd/transport_tcp.c
+ create mode 100644 fs/cifsd/transport_tcp.h
+ create mode 100644 fs/cifsd/unicode.c
+ create mode 100644 fs/cifsd/unicode.h
+ create mode 100644 fs/cifsd/uniupr.h
+ create mode 100644 fs/cifsd/vfs.c
+ create mode 100644 fs/cifsd/vfs.h
+ create mode 100644 fs/cifsd/vfs_cache.c
+ create mode 100644 fs/cifsd/vfs_cache.h
+Merging configfs/for-next (7fe1e79b59ba configfs: implement the .read_iter and .write_iter methods)
+$ git merge configfs/for-next
+Merge made by the 'recursive' strategy.
+ fs/configfs/file.c | 171 +++++++++++++++--------------------------------------
+ 1 file changed, 49 insertions(+), 122 deletions(-)
+Merging ecryptfs/next (682a8e2b41ef Merge tag 'ecryptfs-5.13-rc1-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs)
+$ git merge ecryptfs/next
+Already up to date.
+Merging erofs/dev (ac1c889d37da erofs: clean up file headers & footers)
+$ git merge erofs/dev
+Merge made by the 'recursive' strategy.
+ fs/erofs/Kconfig | 1 -
+ fs/erofs/compress.h | 2 --
+ fs/erofs/data.c | 2 --
+ fs/erofs/decompressor.c | 2 --
+ fs/erofs/dir.c | 2 --
+ fs/erofs/erofs_fs.h | 2 --
+ fs/erofs/inode.c | 2 --
+ fs/erofs/internal.h | 2 --
+ fs/erofs/namei.c | 2 --
+ fs/erofs/super.c | 3 +--
+ fs/erofs/tagptr.h | 3 ---
+ fs/erofs/utils.c | 2 --
+ fs/erofs/xattr.c | 2 --
+ fs/erofs/xattr.h | 1 -
+ fs/erofs/zdata.c | 6 +-----
+ fs/erofs/zdata.h | 1 -
+ fs/erofs/zmap.c | 2 --
+ fs/erofs/zpvec.h | 7 +------
+ 18 files changed, 3 insertions(+), 41 deletions(-)
+Merging exfat/dev (b741596468b0 Merge tag 'riscv-for-linus-5.13-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
+$ git merge exfat/dev
+Already up to date.
+Merging ext3/for_next (a5882ee966b1 Pull disabling of quotactl_path syscall. Merge branch 'for_next_testing' into for_next)
+$ git merge ext3/for_next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging ext4/dev (6c0912739699 ext4: wipe ext4_dir_entry2 upon file deletion)
+$ git merge ext4/dev
+Already up to date.
+Merging f2fs/dev (fe40db607855 f2fs: support RO feature)
+$ git merge f2fs/dev
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-fs-f2fs | 28 +++++++++
+ fs/f2fs/checkpoint.c | 7 +--
+ fs/f2fs/compress.c | 87 +++++++++----------------
+ fs/f2fs/data.c | 71 ++++++++++++---------
+ fs/f2fs/dir.c | 8 ++-
+ fs/f2fs/f2fs.h | 108 +++++++++++++++++++++++++-------
+ fs/f2fs/file.c | 25 ++++----
+ fs/f2fs/gc.c | 7 ++-
+ fs/f2fs/inline.c | 4 +-
+ fs/f2fs/inode.c | 2 +-
+ fs/f2fs/namei.c | 16 +++--
+ fs/f2fs/node.c | 10 +--
+ fs/f2fs/node.h | 29 ---------
+ fs/f2fs/recovery.c | 31 ++++-----
+ fs/f2fs/segment.c | 23 ++++---
+ fs/f2fs/super.c | 57 ++++++++++++-----
+ fs/f2fs/sysfs.c | 27 ++++++++
+ include/linux/f2fs_fs.h | 1 +
+ 18 files changed, 334 insertions(+), 207 deletions(-)
+Merging fsverity/fsverity (07c99001312c fs-verity: support reading signature with ioctl)
+$ git merge fsverity/fsverity
+Already up to date.
+Merging fuse/for-next (3c9c14338c12 cuse: simplify refcount)
+$ git merge fuse/for-next
+Already up to date.
+Merging jfs/jfs-next (492109333c29 fs/jfs: Fix missing error code in lmLogInit())
+$ git merge jfs/jfs-next
+Merge made by the 'recursive' strategy.
+ fs/jfs/jfs_dmap.c | 2 +-
+ fs/jfs/jfs_logmgr.c | 1 +
+ fs/jfs/jfs_txnmgr.c | 2 +-
+ 3 files changed, 3 insertions(+), 2 deletions(-)
+Merging nfs/linux-next (8124c8a6b353 Linux 5.13-rc4)
+$ git merge nfs/linux-next
+Already up to date.
+Merging nfs-anna/linux-next (4f8be1f53bf6 nfs: we don't support removing system.nfs4_acl)
+$ git merge nfs-anna/linux-next
+Already up to date.
+Merging nfsd/nfsd-next (da6f88115e50 nfsd4: Expose the callback address and state of each NFS4 client)
+$ git merge nfsd/nfsd-next
+Auto-merging fs/nfs/nfs4file.c
+Merge made by the 'recursive' strategy.
+ fs/nfs/nfs4file.c | 10 +-
+ fs/nfsd/netns.h | 6 +
+ fs/nfsd/nfs4callback.c | 45 ++++---
+ fs/nfsd/nfs4proc.c | 151 ++++++++++++++++++++++-
+ fs/nfsd/nfs4state.c | 176 +++++++++++++++++++++------
+ fs/nfsd/nfsd.h | 4 +
+ fs/nfsd/nfsfh.h | 7 +-
+ fs/nfsd/nfssvc.c | 3 +
+ fs/nfsd/trace.h | 249 +++++++++++++++++++++++++++++---------
+ fs/nfsd/vfs.c | 8 +-
+ fs/nfsd/xdr4.h | 1 +
+ include/linux/nfs_ssc.h | 14 +++
+ net/sunrpc/xprtrdma/svc_rdma_rw.c | 6 +-
+ 13 files changed, 544 insertions(+), 136 deletions(-)
+Merging cel/for-next (b9f83ffaa0c0 SUNRPC: Fix null pointer dereference in svc_rqst_free())
+$ git merge cel/for-next
+Already up to date.
+Merging orangefs/for-next (211f9f2e0503 orangefs: leave files in the page cache for a few micro seconds at least)
+$ git merge orangefs/for-next
+Already up to date.
+Merging overlayfs/overlayfs-next (5e717c6fa41f ovl: add debug print to ovl_do_getxattr())
+$ git merge overlayfs/overlayfs-next
+Already up to date.
+Merging ubifs/next (9a29f7f020e0 ubi: Remove unnecessary struct declaration)
+$ git merge ubifs/next
+Already up to date.
+Merging v9fs/9p-next (cba7dcd8878e 9p/trans_virtio: Remove sysfs file on probe failure)
+$ git merge v9fs/9p-next
+Merge made by the 'recursive' strategy.
+ net/9p/trans_virtio.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+Merging xfs/for-next (0fe0bbe00a6f xfs: bunmapi has unnecessary AG lock ordering issues)
+$ git merge xfs/for-next
+Already up to date.
+Merging zonefs/for-next (6980d29ce4da zonefs: fix to update .i_wr_refcnt correctly in zonefs_open_zone())
+$ git merge zonefs/for-next
+Already up to date.
+Merging iomap/iomap-for-next (6e552494fb90 iomap: remove unused private field from ioend)
+$ git merge iomap/iomap-for-next
+Already up to date.
+Merging djw-vfs/vfs-for-next (9b8523423b23 vfs: move __sb_{start,end}_write* to fs.h)
+$ git merge djw-vfs/vfs-for-next
+Already up to date.
+Merging file-locks/locks-next (cbe6fc4e0142 fs/locks: remove useless assignment in fcntl_getlk)
+$ git merge file-locks/locks-next
+Already up to date.
+Merging vfs/for-next (e8727aec724e Merge branch 'work.misc' into for-next)
+$ git merge vfs/for-next
+Auto-merging fs/cifs/file.c
+Merge made by the 'recursive' strategy.
+Merging printk/for-next (7e4e0a140346 Merge branch 'for-5.14-vsprintf-scanf' into for-next)
+$ git merge printk/for-next
+Auto-merging lib/vsprintf.c
+Auto-merging lib/test_printf.c
+Auto-merging lib/Makefile
+Auto-merging lib/Kconfig.debug
+Auto-merging MAINTAINERS
+Auto-merging Documentation/core-api/printk-formats.rst
+Merge made by the 'recursive' strategy.
+ Documentation/core-api/printk-formats.rst | 7 +-
+ MAINTAINERS | 1 +
+ drivers/usb/host/xhci-tegra.c | 6 +-
+ fs/nilfs2/sysfs.c | 19 +-
+ include/linux/prandom.h | 2 +-
+ kernel/debug/kdb/kdb_main.c | 9 +-
+ lib/Kconfig.debug | 3 +
+ lib/Makefile | 1 +
+ lib/kstrtox.c | 13 +-
+ lib/kstrtox.h | 2 +
+ lib/test_printf.c | 5 +
+ lib/test_scanf.c | 750 ++++++++++++++++++++++++++++++
+ lib/vsprintf.c | 110 +++--
+ tools/testing/selftests/lib/Makefile | 2 +-
+ tools/testing/selftests/lib/config | 1 +
+ tools/testing/selftests/lib/scanf.sh | 4 +
+ 16 files changed, 860 insertions(+), 75 deletions(-)
+ create mode 100644 lib/test_scanf.c
+ create mode 100755 tools/testing/selftests/lib/scanf.sh
+Merging pci/next (6efb943b8616 Linux 5.13-rc1)
+$ git merge pci/next
+Already up to date.
+Merging pstore/for-next/pstore (9d843e8fafc7 pstore: Add mem_type property DT parsing support)
+$ git merge pstore/for-next/pstore
+Already up to date.
+Merging hid/for-next (84b5e4d4ad37 Merge branches 'for-5.13/upstream-fixes', 'for-5.14/core', 'for-5.14/google', 'for-5.14/intel-ish' and 'for-5.14/logitech' into for-next)
+$ git merge hid/for-next
+Merge made by the 'recursive' strategy.
+ drivers/hid/hid-core.c | 10 +-
+ drivers/hid/hid-google-hammer.c | 10 ++
+ drivers/hid/hid-ids.h | 1 +
+ drivers/hid/hid-input.c | 6 +-
+ drivers/hid/hid-ite.c | 1 +
+ drivers/hid/hid-lg-g15.c | 141 ++++++++++++++++++---------
+ drivers/hid/hid-logitech-dj.c | 8 ++
+ drivers/hid/hid-logitech-hidpp.c | 12 +++
+ drivers/hid/intel-ish-hid/ipc/ipc.c | 2 +-
+ drivers/hid/intel-ish-hid/ipc/pci-ish.c | 3 +-
+ drivers/hid/intel-ish-hid/ishtp-fw-loader.c | 49 +++++-----
+ drivers/hid/intel-ish-hid/ishtp-hid-client.c | 15 +--
+ drivers/hid/intel-ish-hid/ishtp-hid.c | 2 +-
+ drivers/hid/intel-ish-hid/ishtp-hid.h | 9 +-
+ drivers/hid/intel-ish-hid/ishtp/bus.c | 24 +++--
+ drivers/hid/intel-ish-hid/ishtp/client.c | 5 +-
+ drivers/hid/intel-ish-hid/ishtp/hbm.c | 10 +-
+ drivers/hid/intel-ish-hid/ishtp/hbm.h | 1 +
+ drivers/hid/intel-ish-hid/ishtp/ishtp-dev.h | 4 +-
+ drivers/hid/usbhid/usbmouse.c | 2 +-
+ drivers/platform/chrome/cros_ec_ishtp.c | 4 +-
+ include/linux/intel-ish-client-if.h | 10 +-
+ 22 files changed, 203 insertions(+), 126 deletions(-)
+Merging i2c/i2c/for-next (f879917af25f Merge branch 'i2c/for-5.14' into i2c/for-next)
+$ git merge i2c/i2c/for-next
+Auto-merging MAINTAINERS
+Removing Documentation/devicetree/bindings/i2c/renesas,riic.txt
+Removing Documentation/devicetree/bindings/i2c/renesas,iic-emev2.txt
+Removing Documentation/devicetree/bindings/i2c/renesas,i2c.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/i2c/i2c-mt65xx.txt | 1 +
+ .../devicetree/bindings/i2c/i2c-qcom-cci.txt | 5 +-
+ .../devicetree/bindings/i2c/i2c-rk3x.yaml | 1 +
+ Documentation/devicetree/bindings/i2c/i2c.txt | 7 +-
+ .../devicetree/bindings/i2c/renesas,i2c.txt | 67 ---------
+ .../devicetree/bindings/i2c/renesas,iic-emev2.txt | 22 ---
+ .../devicetree/bindings/i2c/renesas,iic-emev2.yaml | 54 +++++++
+ .../devicetree/bindings/i2c/renesas,rcar-i2c.yaml | 158 +++++++++++++++++++++
+ .../devicetree/bindings/i2c/renesas,riic.txt | 32 -----
+ .../devicetree/bindings/i2c/renesas,riic.yaml | 82 +++++++++++
+ MAINTAINERS | 6 +-
+ drivers/i2c/busses/i2c-aspeed.c | 12 +-
+ drivers/i2c/busses/i2c-i801.c | 72 ++++------
+ drivers/i2c/busses/i2c-mt65xx.c | 9 +-
+ drivers/i2c/busses/i2c-qcom-cci.c | 1 +
+ drivers/i2c/busses/i2c-rcar.c | 1 -
+ drivers/i2c/busses/i2c-stm32f7.c | 73 ++++++++++
+ drivers/i2c/i2c-core-base.c | 105 +++++++++++++-
+ include/linux/i2c.h | 2 +
+ 19 files changed, 526 insertions(+), 184 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/i2c/renesas,i2c.txt
+ delete mode 100644 Documentation/devicetree/bindings/i2c/renesas,iic-emev2.txt
+ create mode 100644 Documentation/devicetree/bindings/i2c/renesas,iic-emev2.yaml
+ create mode 100644 Documentation/devicetree/bindings/i2c/renesas,rcar-i2c.yaml
+ delete mode 100644 Documentation/devicetree/bindings/i2c/renesas,riic.txt
+ create mode 100644 Documentation/devicetree/bindings/i2c/renesas,riic.yaml
+$ git am -3 ../patches/0001-drm-i915-selftests-Avoid-name-clash-with-pm_-global-.patch
+Applying: drm/i915/selftests: Avoid name clash with pm_ global functions
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/gpu/drm/i915/selftests/i915_gem.c
+$ git add -A .
+$ git commit -v -a --amend
+[master 22e770971ea9] Merge remote-tracking branch 'i2c/i2c/for-next'
+ Date: Thu Jun 3 10:50:43 2021 +1000
+Merging i3c/i3c/next (0d95f41ebde4 Revert "i3c master: fix missing destroy_workqueue() on error in i3c_master_register")
+$ git merge i3c/i3c/next
+Already up to date.
+Merging dmi/dmi-for-next (3cb4d29a2633 MAINTAINERS: The DMI/SMBIOS tree has moved)
+$ git merge dmi/dmi-for-next
+Already up to date.
+Merging hwmon-staging/hwmon-next (fc49fecb6518 hwmon: (max31790) Add support for fanX_min attributes)
+$ git merge hwmon-staging/hwmon-next
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/hwmon/lm75.yaml | 1 +
+ .../devicetree/bindings/trivial-devices.yaml | 2 +
+ Documentation/hwmon/index.rst | 2 +
+ Documentation/hwmon/ir36021.rst | 2 +-
+ Documentation/hwmon/lm75.rst | 6 +-
+ Documentation/hwmon/ltc2992.rst | 2 +-
+ Documentation/hwmon/max31790.rst | 17 +-
+ Documentation/hwmon/mp2888.rst | 113 ++++++
+ Documentation/hwmon/pm6764tr.rst | 2 +-
+ Documentation/hwmon/pmbus-core.rst | 42 ++-
+ Documentation/hwmon/pmbus.rst | 11 +-
+ Documentation/hwmon/sht4x.rst | 45 +++
+ Documentation/hwmon/zl6100.rst | 132 ++++---
+ drivers/hwmon/Kconfig | 11 +
+ drivers/hwmon/Makefile | 1 +
+ drivers/hwmon/bt1-pvt.c | 4 +-
+ drivers/hwmon/lm70.c | 28 +-
+ drivers/hwmon/lm75.c | 13 +
+ drivers/hwmon/max31722.c | 9 -
+ drivers/hwmon/max31790.c | 171 +++++++--
+ drivers/hwmon/pmbus/Kconfig | 16 +-
+ drivers/hwmon/pmbus/Makefile | 1 +
+ drivers/hwmon/pmbus/adm1275.c | 14 +-
+ drivers/hwmon/pmbus/mp2888.c | 408 +++++++++++++++++++++
+ drivers/hwmon/pmbus/pmbus.c | 19 +-
+ drivers/hwmon/pmbus/pmbus.h | 2 +-
+ drivers/hwmon/pmbus/pmbus_core.c | 2 +
+ drivers/hwmon/pmbus/zl6100.c | 94 ++++-
+ drivers/hwmon/sch5627.c | 18 +-
+ drivers/hwmon/sch5636.c | 9 +-
+ drivers/hwmon/sch56xx-common.c | 65 +---
+ drivers/hwmon/sch56xx-common.h | 4 +-
+ drivers/hwmon/sht4x.c | 301 +++++++++++++++
+ include/linux/pmbus.h | 13 +
+ 34 files changed, 1345 insertions(+), 235 deletions(-)
+ create mode 100644 Documentation/hwmon/mp2888.rst
+ create mode 100644 Documentation/hwmon/sht4x.rst
+ create mode 100644 drivers/hwmon/pmbus/mp2888.c
+ create mode 100644 drivers/hwmon/sht4x.c
+Merging jc_docs/docs-next (6ad1800071e8 docs: Fix typos in Documentation/trace/ftrace.rst)
+$ git merge jc_docs/docs-next
+Auto-merging include/linux/device.h
+Auto-merging Documentation/virt/kvm/vcpu-requests.rst
+Auto-merging Documentation/virt/kvm/api.rst
+Auto-merging Documentation/admin-guide/sysctl/kernel.rst
+Auto-merging Documentation/ABI/testing/sysfs-fs-f2fs
+Removing Documentation/ABI/testing/sysfs-class-led-driver-el15203000
+Removing Documentation/ABI/testing/sysfs-class-backlight-driver-adp8870
+Removing Documentation/ABI/testing/sysfs-class-backlight-adp8860
+Removing Documentation/ABI/testing/sysfs-class-backlight-adp5520
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/obsolete/sysfs-cpuidle | 2 +-
+ Documentation/ABI/removed/sysfs-kernel-uids | 2 +-
+ Documentation/ABI/stable/sysfs-bus-vmbus | 2 +-
+ Documentation/ABI/stable/sysfs-bus-xen-backend | 2 +-
+ Documentation/ABI/stable/sysfs-driver-dma-idxd | 2 +-
+ Documentation/ABI/stable/sysfs-driver-mlxreg-io | 4 +-
+ Documentation/ABI/testing/configfs-iio | 2 +-
+ Documentation/ABI/testing/configfs-most | 8 +-
+ Documentation/ABI/testing/configfs-usb-gadget | 2 +-
+ Documentation/ABI/testing/configfs-usb-gadget-uvc | 4 +-
+ Documentation/ABI/testing/debugfs-driver-genwqe | 2 +-
+ .../ABI/testing/debugfs-driver-habanalabs | 2 +-
+ Documentation/ABI/testing/sysfs-bus-fsi | 2 +-
+ Documentation/ABI/testing/sysfs-bus-iio | 6 +-
+ Documentation/ABI/testing/sysfs-bus-pci | 4 +-
+ Documentation/ABI/testing/sysfs-class-backlight | 100 ++++
+ .../ABI/testing/sysfs-class-backlight-adp5520 | 31 --
+ .../ABI/testing/sysfs-class-backlight-adp8860 | 37 --
+ .../testing/sysfs-class-backlight-driver-adp8870 | 32 --
+ .../ABI/testing/sysfs-class-led-driver-el15203000 | 9 -
+ .../ABI/testing/sysfs-class-led-trigger-pattern | 3 +
+ Documentation/ABI/testing/sysfs-devices-system-cpu | 10 +-
+ Documentation/ABI/testing/sysfs-driver-ufs | 4 +-
+ Documentation/ABI/testing/sysfs-fs-f2fs | 2 +-
+ .../ABI/testing/sysfs-kernel-iommu_groups | 12 +-
+ Documentation/admin-guide/kernel-parameters.txt | 3 +
+ Documentation/admin-guide/sysctl/kernel.rst | 7 +-
+ Documentation/block/blk-mq.rst | 4 +-
+ Documentation/conf.py | 15 +
+ Documentation/dev-tools/checkpatch.rst | 172 +++++-
+ Documentation/scheduler/sched-bwc.rst | 2 +-
+ Documentation/scheduler/sched-nice-design.rst | 2 +-
+ Documentation/trace/ftrace.rst | 4 +-
+ Documentation/translations/index.rst | 4 +
+ Documentation/translations/it_IT/index.rst | 4 +
+ .../translations/it_IT/process/coding-style.rst | 2 +-
+ Documentation/translations/ja_JP/index.rst | 5 +-
+ Documentation/translations/ko_KR/index.rst | 5 +-
+ .../translations/zh_CN/core-api/index.rst | 17 +-
+ .../translations/zh_CN/core-api/kernel-api.rst | 369 +++++++++++++
+ .../translations/zh_CN/core-api/kobject.rst | 378 +++++++++++++
+ .../translations/zh_CN/core-api/local_ops.rst | 194 +++++++
+ .../translations/zh_CN/core-api/padata.rst | 158 ++++++
+ .../translations/zh_CN/core-api/printk-basics.rst | 110 ++++
+ .../translations/zh_CN/core-api/printk-formats.rst | 595 +++++++++++++++++++++
+ .../zh_CN/core-api/refcount-vs-atomic.rst | 154 ++++++
+ .../zh_CN/core-api/symbol-namespaces.rst | 142 +++++
+ .../translations/zh_CN/core-api/workqueue.rst | 337 ++++++++++++
+ Documentation/translations/zh_CN/index.rst | 5 +-
+ .../zh_CN/maintainer/configure-git.rst | 62 +++
+ .../translations/zh_CN/maintainer/index.rst | 21 +
+ .../zh_CN/maintainer/maintainer-entry-profile.rst | 92 ++++
+ .../zh_CN/maintainer/modifying-patches.rst | 51 ++
+ .../zh_CN/maintainer/pull-requests.rst | 148 +++++
+ .../zh_CN/maintainer/rebasing-and-merging.rst | 165 ++++++
+ .../translations/zh_CN/parisc/debugging.rst | 42 ++
+ Documentation/translations/zh_CN/parisc/index.rst | 28 +
+ .../translations/zh_CN/parisc/registers.rst | 153 ++++++
+ .../translations/zh_CN/process/8.Conclusion.rst | 2 +-
+ .../translations/zh_CN/process/coding-style.rst | 2 +-
+ Documentation/virt/kvm/api.rst | 2 +-
+ Documentation/virt/kvm/vcpu-requests.rst | 2 +-
+ include/linux/device.h | 2 +-
+ include/linux/mfd/madera/pdata.h | 2 +-
+ include/linux/pinctrl/pinconf-generic.h | 2 +-
+ include/linux/platform_profile.h | 2 +-
+ samples/kprobes/kprobe_example.c | 33 +-
+ scripts/kernel-doc | 71 ++-
+ scripts/sphinx-pre-install | 262 ++++++---
+ 69 files changed, 3799 insertions(+), 319 deletions(-)
+ delete mode 100644 Documentation/ABI/testing/sysfs-class-backlight-adp5520
+ delete mode 100644 Documentation/ABI/testing/sysfs-class-backlight-adp8860
+ delete mode 100644 Documentation/ABI/testing/sysfs-class-backlight-driver-adp8870
+ delete mode 100644 Documentation/ABI/testing/sysfs-class-led-driver-el15203000
+ create mode 100644 Documentation/translations/zh_CN/core-api/kernel-api.rst
+ create mode 100644 Documentation/translations/zh_CN/core-api/kobject.rst
+ create mode 100644 Documentation/translations/zh_CN/core-api/local_ops.rst
+ create mode 100644 Documentation/translations/zh_CN/core-api/padata.rst
+ create mode 100644 Documentation/translations/zh_CN/core-api/printk-basics.rst
+ create mode 100644 Documentation/translations/zh_CN/core-api/printk-formats.rst
+ create mode 100644 Documentation/translations/zh_CN/core-api/refcount-vs-atomic.rst
+ create mode 100644 Documentation/translations/zh_CN/core-api/symbol-namespaces.rst
+ create mode 100644 Documentation/translations/zh_CN/core-api/workqueue.rst
+ create mode 100644 Documentation/translations/zh_CN/maintainer/configure-git.rst
+ create mode 100644 Documentation/translations/zh_CN/maintainer/index.rst
+ create mode 100644 Documentation/translations/zh_CN/maintainer/maintainer-entry-profile.rst
+ create mode 100644 Documentation/translations/zh_CN/maintainer/modifying-patches.rst
+ create mode 100644 Documentation/translations/zh_CN/maintainer/pull-requests.rst
+ create mode 100644 Documentation/translations/zh_CN/maintainer/rebasing-and-merging.rst
+ create mode 100644 Documentation/translations/zh_CN/parisc/debugging.rst
+ create mode 100644 Documentation/translations/zh_CN/parisc/index.rst
+ create mode 100644 Documentation/translations/zh_CN/parisc/registers.rst
+Merging v4l-dvb/master (80c1c54a2aa3 Merge tag 'v5.13-rc4' into media_tree)
+$ git merge v4l-dvb/master
+Removing include/media/mpeg2-ctrls.h
+Removing drivers/media/v4l2-core/v4l2-ctrls.c
+Removing drivers/media/rc/tango-ir.c
+Removing drivers/media/rc/keymaps/rc-tango.c
+Auto-merging arch/arm/boot/dts/sama5d4.dtsi
+Auto-merging MAINTAINERS
+Removing Documentation/devicetree/bindings/media/tango-ir.txt
+Merge made by the 'recursive' strategy.
+ .../bindings/media/microchip,sama5d4-vdec.yaml | 47 +
+ .../bindings/media/nxp,imx7-mipi-csi2.yaml | 109 +-
+ Documentation/devicetree/bindings/media/rc.yaml | 1 -
+ .../devicetree/bindings/media/tango-ir.txt | 21 -
+ .../media/v4l/ext-ctrls-codec-stateless.rst | 214 +
+ .../userspace-api/media/v4l/ext-ctrls-codec.rst | 222 +-
+ .../userspace-api/media/v4l/pixfmt-compressed.rst | 11 +-
+ .../userspace-api/media/v4l/vidioc-g-ext-ctrls.rst | 12 +
+ .../userspace-api/media/v4l/vidioc-queryctrl.rst | 18 +-
+ .../userspace-api/media/videodev2.h.rst.exceptions | 5 +-
+ MAINTAINERS | 1 +
+ arch/arm/boot/dts/sama5d4.dtsi | 7 +
+ drivers/media/cec/platform/s5p/s5p_cec.c | 7 +-
+ drivers/media/common/siano/smsdvb-main.c | 7 +-
+ drivers/media/dvb-frontends/drx39xyj/drxj.h | 35 +-
+ drivers/media/dvb-frontends/rtl2832_sdr.c | 4 -
+ drivers/media/i2c/ak7375.c | 10 +-
+ drivers/media/i2c/ccs/ccs-core.c | 41 +-
+ drivers/media/i2c/dw9714.c | 10 +-
+ drivers/media/i2c/dw9768.c | 10 +-
+ drivers/media/i2c/dw9807-vcm.c | 10 +-
+ drivers/media/i2c/hi556.c | 3 +-
+ drivers/media/i2c/imx214.c | 6 +-
+ drivers/media/i2c/imx219.c | 6 +-
+ drivers/media/i2c/imx258.c | 6 +-
+ drivers/media/i2c/imx274.c | 3 +-
+ drivers/media/i2c/imx290.c | 6 +-
+ drivers/media/i2c/imx319.c | 6 +-
+ drivers/media/i2c/imx334.c | 7 +-
+ drivers/media/i2c/imx355.c | 6 +-
+ drivers/media/i2c/ir-kbd-i2c.c | 4 +-
+ drivers/media/i2c/mt9m001.c | 9 +-
+ drivers/media/i2c/ov02a10.c | 6 +-
+ drivers/media/i2c/ov13858.c | 6 +-
+ drivers/media/i2c/ov2659.c | 6 +-
+ drivers/media/i2c/ov2685.c | 7 +-
+ drivers/media/i2c/ov2740.c | 6 +-
+ drivers/media/i2c/ov5647.c | 9 +-
+ drivers/media/i2c/ov5648.c | 6 +-
+ drivers/media/i2c/ov5670.c | 6 +-
+ drivers/media/i2c/ov5675.c | 3 +-
+ drivers/media/i2c/ov5695.c | 6 +-
+ drivers/media/i2c/ov7740.c | 6 +-
+ drivers/media/i2c/ov8856.c | 3 +-
+ drivers/media/i2c/ov8865.c | 6 +-
+ drivers/media/i2c/ov9734.c | 3 +-
+ drivers/media/i2c/s5c73m3/s5c73m3-core.c | 6 +-
+ drivers/media/i2c/s5c73m3/s5c73m3.h | 2 +-
+ drivers/media/i2c/s5k4ecgx.c | 10 +-
+ drivers/media/i2c/s5k5baf.c | 6 +-
+ drivers/media/i2c/s5k6aa.c | 10 +-
+ drivers/media/i2c/tvp5150.c | 16 +-
+ drivers/media/i2c/video-i2c.c | 12 +-
+ drivers/media/mc/mc-entity.c | 2 +-
+ drivers/media/pci/cobalt/cobalt-driver.c | 1 +
+ drivers/media/pci/cobalt/cobalt-driver.h | 7 +-
+ drivers/media/pci/intel/ipu3/ipu3-cio2-main.c | 3 +-
+ drivers/media/platform/am437x/am437x-vpfe.c | 15 +-
+ drivers/media/platform/atmel/atmel-isc-base.c | 30 +-
+ drivers/media/platform/atmel/atmel-isi.c | 19 +-
+ drivers/media/platform/coda/coda-common.c | 7 +-
+ drivers/media/platform/davinci/vpif_capture.c | 2 +-
+ drivers/media/platform/davinci/vpif_display.c | 2 +-
+ drivers/media/platform/exynos-gsc/gsc-core.c | 11 +-
+ drivers/media/platform/exynos-gsc/gsc-m2m.c | 4 +-
+ drivers/media/platform/exynos4-is/fimc-capture.c | 6 +-
+ drivers/media/platform/exynos4-is/fimc-is.c | 4 +-
+ drivers/media/platform/exynos4-is/fimc-isp-video.c | 3 +-
+ drivers/media/platform/exynos4-is/fimc-isp.c | 7 +-
+ drivers/media/platform/exynos4-is/fimc-lite.c | 5 +-
+ drivers/media/platform/exynos4-is/fimc-m2m.c | 5 +-
+ drivers/media/platform/exynos4-is/media-dev.c | 10 +-
+ drivers/media/platform/exynos4-is/mipi-csis.c | 10 +-
+ drivers/media/platform/marvell-ccic/mcam-core.c | 9 +-
+ drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 4 +-
+ drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c | 6 +-
+ .../media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c | 4 +-
+ .../media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c | 8 +-
+ .../media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h | 2 +-
+ drivers/media/platform/qcom/camss/camss-csid.c | 9 +-
+ drivers/media/platform/qcom/camss/camss-csiphy.c | 14 +-
+ drivers/media/platform/qcom/camss/camss-ispif.c | 12 +-
+ drivers/media/platform/qcom/camss/camss-vfe.c | 8 +-
+ drivers/media/platform/qcom/venus/core.c | 60 +-
+ drivers/media/platform/qcom/venus/pm_helpers.c | 3 +-
+ drivers/media/platform/qcom/venus/vdec.c | 6 +-
+ drivers/media/platform/qcom/venus/venc.c | 5 +-
+ drivers/media/platform/rcar-fcp.c | 10 +-
+ drivers/media/platform/rcar-vin/rcar-csi2.c | 15 +-
+ drivers/media/platform/rcar-vin/rcar-dma.c | 6 +-
+ drivers/media/platform/rcar-vin/rcar-v4l2.c | 6 +-
+ drivers/media/platform/rcar_fdp1.c | 28 +-
+ drivers/media/platform/renesas-ceu.c | 4 +-
+ drivers/media/platform/rockchip/rga/rga-buf.c | 3 +-
+ drivers/media/platform/rockchip/rga/rga.c | 4 +-
+ .../platform/rockchip/rkisp1/rkisp1-capture.c | 19 +-
+ .../media/platform/rockchip/rkisp1/rkisp1-params.c | 5 +-
+ drivers/media/platform/s3c-camif/camif-capture.c | 2 +-
+ drivers/media/platform/s3c-camif/camif-core.c | 5 +-
+ drivers/media/platform/s5p-jpeg/jpeg-core.c | 5 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_pm.c | 6 +-
+ drivers/media/platform/sh_vou.c | 6 +-
+ drivers/media/platform/sti/bdisp/Makefile | 2 +-
+ drivers/media/platform/sti/bdisp/bdisp-v4l2.c | 7 +-
+ drivers/media/platform/sti/delta/Makefile | 2 +-
+ drivers/media/platform/sti/delta/delta-v4l2.c | 8 +-
+ drivers/media/platform/sti/hva/Makefile | 2 +-
+ drivers/media/platform/sti/hva/hva-hw.c | 17 +-
+ drivers/media/platform/stm32/stm32-dcmi.c | 5 +-
+ .../media/platform/sunxi/sun4i-csi/sun4i_v4l2.c | 6 +-
+ .../platform/sunxi/sun8i-rotate/sun8i_rotate.c | 2 +-
+ drivers/media/platform/ti-vpe/cal-video.c | 4 +-
+ drivers/media/platform/ti-vpe/cal.c | 8 +-
+ drivers/media/platform/ti-vpe/vpe.c | 8 +-
+ drivers/media/platform/vsp1/vsp1_drv.c | 10 +-
+ drivers/media/rc/Kconfig | 83 +-
+ drivers/media/rc/Makefile | 1 -
+ drivers/media/rc/keymaps/Makefile | 1 -
+ drivers/media/rc/keymaps/rc-tango.c | 89 -
+ drivers/media/rc/tango-ir.c | 267 --
+ drivers/media/test-drivers/vivid/vivid-sdr-cap.c | 3 -
+ drivers/media/usb/airspy/airspy.c | 3 -
+ drivers/media/usb/cpia2/cpia2.h | 1 +
+ drivers/media/usb/cpia2/cpia2_core.c | 12 +
+ drivers/media/usb/cpia2/cpia2_usb.c | 13 +-
+ drivers/media/usb/dvb-usb-v2/lmedm04.c | 9 +-
+ drivers/media/usb/dvb-usb/cxusb.c | 2 +-
+ drivers/media/usb/hackrf/hackrf.c | 3 -
+ drivers/media/usb/msi2500/msi2500.c | 3 -
+ drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 4 +-
+ drivers/media/usb/s2255/s2255drv.c | 2 -
+ drivers/media/v4l2-core/Makefile | 5 +-
+ drivers/media/v4l2-core/v4l2-ctrls-api.c | 1225 +++++
+ drivers/media/v4l2-core/v4l2-ctrls-core.c | 1939 ++++++++
+ drivers/media/v4l2-core/v4l2-ctrls-defs.c | 1575 ++++++
+ drivers/media/v4l2-core/v4l2-ctrls-priv.h | 96 +
+ drivers/media/v4l2-core/v4l2-ctrls-request.c | 496 ++
+ drivers/media/v4l2-core/v4l2-ctrls.c | 5035 --------------------
+ drivers/staging/media/atomisp/i2c/atomisp-gc0310.c | 47 +-
+ drivers/staging/media/atomisp/i2c/atomisp-gc2235.c | 27 +-
+ .../media/atomisp/i2c/atomisp-libmsrlisthelper.c | 6 +-
+ .../staging/media/atomisp/i2c/atomisp-mt9m114.c | 108 +-
+ drivers/staging/media/atomisp/i2c/atomisp-ov2680.c | 26 +-
+ drivers/staging/media/atomisp/i2c/atomisp-ov2722.c | 18 +-
+ drivers/staging/media/atomisp/i2c/mt9m114.h | 6 +-
+ drivers/staging/media/atomisp/i2c/ov2680.h | 10 +-
+ drivers/staging/media/atomisp/pci/atomisp_acc.c | 12 +-
+ drivers/staging/media/atomisp/pci/atomisp_cmd.c | 19 +-
+ drivers/staging/media/atomisp/pci/atomisp_cmd.h | 161 +-
+ .../media/atomisp/pci/atomisp_compat_css20.c | 4 +-
+ drivers/staging/media/atomisp/pci/atomisp_fops.c | 4 +-
+ drivers/staging/media/atomisp/pci/atomisp_subdev.c | 4 +-
+ drivers/staging/media/atomisp/pci/atomisp_v4l2.c | 6 +-
+ drivers/staging/media/atomisp/pci/sh_css.c | 2089 ++++----
+ drivers/staging/media/hantro/Kconfig | 10 +-
+ drivers/staging/media/hantro/Makefile | 4 +
+ drivers/staging/media/hantro/hantro_drv.c | 80 +-
+ drivers/staging/media/hantro/hantro_g1.c | 39 +
+ drivers/staging/media/hantro/hantro_g1_mpeg2_dec.c | 115 +-
+ drivers/staging/media/hantro/hantro_hw.h | 6 +-
+ drivers/staging/media/hantro/hantro_mpeg2.c | 2 +-
+ drivers/staging/media/hantro/imx8m_vpu_hw.c | 27 +-
+ drivers/staging/media/hantro/rk3288_vpu_hw.c | 36 +-
+ .../staging/media/hantro/rk3399_vpu_hw_mpeg2_dec.c | 106 +-
+ drivers/staging/media/hantro/sama5d4_vdec_hw.c | 117 +
+ drivers/staging/media/imx/imx7-mipi-csis.c | 1019 ++--
+ drivers/staging/media/ipu3/include/intel-ipu3.h | 13 +-
+ drivers/staging/media/ipu3/ipu3.c | 3 +-
+ drivers/staging/media/omap4iss/iss.h | 3 -
+ drivers/staging/media/omap4iss/iss_video.c | 4 +-
+ drivers/staging/media/rkvdec/rkvdec.c | 2 +-
+ drivers/staging/media/sunxi/cedrus/cedrus.c | 10 +-
+ drivers/staging/media/sunxi/cedrus/cedrus.h | 5 +-
+ drivers/staging/media/sunxi/cedrus/cedrus_dec.c | 10 +-
+ drivers/staging/media/sunxi/cedrus/cedrus_h265.c | 4 +-
+ drivers/staging/media/sunxi/cedrus/cedrus_mpeg2.c | 97 +-
+ drivers/staging/media/sunxi/cedrus/cedrus_video.c | 6 +-
+ drivers/staging/media/tegra-vde/vde.c | 21 +-
+ drivers/staging/media/tegra-video/csi.c | 3 +-
+ drivers/staging/media/tegra-video/vi.c | 7 +-
+ drivers/staging/media/zoran/zr36057.h | 14 +-
+ include/media/hevc-ctrls.h | 3 +-
+ include/media/mpeg2-ctrls.h | 82 -
+ include/media/rc-map.h | 1 -
+ include/media/v4l2-ctrls.h | 11 +-
+ include/uapi/linux/lirc.h | 1 -
+ include/uapi/linux/v4l2-controls.h | 112 +
+ include/uapi/linux/videodev2.h | 7 +
+ 188 files changed, 8482 insertions(+), 8425 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/media/microchip,sama5d4-vdec.yaml
+ delete mode 100644 Documentation/devicetree/bindings/media/tango-ir.txt
+ delete mode 100644 drivers/media/rc/keymaps/rc-tango.c
+ delete mode 100644 drivers/media/rc/tango-ir.c
+ create mode 100644 drivers/media/v4l2-core/v4l2-ctrls-api.c
+ create mode 100644 drivers/media/v4l2-core/v4l2-ctrls-core.c
+ create mode 100644 drivers/media/v4l2-core/v4l2-ctrls-defs.c
+ create mode 100644 drivers/media/v4l2-core/v4l2-ctrls-priv.h
+ create mode 100644 drivers/media/v4l2-core/v4l2-ctrls-request.c
+ delete mode 100644 drivers/media/v4l2-core/v4l2-ctrls.c
+ create mode 100644 drivers/staging/media/hantro/hantro_g1.c
+ create mode 100644 drivers/staging/media/hantro/sama5d4_vdec_hw.c
+ delete mode 100644 include/media/mpeg2-ctrls.h
+Merging v4l-dvb-next/master (c11669f738f4 docs: userspace-api: media: dvb: replace some characters)
+$ git merge v4l-dvb-next/master
+Auto-merging drivers/media/platform/mtk-vpu/mtk_vpu.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/admin-guide/media/ipu3.rst | 35 +-
+ .../devicetree/bindings/media/i2c/rda,rda5807.yaml | 67 +
+ .../devicetree/bindings/media/renesas,csi2.yaml | 1 +
+ .../devicetree/bindings/media/renesas,isp.yaml | 196 ++
+ .../devicetree/bindings/media/renesas,vin.yaml | 27 +-
+ .../driver-api/media/drivers/ccs/ccs-regs.asc | 2 +-
+ .../driver-api/media/drivers/ccs/mk-ccs-regs | 5 +-
+ Documentation/driver-api/media/drivers/zoran.rst | 2 +-
+ .../media/dvb/audio-set-bypass-mode.rst | 2 +-
+ Documentation/userspace-api/media/dvb/audio.rst | 2 +-
+ .../userspace-api/media/dvb/dmx-fopen.rst | 2 +-
+ .../userspace-api/media/dvb/dmx-fread.rst | 2 +-
+ .../userspace-api/media/dvb/dmx-set-filter.rst | 2 +-
+ Documentation/userspace-api/media/dvb/intro.rst | 6 +-
+ Documentation/userspace-api/media/dvb/video.rst | 2 +-
+ Documentation/userspace-api/media/fdl-appendix.rst | 64 +-
+ Documentation/userspace-api/media/v4l/biblio.rst | 8 +-
+ .../userspace-api/media/v4l/dev-decoder.rst | 6 +-
+ .../media/v4l/pixfmt-meta-intel-ipu3.rst | 2 +-
+ MAINTAINERS | 8 +
+ drivers/media/common/Kconfig | 4 +
+ drivers/media/common/Makefile | 1 +
+ drivers/media/{pci/ttpci => common}/ttpci-eeprom.c | 0
+ drivers/media/{pci/ttpci => common}/ttpci-eeprom.h | 0
+ drivers/media/dvb-frontends/Kconfig | 12 -
+ drivers/media/dvb-frontends/Makefile | 1 -
+ drivers/media/i2c/Kconfig | 22 +
+ drivers/media/i2c/Makefile | 1 +
+ drivers/media/i2c/adv7842.c | 37 +-
+ drivers/media/i2c/ccs/ccs-limits.c | 4 +
+ drivers/media/i2c/ccs/ccs-limits.h | 4 +
+ drivers/media/i2c/ccs/ccs-regs.h | 6 +-
+ drivers/media/i2c/imx208.c | 1087 +++++++++
+ drivers/media/i2c/ov2659.c | 27 +-
+ drivers/media/i2c/ov8856.c | 2449 +++++++++++++-------
+ drivers/media/i2c/ov8865.c | 2 +-
+ drivers/media/i2c/ov9650.c | 4 +-
+ drivers/media/i2c/tc358743.c | 1 +
+ drivers/media/mc/mc-request.c | 3 +-
+ drivers/media/pci/bt8xx/bt878.c | 6 +-
+ drivers/media/pci/intel/ipu3/cio2-bridge.c | 10 +-
+ drivers/media/pci/saa7134/saa7134-core.c | 1 -
+ drivers/media/pci/ttpci/Kconfig | 74 -
+ drivers/media/pci/ttpci/Makefile | 11 +-
+ drivers/media/pci/ttpci/budget-core.c | 3 +-
+ drivers/media/pci/ttpci/budget.h | 2 +-
+ drivers/media/platform/atmel/atmel-isc-base.c | 1 -
+ drivers/media/platform/cadence/cdns-csi2rx.c | 8 +-
+ drivers/media/platform/cadence/cdns-csi2tx.c | 8 +-
+ drivers/media/platform/exynos4-is/fimc-isp-video.c | 7 +-
+ drivers/media/platform/mtk-vpu/mtk_vpu.c | 6 +-
+ drivers/media/platform/qcom/camss/camss-csid.c | 5 +-
+ drivers/media/platform/qcom/camss/camss-csiphy.c | 5 +-
+ drivers/media/platform/qcom/venus/core.h | 7 +-
+ drivers/media/platform/qcom/venus/helpers.c | 5 +-
+ drivers/media/platform/qcom/venus/hfi_cmds.c | 22 +-
+ drivers/media/platform/qcom/venus/hfi_cmds.h | 2 +-
+ drivers/media/platform/qcom/venus/hfi_helper.h | 10 +-
+ drivers/media/platform/qcom/venus/hfi_platform.c | 16 +
+ drivers/media/platform/qcom/venus/hfi_platform.h | 4 +
+ .../media/platform/qcom/venus/hfi_platform_v4.c | 28 +-
+ .../media/platform/qcom/venus/hfi_platform_v6.c | 28 +-
+ drivers/media/platform/qcom/venus/pm_helpers.c | 150 +-
+ drivers/media/platform/rcar-vin/rcar-core.c | 4 +
+ drivers/media/platform/rcar-vin/rcar-csi2.c | 9 +
+ drivers/media/platform/rcar_jpu.c | 6 +-
+ drivers/media/platform/sti/bdisp/bdisp-v4l2.c | 1 -
+ drivers/media/platform/sti/delta/delta-v4l2.c | 1 -
+ drivers/media/platform/sti/hva/hva-hw.c | 3 +-
+ drivers/media/radio/si4713/radio-platform-si4713.c | 2 +-
+ drivers/media/test-drivers/vim2m.c | 5 -
+ drivers/media/usb/Kconfig | 5 -
+ drivers/media/usb/au0828/au0828-core.c | 4 +-
+ drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 3 +-
+ drivers/media/usb/dvb-usb/Makefile | 2 +-
+ drivers/media/usb/dvb-usb/dtv5100.c | 7 +-
+ drivers/media/usb/em28xx/em28xx-cards.c | 6 +-
+ drivers/media/usb/em28xx/em28xx-input.c | 8 +-
+ drivers/media/usb/gspca/cpia1.c | 5 +-
+ drivers/media/usb/gspca/gl860/gl860.c | 4 +-
+ drivers/media/usb/gspca/sq905.c | 2 +-
+ drivers/media/usb/gspca/sunplus.c | 8 +-
+ drivers/media/usb/zr364xx/zr364xx.c | 1 +
+ drivers/media/v4l2-core/Kconfig | 5 +
+ drivers/media/v4l2-core/Makefile | 5 +-
+ drivers/media/v4l2-core/v4l2-async.c | 23 +-
+ drivers/media/v4l2-core/v4l2-dev.c | 10 +-
+ drivers/media/v4l2-core/v4l2-fh.c | 1 +
+ drivers/media/v4l2-core/videobuf-dma-sg.c | 1 -
+ drivers/staging/media/Kconfig | 2 +
+ drivers/staging/media/Makefile | 1 +
+ drivers/staging/media/av7110/Kconfig | 94 +
+ drivers/staging/media/av7110/Makefile | 22 +
+ drivers/staging/media/av7110/TODO | 3 +
+ .../pci/ttpci => staging/media/av7110}/av7110.c | 0
+ .../pci/ttpci => staging/media/av7110}/av7110.h | 0
+ .../pci/ttpci => staging/media/av7110}/av7110_av.c | 0
+ .../pci/ttpci => staging/media/av7110}/av7110_av.h | 0
+ .../pci/ttpci => staging/media/av7110}/av7110_ca.c | 0
+ .../pci/ttpci => staging/media/av7110}/av7110_ca.h | 0
+ .../pci/ttpci => staging/media/av7110}/av7110_hw.c | 0
+ .../pci/ttpci => staging/media/av7110}/av7110_hw.h | 0
+ .../ttpci => staging/media/av7110}/av7110_ipack.c | 0
+ .../ttpci => staging/media/av7110}/av7110_ipack.h | 0
+ .../pci/ttpci => staging/media/av7110}/av7110_ir.c | 0
+ .../ttpci => staging/media/av7110}/av7110_v4l.c | 0
+ .../ttpci => staging/media/av7110}/budget-patch.c | 0
+ .../ttpci => staging/media/av7110}/dvb_filter.c | 0
+ .../ttpci => staging/media/av7110}/dvb_filter.h | 0
+ .../media/av7110}/sp8870.c | 0
+ .../media/av7110}/sp8870.h | 0
+ drivers/staging/media/hantro/hantro_drv.c | 4 +-
+ drivers/staging/media/hantro/hantro_v4l2.c | 9 +-
+ drivers/staging/media/imx/imx7-mipi-csis.c | 1 +
+ .../media/ipu3/include/{ => uapi}/intel-ipu3.h | 0
+ drivers/staging/media/ipu3/ipu3-abi.h | 2 +-
+ drivers/staging/media/ipu3/ipu3-css-pool.h | 1 +
+ drivers/staging/media/meson/vdec/vdec_helpers.c | 2 +-
+ drivers/staging/media/rkvdec/rkvdec.c | 10 +-
+ drivers/staging/media/sunxi/cedrus/cedrus_video.c | 8 +-
+ drivers/staging/media/tegra-vde/vde.c | 3 +-
+ drivers/staging/media/zoran/zoran.h | 1 -
+ drivers/staging/media/zoran/zoran_card.c | 7 +-
+ drivers/staging/media/zoran/zoran_device.c | 65 -
+ drivers/staging/media/zoran/zoran_device.h | 2 -
+ drivers/staging/media/zoran/zoran_driver.c | 6 +-
+ drivers/staging/media/zoran/zr36016.c | 3 +-
+ drivers/staging/media/zoran/zr36050.c | 5 +-
+ drivers/staging/media/zoran/zr36060.c | 3 +-
+ include/uapi/linux/cec-funcs.h | 2 +-
+ include/uapi/linux/v4l2-controls.h | 23 +-
+ 131 files changed, 3592 insertions(+), 1343 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/media/i2c/rda,rda5807.yaml
+ create mode 100644 Documentation/devicetree/bindings/media/renesas,isp.yaml
+ rename drivers/media/{pci/ttpci => common}/ttpci-eeprom.c (100%)
+ rename drivers/media/{pci/ttpci => common}/ttpci-eeprom.h (100%)
+ create mode 100644 drivers/media/i2c/imx208.c
+ create mode 100644 drivers/staging/media/av7110/Kconfig
+ create mode 100644 drivers/staging/media/av7110/Makefile
+ create mode 100644 drivers/staging/media/av7110/TODO
+ rename drivers/{media/pci/ttpci => staging/media/av7110}/av7110.c (100%)
+ rename drivers/{media/pci/ttpci => staging/media/av7110}/av7110.h (100%)
+ rename drivers/{media/pci/ttpci => staging/media/av7110}/av7110_av.c (100%)
+ rename drivers/{media/pci/ttpci => staging/media/av7110}/av7110_av.h (100%)
+ rename drivers/{media/pci/ttpci => staging/media/av7110}/av7110_ca.c (100%)
+ rename drivers/{media/pci/ttpci => staging/media/av7110}/av7110_ca.h (100%)
+ rename drivers/{media/pci/ttpci => staging/media/av7110}/av7110_hw.c (100%)
+ rename drivers/{media/pci/ttpci => staging/media/av7110}/av7110_hw.h (100%)
+ rename drivers/{media/pci/ttpci => staging/media/av7110}/av7110_ipack.c (100%)
+ rename drivers/{media/pci/ttpci => staging/media/av7110}/av7110_ipack.h (100%)
+ rename drivers/{media/pci/ttpci => staging/media/av7110}/av7110_ir.c (100%)
+ rename drivers/{media/pci/ttpci => staging/media/av7110}/av7110_v4l.c (100%)
+ rename drivers/{media/pci/ttpci => staging/media/av7110}/budget-patch.c (100%)
+ rename drivers/{media/pci/ttpci => staging/media/av7110}/dvb_filter.c (100%)
+ rename drivers/{media/pci/ttpci => staging/media/av7110}/dvb_filter.h (100%)
+ rename drivers/{media/dvb-frontends => staging/media/av7110}/sp8870.c (100%)
+ rename drivers/{media/dvb-frontends => staging/media/av7110}/sp8870.h (100%)
+ rename drivers/staging/media/ipu3/include/{ => uapi}/intel-ipu3.h (100%)
+Merging pm/linux-next (a25ea0c642c2 Merge branches 'pm-core' and 'pm-cpufreq' into linux-next)
+$ git merge pm/linux-next
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-platform-dptf | 42 ++++
+ Documentation/admin-guide/pm/intel_pstate.rst | 6 +
+ Documentation/power/runtime_pm.rst | 6 +-
+ arch/x86/kernel/acpi/boot.c | 118 +++++-------
+ drivers/acpi/acpi_configfs.c | 5 +-
+ drivers/acpi/acpi_ipmi.c | 7 +-
+ drivers/acpi/apei/einj.c | 2 +-
+ drivers/acpi/arm64/iort.c | 2 +-
+ drivers/acpi/device_pm.c | 6 +-
+ drivers/acpi/dptf/dptf_pch_fivr.c | 9 +
+ drivers/acpi/dptf/int340x_thermal.c | 2 +
+ drivers/acpi/ec.c | 16 ++
+ drivers/acpi/event.c | 2 +-
+ drivers/acpi/fan.c | 7 +-
+ drivers/acpi/fan.h | 13 ++
+ drivers/acpi/internal.h | 2 +-
+ drivers/acpi/power.c | 114 ++++++-----
+ drivers/acpi/processor_idle.c | 40 ++++
+ drivers/acpi/sbshc.c | 1 -
+ drivers/acpi/scan.c | 62 +++---
+ drivers/acpi/sleep.c | 2 +-
+ drivers/acpi/x86/s2idle.c | 4 +
+ drivers/base/power/wakeirq.c | 4 +-
+ drivers/base/property.c | 4 +-
+ drivers/cpufreq/acpi-cpufreq.c | 2 +-
+ drivers/cpufreq/cpufreq_stats.c | 5 +-
+ drivers/cpufreq/intel_pstate.c | 263 +++++++++++++++++++++++---
+ drivers/cpufreq/sc520_freq.c | 1 +
+ drivers/pnp/base.h | 1 -
+ drivers/pnp/card.c | 2 +-
+ drivers/pnp/core.c | 17 +-
+ drivers/pnp/interface.c | 4 +-
+ drivers/pnp/isapnp/proc.c | 13 +-
+ drivers/pnp/resource.c | 2 +-
+ include/linux/pm_runtime.h | 3 +
+ kernel/power/snapshot.c | 8 +-
+ kernel/power/swap.c | 2 +-
+ 37 files changed, 546 insertions(+), 253 deletions(-)
+ create mode 100644 drivers/acpi/fan.h
+Merging cpufreq-arm/cpufreq/arm/linux-next (4814d9c5d3b9 cpufreq: dt: Rename black/white-lists)
+$ git merge cpufreq-arm/cpufreq/arm/linux-next
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/arm/cpus.yaml | 7 ++
+ .../bindings/dvfs/performance-domain.yaml | 74 ++++++++++++++++++++++
+ drivers/cpufreq/cpufreq-dt-platdev.c | 10 +--
+ drivers/cpufreq/mediatek-cpufreq.c | 1 +
+ drivers/cpufreq/scmi-cpufreq.c | 2 +-
+ 5 files changed, 89 insertions(+), 5 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/dvfs/performance-domain.yaml
+Merging cpupower/cpupower (d07f6ca923ea Linux 5.13-rc2)
+$ git merge cpupower/cpupower
+Already up to date.
+Merging devfreq/devfreq-next (64f4d903ce9d dt-bindings: devfreq: tegra30-actmon: Add cooling-cells)
+$ git merge devfreq/devfreq-next
+Removing Documentation/devicetree/bindings/arm/tegra/nvidia,tegra30-actmon.txt
+Merge made by the 'recursive' strategy.
+ .../bindings/arm/tegra/nvidia,tegra30-actmon.txt | 57 ----------
+ .../bindings/devfreq/nvidia,tegra30-actmon.yaml | 126 +++++++++++++++++++++
+ drivers/devfreq/Kconfig | 1 -
+ drivers/devfreq/devfreq.c | 1 +
+ drivers/devfreq/governor_userspace.c | 10 +-
+ drivers/devfreq/imx-bus.c | 14 ---
+ drivers/devfreq/tegra30-devfreq.c | 1 +
+ 7 files changed, 133 insertions(+), 77 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/arm/tegra/nvidia,tegra30-actmon.txt
+ create mode 100644 Documentation/devicetree/bindings/devfreq/nvidia,tegra30-actmon.yaml
+Merging opp/opp/linux-next (ac9fd3c80340 opp: use list_del_init instead of list_del/INIT_LIST_HEAD)
+$ git merge opp/opp/linux-next
+Merge made by the 'recursive' strategy.
+ drivers/opp/of.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+Merging thermal/thermal/linux-next (c310e546164d thermal/drivers/mtk_thermal: Remove redundant initializations of several variables)
+$ git merge thermal/thermal/linux-next
+Already up to date.
+Merging dlm/next (d10a0b88751a fs: dlm: rename socket and app buffer defines)
+$ git merge dlm/next
+Merge made by the 'recursive' strategy.
+ fs/dlm/config.c | 18 +-
+ fs/dlm/config.h | 5 +-
+ fs/dlm/debug_fs.c | 54 ++
+ fs/dlm/dlm_internal.h | 42 +-
+ fs/dlm/lock.c | 16 +-
+ fs/dlm/lockspace.c | 14 +-
+ fs/dlm/lowcomms.c | 411 +++++++++++----
+ fs/dlm/lowcomms.h | 25 +-
+ fs/dlm/member.c | 37 +-
+ fs/dlm/midcomms.c | 1321 +++++++++++++++++++++++++++++++++++++++++++++++--
+ fs/dlm/midcomms.h | 15 +
+ fs/dlm/rcom.c | 123 +++--
+ fs/dlm/util.c | 10 +-
+ fs/dlm/util.h | 2 +
+ 14 files changed, 1902 insertions(+), 191 deletions(-)
+Merging swiotlb/linux-next (dfc06b389a4f swiotlb: don't override user specified size in swiotlb_adjust_size)
+$ git merge swiotlb/linux-next
+Already up to date.
+Merging rdma/for-next (0e8558476faf RDMA/rtrs: Avoid Wtautological-constant-out-of-range-compare)
+$ git merge rdma/for-next
+Auto-merging drivers/infiniband/hw/mlx5/mr.c
+Auto-merging drivers/infiniband/hw/mlx5/main.c
+Merge made by the 'recursive' strategy.
+ drivers/infiniband/core/cache.c | 23 +-
+ drivers/infiniband/core/ucma.c | 11 +-
+ drivers/infiniband/core/verbs.c | 21 -
+ drivers/infiniband/hw/bnxt_re/ib_verbs.c | 18 -
+ drivers/infiniband/hw/bnxt_re/main.c | 12 -
+ drivers/infiniband/hw/cxgb4/qp.c | 1 -
+ drivers/infiniband/hw/hfi1/pio.h | 2 -
+ drivers/infiniband/hw/hfi1/tid_rdma.c | 2 +-
+ drivers/infiniband/hw/hfi1/trace.c | 5 +
+ drivers/infiniband/hw/hns/hns_roce_alloc.c | 51 +-
+ drivers/infiniband/hw/hns/hns_roce_common.h | 4 +-
+ drivers/infiniband/hw/hns/hns_roce_cq.c | 7 +-
+ drivers/infiniband/hw/hns/hns_roce_db.c | 3 +-
+ drivers/infiniband/hw/hns/hns_roce_device.h | 24 +-
+ drivers/infiniband/hw/hns/hns_roce_hem.c | 342 +++++++------
+ drivers/infiniband/hw/hns/hns_roce_hem.h | 13 +-
+ drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 77 +++
+ drivers/infiniband/hw/hns/hns_roce_hw_v1.h | 5 +
+ drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 693 ++++++++++++---------------
+ drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 75 +--
+ drivers/infiniband/hw/hns/hns_roce_mr.c | 14 +-
+ drivers/infiniband/hw/hns/hns_roce_qp.c | 6 +-
+ drivers/infiniband/hw/hns/hns_roce_srq.c | 10 +-
+ drivers/infiniband/hw/mlx4/cq.c | 8 +-
+ drivers/infiniband/hw/mlx5/cq.c | 4 +-
+ drivers/infiniband/hw/mlx5/doorbell.c | 3 +-
+ drivers/infiniband/hw/mlx5/main.c | 4 +
+ drivers/infiniband/hw/mlx5/mlx5_ib.h | 5 +-
+ drivers/infiniband/hw/mlx5/mr.c | 2 +-
+ drivers/infiniband/hw/mlx5/odp.c | 5 +-
+ drivers/infiniband/hw/mlx5/qp.c | 69 +--
+ drivers/infiniband/hw/mlx5/qpc.c | 6 +
+ drivers/infiniband/hw/mlx5/srq.c | 2 +-
+ drivers/infiniband/hw/mlx5/wr.c | 9 +-
+ drivers/infiniband/sw/rxe/rxe_loc.h | 2 +-
+ drivers/infiniband/sw/rxe/rxe_mr.c | 2 +-
+ drivers/infiniband/sw/rxe/rxe_verbs.c | 2 +-
+ drivers/infiniband/ulp/ipoib/ipoib_cm.c | 8 +-
+ drivers/infiniband/ulp/ipoib/ipoib_main.c | 33 +-
+ drivers/infiniband/ulp/ipoib/ipoib_vlan.c | 4 +-
+ drivers/infiniband/ulp/isert/ib_isert.c | 10 +
+ drivers/infiniband/ulp/rtrs/rtrs-clt-sysfs.c | 5 +-
+ drivers/infiniband/ulp/rtrs/rtrs-clt.c | 59 ++-
+ drivers/infiniband/ulp/rtrs/rtrs-clt.h | 2 +-
+ drivers/infiniband/ulp/rtrs/rtrs-pri.h | 14 +-
+ drivers/infiniband/ulp/rtrs/rtrs-srv-stats.c | 12 +-
+ drivers/infiniband/ulp/rtrs/rtrs-srv-sysfs.c | 1 +
+ drivers/infiniband/ulp/rtrs/rtrs-srv.c | 163 ++++---
+ drivers/infiniband/ulp/rtrs/rtrs-srv.h | 4 +-
+ drivers/infiniband/ulp/rtrs/rtrs.c | 1 -
+ drivers/infiniband/ulp/srp/ib_srp.c | 256 +++++-----
+ drivers/infiniband/ulp/srp/ib_srp.h | 2 -
+ drivers/infiniband/ulp/srpt/ib_srpt.c | 1 -
+ include/rdma/ib_hdrs.h | 5 -
+ include/rdma/ib_verbs.h | 3 -
+ include/scsi/srp.h | 26 +-
+ include/uapi/rdma/mlx5-abi.h | 1 +
+ 57 files changed, 1034 insertions(+), 1118 deletions(-)
+Merging net-next/master (270d47dc1fc4 Merge branch 'devlink-rate-objects')
+$ git merge net-next/master
+Auto-merging net/packet/af_packet.c
+Auto-merging net/netfilter/nfnetlink_cthelper.c
+Auto-merging net/mptcp/subflow.c
+Auto-merging net/core/netpoll.c
+Auto-merging net/core/devlink.c
+CONFLICT (content): Merge conflict in net/core/devlink.c
+Auto-merging net/9p/trans_virtio.c
+Auto-merging include/net/netfilter/nf_tables.h
+Auto-merging drivers/net/virtio_net.c
+CONFLICT (content): Merge conflict in drivers/net/virtio_net.c
+Auto-merging drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+Auto-merging drivers/net/ethernet/smsc/smc91x.c
+Auto-merging drivers/net/ethernet/neterion/vxge/vxge-config.c
+Removing drivers/net/ethernet/mellanox/mlxsw/switchx2.c
+Removing drivers/net/ethernet/mellanox/mlxsw/switchib.c
+Removing drivers/net/ethernet/mellanox/mlxsw/ib.h
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/lib/fs_chains.c
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
+Auto-merging MAINTAINERS
+Removing Documentation/devicetree/bindings/net/can/rcar_canfd.txt
+Removing Documentation/devicetree/bindings/net/can/rcar_can.txt
+Removing Documentation/devicetree/bindings/net/brcm,iproc-mdio.txt
+Recorded preimage for 'drivers/net/virtio_net.c'
+Resolved 'net/core/devlink.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+Recorded resolution for 'drivers/net/virtio_net.c'.
+[master 00efd15603d0] Merge remote-tracking branch 'net-next/master'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/net/brcm,iproc-mdio.txt | 23 -
+ .../devicetree/bindings/net/brcm,iproc-mdio.yaml | 38 +
+ .../devicetree/bindings/net/can/rcar_can.txt | 80 -
+ .../devicetree/bindings/net/can/rcar_canfd.txt | 107 -
+ .../bindings/net/can/renesas,rcar-can.yaml | 139 +
+ .../bindings/net/can/renesas,rcar-canfd.yaml | 122 +
+ .../devicetree/bindings/net/dsa/mt7530.txt | 6 +
+ .../devicetree/bindings/net/dsa/qca8k.txt | 40 +
+ .../bindings/net/nfc/samsung,s3fwrn5.yaml | 5 +
+ .../devicetree/bindings/net/rockchip-dwmac.yaml | 30 +-
+ .../device_drivers/cellular/qualcomm/rmnet.rst | 126 +-
+ Documentation/networking/devlink/devlink-port.rst | 35 +
+ Documentation/networking/devlink/netdevsim.rst | 26 +
+ Documentation/networking/ip-sysctl.rst | 58 +
+ Documentation/networking/mptcp-sysctl.rst | 8 +-
+ MAINTAINERS | 7 +
+ arch/arm64/boot/dts/rockchip/rk3308.dtsi | 22 +
+ arch/arm64/net/bpf_jit_comp.c | 19 +-
+ drivers/atm/iphase.c | 13 +-
+ drivers/atm/iphase.h | 1 -
+ drivers/atm/nicstar.c | 2 +-
+ drivers/atm/zeprom.h | 2 +-
+ drivers/infiniband/hw/i40iw/i40iw_main.c | 5 +-
+ drivers/isdn/hardware/mISDN/hfcpci.c | 2 +-
+ drivers/isdn/mISDN/dsp_pipeline.c | 46 +-
+ drivers/net/appletalk/cops.c | 30 +-
+ drivers/net/appletalk/ltpc.c | 16 +-
+ drivers/net/bonding/bond_alb.c | 13 +-
+ drivers/net/bonding/bond_debugfs.c | 3 +-
+ drivers/net/bonding/bond_main.c | 5 +-
+ drivers/net/bonding/bond_netlink.c | 2 +-
+ drivers/net/bonding/bond_procfs.c | 1 +
+ drivers/net/bonding/bond_sysfs.c | 7 +
+ drivers/net/caif/caif_virtio.c | 6 +-
+ drivers/net/can/at91_can.c | 2 +-
+ drivers/net/can/c_can/Makefile | 5 +
+ drivers/net/can/c_can/c_can.h | 3 +-
+ drivers/net/can/c_can/c_can_ethtool.c | 43 +
+ drivers/net/can/c_can/{c_can.c => c_can_main.c} | 2 +-
+ drivers/net/can/m_can/m_can.c | 244 +-
+ drivers/net/can/softing/softing_main.c | 2 -
+ drivers/net/can/spi/hi311x.c | 2 +-
+ drivers/net/can/spi/mcp251x.c | 2 +-
+ drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 2 +-
+ drivers/net/can/usb/Kconfig | 2 +
+ drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c | 14 +-
+ drivers/net/dsa/mt7530.c | 264 +-
+ drivers/net/dsa/mt7530.h | 20 +-
+ drivers/net/dsa/qca8k.c | 805 +-
+ drivers/net/dsa/qca8k.h | 58 +-
+ drivers/net/dsa/sja1105/sja1105.h | 72 +-
+ drivers/net/dsa/sja1105/sja1105_clocking.c | 65 +-
+ drivers/net/dsa/sja1105/sja1105_dynamic_config.c | 15 +-
+ drivers/net/dsa/sja1105/sja1105_ethtool.c | 1089 +--
+ drivers/net/dsa/sja1105/sja1105_flower.c | 13 +-
+ drivers/net/dsa/sja1105/sja1105_main.c | 391 +-
+ drivers/net/dsa/sja1105/sja1105_spi.c | 185 +-
+ drivers/net/dsa/sja1105/sja1105_static_config.c | 13 +-
+ drivers/net/dsa/sja1105/sja1105_static_config.h | 9 +-
+ drivers/net/dsa/sja1105/sja1105_tas.c | 14 +-
+ drivers/net/dsa/sja1105/sja1105_tas.h | 2 +-
+ drivers/net/dsa/sja1105/sja1105_vl.c | 2 +-
+ drivers/net/ethernet/3com/3c59x.c | 2 +-
+ drivers/net/ethernet/8390/axnet_cs.c | 14 +-
+ drivers/net/ethernet/8390/pcnet_cs.c | 2 +-
+ drivers/net/ethernet/8390/smc-ultra.c | 6 +-
+ drivers/net/ethernet/8390/stnic.c | 2 +-
+ drivers/net/ethernet/alteon/acenic.c | 26 +-
+ drivers/net/ethernet/amd/amd8111e.c | 4 +-
+ drivers/net/ethernet/amd/amd8111e.h | 6 +-
+ drivers/net/ethernet/amd/atarilance.c | 2 +-
+ drivers/net/ethernet/amd/declance.c | 2 +-
+ drivers/net/ethernet/amd/lance.c | 4 +-
+ drivers/net/ethernet/amd/ni65.c | 12 +-
+ drivers/net/ethernet/amd/nmclan_cs.c | 12 +-
+ drivers/net/ethernet/amd/sun3lance.c | 12 +-
+ drivers/net/ethernet/apple/bmac.c | 30 +-
+ drivers/net/ethernet/apple/mace.c | 8 +-
+ drivers/net/ethernet/arc/emac_rockchip.c | 2 +-
+ drivers/net/ethernet/atheros/alx/alx.h | 2 +
+ drivers/net/ethernet/atheros/alx/ethtool.c | 21 +-
+ drivers/net/ethernet/atheros/alx/main.c | 84 +-
+ drivers/net/ethernet/atheros/atl1c/atl1c.h | 28 +-
+ drivers/net/ethernet/atheros/atl1c/atl1c_hw.c | 35 +-
+ drivers/net/ethernet/atheros/atl1c/atl1c_hw.h | 42 +-
+ drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 587 +-
+ drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 4 +-
+ drivers/net/ethernet/atheros/atlx/atl1.c | 2 +-
+ drivers/net/ethernet/broadcom/b44.c | 20 +-
+ drivers/net/ethernet/broadcom/bnx2.c | 6 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 2 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c | 4 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h | 1 -
+ drivers/net/ethernet/brocade/bna/bfa_cee.c | 2 +-
+ drivers/net/ethernet/cadence/macb_pci.c | 2 +-
+ drivers/net/ethernet/cadence/macb_ptp.c | 2 +-
+ drivers/net/ethernet/calxeda/xgmac.c | 8 +-
+ drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 3 -
+ drivers/net/ethernet/chelsio/cxgb3/sge.c | 6 +-
+ drivers/net/ethernet/chelsio/cxgb4/clip_tbl.c | 6 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 2 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_ptp.c | 2 +-
+ drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 4 +-
+ drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 2 +-
+ drivers/net/ethernet/dec/tulip/de2104x.c | 4 +-
+ drivers/net/ethernet/dec/tulip/de4x5.c | 6 +-
+ drivers/net/ethernet/dec/tulip/dmfe.c | 18 +-
+ drivers/net/ethernet/dec/tulip/pnic2.c | 4 +-
+ drivers/net/ethernet/dec/tulip/uli526x.c | 10 +-
+ drivers/net/ethernet/dec/tulip/winbond-840.c | 4 +-
+ drivers/net/ethernet/dlink/sundance.c | 12 +-
+ drivers/net/ethernet/faraday/ftgmac100.c | 6 +-
+ drivers/net/ethernet/fealnx.c | 2 +-
+ .../ethernet/freescale/dpaa2/dpaa2-eth-debugfs.c | 6 +-
+ drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 7 +-
+ drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c | 25 +-
+ drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h | 1 +
+ drivers/net/ethernet/freescale/enetc/enetc_qos.c | 31 +-
+ drivers/net/ethernet/freescale/ucc_geth.c | 3 +-
+ drivers/net/ethernet/fujitsu/fmvj18x_cs.c | 6 +-
+ drivers/net/ethernet/hisilicon/Kconfig | 1 +
+ drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c | 2 -
+ drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c | 9 +-
+ drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 16 +-
+ drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c | 76 +-
+ drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c | 8 +-
+ drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c | 2 +-
+ .../net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c | 4 +-
+ drivers/net/ethernet/hisilicon/hns/hns_enet.c | 2 +-
+ drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h | 10 +-
+ drivers/net/ethernet/hisilicon/hns3/hnae3.h | 62 +-
+ drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c | 1391 +++-
+ drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.h | 64 +
+ drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 623 +-
+ drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 32 +-
+ drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 8 +-
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c | 8 +-
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 23 +-
+ .../ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c | 2454 +++---
+ .../ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.h | 47 +-
+ .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 376 +-
+ .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 50 +-
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c | 115 +-
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 215 +-
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.h | 19 +-
+ .../ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c | 2 +
+ .../ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.h | 1 +
+ .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 67 +-
+ .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h | 2 +
+ drivers/net/ethernet/huawei/hinic/hinic_ethtool.c | 1 -
+ drivers/net/ethernet/huawei/hinic/hinic_hw_cmdq.c | 4 +-
+ drivers/net/ethernet/huawei/hinic/hinic_hw_dev.c | 18 +-
+ drivers/net/ethernet/huawei/hinic/hinic_hw_eqs.c | 6 +-
+ drivers/net/ethernet/huawei/hinic/hinic_hw_if.c | 4 +-
+ drivers/net/ethernet/huawei/hinic/hinic_hw_io.c | 4 +-
+ drivers/net/ethernet/huawei/hinic/hinic_hw_mgmt.c | 4 +-
+ drivers/net/ethernet/huawei/hinic/hinic_hw_qp.c | 2 +-
+ drivers/net/ethernet/huawei/hinic/hinic_hw_wq.c | 1 +
+ drivers/net/ethernet/huawei/hinic/hinic_main.c | 5 +-
+ drivers/net/ethernet/huawei/hinic/hinic_port.c | 10 +-
+ drivers/net/ethernet/huawei/hinic/hinic_rx.c | 1 +
+ drivers/net/ethernet/huawei/hinic/hinic_tx.c | 4 +-
+ drivers/net/ethernet/ibm/ehea/ehea_main.c | 27 +-
+ drivers/net/ethernet/ibm/emac/emac.h | 2 +-
+ drivers/net/ethernet/ibm/ibmveth.c | 3 +-
+ drivers/net/ethernet/ibm/ibmvnic.c | 6 +-
+ drivers/net/ethernet/intel/Kconfig | 2 +
+ drivers/net/ethernet/intel/e100.c | 12 +-
+ drivers/net/ethernet/intel/e1000/e1000_ethtool.c | 2 +-
+ drivers/net/ethernet/intel/e1000/e1000_hw.c | 4 +-
+ drivers/net/ethernet/intel/e1000/e1000_main.c | 2 +-
+ drivers/net/ethernet/intel/e1000e/ich8lan.c | 2 +-
+ drivers/net/ethernet/intel/e1000e/netdev.c | 2 +-
+ drivers/net/ethernet/intel/e1000e/phy.c | 2 +-
+ drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 10 +-
+ drivers/net/ethernet/intel/i40e/i40e.h | 2 +
+ drivers/net/ethernet/intel/i40e/i40e_client.c | 132 +-
+ drivers/net/ethernet/intel/i40e/i40e_main.c | 1 +
+ drivers/net/ethernet/intel/ice/Makefile | 1 +
+ drivers/net/ethernet/intel/ice/ice.h | 44 +-
+ drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 33 +
+ drivers/net/ethernet/intel/ice/ice_common.c | 220 +-
+ drivers/net/ethernet/intel/ice/ice_common.h | 9 +
+ drivers/net/ethernet/intel/ice/ice_dcb_lib.c | 19 +
+ drivers/net/ethernet/intel/ice/ice_hw_autogen.h | 3 +-
+ drivers/net/ethernet/intel/ice/ice_idc.c | 334 +
+ drivers/net/ethernet/intel/ice/ice_idc_int.h | 14 +
+ drivers/net/ethernet/intel/ice/ice_lag.c | 2 +
+ drivers/net/ethernet/intel/ice/ice_lib.c | 11 +
+ drivers/net/ethernet/intel/ice/ice_lib.h | 2 +-
+ drivers/net/ethernet/intel/ice/ice_main.c | 142 +-
+ drivers/net/ethernet/intel/ice/ice_sched.c | 69 +-
+ drivers/net/ethernet/intel/ice/ice_switch.c | 28 +
+ drivers/net/ethernet/intel/ice/ice_switch.h | 4 +
+ drivers/net/ethernet/intel/ice/ice_type.h | 4 +
+ drivers/net/ethernet/intel/igb/e1000_82575.c | 2 +-
+ drivers/net/ethernet/intel/igb/igb_ethtool.c | 2 +-
+ drivers/net/ethernet/intel/igb/igb_main.c | 11 +-
+ drivers/net/ethernet/intel/igb/igb_ptp.c | 4 +-
+ drivers/net/ethernet/intel/igbvf/netdev.c | 6 +-
+ drivers/net/ethernet/intel/igbvf/vf.h | 42 +-
+ drivers/net/ethernet/intel/igc/igc.h | 33 +-
+ drivers/net/ethernet/intel/igc/igc_base.h | 2 +
+ drivers/net/ethernet/intel/igc/igc_dump.c | 2 +-
+ drivers/net/ethernet/intel/igc/igc_ethtool.c | 2 +-
+ drivers/net/ethernet/intel/igc/igc_main.c | 665 +-
+ drivers/net/ethernet/intel/igc/igc_xdp.c | 109 +-
+ drivers/net/ethernet/intel/igc/igc_xdp.h | 8 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | 9 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 16 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c | 8 +-
+ drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 2 +-
+ drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 66 +-
+ drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c | 3 -
+ drivers/net/ethernet/marvell/octeontx2/af/npc.h | 104 +-
+ .../ethernet/marvell/octeontx2/af/npc_profile.h | 8675 ++++++++++++--------
+ drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 6 +
+ drivers/net/ethernet/marvell/octeontx2/af/rvu.h | 5 +
+ .../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 34 +
+ .../net/ethernet/marvell/octeontx2/af/rvu_npc.c | 298 +-
+ .../net/ethernet/marvell/octeontx2/af/rvu_reg.h | 4 +-
+ .../ethernet/marvell/octeontx2/nic/otx2_flows.c | 1 +
+ .../net/ethernet/marvell/prestera/prestera_hw.c | 85 +-
+ .../net/ethernet/marvell/prestera/prestera_hw.h | 3 +-
+ .../net/ethernet/marvell/prestera/prestera_pci.c | 104 +-
+ .../ethernet/marvell/prestera/prestera_switchdev.c | 17 +-
+ drivers/net/ethernet/marvell/skge.h | 2 +-
+ drivers/net/ethernet/marvell/sky2.c | 30 +-
+ drivers/net/ethernet/marvell/sky2.h | 8 +-
+ drivers/net/ethernet/mellanox/mlx5/core/Makefile | 2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/devlink.c | 10 +-
+ .../net/ethernet/mellanox/mlx5/core/en/rep/tc.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c | 58 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.h | 23 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 8 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 86 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_tc.h | 8 +-
+ drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 29 +-
+ drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.h | 2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 40 +-
+ drivers/net/ethernet/mellanox/mlx5/core/fs_core.h | 1 +
+ .../net/ethernet/mellanox/mlx5/core/fs_ft_pool.c | 83 +
+ .../net/ethernet/mellanox/mlx5/core/fs_ft_pool.h | 21 +
+ drivers/net/ethernet/mellanox/mlx5/core/lag.c | 28 +-
+ .../ethernet/mellanox/mlx5/core/lib/fs_chains.c | 94 +-
+ .../mellanox/mlx5/core/steering/dr_types.h | 1 -
+ .../ethernet/mellanox/mlx5/core/steering/fs_dr.c | 6 +-
+ drivers/net/ethernet/mellanox/mlxsw/Kconfig | 22 -
+ drivers/net/ethernet/mellanox/mlxsw/Makefile | 4 -
+ drivers/net/ethernet/mellanox/mlxsw/core.c | 10 +-
+ drivers/net/ethernet/mellanox/mlxsw/ib.h | 9 -
+ drivers/net/ethernet/mellanox/mlxsw/minimal.c | 4 +
+ drivers/net/ethernet/mellanox/mlxsw/pci.c | 5 -
+ drivers/net/ethernet/mellanox/mlxsw/pci.h | 3 -
+ drivers/net/ethernet/mellanox/mlxsw/reg.h | 84 +-
+ drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 5 +
+ .../net/ethernet/mellanox/mlxsw/spectrum_buffers.c | 6 +-
+ drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.c | 3 +
+ .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 248 +-
+ .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 4 +
+ drivers/net/ethernet/mellanox/mlxsw/switchib.c | 595 --
+ drivers/net/ethernet/mellanox/mlxsw/switchx2.c | 1691 ----
+ drivers/net/ethernet/micrel/ksz884x.c | 6 +-
+ drivers/net/ethernet/microsoft/mana/mana_en.c | 3 +-
+ drivers/net/ethernet/natsemi/natsemi.c | 6 +-
+ drivers/net/ethernet/neterion/s2io.c | 10 +-
+ drivers/net/ethernet/neterion/vxge/vxge-config.c | 2 +-
+ drivers/net/ethernet/neterion/vxge/vxge-main.c | 31 +-
+ drivers/net/ethernet/netronome/nfp/Makefile | 3 +-
+ drivers/net/ethernet/netronome/nfp/ccm_mbox.c | 2 +-
+ .../net/ethernet/netronome/nfp/flower/conntrack.c | 492 ++
+ .../net/ethernet/netronome/nfp/flower/conntrack.h | 155 +
+ drivers/net/ethernet/netronome/nfp/flower/main.h | 6 +
+ .../net/ethernet/netronome/nfp/flower/metadata.c | 101 +-
+ .../net/ethernet/netronome/nfp/flower/offload.c | 31 +-
+ .../ethernet/netronome/nfp/flower/tunnel_conf.c | 2 +-
+ .../net/ethernet/netronome/nfp/nfpcore/nfp_nffw.c | 2 +-
+ drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h | 2 -
+ .../ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c | 2 +
+ .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 102 +-
+ drivers/net/ethernet/qlogic/qed/qed_iscsi.c | 2 +-
+ .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c | 2 +-
+ .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c | 2 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.h | 1 -
+ drivers/net/ethernet/qualcomm/qca_debug.c | 1 +
+ drivers/net/ethernet/qualcomm/qca_spi.c | 10 +-
+ drivers/net/ethernet/qualcomm/qca_spi.h | 1 +
+ drivers/net/ethernet/qualcomm/rmnet/rmnet_config.h | 4 +-
+ .../net/ethernet/qualcomm/rmnet/rmnet_handlers.c | 40 +-
+ drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h | 11 +-
+ .../net/ethernet/qualcomm/rmnet/rmnet_map_data.c | 149 +-
+ drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c | 1 +
+ drivers/net/ethernet/rdc/r6040.c | 9 +-
+ drivers/net/ethernet/realtek/8139cp.c | 6 +-
+ drivers/net/ethernet/realtek/8139too.c | 6 +-
+ drivers/net/ethernet/realtek/atp.c | 4 +-
+ drivers/net/ethernet/realtek/r8169_main.c | 9 +-
+ drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 4 +-
+ drivers/net/ethernet/seeq/ether3.c | 10 +-
+ drivers/net/ethernet/sfc/ef10.c | 17 +-
+ drivers/net/ethernet/sfc/efx.c | 19 +-
+ drivers/net/ethernet/sfc/efx_common.c | 12 +-
+ drivers/net/ethernet/sfc/falcon/efx.c | 4 +-
+ drivers/net/ethernet/sfc/falcon/falcon_boards.c | 10 +-
+ drivers/net/ethernet/sfc/farch.c | 13 +-
+ drivers/net/ethernet/sis/sis900.c | 22 +-
+ drivers/net/ethernet/smsc/smc9194.c | 42 +-
+ drivers/net/ethernet/smsc/smc91x.c | 14 +-
+ drivers/net/ethernet/socionext/sni_ave.c | 2 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 37 +
+ drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 207 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac5.c | 30 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac5.h | 3 +-
+ .../net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 4 +-
+ drivers/net/ethernet/stmicro/stmmac/hwif.h | 5 +-
+ .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 6 +
+ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 12 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 21 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 16 +
+ .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 2 -
+ drivers/net/ethernet/sun/cassini.c | 2 +-
+ drivers/net/ethernet/sun/sungem.c | 20 +-
+ drivers/net/ethernet/sun/sunhme.c | 6 +-
+ drivers/net/ethernet/ti/cpsw_ale.c | 2 +-
+ drivers/net/ethernet/via/via-velocity.c | 6 +-
+ drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 1 +
+ drivers/net/ethernet/xilinx/xilinx_emaclite.c | 5 +-
+ drivers/net/ethernet/xircom/xirc2ps_cs.c | 2 +-
+ drivers/net/ethernet/xscale/ixp4xx_eth.c | 4 +-
+ drivers/net/fddi/skfp/ess.c | 6 +-
+ drivers/net/fddi/skfp/h/supern_2.h | 2 +-
+ drivers/net/fjes/fjes_main.c | 12 +-
+ drivers/net/gtp.c | 2 +-
+ drivers/net/hamradio/6pack.c | 10 +-
+ drivers/net/hamradio/baycom_epp.c | 4 +-
+ drivers/net/hamradio/bpqether.c | 4 +-
+ drivers/net/hamradio/hdlcdrv.c | 2 +-
+ drivers/net/hamradio/mkiss.c | 6 +-
+ drivers/net/hamradio/scc.c | 20 +-
+ drivers/net/hamradio/yam.c | 2 +-
+ drivers/net/ifb.c | 4 +-
+ drivers/net/macvlan.c | 2 +-
+ drivers/net/mdio/mdio-bcm-unimac.c | 2 +-
+ drivers/net/mdio/mdio-ipq8064.c | 70 +-
+ drivers/net/mdio/mdio-mux-bcm-iproc.c | 2 +-
+ drivers/net/mdio/mdio-mux-meson-g12a.c | 2 +-
+ drivers/net/mdio/of_mdio.c | 2 +-
+ drivers/net/mii.c | 2 +-
+ drivers/net/netdevsim/bus.c | 129 +-
+ drivers/net/netdevsim/dev.c | 396 +-
+ drivers/net/netdevsim/netdev.c | 95 +-
+ drivers/net/netdevsim/netdevsim.h | 48 +
+ drivers/net/pcs/pcs-xpcs.c | 51 +
+ drivers/net/phy/Kconfig | 16 +-
+ drivers/net/phy/Makefile | 2 +
+ drivers/net/phy/adin.c | 2 +-
+ drivers/net/phy/at803x.c | 162 +-
+ drivers/net/phy/mediatek-ge.c | 112 +
+ drivers/net/phy/motorcomm.c | 137 +
+ drivers/net/phy/nxp-c45-tja11xx.c | 531 +-
+ drivers/net/phy/phy_device.c | 2 +-
+ drivers/net/phy/rockchip.c | 2 +-
+ drivers/net/ppp/bsd_comp.c | 2 +-
+ drivers/net/slip/slhc.c | 2 +-
+ drivers/net/tun.c | 16 +-
+ drivers/net/usb/Kconfig | 10 +-
+ drivers/net/usb/cdc_ether.c | 2 +-
+ drivers/net/usb/cdc_mbim.c | 7 +-
+ drivers/net/usb/cdc_ncm.c | 40 +-
+ drivers/net/usb/hso.c | 7 +-
+ drivers/net/usb/huawei_cdc_ncm.c | 1 +
+ drivers/net/usb/int51x1.c | 2 +-
+ drivers/net/usb/lan78xx.c | 2 +-
+ drivers/net/usb/lg-vl600.c | 4 +-
+ drivers/net/usb/mcs7830.c | 2 +-
+ drivers/net/usb/qmi_wwan.c | 3 +-
+ drivers/net/usb/r8152.c | 79 +-
+ drivers/net/usb/rndis_host.c | 2 +-
+ drivers/net/virtio_net.c | 47 +-
+ drivers/net/vrf.c | 2 +-
+ drivers/net/wan/Kconfig | 4 +-
+ drivers/net/wan/c101.c | 39 +-
+ drivers/net/wan/fsl_ucc_hdlc.c | 3 +-
+ drivers/net/wan/hd64572.c | 95 +-
+ drivers/net/wan/hdlc.c | 63 +-
+ drivers/net/wan/hdlc_fr.c | 101 +-
+ drivers/net/wan/lmc/lmc.h | 2 +-
+ drivers/net/wan/n2.c | 56 +-
+ drivers/net/wan/sealevel.c | 126 +-
+ drivers/net/wan/wanxl.c | 190 +-
+ drivers/net/wan/z85230.c | 8 +-
+ drivers/net/wwan/wwan_core.c | 49 +-
+ drivers/nfc/fdp/fdp.c | 35 +-
+ drivers/nfc/fdp/fdp.h | 1 -
+ drivers/nfc/fdp/i2c.c | 14 +-
+ drivers/nfc/mei_phy.c | 8 -
+ drivers/nfc/microread/microread.c | 1 -
+ drivers/nfc/nfcmrvl/fw_dnld.c | 25 +-
+ drivers/nfc/nfcmrvl/fw_dnld.h | 15 +-
+ drivers/nfc/nfcmrvl/i2c.c | 22 +-
+ drivers/nfc/nfcmrvl/main.c | 13 +-
+ drivers/nfc/nfcmrvl/nfcmrvl.h | 27 +-
+ drivers/nfc/nfcmrvl/spi.c | 17 +-
+ drivers/nfc/nfcmrvl/uart.c | 47 +-
+ drivers/nfc/nfcmrvl/usb.c | 15 +-
+ drivers/nfc/pn533/i2c.c | 10 +-
+ drivers/nfc/pn533/pn533.c | 46 -
+ drivers/nfc/pn533/uart.c | 2 +-
+ drivers/nfc/pn533/usb.c | 4 -
+ drivers/nfc/pn544/i2c.c | 11 +-
+ drivers/nfc/port100.c | 4 +-
+ drivers/nfc/s3fwrn5/i2c.c | 32 +-
+ drivers/nfc/st-nci/i2c.c | 9 +-
+ drivers/nfc/st-nci/se.c | 14 +-
+ drivers/nfc/st-nci/spi.c | 9 +-
+ drivers/nfc/st-nci/vendor_cmds.c | 15 +-
+ drivers/nfc/st21nfca/dep.c | 59 +-
+ drivers/nfc/st21nfca/i2c.c | 9 +-
+ drivers/nfc/st95hf/core.c | 13 +-
+ drivers/ptp/ptp_clock.c | 21 -
+ drivers/staging/mt7621-dts/mt7621.dtsi | 4 +
+ drivers/usb/class/cdc-wdm.c | 181 +-
+ drivers/vhost/net.c | 6 +-
+ include/linux/bpf.h | 19 +-
+ include/linux/bpf_types.h | 2 +
+ include/linux/bpf_verifier.h | 9 +
+ include/linux/bpfptr.h | 75 +
+ include/linux/btf.h | 2 +-
+ include/linux/if_bridge.h | 8 +
+ include/linux/if_rmnet.h | 30 +-
+ include/linux/mlx5/driver.h | 2 +
+ include/linux/mlx5/eswitch.h | 17 +-
+ include/linux/net/intel/i40e_client.h | 12 +-
+ include/linux/net/intel/iidc.h | 100 +
+ include/linux/netfilter.h | 4 +-
+ include/linux/netfilter/x_tables.h | 2 +-
+ include/linux/of_mdio.h | 7 +
+ include/linux/pcs/pcs-xpcs.h | 2 +
+ include/linux/ptp_clock_kernel.h | 34 +-
+ include/linux/skmsg.h | 3 +-
+ include/linux/stmmac.h | 14 +
+ include/linux/usb/cdc-wdm.h | 3 +-
+ include/linux/wwan.h | 4 +-
+ include/net/devlink.h | 48 +
+ include/net/ip_fib.h | 43 +
+ include/net/ipv6.h | 8 +
+ include/net/netfilter/nf_tables.h | 34 +-
+ include/net/netfilter/nf_tables_core.h | 31 +
+ include/net/netfilter/nf_tables_ipv4.h | 40 +-
+ include/net/netfilter/nf_tables_ipv6.h | 42 +-
+ include/net/netns/ipv4.h | 1 +
+ include/net/netns/ipv6.h | 3 +-
+ include/net/protocol.h | 1 -
+ include/net/tc_act/tc_vlan.h | 1 +
+ include/trace/events/tcp.h | 76 +
+ include/uapi/linux/bpf.h | 39 +-
+ include/uapi/linux/can.h | 13 +-
+ include/uapi/linux/devlink.h | 17 +
+ include/uapi/linux/if_bridge.h | 2 +
+ include/uapi/linux/if_link.h | 2 +
+ include/uapi/linux/netfilter/nf_tables.h | 2 +
+ kernel/bpf/bpf_iter.c | 13 +-
+ kernel/bpf/btf.c | 70 +-
+ kernel/bpf/syscall.c | 194 +-
+ kernel/bpf/verifier.c | 345 +-
+ net/9p/trans_virtio.c | 6 +-
+ net/atm/atm_sysfs.c | 24 +-
+ net/bluetooth/hci_conn.c | 2 +-
+ net/bluetooth/hci_core.c | 8 +-
+ net/bluetooth/hci_event.c | 2 +-
+ net/bluetooth/hci_sock.c | 6 +-
+ net/bluetooth/mgmt.c | 2 +-
+ net/bluetooth/smp.c | 6 +-
+ net/bpf/test_run.c | 45 +-
+ net/bridge/br_forward.c | 5 +-
+ net/bridge/br_input.c | 2 +-
+ net/bridge/br_mdb.c | 57 +-
+ net/bridge/br_multicast.c | 445 +-
+ net/bridge/br_netlink.c | 1 -
+ net/bridge/br_private.h | 70 +-
+ net/caif/chnl_net.c | 2 -
+ net/can/isotp.c | 20 +-
+ net/can/proc.c | 6 +-
+ net/core/bpf_sk_storage.c | 3 +-
+ net/core/dev.c | 11 +-
+ net/core/devlink.c | 670 +-
+ net/core/filter.c | 22 +-
+ net/core/neighbour.c | 2 +-
+ net/core/net-traces.c | 1 +
+ net/core/netpoll.c | 4 +-
+ net/core/rtnetlink.c | 26 +-
+ net/core/skmsg.c | 3 +-
+ net/dcb/dcbnl.c | 6 +-
+ net/dccp/ipv4.c | 1 -
+ net/decnet/dn_nsp_in.c | 2 +-
+ net/decnet/dn_nsp_out.c | 2 +-
+ net/decnet/dn_route.c | 2 +-
+ net/ethtool/netlink.h | 2 +-
+ net/ipv4/af_inet.c | 6 +-
+ net/ipv4/cipso_ipv4.c | 3 +-
+ net/ipv4/devinet.c | 4 +-
+ net/ipv4/fib_frontend.c | 10 +-
+ net/ipv4/gre_demux.c | 1 -
+ net/ipv4/ipmr.c | 1 -
+ net/ipv4/netfilter/nft_reject_ipv4.c | 2 +-
+ net/ipv4/protocol.c | 6 -
+ net/ipv4/route.c | 127 +-
+ net/ipv4/sysctl_net_ipv4.c | 31 +-
+ net/ipv4/tcp_bpf.c | 9 +-
+ net/ipv4/tcp_input.c | 1 +
+ net/ipv4/tcp_ipv4.c | 3 +
+ net/ipv4/tunnel4.c | 3 -
+ net/ipv4/udp_bpf.c | 8 +-
+ net/ipv4/udplite.c | 1 -
+ net/ipv4/xfrm4_protocol.c | 3 -
+ net/ipv6/addrconf.c | 8 +-
+ net/ipv6/ip6_fib.c | 9 +-
+ net/ipv6/netfilter/ip6_tables.c | 2 +-
+ net/ipv6/netfilter/nft_reject_ipv6.c | 2 +-
+ net/ipv6/output_core.c | 28 +-
+ net/ipv6/route.c | 131 +-
+ net/ipv6/sit.c | 2 +-
+ net/ipv6/sysctl_net_ipv6.c | 31 +-
+ net/ipv6/tcp_ipv6.c | 2 +
+ net/l2tp/l2tp_ip.c | 1 -
+ net/mptcp/ctrl.c | 36 +-
+ net/mptcp/pm_netlink.c | 15 +-
+ net/mptcp/protocol.h | 2 +
+ net/mptcp/subflow.c | 8 +-
+ net/mptcp/token.c | 9 +-
+ net/netfilter/Kconfig | 2 +-
+ net/netfilter/ipset/ip_set_core.c | 50 +-
+ net/netfilter/ipvs/Kconfig | 2 +-
+ net/netfilter/nf_conntrack_h323_main.c | 2 +-
+ net/netfilter/nf_conntrack_netlink.c | 65 +-
+ net/netfilter/nf_tables_core.c | 2 +-
+ net/netfilter/nf_tables_trace.c | 6 +-
+ net/netfilter/nfnetlink_acct.c | 9 +-
+ net/netfilter/nfnetlink_cthelper.c | 10 +-
+ net/netfilter/nfnetlink_cttimeout.c | 34 +-
+ net/netfilter/nft_chain_filter.c | 26 +-
+ net/netfilter/nft_chain_nat.c | 4 +-
+ net/netfilter/nft_chain_route.c | 4 +-
+ net/netfilter/nft_compat.c | 28 +-
+ net/netfilter/nft_exthdr.c | 57 +-
+ net/netfilter/nft_flow_offload.c | 2 +-
+ net/netfilter/nft_lookup.c | 35 +-
+ net/netfilter/nft_objref.c | 4 +-
+ net/netfilter/nft_payload.c | 10 +-
+ net/netfilter/nft_reject_inet.c | 4 +-
+ net/netfilter/nft_set_bitmap.c | 5 +-
+ net/netfilter/nft_set_hash.c | 17 +-
+ net/netfilter/nft_set_pipapo.h | 2 -
+ net/netfilter/nft_set_pipapo_avx2.c | 12 +-
+ net/netfilter/nft_set_pipapo_avx2.h | 2 -
+ net/netfilter/nft_set_rbtree.c | 5 +-
+ net/netfilter/nft_synproxy.c | 4 +-
+ net/netfilter/nft_tproxy.c | 4 +-
+ net/netfilter/xt_AUDIT.c | 2 +-
+ net/netfilter/xt_CT.c | 1 -
+ net/netfilter/xt_limit.c | 46 +-
+ net/netlabel/netlabel_calipso.c | 4 +-
+ net/netlabel/netlabel_cipso_v4.c | 4 +-
+ net/netlabel/netlabel_mgmt.c | 8 +-
+ net/netlabel/netlabel_unlabeled.c | 10 +-
+ net/netlabel/netlabel_user.h | 4 +-
+ net/nfc/hci/command.c | 2 +-
+ net/nfc/hci/core.c | 2 +-
+ net/nfc/hci/llc_shdlc.c | 2 +-
+ net/nfc/nci/hci.c | 2 -
+ net/openvswitch/conntrack.c | 11 +-
+ net/packet/af_packet.c | 7 +-
+ net/qrtr/ns.c | 4 +-
+ net/rds/ib_ring.c | 2 +-
+ net/rds/tcp_recv.c | 2 +-
+ net/rxrpc/local_event.c | 2 +-
+ net/sched/act_vlan.c | 11 +-
+ net/sched/cls_api.c | 2 +-
+ net/sched/cls_rsvp.h | 2 +-
+ net/sched/ematch.c | 2 +-
+ net/sched/sch_gred.c | 2 +-
+ net/sched/sch_htb.c | 4 +-
+ net/sched/sch_taprio.c | 88 +-
+ net/sctp/protocol.c | 1 -
+ net/sctp/sm_statefuns.c | 30 +-
+ net/tls/tls_sw.c | 3 +-
+ samples/bpf/task_fd_query_user.c | 2 +-
+ samples/pktgen/parameters.sh | 7 +-
+ samples/pktgen/pktgen_sample01_simple.sh | 2 +
+ samples/pktgen/pktgen_sample02_multiqueue.sh | 2 +
+ .../pktgen/pktgen_sample03_burst_single_flow.sh | 2 +
+ samples/pktgen/pktgen_sample04_many_flows.sh | 2 +
+ samples/pktgen/pktgen_sample05_flow_per_thread.sh | 2 +
+ ...tgen_sample06_numa_awared_queue_irq_affinity.sh | 2 +
+ tools/bpf/bpftool/Makefile | 2 +-
+ tools/bpf/bpftool/gen.c | 394 +-
+ tools/bpf/bpftool/main.c | 7 +-
+ tools/bpf/bpftool/main.h | 1 +
+ tools/bpf/bpftool/prog.c | 107 +-
+ tools/bpf/bpftool/xlated_dumper.c | 3 +
+ tools/include/uapi/linux/bpf.h | 39 +-
+ tools/lib/bpf/Build | 2 +-
+ tools/lib/bpf/bpf_gen_internal.h | 41 +
+ tools/lib/bpf/gen_loader.c | 729 ++
+ tools/lib/bpf/libbpf.c | 427 +-
+ tools/lib/bpf/libbpf.h | 67 +-
+ tools/lib/bpf/libbpf.map | 7 +
+ tools/lib/bpf/libbpf_internal.h | 2 +
+ tools/lib/bpf/linker.c | 18 +-
+ tools/lib/bpf/netlink.c | 568 +-
+ tools/lib/bpf/nlattr.h | 48 +
+ tools/lib/bpf/skel_internal.h | 123 +
+ tools/testing/selftests/bpf/.gitignore | 1 +
+ tools/testing/selftests/bpf/Makefile | 16 +-
+ tools/testing/selftests/bpf/prog_tests/atomics.c | 72 +-
+ .../selftests/bpf/prog_tests/fentry_fexit.c | 6 +-
+ .../testing/selftests/bpf/prog_tests/fentry_test.c | 10 +-
+ .../testing/selftests/bpf/prog_tests/fexit_sleep.c | 6 +-
+ .../testing/selftests/bpf/prog_tests/fexit_test.c | 10 +-
+ .../testing/selftests/bpf/prog_tests/kfunc_call.c | 6 +-
+ .../selftests/bpf/prog_tests/ksyms_module.c | 2 +-
+ tools/testing/selftests/bpf/prog_tests/ringbuf.c | 8 +-
+ .../testing/selftests/bpf/prog_tests/send_signal.c | 2 +-
+ tools/testing/selftests/bpf/prog_tests/skeleton.c | 6 +-
+ .../selftests/bpf/prog_tests/static_linked.c | 9 +-
+ tools/testing/selftests/bpf/prog_tests/syscall.c | 55 +
+ tools/testing/selftests/bpf/prog_tests/tc_bpf.c | 395 +
+ .../selftests/bpf/prog_tests/trace_printk.c | 5 +-
+ .../selftests/bpf/progs/bpf_iter_test_kern4.c | 4 +-
+ tools/testing/selftests/bpf/progs/kfree_skb.c | 4 +-
+ tools/testing/selftests/bpf/progs/linked_maps1.c | 2 +-
+ tools/testing/selftests/bpf/progs/syscall.c | 121 +
+ tools/testing/selftests/bpf/progs/tailcall3.c | 2 +-
+ tools/testing/selftests/bpf/progs/tailcall4.c | 2 +-
+ tools/testing/selftests/bpf/progs/tailcall5.c | 2 +-
+ .../selftests/bpf/progs/tailcall_bpf2bpf2.c | 2 +-
+ .../selftests/bpf/progs/tailcall_bpf2bpf4.c | 2 +-
+ tools/testing/selftests/bpf/progs/test_check_mtu.c | 4 +-
+ .../selftests/bpf/progs/test_cls_redirect.c | 4 +-
+ .../selftests/bpf/progs/test_global_func_args.c | 2 +-
+ .../testing/selftests/bpf/progs/test_rdonly_maps.c | 6 +-
+ tools/testing/selftests/bpf/progs/test_ringbuf.c | 4 +-
+ tools/testing/selftests/bpf/progs/test_skeleton.c | 4 +-
+ .../selftests/bpf/progs/test_snprintf_single.c | 2 +-
+ .../selftests/bpf/progs/test_sockmap_listen.c | 4 +-
+ .../selftests/bpf/progs/test_static_linked1.c | 10 +-
+ .../selftests/bpf/progs/test_static_linked2.c | 10 +-
+ tools/testing/selftests/bpf/progs/test_subprogs.c | 13 +
+ tools/testing/selftests/bpf/progs/test_tc_bpf.c | 12 +
+ tools/testing/selftests/bpf/progs/trace_printk.c | 6 +-
+ .../selftests/drivers/net/mlxsw/port_scale.sh | 4 +-
+ .../selftests/drivers/net/mlxsw/qos_headroom.sh | 69 +-
+ .../testing/selftests/drivers/net/mlxsw/qos_lib.sh | 14 -
+ .../testing/selftests/drivers/net/mlxsw/qos_pfc.sh | 24 +-
+ .../selftests/drivers/net/mlxsw/tc_sample.sh | 12 +-
+ .../selftests/drivers/net/netdevsim/devlink.sh | 167 +-
+ tools/testing/selftests/net/devlink_port_split.py | 8 +-
+ .../net/forwarding/custom_multipath_hash.sh | 364 +
+ .../selftests/net/forwarding/devlink_lib.sh | 6 +
+ .../net/forwarding/gre_custom_multipath_hash.sh | 456 +
+ .../net/forwarding/ip6gre_custom_multipath_hash.sh | 458 ++
+ tools/testing/selftests/net/unicast_extensions.sh | 17 +-
+ .../tc-testing/tc-tests/actions/vlan.json | 28 +-
+ 663 files changed, 27593 insertions(+), 12774 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/net/brcm,iproc-mdio.txt
+ create mode 100644 Documentation/devicetree/bindings/net/brcm,iproc-mdio.yaml
+ delete mode 100644 Documentation/devicetree/bindings/net/can/rcar_can.txt
+ delete mode 100644 Documentation/devicetree/bindings/net/can/rcar_canfd.txt
+ create mode 100644 Documentation/devicetree/bindings/net/can/renesas,rcar-can.yaml
+ create mode 100644 Documentation/devicetree/bindings/net/can/renesas,rcar-canfd.yaml
+ create mode 100644 drivers/net/can/c_can/c_can_ethtool.c
+ rename drivers/net/can/c_can/{c_can.c => c_can_main.c} (99%)
+ create mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.h
+ create mode 100644 drivers/net/ethernet/intel/ice/ice_idc.c
+ create mode 100644 drivers/net/ethernet/intel/ice/ice_idc_int.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/fs_ft_pool.c
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/fs_ft_pool.h
+ delete mode 100644 drivers/net/ethernet/mellanox/mlxsw/ib.h
+ delete mode 100644 drivers/net/ethernet/mellanox/mlxsw/switchib.c
+ delete mode 100644 drivers/net/ethernet/mellanox/mlxsw/switchx2.c
+ create mode 100644 drivers/net/ethernet/netronome/nfp/flower/conntrack.c
+ create mode 100644 drivers/net/ethernet/netronome/nfp/flower/conntrack.h
+ create mode 100644 drivers/net/phy/mediatek-ge.c
+ create mode 100644 drivers/net/phy/motorcomm.c
+ create mode 100644 include/linux/bpfptr.h
+ create mode 100644 include/linux/net/intel/iidc.h
+ create mode 100644 tools/lib/bpf/bpf_gen_internal.h
+ create mode 100644 tools/lib/bpf/gen_loader.c
+ create mode 100644 tools/lib/bpf/skel_internal.h
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/syscall.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/tc_bpf.c
+ create mode 100644 tools/testing/selftests/bpf/progs/syscall.c
+ create mode 100644 tools/testing/selftests/bpf/progs/test_tc_bpf.c
+ create mode 100755 tools/testing/selftests/net/forwarding/custom_multipath_hash.sh
+ create mode 100755 tools/testing/selftests/net/forwarding/gre_custom_multipath_hash.sh
+ create mode 100755 tools/testing/selftests/net/forwarding/ip6gre_custom_multipath_hash.sh
+Merging bpf-next/for-next (05924717ac70 bpf, tnums: Provably sound, faster, and more precise algorithm for tnum_mul)
+$ git merge bpf-next/for-next
+Auto-merging tools/lib/bpf/libbpf_internal.h
+Auto-merging tools/lib/bpf/libbpf.c
+Auto-merging net/core/filter.c
+Auto-merging kernel/bpf/verifier.c
+Auto-merging kernel/bpf/syscall.c
+Auto-merging kernel/bpf/btf.c
+Merge made by the 'recursive' strategy.
+ Documentation/bpf/index.rst | 1 +
+ Documentation/bpf/llvm_reloc.rst | 240 ++++++++++
+ include/linux/bpf.h | 22 +
+ include/linux/bpf_local_storage.h | 4 +-
+ include/linux/filter.h | 19 +-
+ include/net/xdp.h | 1 +
+ include/trace/events/xdp.h | 6 +-
+ include/uapi/linux/bpf.h | 27 +-
+ kernel/bpf/bpf_inode_storage.c | 2 +-
+ kernel/bpf/btf.c | 6 +-
+ kernel/bpf/cpumap.c | 3 +-
+ kernel/bpf/devmap.c | 305 ++++++++++--
+ kernel/bpf/hashtab.c | 102 +++-
+ kernel/bpf/preload/iterators/iterators.bpf.c | 1 -
+ kernel/bpf/reuseport_array.c | 2 +-
+ kernel/bpf/syscall.c | 34 +-
+ kernel/bpf/tnum.c | 41 +-
+ kernel/bpf/trampoline.c | 2 +-
+ kernel/bpf/verifier.c | 12 +-
+ net/core/filter.c | 37 +-
+ net/core/xdp.c | 28 ++
+ net/xdp/xdp_umem.c | 7 +-
+ net/xdp/xskmap.c | 3 +-
+ samples/bpf/Makefile | 3 +
+ samples/bpf/ibumad_kern.c | 2 +-
+ samples/bpf/ibumad_user.c | 2 +-
+ samples/bpf/xdp_redirect_map_multi_kern.c | 88 ++++
+ samples/bpf/xdp_redirect_map_multi_user.c | 302 ++++++++++++
+ tools/bpf/bpftool/gen.c | 27 +-
+ tools/include/uapi/linux/bpf.h | 27 +-
+ tools/lib/bpf/Makefile | 1 +
+ tools/lib/bpf/bpf.c | 179 +++++--
+ tools/lib/bpf/bpf.h | 2 +
+ tools/lib/bpf/bpf_helpers.h | 66 +++
+ tools/lib/bpf/bpf_prog_linfo.c | 18 +-
+ tools/lib/bpf/bpf_tracing.h | 62 +--
+ tools/lib/bpf/btf.c | 302 ++++++------
+ tools/lib/bpf/btf_dump.c | 14 +-
+ tools/lib/bpf/libbpf.c | 522 +++++++++++----------
+ tools/lib/bpf/libbpf.h | 1 +
+ tools/lib/bpf/libbpf.map | 6 +
+ tools/lib/bpf/libbpf_errno.c | 7 +-
+ tools/lib/bpf/libbpf_internal.h | 59 +++
+ tools/lib/bpf/libbpf_legacy.h | 59 +++
+ tools/lib/bpf/linker.c | 25 +-
+ tools/lib/bpf/netlink.c | 81 ++--
+ tools/lib/bpf/ringbuf.c | 26 +-
+ tools/testing/selftests/bpf/Makefile | 3 +-
+ tools/testing/selftests/bpf/README.rst | 19 +
+ tools/testing/selftests/bpf/bench.c | 1 +
+ tools/testing/selftests/bpf/benchs/bench_rename.c | 2 +-
+ .../testing/selftests/bpf/benchs/bench_ringbufs.c | 6 +-
+ tools/testing/selftests/bpf/benchs/bench_trigger.c | 2 +-
+ .../selftests/bpf/prog_tests/attach_probe.c | 12 +-
+ tools/testing/selftests/bpf/prog_tests/bpf_iter.c | 31 +-
+ .../testing/selftests/bpf/prog_tests/bpf_tcp_ca.c | 8 +-
+ tools/testing/selftests/bpf/prog_tests/btf.c | 93 ++--
+ tools/testing/selftests/bpf/prog_tests/btf_dump.c | 8 +-
+ tools/testing/selftests/bpf/prog_tests/btf_write.c | 4 +-
+ .../selftests/bpf/prog_tests/cg_storage_multi.c | 84 ++--
+ .../selftests/bpf/prog_tests/cgroup_attach_multi.c | 2 +-
+ .../testing/selftests/bpf/prog_tests/cgroup_link.c | 14 +-
+ .../bpf/prog_tests/cgroup_skb_sk_lookup.c | 2 +-
+ tools/testing/selftests/bpf/prog_tests/check_mtu.c | 2 +-
+ .../testing/selftests/bpf/prog_tests/core_reloc.c | 15 +-
+ .../selftests/bpf/prog_tests/fexit_bpf2bpf.c | 25 +-
+ .../selftests/bpf/prog_tests/flow_dissector.c | 2 +-
+ .../bpf/prog_tests/flow_dissector_reattach.c | 10 +-
+ .../selftests/bpf/prog_tests/get_stack_raw_tp.c | 10 +-
+ .../bpf/prog_tests/get_stackid_cannot_attach.c | 9 +-
+ tools/testing/selftests/bpf/prog_tests/hashmap.c | 9 +-
+ tools/testing/selftests/bpf/prog_tests/kfree_skb.c | 19 +-
+ tools/testing/selftests/bpf/prog_tests/ksyms_btf.c | 3 +-
+ .../selftests/bpf/prog_tests/link_pinning.c | 7 +-
+ .../selftests/bpf/prog_tests/lookup_and_delete.c | 288 ++++++++++++
+ tools/testing/selftests/bpf/prog_tests/obj_name.c | 8 +-
+ .../selftests/bpf/prog_tests/perf_branches.c | 4 +-
+ .../testing/selftests/bpf/prog_tests/perf_buffer.c | 2 +-
+ .../selftests/bpf/prog_tests/perf_event_stackmap.c | 3 +-
+ .../testing/selftests/bpf/prog_tests/probe_user.c | 7 +-
+ .../selftests/bpf/prog_tests/prog_run_xattr.c | 4 +-
+ .../selftests/bpf/prog_tests/raw_tp_test_run.c | 4 +-
+ .../testing/selftests/bpf/prog_tests/rdonly_maps.c | 7 +-
+ .../selftests/bpf/prog_tests/reference_tracking.c | 2 +-
+ .../selftests/bpf/prog_tests/resolve_btfids.c | 2 +-
+ .../selftests/bpf/prog_tests/ringbuf_multi.c | 2 +-
+ .../selftests/bpf/prog_tests/select_reuseport.c | 53 ++-
+ .../testing/selftests/bpf/prog_tests/send_signal.c | 3 +-
+ tools/testing/selftests/bpf/prog_tests/sk_lookup.c | 2 +-
+ .../testing/selftests/bpf/prog_tests/sock_fields.c | 14 +-
+ .../selftests/bpf/prog_tests/sockmap_basic.c | 8 +-
+ .../selftests/bpf/prog_tests/sockmap_ktls.c | 2 +-
+ .../selftests/bpf/prog_tests/sockmap_listen.c | 10 +-
+ .../bpf/prog_tests/stacktrace_build_id_nmi.c | 3 +-
+ .../selftests/bpf/prog_tests/stacktrace_map.c | 2 +-
+ .../bpf/prog_tests/stacktrace_map_raw_tp.c | 5 +-
+ .../selftests/bpf/prog_tests/tcp_hdr_options.c | 15 +-
+ .../selftests/bpf/prog_tests/test_overhead.c | 12 +-
+ .../selftests/bpf/prog_tests/trampoline_count.c | 14 +-
+ tools/testing/selftests/bpf/prog_tests/udp_limit.c | 7 +-
+ .../testing/selftests/bpf/prog_tests/xdp_bpf2bpf.c | 2 +-
+ tools/testing/selftests/bpf/prog_tests/xdp_link.c | 8 +-
+ .../selftests/bpf/progs/bpf_iter_bpf_hash_map.c | 1 -
+ .../testing/selftests/bpf/progs/bpf_iter_bpf_map.c | 1 -
+ .../selftests/bpf/progs/bpf_iter_ipv6_route.c | 1 -
+ .../testing/selftests/bpf/progs/bpf_iter_netlink.c | 1 -
+ tools/testing/selftests/bpf/progs/bpf_iter_task.c | 1 -
+ .../selftests/bpf/progs/bpf_iter_task_btf.c | 1 -
+ .../selftests/bpf/progs/bpf_iter_task_file.c | 1 -
+ .../selftests/bpf/progs/bpf_iter_task_stack.c | 1 -
+ .../selftests/bpf/progs/bpf_iter_task_vma.c | 1 -
+ tools/testing/selftests/bpf/progs/bpf_iter_tcp4.c | 1 -
+ tools/testing/selftests/bpf/progs/bpf_iter_tcp6.c | 1 -
+ tools/testing/selftests/bpf/progs/bpf_iter_udp4.c | 1 -
+ tools/testing/selftests/bpf/progs/bpf_iter_udp6.c | 1 -
+ .../selftests/bpf/progs/test_lookup_and_delete.c | 26 +
+ tools/testing/selftests/bpf/progs/test_snprintf.c | 1 -
+ .../selftests/bpf/progs/xdp_redirect_multi_kern.c | 94 ++++
+ tools/testing/selftests/bpf/test_lru_map.c | 8 +
+ tools/testing/selftests/bpf/test_maps.c | 185 ++++----
+ tools/testing/selftests/bpf/test_progs.c | 3 +
+ tools/testing/selftests/bpf/test_progs.h | 9 +-
+ tools/testing/selftests/bpf/test_tcpnotify_user.c | 7 +-
+ .../selftests/bpf/test_xdp_redirect_multi.sh | 204 ++++++++
+ tools/testing/selftests/bpf/xdp_redirect_multi.c | 226 +++++++++
+ 125 files changed, 3325 insertions(+), 1132 deletions(-)
+ create mode 100644 Documentation/bpf/llvm_reloc.rst
+ create mode 100644 samples/bpf/xdp_redirect_map_multi_kern.c
+ create mode 100644 samples/bpf/xdp_redirect_map_multi_user.c
+ create mode 100644 tools/lib/bpf/libbpf_legacy.h
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/lookup_and_delete.c
+ create mode 100644 tools/testing/selftests/bpf/progs/test_lookup_and_delete.c
+ create mode 100644 tools/testing/selftests/bpf/progs/xdp_redirect_multi_kern.c
+ create mode 100755 tools/testing/selftests/bpf/test_xdp_redirect_multi.sh
+ create mode 100644 tools/testing/selftests/bpf/xdp_redirect_multi.c
+Merging ipsec-next/master (a925316af80a net: Remove unnecessary variables)
+$ git merge ipsec-next/master
+Auto-merging net/xfrm/xfrm_state.c
+Auto-merging include/net/xfrm.h
+Merge made by the 'recursive' strategy.
+ include/net/netns/xfrm.h | 1 +
+ include/net/xfrm.h | 1 +
+ net/ipv4/esp4_offload.c | 3 +--
+ net/key/af_key.c | 6 +----
+ net/xfrm/xfrm_hash.h | 7 ++++++
+ net/xfrm/xfrm_state.c | 65 ++++++++++++++++++++++++++++++++++++++----------
+ 6 files changed, 63 insertions(+), 20 deletions(-)
+Merging mlx5-next/mlx5-next (63f9c44bca5e net/mlx5: Add MEMIC operations related bits)
+$ git merge mlx5-next/mlx5-next
+Already up to date.
+Merging netfilter-next/master (5fe8e519e44f Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next)
+$ git merge netfilter-next/master
+Already up to date.
+Merging ipvs-next/master (5fe8e519e44f Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next)
+$ git merge ipvs-next/master
+Already up to date.
+Merging wireless-drivers-next/master (1e36f828c423 Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git)
+$ git merge wireless-drivers-next/master
+Merge made by the 'recursive' strategy.
+ drivers/net/wireless/ath/ath10k/core.h | 2 +-
+ drivers/net/wireless/ath/ath10k/debug.c | 4 ++--
+ drivers/net/wireless/ath/ath10k/htt.h | 4 ++--
+ drivers/net/wireless/ath/ath10k/wmi.c | 6 +++---
+ drivers/net/wireless/ath/ath10k/wmi.h | 8 ++++----
+ drivers/net/wireless/ath/ath11k/core.h | 4 ++--
+ drivers/net/wireless/ath/ath11k/debugfs_htt_stats.c | 2 +-
+ drivers/net/wireless/ath/ath11k/debugfs_htt_stats.h | 2 +-
+ drivers/net/wireless/ath/ath11k/wmi.c | 4 ++--
+ drivers/net/wireless/ath/ath11k/wmi.h | 4 ++--
+ drivers/net/wireless/ath/ath9k/ar9003_mac.c | 2 ++
+ 11 files changed, 22 insertions(+), 20 deletions(-)
+Merging bluetooth/master (35eb10b55b83 Bluetooth: Fix spelling mistakes)
+$ git merge bluetooth/master
+Auto-merging net/bluetooth/smp.c
+Auto-merging net/bluetooth/mgmt.c
+Auto-merging net/bluetooth/hci_event.c
+Auto-merging net/bluetooth/hci_core.c
+Auto-merging net/bluetooth/hci_conn.c
+Auto-merging drivers/bluetooth/btusb.c
+Removing Documentation/devicetree/bindings/net/qualcomm-bluetooth.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/net/qualcomm-bluetooth.txt | 69 --------
+ .../bindings/net/qualcomm-bluetooth.yaml | 183 +++++++++++++++++++++
+ drivers/bluetooth/btbcm.c | 1 +
+ drivers/bluetooth/btmtkuart.c | 6 +-
+ drivers/bluetooth/btqca.c | 113 +++++++++----
+ drivers/bluetooth/btqca.h | 14 +-
+ drivers/bluetooth/btrtl.c | 35 ++--
+ drivers/bluetooth/btrtl.h | 7 +
+ drivers/bluetooth/btusb.c | 68 ++++++--
+ drivers/bluetooth/hci_h5.c | 5 +-
+ drivers/bluetooth/hci_qca.c | 118 ++++++++++---
+ drivers/bluetooth/virtio_bt.c | 3 +
+ include/net/bluetooth/hci.h | 77 ++++-----
+ include/net/bluetooth/hci_core.h | 7 +-
+ include/net/bluetooth/mgmt.h | 3 +-
+ net/bluetooth/6lowpan.c | 38 +----
+ net/bluetooth/cmtp/core.c | 5 +
+ net/bluetooth/hci_conn.c | 2 +-
+ net/bluetooth/hci_core.c | 54 ++++--
+ net/bluetooth/hci_event.c | 94 +++++++----
+ net/bluetooth/hci_request.c | 46 +++++-
+ net/bluetooth/hidp/core.c | 2 +-
+ net/bluetooth/l2cap_core.c | 10 +-
+ net/bluetooth/mgmt.c | 26 ++-
+ net/bluetooth/msft.c | 6 +-
+ net/bluetooth/rfcomm/tty.c | 10 +-
+ net/bluetooth/smp.c | 66 ++++----
+ net/bluetooth/smp.h | 6 +-
+ 28 files changed, 730 insertions(+), 344 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/net/qualcomm-bluetooth.txt
+ create mode 100644 Documentation/devicetree/bindings/net/qualcomm-bluetooth.yaml
+Merging mac80211-next/master (77091933e453 net: mdio: ipq8064: enlarge sleep after read/write operation)
+$ git merge mac80211-next/master
+Already up to date.
+Merging gfs2/for-next (574c26b5ca1c gfs2: Fix do_gfs2_set_flags description)
+$ git merge gfs2/for-next
+Merge made by the 'recursive' strategy.
+ fs/gfs2/aops.c | 6 +-
+ fs/gfs2/bmap.c | 31 ++++-----
+ fs/gfs2/file.c | 176 +++++++++++++++++++++++++++++++++++++++-------------
+ fs/gfs2/glock.c | 12 ++++
+ fs/gfs2/glock.h | 27 +++++++-
+ fs/gfs2/incore.h | 41 ++++++++++++
+ fs/gfs2/inode.c | 2 +-
+ fs/gfs2/log.c | 4 +-
+ fs/gfs2/lops.c | 2 +-
+ fs/gfs2/meta_io.c | 6 +-
+ fs/gfs2/super.c | 2 +-
+ fs/gfs2/trans.c | 16 ++---
+ include/linux/uio.h | 1 +
+ lib/iov_iter.c | 20 +++++-
+ 14 files changed, 266 insertions(+), 80 deletions(-)
+Merging mtd/mtd/next (10f3b4d79958 mtd: parsers: qcom: Fix leaking of partition name)
+$ git merge mtd/mtd/next
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/mtd/common.txt | 16 +-
+ .../devicetree/bindings/mtd/jedec,spi-nor.yaml | 6 +
+ Documentation/devicetree/bindings/mtd/mtd.yaml | 89 ++++++++++
+ .../bindings/mtd/partitions/brcm,trx.txt | 5 +
+ drivers/mtd/devices/ms02-nv.c | 1 -
+ drivers/mtd/devices/phram.c | 1 +
+ drivers/mtd/inftlmount.c | 2 +-
+ drivers/mtd/maps/plat-ram.c | 1 -
+ drivers/mtd/mtdcore.c | 194 ++++++++++++++++++---
+ drivers/mtd/mtdpart.c | 2 +-
+ drivers/mtd/nftlcore.c | 1 -
+ drivers/mtd/nftlmount.c | 2 +-
+ drivers/mtd/parsers/Kconfig | 2 +-
+ drivers/mtd/parsers/parser_trx.c | 9 +-
+ drivers/mtd/parsers/qcomsmempart.c | 10 ++
+ drivers/mtd/parsers/redboot.c | 76 ++++----
+ drivers/mtd/sm_ftl.c | 51 ++++--
+ drivers/mtd/tests/oobtest.c | 7 +-
+ drivers/mtd/tests/torturetest.c | 2 -
+ drivers/nvmem/core.c | 4 +-
+ include/linux/mtd/mtd.h | 2 +
+ include/linux/nvmem-provider.h | 2 +
+ 22 files changed, 376 insertions(+), 109 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mtd/mtd.yaml
+Merging nand/nand/next (c374839f9b44 mtd: spinand: macronix: Add support for serial NAND flash)
+$ git merge nand/nand/next
+Auto-merging MAINTAINERS
+Removing Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/mtd/brcm,brcmnand.txt | 186 -----------
+ .../devicetree/bindings/mtd/brcm,brcmnand.yaml | 242 ++++++++++++++
+ .../devicetree/bindings/mtd/nand-controller.yaml | 18 +-
+ MAINTAINERS | 1 +
+ drivers/mtd/nand/bbt.c | 2 +-
+ drivers/mtd/nand/raw/arasan-nand-controller.c | 283 ++++++++++++----
+ drivers/mtd/nand/raw/atmel/nand-controller.c | 7 +-
+ drivers/mtd/nand/raw/cadence-nand-controller.c | 6 +-
+ drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.h | 2 +-
+ drivers/mtd/nand/raw/hisi504_nand.c | 4 +-
+ drivers/mtd/nand/raw/internals.h | 5 +
+ drivers/mtd/nand/raw/mtk_ecc.c | 4 +-
+ drivers/mtd/nand/raw/nand_base.c | 364 +++++++++++++++-----
+ drivers/mtd/nand/raw/nand_legacy.c | 2 +-
+ drivers/mtd/nand/raw/nand_onfi.c | 5 +-
+ drivers/mtd/nand/raw/nand_timings.c | 370 ++++++++++++++++++++-
+ drivers/mtd/nand/raw/qcom_nandc.c | 5 +-
+ drivers/mtd/nand/spi/macronix.c | 112 +++++++
+ include/linux/mtd/onfi.h | 41 ++-
+ include/linux/mtd/rawnand.h | 161 ++++++++-
+ 20 files changed, 1449 insertions(+), 371 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt
+ create mode 100644 Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml
+Merging spi-nor/spi-nor/next (a6e2cd4dd28e mtd: spi-nor: otp: fix kerneldoc typos)
+$ git merge spi-nor/spi-nor/next
+Merge made by the 'recursive' strategy.
+ drivers/mtd/spi-nor/controllers/nxp-spifi.c | 2 +-
+ drivers/mtd/spi-nor/core.c | 15 +++++++++++++++
+ drivers/mtd/spi-nor/otp.c | 4 ++--
+ 3 files changed, 18 insertions(+), 3 deletions(-)
+Merging crypto/master (a5c164b195a8 crypto: hisilicon/qm - support address prefetching)
+$ git merge crypto/master
+Auto-merging drivers/crypto/cavium/nitrox/nitrox_main.c
+Removing arch/arm64/crypto/sha512-core.S_shipped
+Removing arch/arm64/crypto/sha256-core.S_shipped
+Removing arch/arm64/crypto/poly1305-core.S_shipped
+Removing arch/arm/crypto/sha512-core.S_shipped
+Removing arch/arm/crypto/sha256-core.S_shipped
+Removing arch/arm/crypto/poly1305-core.S_shipped
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 14 +
+ arch/arm/crypto/Makefile | 10 +-
+ arch/arm/crypto/poly1305-core.S_shipped | 1158 --------
+ arch/arm/crypto/sha256-core.S_shipped | 2816 --------------------
+ arch/arm/crypto/sha512-core.S_shipped | 1869 -------------
+ arch/arm64/crypto/Makefile | 10 +-
+ arch/arm64/crypto/poly1305-core.S_shipped | 835 ------
+ arch/arm64/crypto/sha256-core.S_shipped | 2069 --------------
+ arch/arm64/crypto/sha512-core.S_shipped | 1093 --------
+ crypto/drbg.c | 12 +-
+ crypto/ecdh.c | 49 +-
+ crypto/khazad.c | 2 +-
+ crypto/tcrypt.c | 36 +
+ crypto/testmgr.c | 10 +-
+ crypto/testmgr.h | 71 +-
+ crypto/wp512.c | 40 +-
+ drivers/char/hw_random/Kconfig | 10 +-
+ drivers/char/hw_random/amd-rng.c | 2 +-
+ drivers/char/hw_random/core.c | 38 +-
+ drivers/char/hw_random/exynos-trng.c | 4 +-
+ drivers/crypto/Kconfig | 20 +
+ drivers/crypto/cavium/cpt/cptpf_main.c | 2 +-
+ drivers/crypto/cavium/cpt/cptvf_reqmanager.c | 10 +-
+ drivers/crypto/cavium/nitrox/nitrox_main.c | 4 +-
+ drivers/crypto/cavium/nitrox/nitrox_mbx.c | 4 +-
+ drivers/crypto/cavium/nitrox/nitrox_reqmgr.c | 16 +-
+ drivers/crypto/cavium/nitrox/nitrox_skcipher.c | 2 +-
+ drivers/crypto/ccp/ccp-dev.c | 2 +-
+ drivers/crypto/ccp/sev-dev.c | 4 +
+ drivers/crypto/ccp/sp-pci.c | 6 +-
+ drivers/crypto/hisilicon/hpre/hpre_crypto.c | 89 +-
+ drivers/crypto/hisilicon/hpre/hpre_main.c | 249 +-
+ drivers/crypto/hisilicon/qm.c | 310 ++-
+ drivers/crypto/hisilicon/qm.h | 2 +
+ drivers/crypto/hisilicon/sec2/sec_main.c | 93 +-
+ drivers/crypto/hisilicon/zip/zip_main.c | 88 +-
+ drivers/crypto/ixp4xx_crypto.c | 277 +-
+ drivers/crypto/nx/nx-842-pseries.c | 25 +-
+ drivers/crypto/nx/nx-common-powernv.c | 4 +-
+ .../qat/qat_common/icp_qat_fw_loader_handle.h | 2 +-
+ drivers/crypto/qat/qat_common/qat_hal.c | 14 +-
+ drivers/crypto/qat/qat_common/qat_uclo.c | 12 +-
+ drivers/crypto/qce/Makefile | 1 +
+ drivers/crypto/qce/aead.c | 847 ++++++
+ drivers/crypto/qce/aead.h | 56 +
+ drivers/crypto/qce/common.c | 196 +-
+ drivers/crypto/qce/common.h | 9 +-
+ drivers/crypto/qce/core.c | 4 +
+ drivers/crypto/qce/skcipher.c | 15 +-
+ drivers/crypto/sa2ul.c | 46 +-
+ drivers/crypto/ux500/hash/hash_core.c | 1 +
+ include/crypto/aead.h | 2 +-
+ include/crypto/engine.h | 2 +-
+ include/crypto/hash.h | 2 +-
+ 54 files changed, 2210 insertions(+), 10354 deletions(-)
+ delete mode 100644 arch/arm/crypto/poly1305-core.S_shipped
+ delete mode 100644 arch/arm/crypto/sha256-core.S_shipped
+ delete mode 100644 arch/arm/crypto/sha512-core.S_shipped
+ delete mode 100644 arch/arm64/crypto/poly1305-core.S_shipped
+ delete mode 100644 arch/arm64/crypto/sha256-core.S_shipped
+ delete mode 100644 arch/arm64/crypto/sha512-core.S_shipped
+ create mode 100644 drivers/crypto/qce/aead.c
+ create mode 100644 drivers/crypto/qce/aead.h
+Merging drm/drm-next (ccd1950c2f7e Merge tag 'drm-intel-gt-next-2021-05-28' of git://anongit.freedesktop.org/drm/drm-intel into drm-next)
+$ git merge drm/drm-next
+Auto-merging include/linux/pci.h
+Removing include/drm/drm_agpsupport.h
+Removing drivers/gpu/drm/vmwgfx/vmwgfx_msg.h
+Removing drivers/gpu/drm/vmwgfx/ttm_lock.h
+Removing drivers/gpu/drm/vmwgfx/ttm_lock.c
+Auto-merging drivers/gpu/drm/ttm/ttm_device.c
+Auto-merging drivers/gpu/drm/meson/meson_drv.c
+Auto-merging drivers/gpu/drm/i915/selftests/i915_gem.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/selftests/i915_gem.c
+Auto-merging drivers/gpu/drm/i915/i915_drv.h
+Auto-merging drivers/gpu/drm/i915/display/intel_dp_link_training.c
+Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c
+Auto-merging MAINTAINERS
+Removing Documentation/devicetree/bindings/display/faraday,tve200.txt
+Recorded preimage for 'drivers/gpu/drm/i915/selftests/i915_gem.c'
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+Recorded resolution for 'drivers/gpu/drm/i915/selftests/i915_gem.c'.
+[master 302f3adf3371] Merge remote-tracking branch 'drm/drm-next'
+$ git diff -M --stat --summary HEAD^..
+ .../bindings/display/brcm,bcm2835-vec.yaml | 4 +-
+ .../bindings/display/bridge/cdns,mhdp8546.yaml | 15 +-
+ .../display/bridge/google,cros-ec-anx7688.yaml | 82 +
+ .../bindings/display/bridge/ite,it66121.yaml | 124 +
+ .../devicetree/bindings/display/faraday,tve200.txt | 54 -
+ .../bindings/display/faraday,tve200.yaml | 68 +
+ .../bindings/display/panel/samsung,lms397kf04.yaml | 74 +
+ .../devicetree/bindings/gpu/arm,mali-bifrost.yaml | 30 +-
+ Documentation/gpu/driver-uapi.rst | 8 +
+ Documentation/gpu/drm-internals.rst | 12 +
+ Documentation/gpu/index.rst | 1 +
+ Documentation/gpu/rfc/i915_gem_lmem.rst | 131 +
+ Documentation/gpu/rfc/index.rst | 4 +
+ Documentation/gpu/todo.rst | 2 +
+ MAINTAINERS | 22 +-
+ arch/x86/kernel/early-quirks.c | 1 +
+ drivers/gpu/drm/Kconfig | 29 +-
+ drivers/gpu/drm/Makefile | 8 +-
+ drivers/gpu/drm/amd/amdgpu/Makefile | 7 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu.h | 12 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 12 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 55 +-
+ .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_fence.c | 20 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 8 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 635 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 20 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 196 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h | 6 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 78 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.h | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 158 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 7 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 46 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.h | 2 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 60 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c | 104 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.h | 43 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 32 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 18 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gart.h | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 57 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 7 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 70 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 6 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 162 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.c | 69 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.h | 13 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c | 10 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 31 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h | 3 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 19 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 17 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c | 86 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mn.h | 7 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 139 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 26 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 152 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 2 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 202 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 8 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 3 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_securedisplay.c | 4 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_smuio.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 236 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 6 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 31 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 11 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 30 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 68 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 13 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 241 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 24 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 239 +-
+ drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h | 52 +-
+ drivers/gpu/drm/amd/amdgpu/athub_v2_1.c | 1 +
+ drivers/gpu/drm/amd/amdgpu/atombios_dp.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/beige_goby_reg_init.c | 54 +
+ drivers/gpu/drm/amd/amdgpu/cik_ih.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/cz_ih.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 12 +-
+ drivers/gpu/drm/amd/amdgpu/df_v3_6.c | 20 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 71 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 12 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c | 644 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 8 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 7 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 1 -
+ drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 1 -
+ drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 1 -
+ drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 22 +-
+ drivers/gpu/drm/amd/amdgpu/hdp_v4_0.c | 31 +-
+ drivers/gpu/drm/amd/amdgpu/hdp_v4_0.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/iceland_ih.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c | 25 +-
+ drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 33 +
+ drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 27 +-
+ drivers/gpu/drm/amd/amdgpu/nv.c | 172 +-
+ drivers/gpu/drm/amd/amdgpu/nv.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 1 -
+ drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 57 +-
+ drivers/gpu/drm/amd/amdgpu/psp_v12_0.c | 8 +-
+ drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 8 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 35 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 40 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 15 +
+ drivers/gpu/drm/amd/amdgpu/si_ih.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/smuio_v13_0.c | 18 +
+ drivers/gpu/drm/amd/amdgpu/soc15.c | 12 +-
+ drivers/gpu/drm/amd/amdgpu/ta_ras_if.h | 7 +
+ drivers/gpu/drm/amd/amdgpu/tonga_ih.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 1 +
+ drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 26 +-
+ drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 123 +-
+ drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 7 +-
+ drivers/gpu/drm/amd/amdgpu/vega20_ih.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/vi.c | 2 +-
+ drivers/gpu/drm/amd/amdkfd/Kconfig | 13 +
+ drivers/gpu/drm/amd/amdkfd/Makefile | 5 +
+ drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 80 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 942 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_device.c | 40 +-
+ .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 7 +-
+ .../drm/amd/amdkfd/kfd_device_queue_manager_v9.c | 13 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_events.c | 41 +
+ drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 5 +
+ drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 3 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 937 +
+ drivers/gpu/drm/amd/amdkfd/kfd_migrate.h | 65 +
+ drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 13 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c | 58 +-
+ .../gpu/drm/amd/amdkfd/kfd_pm4_headers_aldebaran.h | 93 +
+ drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 41 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_process.c | 126 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 3092 ++
+ drivers/gpu/drm/amd/amdkfd/kfd_svm.h | 206 +
+ drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 83 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 10 +-
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 387 +-
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 29 +-
+ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 63 +-
+ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.h | 4 -
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 106 +-
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 19 +-
+ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 27 +-
+ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.h | 1 +
+ .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 9 +
+ drivers/gpu/drm/amd/display/dc/Makefile | 3 +-
+ drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 2 +
+ .../amd/display/dc/bios/command_table_helper2.c | 1 +
+ drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 7 +
+ .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 96 +-
+ drivers/gpu/drm/amd/display/dc/core/dc.c | 19 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_link.c | 102 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 9 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 351 +-
+ .../gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c | 22 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 3 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 13 +-
+ drivers/gpu/drm/amd/display/dc/dc.h | 4 +-
+ drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 2 +-
+ drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 6 +
+ drivers/gpu/drm/amd/display/dc/dc_dsc.h | 5 +-
+ drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 1 +
+ drivers/gpu/drm/amd/display/dc/dc_link.h | 12 +-
+ drivers/gpu/drm/amd/display/dc/dc_types.h | 3 +-
+ drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 19 +
+ drivers/gpu/drm/amd/display/dc/dce/dce_aux.h | 3 +
+ .../gpu/drm/amd/display/dc/dce/dce_clock_source.h | 9 +
+ drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h | 43 +
+ drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c | 30 +
+ .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_dscl.c | 58 +-
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 13 +
+ .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 385 +-
+ .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h | 11 +-
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.c | 5 +-
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c | 5 +
+ .../gpu/drm/amd/display/dc/dcn20/dcn20_dpp_cm.c | 4 +-
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 35 +-
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.h | 5 +
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.c | 1 +
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_mpc.c | 2 +-
+ .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 2 +-
+ drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hwseq.c | 2 +-
+ drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.c | 1 +
+ .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 33 +-
+ .../display/dc/dcn30/dcn30_dio_stream_encoder.h | 4 +
+ drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 9 +
+ drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.c | 1 +
+ drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.c | 4 +-
+ drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.h | 175 +
+ drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.c | 2 +-
+ .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 4 +-
+ .../gpu/drm/amd/display/dc/dcn301/dcn301_init.c | 1 +
+ .../drm/amd/display/dc/dcn301/dcn301_resource.c | 2 +-
+ .../drm/amd/display/dc/dcn302/dcn302_resource.c | 2 +-
+ drivers/gpu/drm/amd/display/dc/dcn303/Makefile | 39 +
+ .../gpu/drm/amd/display/dc/dcn303/dcn303_dccg.h | 30 +
+ .../gpu/drm/amd/display/dc/dcn303/dcn303_hwseq.c | 40 +
+ .../gpu/drm/amd/display/dc/dcn303/dcn303_hwseq.h | 17 +
+ .../gpu/drm/amd/display/dc/dcn303/dcn303_init.c | 19 +
+ .../gpu/drm/amd/display/dc/dcn303/dcn303_init.h | 15 +
+ .../drm/amd/display/dc/dcn303/dcn303_resource.c | 1675 +
+ .../drm/amd/display/dc/dcn303/dcn303_resource.h | 17 +
+ drivers/gpu/drm/amd/display/dc/dm_helpers.h | 9 +-
+ .../amd/display/dc/dml/dcn20/display_mode_vba_20.c | 26 +-
+ .../display/dc/dml/dcn20/display_mode_vba_20v2.c | 26 +-
+ .../amd/display/dc/dml/dcn21/display_mode_vba_21.c | 58 +-
+ .../amd/display/dc/dml/dcn30/display_mode_vba_30.c | 48 +-
+ .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 2 +-
+ .../gpu/drm/amd/display/dc/dml/display_mode_vba.h | 14 +-
+ drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 128 +-
+ drivers/gpu/drm/amd/display/dc/dsc/rc_calc.c | 43 -
+ drivers/gpu/drm/amd/display/dc/dsc/rc_calc.h | 2 -
+ drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c | 1 +
+ drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c | 1 +
+ drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 13 +-
+ drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h | 6 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/dsc.h | 1 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 3 +
+ drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 4 +
+ drivers/gpu/drm/amd/display/dc/inc/link_enc_cfg.h | 7 +-
+ drivers/gpu/drm/amd/display/dc/irq/Makefile | 8 +
+ .../amd/display/dc/irq/dcn21/irq_service_dcn21.c | 18 +-
+ .../amd/display/dc/irq/dcn303/irq_service_dcn303.c | 262 +
+ .../amd/display/dc/irq/dcn303/irq_service_dcn303.h | 15 +
+ drivers/gpu/drm/amd/display/dc/irq_types.h | 2 +-
+ drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 39 +-
+ drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 207 +-
+ drivers/gpu/drm/amd/display/dmub/src/Makefile | 1 +
+ drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.c | 7 +-
+ drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.h | 7 +-
+ drivers/gpu/drm/amd/display/dmub/src/dmub_dcn303.c | 37 +
+ drivers/gpu/drm/amd/display/dmub/src/dmub_dcn303.h | 19 +
+ drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 13 +
+ drivers/gpu/drm/amd/display/include/dal_asic_id.h | 4 +-
+ drivers/gpu/drm/amd/display/include/dal_types.h | 1 +
+ .../drm/amd/display/include/link_service_types.h | 9 +
+ drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c | 1 -
+ .../drm/amd/display/modules/hdcp/hdcp1_execution.c | 5 +
+ .../drm/amd/display/modules/hdcp/hdcp2_execution.c | 5 +
+ drivers/gpu/drm/amd/include/amd_shared.h | 2 +
+ .../amd/include/asic_reg/dcn/dcn_3_0_3_offset.h | 8427 +++++
+ .../amd/include/asic_reg/dcn/dcn_3_0_3_sh_mask.h | 35330 +++++++++++++++++++
+ .../amd/include/asic_reg/dcn/dpcs_3_0_3_offset.h | 204 +
+ .../amd/include/asic_reg/dcn/dpcs_3_0_3_sh_mask.h | 1192 +
+ .../drm/amd/include/asic_reg/df/df_3_6_offset.h | 3 +
+ .../drm/amd/include/asic_reg/df/df_3_6_sh_mask.h | 1 +
+ drivers/gpu/drm/amd/include/atombios.h | 10 +-
+ drivers/gpu/drm/amd/include/atomfirmware.h | 1 +
+ drivers/gpu/drm/amd/include/beige_goby_ip_offset.h | 1274 +
+ drivers/gpu/drm/amd/include/kgd_pp_interface.h | 63 +
+ drivers/gpu/drm/amd/pm/amdgpu_pm.c | 66 +-
+ drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 8 +
+ .../amd/pm/inc/smu11_driver_if_sienna_cichlid.h | 366 +-
+ .../gpu/drm/amd/pm/inc/smu13_driver_if_aldebaran.h | 7 +-
+ drivers/gpu/drm/amd/pm/inc/smu_v11_0.h | 1 +
+ drivers/gpu/drm/amd/pm/inc/smu_v13_0.h | 2 +-
+ drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c | 21 +
+ .../gpu/drm/amd/pm/powerplay/hwmgr/ppatomctrl.c | 8 +-
+ .../gpu/drm/amd/pm/powerplay/hwmgr/vega20_baco.c | 2 +-
+ drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 25 +-
+ .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 801 +-
+ drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 13 +-
+ drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 99 +-
+ drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 9 +
+ drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 9 +-
+ drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 1 -
+ drivers/gpu/drm/arm/malidp_drv.c | 1 -
+ drivers/gpu/drm/arm/malidp_planes.c | 9 +-
+ drivers/gpu/drm/armada/armada_drv.c | 5 +-
+ drivers/gpu/drm/ast/ast_dp501.c | 139 +-
+ drivers/gpu/drm/ast/ast_drv.c | 23 +-
+ drivers/gpu/drm/ast/ast_drv.h | 12 +
+ drivers/gpu/drm/ast/ast_main.c | 14 +-
+ drivers/gpu/drm/bochs/bochs.h | 1 +
+ drivers/gpu/drm/bochs/bochs_drv.c | 3 +-
+ drivers/gpu/drm/bochs/bochs_hw.c | 25 +-
+ drivers/gpu/drm/bochs/bochs_kms.c | 8 +
+ drivers/gpu/drm/bridge/Kconfig | 25 +-
+ drivers/gpu/drm/bridge/Makefile | 2 +
+ drivers/gpu/drm/bridge/adv7511/adv7511.h | 1 +
+ drivers/gpu/drm/bridge/adv7511/adv7511_audio.c | 6 +
+ drivers/gpu/drm/bridge/analogix/Kconfig | 2 +-
+ drivers/gpu/drm/bridge/analogix/analogix-anx6345.c | 1 +
+ drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c | 1 +
+ drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 1 +
+ drivers/gpu/drm/bridge/analogix/anx7625.c | 183 +-
+ drivers/gpu/drm/bridge/analogix/anx7625.h | 1 -
+ drivers/gpu/drm/bridge/cadence/Makefile | 2 +-
+ .../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 146 +-
+ .../gpu/drm/bridge/cadence/cdns-mhdp8546-core.h | 22 +
+ .../gpu/drm/bridge/cadence/cdns-mhdp8546-hdcp.c | 570 +
+ .../gpu/drm/bridge/cadence/cdns-mhdp8546-hdcp.h | 92 +
+ drivers/gpu/drm/bridge/cdns-dsi.c | 2 +-
+ drivers/gpu/drm/bridge/cros-ec-anx7688.c | 191 +
+ drivers/gpu/drm/bridge/ite-it66121.c | 1021 +
+ drivers/gpu/drm/bridge/lontium-lt8912b.c | 3 -
+ drivers/gpu/drm/bridge/lontium-lt9611.c | 1 +
+ drivers/gpu/drm/bridge/nwl-dsi.c | 86 +-
+ drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 22 +-
+ drivers/gpu/drm/bridge/tc358767.c | 1 +
+ drivers/gpu/drm/bridge/ti-sn65dsi86.c | 717 +-
+ drivers/gpu/drm/drm_agpsupport.c | 101 +-
+ drivers/gpu/drm/drm_aperture.c | 348 +
+ drivers/gpu/drm/drm_atomic.c | 7 +-
+ drivers/gpu/drm/drm_atomic_helper.c | 40 +-
+ drivers/gpu/drm/drm_atomic_uapi.c | 6 +-
+ drivers/gpu/drm/drm_auth.c | 3 +-
+ drivers/gpu/drm/drm_blend.c | 4 +-
+ drivers/gpu/drm/drm_bridge.c | 3 +
+ drivers/gpu/drm/drm_bufs.c | 34 +-
+ drivers/gpu/drm/drm_connector.c | 127 +-
+ drivers/gpu/drm/drm_context.c | 5 +-
+ drivers/gpu/drm/drm_dma.c | 8 +-
+ drivers/gpu/drm/drm_dp_aux_dev.c | 6 +
+ drivers/gpu/drm/drm_dp_dual_mode_helper.c | 68 +-
+ drivers/gpu/drm/drm_dp_helper.c | 195 +-
+ drivers/gpu/drm/drm_dp_mst_topology.c | 405 +-
+ drivers/gpu/drm/drm_drv.c | 4 +-
+ drivers/gpu/drm/drm_fb_cma_helper.c | 46 +
+ drivers/gpu/drm/drm_fb_helper.c | 2 +-
+ drivers/gpu/drm/drm_file.c | 14 +-
+ drivers/gpu/drm/drm_format_helper.c | 96 +-
+ drivers/gpu/drm/drm_fourcc.c | 25 -
+ drivers/gpu/drm/drm_gem_cma_helper.c | 41 +-
+ drivers/gpu/drm/drm_gem_framebuffer_helper.c | 7 +-
+ drivers/gpu/drm/drm_gem_ttm_helper.c | 33 +
+ drivers/gpu/drm/drm_gem_vram_helper.c | 48 -
+ drivers/gpu/drm/drm_internal.h | 13 -
+ drivers/gpu/drm/drm_ioc32.c | 19 +-
+ drivers/gpu/drm/drm_ioctl.c | 27 +-
+ drivers/gpu/drm/drm_lease.c | 1 -
+ drivers/gpu/drm/drm_legacy.h | 38 +
+ drivers/gpu/drm/drm_legacy_misc.c | 1 -
+ drivers/gpu/drm/drm_memory.c | 1 -
+ drivers/gpu/drm/drm_modes.c | 13 +-
+ drivers/gpu/drm/drm_pci.c | 89 +-
+ drivers/gpu/drm/drm_plane.c | 18 +-
+ drivers/gpu/drm/drm_vm.c | 2 -
+ drivers/gpu/drm/exynos/exynos_drm_fb.c | 2 -
+ drivers/gpu/drm/gma500/backlight.c | 4 +-
+ drivers/gpu/drm/gma500/cdv_intel_dp.c | 50 +-
+ drivers/gpu/drm/gma500/cdv_intel_lvds.c | 2 +-
+ drivers/gpu/drm/gma500/intel_gmbus.c | 2 +-
+ drivers/gpu/drm/gma500/psb_drv.h | 2 +-
+ drivers/gpu/drm/gud/gud_internal.h | 4 +-
+ drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 6 +-
+ drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c | 2 +-
+ drivers/gpu/drm/hisilicon/kirin/dw_dsi_reg.h | 2 +-
+ drivers/gpu/drm/hisilicon/kirin/kirin_ade_reg.h | 2 +-
+ drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 2 +-
+ drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 2 +-
+ drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h | 2 +-
+ drivers/gpu/drm/i810/i810_dma.c | 11 +-
+ drivers/gpu/drm/i915/display/g4x_dp.c | 1 +
+ drivers/gpu/drm/i915/display/g4x_hdmi.c | 1 +
+ drivers/gpu/drm/i915/display/i9xx_plane.c | 4 +-
+ drivers/gpu/drm/i915/display/icl_dsi.c | 6 +-
+ drivers/gpu/drm/i915/display/intel_atomic.c | 15 +-
+ drivers/gpu/drm/i915/display/intel_atomic_plane.c | 43 +-
+ drivers/gpu/drm/i915/display/intel_atomic_plane.h | 4 +
+ drivers/gpu/drm/i915/display/intel_audio.c | 32 +-
+ drivers/gpu/drm/i915/display/intel_bios.c | 77 +-
+ drivers/gpu/drm/i915/display/intel_bw.c | 22 +-
+ drivers/gpu/drm/i915/display/intel_cdclk.c | 367 +-
+ drivers/gpu/drm/i915/display/intel_color.c | 7 +-
+ drivers/gpu/drm/i915/display/intel_combo_phy.c | 1 +
+ drivers/gpu/drm/i915/display/intel_connector.c | 6 +-
+ drivers/gpu/drm/i915/display/intel_crt.c | 8 +-
+ drivers/gpu/drm/i915/display/intel_crtc.c | 4 +-
+ drivers/gpu/drm/i915/display/intel_crtc.h | 3 +
+ drivers/gpu/drm/i915/display/intel_csr.c | 30 +-
+ drivers/gpu/drm/i915/display/intel_cursor.c | 1 +
+ drivers/gpu/drm/i915/display/intel_ddi.c | 109 +-
+ drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c | 11 +-
+ drivers/gpu/drm/i915/display/intel_de.h | 41 +-
+ drivers/gpu/drm/i915/display/intel_display.c | 896 +-
+ drivers/gpu/drm/i915/display/intel_display.h | 31 +-
+ .../gpu/drm/i915/display/intel_display_debugfs.c | 9 +-
+ drivers/gpu/drm/i915/display/intel_display_power.c | 551 +-
+ drivers/gpu/drm/i915/display/intel_display_power.h | 11 +
+ drivers/gpu/drm/i915/display/intel_display_types.h | 26 +-
+ drivers/gpu/drm/i915/display/intel_dp.c | 133 +-
+ drivers/gpu/drm/i915/display/intel_dp.h | 3 -
+ drivers/gpu/drm/i915/display/intel_dp_aux.c | 24 +-
+ .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 8 +-
+ drivers/gpu/drm/i915/display/intel_dp_hdcp.h | 15 +
+ .../gpu/drm/i915/display/intel_dp_link_training.c | 8 +-
+ drivers/gpu/drm/i915/display/intel_dp_mst.c | 19 +-
+ drivers/gpu/drm/i915/display/intel_dpio_phy.c | 1 +
+ drivers/gpu/drm/i915/display/intel_dpll.c | 9 +-
+ drivers/gpu/drm/i915/display/intel_dpll.h | 5 +
+ drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 8 +-
+ drivers/gpu/drm/i915/display/intel_dsb.c | 1 +
+ drivers/gpu/drm/i915/display/intel_dsi.h | 1 +
+ drivers/gpu/drm/i915/display/intel_dvo.c | 1 +
+ drivers/gpu/drm/i915/display/intel_fb.c | 102 +-
+ drivers/gpu/drm/i915/display/intel_fb.h | 6 +-
+ drivers/gpu/drm/i915/display/intel_fbc.c | 28 +-
+ drivers/gpu/drm/i915/display/intel_fbdev.c | 51 +-
+ drivers/gpu/drm/i915/display/intel_fdi.c | 1 +
+ drivers/gpu/drm/i915/display/intel_fifo_underrun.c | 5 +-
+ drivers/gpu/drm/i915/display/intel_frontbuffer.c | 9 +-
+ drivers/gpu/drm/i915/display/intel_gmbus.c | 16 +-
+ drivers/gpu/drm/i915/display/intel_hdcp.c | 10 +-
+ drivers/gpu/drm/i915/display/intel_hdmi.c | 160 +-
+ drivers/gpu/drm/i915/display/intel_hotplug.c | 12 +
+ drivers/gpu/drm/i915/display/intel_lspcon.c | 18 +-
+ drivers/gpu/drm/i915/display/intel_lvds.c | 3 +-
+ drivers/gpu/drm/i915/display/intel_overlay.c | 16 +-
+ drivers/gpu/drm/i915/display/intel_panel.c | 67 +-
+ drivers/gpu/drm/i915/display/intel_pipe_crc.c | 56 +-
+ drivers/gpu/drm/i915/display/intel_pps.c | 20 +-
+ drivers/gpu/drm/i915/display/intel_psr.c | 95 +-
+ drivers/gpu/drm/i915/display/intel_psr.h | 3 +
+ drivers/gpu/drm/i915/display/intel_sdvo.c | 2 +
+ drivers/gpu/drm/i915/display/intel_sprite.c | 1 +
+ drivers/gpu/drm/i915/display/intel_tc.c | 45 +-
+ drivers/gpu/drm/i915/display/intel_tv.c | 7 +-
+ drivers/gpu/drm/i915/display/intel_vdsc.c | 45 +-
+ drivers/gpu/drm/i915/display/intel_vdsc.h | 2 +
+ drivers/gpu/drm/i915/display/intel_vrr.c | 1 +
+ drivers/gpu/drm/i915/display/skl_scaler.c | 1 +
+ drivers/gpu/drm/i915/display/skl_universal_plane.c | 190 +-
+ drivers/gpu/drm/i915/display/vlv_dsi.c | 79 +-
+ drivers/gpu/drm/i915/display/vlv_dsi_pll.c | 1 +
+ drivers/gpu/drm/i915/gem/i915_gem_context.c | 3 +-
+ drivers/gpu/drm/i915/gem/i915_gem_create.c | 345 +-
+ drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 22 +-
+ drivers/gpu/drm/i915/gem/i915_gem_ioctls.h | 2 +
+ drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 20 +-
+ drivers/gpu/drm/i915/gem/i915_gem_lmem.h | 5 +
+ drivers/gpu/drm/i915/gem/i915_gem_object.c | 3 +
+ drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 14 +-
+ drivers/gpu/drm/i915/gem/i915_gem_phys.c | 1 -
+ drivers/gpu/drm/i915/gem/i915_gem_region.c | 22 +
+ drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 13 +-
+ drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 159 +-
+ drivers/gpu/drm/i915/gem/i915_gem_stolen.h | 3 +-
+ .../gpu/drm/i915/gem/selftests/i915_gem_context.c | 11 +-
+ drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 26 +
+ drivers/gpu/drm/i915/gt/gen6_ppgtt.c | 13 +-
+ drivers/gpu/drm/i915/gt/gen8_ppgtt.c | 31 +-
+ drivers/gpu/drm/i915/gt/gen8_ppgtt.h | 7 +
+ drivers/gpu/drm/i915/gt/intel_context.c | 3 +-
+ drivers/gpu/drm/i915/gt/intel_engine.h | 8 +-
+ drivers/gpu/drm/i915/gt/intel_engine_cs.c | 61 +-
+ drivers/gpu/drm/i915/gt/intel_engine_pm.c | 2 +-
+ drivers/gpu/drm/i915/gt/intel_engine_types.h | 14 +-
+ .../gpu/drm/i915/gt/intel_execlists_submission.c | 95 +-
+ .../gpu/drm/i915/gt/intel_execlists_submission.h | 3 -
+ drivers/gpu/drm/i915/gt/intel_ggtt.c | 17 +-
+ drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c | 6 +-
+ drivers/gpu/drm/i915/gt/intel_gpu_commands.h | 2 +-
+ drivers/gpu/drm/i915/gt/intel_gt_buffer_pool.c | 3 +-
+ drivers/gpu/drm/i915/gt/intel_gt_irq.c | 82 +-
+ drivers/gpu/drm/i915/gt/intel_gt_irq.h | 23 +
+ drivers/gpu/drm/i915/gt/intel_gt_types.h | 7 +
+ drivers/gpu/drm/i915/gt/intel_gtt.c | 91 +-
+ drivers/gpu/drm/i915/gt/intel_gtt.h | 17 +-
+ drivers/gpu/drm/i915/gt/intel_lrc.c | 4 +-
+ drivers/gpu/drm/i915/gt/intel_ppgtt.c | 7 +-
+ drivers/gpu/drm/i915/gt/intel_region_lmem.c | 2 +-
+ drivers/gpu/drm/i915/gt/intel_reset.c | 201 +-
+ drivers/gpu/drm/i915/gt/intel_ring.c | 11 +-
+ drivers/gpu/drm/i915/gt/intel_ring_submission.c | 12 +-
+ drivers/gpu/drm/i915/gt/intel_rps.c | 2 +-
+ drivers/gpu/drm/i915/gt/intel_timeline.c | 4 +-
+ drivers/gpu/drm/i915/gt/intel_workarounds.c | 100 +-
+ drivers/gpu/drm/i915/gt/mock_engine.c | 2 +-
+ drivers/gpu/drm/i915/gt/selftest_context.c | 3 +-
+ drivers/gpu/drm/i915/gt/selftest_engine_cs.c | 18 +-
+ .../gpu/drm/i915/gt/selftest_engine_heartbeat.c | 2 +-
+ drivers/gpu/drm/i915/gt/selftest_execlists.c | 2 +-
+ drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 4 +-
+ drivers/gpu/drm/i915/gt/selftest_lrc.c | 4 +-
+ drivers/gpu/drm/i915/gt/selftest_rc6.c | 32 +-
+ drivers/gpu/drm/i915/gt/selftest_ring_submission.c | 2 +-
+ drivers/gpu/drm/i915/gt/selftest_rps.c | 6 +-
+ drivers/gpu/drm/i915/gt/selftest_workarounds.c | 10 +-
+ drivers/gpu/drm/i915/gt/shmem_utils.c | 4 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc.c | 4 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc_log_debugfs.c | 1 -
+ drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 64 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc_submission.h | 1 -
+ drivers/gpu/drm/i915/gt/uc/intel_huc.c | 4 +-
+ drivers/gpu/drm/i915/i915_active.c | 14 +-
+ drivers/gpu/drm/i915/i915_active.h | 11 +-
+ drivers/gpu/drm/i915/i915_active_types.h | 5 -
+ drivers/gpu/drm/i915/i915_cmd_parser.c | 18 +-
+ drivers/gpu/drm/i915/i915_debugfs.c | 4 +-
+ drivers/gpu/drm/i915/i915_drv.c | 47 +-
+ drivers/gpu/drm/i915/i915_drv.h | 81 +-
+ drivers/gpu/drm/i915/i915_gem.c | 14 +-
+ drivers/gpu/drm/i915/i915_gpu_error.c | 6 -
+ drivers/gpu/drm/i915/i915_gpu_error.h | 4 +-
+ drivers/gpu/drm/i915/i915_irq.c | 87 +-
+ drivers/gpu/drm/i915/i915_params.h | 9 +-
+ drivers/gpu/drm/i915/i915_pci.c | 54 +-
+ drivers/gpu/drm/i915/i915_perf.c | 11 +-
+ drivers/gpu/drm/i915/i915_pmu.c | 4 +-
+ drivers/gpu/drm/i915/i915_query.c | 62 +
+ drivers/gpu/drm/i915/i915_reg.h | 68 +-
+ drivers/gpu/drm/i915/i915_request.c | 2 +-
+ drivers/gpu/drm/i915/i915_suspend.c | 6 +
+ drivers/gpu/drm/i915/i915_sysfs.c | 30 +-
+ drivers/gpu/drm/i915/i915_trace.h | 39 +
+ drivers/gpu/drm/i915/i915_utils.h | 5 +
+ drivers/gpu/drm/i915/i915_vma.c | 31 +-
+ drivers/gpu/drm/i915/i915_vma_types.h | 1 -
+ drivers/gpu/drm/i915/intel_device_info.c | 7 +-
+ drivers/gpu/drm/i915/intel_device_info.h | 13 +-
+ drivers/gpu/drm/i915/intel_memory_region.c | 29 +-
+ drivers/gpu/drm/i915/intel_memory_region.h | 18 +-
+ drivers/gpu/drm/i915/intel_pch.c | 6 +-
+ drivers/gpu/drm/i915/intel_pch.h | 1 +
+ drivers/gpu/drm/i915/intel_pm.c | 128 +-
+ drivers/gpu/drm/i915/intel_runtime_pm.h | 2 +-
+ drivers/gpu/drm/i915/intel_step.c | 12 +-
+ drivers/gpu/drm/i915/intel_uncore.c | 20 +-
+ drivers/gpu/drm/i915/selftests/i915_active.c | 2 +-
+ drivers/gpu/drm/i915/selftests/i915_gem.c | 20 +-
+ drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 10 +-
+ drivers/gpu/drm/i915/selftests/i915_perf.c | 3 +-
+ drivers/gpu/drm/i915/selftests/i915_vma.c | 3 +
+ drivers/gpu/drm/i915/selftests/igt_spinner.c | 4 +-
+ .../gpu/drm/i915/selftests/intel_memory_region.c | 87 +-
+ drivers/gpu/drm/i915/selftests/intel_uncore.c | 8 +-
+ drivers/gpu/drm/i915/selftests/librapl.c | 10 +
+ drivers/gpu/drm/i915/selftests/librapl.h | 4 +
+ drivers/gpu/drm/i915/selftests/mock_gem_device.c | 3 +-
+ drivers/gpu/drm/imx/dcss/dcss-kms.c | 1 -
+ drivers/gpu/drm/imx/imx-drm-core.c | 22 +-
+ drivers/gpu/drm/imx/imx-ldb.c | 5 +
+ drivers/gpu/drm/imx/ipuv3-crtc.c | 11 +-
+ drivers/gpu/drm/imx/ipuv3-plane.c | 115 +-
+ drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 72 +-
+ drivers/gpu/drm/ingenic/ingenic-drm.h | 1 +
+ drivers/gpu/drm/ingenic/ingenic-ipu.c | 23 +-
+ drivers/gpu/drm/kmb/kmb_dsi.c | 10 +-
+ drivers/gpu/drm/mcde/mcde_dsi.c | 4 +-
+ drivers/gpu/drm/meson/meson_drv.c | 27 +-
+ drivers/gpu/drm/meson/meson_dw_hdmi.c | 1 +
+ drivers/gpu/drm/mga/mga_dma.c | 29 +-
+ drivers/gpu/drm/mga/mga_drv.h | 1 -
+ drivers/gpu/drm/mga/mga_state.c | 3 +-
+ drivers/gpu/drm/mgag200/mgag200_drv.c | 5 +-
+ drivers/gpu/drm/mgag200/mgag200_mode.c | 2 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 5 -
+ drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 2 -
+ drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c | 8 +-
+ drivers/gpu/drm/msm/dp/dp_ctrl.c | 6 +-
+ drivers/gpu/drm/msm/edp/edp.h | 3 +-
+ drivers/gpu/drm/msm/edp/edp_aux.c | 5 +-
+ drivers/gpu/drm/msm/edp/edp_ctrl.c | 8 +-
+ drivers/gpu/drm/msm/msm_fbdev.c | 5 +-
+ drivers/gpu/drm/mxsfb/Kconfig | 1 -
+ drivers/gpu/drm/nouveau/dispnv50/disp.c | 4 +-
+ drivers/gpu/drm/nouveau/nouveau_bo.c | 19 +-
+ drivers/gpu/drm/nouveau/nouveau_connector.c | 29 +-
+ drivers/gpu/drm/nouveau/nouveau_display.c | 19 -
+ drivers/gpu/drm/nouveau/nouveau_display.h | 2 -
+ drivers/gpu/drm/nouveau/nouveau_drm.c | 9 +-
+ drivers/gpu/drm/nouveau/nouveau_fbcon.c | 4 +-
+ drivers/gpu/drm/nouveau/nouveau_gem.c | 40 +-
+ drivers/gpu/drm/nouveau/nouveau_ttm.c | 51 -
+ drivers/gpu/drm/nouveau/nouveau_ttm.h | 1 -
+ drivers/gpu/drm/panel/Kconfig | 1 +
+ drivers/gpu/drm/panel/panel-samsung-s6e63m0-dsi.c | 6 +-
+ drivers/gpu/drm/panel/panel-simple.c | 142 +-
+ drivers/gpu/drm/panfrost/panfrost_devfreq.c | 9 +
+ drivers/gpu/drm/panfrost/panfrost_device.c | 1 -
+ drivers/gpu/drm/panfrost/panfrost_drv.c | 10 +
+ drivers/gpu/drm/qxl/qxl_display.c | 5 +-
+ drivers/gpu/drm/qxl/qxl_drv.c | 8 +-
+ drivers/gpu/drm/qxl/qxl_drv.h | 3 -
+ drivers/gpu/drm/qxl/qxl_dumb.c | 17 -
+ drivers/gpu/drm/qxl/qxl_ioctl.c | 4 +-
+ drivers/gpu/drm/qxl/qxl_object.h | 5 -
+ drivers/gpu/drm/r128/ati_pcigart.c | 35 +-
+ drivers/gpu/drm/r128/r128_cce.c | 2 +-
+ drivers/gpu/drm/r128/r128_drv.c | 4 +-
+ drivers/gpu/drm/r128/r128_drv.h | 2 +-
+ drivers/gpu/drm/r128/r128_state.c | 3 +-
+ drivers/gpu/drm/radeon/atombios_dp.c | 5 +-
+ drivers/gpu/drm/radeon/radeon.h | 42 +
+ drivers/gpu/drm/radeon/radeon_agp.c | 118 +-
+ drivers/gpu/drm/radeon/radeon_device.c | 3 +-
+ drivers/gpu/drm/radeon/radeon_dp_mst.c | 7 +
+ drivers/gpu/drm/radeon/radeon_drv.c | 19 +-
+ drivers/gpu/drm/radeon/radeon_gem.c | 49 +
+ drivers/gpu/drm/radeon/radeon_kms.c | 18 +-
+ drivers/gpu/drm/radeon/radeon_object.h | 2 +-
+ drivers/gpu/drm/radeon/radeon_ttm.c | 71 +-
+ drivers/gpu/drm/radeon/radeon_ttm.h | 1 -
+ drivers/gpu/drm/rockchip/cdn-dp-core.c | 2 +
+ drivers/gpu/drm/rockchip/cdn-dp-reg.c | 2 +-
+ drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 45 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 10 +
+ drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 1 +
+ drivers/gpu/drm/rockchip/rockchip_lvds.c | 4 +-
+ drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 54 +-
+ drivers/gpu/drm/rockchip/rockchip_vop_reg.h | 1 +
+ drivers/gpu/drm/savage/savage_bci.c | 26 +-
+ drivers/gpu/drm/scheduler/sched_entity.c | 14 +-
+ drivers/gpu/drm/scheduler/sched_main.c | 44 +-
+ drivers/gpu/drm/sis/sis_drv.c | 3 +-
+ drivers/gpu/drm/stm/ltdc.c | 2 -
+ drivers/gpu/drm/sun4i/sun4i_drv.c | 5 +-
+ drivers/gpu/drm/tegra/dc.c | 10 +-
+ drivers/gpu/drm/tegra/dpaux.c | 1 +
+ drivers/gpu/drm/tegra/drm.c | 6 +-
+ drivers/gpu/drm/tiny/Kconfig | 16 +
+ drivers/gpu/drm/tiny/Makefile | 1 +
+ drivers/gpu/drm/tiny/cirrus.c | 5 +-
+ drivers/gpu/drm/tiny/hx8357d.c | 6 +-
+ drivers/gpu/drm/tiny/ili9225.c | 12 +-
+ drivers/gpu/drm/tiny/ili9341.c | 12 +-
+ drivers/gpu/drm/tiny/ili9486.c | 12 +-
+ drivers/gpu/drm/tiny/mi0283qt.c | 12 +-
+ drivers/gpu/drm/tiny/simpledrm.c | 901 +
+ drivers/gpu/drm/tiny/st7586.c | 12 +-
+ drivers/gpu/drm/tiny/st7735r.c | 12 +-
+ drivers/gpu/drm/ttm/Makefile | 2 +-
+ drivers/gpu/drm/ttm/ttm_agp_backend.c | 8 +-
+ drivers/gpu/drm/ttm/ttm_bo.c | 62 +-
+ drivers/gpu/drm/ttm/ttm_bo_util.c | 4 +-
+ drivers/gpu/drm/ttm/ttm_bo_vm.c | 114 +-
+ drivers/gpu/drm/ttm/ttm_device.c | 25 +-
+ drivers/gpu/drm/ttm/ttm_module.h | 3 +
+ drivers/gpu/drm/ttm/ttm_range_manager.c | 40 +-
+ drivers/gpu/drm/ttm/ttm_resource.c | 20 +-
+ drivers/gpu/drm/ttm/ttm_sys_manager.c | 41 +
+ drivers/gpu/drm/ttm/ttm_tt.c | 20 +
+ drivers/gpu/drm/vboxvideo/vbox_drv.c | 3 +-
+ drivers/gpu/drm/vc4/vc4_crtc.c | 68 +-
+ drivers/gpu/drm/vc4/vc4_drv.c | 20 +-
+ drivers/gpu/drm/vc4/vc4_drv.h | 2 +-
+ drivers/gpu/drm/vc4/vc4_hdmi.c | 208 +-
+ drivers/gpu/drm/vc4/vc4_hdmi.h | 13 +
+ drivers/gpu/drm/vc4/vc4_hdmi_regs.h | 3 +
+ drivers/gpu/drm/vc4/vc4_kms.c | 1 -
+ drivers/gpu/drm/vc4/vc4_txp.c | 2 +-
+ drivers/gpu/drm/vc4/vc4_vec.c | 27 +-
+ drivers/gpu/drm/via/via_dma.c | 1 -
+ drivers/gpu/drm/via/via_dmablit.c | 15 +-
+ drivers/gpu/drm/via/via_map.c | 3 +-
+ drivers/gpu/drm/virtio/virtgpu_drv.c | 14 +-
+ drivers/gpu/drm/virtio/virtgpu_gem.c | 8 +
+ drivers/gpu/drm/virtio/virtgpu_kms.c | 4 +
+ drivers/gpu/drm/virtio/virtgpu_object.c | 3 +
+ drivers/gpu/drm/vkms/vkms_composer.c | 104 +-
+ drivers/gpu/drm/vkms/vkms_drv.c | 5 +
+ drivers/gpu/drm/vkms/vkms_drv.h | 9 +-
+ drivers/gpu/drm/vkms/vkms_output.c | 28 +-
+ drivers/gpu/drm/vkms/vkms_plane.c | 51 +-
+ drivers/gpu/drm/vmwgfx/Kconfig | 10 +-
+ drivers/gpu/drm/vmwgfx/Makefile | 6 +-
+ .../drm/vmwgfx/device_include/svga3d_surfacedefs.h | 8 +-
+ drivers/gpu/drm/vmwgfx/device_include/svga_reg.h | 55 +-
+ drivers/gpu/drm/vmwgfx/ttm_lock.c | 194 -
+ drivers/gpu/drm/vmwgfx/ttm_lock.h | 218 -
+ drivers/gpu/drm/vmwgfx/ttm_object.c | 2 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_binding.c | 8 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_blit.c | 2 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 43 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_cmd.c | 124 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c | 4 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_context.c | 13 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c | 2 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 169 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 147 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 41 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 8 -
+ drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 18 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_fence.h | 2 -
+ drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c | 2 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | 60 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_irq.c | 77 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 36 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 36 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_msg.c | 31 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_msg.h | 214 -
+ drivers/gpu/drm/vmwgfx/vmwgfx_msg_arm64.h | 130 +
+ drivers/gpu/drm/vmwgfx/vmwgfx_msg_x86.h | 219 +
+ drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c | 2 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_reg.h | 4 -
+ drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 8 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 2 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_shader.c | 6 -
+ drivers/gpu/drm/vmwgfx/vmwgfx_simple_resource.c | 5 -
+ drivers/gpu/drm/vmwgfx/vmwgfx_so.c | 4 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 6 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 40 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_thp.c | 15 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 18 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c | 53 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_validation.c | 4 +-
+ drivers/gpu/drm/xlnx/zynqmp_dp.c | 5 +-
+ drivers/gpu/drm/zte/Kconfig | 1 -
+ drivers/gpu/ipu-v3/ipu-dc.c | 5 +
+ drivers/gpu/ipu-v3/ipu-di.c | 7 +
+ drivers/gpu/ipu-v3/ipu-dp.c | 25 +-
+ drivers/gpu/vga/vgaarb.c | 31 +-
+ drivers/pci/pci-driver.c | 1 +
+ drivers/video/fbdev/Kconfig | 2 +-
+ drivers/video/fbdev/imxfb.c | 2 +-
+ drivers/video/fbdev/matrox/matroxfb_base.c | 5 +-
+ include/drm/amd_asic_type.h | 1 +
+ include/drm/bridge/dw_hdmi.h | 2 +
+ include/drm/drm_agpsupport.h | 117 -
+ include/drm/drm_aperture.h | 35 +
+ include/drm/drm_connector.h | 4 +
+ include/drm/drm_device.h | 9 +-
+ include/drm/drm_dp_dual_mode_helper.h | 14 +-
+ include/drm/drm_dp_helper.h | 35 +-
+ include/drm/drm_dp_mst_helper.h | 15 +-
+ include/drm/drm_fb_cma_helper.h | 5 +
+ include/drm/drm_fb_helper.h | 51 -
+ include/drm/drm_format_helper.h | 10 +-
+ include/drm/drm_fourcc.h | 9 -
+ include/drm/drm_gem_cma_helper.h | 3 +
+ include/drm/drm_gem_ttm_helper.h | 5 +-
+ include/drm/drm_gem_vram_helper.h | 7 +-
+ include/drm/drm_legacy.h | 86 +-
+ include/drm/drm_mode_config.h | 2 +
+ include/drm/drm_print.h | 20 +-
+ include/drm/i915_pciids.h | 23 +
+ include/drm/ttm/ttm_bo_api.h | 36 +-
+ include/drm/ttm/ttm_device.h | 15 -
+ include/drm/ttm/ttm_resource.h | 2 -
+ include/linux/pci.h | 3 +
+ include/uapi/drm/amdgpu_drm.h | 2 -
+ include/uapi/drm/drm.h | 28 +-
+ include/uapi/drm/drm_mode.h | 7 +-
+ include/uapi/drm/i915_drm.h | 393 +-
+ include/uapi/linux/kfd_ioctl.h | 171 +-
+ include/video/imx-ipu-v3.h | 2 +
+ 749 files changed, 74562 insertions(+), 8262 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/display/bridge/google,cros-ec-anx7688.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/bridge/ite,it66121.yaml
+ delete mode 100644 Documentation/devicetree/bindings/display/faraday,tve200.txt
+ create mode 100644 Documentation/devicetree/bindings/display/faraday,tve200.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/panel/samsung,lms397kf04.yaml
+ create mode 100644 Documentation/gpu/driver-uapi.rst
+ create mode 100644 Documentation/gpu/rfc/i915_gem_lmem.rst
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.h
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/beige_goby_reg_init.c
+ create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_migrate.c
+ create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_migrate.h
+ create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_aldebaran.h
+ create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_svm.c
+ create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_svm.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn303/Makefile
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn303/dcn303_dccg.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn303/dcn303_hwseq.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn303/dcn303_hwseq.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn303/dcn303_init.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn303/dcn303_init.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn303/dcn303_resource.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn303/dcn303_resource.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn303/irq_service_dcn303.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn303/irq_service_dcn303.h
+ create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn303.c
+ create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn303.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_0_3_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_0_3_sh_mask.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dpcs_3_0_3_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dpcs_3_0_3_sh_mask.h
+ create mode 100644 drivers/gpu/drm/amd/include/beige_goby_ip_offset.h
+ create mode 100644 drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-hdcp.c
+ create mode 100644 drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-hdcp.h
+ create mode 100644 drivers/gpu/drm/bridge/cros-ec-anx7688.c
+ create mode 100644 drivers/gpu/drm/bridge/ite-it66121.c
+ create mode 100644 drivers/gpu/drm/drm_aperture.c
+ create mode 100644 drivers/gpu/drm/i915/display/intel_dp_hdcp.h
+ create mode 100644 drivers/gpu/drm/tiny/simpledrm.c
+ create mode 100644 drivers/gpu/drm/ttm/ttm_sys_manager.c
+ delete mode 100644 drivers/gpu/drm/vmwgfx/ttm_lock.c
+ delete mode 100644 drivers/gpu/drm/vmwgfx/ttm_lock.h
+ delete mode 100644 drivers/gpu/drm/vmwgfx/vmwgfx_msg.h
+ create mode 100755 drivers/gpu/drm/vmwgfx/vmwgfx_msg_arm64.h
+ create mode 100644 drivers/gpu/drm/vmwgfx/vmwgfx_msg_x86.h
+ delete mode 100644 include/drm/drm_agpsupport.h
+ create mode 100644 include/drm/drm_aperture.h
+Merging drm-misc/for-linux-next (d3116756a710 drm/ttm: rename bo->mem and make it a pointer)
+$ git merge drm-misc/for-linux-next
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 6 +--
+ drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 11 +++---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 50 ++++++++++++------------
+ drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 43 ++++++++++----------
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 12 +++---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 2 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 4 +-
+ drivers/gpu/drm/drm_gem_cma_helper.c | 3 +-
+ drivers/gpu/drm/drm_gem_ttm_helper.c | 6 +--
+ drivers/gpu/drm/drm_gem_vram_helper.c | 4 +-
+ drivers/gpu/drm/nouveau/nouveau_abi16.c | 2 +-
+ drivers/gpu/drm/nouveau/nouveau_bo.c | 30 +++++++-------
+ drivers/gpu/drm/nouveau/nouveau_chan.c | 2 +-
+ drivers/gpu/drm/nouveau/nouveau_fbcon.c | 2 +-
+ drivers/gpu/drm/nouveau/nouveau_gem.c | 16 ++++----
+ drivers/gpu/drm/nouveau/nouveau_vmm.c | 4 +-
+ drivers/gpu/drm/nouveau/nv17_fence.c | 2 +-
+ drivers/gpu/drm/nouveau/nv50_fence.c | 2 +-
+ drivers/gpu/drm/qxl/qxl_drv.h | 6 +--
+ drivers/gpu/drm/qxl/qxl_object.c | 10 ++---
+ drivers/gpu/drm/qxl/qxl_ttm.c | 4 +-
+ drivers/gpu/drm/radeon/radeon_cs.c | 8 ++--
+ drivers/gpu/drm/radeon/radeon_gem.c | 10 ++---
+ drivers/gpu/drm/radeon/radeon_object.c | 22 +++++------
+ drivers/gpu/drm/radeon/radeon_object.h | 4 +-
+ drivers/gpu/drm/radeon/radeon_pm.c | 2 +-
+ drivers/gpu/drm/radeon/radeon_trace.h | 2 +-
+ drivers/gpu/drm/radeon/radeon_ttm.c | 8 ++--
+ drivers/gpu/drm/ttm/ttm_bo.c | 37 ++++++++++--------
+ drivers/gpu/drm/ttm/ttm_bo_util.c | 49 +++++++++++------------
+ drivers/gpu/drm/ttm/ttm_bo_vm.c | 22 +++++------
+ drivers/gpu/drm/vmwgfx/vmwgfx_blit.c | 8 ++--
+ drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 36 ++++++++---------
+ drivers/gpu/drm/vmwgfx/vmwgfx_cmd.c | 10 ++---
+ drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c | 2 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_context.c | 12 +++---
+ drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c | 10 ++---
+ drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 12 +++---
+ drivers/gpu/drm/vmwgfx/vmwgfx_page_dirty.c | 8 ++--
+ drivers/gpu/drm/vmwgfx/vmwgfx_shader.c | 12 +++---
+ drivers/gpu/drm/vmwgfx/vmwgfx_streamoutput.c | 6 +--
+ drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 6 +--
+ drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 10 ++---
+ include/drm/ttm/ttm_bo_api.h | 3 +-
+ include/drm/ttm/ttm_bo_driver.h | 6 +--
+ 50 files changed, 275 insertions(+), 267 deletions(-)
+Merging amdgpu/drm-next (6c4a0e31f499 drm/radeon: Add HD-audio component notifier support (v2))
+$ git merge amdgpu/drm-next
+Auto-merging drivers/gpu/drm/radeon/radeon_cs.c
+Auto-merging drivers/gpu/drm/drm_fourcc.c
+Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c
+Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c
+Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.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
+Auto-merging drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gart.h
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_display.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
+Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c' using previous resolution.
+Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 97d9f0d8b801] Merge remote-tracking branch 'amdgpu/drm-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/gpu/amdgpu.rst | 21 +
+ drivers/gpu/drm/Kconfig | 1 +
+ drivers/gpu/drm/amd/amdgpu/Makefile | 7 +-
+ drivers/gpu/drm/amd/amdgpu/aldebaran.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu.h | 52 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 391 +++++++++-----
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | 42 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 14 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 23 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 41 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 32 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 5 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c | 42 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 22 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gart.h | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 13 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 4 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 11 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 8 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 27 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 92 ++--
+ drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 33 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c | 190 +++++++
+ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 63 ++-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 10 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 38 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 11 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 10 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 167 +++---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 5 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c | 14 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 19 +-
+ drivers/gpu/drm/amd/amdgpu/atom.c | 172 ++++++
+ drivers/gpu/drm/amd/amdgpu/atom.h | 10 +
+ drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 8 +-
+ drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 117 ++---
+ drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 11 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c | 24 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 27 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 41 +-
+ drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/nv.c | 11 +-
+ drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 93 ++--
+ drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 8 +-
+ drivers/gpu/drm/amd/amdgpu/si_dma.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/smuio_v13_0.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/soc15.c | 10 +-
+ drivers/gpu/drm/amd/amdgpu/soc15_common.h | 87 ++--
+ drivers/gpu/drm/amd/amdgpu/uvd_v3_1.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 1 +
+ drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 4 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_process.c | 2 -
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 222 +++++---
+ .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 10 +-
+ drivers/gpu/drm/amd/display/dc/bios/bios_parser.c | 6 +-
+ .../drm/amd/display/dc/bios/command_table_helper.c | 2 +-
+ .../amd/display/dc/bios/command_table_helper2.c | 2 +-
+ drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c | 2 +
+ drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 2 +
+ drivers/gpu/drm/amd/display/dc/core/dc.c | 63 +--
+ drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 317 +++++++----
+ drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 577 ++++++++-------------
+ drivers/gpu/drm/amd/display/dc/dc.h | 4 +-
+ drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 9 +
+ drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 2 +
+ drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 2 +
+ drivers/gpu/drm/amd/display/dc/dc_link.h | 19 +-
+ drivers/gpu/drm/amd/display/dc/dc_stream.h | 3 +
+ drivers/gpu/drm/amd/display/dc/dc_types.h | 5 -
+ drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c | 2 +
+ drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.h | 3 +-
+ drivers/gpu/drm/amd/display/dc/dce/dce_transform.c | 10 +-
+ drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c | 10 +-
+ .../gpu/drm/amd/display/dc/dce/dmub_hw_lock_mgr.c | 8 +
+ .../gpu/drm/amd/display/dc/dce/dmub_hw_lock_mgr.h | 3 +
+ drivers/gpu/drm/amd/display/dc/dce/dmub_outbox.c | 17 +-
+ .../amd/display/dc/dce110/dce110_hw_sequencer.c | 4 +
+ .../drm/amd/display/dc/dce110/dce110_mem_input_v.c | 1 +
+ .../drm/amd/display/dc/dce110/dce110_transform_v.c | 3 +-
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c | 9 +-
+ .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_dscl.c | 12 +-
+ .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c | 1 +
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 4 +-
+ .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 34 +-
+ .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h | 6 -
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.c | 1 -
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c | 5 -
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dpp.c | 6 +-
+ .../gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.c | 1 +
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c | 4 +-
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 31 +-
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.h | 5 -
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.c | 1 -
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_mpc.c | 2 +-
+ .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 17 +-
+ drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.c | 1 -
+ drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.c | 6 +-
+ drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.c | 1 -
+ drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.c | 2 +-
+ .../gpu/drm/amd/display/dc/dcn301/dcn301_init.c | 1 -
+ drivers/gpu/drm/amd/display/dc/dm_pp_smu.h | 4 +
+ .../drm/amd/display/dc/dml/display_mode_structs.h | 2 +
+ .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 13 +
+ drivers/gpu/drm/amd/display/dc/gpio/gpio_service.c | 12 +-
+ drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 70 ++-
+ drivers/gpu/drm/amd/display/dc/inc/hw/abm.h | 3 +-
+ drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 3 -
+ drivers/gpu/drm/amd/display/dc/inc/hw/transform.h | 4 -
+ drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 4 -
+ drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 1 +
+ .../gpu/drm/amd/display/dmub/src/dmub_srv_stat.c | 19 +-
+ .../amd/display/include/gpio_service_interface.h | 4 +-
+ .../drm/amd/display/include/link_service_types.h | 1 +
+ .../drm/amd/display/modules/freesync/freesync.c | 29 +-
+ .../drm/amd/display/modules/hdcp/hdcp1_execution.c | 4 +-
+ .../gpu/drm/amd/display/modules/hdcp/hdcp_psp.c | 13 -
+ .../drm/amd/display/modules/power/power_helpers.c | 15 +-
+ .../drm/amd/display/modules/power/power_helpers.h | 3 +-
+ drivers/gpu/drm/amd/include/aldebaran_ip_offset.h | 2 +-
+ drivers/gpu/drm/amd/include/amd_acpi.h | 18 +
+ drivers/gpu/drm/amd/include/atomfirmware.h | 17 +-
+ drivers/gpu/drm/amd/include/kgd_pp_interface.h | 71 +++
+ drivers/gpu/drm/amd/pm/amdgpu_pm.c | 192 ++++++-
+ drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 2 +
+ .../amd/pm/inc/smu11_driver_if_sienna_cichlid.h | 2 +-
+ drivers/gpu/drm/amd/pm/inc/smu_types.h | 2 +-
+ drivers/gpu/drm/amd/pm/inc/smu_v11_5_ppsmc.h | 2 +-
+ drivers/gpu/drm/amd/pm/inc/smu_v13_0.h | 6 -
+ .../drm/amd/pm/powerplay/hwmgr/hardwaremanager.c | 3 +-
+ .../gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c | 21 +
+ .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_thermal.c | 8 +-
+ .../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 26 +-
+ .../gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c | 2 +-
+ .../drm/amd/pm/powerplay/hwmgr/vega12_thermal.c | 3 +-
+ .../gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c | 2 +-
+ drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 46 ++
+ drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 76 ++-
+ .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 4 +
+ drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 4 +-
+ drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.h | 1 -
+ drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c | 33 ++
+ drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 61 ++-
+ drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 3 +
+ drivers/gpu/drm/drm_fourcc.c | 4 +
+ drivers/gpu/drm/radeon/cik.c | 2 +-
+ drivers/gpu/drm/radeon/evergreen.h | 1 -
+ drivers/gpu/drm/radeon/r100.c | 2 +-
+ drivers/gpu/drm/radeon/radeon.h | 3 +
+ drivers/gpu/drm/radeon/radeon_asic.h | 2 -
+ drivers/gpu/drm/radeon/radeon_audio.c | 95 ++++
+ drivers/gpu/drm/radeon/radeon_cs.c | 2 +-
+ drivers/gpu/drm/radeon/radeon_vm.c | 4 +-
+ drivers/usb/host/xhci-pci.c | 3 +
+ include/drm/drm_atomic.h | 12 +
+ include/uapi/drm/amdgpu_drm.h | 15 +
+ include/uapi/drm/drm_fourcc.h | 7 +
+ 168 files changed, 3013 insertions(+), 1498 deletions(-)
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c
+Merging drm-intel/for-linux-next (0b86952d15ce drm/i915/adl_p: Implement Wa_22012358565)
+$ git merge drm-intel/for-linux-next
+Auto-merging drivers/gpu/drm/i915/i915_vma.c
+Auto-merging drivers/gpu/drm/i915/i915_reg.h
+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_drv.c
+Auto-merging drivers/gpu/drm/i915/i915_debugfs.c
+Auto-merging drivers/gpu/drm/i915/gt/intel_gtt.h
+Auto-merging drivers/gpu/drm/i915/display/intel_display.c
+Removing drivers/gpu/drm/i915/display/intel_csr.h
+Merge made by the 'recursive' strategy.
+ Documentation/gpu/i915.rst | 12 +-
+ drivers/gpu/drm/i915/Makefile | 3 +-
+ drivers/gpu/drm/i915/display/icl_dsi.c | 21 +-
+ drivers/gpu/drm/i915/display/intel_atomic.c | 20 ++
+ drivers/gpu/drm/i915/display/intel_atomic.h | 1 +
+ drivers/gpu/drm/i915/display/intel_bw.c | 4 +-
+ drivers/gpu/drm/i915/display/intel_csr.h | 21 --
+ drivers/gpu/drm/i915/display/intel_cursor.c | 4 +
+ drivers/gpu/drm/i915/display/intel_ddi.c | 50 +++-
+ drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c | 53 ++++
+ drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h | 4 +
+ drivers/gpu/drm/i915/display/intel_display.c | 116 ++++++-
+ .../gpu/drm/i915/display/intel_display_debugfs.c | 30 +-
+ drivers/gpu/drm/i915/display/intel_display_power.c | 98 +++---
+ drivers/gpu/drm/i915/display/intel_display_types.h | 4 +-
+ .../drm/i915/display/{intel_csr.c => intel_dmc.c} | 333 ++++++++++-----------
+ drivers/gpu/drm/i915/display/intel_dmc.h | 21 ++
+ drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 69 +++--
+ drivers/gpu/drm/i915/display/intel_fb.c | 13 +-
+ drivers/gpu/drm/i915/display/intel_fifo_underrun.c | 57 +++-
+ drivers/gpu/drm/i915/display/intel_hdmi.c | 104 ++++---
+ drivers/gpu/drm/i915/display/intel_psr.c | 93 ++++--
+ drivers/gpu/drm/i915/display/intel_qp_tables.c | 309 +++++++++++++++++++
+ drivers/gpu/drm/i915/display/intel_qp_tables.h | 14 +
+ drivers/gpu/drm/i915/display/intel_tc.c | 152 ++++++++--
+ drivers/gpu/drm/i915/display/intel_tc.h | 2 +
+ drivers/gpu/drm/i915/display/intel_vdsc.c | 105 ++++++-
+ drivers/gpu/drm/i915/display/intel_vrr.c | 58 ++--
+ drivers/gpu/drm/i915/display/skl_universal_plane.c | 27 ++
+ drivers/gpu/drm/i915/gt/intel_gtt.h | 3 +-
+ drivers/gpu/drm/i915/gvt/handlers.c | 8 +-
+ drivers/gpu/drm/i915/i915_debugfs.c | 17 +-
+ drivers/gpu/drm/i915/i915_drv.c | 8 +-
+ drivers/gpu/drm/i915/i915_drv.h | 11 +-
+ drivers/gpu/drm/i915/i915_gpu_error.c | 12 +-
+ drivers/gpu/drm/i915/i915_irq.c | 19 +-
+ drivers/gpu/drm/i915/i915_irq.h | 1 +
+ drivers/gpu/drm/i915/i915_pci.c | 4 +-
+ drivers/gpu/drm/i915/i915_reg.h | 172 ++++++++---
+ drivers/gpu/drm/i915/i915_vma.c | 2 +-
+ drivers/gpu/drm/i915/i915_vma.h | 7 +-
+ drivers/gpu/drm/i915/intel_device_info.c | 2 +-
+ drivers/gpu/drm/i915/intel_device_info.h | 2 +-
+ drivers/gpu/drm/i915/intel_pm.c | 303 +++++++++++++++++--
+ drivers/gpu/drm/i915/intel_pm.h | 4 +-
+ 45 files changed, 1863 insertions(+), 510 deletions(-)
+ delete mode 100644 drivers/gpu/drm/i915/display/intel_csr.h
+ rename drivers/gpu/drm/i915/display/{intel_csr.c => intel_dmc.c} (66%)
+ create mode 100644 drivers/gpu/drm/i915/display/intel_dmc.h
+ create mode 100644 drivers/gpu/drm/i915/display/intel_qp_tables.c
+ create mode 100644 drivers/gpu/drm/i915/display/intel_qp_tables.h
+Merging drm-tegra/drm/tegra/for-next (ecc583e22d46 drm/tegra: hub: Implement basic scaling support)
+$ git merge drm-tegra/drm/tegra/for-next
+Auto-merging drivers/gpu/drm/tegra/dc.c
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/tegra/dc.c | 2 +-
+ drivers/gpu/drm/tegra/dc.h | 26 ++++++
+ drivers/gpu/drm/tegra/drm.h | 2 +-
+ drivers/gpu/drm/tegra/hub.c | 182 +++++++++++++++++++++++++++++++++++++++---
+ drivers/gpu/drm/tegra/plane.c | 23 +++++-
+ drivers/gpu/drm/tegra/plane.h | 3 +-
+ drivers/gpu/drm/tegra/sor.c | 70 +++++++++-------
+ drivers/gpu/host1x/bus.c | 30 +++++--
+ include/linux/host1x.h | 30 +++++--
+ 9 files changed, 313 insertions(+), 55 deletions(-)
+Merging drm-msm/msm-next (0532108c6512 drm/msm/dp: Handle aux timeouts, nacks, defers)
+$ git merge drm-msm/msm-next
+Auto-merging drivers/gpu/drm/msm/dp/dp_ctrl.c
+Auto-merging drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
+Auto-merging drivers/gpu/drm/drm_atomic_uapi.c
+Auto-merging drivers/gpu/drm/drm_atomic.c
+Removing Documentation/devicetree/bindings/display/msm/dsi.txt
+Removing Documentation/devicetree/bindings/display/msm/dpu.txt
+Merge made by the 'recursive' strategy.
+ .../bindings/display/msm/dp-controller.yaml | 146 ++++++++++++
+ .../bindings/display/msm/dpu-sc7180.yaml | 228 +++++++++++++++++++
+ .../bindings/display/msm/dpu-sdm845.yaml | 212 ++++++++++++++++++
+ .../devicetree/bindings/display/msm/dpu.txt | 141 ------------
+ .../bindings/display/msm/dsi-controller-main.yaml | 185 +++++++++++++++
+ .../bindings/display/msm/dsi-phy-10nm.yaml | 68 ++++++
+ .../bindings/display/msm/dsi-phy-14nm.yaml | 66 ++++++
+ .../bindings/display/msm/dsi-phy-20nm.yaml | 71 ++++++
+ .../bindings/display/msm/dsi-phy-28nm.yaml | 68 ++++++
+ .../bindings/display/msm/dsi-phy-common.yaml | 40 ++++
+ .../devicetree/bindings/display/msm/dsi.txt | 249 ---------------------
+ drivers/gpu/drm/drm_atomic.c | 28 ++-
+ drivers/gpu/drm/drm_atomic_uapi.c | 4 +-
+ drivers/gpu/drm/drm_crtc_internal.h | 4 +-
+ drivers/gpu/drm/msm/Makefile | 2 +
+ drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 4 +-
+ drivers/gpu/drm/msm/adreno/a5xx_power.c | 2 +-
+ drivers/gpu/drm/msm/adreno/a5xx_preempt.c | 4 +-
+ drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 2 +-
+ drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 2 +-
+ drivers/gpu/drm/msm/adreno/adreno_device.c | 1 +
+ drivers/gpu/drm/msm/adreno/adreno_gpu.c | 2 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 16 +-
+ .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 14 +-
+ .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 8 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 2 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 47 ++++
+ drivers/gpu/drm/msm/disp/msm_disp_snapshot.c | 125 +++++++++++
+ drivers/gpu/drm/msm/disp/msm_disp_snapshot.h | 136 +++++++++++
+ drivers/gpu/drm/msm/disp/msm_disp_snapshot_util.c | 187 ++++++++++++++++
+ drivers/gpu/drm/msm/dp/dp_aux.c | 181 +++++++--------
+ drivers/gpu/drm/msm/dp/dp_aux.h | 8 -
+ drivers/gpu/drm/msm/dp/dp_catalog.c | 16 +-
+ drivers/gpu/drm/msm/dp/dp_catalog.h | 6 +-
+ drivers/gpu/drm/msm/dp/dp_ctrl.c | 55 +++++
+ drivers/gpu/drm/msm/dp/dp_ctrl.h | 2 +
+ drivers/gpu/drm/msm/dp/dp_display.c | 84 +++++--
+ drivers/gpu/drm/msm/dp/dp_display.h | 1 +
+ drivers/gpu/drm/msm/dsi/dsi.c | 6 +
+ drivers/gpu/drm/msm/dsi/dsi.h | 4 +-
+ drivers/gpu/drm/msm/dsi/dsi_host.c | 17 +-
+ drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 31 ++-
+ drivers/gpu/drm/msm/dsi/phy/dsi_phy.h | 4 +
+ drivers/gpu/drm/msm/msm_drv.c | 27 ++-
+ drivers/gpu/drm/msm/msm_drv.h | 15 ++
+ drivers/gpu/drm/msm/msm_gem.c | 34 +--
+ drivers/gpu/drm/msm/msm_kms.h | 9 +
+ drivers/gpu/drm/selftests/test-drm_framebuffer.c | 1 +
+ include/uapi/drm/msm_drm.h | 7 +-
+ 49 files changed, 1993 insertions(+), 579 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/display/msm/dp-controller.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/msm/dpu-sc7180.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/msm/dpu-sdm845.yaml
+ delete mode 100644 Documentation/devicetree/bindings/display/msm/dpu.txt
+ create mode 100644 Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/msm/dsi-phy-10nm.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/msm/dsi-phy-14nm.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/msm/dsi-phy-20nm.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/msm/dsi-phy-28nm.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/msm/dsi-phy-common.yaml
+ delete mode 100644 Documentation/devicetree/bindings/display/msm/dsi.txt
+ create mode 100644 drivers/gpu/drm/msm/disp/msm_disp_snapshot.c
+ create mode 100644 drivers/gpu/drm/msm/disp/msm_disp_snapshot.h
+ create mode 100644 drivers/gpu/drm/msm/disp/msm_disp_snapshot_util.c
+Merging imx-drm/imx-drm/next (fc1e985b67f9 drm/imx: ipuv3-plane: add color encoding and range properties)
+$ git merge imx-drm/imx-drm/next
+Already up to date.
+Merging etnaviv/etnaviv/next (4bfdd2aa67fb drm/etnaviv: rework linear window offset calculation)
+$ git merge etnaviv/etnaviv/next
+Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/etnaviv/etnaviv_dump.c | 8 ++--
+ drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 3 +-
+ drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 12 ++---
+ drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 68 ++++++++++++++++------------
+ include/uapi/drm/etnaviv_drm.h | 3 ++
+ 5 files changed, 51 insertions(+), 43 deletions(-)
+Merging regmap/for-next (5587eb7dbdc2 Merge remote-tracking branch 'regmap/for-5.14' into regmap-next)
+$ git merge regmap/for-next
+Merge made by the 'recursive' strategy.
+ drivers/base/regmap/Kconfig | 6 +++-
+ drivers/base/regmap/Makefile | 1 +
+ drivers/base/regmap/regmap-i2c.c | 45 ++++++++++++++++++++++++-----
+ drivers/base/regmap/regmap-mdio.c | 59 +++++++++++++++++++++++++++++++++++++++
+ drivers/base/regmap/regmap.c | 15 ++++++++++
+ include/linux/regmap.h | 38 +++++++++++++++++++++++++
+ 6 files changed, 156 insertions(+), 8 deletions(-)
+ create mode 100644 drivers/base/regmap/regmap-mdio.c
+Merging sound/for-next (9ce650a75a3b ALSA: usb-audio: Reduce latency at playback start)
+$ git merge sound/for-next
+Auto-merging sound/soc/soc-core.c
+Auto-merging sound/pci/hda/hda_generic.c
+Auto-merging sound/isa/gus/gus_main.c
+Auto-merging sound/core/control_led.c
+Merge made by the 'recursive' strategy.
+ include/sound/core.h | 50 +-
+ include/sound/rawmidi.h | 2 +
+ include/uapi/sound/asound.h | 30 +-
+ sound/ac97/bus.c | 2 +-
+ sound/core/control.c | 38 +-
+ sound/core/control_compat.c | 14 +-
+ sound/core/control_led.c | 34 +-
+ sound/core/init.c | 65 +-
+ sound/core/pcm.c | 4 +-
+ sound/core/pcm_native.c | 6 +-
+ sound/core/rawmidi.c | 93 ++-
+ sound/core/rawmidi_compat.c | 4 +-
+ sound/drivers/opl3/opl3_midi.c | 3 +-
+ sound/firewire/Kconfig | 4 +-
+ sound/firewire/amdtp-am824.c | 4 +-
+ sound/firewire/amdtp-am824.h | 2 +-
+ sound/firewire/amdtp-stream.c | 1164 +++++++++++++++++++--------
+ sound/firewire/amdtp-stream.h | 104 ++-
+ sound/firewire/bebob/bebob.c | 12 +-
+ sound/firewire/bebob/bebob.h | 1 +
+ sound/firewire/bebob/bebob_stream.c | 51 +-
+ sound/firewire/dice/dice-stream.c | 50 +-
+ sound/firewire/dice/dice-transaction.c | 2 +-
+ sound/firewire/digi00x/amdtp-dot.c | 9 +-
+ sound/firewire/digi00x/digi00x-stream.c | 13 +-
+ sound/firewire/fireface/amdtp-ff.c | 2 +-
+ sound/firewire/fireface/ff-stream.c | 13 +-
+ sound/firewire/fireworks/fireworks.h | 2 +-
+ sound/firewire/fireworks/fireworks_stream.c | 24 +-
+ sound/firewire/motu/amdtp-motu.c | 139 ++--
+ sound/firewire/motu/motu-stream.c | 34 +-
+ sound/firewire/motu/motu.h | 17 +-
+ sound/firewire/oxfw/oxfw-stream.c | 55 +-
+ sound/firewire/oxfw/oxfw.c | 137 ++--
+ sound/firewire/oxfw/oxfw.h | 13 +-
+ sound/firewire/tascam/amdtp-tascam.c | 6 +-
+ sound/firewire/tascam/tascam-stream.c | 26 +-
+ sound/firewire/tascam/tascam.h | 1 +
+ sound/isa/gus/gus_main.c | 2 +-
+ sound/oss/dmasound/dmasound_core.c | 14 -
+ sound/pci/hda/hda_generic.c | 2 +-
+ sound/pci/hda/patch_ca0132.c | 2 +-
+ sound/pci/intel8x0.c | 2 +-
+ sound/pci/intel8x0m.c | 2 +-
+ sound/pci/lx6464es/lx_core.c | 4 -
+ sound/pci/rme9652/hdsp.c | 2 +-
+ sound/soc/soc-core.c | 2 +-
+ sound/usb/card.h | 8 +-
+ sound/usb/clock.c | 298 +++----
+ sound/usb/endpoint.c | 1 +
+ sound/usb/endpoint.h | 1 -
+ sound/usb/pcm.c | 202 +++--
+ sound/usb/pcm.h | 3 -
+ sound/usb/usx2y/us122l.c | 63 +-
+ sound/usb/usx2y/us122l.h | 2 +-
+ sound/usb/usx2y/usX2Yhwdep.c | 135 ++--
+ sound/usb/usx2y/usX2Yhwdep.h | 2 +-
+ sound/usb/usx2y/usb_stream.c | 82 +-
+ sound/usb/usx2y/usb_stream.h | 23 +-
+ sound/usb/usx2y/usbus428ctldefs.h | 104 +--
+ sound/usb/usx2y/usbusx2y.c | 389 ++++-----
+ sound/usb/usx2y/usbusx2y.h | 65 +-
+ sound/usb/usx2y/usbusx2yaudio.c | 684 ++++++++--------
+ sound/usb/usx2y/usx2yhwdeppcm.c | 627 ++++++++-------
+ sound/usb/usx2y/usx2yhwdeppcm.h | 4 +-
+ 65 files changed, 2850 insertions(+), 2105 deletions(-)
+Merging sound-asoc/for-next (385247d1d50e Merge remote-tracking branch 'asoc/for-5.14' into asoc-next)
+$ git merge sound-asoc/for-next
+Auto-merging sound/soc/soc-core.c
+Auto-merging MAINTAINERS
+Removing Documentation/devicetree/bindings/sound/wm8750.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/sound/cs42l42.txt | 7 +
+ .../devicetree/bindings/sound/imx-audio-card.yaml | 122 +++
+ .../devicetree/bindings/sound/nxp,tfa989x.yaml | 58 ++
+ .../devicetree/bindings/sound/renesas,rsnd.yaml | 10 +-
+ Documentation/devicetree/bindings/sound/wm8750.txt | 18 -
+ .../devicetree/bindings/sound/wm8750.yaml | 42 +
+ MAINTAINERS | 7 +
+ include/sound/soc-topology.h | 2 +-
+ sound/soc/amd/renoir/acp3x-pdm-dma.c | 4 -
+ sound/soc/codecs/Kconfig | 11 +
+ sound/soc/codecs/Makefile | 2 +
+ sound/soc/codecs/cirrus_legacy.h | 21 +
+ sound/soc/codecs/cs35l32.c | 34 +-
+ sound/soc/codecs/cs35l33.c | 15 +-
+ sound/soc/codecs/cs35l34.c | 39 +-
+ sound/soc/codecs/cs35l35.c | 37 +-
+ sound/soc/codecs/cs35l35.h | 3 +-
+ sound/soc/codecs/cs35l36.c | 18 +-
+ sound/soc/codecs/cs4265.c | 10 +-
+ sound/soc/codecs/cs42l42.c | 198 +++--
+ sound/soc/codecs/cs42l42.h | 5 +-
+ sound/soc/codecs/cs42l52.c | 19 +-
+ sound/soc/codecs/cs42l56.c | 7 +-
+ sound/soc/codecs/cs42l73.c | 30 +-
+ sound/soc/codecs/cs43130.c | 55 +-
+ sound/soc/codecs/cs47l24.c | 2 +-
+ sound/soc/codecs/cs53l30.c | 22 +-
+ sound/soc/codecs/lpass-rx-macro.c | 2 +-
+ sound/soc/codecs/lpass-wsa-macro.c | 4 +
+ sound/soc/codecs/mt6359-accdet.c | 2 +-
+ sound/soc/codecs/mt6359.c | 2 +-
+ sound/soc/codecs/rk3328_codec.c | 28 +-
+ sound/soc/codecs/rt1019.c | 5 +-
+ sound/soc/codecs/rt286.c | 1 -
+ sound/soc/codecs/rt5682-i2c.c | 12 +
+ sound/soc/codecs/sigmadsp.h | 1 -
+ sound/soc/codecs/tfa989x.c | 357 +++++++++
+ sound/soc/codecs/tlv320aic26.c | 12 +-
+ sound/soc/codecs/wm2200.c | 1 -
+ sound/soc/codecs/wm5102.c | 2 +-
+ sound/soc/codecs/wm5110.c | 2 +-
+ sound/soc/codecs/wm8962.c | 7 +-
+ sound/soc/codecs/wm_adsp.c | 18 +-
+ sound/soc/codecs/wm_adsp.h | 2 +-
+ sound/soc/fsl/Kconfig | 13 +
+ sound/soc/fsl/Makefile | 2 +
+ sound/soc/fsl/fsl_spdif.c | 67 ++
+ sound/soc/fsl/fsl_spdif.h | 1 +
+ sound/soc/fsl/fsl_xcvr.c | 2 +-
+ sound/soc/fsl/imx-card.c | 844 +++++++++++++++++++++
+ sound/soc/fsl/imx-pcm-rpmsg.c | 6 +-
+ sound/soc/fsl/imx-pcm-rpmsg.h | 4 +-
+ sound/soc/fsl/imx-rpmsg.c | 1 -
+ sound/soc/hisilicon/hi6210-i2s.c | 14 +-
+ sound/soc/intel/boards/Kconfig | 36 +-
+ sound/soc/intel/boards/Makefile | 30 +-
+ sound/soc/intel/boards/bxt_da7219_max98357a.c | 13 +-
+ sound/soc/intel/boards/bxt_rt298.c | 1 +
+ sound/soc/intel/boards/bytcht_cx2072x.c | 1 -
+ sound/soc/intel/boards/bytcht_da7213.c | 1 -
+ sound/soc/intel/boards/bytcht_es8316.c | 1 -
+ sound/soc/intel/boards/bytcht_nocodec.c | 1 -
+ sound/soc/intel/boards/bytcr_rt5640.c | 1 -
+ sound/soc/intel/boards/bytcr_rt5651.c | 1 -
+ sound/soc/intel/boards/bytcr_wm5102.c | 1 -
+ sound/soc/intel/boards/cht_bsw_rt5645.c | 1 -
+ sound/soc/intel/boards/cht_bsw_rt5672.c | 1 -
+ sound/soc/intel/boards/cml_rt1011_rt5682.c | 1 +
+ sound/soc/intel/boards/ehl_rt5660.c | 2 +-
+ sound/soc/intel/boards/glk_rt5682_max98357a.c | 1 +
+ sound/soc/intel/boards/hda_dsp_common.c | 5 +
+ sound/soc/intel/boards/skl_hda_dsp_generic.c | 1 +
+ sound/soc/intel/boards/sof_cs42l42.c | 509 +++++++++++++
+ sound/soc/intel/boards/sof_da7219_max98373.c | 2 +
+ sound/soc/intel/boards/sof_maxim_common.c | 84 +-
+ sound/soc/intel/boards/sof_maxim_common.h | 14 +-
+ sound/soc/intel/boards/sof_pcm512x.c | 2 +-
+ sound/soc/intel/boards/sof_rt5682.c | 120 ++-
+ sound/soc/intel/boards/sof_sdw.c | 71 +-
+ sound/soc/intel/boards/sof_sdw_common.h | 8 +
+ sound/soc/intel/boards/sof_sdw_max98373.c | 4 +-
+ sound/soc/intel/boards/sof_wm8804.c | 1 -
+ sound/soc/intel/common/soc-acpi-intel-adl-match.c | 71 ++
+ sound/soc/intel/common/soc-acpi-intel-bxt-match.c | 2 +-
+ sound/soc/intel/common/soc-acpi-intel-cml-match.c | 2 +-
+ sound/soc/intel/common/soc-acpi-intel-glk-match.c | 12 +-
+ sound/soc/intel/skylake/skl-nhlt.c | 6 +-
+ sound/soc/jz4740/jz4740-i2s.c | 4 +-
+ sound/soc/jz4740/jz4740-i2s.h | 2 -
+ sound/soc/mediatek/mt8192/mt8192-dai-adda.c | 2 -
+ sound/soc/meson/g12a-toacodec.c | 143 +++-
+ sound/soc/qcom/qdsp6/q6asm-dai.c | 2 +-
+ sound/soc/sh/rcar/Makefile | 2 +-
+ sound/soc/sh/rcar/adg.c | 73 +-
+ sound/soc/sh/rcar/cmd.c | 14 +
+ sound/soc/sh/rcar/core.c | 123 ++-
+ sound/soc/sh/rcar/ctu.c | 14 +
+ sound/soc/sh/rcar/debugfs.c | 96 +++
+ sound/soc/sh/rcar/dma.c | 39 +-
+ sound/soc/sh/rcar/dvc.c | 16 +-
+ sound/soc/sh/rcar/gen.c | 9 +
+ sound/soc/sh/rcar/mix.c | 14 +
+ sound/soc/sh/rcar/rsnd.h | 56 +-
+ sound/soc/sh/rcar/src.c | 32 +-
+ sound/soc/sh/rcar/ssi.c | 160 ++--
+ sound/soc/sh/rcar/ssiu.c | 144 +++-
+ sound/soc/soc-core.c | 8 +-
+ sound/soc/soc-dai.c | 13 +-
+ sound/soc/soc-topology.c | 466 ++++++------
+ sound/soc/sof/compress.c | 2 +-
+ sound/soc/sof/compress.h | 2 +-
+ sound/soc/sof/intel/Makefile | 5 +-
+ sound/soc/sof/intel/atom.c | 463 +++++++++++
+ sound/soc/sof/intel/atom.h | 74 ++
+ sound/soc/sof/intel/byt.c | 768 ++-----------------
+ sound/soc/sof/intel/hda-loader.c | 5 -
+ sound/soc/sof/intel/hda.c | 27 +-
+ sound/soc/sof/intel/pci-tgl.c | 2 +
+ sound/soc/sof/intel/pci-tng.c | 171 ++++-
+ sound/soc/sof/loader.c | 2 +-
+ sound/soc/sof/ops.h | 10 +-
+ sound/soc/sof/sof-acpi-dev.c | 5 +-
+ sound/soc/sof/sof-of-dev.c | 5 +-
+ sound/soc/sof/sof-pci-dev.c | 7 +-
+ sound/soc/sof/topology.c | 17 +-
+ sound/soc/ti/omap-mcbsp.c | 2 +-
+ 126 files changed, 4617 insertions(+), 1599 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/sound/imx-audio-card.yaml
+ create mode 100644 Documentation/devicetree/bindings/sound/nxp,tfa989x.yaml
+ delete mode 100644 Documentation/devicetree/bindings/sound/wm8750.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/wm8750.yaml
+ create mode 100644 sound/soc/codecs/cirrus_legacy.h
+ create mode 100644 sound/soc/codecs/tfa989x.c
+ create mode 100644 sound/soc/fsl/imx-card.c
+ create mode 100644 sound/soc/intel/boards/sof_cs42l42.c
+ create mode 100644 sound/soc/sh/rcar/debugfs.c
+ create mode 100644 sound/soc/sof/intel/atom.c
+ create mode 100644 sound/soc/sof/intel/atom.h
+Merging modules/modules-next (2c0f0f363956 module: correctly exit module_kallsyms_on_each_symbol when fn() != 0)
+$ git merge modules/modules-next
+Auto-merging kernel/module.c
+Merge made by the 'recursive' strategy.
+ kernel/module.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+Merging input/next (2fcbda9a822d Input: pm8941-pwrkey - add support for PMK8350 PON_HLOS PMIC peripheral)
+$ git merge input/next
+Removing include/linux/input/cyttsp.h
+Auto-merging MAINTAINERS
+Removing Documentation/devicetree/bindings/input/touchscreen/resistive-adc-touch.txt
+Removing Documentation/devicetree/bindings/input/touchscreen/cyttsp.txt
+Removing Documentation/devicetree/bindings/input/fsl-mma8450.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/input/fsl-mma8450.txt | 12 --
+ .../bindings/input/qcom,pm8941-pwrkey.txt | 2 +
+ .../input/touchscreen/cypress,cy8ctma340.yaml | 148 +++++++++++++++++++++
+ .../bindings/input/touchscreen/cyttsp.txt | 93 -------------
+ .../bindings/input/touchscreen/edt-ft5x06.yaml | 1 +
+ .../input/touchscreen/resistive-adc-touch.txt | 33 -----
+ .../input/touchscreen/resistive-adc-touch.yaml | 86 ++++++++++++
+ .../bindings/input/touchscreen/touchscreen.yaml | 6 +
+ MAINTAINERS | 5 +-
+ drivers/input/evbug.c | 3 -
+ drivers/input/keyboard/hil_kbd.c | 1 +
+ drivers/input/misc/ims-pcu.c | 4 +-
+ drivers/input/misc/pm8941-pwrkey.c | 103 +++++++++-----
+ drivers/input/touchscreen/cyttsp_core.c | 47 ++++++-
+ drivers/input/touchscreen/cyttsp_core.h | 3 +-
+ drivers/input/touchscreen/cyttsp_i2c.c | 10 ++
+ drivers/input/touchscreen/cyttsp_spi.c | 10 ++
+ drivers/input/touchscreen/edt-ft5x06.c | 38 +++++-
+ drivers/input/touchscreen/resistive-adc-touch.c | 138 ++++++++++++++++---
+ include/linux/input/cyttsp.h | 29 ----
+ 20 files changed, 542 insertions(+), 230 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/input/fsl-mma8450.txt
+ create mode 100644 Documentation/devicetree/bindings/input/touchscreen/cypress,cy8ctma340.yaml
+ delete mode 100644 Documentation/devicetree/bindings/input/touchscreen/cyttsp.txt
+ delete mode 100644 Documentation/devicetree/bindings/input/touchscreen/resistive-adc-touch.txt
+ create mode 100644 Documentation/devicetree/bindings/input/touchscreen/resistive-adc-touch.yaml
+ delete mode 100644 include/linux/input/cyttsp.h
+Merging block/for-next (314e07c78aef Merge branch 'for-5.14/block' into for-next)
+$ git merge block/for-next
+Auto-merging kernel/sysctl.c
+Auto-merging fs/io_uring.c
+Auto-merging fs/btrfs/volumes.c
+Auto-merging drivers/nvme/host/core.c
+Merge made by the 'recursive' strategy.
+ Documentation/admin-guide/laptops/laptop-mode.rst | 11 -
+ Documentation/admin-guide/sysctl/vm.rst | 8 -
+ Documentation/filesystems/locking.rst | 2 +-
+ arch/m68k/emu/nfblock.c | 20 +-
+ arch/xtensa/platforms/iss/simdisk.c | 29 +-
+ block/blk-cgroup.c | 27 --
+ block/blk-core.c | 10 -
+ block/blk-flush.c | 3 +-
+ block/blk-mq-sched.c | 67 ++++-
+ block/blk-mq-sched.h | 2 +
+ block/blk-mq-tag.c | 114 ++++---
+ block/blk-mq-tag.h | 15 +-
+ block/blk-mq.c | 110 ++++++-
+ block/blk-mq.h | 1 +
+ block/blk-sysfs.c | 16 +-
+ block/blk.h | 6 +-
+ block/genhd.c | 208 +++++++------
+ block/ioctl.c | 2 +-
+ block/partitions/core.c | 64 ++--
+ drivers/ata/pata_ep93xx.c | 2 +-
+ drivers/ata/pata_octeon_cf.c | 5 +-
+ drivers/ata/pata_rb532_cf.c | 6 +-
+ drivers/ata/sata_fsl.c | 2 +-
+ drivers/ata/sata_highbank.c | 6 +-
+ drivers/ata/sata_nv.c | 2 +-
+ drivers/block/aoe/aoecmd.c | 2 -
+ drivers/block/brd.c | 94 +++---
+ drivers/block/drbd/drbd_main.c | 23 +-
+ drivers/block/loop.c | 14 +-
+ drivers/block/n64cart.c | 8 +-
+ drivers/block/null_blk/main.c | 38 +--
+ drivers/block/pktcdvd.c | 11 +-
+ drivers/block/ps3vram.c | 31 +-
+ drivers/block/rsxx/dev.c | 39 +--
+ drivers/block/rsxx/dma.c | 6 +-
+ drivers/block/rsxx/rsxx_priv.h | 1 -
+ drivers/block/xen-blkfront.c | 8 +-
+ drivers/block/zram/zram_drv.c | 37 +--
+ drivers/block/zram/zram_drv.h | 2 +-
+ drivers/lightnvm/core.c | 24 +-
+ drivers/md/bcache/super.c | 15 +-
+ drivers/md/dm.c | 16 +-
+ drivers/md/md.c | 25 +-
+ drivers/md/md.h | 6 +-
+ drivers/memstick/core/ms_block.c | 1 -
+ drivers/nvdimm/blk.c | 27 +-
+ drivers/nvdimm/btt.c | 25 +-
+ drivers/nvdimm/btt.h | 2 -
+ drivers/nvdimm/pmem.c | 17 +-
+ drivers/nvme/host/core.c | 1 -
+ drivers/nvme/host/multipath.c | 46 +--
+ drivers/s390/block/dasd_genhd.c | 8 +-
+ drivers/s390/block/dcssblk.c | 26 +-
+ drivers/s390/block/xpram.c | 26 +-
+ drivers/scsi/sd.c | 4 +-
+ fs/block_dev.c | 207 +++++++------
+ fs/btrfs/volumes.c | 2 +-
+ fs/fs-writeback.c | 25 --
+ fs/io_uring.c | 343 +++++++++++-----------
+ fs/super.c | 8 +-
+ include/linux/ata.h | 2 +-
+ include/linux/blk_types.h | 4 -
+ include/linux/blkdev.h | 5 +-
+ include/linux/genhd.h | 29 +-
+ include/linux/writeback.h | 1 -
+ init/do_mounts.c | 10 +-
+ kernel/sysctl.c | 8 -
+ mm/page-writeback.c | 5 -
+ 68 files changed, 925 insertions(+), 1045 deletions(-)
+Merging device-mapper/for-next (2c243153d1d4 dm: Forbid requeue of writes to zones)
+$ git merge device-mapper/for-next
+Auto-merging drivers/md/dm.c
+Merge made by the 'recursive' strategy.
+ drivers/md/Makefile | 4 +
+ drivers/md/dm-cache-target.c | 11 +-
+ drivers/md/dm-crypt.c | 7 +-
+ drivers/md/dm-era-target.c | 24 +-
+ drivers/md/dm-flakey.c | 7 +-
+ drivers/md/dm-kcopyd.c | 48 +-
+ drivers/md/dm-linear.c | 7 +-
+ drivers/md/dm-raid1.c | 2 +-
+ drivers/md/dm-table.c | 18 +-
+ drivers/md/dm-thin-metadata.c | 91 ++--
+ drivers/md/dm-thin.c | 2 +-
+ drivers/md/dm-writecache.c | 51 +-
+ drivers/md/dm-zone.c | 136 ++++++
+ drivers/md/dm-zoned-metadata.c | 7 +
+ drivers/md/dm-zoned-reclaim.c | 2 +-
+ drivers/md/dm.c | 104 +---
+ drivers/md/dm.h | 16 +
+ drivers/md/persistent-data/dm-array.c | 52 +-
+ drivers/md/persistent-data/dm-btree-internal.h | 13 +
+ drivers/md/persistent-data/dm-btree-remove.c | 4 +-
+ drivers/md/persistent-data/dm-btree-spine.c | 16 +-
+ drivers/md/persistent-data/dm-btree.c | 540 +++++++++++++++++++--
+ drivers/md/persistent-data/dm-btree.h | 10 +-
+ drivers/md/persistent-data/dm-space-map-common.c | 534 ++++++++++++++++++--
+ drivers/md/persistent-data/dm-space-map-common.h | 34 +-
+ drivers/md/persistent-data/dm-space-map-disk.c | 83 +---
+ drivers/md/persistent-data/dm-space-map-metadata.c | 105 ++--
+ drivers/md/persistent-data/dm-space-map.h | 18 +-
+ .../md/persistent-data/dm-transaction-manager.c | 61 +++
+ .../md/persistent-data/dm-transaction-manager.h | 22 +-
+ include/linux/device-mapper.h | 3 +-
+ include/linux/dm-kcopyd.h | 5 +-
+ 32 files changed, 1599 insertions(+), 438 deletions(-)
+ create mode 100644 drivers/md/dm-zone.c
+Merging pcmcia/pcmcia-next (e9d503fef7da pcmcia: rsrc_nonstatic: Fix call-back function as reference formatting)
+$ git merge pcmcia/pcmcia-next
+Already up to date.
+Merging mmc/next (92df2ba88355 mmc: mmc_spi: Imply container_of() to be no-op)
+$ git merge mmc/next
+Auto-merging drivers/memstick/core/ms_block.c
+Removing Documentation/devicetree/bindings/mmc/renesas,mmcif.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/mmc/mmc-controller.yaml | 25 +-
+ .../devicetree/bindings/mmc/renesas,mmcif.txt | 53 ---
+ .../devicetree/bindings/mmc/renesas,mmcif.yaml | 135 ++++++
+ .../devicetree/bindings/mmc/rockchip-dw-mshc.yaml | 10 +-
+ .../devicetree/bindings/mmc/sdhci-am654.yaml | 1 -
+ drivers/memstick/core/ms_block.c | 37 +-
+ drivers/memstick/host/rtsx_usb_ms.c | 10 +-
+ drivers/mmc/core/block.c | 11 +-
+ drivers/mmc/core/core.c | 22 +-
+ drivers/mmc/core/core.h | 9 +
+ drivers/mmc/core/host.c | 3 +
+ drivers/mmc/core/mmc.c | 68 ++-
+ drivers/mmc/core/mmc_ops.c | 159 ++++---
+ drivers/mmc/core/mmc_ops.h | 12 +-
+ drivers/mmc/core/sd.c | 471 ++++++++++++++++++++-
+ drivers/mmc/core/sd_ops.c | 38 +-
+ drivers/mmc/core/sdio.c | 6 +-
+ drivers/mmc/host/cqhci-core.c | 21 +-
+ drivers/mmc/host/dw_mmc-pltfm.c | 1 -
+ drivers/mmc/host/jz4740_mmc.c | 1 -
+ drivers/mmc/host/mmc_spi.c | 12 +-
+ drivers/mmc/host/mtk-sd.c | 25 +-
+ drivers/mmc/host/of_mmc_spi.c | 2 +-
+ drivers/mmc/host/s3cmci.c | 7 +-
+ drivers/mmc/host/sdhci-acpi.c | 11 +
+ drivers/mmc/host/sdhci-esdhc-imx.c | 5 +-
+ drivers/mmc/host/sdhci-of-aspeed.c | 48 +++
+ drivers/mmc/host/sdhci-omap.c | 5 +-
+ drivers/mmc/host/sdhci-pci-gli.c | 4 +-
+ drivers/mmc/host/sdhci_am654.c | 6 +-
+ drivers/mmc/host/usdhi6rol0.c | 1 +
+ drivers/mmc/host/vub300.c | 2 +-
+ include/linux/mmc/card.h | 23 +
+ include/linux/mmc/sd.h | 4 +
+ 34 files changed, 924 insertions(+), 324 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/mmc/renesas,mmcif.txt
+ create mode 100644 Documentation/devicetree/bindings/mmc/renesas,mmcif.yaml
+Merging mfd/for-mfd-next (495fb48dbd9b mfd: wm831x: Use DEFINE_RES_IRQ_NAMED() and DEFINE_RES_IRQ() to simplify code)
+$ git merge mfd/for-mfd-next
+Auto-merging sound/soc/codecs/Makefile
+Auto-merging sound/soc/codecs/Kconfig
+Removing include/linux/mfd/mt6360.h
+Auto-merging drivers/regulator/Kconfig
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../leds/backlight/richtek,rt4831-backlight.yaml | 62 ++
+ .../devicetree/bindings/mfd/google,cros-ec.yaml | 20 +
+ Documentation/devicetree/bindings/mfd/mt6397.txt | 1 +
+ .../devicetree/bindings/mfd/qcom,pm8008.yaml | 121 +++
+ .../devicetree/bindings/mfd/qcom,spmi-pmic.txt | 4 +
+ .../devicetree/bindings/mfd/richtek,rt4831.yaml | 90 ++
+ Documentation/devicetree/bindings/mfd/rk808.txt | 188 ++++
+ .../bindings/mfd/stericsson,db8500-prcmu.yaml | 278 ++++++
+ .../bindings/regulator/mt6359-regulator.yaml | 385 ++++++++
+ MAINTAINERS | 10 -
+ drivers/gpio/gpio-lp87565.c | 6 +-
+ drivers/mfd/88pm800.c | 14 +-
+ drivers/mfd/88pm805.c | 29 +-
+ drivers/mfd/Kconfig | 29 +-
+ drivers/mfd/Makefile | 16 +-
+ drivers/mfd/arizona-core.c | 2 +
+ drivers/mfd/as3722.c | 14 +-
+ drivers/mfd/asic3.c | 12 +-
+ drivers/mfd/axp20x.c | 24 +-
+ drivers/mfd/cros_ec_dev.c | 20 +-
+ drivers/mfd/da9052-i2c.c | 10 +-
+ drivers/mfd/da9055-core.c | 38 +-
+ drivers/mfd/da9062-core.c | 13 +-
+ drivers/mfd/da9063-i2c.c | 2 +-
+ drivers/mfd/db8500-prcmu.c | 6 +-
+ drivers/mfd/hi655x-pmic.c | 2 +-
+ drivers/mfd/intel-lpss-pci.c | 13 +
+ drivers/mfd/ioc3.c | 1 +
+ drivers/mfd/lp87565.c | 27 +
+ drivers/mfd/max8907.c | 6 +-
+ drivers/mfd/max8997.c | 9 +-
+ drivers/mfd/max8998.c | 8 +-
+ drivers/mfd/mfd-core.c | 15 +-
+ drivers/mfd/motorola-cpcap.c | 4 +
+ drivers/mfd/mt6358-irq.c | 89 +-
+ drivers/mfd/mt6360-core.c | 552 +++++++----
+ drivers/mfd/mt6397-core.c | 44 +-
+ drivers/mfd/omap-usb-host.c | 2 +-
+ drivers/mfd/omap-usb-tll.c | 2 +-
+ drivers/mfd/qcom-pm8008.c | 260 +++++
+ drivers/mfd/rk808.c | 81 ++
+ drivers/mfd/rn5t618.c | 2 +-
+ drivers/mfd/rt4831.c | 115 +++
+ drivers/mfd/sec-core.c | 70 +-
+ drivers/mfd/sec-irq.c | 4 +-
+ drivers/mfd/si476x-cmd.c | 28 +-
+ drivers/mfd/si476x-i2c.c | 10 +-
+ drivers/mfd/stmpe-i2c.c | 2 +-
+ drivers/mfd/sun6i-prcm.c | 30 +-
+ drivers/mfd/syscon.c | 2 +-
+ drivers/mfd/t7l66xb.c | 12 +-
+ drivers/mfd/tps80031.c | 6 +-
+ drivers/mfd/twl-core.c | 2 +-
+ drivers/mfd/wcd934x.c | 50 +-
+ drivers/mfd/wm831x-core.c | 250 +----
+ drivers/regulator/Kconfig | 9 +
+ drivers/regulator/Makefile | 1 +
+ drivers/regulator/lp87565-regulator.c | 11 +
+ drivers/regulator/mt6359-regulator.c | 1036 ++++++++++++++++++++
+ drivers/rtc/rtc-mt6397.c | 2 +-
+ include/dt-bindings/leds/rt4831-backlight.h | 23 +
+ include/dt-bindings/mfd/qcom-pm8008.h | 19 +
+ include/linux/mfd/hi655x-pmic.h | 2 +-
+ include/linux/mfd/lp87565.h | 40 +-
+ include/linux/mfd/mt6358/core.h | 8 +-
+ include/linux/mfd/mt6358/registers.h | 2 +
+ include/linux/mfd/mt6359/core.h | 133 +++
+ include/linux/mfd/mt6359/registers.h | 529 ++++++++++
+ include/linux/mfd/mt6359p/registers.h | 249 +++++
+ include/linux/mfd/mt6360.h | 240 -----
+ include/linux/mfd/mt6397/core.h | 1 +
+ include/linux/mfd/mt6397/rtc.h | 1 +
+ include/linux/mfd/rk808.h | 81 ++
+ include/linux/mfd/samsung/core.h | 33 -
+ include/linux/regulator/mt6359-regulator.h | 59 ++
+ sound/soc/codecs/Kconfig | 16 +-
+ sound/soc/codecs/Makefile | 2 +
+ sound/soc/codecs/rk817_codec.c | 538 ++++++++++
+ 78 files changed, 5088 insertions(+), 1039 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/leds/backlight/richtek,rt4831-backlight.yaml
+ create mode 100644 Documentation/devicetree/bindings/mfd/qcom,pm8008.yaml
+ create mode 100644 Documentation/devicetree/bindings/mfd/richtek,rt4831.yaml
+ create mode 100644 Documentation/devicetree/bindings/mfd/stericsson,db8500-prcmu.yaml
+ create mode 100644 Documentation/devicetree/bindings/regulator/mt6359-regulator.yaml
+ create mode 100644 drivers/mfd/qcom-pm8008.c
+ create mode 100644 drivers/mfd/rt4831.c
+ create mode 100644 drivers/regulator/mt6359-regulator.c
+ create mode 100644 include/dt-bindings/leds/rt4831-backlight.h
+ create mode 100644 include/dt-bindings/mfd/qcom-pm8008.h
+ create mode 100644 include/linux/mfd/mt6359/core.h
+ create mode 100644 include/linux/mfd/mt6359/registers.h
+ create mode 100644 include/linux/mfd/mt6359p/registers.h
+ delete mode 100644 include/linux/mfd/mt6360.h
+ create mode 100644 include/linux/regulator/mt6359-regulator.h
+ create mode 100644 sound/soc/codecs/rk817_codec.c
+Merging backlight/for-backlight-next (6fc632d3e3e0 video: backlight: qcom-wled: Add PMI8994 compatible)
+$ git merge backlight/for-backlight-next
+Merge made by the 'recursive' strategy.
+ drivers/video/backlight/Kconfig | 8 ++
+ drivers/video/backlight/Makefile | 1 +
+ drivers/video/backlight/lm3630a_bl.c | 4 +-
+ drivers/video/backlight/qcom-wled.c | 1 +
+ drivers/video/backlight/rt4831-backlight.c | 203 +++++++++++++++++++++++++++++
+ 5 files changed, 216 insertions(+), 1 deletion(-)
+ create mode 100644 drivers/video/backlight/rt4831-backlight.c
+Merging battery/for-next (2aac79d14d76 power: supply: sc2731_charger: Add missing MODULE_DEVICE_TABLE)
+$ git merge battery/for-next
+Auto-merging MAINTAINERS
+Removing Documentation/devicetree/bindings/power/supply/charger-manager.txt
+Merge made by the 'recursive' strategy.
+ .../bindings/power/supply/charger-manager.txt | 91 ---------
+ .../bindings/power/supply/charger-manager.yaml | 215 +++++++++++++++++++++
+ MAINTAINERS | 2 +-
+ drivers/power/supply/sc2731_charger.c | 1 +
+ drivers/power/supply/sc27xx_fuel_gauge.c | 1 +
+ 5 files changed, 218 insertions(+), 92 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/power/supply/charger-manager.txt
+ create mode 100644 Documentation/devicetree/bindings/power/supply/charger-manager.yaml
+Merging regulator/for-next (88a0f637b67b Merge remote-tracking branch 'regulator/for-5.14' into regulator-next)
+$ git merge regulator/for-next
+Auto-merging drivers/regulator/core.c
+Removing drivers/regulator/bd70528-regulator.c
+Auto-merging drivers/regulator/Makefile
+Auto-merging drivers/regulator/Kconfig
+Merge made by the 'recursive' strategy.
+ .../bindings/regulator/qcom,smd-rpm-regulator.yaml | 5 +
+ .../regulator/richtek,rt6160-regulator.yaml | 61 ++++
+ drivers/regulator/Kconfig | 23 +-
+ drivers/regulator/Makefile | 2 +-
+ drivers/regulator/bd70528-regulator.c | 283 ------------------
+ drivers/regulator/bd71815-regulator.c | 3 +-
+ drivers/regulator/core.c | 130 ++++----
+ drivers/regulator/fan53555.c | 45 +--
+ drivers/regulator/fan53880.c | 5 +-
+ drivers/regulator/hi6421v600-regulator.c | 22 +-
+ drivers/regulator/lp8755.c | 55 +---
+ drivers/regulator/max8973-regulator.c | 37 +--
+ drivers/regulator/mcp16502.c | 79 ++---
+ drivers/regulator/mp5416.c | 44 +--
+ drivers/regulator/mp886x.c | 32 +-
+ drivers/regulator/mt6315-regulator.c | 17 +-
+ drivers/regulator/pca9450-regulator.c | 51 ++--
+ drivers/regulator/qcom_smd-regulator.c | 85 +++++-
+ drivers/regulator/qcom_usb_vbus-regulator.c | 12 +
+ drivers/regulator/rk808-regulator.c | 116 ++++---
+ drivers/regulator/rt4831-regulator.c | 3 +
+ drivers/regulator/rt6160-regulator.c | 332 +++++++++++++++++++++
+ drivers/regulator/uniphier-regulator.c | 1 +
+ drivers/regulator/userspace-consumer.c | 14 +-
+ 24 files changed, 764 insertions(+), 693 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/regulator/richtek,rt6160-regulator.yaml
+ delete mode 100644 drivers/regulator/bd70528-regulator.c
+ create mode 100644 drivers/regulator/rt6160-regulator.c
+Merging security/next-testing (047843bdb316 Merge branch 'landlock_lsm_v34' into next-testing)
+$ git merge security/next-testing
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging apparmor/apparmor-next (d108370c644b apparmor: fix error check)
+$ git merge apparmor/apparmor-next
+Auto-merging security/apparmor/policy_unpack.c
+Auto-merging security/apparmor/policy.c
+Auto-merging security/apparmor/lsm.c
+Auto-merging security/apparmor/label.c
+Auto-merging security/apparmor/include/label.h
+Auto-merging security/apparmor/include/file.h
+Auto-merging security/apparmor/apparmorfs.c
+Merge made by the 'recursive' strategy.
+ security/apparmor/apparmorfs.c | 4 +--
+ security/apparmor/include/file.h | 2 +-
+ security/apparmor/include/label.h | 1 +
+ security/apparmor/include/policy.h | 6 ++--
+ security/apparmor/label.c | 4 +--
+ security/apparmor/lsm.c | 22 +++++++-------
+ security/apparmor/path.c | 2 +-
+ security/apparmor/policy.c | 59 ++++++++++++++++++++++++++++++++------
+ security/apparmor/policy_unpack.c | 2 +-
+ 9 files changed, 73 insertions(+), 29 deletions(-)
+Merging integrity/next-integrity (5a25d8ceb861 Merge branch 'misc-evm-v7' into next-integrity)
+$ git merge integrity/next-integrity
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/evm | 36 ++++-
+ Documentation/security/IMA-templates.rst | 4 +-
+ include/linux/evm.h | 18 ++-
+ include/linux/integrity.h | 1 +
+ security/integrity/evm/evm_main.c | 247 +++++++++++++++++++++++++++---
+ security/integrity/evm/evm_secfs.c | 13 +-
+ security/integrity/iint.c | 4 +-
+ security/integrity/ima/ima_appraise.c | 43 ++++--
+ security/integrity/ima/ima_init.c | 4 +
+ security/integrity/ima/ima_template.c | 2 +
+ security/integrity/ima/ima_template_lib.c | 33 +++-
+ security/integrity/ima/ima_template_lib.h | 2 +
+ security/security.c | 4 +-
+ 13 files changed, 358 insertions(+), 53 deletions(-)
+Merging keys/keys-next (e377c31f788f integrity: Load mokx variables into the blacklist keyring)
+$ git merge keys/keys-next
+Auto-merging scripts/Makefile
+Auto-merging include/keys/system_keyring.h
+Auto-merging certs/system_keyring.c
+CONFLICT (content): Merge conflict in certs/system_keyring.c
+Auto-merging certs/Makefile
+Auto-merging certs/Kconfig
+Resolved 'certs/system_keyring.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 151f9d2b46fd] Merge remote-tracking branch 'keys/keys-next'
+$ git diff -M --stat --summary HEAD^..
+Merging safesetid/safesetid-next (1ca86ac1ec8d LSM: SafeSetID: Fix code specification by scripts/checkpatch.pl)
+$ git merge safesetid/safesetid-next
+Already up to date.
+Merging selinux/next (869cbeef18e5 lsm_audit,selinux: pass IB device name by reference)
+$ git merge selinux/next
+Auto-merging security/security.c
+Merge made by the 'recursive' strategy.
+ include/linux/lsm_audit.h | 8 ++++----
+ include/linux/lsm_hook_defs.h | 3 +--
+ include/linux/security.h | 4 ++--
+ net/xfrm/xfrm_policy.c | 6 ++----
+ security/security.c | 4 ++--
+ security/selinux/avc.c | 2 +-
+ security/selinux/hooks.c | 2 +-
+ security/selinux/include/xfrm.h | 2 +-
+ security/selinux/ss/avtab.c | 28 +++++++++++++++-------------
+ security/selinux/ss/avtab.h | 16 +++++++++-------
+ security/selinux/ss/conditional.c | 14 ++++++++------
+ security/selinux/ss/policydb.c | 1 -
+ security/selinux/ss/services.c | 4 ----
+ security/selinux/xfrm.c | 2 +-
+ 14 files changed, 47 insertions(+), 49 deletions(-)
+Merging smack/next (0169d8f33ab7 Revert "Smack: Handle io_uring kernel thread privileges")
+$ git merge smack/next
+Merge made by the 'recursive' strategy.
+ security/smack/smack_access.c | 5 ++---
+ security/smack/smackfs.c | 4 +++-
+ 2 files changed, 5 insertions(+), 4 deletions(-)
+Merging tomoyo/master (6efb943b8616 Linux 5.13-rc1)
+$ git merge tomoyo/master
+Already up to date.
+Merging tpmdd/next (8124c8a6b353 Linux 5.13-rc4)
+$ git merge tpmdd/next
+Already up to date.
+Merging watchdog/master (c4681547bcce Linux 5.13-rc3)
+$ git merge watchdog/master
+Already up to date.
+Merging iommu/next (a2bf39204785 Merge branch 'iommu/fixes' into next)
+$ git merge iommu/next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging audit/next (254c8b96c4af audit: add blank line after variable declarations)
+$ git merge audit/next
+Merge made by the 'recursive' strategy.
+ kernel/auditsc.c | 21 +++++++++++++++++++++
+ 1 file changed, 21 insertions(+)
+Merging devicetree/for-next (67a315645385 of: Merge of_address_to_resource() and of_pci_address_to_resource() implementations)
+$ git merge devicetree/for-next
+Auto-merging include/linux/pci.h
+Auto-merging MAINTAINERS
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml
+Removing Documentation/devicetree/bindings/timer/renesas,tpu.txt
+Removing Documentation/devicetree/bindings/timer/arm,twd.txt
+Removing Documentation/devicetree/bindings/soc/ti/sci-pm-domain.txt
+Removing Documentation/devicetree/bindings/rtc/pcf8563.txt
+Removing Documentation/devicetree/bindings/rng/mtk-rng.txt
+Removing Documentation/devicetree/bindings/reset/ti,sci-reset.txt
+Removing Documentation/devicetree/bindings/pwm/brcm,iproc-pwm.txt
+Removing Documentation/devicetree/bindings/property-units.txt
+Removing Documentation/devicetree/bindings/power/renesas,sysc-rmobile.txt
+Removing Documentation/devicetree/bindings/net/mdio-mux.txt
+Removing Documentation/devicetree/bindings/net/mdio-mux-multiplexer.txt
+Removing Documentation/devicetree/bindings/net/mdio-mux-mmioreg.txt
+Removing Documentation/devicetree/bindings/net/mdio-mux-gpio.txt
+Removing Documentation/devicetree/bindings/net/mdio-gpio.txt
+Removing Documentation/devicetree/bindings/mux/reg-mux.txt
+Removing Documentation/devicetree/bindings/mux/mux-controller.txt
+Removing Documentation/devicetree/bindings/mux/gpio-mux.txt
+Removing Documentation/devicetree/bindings/memory-controllers/nvidia,tegra20-emc.txt
+Removing Documentation/devicetree/bindings/mailbox/omap-mailbox.txt
+Removing Documentation/devicetree/bindings/iio/multiplexer/io-channel-mux.txt
+Removing Documentation/devicetree/bindings/i2c/i2c-mux.txt
+Removing Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.txt
+Removing Documentation/devicetree/bindings/i2c/i2c-mux-gpmux.txt
+Removing Documentation/devicetree/bindings/clock/ti,sci-clk.txt
+Removing Documentation/devicetree/bindings/clock/renesas,r9a06g032-sysctrl.txt
+Removing Documentation/devicetree/bindings/clock/renesas,emev2-smu.txt
+Removing Documentation/devicetree/bindings/arm/scu.txt
+Removing Documentation/devicetree/bindings/arm/keystone/ti,sci.txt
+Removing Documentation/devicetree/bindings/arm/juno,scpi.txt
+Removing Documentation/devicetree/bindings/arm/firmware/linaro,optee-tz.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/arm/amlogic,scpi.txt | 12 -
+ Documentation/devicetree/bindings/arm/arm,scmi.txt | 15 -
+ Documentation/devicetree/bindings/arm/arm,scpi.txt | 15 -
+ Documentation/devicetree/bindings/arm/arm,scu.yaml | 46 +++
+ .../bindings/arm/firmware/linaro,optee-tz.txt | 31 ---
+ .../bindings/arm/firmware/linaro,optee-tz.yaml | 58 ++++
+ .../devicetree/bindings/arm/intel,keembay.yaml | 2 +
+ .../devicetree/bindings/arm/juno,scpi.txt | 26 --
+ .../devicetree/bindings/arm/keystone/ti,sci.txt | 86 ------
+ .../devicetree/bindings/arm/keystone/ti,sci.yaml | 129 +++++++++
+ Documentation/devicetree/bindings/arm/scu.txt | 28 --
+ .../devicetree/bindings/arm/ux500/boards.txt | 4 +-
+ .../devicetree/bindings/ata/renesas,rcar-sata.yaml | 11 +
+ .../bindings/clock/renesas,emev2-smu.txt | 98 -------
+ .../bindings/clock/renesas,emev2-smu.yaml | 140 ++++++++++
+ .../bindings/clock/renesas,r9a06g032-sysctrl.txt | 46 ---
+ .../bindings/clock/renesas,r9a06g032-sysctrl.yaml | 62 +++++
+ .../devicetree/bindings/clock/ti,sci-clk.txt | 36 ---
+ .../devicetree/bindings/clock/ti,sci-clk.yaml | 49 ++++
+ .../devicetree/bindings/display/panel/lvds.yaml | 46 +--
+ Documentation/devicetree/bindings/dma/ti-edma.txt | 4 +-
+ .../devicetree/bindings/gpio/gpio-davinci.txt | 2 +-
+ .../devicetree/bindings/i2c/i2c-davinci.txt | 4 +-
+ .../devicetree/bindings/i2c/i2c-demux-pinctrl.txt | 2 +-
+ .../devicetree/bindings/i2c/i2c-mux-gpio.txt | 4 +-
+ .../devicetree/bindings/i2c/i2c-mux-gpmux.txt | 99 -------
+ .../devicetree/bindings/i2c/i2c-mux-gpmux.yaml | 124 +++++++++
+ .../devicetree/bindings/i2c/i2c-mux-ltc4306.txt | 4 +-
+ .../devicetree/bindings/i2c/i2c-mux-pca954x.txt | 74 -----
+ .../devicetree/bindings/i2c/i2c-mux-pca954x.yaml | 110 ++++++++
+ .../devicetree/bindings/i2c/i2c-mux-pinctrl.txt | 4 +-
+ .../devicetree/bindings/i2c/i2c-mux-reg.txt | 4 +-
+ Documentation/devicetree/bindings/i2c/i2c-mux.txt | 73 -----
+ Documentation/devicetree/bindings/i2c/i2c-mux.yaml | 87 ++++++
+ .../bindings/iio/multiplexer/io-channel-mux.txt | 39 ---
+ .../bindings/iio/multiplexer/io-channel-mux.yaml | 70 +++++
+ .../devicetree/bindings/mailbox/omap-mailbox.txt | 184 ------------
+ .../bindings/mailbox/ti,omap-mailbox.yaml | 308 +++++++++++++++++++++
+ .../bindings/media/i2c/maxim,max9286.yaml | 23 +-
+ .../memory-controllers/nvidia,tegra20-emc.txt | 130 ---------
+ .../memory-controllers/nvidia,tegra20-emc.yaml | 230 +++++++++++++++
+ .../devicetree/bindings/mfd/motorola-cpcap.txt | 4 +-
+ .../bindings/mfd/ti,j721e-system-controller.yaml | 19 +-
+ .../devicetree/bindings/mmc/ti-omap-hsmmc.txt | 4 +-
+ .../devicetree/bindings/mtd/ti,am654-hbmc.txt | 2 +-
+ .../devicetree/bindings/mux/adi,adg792a.txt | 2 +-
+ .../devicetree/bindings/mux/adi,adgs1408.txt | 2 +-
+ Documentation/devicetree/bindings/mux/gpio-mux.txt | 69 -----
+ .../devicetree/bindings/mux/gpio-mux.yaml | 92 ++++++
+ .../devicetree/bindings/mux/mux-consumer.yaml | 46 +++
+ .../devicetree/bindings/mux/mux-controller.txt | 157 -----------
+ .../devicetree/bindings/mux/mux-controller.yaml | 182 ++++++++++++
+ Documentation/devicetree/bindings/mux/reg-mux.txt | 129 ---------
+ Documentation/devicetree/bindings/mux/reg-mux.yaml | 143 ++++++++++
+ .../bindings/net/brcm,mdio-mux-iproc.txt | 2 +-
+ .../devicetree/bindings/net/can/c_can.txt | 4 +-
+ .../devicetree/bindings/net/mdio-gpio.txt | 27 --
+ .../devicetree/bindings/net/mdio-gpio.yaml | 58 ++++
+ .../devicetree/bindings/net/mdio-mux-gpio.txt | 119 --------
+ .../devicetree/bindings/net/mdio-mux-gpio.yaml | 135 +++++++++
+ .../devicetree/bindings/net/mdio-mux-mmioreg.txt | 75 -----
+ .../devicetree/bindings/net/mdio-mux-mmioreg.yaml | 78 ++++++
+ .../bindings/net/mdio-mux-multiplexer.txt | 82 ------
+ .../bindings/net/mdio-mux-multiplexer.yaml | 82 ++++++
+ Documentation/devicetree/bindings/net/mdio-mux.txt | 129 ---------
+ .../devicetree/bindings/net/mdio-mux.yaml | 44 +++
+ .../bindings/power/renesas,sysc-rmobile.txt | 100 -------
+ .../bindings/power/renesas,sysc-rmobile.yaml | 121 ++++++++
+ .../devicetree/bindings/property-units.txt | 48 ----
+ .../devicetree/bindings/pwm/brcm,iproc-pwm.txt | 21 --
+ .../devicetree/bindings/pwm/brcm,iproc-pwm.yaml | 45 +++
+ .../devicetree/bindings/pwm/renesas,pwm-rcar.yaml | 13 +
+ .../devicetree/bindings/pwm/renesas,tpu-pwm.yaml | 26 ++
+ .../bindings/remoteproc/ti,keystone-rproc.txt | 4 +-
+ .../bindings/remoteproc/ti,omap-remoteproc.yaml | 2 +-
+ .../devicetree/bindings/reset/ti,sci-reset.txt | 62 -----
+ .../devicetree/bindings/reset/ti,sci-reset.yaml | 51 ++++
+ Documentation/devicetree/bindings/rng/mtk-rng.txt | 22 --
+ Documentation/devicetree/bindings/rng/mtk-rng.yaml | 54 ++++
+ .../devicetree/bindings/rtc/nxp,pcf8563.yaml | 56 ++++
+ Documentation/devicetree/bindings/rtc/pcf8563.txt | 29 --
+ .../devicetree/bindings/soc/ti/sci-pm-domain.txt | 65 -----
+ .../devicetree/bindings/soc/ti/sci-pm-domain.yaml | 59 ++++
+ .../devicetree/bindings/spi/spi-davinci.txt | 2 +-
+ Documentation/devicetree/bindings/sram/sram.yaml | 5 +
+ .../devicetree/bindings/timer/arm,twd-timer.yaml | 56 ++++
+ .../devicetree/bindings/timer/arm,twd.txt | 53 ----
+ .../devicetree/bindings/timer/renesas,tpu.txt | 21 --
+ .../devicetree/bindings/timer/renesas,tpu.yaml | 56 ++++
+ .../devicetree/bindings/usb/ti,j721e-usb.yaml | 2 +-
+ .../devicetree/bindings/usb/ti,keystone-dwc3.yaml | 2 +-
+ .../devicetree/bindings/vendor-prefixes.yaml | 4 +
+ .../devicetree/bindings/watchdog/arm,twd-wdt.yaml | 50 ++++
+ .../devicetree/bindings/writing-bindings.rst | 3 +-
+ MAINTAINERS | 8 +-
+ drivers/of/Kconfig | 4 +-
+ drivers/of/address.c | 114 +++-----
+ drivers/of/of_private.h | 4 +
+ drivers/of/of_reserved_mem.c | 2 +
+ include/linux/of_address.h | 54 ++--
+ include/linux/of_reserved_mem.h | 6 -
+ include/linux/pci.h | 4 +
+ 102 files changed, 3036 insertions(+), 2397 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/arm/arm,scu.yaml
+ delete mode 100644 Documentation/devicetree/bindings/arm/firmware/linaro,optee-tz.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/firmware/linaro,optee-tz.yaml
+ delete mode 100644 Documentation/devicetree/bindings/arm/juno,scpi.txt
+ delete mode 100644 Documentation/devicetree/bindings/arm/keystone/ti,sci.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/keystone/ti,sci.yaml
+ delete mode 100644 Documentation/devicetree/bindings/arm/scu.txt
+ delete mode 100644 Documentation/devicetree/bindings/clock/renesas,emev2-smu.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/renesas,emev2-smu.yaml
+ delete mode 100644 Documentation/devicetree/bindings/clock/renesas,r9a06g032-sysctrl.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/renesas,r9a06g032-sysctrl.yaml
+ delete mode 100644 Documentation/devicetree/bindings/clock/ti,sci-clk.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/ti,sci-clk.yaml
+ delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-mux-gpmux.txt
+ create mode 100644 Documentation/devicetree/bindings/i2c/i2c-mux-gpmux.yaml
+ delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.txt
+ create mode 100644 Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.yaml
+ delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-mux.txt
+ create mode 100644 Documentation/devicetree/bindings/i2c/i2c-mux.yaml
+ delete mode 100644 Documentation/devicetree/bindings/iio/multiplexer/io-channel-mux.txt
+ create mode 100644 Documentation/devicetree/bindings/iio/multiplexer/io-channel-mux.yaml
+ delete mode 100644 Documentation/devicetree/bindings/mailbox/omap-mailbox.txt
+ create mode 100644 Documentation/devicetree/bindings/mailbox/ti,omap-mailbox.yaml
+ delete mode 100644 Documentation/devicetree/bindings/memory-controllers/nvidia,tegra20-emc.txt
+ create mode 100644 Documentation/devicetree/bindings/memory-controllers/nvidia,tegra20-emc.yaml
+ delete mode 100644 Documentation/devicetree/bindings/mux/gpio-mux.txt
+ create mode 100644 Documentation/devicetree/bindings/mux/gpio-mux.yaml
+ create mode 100644 Documentation/devicetree/bindings/mux/mux-consumer.yaml
+ delete mode 100644 Documentation/devicetree/bindings/mux/mux-controller.txt
+ create mode 100644 Documentation/devicetree/bindings/mux/mux-controller.yaml
+ delete mode 100644 Documentation/devicetree/bindings/mux/reg-mux.txt
+ create mode 100644 Documentation/devicetree/bindings/mux/reg-mux.yaml
+ delete mode 100644 Documentation/devicetree/bindings/net/mdio-gpio.txt
+ create mode 100644 Documentation/devicetree/bindings/net/mdio-gpio.yaml
+ delete mode 100644 Documentation/devicetree/bindings/net/mdio-mux-gpio.txt
+ create mode 100644 Documentation/devicetree/bindings/net/mdio-mux-gpio.yaml
+ delete mode 100644 Documentation/devicetree/bindings/net/mdio-mux-mmioreg.txt
+ create mode 100644 Documentation/devicetree/bindings/net/mdio-mux-mmioreg.yaml
+ delete mode 100644 Documentation/devicetree/bindings/net/mdio-mux-multiplexer.txt
+ create mode 100644 Documentation/devicetree/bindings/net/mdio-mux-multiplexer.yaml
+ delete mode 100644 Documentation/devicetree/bindings/net/mdio-mux.txt
+ create mode 100644 Documentation/devicetree/bindings/net/mdio-mux.yaml
+ delete mode 100644 Documentation/devicetree/bindings/power/renesas,sysc-rmobile.txt
+ create mode 100644 Documentation/devicetree/bindings/power/renesas,sysc-rmobile.yaml
+ delete mode 100644 Documentation/devicetree/bindings/property-units.txt
+ delete mode 100644 Documentation/devicetree/bindings/pwm/brcm,iproc-pwm.txt
+ create mode 100644 Documentation/devicetree/bindings/pwm/brcm,iproc-pwm.yaml
+ delete mode 100644 Documentation/devicetree/bindings/reset/ti,sci-reset.txt
+ create mode 100644 Documentation/devicetree/bindings/reset/ti,sci-reset.yaml
+ delete mode 100644 Documentation/devicetree/bindings/rng/mtk-rng.txt
+ create mode 100644 Documentation/devicetree/bindings/rng/mtk-rng.yaml
+ create mode 100644 Documentation/devicetree/bindings/rtc/nxp,pcf8563.yaml
+ delete mode 100644 Documentation/devicetree/bindings/rtc/pcf8563.txt
+ delete mode 100644 Documentation/devicetree/bindings/soc/ti/sci-pm-domain.txt
+ create mode 100644 Documentation/devicetree/bindings/soc/ti/sci-pm-domain.yaml
+ create mode 100644 Documentation/devicetree/bindings/timer/arm,twd-timer.yaml
+ delete mode 100644 Documentation/devicetree/bindings/timer/arm,twd.txt
+ delete mode 100644 Documentation/devicetree/bindings/timer/renesas,tpu.txt
+ create mode 100644 Documentation/devicetree/bindings/timer/renesas,tpu.yaml
+ create mode 100644 Documentation/devicetree/bindings/watchdog/arm,twd-wdt.yaml
+Merging mailbox/mailbox-for-next (2335f556b3af dt-bindings: mailbox: qcom-ipcc: Add compatible for SC7280)
+$ git merge mailbox/mailbox-for-next
+Already up to date.
+Merging spi/for-next (e1cb4e6408f5 Merge remote-tracking branch 'spi/for-5.14' into spi-next)
+$ git merge spi/for-next
+Removing include/linux/platform_data/spi-ath79.h
+Removing Documentation/devicetree/bindings/spi/renesas,rzn1-spi.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/spi/renesas,rzn1-spi.txt | 11 -
+ .../devicetree/bindings/spi/snps,dw-apb-ssi.yaml | 6 +
+ Documentation/spi/pxa2xx.rst | 58 +--
+ drivers/spi/spi-altera-dfl.c | 4 +-
+ drivers/spi/spi-ath79.c | 9 +-
+ drivers/spi/spi-bcm2835.c | 204 ++++++-----
+ drivers/spi/spi-bcm2835aux.c | 2 +-
+ drivers/spi/spi-dw-mmio.c | 2 +-
+ drivers/spi/spi-geni-qcom.c | 4 +-
+ drivers/spi/spi-lm70llp.c | 2 +-
+ drivers/spi/spi-loopback-test.c | 2 +-
+ drivers/spi/spi-mpc512x-psc.c | 4 +-
+ drivers/spi/spi-mpc52xx-psc.c | 4 +-
+ drivers/spi/spi-mpc52xx.c | 2 +-
+ drivers/spi/spi-npcm-pspi.c | 2 +-
+ drivers/spi/spi-oc-tiny.c | 2 +-
+ drivers/spi/spi-omap-100k.c | 6 +-
+ drivers/spi/spi-omap-uwire.c | 4 +-
+ drivers/spi/spi-omap2-mcspi.c | 4 +-
+ drivers/spi/spi-pl022.c | 4 +-
+ drivers/spi/spi-ppc4xx.c | 10 +-
+ drivers/spi/spi-pxa2xx-dma.c | 41 +--
+ drivers/spi/spi-pxa2xx-pci.c | 11 +-
+ drivers/spi/spi-pxa2xx.c | 387 +++++++++------------
+ drivers/spi/spi-pxa2xx.h | 68 ++--
+ drivers/spi/spi-tegra114.c | 3 +-
+ drivers/spi/spi-tegra210-quad.c | 2 +-
+ drivers/spi/spi-topcliff-pch.c | 4 +-
+ drivers/spi/spi-uniphier.c | 2 +-
+ drivers/spi/spi.c | 49 ++-
+ drivers/spi/spidev.c | 2 +-
+ include/linux/platform_data/spi-ath79.h | 16 -
+ include/linux/pxa2xx_ssp.h | 51 ++-
+ include/linux/spi/pxa2xx_spi.h | 21 +-
+ include/trace/events/spi.h | 57 +++
+ sound/soc/pxa/pxa-ssp.c | 16 -
+ 36 files changed, 568 insertions(+), 508 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/spi/renesas,rzn1-spi.txt
+ delete mode 100644 include/linux/platform_data/spi-ath79.h
+Merging tip/auto-latest (81910a634d57 Merge branch 'efi/core')
+$ git merge tip/auto-latest
+Auto-merging scripts/Makefile.build
+Auto-merging samples/kprobes/kprobe_example.c
+CONFLICT (content): Merge conflict in samples/kprobes/kprobe_example.c
+Auto-merging net/core/filter.c
+Auto-merging lib/Kconfig.debug
+Auto-merging kernel/sysctl.c
+Auto-merging kernel/kprobes.c
+Auto-merging include/linux/kprobes.h
+Removing include/linux/atomic-fallback.h
+Removing arch/x86/entry/syscalls/syscalltbl.sh
+Removing arch/x86/entry/syscalls/syscallhdr.sh
+Auto-merging arch/x86/Makefile
+Auto-merging arch/s390/kernel/smp.c
+Auto-merging arch/riscv/kernel/probes/kprobes.c
+Removing arch/microblaze/include/asm/cmpxchg.h
+Removing arch/microblaze/include/asm/atomic.h
+Removing arch/h8300/include/asm/cmpxchg.h
+Removing arch/h8300/include/asm/atomic.h
+Auto-merging arch/arm64/kernel/smp.c
+Auto-merging MAINTAINERS
+Auto-merging Documentation/admin-guide/sysctl/kernel.rst
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Recorded preimage for 'samples/kprobes/kprobe_example.c'
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+Recorded resolution for 'samples/kprobes/kprobe_example.c'.
+[master 5efdb12aea27] Merge remote-tracking branch 'tip/auto-latest'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/accounting/delay-accounting.rst | 12 +-
+ Documentation/admin-guide/kernel-parameters.txt | 10 +-
+ Documentation/admin-guide/sysctl/kernel.rst | 7 +
+ Documentation/locking/lockdep-design.rst | 4 +-
+ Documentation/trace/kprobes.rst | 24 +-
+ Documentation/x86/buslock.rst | 126 +
+ Documentation/x86/elf_auxvec.rst | 53 +
+ Documentation/x86/index.rst | 2 +
+ MAINTAINERS | 6 +
+ arch/alpha/include/asm/atomic.h | 88 +-
+ arch/alpha/include/asm/cmpxchg.h | 12 +-
+ arch/alpha/kernel/smp.c | 1 -
+ arch/arc/include/asm/atomic.h | 60 +-
+ arch/arc/include/asm/cmpxchg.h | 10 +-
+ arch/arc/kernel/kprobes.c | 10 -
+ arch/arc/kernel/smp.c | 1 -
+ arch/arm/include/asm/atomic.h | 96 +-
+ arch/arm/include/asm/cmpxchg.h | 20 +-
+ arch/arm/include/asm/sync_bitops.h | 2 +-
+ arch/arm/kernel/smp.c | 1 -
+ arch/arm/probes/kprobes/core.c | 9 -
+ arch/arm64/include/asm/atomic.h | 2 -
+ arch/arm64/include/asm/preempt.h | 2 +-
+ arch/arm64/kernel/probes/kprobes.c | 10 -
+ arch/arm64/kernel/smp.c | 1 -
+ arch/arm64/kvm/Kconfig | 5 +-
+ arch/csky/include/asm/cmpxchg.h | 8 +-
+ arch/csky/kernel/probes/kprobes.c | 10 -
+ arch/csky/kernel/smp.c | 1 -
+ arch/h8300/include/asm/Kbuild | 1 +
+ arch/h8300/include/asm/atomic.h | 97 -
+ arch/h8300/include/asm/cmpxchg.h | 66 -
+ arch/hexagon/include/asm/atomic.h | 28 +-
+ arch/hexagon/include/asm/cmpxchg.h | 4 +-
+ arch/ia64/include/asm/atomic.h | 74 +-
+ arch/ia64/include/asm/cmpxchg.h | 16 +
+ arch/ia64/include/uapi/asm/cmpxchg.h | 10 +-
+ arch/ia64/kernel/kprobes.c | 9 -
+ arch/ia64/kernel/smpboot.c | 1 -
+ arch/m68k/include/asm/atomic.h | 60 +-
+ arch/m68k/include/asm/cmpxchg.h | 10 +-
+ arch/m68k/include/asm/mmu_context.h | 2 +-
+ arch/microblaze/include/asm/Kbuild | 1 +
+ arch/microblaze/include/asm/atomic.h | 28 -
+ arch/microblaze/include/asm/cmpxchg.h | 9 -
+ arch/mips/include/asm/atomic.h | 55 +-
+ arch/mips/include/asm/cmpxchg.h | 22 +-
+ arch/mips/kernel/cmpxchg.c | 4 +-
+ arch/mips/kernel/kprobes.c | 3 -
+ arch/mips/kernel/smp.c | 1 -
+ arch/openrisc/include/asm/atomic.h | 42 +-
+ arch/openrisc/include/asm/cmpxchg.h | 4 +-
+ arch/openrisc/kernel/smp.c | 2 -
+ arch/parisc/include/asm/atomic.h | 34 +-
+ arch/parisc/include/asm/cmpxchg.h | 14 +-
+ arch/parisc/kernel/smp.c | 1 -
+ arch/powerpc/include/asm/atomic.h | 140 +-
+ arch/powerpc/include/asm/cmpxchg.h | 30 +-
+ arch/powerpc/include/asm/qspinlock.h | 2 +-
+ arch/powerpc/kernel/kprobes.c | 10 -
+ arch/powerpc/kernel/smp.c | 1 -
+ arch/riscv/include/asm/atomic.h | 128 +-
+ arch/riscv/include/asm/cmpxchg.h | 34 +-
+ arch/riscv/kernel/probes/kprobes.c | 10 -
+ arch/riscv/kernel/smpboot.c | 1 -
+ arch/s390/include/asm/atomic.h | 2 -
+ arch/s390/include/asm/preempt.h | 4 +-
+ arch/s390/kernel/kprobes.c | 10 -
+ arch/s390/kernel/smp.c | 1 -
+ arch/sh/include/asm/atomic-grb.h | 6 +-
+ arch/sh/include/asm/atomic-irq.h | 6 +-
+ arch/sh/include/asm/atomic-llsc.h | 6 +-
+ arch/sh/include/asm/atomic.h | 8 +-
+ arch/sh/include/asm/cmpxchg.h | 4 +-
+ arch/sh/kernel/kprobes.c | 10 -
+ arch/sh/kernel/smp.c | 2 -
+ arch/sparc/include/asm/atomic_32.h | 38 +-
+ arch/sparc/include/asm/atomic_64.h | 36 +-
+ arch/sparc/include/asm/cmpxchg_32.h | 12 +-
+ arch/sparc/include/asm/cmpxchg_64.h | 12 +-
+ arch/sparc/kernel/kprobes.c | 10 -
+ arch/sparc/kernel/smp_32.c | 1 -
+ arch/sparc/kernel/smp_64.c | 3 -
+ arch/sparc/lib/atomic32.c | 24 +-
+ arch/sparc/lib/atomic_64.S | 42 +-
+ arch/um/kernel/skas/syscall.c | 2 +-
+ arch/x86/Makefile | 5 +-
+ arch/x86/boot/.gitignore | 1 +
+ arch/x86/boot/Makefile | 44 +-
+ arch/x86/boot/genimage.sh | 303 ++-
+ arch/x86/boot/mtools.conf.in | 3 +
+ arch/x86/entry/Makefile | 10 -
+ arch/x86/entry/calling.h | 45 +-
+ arch/x86/entry/common.c | 87 +-
+ arch/x86/entry/entry_64.S | 5 +-
+ arch/x86/entry/syscall_32.c | 20 +-
+ arch/x86/entry/syscall_64.c | 17 +-
+ arch/x86/entry/syscall_x32.c | 35 +-
+ arch/x86/entry/syscalls/Makefile | 38 +-
+ arch/x86/entry/syscalls/syscallhdr.sh | 35 -
+ arch/x86/entry/syscalls/syscalltbl.sh | 46 -
+ arch/x86/events/intel/uncore.c | 4 -
+ arch/x86/events/intel/uncore.h | 1 +
+ arch/x86/events/intel/uncore_snbep.c | 182 +-
+ arch/x86/events/rapl.c | 6 +-
+ arch/x86/hyperv/hv_init.c | 2 +-
+ arch/x86/include/asm/Kbuild | 1 +
+ arch/x86/include/asm/apic.h | 1 +
+ arch/x86/include/asm/asm.h | 27 +-
+ arch/x86/include/asm/atomic.h | 2 -
+ arch/x86/include/asm/barrier.h | 7 +-
+ arch/x86/include/asm/cpufeatures.h | 2 +-
+ arch/x86/include/asm/desc.h | 24 +-
+ arch/x86/include/asm/elf.h | 4 +
+ arch/x86/include/asm/fpu/signal.h | 2 +
+ arch/x86/include/asm/idtentry.h | 4 +-
+ arch/x86/include/asm/intel-family.h | 3 +-
+ arch/x86/include/asm/irq_vectors.h | 7 +-
+ arch/x86/include/asm/jump_label.h | 79 +-
+ arch/x86/include/asm/mce.h | 13 +-
+ arch/x86/include/asm/nops.h | 24 +-
+ arch/x86/include/asm/preempt.h | 2 +-
+ arch/x86/include/asm/processor.h | 1 +
+ arch/x86/include/asm/sgx.h | 2 +-
+ arch/x86/include/asm/sigframe.h | 2 +
+ arch/x86/include/asm/stackprotector.h | 2 +-
+ arch/x86/include/asm/syscall.h | 13 +-
+ arch/x86/include/asm/syscall_wrapper.h | 10 +-
+ arch/x86/include/asm/thermal.h | 4 +-
+ arch/x86/include/asm/unistd.h | 8 +-
+ arch/x86/include/uapi/asm/auxvec.h | 4 +-
+ arch/x86/include/uapi/asm/hwcap2.h | 6 +-
+ arch/x86/kernel/acpi/cstate.c | 3 +-
+ arch/x86/kernel/alternative.c | 2 +-
+ arch/x86/kernel/amd_nb.c | 3 +
+ arch/x86/kernel/apic/apic.c | 1 +
+ arch/x86/kernel/apic/vector.c | 20 +
+ arch/x86/kernel/cpu/amd.c | 4 +
+ arch/x86/kernel/cpu/common.c | 43 +-
+ arch/x86/kernel/cpu/hygon.c | 4 +
+ arch/x86/kernel/cpu/intel.c | 42 +-
+ arch/x86/kernel/cpu/mce/amd.c | 55 +-
+ arch/x86/kernel/cpu/mce/apei.c | 3 +-
+ arch/x86/kernel/fpu/signal.c | 19 +
+ arch/x86/kernel/head_64.S | 6 +-
+ arch/x86/kernel/idt.c | 45 +-
+ arch/x86/kernel/jump_label.c | 81 +-
+ arch/x86/kernel/kprobes/core.c | 12 +-
+ arch/x86/kernel/machine_kexec_32.c | 15 +-
+ arch/x86/kernel/machine_kexec_64.c | 33 +-
+ arch/x86/kernel/ptrace.c | 2 +-
+ arch/x86/kernel/reboot.c | 2 +-
+ arch/x86/kernel/setup.c | 9 +
+ arch/x86/kernel/signal.c | 92 +-
+ arch/x86/kernel/smpboot.c | 4 +-
+ arch/x86/kernel/traps.c | 9 +-
+ arch/x86/kvm/Kconfig | 5 +-
+ arch/x86/kvm/mmu/mmu.c | 2 +-
+ arch/x86/kvm/mmu/tdp_mmu.c | 2 +-
+ arch/x86/mm/fault.c | 4 +-
+ arch/x86/platform/efi/efi.c | 2 +-
+ arch/x86/realmode/Makefile | 1 -
+ arch/x86/um/sys_call_table_32.c | 14 +-
+ arch/x86/um/sys_call_table_64.c | 15 +-
+ arch/xtensa/include/asm/atomic.h | 26 +-
+ arch/xtensa/include/asm/cmpxchg.h | 14 +-
+ arch/xtensa/kernel/smp.c | 1 -
+ drivers/cpuidle/governors/menu.c | 6 +-
+ drivers/edac/mce_amd.c | 70 +
+ drivers/firmware/efi/apple-properties.c | 2 +-
+ drivers/firmware/efi/dev-path-parser.c | 49 +-
+ drivers/thermal/intel/therm_throt.c | 15 +-
+ fs/proc/loadavg.c | 2 +-
+ fs/proc/stat.c | 4 +-
+ include/asm-generic/atomic-instrumented.h | 498 +---
+ include/asm-generic/atomic.h | 118 +-
+ include/asm-generic/atomic64.h | 45 +-
+ include/asm-generic/cmpxchg-local.h | 4 +-
+ include/asm-generic/cmpxchg.h | 42 +-
+ include/asm-generic/preempt.h | 2 +-
+ include/linux/atomic-fallback.h | 2595 --------------------
+ include/linux/atomic.h | 4 -
+ include/linux/compiler.h | 22 +-
+ include/linux/delayacct.h | 22 +-
+ include/linux/entry-kvm.h | 3 +-
+ include/linux/instrumentation.h | 20 +-
+ include/linux/interrupt.h | 3 +
+ include/linux/irq.h | 2 +
+ include/linux/jump_label.h | 16 +-
+ include/linux/kprobes.h | 8 -
+ include/linux/kthread.h | 2 +
+ include/linux/lockdep_types.h | 2 +-
+ include/linux/pci_ids.h | 1 +
+ include/linux/sched.h | 21 +-
+ include/linux/sched/signal.h | 19 +-
+ include/linux/sched/stat.h | 16 +-
+ include/linux/sched_clock.h | 2 +-
+ include/linux/tick.h | 33 +-
+ include/uapi/linux/auxvec.h | 3 +
+ include/uapi/linux/prctl.h | 8 +
+ init/main.c | 17 +-
+ kernel/Kconfig.preempt | 20 +
+ kernel/cpu.c | 4 +-
+ kernel/delayacct.c | 71 +-
+ kernel/entry/common.c | 5 +-
+ kernel/events/core.c | 14 +-
+ kernel/events/hw_breakpoint.c | 2 +
+ kernel/events/uprobes.c | 1 +
+ kernel/fork.c | 8 +-
+ kernel/futex.c | 19 +-
+ kernel/irq/chip.c | 2 +-
+ kernel/irq/handle.c | 2 +-
+ kernel/irq/manage.c | 5 +
+ kernel/irq/settings.h | 12 +
+ kernel/jump_label.c | 12 +-
+ kernel/kprobes.c | 19 -
+ kernel/kthread.c | 30 +-
+ kernel/sched/Makefile | 1 +
+ kernel/sched/core.c | 973 +++++++-
+ kernel/sched/core_sched.c | 229 ++
+ kernel/sched/cpuacct.c | 12 +-
+ kernel/sched/deadline.c | 38 +-
+ kernel/sched/debug.c | 4 +-
+ kernel/sched/fair.c | 376 ++-
+ kernel/sched/idle.c | 13 +-
+ kernel/sched/isolation.c | 4 +-
+ kernel/sched/loadavg.c | 2 +-
+ kernel/sched/pelt.h | 2 +-
+ kernel/sched/rt.c | 31 +-
+ kernel/sched/sched.h | 433 +++-
+ kernel/sched/stats.h | 66 +-
+ kernel/sched/stop_task.c | 14 +-
+ kernel/sched/topology.c | 4 +-
+ kernel/smpboot.c | 1 -
+ kernel/sys.c | 5 +
+ kernel/sysctl.c | 12 +
+ kernel/time/Kconfig | 11 +-
+ kernel/time/clockevents.c | 16 +-
+ kernel/time/posix-cpu-timers.c | 4 +-
+ kernel/time/tick-broadcast.c | 143 +-
+ kernel/time/tick-common.c | 2 +-
+ kernel/time/tick-internal.h | 5 +-
+ kernel/time/tick-sched.c | 130 +-
+ kernel/time/timer_list.c | 10 +-
+ lib/Kconfig.debug | 1 -
+ lib/atomic64.c | 36 +-
+ lib/smp_processor_id.c | 6 +-
+ net/core/filter.c | 2 +-
+ net/sunrpc/xprtmultipath.c | 2 +-
+ samples/kprobes/kprobe_example.c | 15 -
+ scripts/Makefile.build | 5 +-
+ scripts/atomic/check-atomics.sh | 1 -
+ scripts/atomic/gen-atomic-instrumented.sh | 51 +-
+ scripts/atomic/gen-atomics.sh | 1 -
+ tools/arch/x86/include/asm/asm.h | 193 ++
+ tools/arch/x86/include/asm/irq_vectors.h | 7 +-
+ tools/arch/x86/include/asm/nops.h | 24 +-
+ tools/include/uapi/linux/prctl.h | 8 +
+ tools/objtool/arch/x86/include/arch/special.h | 1 +
+ tools/objtool/check.c | 38 +-
+ tools/objtool/elf.c | 113 +-
+ tools/objtool/include/objtool/elf.h | 17 +-
+ tools/objtool/include/objtool/objtool.h | 3 +
+ tools/objtool/include/objtool/special.h | 1 +
+ tools/objtool/special.c | 14 +
+ tools/testing/selftests/futex/functional/Makefile | 3 +-
+ .../futex/functional/futex_wait_timeout.c | 126 +-
+ tools/testing/selftests/sched/.gitignore | 1 +
+ tools/testing/selftests/sched/Makefile | 14 +
+ tools/testing/selftests/sched/config | 1 +
+ tools/testing/selftests/sched/cs_prctl_test.c | 338 +++
+ tools/testing/selftests/sigaltstack/sas.c | 20 +-
+ tools/testing/selftests/x86/Makefile | 2 +-
+ tools/testing/selftests/x86/sigaltstack.c | 128 +
+ tools/testing/selftests/x86/syscall_numbering.c | 491 +++-
+ 275 files changed, 5932 insertions(+), 5698 deletions(-)
+ create mode 100644 Documentation/x86/buslock.rst
+ create mode 100644 Documentation/x86/elf_auxvec.rst
+ delete mode 100644 arch/h8300/include/asm/atomic.h
+ delete mode 100644 arch/h8300/include/asm/cmpxchg.h
+ create mode 100644 arch/ia64/include/asm/cmpxchg.h
+ delete mode 100644 arch/microblaze/include/asm/atomic.h
+ delete mode 100644 arch/microblaze/include/asm/cmpxchg.h
+ delete mode 100644 arch/x86/entry/syscalls/syscallhdr.sh
+ delete mode 100644 arch/x86/entry/syscalls/syscalltbl.sh
+ delete mode 100644 include/linux/atomic-fallback.h
+ create mode 100644 kernel/sched/core_sched.c
+ create mode 100644 tools/arch/x86/include/asm/asm.h
+ create mode 100644 tools/testing/selftests/sched/.gitignore
+ create mode 100644 tools/testing/selftests/sched/Makefile
+ create mode 100644 tools/testing/selftests/sched/config
+ create mode 100644 tools/testing/selftests/sched/cs_prctl_test.c
+ create mode 100644 tools/testing/selftests/x86/sigaltstack.c
+Merging clockevents/timers/drivers/next (8120891105ba dt-bindings: timer: nuvoton,npcm7xx: Add wpcm450-timer)
+$ git merge clockevents/timers/drivers/next
+Already up to date.
+Merging edac/edac-for-next (e8049c4aa5d8 MAINTAINERS: Make Yazen Ghannam maintainer for EDAC-AMD64)
+$ git merge edac/edac-for-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 5 +++--
+ drivers/edac/aspeed_edac.c | 4 ++--
+ drivers/edac/thunderx_edac.c | 4 ++--
+ drivers/edac/ti_edac.c | 1 +
+ 4 files changed, 8 insertions(+), 6 deletions(-)
+Merging irqchip/irq/irqchip-next (fbb80d5ad400 irqchip: Remove redundant error printing)
+$ git merge irqchip/irq/irqchip-next
+Already up to date.
+Merging ftrace/for-next (eb01f5353bda tracing: Handle %.*s in trace_check_vprintf())
+$ git merge ftrace/for-next
+Already up to date.
+Merging rcu/rcu/next (c44a4c385913 docs: Fix a typo in Documentation/RCU/stallwarn.rst)
+$ git merge rcu/rcu/next
+Auto-merging mm/slub.c
+Auto-merging mm/slab_common.c
+Auto-merging lib/Kconfig.debug
+Auto-merging kernel/locking/lockdep.c
+Auto-merging init/main.c
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Merge made by the 'recursive' strategy.
+ .../Memory-Ordering/Tree-RCU-Memory-Ordering.rst | 6 +-
+ .../RCU/Design/Requirements/Requirements.rst | 8 +-
+ Documentation/RCU/checklist.rst | 24 +-
+ Documentation/RCU/rcu_dereference.rst | 6 +-
+ Documentation/RCU/stallwarn.rst | 10 +-
+ Documentation/admin-guide/kernel-parameters.rst | 5 +
+ Documentation/admin-guide/kernel-parameters.txt | 27 +
+ Documentation/dev-tools/kcsan.rst | 93 +-
+ .../litmus-tests/locking/DCL-broken.litmus | 55 +
+ .../litmus-tests/locking/DCL-fixed.litmus | 56 +
+ .../litmus-tests/locking/RM-broken.litmus | 42 +
+ Documentation/litmus-tests/locking/RM-fixed.litmus | 42 +
+ arch/x86/kernel/tsc.c | 4 +-
+ include/linux/clocksource.h | 8 +-
+ include/linux/rculist.h | 35 +-
+ include/linux/rcupdate.h | 86 +-
+ include/linux/rcutiny.h | 4 -
+ include/linux/rcutree.h | 1 -
+ include/linux/srcu.h | 6 +
+ include/linux/srcutree.h | 2 -
+ include/linux/timer.h | 2 -
+ include/trace/events/rcu.h | 1 +
+ init/main.c | 2 +
+ kernel/kcsan/core.c | 53 +-
+ kernel/kcsan/kcsan.h | 39 +-
+ kernel/kcsan/report.c | 169 +--
+ kernel/locking/lockdep.c | 6 +-
+ kernel/rcu/Kconfig.debug | 2 +-
+ kernel/rcu/rcu.h | 14 +-
+ kernel/rcu/rcutorture.c | 322 +++--
+ kernel/rcu/refscale.c | 144 +-
+ kernel/rcu/srcutree.c | 28 +-
+ kernel/rcu/sync.c | 4 +-
+ kernel/rcu/tasks.h | 94 +-
+ kernel/rcu/tiny.c | 1 -
+ kernel/rcu/tree.c | 422 +++---
+ kernel/rcu/tree.h | 16 +-
+ kernel/rcu/tree_nocb.h | 1496 +++++++++++++++++++
+ kernel/rcu/tree_plugin.h | 1527 +-------------------
+ kernel/rcu/tree_stall.h | 165 ++-
+ kernel/rcu/update.c | 8 +-
+ kernel/time/Makefile | 1 +
+ kernel/time/clocksource-wdtest.c | 202 +++
+ kernel/time/clocksource.c | 226 ++-
+ kernel/time/jiffies.c | 15 +-
+ kernel/time/timer.c | 14 -
+ lib/Kconfig.debug | 12 +
+ lib/bitmap.c | 9 +
+ lib/test_bitmap.c | 7 +
+ mm/oom_kill.c | 2 +-
+ mm/slab.h | 1 +
+ mm/slab_common.c | 12 +-
+ mm/slub.c | 8 +
+ mm/util.c | 2 +-
+ .../memory-model/Documentation/access-marking.txt | 152 +-
+ tools/memory-model/Documentation/explanation.txt | 2 +-
+ tools/memory-model/Documentation/locking.txt | 320 ++++
+ 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 +
+ tools/rcu/rcu-cbs.py | 46 +
+ .../testing/selftests/rcutorture/bin/kvm-again.sh | 33 +-
+ .../testing/selftests/rcutorture/bin/kvm-build.sh | 6 +-
+ .../selftests/rcutorture/bin/kvm-end-run-stats.sh | 40 +
+ .../selftests/rcutorture/bin/kvm-find-errors.sh | 2 +-
+ .../selftests/rcutorture/bin/kvm-recheck-rcu.sh | 2 +-
+ .../testing/selftests/rcutorture/bin/kvm-remote.sh | 249 ++++
+ tools/testing/selftests/rcutorture/bin/kvm.sh | 61 +-
+ tools/testing/selftests/rcutorture/bin/torture.sh | 35 +-
+ .../selftests/rcutorture/configs/rcu/BUSTED-BOOST | 17 +
+ .../rcutorture/configs/rcu/BUSTED-BOOST.boot | 8 +
+ .../selftests/rcutorture/configs/rcuscale/TREE | 2 +-
+ .../selftests/rcutorture/configs/rcuscale/TREE54 | 2 +-
+ .../rcutorture/configs/refscale/NOPREEMPT | 2 +-
+ .../selftests/rcutorture/configs/refscale/PREEMPT | 2 +-
+ .../rcutorture/formal/srcu-cbmc/src/locks.h | 2 +-
+ 89 files changed, 4575 insertions(+), 2442 deletions(-)
+ create mode 100644 Documentation/litmus-tests/locking/DCL-broken.litmus
+ create mode 100644 Documentation/litmus-tests/locking/DCL-fixed.litmus
+ create mode 100644 Documentation/litmus-tests/locking/RM-broken.litmus
+ create mode 100644 Documentation/litmus-tests/locking/RM-fixed.litmus
+ create mode 100644 kernel/rcu/tree_nocb.h
+ create mode 100644 kernel/time/clocksource-wdtest.c
+ create mode 100644 tools/memory-model/Documentation/locking.txt
+ 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 100644 tools/rcu/rcu-cbs.py
+ create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-end-run-stats.sh
+ create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-remote.sh
+ create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/BUSTED-BOOST
+ create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/BUSTED-BOOST.boot
+Merging kvm/next (a4345a7cecfb Merge tag 'kvmarm-fixes-5.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD)
+$ git merge kvm/next
+Already up to date.
+Merging kvm-arm/next (4fda98afcac9 Merge branch kvm-arm64/mmu/MMIO-block-mapping into kvmarm-master/next)
+$ git merge kvm-arm/next
+Merge made by the 'recursive' strategy.
+ arch/arm64/kvm/arch_timer.c | 162 ++++++++++---
+ arch/arm64/kvm/hyp/hyp-entry.S | 6 +-
+ arch/arm64/kvm/mmu.c | 99 ++++----
+ arch/arm64/kvm/vgic/vgic-init.c | 36 ++-
+ arch/arm64/kvm/vgic/vgic-v2.c | 19 +-
+ arch/arm64/kvm/vgic/vgic-v3.c | 19 +-
+ arch/arm64/kvm/vgic/vgic.c | 14 +-
+ drivers/irqchip/irq-apple-aic.c | 9 +
+ drivers/irqchip/irq-gic-common.c | 13 --
+ drivers/irqchip/irq-gic-common.h | 2 -
+ drivers/irqchip/irq-gic-v3.c | 6 +-
+ drivers/irqchip/irq-gic.c | 6 +-
+ include/kvm/arm_vgic.h | 41 +++-
+ include/linux/irqchip/arm-gic-common.h | 25 +--
+ include/linux/irqchip/arm-vgic-info.h | 45 ++++
+ tools/testing/selftests/kvm/.gitignore | 1 +
+ tools/testing/selftests/kvm/Makefile | 3 +-
+ .../selftests/kvm/aarch64/debug-exceptions.c | 250 +++++++++++++++++++++
+ .../selftests/kvm/include/aarch64/processor.h | 83 ++++++-
+ tools/testing/selftests/kvm/include/kvm_util.h | 23 +-
+ .../selftests/kvm/include/x86_64/processor.h | 4 +-
+ tools/testing/selftests/kvm/lib/aarch64/handlers.S | 124 ++++++++++
+ .../testing/selftests/kvm/lib/aarch64/processor.c | 131 +++++++++++
+ tools/testing/selftests/kvm/lib/x86_64/processor.c | 22 +-
+ tools/testing/selftests/kvm/x86_64/kvm_pv_test.c | 2 +-
+ tools/testing/selftests/kvm/x86_64/tsc_msrs_test.c | 9 -
+ .../selftests/kvm/x86_64/userspace_msr_exit_test.c | 8 +-
+ .../testing/selftests/kvm/x86_64/xapic_ipi_test.c | 2 +-
+ 28 files changed, 968 insertions(+), 196 deletions(-)
+ create mode 100644 include/linux/irqchip/arm-vgic-info.h
+ create mode 100644 tools/testing/selftests/kvm/aarch64/debug-exceptions.c
+ create mode 100644 tools/testing/selftests/kvm/lib/aarch64/handlers.S
+Merging kvm-ppc/kvm-ppc-next (72476aaa4691 KVM: PPC: Book3S HV: Fix host radix SLB optimisation with hash guests)
+$ git merge kvm-ppc/kvm-ppc-next
+Already up to date.
+Merging kvms390/next (44bada282190 KVM: s390: fix guarded storage control register handling)
+$ git merge kvms390/next
+Already up to date.
+Merging xen-tip/linux-next (c81d3d246025 xen-pciback: reconfigure also from backend watch handler)
+$ git merge xen-tip/linux-next
+Already up to date.
+Merging percpu/for-next (7b92d0f97d9b Merge branch 'for-5.14' into for-next)
+$ git merge percpu/for-next
+Merge made by the 'recursive' strategy.
+ mm/percpu-internal.h | 4 +
+ mm/percpu-km.c | 5 +
+ mm/percpu-stats.c | 12 ++-
+ mm/percpu-vm.c | 30 ++++++
+ mm/percpu.c | 261 +++++++++++++++++++++++++++++++++++++++++++--------
+ 5 files changed, 268 insertions(+), 44 deletions(-)
+Merging workqueues/for-next (940d71c6462e wq: handle VM suspension in stall detection)
+$ git merge workqueues/for-next
+Already up to date.
+Merging drivers-x86/for-next (4ed39d31efbd platform/x86: dell-privacy: Add support for Dell hardware privacy)
+$ git merge drivers-x86/for-next
+Auto-merging drivers/platform/x86/thinkpad_acpi.c
+Removing drivers/platform/x86/hp-wireless.c
+Auto-merging drivers/platform/surface/surface_aggregator_registry.c
+CONFLICT (content): Merge conflict in drivers/platform/surface/surface_aggregator_registry.c
+Auto-merging MAINTAINERS
+Resolved 'drivers/platform/surface/surface_aggregator_registry.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 1ec21843e8e9] Merge remote-tracking branch 'drivers-x86/for-next'
+$ git diff -M --stat --summary HEAD^..
+ .../ABI/testing/sysfs-platform-dell-privacy-wmi | 55 +++
+ MAINTAINERS | 11 +-
+ .../platform/surface/surface_aggregator_registry.c | 47 +--
+ drivers/platform/x86/Kconfig | 9 +-
+ drivers/platform/x86/Makefile | 2 +-
+ drivers/platform/x86/asus-nb-wmi.c | 77 ----
+ drivers/platform/x86/dell/Kconfig | 9 +
+ drivers/platform/x86/dell/Makefile | 2 +
+ drivers/platform/x86/dell/dcdbas.c | 3 +-
+ drivers/platform/x86/dell/dell-laptop.c | 13 +-
+ .../x86/dell/{dell-wmi.c => dell-wmi-base.c} | 14 +-
+ drivers/platform/x86/dell/dell-wmi-privacy.c | 391 +++++++++++++++++++++
+ drivers/platform/x86/dell/dell-wmi-privacy.h | 36 ++
+ .../x86/dell/dell-wmi-sysman/dell-wmi-sysman.h | 5 +-
+ .../x86/dell/dell-wmi-sysman/enum-attributes.c | 39 +-
+ .../x86/dell/dell-wmi-sysman/int-attributes.c | 16 +
+ .../x86/dell/dell-wmi-sysman/passobj-attributes.c | 6 +
+ .../x86/dell/dell-wmi-sysman/string-attributes.c | 16 +-
+ drivers/platform/x86/dell/dell-wmi-sysman/sysman.c | 3 +-
+ drivers/platform/x86/hp-wireless.c | 102 ------
+ drivers/platform/x86/ideapad-laptop.c | 12 +
+ drivers/platform/x86/intel_cht_int33fe_typec.c | 4 +-
+ drivers/platform/x86/samsung-laptop.c | 35 +-
+ drivers/platform/x86/thinkpad_acpi.c | 2 +-
+ drivers/platform/x86/toshiba_haps.c | 2 +-
+ drivers/platform/x86/wireless-hotkey.c | 103 ++++++
+ 26 files changed, 754 insertions(+), 260 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-platform-dell-privacy-wmi
+ rename drivers/platform/x86/dell/{dell-wmi.c => dell-wmi-base.c} (98%)
+ create mode 100644 drivers/platform/x86/dell/dell-wmi-privacy.c
+ create mode 100644 drivers/platform/x86/dell/dell-wmi-privacy.h
+ delete mode 100644 drivers/platform/x86/hp-wireless.c
+ create mode 100644 drivers/platform/x86/wireless-hotkey.c
+Merging chrome-platform/for-next (6efb943b8616 Linux 5.13-rc1)
+$ git merge chrome-platform/for-next
+Already up to date.
+Merging hsi/for-next (6efb943b8616 Linux 5.13-rc1)
+$ git merge hsi/for-next
+Already up to date.
+Merging leds/for-next (e90abb95bc71 leds: lm36274: Add missed property.h)
+$ git merge leds/for-next
+Merge made by the 'recursive' strategy.
+ drivers/leds/Kconfig | 2 +-
+ drivers/leds/blink/leds-lgm-sso.c | 48 +++++++++++++++-----------------------
+ drivers/leds/led-class.c | 6 +----
+ drivers/leds/leds-as3645a.c | 2 +-
+ drivers/leds/leds-bcm6328.c | 2 +-
+ drivers/leds/leds-blinkm.c | 5 ++--
+ drivers/leds/leds-el15203000.c | 37 ++++++++++++-----------------
+ drivers/leds/leds-gpio-register.c | 1 +
+ drivers/leds/leds-is31fl32xx.c | 3 ++-
+ drivers/leds/leds-lm3530.c | 2 +-
+ drivers/leds/leds-lm3532.c | 7 ++----
+ drivers/leds/leds-lm36274.c | 4 +++-
+ drivers/leds/leds-lm3692x.c | 26 ++++++++++-----------
+ drivers/leds/leds-lm3697.c | 12 ++++++----
+ drivers/leds/leds-lp3944.c | 6 ++---
+ drivers/leds/leds-lp50xx.c | 2 +-
+ drivers/leds/leds-lp8860.c | 16 ++++++-------
+ drivers/leds/leds-lt3593.c | 8 +++----
+ drivers/leds/leds-mlxcpld.c | 38 +++++++++++++++---------------
+ drivers/leds/leds-mlxreg.c | 3 ++-
+ drivers/leds/leds-pwm.c | 16 +++++++------
+ drivers/leds/leds-tlc591xx.c | 8 +++++--
+ drivers/leds/trigger/ledtrig-cpu.c | 2 +-
+ 23 files changed, 121 insertions(+), 135 deletions(-)
+Merging ipmi/for-next (2253042d86f5 ipmi/watchdog: Stop watchdog timer when the current action is 'none')
+$ git merge ipmi/for-next
+Merge made by the 'recursive' strategy.
+ drivers/char/ipmi/ipmi_watchdog.c | 22 ++++++++++++----------
+ 1 file changed, 12 insertions(+), 10 deletions(-)
+Merging driver-core/driver-core-next (92722bac5fe4 Merge 5.13-rc4 into driver-core-next)
+$ git merge driver-core/driver-core-next
+Auto-merging drivers/media/platform/exynos4-is/fimc-is.c
+Auto-merging drivers/base/property.c
+Merge made by the 'recursive' strategy.
+ Documentation/driver-api/auxiliary_bus.rst | 2 +-
+ Documentation/driver-api/driver-model/devres.rst | 1 -
+ Documentation/filesystems/debugfs.rst | 4 +-
+ drivers/base/attribute_container.c | 6 +-
+ drivers/base/component.c | 96 +++++++++++------------
+ drivers/base/core.c | 2 +-
+ drivers/base/node.c | 2 +-
+ drivers/base/platform.c | 20 -----
+ drivers/base/property.c | 16 ++--
+ drivers/dma/imx-sdma.c | 2 +-
+ drivers/gpu/drm/i915/gvt/kvmgt.c | 11 ++-
+ drivers/media/platform/exynos4-is/fimc-is.c | 2 +-
+ drivers/mfd/iqs62x.c | 2 +-
+ drivers/misc/lattice-ecp3-config.c | 2 +-
+ drivers/misc/sram.c | 6 +-
+ drivers/net/wireless/broadcom/b43/debugfs.c | 34 ++------
+ drivers/net/wireless/broadcom/b43/debugfs.h | 3 -
+ drivers/net/wireless/broadcom/b43legacy/debugfs.c | 29 ++-----
+ drivers/net/wireless/broadcom/b43legacy/debugfs.h | 3 -
+ drivers/net/wireless/ti/wlcore/main.c | 2 +-
+ drivers/platform/x86/dell/dell_rbu.c | 2 +-
+ drivers/remoteproc/remoteproc_core.c | 2 +-
+ drivers/scsi/lpfc/lpfc_init.c | 2 +-
+ drivers/scsi/snic/snic_debugfs.c | 23 +++---
+ drivers/scsi/snic/snic_trc.h | 3 -
+ drivers/tty/serial/ucc_uart.c | 2 +-
+ fs/debugfs/file.c | 38 +++------
+ include/linux/debugfs.h | 26 +++---
+ include/linux/export.h | 5 ++
+ include/linux/firmware.h | 4 +-
+ include/linux/platform_device.h | 3 -
+ lib/devres.c | 4 +-
+ lib/test_firmware.c | 10 +--
+ sound/soc/codecs/wm8958-dsp2.c | 6 +-
+ 34 files changed, 135 insertions(+), 240 deletions(-)
+Merging usb/usb-next (aa10fab0f859 Merge 5.13-rc4 into usb-next)
+$ git merge usb/usb-next
+Removing include/linux/usb/isp1760.h
+Auto-merging include/linux/device.h
+Auto-merging drivers/usb/musb/musb_core.c
+Auto-merging drivers/usb/cdns3/cdns3-gadget.c
+Auto-merging drivers/pci/probe.c
+Auto-merging drivers/base/core.c
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-bus-usb | 11 -
+ Documentation/ABI/testing/sysfs-devices-removable | 18 +
+ .../bindings/phy/allwinner,sun8i-h3-usb-phy.yaml | 4 +-
+ .../bindings/usb/allwinner,sun4i-a10-musb.yaml | 3 +
+ Documentation/devicetree/bindings/usb/dwc2.yaml | 1 +
+ .../devicetree/bindings/usb/nxp,isp1760.yaml | 69 ++
+ Documentation/driver-api/usb/error-codes.rst | 3 +
+ arch/arm/boot/dts/arm-realview-eb.dtsi | 2 +-
+ arch/arm/boot/dts/arm-realview-pb1176.dts | 2 +-
+ arch/arm/boot/dts/arm-realview-pb11mp.dts | 2 +-
+ arch/arm/boot/dts/arm-realview-pbx.dtsi | 2 +-
+ arch/arm/boot/dts/vexpress-v2m-rs1.dtsi | 2 +-
+ arch/arm/boot/dts/vexpress-v2m.dtsi | 2 +-
+ drivers/base/core.c | 28 +
+ drivers/pci/probe.c | 22 +
+ drivers/usb/atm/cxacru.c | 2 +-
+ drivers/usb/cdns3/cdns3-ep0.c | 6 +-
+ drivers/usb/cdns3/cdns3-gadget.c | 34 +-
+ drivers/usb/cdns3/cdns3-imx.c | 2 +-
+ drivers/usb/cdns3/cdns3-plat.c | 2 +-
+ drivers/usb/cdns3/cdns3-ti.c | 2 +-
+ drivers/usb/cdns3/cdnsp-gadget.c | 7 +-
+ drivers/usb/cdns3/core.c | 4 +-
+ drivers/usb/chipidea/ci.h | 2 -
+ drivers/usb/chipidea/core.c | 2 +-
+ drivers/usb/chipidea/debug.c | 34 +-
+ drivers/usb/chipidea/otg.c | 9 +-
+ drivers/usb/chipidea/udc.c | 2 +-
+ drivers/usb/common/ulpi.c | 2 +-
+ drivers/usb/common/usb-conn-gpio.c | 62 +-
+ drivers/usb/core/devio.c | 2 +-
+ drivers/usb/core/hcd.c | 130 +++
+ drivers/usb/core/hub.c | 34 +-
+ drivers/usb/core/quirks.c | 1 -
+ drivers/usb/core/sysfs.c | 24 -
+ drivers/usb/core/urb.c | 9 +
+ drivers/usb/dwc2/gadget.c | 14 +-
+ drivers/usb/dwc2/hcd_queue.c | 2 +-
+ drivers/usb/dwc2/params.c | 4 +-
+ drivers/usb/dwc2/pci.c | 2 +-
+ drivers/usb/dwc2/platform.c | 2 +-
+ drivers/usb/dwc3/drd.c | 1 -
+ drivers/usb/dwc3/dwc3-pci.c | 8 +-
+ drivers/usb/dwc3/trace.h | 2 -
+ drivers/usb/gadget/function/f_hid.c | 2 +-
+ drivers/usb/gadget/function/u_hid.h | 4 +-
+ drivers/usb/gadget/function/u_midi.h | 4 +-
+ drivers/usb/gadget/function/uvc_configfs.c | 5 -
+ drivers/usb/gadget/udc/bcm63xx_udc.c | 7 +-
+ drivers/usb/gadget/udc/fsl_qe_udc.c | 5 +
+ drivers/usb/gadget/udc/fsl_udc_core.c | 8 +-
+ drivers/usb/gadget/udc/lpc32xx_udc.c | 5 +-
+ drivers/usb/gadget/udc/mv_u3d_core.c | 2 +-
+ drivers/usb/gadget/udc/mv_udc_core.c | 2 +-
+ drivers/usb/gadget/udc/pxa25x_udc.c | 4 +-
+ drivers/usb/gadget/udc/pxa25x_udc.h | 4 -
+ drivers/usb/gadget/udc/pxa27x_udc.c | 6 +-
+ drivers/usb/gadget/udc/pxa27x_udc.h | 4 -
+ drivers/usb/gadget/udc/s3c-hsudc.c | 5 +-
+ drivers/usb/gadget/udc/s3c2410_udc.c | 9 +-
+ drivers/usb/gadget/udc/s3c2410_udc.h | 1 -
+ drivers/usb/gadget/udc/tegra-xudc.c | 30 +-
+ drivers/usb/gadget/udc/trace.c | 2 +-
+ drivers/usb/gadget/udc/trace.h | 2 +-
+ drivers/usb/gadget/udc/udc-xilinx.c | 4 +-
+ drivers/usb/host/ehci-fsl.c | 8 +-
+ drivers/usb/host/ehci-hcd.c | 4 +
+ drivers/usb/host/ehci-hub.c | 139 ---
+ drivers/usb/host/ehci-q.c | 2 +-
+ drivers/usb/host/fotg210-hcd.c | 5 +-
+ drivers/usb/host/fotg210.h | 3 -
+ drivers/usb/host/xhci-mtk-sch.c | 42 +-
+ drivers/usb/host/xhci-mtk.c | 2 -
+ drivers/usb/host/xhci-mtk.h | 8 +-
+ drivers/usb/isp1760/Kconfig | 5 +-
+ drivers/usb/isp1760/isp1760-core.c | 513 +++++++++-
+ drivers/usb/isp1760/isp1760-core.h | 44 +-
+ drivers/usb/isp1760/isp1760-hcd.c | 1021 ++++++++++++++------
+ drivers/usb/isp1760/isp1760-hcd.h | 57 +-
+ drivers/usb/isp1760/isp1760-if.c | 41 +-
+ drivers/usb/isp1760/isp1760-regs.h | 435 +++++----
+ drivers/usb/isp1760/isp1760-udc.c | 251 +++--
+ drivers/usb/isp1760/isp1760-udc.h | 13 +-
+ drivers/usb/musb/musb_core.c | 9 +
+ drivers/usb/musb/musb_gadget.c | 2 +-
+ drivers/usb/musb/musb_host.c | 18 +-
+ drivers/usb/musb/musb_host.h | 4 -
+ drivers/usb/musb/omap2430.c | 32 +
+ drivers/usb/phy/phy-isp1301-omap.c | 2 +-
+ drivers/usb/phy/phy-isp1301.c | 25 +-
+ drivers/usb/roles/class.c | 9 +
+ drivers/usb/typec/mux.c | 29 +-
+ drivers/usb/typec/mux.h | 6 +
+ drivers/usb/typec/tcpm/tcpci.c | 28 +
+ drivers/usb/typec/tcpm/tcpm.c | 58 +-
+ drivers/usb/typec/tcpm/wcove.c | 2 +-
+ drivers/usb/typec/ucsi/ucsi.c | 2 +-
+ include/linux/device.h | 37 +
+ include/linux/usb.h | 9 +-
+ include/linux/usb/composite.h | 2 +-
+ include/linux/usb/gadget.h | 2 +-
+ include/linux/usb/hcd.h | 17 +-
+ include/linux/usb/isp1760.h | 19 -
+ include/linux/usb/otg-fsm.h | 6 +-
+ include/linux/usb/otg.h | 2 +-
+ include/linux/usb/quirks.h | 2 +-
+ include/linux/usb/role.h | 6 +
+ include/linux/usb/serial.h | 2 +-
+ include/linux/usb/tcpm.h | 4 +
+ include/linux/usb/typec_dp.h | 2 +-
+ 110 files changed, 2417 insertions(+), 1205 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-devices-removable
+ create mode 100644 Documentation/devicetree/bindings/usb/nxp,isp1760.yaml
+ delete mode 100644 include/linux/usb/isp1760.h
+Merging usb-gadget/next (e49d033bddf5 Linux 5.12-rc6)
+$ git merge usb-gadget/next
+Already up to date.
+Merging usb-serial/usb-next (17cd3a106e97 USB: serial: drop irq-flags initialisations)
+$ git merge usb-serial/usb-next
+Auto-merging include/linux/usb/serial.h
+Auto-merging drivers/usb/serial/ti_usb_3410_5052.c
+Auto-merging drivers/usb/serial/quatech2.c
+Merge made by the 'recursive' strategy.
+ drivers/usb/serial/cyberjack.c | 4 +--
+ drivers/usb/serial/cypress_m8.c | 16 ++++++------
+ drivers/usb/serial/digi_acceleport.c | 46 +++++++++++++++++------------------
+ drivers/usb/serial/garmin_gps.c | 2 +-
+ drivers/usb/serial/generic.c | 12 ++++-----
+ drivers/usb/serial/io_edgeport.c | 39 ++++++-----------------------
+ drivers/usb/serial/io_ti.c | 12 ++++-----
+ drivers/usb/serial/ir-usb.c | 6 ++---
+ drivers/usb/serial/keyspan.c | 4 +--
+ drivers/usb/serial/kobil_sct.c | 4 +--
+ drivers/usb/serial/metro-usb.c | 12 ++++-----
+ drivers/usb/serial/mos7720.c | 29 ++++++----------------
+ drivers/usb/serial/mos7840.c | 17 +++++--------
+ drivers/usb/serial/opticon.c | 6 ++---
+ drivers/usb/serial/oti6858.c | 12 ++++-----
+ drivers/usb/serial/quatech2.c | 6 ++---
+ drivers/usb/serial/sierra.c | 8 +++---
+ drivers/usb/serial/ti_usb_3410_5052.c | 16 ++++++------
+ drivers/usb/serial/usb-wwan.h | 4 +--
+ drivers/usb/serial/usb_wwan.c | 12 ++++-----
+ include/linux/usb/serial.h | 8 +++---
+ 21 files changed, 116 insertions(+), 159 deletions(-)
+Merging usb-chipidea-next/for-usb-next (3496993d06ff doc: dt-binding: cdns,usb3: Add interrupt-names property under required)
+$ git merge usb-chipidea-next/for-usb-next
+Auto-merging drivers/usb/cdns3/cdns3-gadget.c
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/usb/cdns,usb3.yaml | 1 +
+ drivers/usb/cdns3/cdns3-gadget.c | 2 +-
+ drivers/usb/cdns3/cdnsp-mem.c | 5 ++---
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+Merging tty/tty-next (910cc9537302 Merge 5.13-rc4 into tty-next)
+$ git merge tty/tty-next
+Auto-merging net/bluetooth/rfcomm/tty.c
+Removing include/uapi/linux/n_r3964.h
+Removing include/linux/n_r3964.h
+Removing drivers/tty/n_r3964.c
+Auto-merging drivers/s390/char/sclp_vt220.c
+Auto-merging drivers/net/usb/hso.c
+Auto-merging drivers/net/hamradio/mkiss.c
+Auto-merging drivers/net/hamradio/6pack.c
+Auto-merging MAINTAINERS
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Merge made by the 'recursive' strategy.
+ Documentation/admin-guide/kernel-parameters.txt | 5 +
+ Documentation/devicetree/bindings/serial/8250.yaml | 2 +-
+ .../bindings/serial/amlogic,meson-uart.yaml | 5 +
+ .../bindings/serial/brcm,bcm7271-uart.yaml | 2 +-
+ .../devicetree/bindings/serial/ingenic,uart.yaml | 2 +-
+ .../devicetree/bindings/serial/pl011.yaml | 13 +-
+ .../bindings/serial/qca,ar9330-uart.yaml | 4 +-
+ .../bindings/serial/renesas,em-uart.yaml | 2 +-
+ .../devicetree/bindings/serial/renesas,scif.yaml | 4 +
+ .../devicetree/bindings/serial/samsung_uart.yaml | 2 +-
+ .../devicetree/bindings/serial/serial.yaml | 2 +
+ .../devicetree/bindings/serial/sifive-serial.yaml | 4 +-
+ .../bindings/serial/snps-dw-apb-uart.yaml | 4 +-
+ .../devicetree/bindings/serial/st,stm32-uart.yaml | 3 +-
+ Documentation/networking/caif/caif.rst | 4 +-
+ MAINTAINERS | 6 +-
+ arch/alpha/kernel/srmcons.c | 9 +-
+ arch/m68k/emu/nfcon.c | 2 +-
+ arch/parisc/kernel/pdc_cons.c | 8 +-
+ arch/powerpc/configs/ppc6xx_defconfig | 1 -
+ arch/um/drivers/line.c | 15 +-
+ arch/um/drivers/line.h | 5 +-
+ arch/um/drivers/ssl.c | 1 -
+ arch/um/drivers/stdio_console.c | 1 -
+ arch/xtensa/platforms/iss/console.c | 9 +-
+ drivers/accessibility/speakup/spk_ttyio.c | 9 +-
+ drivers/bluetooth/hci_ldisc.c | 12 +-
+ drivers/char/Kconfig | 13 -
+ drivers/char/pcmcia/synclink_cs.c | 16 +-
+ drivers/char/ttyprintk.c | 52 +-
+ drivers/input/serio/serport.c | 8 +-
+ drivers/ipack/devices/ipoctal.c | 4 +-
+ drivers/isdn/capi/capi.c | 40 +-
+ drivers/misc/bcm-vk/bcm_vk_tty.c | 2 +-
+ drivers/misc/ti-st/st_core.c | 30 +-
+ drivers/mmc/core/sdio_uart.c | 6 +-
+ drivers/net/caif/caif_serial.c | 13 +-
+ drivers/net/can/slcan.c | 10 +-
+ drivers/net/hamradio/6pack.c | 14 +-
+ drivers/net/hamradio/mkiss.c | 13 +-
+ drivers/net/ppp/ppp_async.c | 12 +-
+ drivers/net/ppp/ppp_synctty.c | 12 +-
+ drivers/net/slip/slip.c | 9 +-
+ drivers/net/usb/hso.c | 8 +-
+ drivers/pps/clients/pps-ldisc.c | 11 +-
+ drivers/s390/char/con3215.c | 4 +-
+ drivers/s390/char/sclp_rw.c | 4 +-
+ drivers/s390/char/sclp_rw.h | 2 +-
+ drivers/s390/char/sclp_tty.c | 9 +-
+ drivers/s390/char/sclp_vt220.c | 9 +-
+ drivers/s390/char/tty3270.c | 22 +-
+ drivers/staging/fwserial/fwserial.c | 14 +-
+ drivers/staging/gdm724x/gdm_tty.c | 2 +-
+ drivers/staging/greybus/uart.c | 6 +-
+ drivers/tty/Makefile | 1 -
+ drivers/tty/amiserial.c | 12 +-
+ drivers/tty/ehv_bytechan.c | 4 +-
+ drivers/tty/goldfish.c | 4 +-
+ drivers/tty/hvc/hvc_console.c | 8 +-
+ drivers/tty/hvc/hvc_iucv.c | 2 -
+ drivers/tty/hvc/hvcs.c | 4 +-
+ drivers/tty/hvc/hvsi.c | 6 +-
+ drivers/tty/ipwireless/tty.c | 4 +-
+ drivers/tty/mips_ejtag_fdc.c | 8 +-
+ drivers/tty/moxa.c | 22 +-
+ drivers/tty/mxser.c | 16 +-
+ drivers/tty/n_gsm.c | 34 +-
+ drivers/tty/n_hdlc.c | 18 +-
+ drivers/tty/n_null.c | 7 +-
+ drivers/tty/n_r3964.c | 1283 --------------------
+ drivers/tty/n_tty.c | 201 ++-
+ drivers/tty/nozomi.c | 26 +-
+ drivers/tty/pty.c | 89 +-
+ drivers/tty/serdev/core.c | 2 +-
+ drivers/tty/serial/8250/8250_aspeed_vuart.c | 54 +-
+ drivers/tty/serial/8250/8250_core.c | 27 +-
+ drivers/tty/serial/8250/8250_of.c | 4 +
+ drivers/tty/serial/8250/8250_omap.c | 2 +-
+ drivers/tty/serial/8250/serial_cs.c | 11 +-
+ drivers/tty/serial/Kconfig | 1 +
+ drivers/tty/serial/amba-pl011.c | 2 +-
+ drivers/tty/serial/arc_uart.c | 2 +-
+ drivers/tty/serial/atmel_serial.c | 2 +-
+ drivers/tty/serial/dz.c | 4 +-
+ drivers/tty/serial/fsl_lpuart.c | 135 +-
+ drivers/tty/serial/icom.c | 2 +-
+ drivers/tty/serial/imx.c | 2 +-
+ drivers/tty/serial/ip22zilog.c | 2 +-
+ drivers/tty/serial/kgdb_nmi.c | 4 +-
+ drivers/tty/serial/liteuart.c | 21 +
+ drivers/tty/serial/max310x.c | 40 +-
+ drivers/tty/serial/meson_uart.c | 8 +-
+ drivers/tty/serial/mux.c | 2 +-
+ drivers/tty/serial/omap-serial.c | 10 +-
+ drivers/tty/serial/pmac_zilog.c | 2 +-
+ drivers/tty/serial/qcom_geni_serial.c | 2 +-
+ drivers/tty/serial/samsung_tty.c | 3 +-
+ drivers/tty/serial/sb1250-duart.c | 2 +-
+ drivers/tty/serial/sc16is7xx.c | 26 +-
+ drivers/tty/serial/serial_core.c | 28 +-
+ drivers/tty/serial/serial_txx9.c | 2 +-
+ drivers/tty/serial/st-asc.c | 4 +-
+ drivers/tty/serial/stm32-usart.c | 2 +-
+ drivers/tty/serial/sunsab.c | 2 +-
+ drivers/tty/serial/sunsu.c | 2 +-
+ drivers/tty/serial/sunzilog.c | 2 +-
+ drivers/tty/serial/vr41xx_siu.c | 2 +-
+ drivers/tty/serial/xilinx_uartps.c | 10 +-
+ drivers/tty/synclink_gt.c | 18 +-
+ drivers/tty/tty_baudrate.c | 13 +-
+ drivers/tty/tty_buffer.c | 28 +-
+ drivers/tty/tty_io.c | 198 +--
+ drivers/tty/tty_ioctl.c | 51 +-
+ drivers/tty/tty_jobctrl.c | 88 +-
+ drivers/tty/tty_ldisc.c | 26 +-
+ drivers/tty/tty_port.c | 18 +-
+ drivers/tty/ttynull.c | 2 +-
+ drivers/tty/vcc.c | 8 +-
+ drivers/tty/vt/keyboard.c | 2 +-
+ drivers/tty/vt/selection.c | 20 +-
+ drivers/tty/vt/vt.c | 18 +-
+ drivers/usb/class/cdc-acm.c | 4 +-
+ drivers/usb/gadget/function/u_serial.c | 12 +-
+ drivers/usb/host/xhci-dbgtty.c | 8 +-
+ drivers/usb/serial/usb-serial.c | 4 +-
+ include/linux/n_r3964.h | 175 ---
+ include/linux/serial_8250.h | 2 +-
+ include/linux/serial_core.h | 5 +-
+ include/linux/tty.h | 75 +-
+ include/linux/tty_driver.h | 12 +-
+ include/linux/tty_flip.h | 2 +-
+ include/linux/tty_ldisc.h | 6 +-
+ include/uapi/linux/n_r3964.h | 99 --
+ net/bluetooth/rfcomm/tty.c | 4 +-
+ net/nfc/nci/uart.c | 7 +-
+ sound/soc/codecs/cx20442.c | 4 +-
+ sound/soc/ti/ams-delta.c | 11 +-
+ 137 files changed, 934 insertions(+), 2642 deletions(-)
+ delete mode 100644 drivers/tty/n_r3964.c
+ delete mode 100644 include/linux/n_r3964.h
+ delete mode 100644 include/uapi/linux/n_r3964.h
+Merging char-misc/char-misc-next (2d06954e2337 Merge 5.13-rc4 into char-misc-next)
+$ git merge char-misc/char-misc-next
+Auto-merging drivers/video/fbdev/Kconfig
+Auto-merging drivers/tty/vcc.c
+Auto-merging drivers/ipack/devices/ipoctal.c
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/stable/sysfs-driver-w1_ds2438 | 13 +
+ .../devicetree/bindings/misc/eeprom-93xx46.txt | 3 +
+ Documentation/w1/slaves/w1_ds2438.rst | 19 +-
+ arch/sparc/include/asm/vio.h | 2 +-
+ arch/sparc/kernel/ds.c | 6 -
+ arch/sparc/kernel/vio.c | 4 +-
+ drivers/block/sunvdc.c | 3 +-
+ drivers/char/hpet.c | 4 +-
+ drivers/char/hw_random/pseries-rng.c | 2 +-
+ drivers/char/pcmcia/cm4000_cs.c | 7 +-
+ drivers/char/pcmcia/cm4040_cs.c | 3 +-
+ drivers/char/pcmcia/scr24x_cs.c | 1 -
+ drivers/char/xillybus/Kconfig | 22 +-
+ drivers/char/xillybus/Makefile | 2 +
+ drivers/char/xillybus/xillybus.h | 10 +-
+ drivers/char/xillybus/xillybus_class.c | 263 +++
+ drivers/char/xillybus/xillybus_class.h | 30 +
+ drivers/char/xillybus/xillybus_core.c | 181 +-
+ drivers/char/xillybus/xillyusb.c | 2260 ++++++++++++++++++++
+ drivers/comedi/drivers/comedi_8254.c | 3 +-
+ drivers/comedi/drivers/comedi_isadma.c | 2 +-
+ drivers/comedi/drivers/ni_routes.c | 7 +-
+ drivers/comedi/drivers/ni_routes.h | 1 -
+ .../comedi/drivers/ni_routing/ni_device_routes.c | 1 -
+ .../comedi/drivers/ni_routing/ni_device_routes.h | 1 -
+ .../drivers/ni_routing/ni_device_routes/all.h | 1 -
+ .../ni_routing/ni_device_routes/pci-6070e.c | 1 -
+ .../drivers/ni_routing/ni_device_routes/pci-6220.c | 1 -
+ .../drivers/ni_routing/ni_device_routes/pci-6221.c | 1 -
+ .../drivers/ni_routing/ni_device_routes/pci-6229.c | 1 -
+ .../drivers/ni_routing/ni_device_routes/pci-6251.c | 1 -
+ .../drivers/ni_routing/ni_device_routes/pci-6254.c | 1 -
+ .../drivers/ni_routing/ni_device_routes/pci-6259.c | 1 -
+ .../drivers/ni_routing/ni_device_routes/pci-6534.c | 1 -
+ .../drivers/ni_routing/ni_device_routes/pci-6602.c | 1 -
+ .../drivers/ni_routing/ni_device_routes/pci-6713.c | 1 -
+ .../drivers/ni_routing/ni_device_routes/pci-6723.c | 1 -
+ .../drivers/ni_routing/ni_device_routes/pci-6733.c | 1 -
+ .../ni_routing/ni_device_routes/pxi-6030e.c | 1 -
+ .../drivers/ni_routing/ni_device_routes/pxi-6224.c | 1 -
+ .../drivers/ni_routing/ni_device_routes/pxi-6225.c | 1 -
+ .../drivers/ni_routing/ni_device_routes/pxi-6251.c | 1 -
+ .../drivers/ni_routing/ni_device_routes/pxi-6733.c | 1 -
+ .../ni_routing/ni_device_routes/pxie-6251.c | 1 -
+ .../ni_routing/ni_device_routes/pxie-6535.c | 1 -
+ .../ni_routing/ni_device_routes/pxie-6738.c | 1 -
+ .../comedi/drivers/ni_routing/ni_route_values.c | 1 -
+ .../comedi/drivers/ni_routing/ni_route_values.h | 1 -
+ .../drivers/ni_routing/ni_route_values/all.h | 1 -
+ .../drivers/ni_routing/ni_route_values/ni_660x.c | 1 -
+ .../ni_routing/ni_route_values/ni_eseries.c | 1 -
+ .../ni_routing/ni_route_values/ni_mseries.c | 1 -
+ .../drivers/ni_routing/tools/convert_c_to_py.c | 1 -
+ .../drivers/ni_routing/tools/convert_csv_to_c.py | 7 -
+ .../drivers/ni_routing/tools/convert_py_to_csv.py | 1 -
+ .../drivers/ni_routing/tools/csv_collection.py | 1 -
+ .../drivers/ni_routing/tools/make_blank_csv.py | 1 -
+ .../comedi/drivers/ni_routing/tools/ni_names.py | 1 -
+ drivers/comedi/drivers/ni_tio.c | 12 +-
+ drivers/comedi/drivers/tests/comedi_example_test.c | 1 -
+ drivers/comedi/drivers/tests/ni_routes_test.c | 1 -
+ drivers/comedi/drivers/tests/unittest.h | 1 -
+ drivers/firmware/stratix10-svc.c | 22 +-
+ drivers/ipack/carriers/tpci200.c | 9 +-
+ drivers/ipack/carriers/tpci200.h | 4 +-
+ drivers/ipack/devices/ipoctal.c | 4 +-
+ drivers/ipack/devices/ipoctal.h | 6 +-
+ drivers/misc/bcm-vk/bcm_vk_msg.c | 3 +-
+ drivers/misc/bcm-vk/bcm_vk_msg.h | 2 +-
+ drivers/misc/cardreader/alcor_pci.c | 8 +-
+ drivers/misc/cxl/file.c | 5 +-
+ drivers/misc/eeprom/ee1004.c | 217 +-
+ drivers/misc/eeprom/eeprom_93xx46.c | 90 +-
+ drivers/misc/ibmasm/module.c | 5 +-
+ drivers/misc/mei/main.c | 2 -
+ drivers/misc/pvpanic/pvpanic-mmio.c | 17 +-
+ drivers/misc/pvpanic/pvpanic-pci.c | 22 +-
+ drivers/misc/pvpanic/pvpanic.c | 30 +-
+ drivers/misc/pvpanic/pvpanic.h | 3 +-
+ drivers/misc/xilinx_sdfec.c | 3 -
+ drivers/net/ethernet/sun/ldmvsw.c | 4 +-
+ drivers/net/ethernet/sun/sunvnet.c | 3 +-
+ drivers/nvmem/sprd-efuse.c | 2 +-
+ drivers/parport/probe.c | 11 +-
+ drivers/tty/vcc.c | 4 +-
+ drivers/uio/Kconfig | 2 +-
+ drivers/uio/uio_aec.c | 2 +-
+ drivers/uio/uio_pci_generic.c | 32 +
+ drivers/video/fbdev/Kconfig | 1 -
+ drivers/w1/masters/ds2482.c | 94 +-
+ drivers/w1/slaves/w1_ds2438.c | 122 +-
+ drivers/w1/slaves/w1_therm.c | 5 +-
+ include/linux/eeprom_93xx46.h | 3 +
+ include/linux/sysfs.h | 6 +
+ lib/dynamic_debug.c | 6 +-
+ 95 files changed, 3079 insertions(+), 574 deletions(-)
+ create mode 100644 Documentation/ABI/stable/sysfs-driver-w1_ds2438
+ create mode 100644 drivers/char/xillybus/xillybus_class.c
+ create mode 100644 drivers/char/xillybus/xillybus_class.h
+ create mode 100644 drivers/char/xillybus/xillyusb.c
+Merging extcon/extcon-next (82d7c97beb5e dt-bindings: extcon: sm5502: Convert to DT schema)
+$ git merge extcon/extcon-next
+Removing Documentation/devicetree/bindings/extcon/extcon-sm5502.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/extcon/extcon-sm5502.txt | 21 ---------
+ .../bindings/extcon/siliconmitus,sm5502-muic.yaml | 50 ++++++++++++++++++++++
+ drivers/extcon/extcon-intel-mrfld.c | 9 ++++
+ drivers/extcon/extcon-max8997.c | 1 +
+ drivers/extcon/extcon-sm5502.c | 20 ++-------
+ 5 files changed, 64 insertions(+), 37 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/extcon/extcon-sm5502.txt
+ create mode 100644 Documentation/devicetree/bindings/extcon/siliconmitus,sm5502-muic.yaml
+Merging phy-next/next (f0afa235685e phy: phy-twl4030-usb: use DEVICE_ATTR_RO macro)
+$ git merge phy-next/next
+Removing Documentation/devicetree/bindings/phy/rockchip-usb-phy.txt
+Removing Documentation/devicetree/bindings/phy/rcar-gen3-phy-pcie.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/pci/qcom,pcie.txt | 24 ++
+ .../bindings/phy/mediatek,mt7621-pci-phy.yaml | 5 +
+ .../bindings/phy/phy-rockchip-inno-usb2.yaml | 1 +
+ .../devicetree/bindings/phy/phy-stm32-usbphyc.yaml | 11 +
+ .../devicetree/bindings/phy/qcom,qmp-phy.yaml | 27 ++
+ .../devicetree/bindings/phy/rcar-gen3-phy-pcie.txt | 24 --
+ .../bindings/phy/renesas,rcar-gen3-pcie-phy.yaml | 53 ++++
+ .../devicetree/bindings/phy/rockchip-usb-phy.txt | 52 ----
+ .../devicetree/bindings/phy/rockchip-usb-phy.yaml | 81 ++++++
+ drivers/phy/phy-core-mipi-dphy.c | 2 +-
+ drivers/phy/phy-core.c | 16 +-
+ drivers/phy/phy-xgene.c | 3 +-
+ drivers/phy/qualcomm/phy-qcom-qmp.c | 315 ++++++++++++++++++++-
+ drivers/phy/qualcomm/phy-qcom-qmp.h | 189 ++++++++++++-
+ drivers/phy/ralink/Kconfig | 4 +-
+ drivers/phy/ralink/phy-mt7621-pci.c | 37 ++-
+ drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 44 +++
+ drivers/phy/st/phy-stm32-usbphyc.c | 31 ++
+ drivers/phy/ti/phy-twl4030-usb.c | 6 +-
+ 19 files changed, 812 insertions(+), 113 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/phy/rcar-gen3-phy-pcie.txt
+ create mode 100644 Documentation/devicetree/bindings/phy/renesas,rcar-gen3-pcie-phy.yaml
+ delete mode 100644 Documentation/devicetree/bindings/phy/rockchip-usb-phy.txt
+ create mode 100644 Documentation/devicetree/bindings/phy/rockchip-usb-phy.yaml
+Merging soundwire/next (1ec9d2e7936c soundwire: cadence: remove the repeated declaration)
+$ git merge soundwire/next
+Auto-merging sound/soc/intel/boards/sof_sdw.c
+Merge made by the 'recursive' strategy.
+ drivers/soundwire/bus.c | 155 ++++++++++-------------
+ drivers/soundwire/cadence_master.c | 21 +--
+ drivers/soundwire/cadence_master.h | 3 -
+ drivers/soundwire/dmi-quirks.c | 2 +-
+ drivers/soundwire/generic_bandwidth_allocation.c | 14 +-
+ drivers/soundwire/slave.c | 4 +-
+ include/linux/soundwire/sdw.h | 3 +-
+ sound/soc/intel/boards/sof_sdw.c | 4 +-
+ 8 files changed, 86 insertions(+), 120 deletions(-)
+Merging thunderbolt/next (25335b30daf6 thunderbolt: Check for NVM authentication status after the operation started)
+$ git merge thunderbolt/next
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-bus-thunderbolt | 82 +++-
+ Documentation/admin-guide/thunderbolt.rst | 29 ++
+ drivers/thunderbolt/Makefile | 2 +-
+ drivers/thunderbolt/acpi.c | 206 +++++++++
+ drivers/thunderbolt/dma_port.c | 94 +---
+ drivers/thunderbolt/domain.c | 9 +-
+ drivers/thunderbolt/lc.c | 6 +-
+ drivers/thunderbolt/nvm.c | 95 +++++
+ drivers/thunderbolt/path.c | 4 +-
+ drivers/thunderbolt/quirks.c | 30 +-
+ drivers/thunderbolt/retimer.c | 108 +++--
+ drivers/thunderbolt/sb_regs.h | 2 +
+ drivers/thunderbolt/switch.c | 274 +++++++++---
+ drivers/thunderbolt/tb.c | 4 +-
+ drivers/thunderbolt/tb.h | 116 ++++-
+ drivers/thunderbolt/tb_regs.h | 4 +
+ drivers/thunderbolt/test.c | 545 ++++++++++++++++++++++++
+ drivers/thunderbolt/tunnel.c | 401 ++++++++++++++---
+ drivers/thunderbolt/tunnel.h | 2 +
+ drivers/thunderbolt/usb4.c | 438 ++++++++++++++-----
+ drivers/thunderbolt/usb4_port.c | 281 ++++++++++++
+ drivers/thunderbolt/xdomain.c | 10 +
+ 22 files changed, 2369 insertions(+), 373 deletions(-)
+ create mode 100644 drivers/thunderbolt/usb4_port.c
+Merging vfio/next (adaeb718d46f vfio/gvt: fix DRM_I915_GVT dependency on VFIO_MDEV)
+$ git merge vfio/next
+Already up to date.
+Merging staging/staging-next (cb37defbd17a Merge 5.13-rc4 into staging-next)
+$ git merge staging/staging-next
+Auto-merging drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
+Removing drivers/staging/rtl8723bs/hal/odm_debug.h
+Removing drivers/staging/rtl8723bs/hal/odm_debug.c
+Removing drivers/staging/rtl8723bs/hal/odm_PathDiv.h
+Removing drivers/staging/rtl8723bs/hal/odm_PathDiv.c
+Auto-merging drivers/staging/mt7621-dts/mt7621.dtsi
+Auto-merging drivers/staging/fwserial/fwserial.c
+Merge made by the 'recursive' strategy.
+ drivers/comedi/drivers/jr3_pci.c | 15 -
+ drivers/staging/android/ashmem.c | 1 +
+ drivers/staging/axis-fifo/axis-fifo.c | 18 +-
+ drivers/staging/emxx_udc/emxx_udc.c | 11 +-
+ drivers/staging/fbtft/TODO | 5 -
+ drivers/staging/fbtft/fb_agm1264k-fl.c | 30 +-
+ drivers/staging/fbtft/fb_bd663474.c | 4 -
+ drivers/staging/fbtft/fb_hx8347d.c | 29 +-
+ drivers/staging/fbtft/fb_ili9163.c | 4 -
+ drivers/staging/fbtft/fb_ili9320.c | 4 +-
+ drivers/staging/fbtft/fb_ili9325.c | 4 -
+ drivers/staging/fbtft/fb_ili9340.c | 1 -
+ drivers/staging/fbtft/fb_s6d1121.c | 4 -
+ drivers/staging/fbtft/fb_sh1106.c | 1 -
+ drivers/staging/fbtft/fb_ssd1289.c | 4 -
+ drivers/staging/fbtft/fb_ssd1325.c | 2 -
+ drivers/staging/fbtft/fb_ssd1331.c | 6 +-
+ drivers/staging/fbtft/fb_ssd1351.c | 1 -
+ drivers/staging/fbtft/fb_upd161704.c | 4 -
+ drivers/staging/fbtft/fb_watterott.c | 1 -
+ drivers/staging/fbtft/fbtft-bus.c | 3 +-
+ drivers/staging/fbtft/fbtft-core.c | 25 +-
+ drivers/staging/fbtft/fbtft-io.c | 12 +-
+ drivers/staging/fieldbus/anybuss/anybuss-client.h | 2 +-
+ drivers/staging/fieldbus/anybuss/hms-profinet.c | 3 +-
+ drivers/staging/fieldbus/anybuss/host.c | 8 +-
+ drivers/staging/fwserial/fwserial.c | 46 +-
+ drivers/staging/greybus/audio_topology.c | 4 +-
+ drivers/staging/greybus/gbphy.c | 4 +-
+ drivers/staging/greybus/spilib.c | 1 +
+ drivers/staging/iio/addac/adt7316.c | 12 +-
+ drivers/staging/iio/frequency/ad9834.c | 5 +-
+ drivers/staging/ks7010/ks_hostif.c | 14 +-
+ drivers/staging/most/dim2/dim2.c | 23 +-
+ drivers/staging/most/dim2/hal.c | 10 +-
+ drivers/staging/most/i2c/i2c.c | 12 +-
+ drivers/staging/most/net/net.c | 6 +-
+ drivers/staging/mt7621-dts/mt7621.dtsi | 56 +-
+ drivers/staging/mt7621-pci/pci-mt7621.c | 154 +--
+ drivers/staging/nvec/nvec.c | 7 +-
+ drivers/staging/octeon/ethernet-tx.c | 1 -
+ drivers/staging/qlge/qlge_main.c | 10 +-
+ drivers/staging/rtl8188eu/core/rtw_ap.c | 62 +-
+ drivers/staging/rtl8188eu/core/rtw_cmd.c | 13 +-
+ drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 2 +-
+ drivers/staging/rtl8188eu/core/rtw_ioctl_set.c | 10 +-
+ drivers/staging/rtl8188eu/core/rtw_led.c | 36 +-
+ drivers/staging/rtl8188eu/core/rtw_mlme.c | 45 +-
+ drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 112 +-
+ drivers/staging/rtl8188eu/core/rtw_recv.c | 8 +-
+ drivers/staging/rtl8188eu/core/rtw_security.c | 10 +-
+ drivers/staging/rtl8188eu/core/rtw_sta_mgt.c | 32 +-
+ drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 2 +-
+ drivers/staging/rtl8188eu/core/rtw_xmit.c | 58 +-
+ drivers/staging/rtl8188eu/hal/odm.c | 3 +-
+ drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c | 10 +-
+ drivers/staging/rtl8188eu/hal/rtl8188e_rxdesc.c | 2 +-
+ drivers/staging/rtl8188eu/hal/rtl8188eu_led.c | 4 +-
+ drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c | 8 +-
+ drivers/staging/rtl8188eu/include/odm_debug.h | 13 -
+ drivers/staging/rtl8188eu/include/rtw_android.h | 1 -
+ drivers/staging/rtl8188eu/include/rtw_cmd.h | 3 +-
+ drivers/staging/rtl8188eu/include/rtw_led.h | 2 +-
+ drivers/staging/rtl8188eu/include/rtw_mlme.h | 2 -
+ drivers/staging/rtl8188eu/include/rtw_mlme_ext.h | 1 -
+ drivers/staging/rtl8188eu/include/wifi.h | 36 -
+ drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 38 +-
+ drivers/staging/rtl8188eu/os_dep/mon.c | 6 +-
+ drivers/staging/rtl8188eu/os_dep/os_intfs.c | 11 +-
+ drivers/staging/rtl8188eu/os_dep/rtw_android.c | 2 +-
+ drivers/staging/rtl8188eu/os_dep/xmit_linux.c | 8 +-
+ drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c | 5 -
+ drivers/staging/rtl8192e/rtl8192e/rtl_cam.c | 12 +-
+ drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 4 +-
+ drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 2 +-
+ drivers/staging/rtl8192e/rtl819x_HTProc.c | 10 +-
+ drivers/staging/rtl8192e/rtllib.h | 2 -
+ drivers/staging/rtl8192e/rtllib_rx.c | 3 +-
+ drivers/staging/rtl8192e/rtllib_softmac.c | 1 -
+ drivers/staging/rtl8192e/rtllib_tx.c | 2 +-
+ drivers/staging/rtl8192e/rtllib_wx.c | 4 -
+ .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 25 +-
+ drivers/staging/rtl8192u/r8192U_core.c | 15 +-
+ drivers/staging/rtl8192u/r8192U_dm.c | 6 +-
+ drivers/staging/rtl8192u/r819xU_cmdpkt.c | 41 -
+ drivers/staging/rtl8192u/r819xU_phy.c | 48 +-
+ drivers/staging/rtl8712/rtl8712_recv.c | 5 +-
+ drivers/staging/rtl8712/rtl871x_mlme.c | 6 +-
+ drivers/staging/rtl8712/rtl871x_mp_ioctl.c | 31 +-
+ drivers/staging/rtl8712/rtl871x_mp_ioctl.h | 127 ---
+ drivers/staging/rtl8712/rtl871x_recv.c | 2 +-
+ drivers/staging/rtl8712/rtl871x_security.c | 12 +-
+ drivers/staging/rtl8712/rtl871x_sta_mgt.c | 1 -
+ drivers/staging/rtl8712/rtl871x_xmit.c | 1 -
+ drivers/staging/rtl8712/usb_intf.c | 1 -
+ drivers/staging/rtl8712/xmit_linux.c | 1 -
+ drivers/staging/rtl8723bs/Makefile | 2 -
+ drivers/staging/rtl8723bs/core/rtw_ap.c | 222 ++--
+ drivers/staging/rtl8723bs/core/rtw_cmd.c | 7 +-
+ drivers/staging/rtl8723bs/core/rtw_debug.c | 74 +-
+ drivers/staging/rtl8723bs/core/rtw_eeprom.c | 2 -
+ drivers/staging/rtl8723bs/core/rtw_efuse.c | 3 -
+ drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 6 +-
+ drivers/staging/rtl8723bs/core/rtw_io.c | 35 +-
+ drivers/staging/rtl8723bs/core/rtw_mlme.c | 91 +-
+ drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 89 +-
+ drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 2 -
+ drivers/staging/rtl8723bs/core/rtw_recv.c | 26 +-
+ drivers/staging/rtl8723bs/core/rtw_security.c | 672 +-----------
+ drivers/staging/rtl8723bs/core/rtw_sta_mgt.c | 41 +-
+ drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 165 +--
+ drivers/staging/rtl8723bs/core/rtw_xmit.c | 55 +-
+ drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c | 955 +++--------------
+ drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c | 502 +--------
+ drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h | 67 --
+ drivers/staging/rtl8723bs/hal/HalHWImg8723B_BB.c | 62 --
+ drivers/staging/rtl8723bs/hal/HalHWImg8723B_MAC.c | 49 -
+ drivers/staging/rtl8723bs/hal/HalHWImg8723B_RF.c | 63 --
+ drivers/staging/rtl8723bs/hal/HalPhyRf.c | 340 +-----
+ drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c | 195 +---
+ drivers/staging/rtl8723bs/hal/hal_btcoex.c | 171 ----
+ drivers/staging/rtl8723bs/hal/hal_com.c | 20 -
+ drivers/staging/rtl8723bs/hal/hal_intf.c | 3 -
+ drivers/staging/rtl8723bs/hal/odm.c | 53 +-
+ drivers/staging/rtl8723bs/hal/odm.h | 4 -
+ drivers/staging/rtl8723bs/hal/odm_CfoTracking.c | 107 --
+ drivers/staging/rtl8723bs/hal/odm_DIG.c | 320 ------
+ drivers/staging/rtl8723bs/hal/odm_EdcaTurboCheck.c | 18 -
+ drivers/staging/rtl8723bs/hal/odm_HWConfig.c | 38 -
+ drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.c | 36 +-
+ drivers/staging/rtl8723bs/hal/odm_PathDiv.c | 34 -
+ drivers/staging/rtl8723bs/hal/odm_PathDiv.h | 21 -
+ drivers/staging/rtl8723bs/hal/odm_RTL8723B.c | 1 -
+ drivers/staging/rtl8723bs/hal/odm_RegConfig8723B.c | 66 --
+ drivers/staging/rtl8723bs/hal/odm_debug.c | 44 -
+ drivers/staging/rtl8723bs/hal/odm_debug.h | 165 ---
+ drivers/staging/rtl8723bs/hal/odm_precomp.h | 2 -
+ drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 18 -
+ drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 24 +-
+ drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c | 10 +-
+ drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c | 2 +-
+ drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c | 7 +-
+ drivers/staging/rtl8723bs/hal/sdio_halinit.c | 15 +-
+ drivers/staging/rtl8723bs/hal/sdio_ops.c | 16 +-
+ drivers/staging/rtl8723bs/include/drv_types.h | 1 -
+ drivers/staging/rtl8723bs/include/hal_btcoex.h | 2 -
+ drivers/staging/rtl8723bs/include/osdep_intf.h | 2 +-
+ drivers/staging/rtl8723bs/include/rtw_ap.h | 2 +-
+ drivers/staging/rtl8723bs/include/rtw_debug.h | 170 +--
+ drivers/staging/rtl8723bs/include/rtw_io.h | 44 +-
+ drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 32 -
+ drivers/staging/rtl8723bs/include/rtw_mp.h | 1 -
+ drivers/staging/rtl8723bs/include/rtw_security.h | 104 +-
+ drivers/staging/rtl8723bs/include/rtw_xmit.h | 2 +-
+ drivers/staging/rtl8723bs/include/sdio_ops_linux.h | 2 -
+ drivers/staging/rtl8723bs/include/wifi.h | 2 +-
+ drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 21 +-
+ drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 53 +-
+ drivers/staging/rtl8723bs/os_dep/mlme_linux.c | 4 -
+ drivers/staging/rtl8723bs/os_dep/os_intfs.c | 11 +-
+ drivers/staging/rtl8723bs/os_dep/osdep_service.c | 4 -
+ drivers/staging/rtl8723bs/os_dep/recv_linux.c | 2 -
+ drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 6 +-
+ drivers/staging/rtl8723bs/os_dep/sdio_ops_linux.c | 28 -
+ drivers/staging/rtl8723bs/os_dep/xmit_linux.c | 10 +-
+ drivers/staging/sm750fb/sm750_accel.c | 4 +-
+ drivers/staging/unisys/visorinput/visorinput.c | 1 -
+ drivers/staging/vc04_services/Makefile | 2 +-
+ .../include/linux/raspberrypi/vchiq.h | 2 +-
+ .../interface/vchiq_arm/vchiq_2835_arm.c | 27 +-
+ .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 256 ++---
+ .../vc04_services/interface/vchiq_arm/vchiq_arm.h | 2 +-
+ .../interface/vchiq_arm/vchiq_connected.h | 8 -
+ .../vc04_services/interface/vchiq_arm/vchiq_core.c | 1082 ++++++++++----------
+ .../vc04_services/interface/vchiq_arm/vchiq_core.h | 14 +-
+ .../interface/vchiq_arm/vchiq_debugfs.c | 6 +-
+ .../staging/vc04_services/vchiq-mmal/mmal-vchiq.c | 2 +-
+ drivers/staging/vt6655/upc.h | 2 +-
+ drivers/staging/wlan-ng/cfg80211.c | 30 +-
+ drivers/staging/wlan-ng/p80211ioctl.h | 2 +-
+ drivers/staging/wlan-ng/p80211netdev.c | 6 +-
+ 181 files changed, 1793 insertions(+), 6550 deletions(-)
+ delete mode 100644 drivers/staging/rtl8723bs/hal/odm_PathDiv.c
+ delete mode 100644 drivers/staging/rtl8723bs/hal/odm_PathDiv.h
+ delete mode 100644 drivers/staging/rtl8723bs/hal/odm_debug.c
+ delete mode 100644 drivers/staging/rtl8723bs/hal/odm_debug.h
+Merging iio/togreg (301f7eba67df iio: adc: ti-adc161s626: Use devm managed functions for all of probe.)
+$ git merge iio/togreg
+Removing drivers/staging/iio/cdc/ad7746.h
+Auto-merging drivers/staging/iio/cdc/ad7746.c
+Auto-merging drivers/iio/gyro/fxas21002c_core.c
+Auto-merging drivers/iio/adc/ad7768-1.c
+Auto-merging drivers/iio/accel/bmc150-accel-core.c
+Auto-merging MAINTAINERS
+Auto-merging Documentation/devicetree/bindings/trivial-devices.yaml
+Removing Documentation/devicetree/bindings/iio/dac/ti-dac082s085.txt
+Removing Documentation/devicetree/bindings/iio/dac/ad5755.txt
+Removing Documentation/ABI/testing/sysfs-bus-iio-icm42600
+Auto-merging Documentation/ABI/testing/sysfs-bus-iio
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/obsolete/sysfs-bus-iio | 182 +++
+ Documentation/ABI/testing/sysfs-bus-iio | 125 +-
+ .../ABI/testing/sysfs-bus-iio-frequency-adf4371 | 33 -
+ .../ABI/testing/sysfs-bus-iio-health-afe440x | 10 +-
+ Documentation/ABI/testing/sysfs-bus-iio-icm42600 | 20 -
+ .../ABI/testing/sysfs-bus-iio-light-lm3533-als | 11 +-
+ .../bindings/iio/accel/adi,adis16201.yaml | 55 +
+ .../bindings/iio/accel/bosch,bma220.yaml | 50 +
+ .../devicetree/bindings/iio/accel/fsl,mma7455.yaml | 82 ++
+ .../bindings/iio/accel/kionix,kxcjk1013.yaml | 1 +
+ .../bindings/iio/accel/murata,sca3300.yaml | 44 +
+ .../bindings/iio/accel/nxp,fxls8962af.yaml | 80 ++
+ Documentation/devicetree/bindings/iio/adc/adc.yaml | 12 +
+ .../devicetree/bindings/iio/adc/adi,ad7298.yaml | 48 +
+ .../devicetree/bindings/iio/adc/adi,ad7476.yaml | 174 +++
+ .../devicetree/bindings/iio/adc/ti,tsc2046.yaml | 115 ++
+ .../bindings/iio/afe/current-sense-shunt.yaml | 4 +
+ .../devicetree/bindings/iio/cdc/adi,ad7746.yaml | 77 ++
+ .../bindings/iio/chemical/sensirion,sps30.yaml | 7 +-
+ .../devicetree/bindings/iio/dac/ad5755.txt | 124 --
+ .../devicetree/bindings/iio/dac/adi,ad5755.yaml | 169 +++
+ .../devicetree/bindings/iio/dac/ti,dac082s085.yaml | 72 ++
+ .../devicetree/bindings/iio/dac/ti-dac082s085.txt | 34 -
+ .../bindings/iio/light/amstaos,tsl2591.yaml | 50 +
+ .../devicetree/bindings/iio/st,st-sensors.yaml | 262 +++--
+ .../bindings/iio/temperature/ti,tmp117.yaml | 41 +
+ .../devicetree/bindings/trivial-devices.yaml | 10 +
+ MAINTAINERS | 17 +
+ drivers/iio/accel/Kconfig | 40 +
+ drivers/iio/accel/Makefile | 4 +
+ drivers/iio/accel/adxl372.c | 4 +-
+ drivers/iio/accel/bma180.c | 15 +-
+ drivers/iio/accel/bma220_spi.c | 10 +-
+ drivers/iio/accel/bma400_core.c | 2 +-
+ drivers/iio/accel/bmc150-accel-core.c | 13 +-
+ drivers/iio/accel/bmi088-accel-core.c | 27 +-
+ drivers/iio/accel/fxls8962af-core.c | 968 ++++++++++++++++
+ drivers/iio/accel/fxls8962af-i2c.c | 57 +
+ drivers/iio/accel/fxls8962af-spi.c | 57 +
+ drivers/iio/accel/fxls8962af.h | 22 +
+ drivers/iio/accel/hid-sensor-accel-3d.c | 13 +-
+ drivers/iio/accel/kxcjk-1013.c | 253 +++-
+ drivers/iio/accel/kxsd9.c | 2 +-
+ drivers/iio/accel/mma8452.c | 7 +-
+ drivers/iio/accel/mma9551.c | 1 -
+ drivers/iio/accel/mma9551_core.c | 4 +-
+ drivers/iio/accel/mma9553.c | 1 -
+ drivers/iio/accel/mxc4005.c | 12 +-
+ drivers/iio/accel/sca3300.c | 472 ++++++++
+ drivers/iio/accel/st_accel.h | 12 -
+ drivers/iio/accel/st_accel_core.c | 230 ++--
+ drivers/iio/accel/st_accel_i2c.c | 17 +-
+ drivers/iio/accel/st_accel_spi.c | 17 +-
+ drivers/iio/accel/stk8312.c | 27 +-
+ drivers/iio/accel/stk8ba50.c | 19 +-
+ drivers/iio/adc/Kconfig | 12 +
+ drivers/iio/adc/Makefile | 1 +
+ drivers/iio/adc/ad7298.c | 8 +
+ drivers/iio/adc/ad7476.c | 118 +-
+ drivers/iio/adc/ad7606.c | 3 +-
+ drivers/iio/adc/ad7766.c | 8 +-
+ drivers/iio/adc/ad7768-1.c | 3 +-
+ drivers/iio/adc/ad_sigma_delta.c | 2 +-
+ drivers/iio/adc/adi-axi-adc.c | 24 +-
+ drivers/iio/adc/at91-sama5d2_adc.c | 2 +-
+ drivers/iio/adc/at91_adc.c | 4 +-
+ drivers/iio/adc/dln2-adc.c | 3 +-
+ drivers/iio/adc/ep93xx_adc.c | 4 +-
+ drivers/iio/adc/exynos_adc.c | 2 +-
+ drivers/iio/adc/ina2xx-adc.c | 3 +-
+ drivers/iio/adc/max11100.c | 34 +-
+ drivers/iio/adc/max1118.c | 68 +-
+ drivers/iio/adc/mp2629_adc.c | 1 -
+ drivers/iio/adc/mt6360-adc.c | 1 -
+ drivers/iio/adc/mxs-lradc-adc.c | 2 +-
+ drivers/iio/adc/rcar-gyroadc.c | 15 +-
+ drivers/iio/adc/sc27xx_adc.c | 1 +
+ drivers/iio/adc/stm32-adc.c | 28 +-
+ drivers/iio/adc/stm32-dfsdm-core.c | 6 +-
+ drivers/iio/adc/ti-adc081c.c | 43 +-
+ drivers/iio/adc/ti-adc0832.c | 39 +-
+ drivers/iio/adc/ti-adc108s102.c | 45 +-
+ drivers/iio/adc/ti-adc161s626.c | 51 +-
+ drivers/iio/adc/ti-ads1015.c | 12 +-
+ drivers/iio/adc/ti-ads131e08.c | 3 +-
+ drivers/iio/adc/ti-tsc2046.c | 714 ++++++++++++
+ drivers/iio/adc/vf610_adc.c | 10 +-
+ drivers/iio/adc/xilinx-xadc-core.c | 2 +-
+ drivers/iio/afe/iio-rescale.c | 41 +-
+ drivers/iio/buffer/industrialio-buffer-dmaengine.c | 22 +-
+ drivers/iio/buffer/industrialio-hw-consumer.c | 25 +-
+ drivers/iio/buffer/industrialio-triggered-buffer.c | 23 +-
+ drivers/iio/chemical/Kconfig | 27 +-
+ drivers/iio/chemical/Makefile | 2 +
+ drivers/iio/chemical/atlas-sensor.c | 6 +-
+ drivers/iio/chemical/bme680_i2c.c | 8 -
+ drivers/iio/chemical/bme680_spi.c | 8 -
+ drivers/iio/chemical/ccs811.c | 2 +-
+ drivers/iio/chemical/scd30_core.c | 3 +-
+ drivers/iio/chemical/sgp30.c | 2 +-
+ drivers/iio/chemical/sps30.c | 275 +----
+ drivers/iio/chemical/sps30.h | 35 +
+ drivers/iio/chemical/sps30_i2c.c | 258 +++++
+ drivers/iio/chemical/sps30_serial.c | 431 +++++++
+ .../iio/common/hid-sensors/hid-sensor-trigger.c | 10 +-
+ drivers/iio/common/scmi_sensors/scmi_iio.c | 1 -
+ drivers/iio/dac/ad5766.c | 2 -
+ drivers/iio/dac/stm32-dac.c | 3 +-
+ drivers/iio/gyro/adis16136.c | 15 +-
+ drivers/iio/gyro/adis16260.c | 4 +-
+ drivers/iio/gyro/adxrs290.c | 2 +-
+ drivers/iio/gyro/bmg160_core.c | 17 +-
+ drivers/iio/gyro/fxas21002c_core.c | 13 +-
+ drivers/iio/gyro/itg3200_buffer.c | 2 +-
+ drivers/iio/gyro/itg3200_core.c | 3 +-
+ drivers/iio/gyro/mpu3050-core.c | 4 +-
+ drivers/iio/gyro/st_gyro.h | 12 -
+ drivers/iio/gyro/st_gyro_core.c | 53 +-
+ drivers/iio/gyro/st_gyro_i2c.c | 17 +-
+ drivers/iio/gyro/st_gyro_spi.c | 17 +-
+ drivers/iio/health/afe4403.c | 2 +-
+ drivers/iio/health/afe4404.c | 2 +-
+ drivers/iio/humidity/am2315.c | 25 +-
+ drivers/iio/humidity/hdc2010.c | 1 -
+ drivers/iio/imu/Kconfig | 1 +
+ drivers/iio/imu/Makefile | 1 +
+ drivers/iio/imu/adis16400.c | 18 +-
+ drivers/iio/imu/adis16475.c | 9 +-
+ drivers/iio/imu/adis16480.c | 160 ++-
+ drivers/iio/imu/adis_buffer.c | 27 +-
+ drivers/iio/imu/adis_trigger.c | 3 +-
+ drivers/iio/imu/bmi160/bmi160_core.c | 6 +-
+ drivers/iio/imu/inv_icm42600/inv_icm42600_core.c | 2 +-
+ drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 8 +-
+ drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c | 2 +-
+ drivers/iio/imu/kmx61.c | 7 +-
+ drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 8 +-
+ drivers/iio/imu/st_lsm9ds0/Kconfig | 28 +
+ drivers/iio/imu/st_lsm9ds0/Makefile | 5 +
+ drivers/iio/imu/st_lsm9ds0/st_lsm9ds0.h | 23 +
+ drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_core.c | 163 +++
+ drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_i2c.c | 84 ++
+ drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_spi.c | 83 ++
+ drivers/iio/industrialio-buffer.c | 13 +-
+ drivers/iio/industrialio-core.c | 126 +-
+ drivers/iio/industrialio-trigger.c | 37 +-
+ drivers/iio/industrialio-triggered-event.c | 2 +-
+ drivers/iio/inkern.c | 107 +-
+ drivers/iio/light/Kconfig | 11 +
+ drivers/iio/light/Makefile | 1 +
+ drivers/iio/light/acpi-als.c | 3 +-
+ drivers/iio/light/isl29028.c | 5 +-
+ drivers/iio/light/isl29125.c | 10 +-
+ drivers/iio/light/pa12203001.c | 4 +-
+ drivers/iio/light/rpr0521.c | 9 +-
+ drivers/iio/light/si1133.c | 18 +-
+ drivers/iio/light/si1145.c | 12 +-
+ drivers/iio/light/tcs3414.c | 10 +-
+ drivers/iio/light/tcs3472.c | 10 +-
+ drivers/iio/light/tsl2583.c | 13 +-
+ drivers/iio/light/tsl2591.c | 1225 ++++++++++++++++++++
+ drivers/iio/light/us5182d.c | 4 +-
+ drivers/iio/light/vcnl4000.c | 7 +-
+ drivers/iio/light/vcnl4035.c | 6 +-
+ drivers/iio/light/veml6030.c | 2 +-
+ drivers/iio/magnetometer/ak8974.c | 3 +-
+ drivers/iio/magnetometer/ak8975.c | 2 +-
+ drivers/iio/magnetometer/bmc150_magn.c | 26 +-
+ drivers/iio/magnetometer/hmc5843.h | 8 +-
+ drivers/iio/magnetometer/hmc5843_core.c | 7 +-
+ drivers/iio/magnetometer/rm3100-core.c | 2 +-
+ drivers/iio/magnetometer/st_magn.h | 4 -
+ drivers/iio/magnetometer/st_magn_core.c | 181 ++-
+ drivers/iio/magnetometer/st_magn_i2c.c | 14 +-
+ drivers/iio/magnetometer/st_magn_spi.c | 14 +-
+ drivers/iio/magnetometer/yamaha-yas530.c | 2 +-
+ .../iio/position/hid-sensor-custom-intel-hinge.c | 1 -
+ drivers/iio/potentiostat/lmp91000.c | 7 +-
+ drivers/iio/pressure/st_pressure.h | 4 -
+ drivers/iio/pressure/st_pressure_core.c | 15 +-
+ drivers/iio/pressure/st_pressure_i2c.c | 17 +-
+ drivers/iio/pressure/st_pressure_spi.c | 17 +-
+ drivers/iio/pressure/zpa2326.c | 3 +-
+ drivers/iio/proximity/as3935.c | 13 +-
+ drivers/iio/proximity/pulsedlight-lidar-lite-v2.c | 10 +-
+ drivers/iio/proximity/srf04.c | 8 +-
+ drivers/iio/proximity/srf08.c | 14 +-
+ drivers/iio/proximity/sx9310.c | 2 +-
+ drivers/iio/proximity/sx9500.c | 2 +-
+ drivers/iio/temperature/Kconfig | 10 +
+ drivers/iio/temperature/Makefile | 1 +
+ drivers/iio/temperature/mlx90614.c | 25 +-
+ drivers/iio/temperature/tmp117.c | 185 +++
+ drivers/iio/trigger/stm32-timer-trigger.c | 2 +-
+ drivers/staging/iio/cdc/ad7746.c | 56 +-
+ drivers/staging/iio/cdc/ad7746.h | 28 -
+ include/linux/iio/common/cros_ec_sensors_core.h | 2 +-
+ include/linux/iio/common/st_sensors.h | 36 +-
+ include/linux/iio/iio-opaque.h | 22 +-
+ include/linux/iio/iio.h | 32 +-
+ include/linux/iio/imu/adis.h | 2 +
+ include/linux/platform_data/st_sensors_pdata.h | 3 +-
+ 202 files changed, 8176 insertions(+), 1737 deletions(-)
+ create mode 100644 Documentation/ABI/obsolete/sysfs-bus-iio
+ delete mode 100644 Documentation/ABI/testing/sysfs-bus-iio-icm42600
+ create mode 100644 Documentation/devicetree/bindings/iio/accel/adi,adis16201.yaml
+ create mode 100644 Documentation/devicetree/bindings/iio/accel/bosch,bma220.yaml
+ create mode 100644 Documentation/devicetree/bindings/iio/accel/fsl,mma7455.yaml
+ create mode 100644 Documentation/devicetree/bindings/iio/accel/murata,sca3300.yaml
+ create mode 100644 Documentation/devicetree/bindings/iio/accel/nxp,fxls8962af.yaml
+ create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,ad7298.yaml
+ create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,ad7476.yaml
+ create mode 100644 Documentation/devicetree/bindings/iio/adc/ti,tsc2046.yaml
+ create mode 100644 Documentation/devicetree/bindings/iio/cdc/adi,ad7746.yaml
+ delete mode 100644 Documentation/devicetree/bindings/iio/dac/ad5755.txt
+ create mode 100644 Documentation/devicetree/bindings/iio/dac/adi,ad5755.yaml
+ create mode 100644 Documentation/devicetree/bindings/iio/dac/ti,dac082s085.yaml
+ delete mode 100644 Documentation/devicetree/bindings/iio/dac/ti-dac082s085.txt
+ create mode 100644 Documentation/devicetree/bindings/iio/light/amstaos,tsl2591.yaml
+ create mode 100644 Documentation/devicetree/bindings/iio/temperature/ti,tmp117.yaml
+ create mode 100644 drivers/iio/accel/fxls8962af-core.c
+ create mode 100644 drivers/iio/accel/fxls8962af-i2c.c
+ create mode 100644 drivers/iio/accel/fxls8962af-spi.c
+ create mode 100644 drivers/iio/accel/fxls8962af.h
+ create mode 100644 drivers/iio/accel/sca3300.c
+ create mode 100644 drivers/iio/adc/ti-tsc2046.c
+ create mode 100644 drivers/iio/chemical/sps30.h
+ create mode 100644 drivers/iio/chemical/sps30_i2c.c
+ create mode 100644 drivers/iio/chemical/sps30_serial.c
+ create mode 100644 drivers/iio/imu/st_lsm9ds0/Kconfig
+ create mode 100644 drivers/iio/imu/st_lsm9ds0/Makefile
+ create mode 100644 drivers/iio/imu/st_lsm9ds0/st_lsm9ds0.h
+ create mode 100644 drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_core.c
+ create mode 100644 drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_i2c.c
+ create mode 100644 drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_spi.c
+ create mode 100644 drivers/iio/light/tsl2591.c
+ create mode 100644 drivers/iio/temperature/tmp117.c
+ delete mode 100644 drivers/staging/iio/cdc/ad7746.h
+Merging mux/for-next (3516bd729358 Merge tag 's390-5.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux)
+$ git merge mux/for-next
+Already up to date.
+Merging icc/icc-next (46bdcac533cc interconnect: qcom: Add SC7280 interconnect provider driver)
+$ git merge icc/icc-next
+Auto-merging Documentation/devicetree/bindings/interconnect/qcom,rpmh.yaml
+Merge made by the 'recursive' strategy.
+ .../bindings/interconnect/qcom,rpmh.yaml | 12 +
+ drivers/interconnect/qcom/Kconfig | 9 +
+ drivers/interconnect/qcom/Makefile | 2 +
+ drivers/interconnect/qcom/sc7280.c | 1938 ++++++++++++++++++++
+ drivers/interconnect/qcom/sc7280.h | 154 ++
+ include/dt-bindings/interconnect/qcom,sc7280.h | 165 ++
+ 6 files changed, 2280 insertions(+)
+ create mode 100644 drivers/interconnect/qcom/sc7280.c
+ create mode 100644 drivers/interconnect/qcom/sc7280.h
+ create mode 100644 include/dt-bindings/interconnect/qcom,sc7280.h
+Merging dmaengine/next (340ad031887b dmaengine: ti: omap-dma: Skip pointless cpu_pm context restore on errors)
+$ git merge dmaengine/next
+Auto-merging drivers/dma/xilinx/xilinx_dpdma.c
+Auto-merging drivers/dma/idxd/init.c
+Removing Documentation/devicetree/bindings/dma/arm-pl08x.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/dma/arm-pl08x.txt | 59 ---------
+ .../devicetree/bindings/dma/arm-pl08x.yaml | 136 +++++++++++++++++++++
+ drivers/dma/fsl-qdma.c | 6 +-
+ drivers/dma/hsu/hsu.c | 3 +
+ drivers/dma/idxd/cdev.c | 2 -
+ drivers/dma/idxd/init.c | 3 +-
+ drivers/dma/ti/omap-dma.c | 3 +-
+ drivers/dma/xilinx/xilinx_dpdma.c | 38 ++++--
+ include/linux/dmaengine.h | 11 +-
+ 9 files changed, 178 insertions(+), 83 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/dma/arm-pl08x.txt
+ create mode 100644 Documentation/devicetree/bindings/dma/arm-pl08x.yaml
+Merging cgroup/for-next (6962681ee8c6 Merge branch 'for-5.13-fixes' into for-next)
+$ git merge cgroup/for-next
+Merge made by the 'recursive' strategy.
+ Documentation/admin-guide/cgroup-v2.rst | 15 ++
+ include/linux/cgroup-defs.h | 3 +
+ include/linux/cgroup.h | 18 --
+ kernel/cgroup/cgroup.c | 130 +++++++++--
+ tools/testing/selftests/cgroup/.gitignore | 3 +-
+ tools/testing/selftests/cgroup/Makefile | 2 +
+ tools/testing/selftests/cgroup/cgroup_util.c | 51 +++++
+ tools/testing/selftests/cgroup/cgroup_util.h | 2 +
+ tools/testing/selftests/cgroup/test_freezer.c | 57 -----
+ tools/testing/selftests/cgroup/test_kill.c | 297 ++++++++++++++++++++++++++
+ 10 files changed, 487 insertions(+), 91 deletions(-)
+ create mode 100644 tools/testing/selftests/cgroup/test_kill.c
+Merging scsi/for-next (17f23af37bb0 Merge branch 'fixes' into for-next)
+$ git merge scsi/for-next
+Auto-merging drivers/scsi/ufs/ufs-hisi.c
+Auto-merging drivers/scsi/lpfc/lpfc_init.c
+Auto-merging Documentation/ABI/testing/sysfs-driver-ufs
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-driver-ufs | 126 ++++
+ drivers/message/fusion/mptbase.c | 2 -
+ drivers/message/fusion/mptsas.c | 119 ++--
+ drivers/scsi/3w-9xxx.c | 72 ++-
+ drivers/scsi/3w-9xxx.h | 121 ++--
+ drivers/scsi/Kconfig | 2 +-
+ drivers/scsi/aacraid/aachba.c | 10 +-
+ drivers/scsi/aacraid/aacraid.h | 2 +-
+ drivers/scsi/arcmsr/arcmsr.h | 2 +-
+ drivers/scsi/arcmsr/arcmsr_hba.c | 19 +-
+ drivers/scsi/arm/fas216.c | 2 +-
+ drivers/scsi/be2iscsi/be_main.c | 2 -
+ drivers/scsi/bfa/bfa_defs_svc.h | 2 +-
+ drivers/scsi/bfa/bfa_svc.c | 8 +-
+ drivers/scsi/device_handler/scsi_dh_alua.c | 70 ++-
+ drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 12 +-
+ drivers/scsi/hosts.c | 5 +-
+ drivers/scsi/ibmvscsi/ibmvfc.c | 60 +-
+ drivers/scsi/ibmvscsi/ibmvfc.h | 3 +-
+ drivers/scsi/lpfc/lpfc.h | 2 +
+ drivers/scsi/lpfc/lpfc_attr.c | 11 +
+ drivers/scsi/lpfc/lpfc_crtn.h | 1 +
+ drivers/scsi/lpfc/lpfc_ct.c | 43 +-
+ drivers/scsi/lpfc/lpfc_debugfs.c | 11 +-
+ drivers/scsi/lpfc/lpfc_disc.h | 1 +
+ drivers/scsi/lpfc/lpfc_els.c | 299 +++++++++-
+ drivers/scsi/lpfc/lpfc_hbadisc.c | 81 ++-
+ drivers/scsi/lpfc/lpfc_init.c | 7 -
+ drivers/scsi/lpfc/lpfc_mbox.c | 3 +-
+ drivers/scsi/lpfc/lpfc_nportdisc.c | 40 +-
+ drivers/scsi/lpfc/lpfc_nvme.c | 14 +-
+ drivers/scsi/lpfc/lpfc_scsi.c | 45 +-
+ drivers/scsi/lpfc/lpfc_sli.c | 40 +-
+ drivers/scsi/lpfc/lpfc_sli.h | 3 +-
+ drivers/scsi/lpfc/lpfc_version.h | 2 +-
+ drivers/scsi/megaraid/megaraid_mbox.c | 2 -
+ drivers/scsi/megaraid/megaraid_sas_base.c | 4 +-
+ drivers/scsi/mpt3sas/mpt3sas_base.c | 348 +++++++----
+ drivers/scsi/mpt3sas/mpt3sas_base.h | 8 +
+ drivers/scsi/mpt3sas/mpt3sas_config.c | 18 +-
+ drivers/scsi/mpt3sas/mpt3sas_scsih.c | 174 +++++-
+ drivers/scsi/pmcraid.h | 4 +-
+ drivers/scsi/qedf/qedf_dbg.c | 3 +-
+ drivers/scsi/qedf/qedf_io.c | 5 -
+ drivers/scsi/qedf/qedf_main.c | 4 -
+ drivers/scsi/qla2xxx/qla_init.c | 2 -
+ drivers/scsi/qla4xxx/ql4_83xx.c | 3 +-
+ drivers/scsi/scsi_debug.c | 5 -
+ drivers/scsi/scsi_transport_fc.c | 2 +-
+ drivers/scsi/snic/snic_ctl.c | 5 +-
+ drivers/scsi/ufs/cdns-pltfrm.c | 2 +
+ drivers/scsi/ufs/tc-dwc-g210-pci.c | 2 +
+ drivers/scsi/ufs/ufs-debugfs.c | 6 +-
+ drivers/scsi/ufs/ufs-debugfs.h | 2 +-
+ drivers/scsi/ufs/ufs-exynos.c | 31 +-
+ drivers/scsi/ufs/ufs-exynos.h | 26 -
+ drivers/scsi/ufs/ufs-hisi.c | 4 +-
+ drivers/scsi/ufs/ufs-mediatek.c | 12 +-
+ drivers/scsi/ufs/ufs-qcom.c | 2 +
+ drivers/scsi/ufs/ufs-sysfs.c | 269 ++++++++-
+ drivers/scsi/ufs/ufs_bsg.c | 6 +-
+ drivers/scsi/ufs/ufshcd-pci.c | 36 +-
+ drivers/scsi/ufs/ufshcd.c | 790 ++++++++++++++++++-------
+ drivers/scsi/ufs/ufshcd.h | 74 ++-
+ drivers/target/iscsi/cxgbit/cxgbit_ddp.c | 19 +-
+ drivers/target/iscsi/cxgbit/cxgbit_target.c | 21 +-
+ drivers/target/iscsi/iscsi_target_nego.c | 11 +-
+ drivers/target/iscsi/iscsi_target_parameters.c | 4 +-
+ drivers/target/sbp/sbp_target.c | 1 -
+ drivers/target/target_core_configfs.c | 50 ++
+ drivers/target/target_core_device.c | 5 +
+ drivers/target/target_core_pr.h | 2 +-
+ drivers/target/target_core_spc.c | 83 ++-
+ drivers/target/target_core_user.c | 10 +-
+ drivers/target/target_core_xcopy.c | 17 +-
+ include/scsi/iscsi_proto.h | 2 +-
+ include/scsi/libfc.h | 6 +-
+ include/scsi/scsi.h | 54 +-
+ include/scsi/scsi_bsg_iscsi.h | 2 +-
+ include/scsi/scsi_proto.h | 12 +
+ include/scsi/sg.h | 2 +-
+ include/target/target_core_base.h | 1 +
+ include/trace/events/ufs.h | 20 +
+ 83 files changed, 2535 insertions(+), 878 deletions(-)
+Merging scsi-mkp/for-next (1ff28f229bc7 Merge branch '5.14/scsi-result' into 5.14/scsi-staging)
+$ git merge scsi-mkp/for-next
+Auto-merging drivers/target/target_core_iblock.c
+Auto-merging drivers/scsi/vmw_pvscsi.c
+Auto-merging drivers/scsi/ufs/ufshcd.c
+Auto-merging drivers/scsi/ufs/ufs-mediatek.c
+Auto-merging drivers/scsi/sd.c
+Auto-merging drivers/infiniband/ulp/srp/ib_srp.c
+Merge made by the 'recursive' strategy.
+ Documentation/scsi/scsi_mid_low_api.rst | 7 +-
+ block/bsg-lib.c | 2 +-
+ block/bsg.c | 4 +-
+ block/scsi_ioctl.c | 13 +-
+ drivers/ata/libata-scsi.c | 30 +-
+ drivers/infiniband/ulp/iser/iscsi_iser.c | 2 +
+ drivers/infiniband/ulp/srp/ib_srp.c | 2 +-
+ drivers/s390/scsi/zfcp_scsi.c | 5 +-
+ drivers/scsi/3w-9xxx.c | 2 +-
+ drivers/scsi/3w-xxxx.c | 6 +-
+ drivers/scsi/53c700.c | 6 +-
+ drivers/scsi/FlashPoint.c | 197 +-
+ drivers/scsi/Kconfig | 1 +
+ drivers/scsi/Makefile | 1 +
+ drivers/scsi/NCR5380.c | 10 +-
+ drivers/scsi/advansys.c | 4 -
+ drivers/scsi/aha152x.c | 33 +-
+ drivers/scsi/aic7xxx/aic79xx_osm.c | 19 +-
+ drivers/scsi/aic7xxx/aic7xxx_osm.c | 1 -
+ drivers/scsi/arcmsr/arcmsr_hba.c | 5 +-
+ drivers/scsi/arm/acornscsi.c | 46 +-
+ drivers/scsi/arm/fas216.c | 15 +-
+ drivers/scsi/be2iscsi/be_iscsi.c | 25 +-
+ drivers/scsi/be2iscsi/be_main.c | 5 +-
+ drivers/scsi/bnx2i/bnx2i_iscsi.c | 32 +-
+ drivers/scsi/ch.c | 5 +-
+ drivers/scsi/constants.c | 15 -
+ drivers/scsi/cxgbi/cxgb3i/cxgb3i.c | 1 +
+ drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 1 +
+ drivers/scsi/cxgbi/libcxgbi.c | 17 +-
+ drivers/scsi/cxlflash/superpipe.c | 3 +-
+ drivers/scsi/dc395x.c | 80 +-
+ drivers/scsi/device_handler/scsi_dh_alua.c | 8 +-
+ drivers/scsi/esas2r/atioctl.h | 2 +-
+ drivers/scsi/esas2r/esas2r_main.c | 2 +-
+ drivers/scsi/esp_scsi.c | 4 +-
+ drivers/scsi/fdomain.c | 22 +-
+ drivers/scsi/hptiop.c | 2 +-
+ drivers/scsi/ibmvscsi/ibmvscsi.c | 2 +-
+ drivers/scsi/isci/task.c | 4 +-
+ drivers/scsi/iscsi_tcp.c | 7 +
+ drivers/scsi/libiscsi.c | 234 +-
+ drivers/scsi/lpfc/lpfc_scsi.c | 54 +-
+ drivers/scsi/megaraid.c | 20 +-
+ drivers/scsi/megaraid/megaraid_mbox.c | 25 +-
+ drivers/scsi/megaraid/megaraid_sas.h | 16 +-
+ drivers/scsi/megaraid/megaraid_sas_base.c | 98 +-
+ drivers/scsi/megaraid/megaraid_sas_fp.c | 6 +-
+ drivers/scsi/megaraid/megaraid_sas_fusion.c | 21 +-
+ drivers/scsi/mesh.c | 9 +-
+ drivers/scsi/mpi3mr/Kconfig | 7 +
+ drivers/scsi/mpi3mr/Makefile | 4 +
+ drivers/scsi/mpi3mr/mpi/mpi30_cnfg.h | 1880 +++++++++++++
+ drivers/scsi/mpi3mr/mpi/mpi30_image.h | 216 ++
+ drivers/scsi/mpi3mr/mpi/mpi30_init.h | 159 ++
+ drivers/scsi/mpi3mr/mpi/mpi30_ioc.h | 1004 +++++++
+ drivers/scsi/mpi3mr/mpi/mpi30_sas.h | 33 +
+ drivers/scsi/mpi3mr/mpi/mpi30_transport.h | 463 +++
+ drivers/scsi/mpi3mr/mpi3mr.h | 900 ++++++
+ drivers/scsi/mpi3mr/mpi3mr_debug.h | 60 +
+ drivers/scsi/mpi3mr/mpi3mr_fw.c | 3956 ++++++++++++++++++++++++++
+ drivers/scsi/mpi3mr/mpi3mr_os.c | 4049 +++++++++++++++++++++++++++
+ drivers/scsi/mpt3sas/mpt3sas_base.c | 1 +
+ drivers/scsi/mpt3sas/mpt3sas_scsih.c | 15 +-
+ drivers/scsi/mvumi.c | 10 +-
+ drivers/scsi/myrb.c | 64 +-
+ drivers/scsi/myrs.c | 9 +-
+ drivers/scsi/nsp32.c | 419 +--
+ drivers/scsi/pcmcia/nsp_cs.c | 2 +-
+ drivers/scsi/ps3rom.c | 7 +-
+ drivers/scsi/qedi/qedi.h | 1 +
+ drivers/scsi/qedi/qedi_fw.c | 291 +-
+ drivers/scsi/qedi/qedi_gbl.h | 3 +-
+ drivers/scsi/qedi/qedi_iscsi.c | 96 +-
+ drivers/scsi/qedi/qedi_iscsi.h | 5 +-
+ drivers/scsi/qedi/qedi_main.c | 2 +-
+ drivers/scsi/qla2xxx/qla_isr.c | 15 +-
+ drivers/scsi/qla2xxx/qla_nvme.c | 2 +-
+ drivers/scsi/qla4xxx/ql4_os.c | 2 +
+ drivers/scsi/qlogicfas408.c | 138 +-
+ drivers/scsi/scsi.c | 11 +-
+ drivers/scsi/scsi_debug.c | 15 +-
+ drivers/scsi/scsi_error.c | 70 +-
+ drivers/scsi/scsi_ioctl.c | 7 +-
+ drivers/scsi/scsi_lib.c | 119 +-
+ drivers/scsi/scsi_logging.c | 10 +-
+ drivers/scsi/scsi_scan.c | 6 +-
+ drivers/scsi/scsi_transport_iscsi.c | 499 ++--
+ drivers/scsi/scsi_transport_sas.c | 9 +-
+ drivers/scsi/scsi_transport_spi.c | 2 +-
+ drivers/scsi/sd.c | 63 +-
+ drivers/scsi/sd_zbc.c | 3 +-
+ drivers/scsi/sg.c | 9 +-
+ drivers/scsi/smartpqi/smartpqi_init.c | 3 +-
+ drivers/scsi/sr.c | 4 +-
+ drivers/scsi/sr_ioctl.c | 6 +-
+ drivers/scsi/st.c | 8 +-
+ drivers/scsi/stex.c | 9 +-
+ drivers/scsi/sym53c8xx_2/sym_glue.c | 6 +-
+ drivers/scsi/ufs/ufs-mediatek.c | 3 +
+ drivers/scsi/ufs/ufshcd.c | 10 +-
+ drivers/scsi/ufs/ufshcd.h | 1 +
+ drivers/scsi/virtio_scsi.c | 5 +-
+ drivers/scsi/vmw_pvscsi.c | 6 -
+ drivers/scsi/wd33c93.c | 43 +-
+ drivers/scsi/xen-scsifront.c | 8 +-
+ drivers/target/loopback/tcm_loop.c | 1 -
+ drivers/target/target_core_alua.c | 6 +-
+ drivers/target/target_core_iblock.c | 2 +-
+ drivers/target/target_core_pr.c | 8 +-
+ drivers/target/target_core_pscsi.c | 2 +-
+ drivers/target/target_core_sbc.c | 10 +-
+ drivers/target/target_core_spc.c | 14 +-
+ drivers/target/target_core_xcopy.c | 2 +-
+ drivers/usb/storage/cypress_atacb.c | 4 +-
+ drivers/xen/xen-scsiback.c | 17 +-
+ include/scsi/libiscsi.h | 20 +-
+ include/scsi/scsi.h | 42 +-
+ include/scsi/scsi_cmnd.h | 38 +-
+ include/scsi/scsi_proto.h | 22 +-
+ include/scsi/scsi_transport_iscsi.h | 14 +-
+ include/scsi/sg.h | 33 +
+ include/trace/events/scsi.h | 48 +-
+ 123 files changed, 14519 insertions(+), 1643 deletions(-)
+ create mode 100644 drivers/scsi/mpi3mr/Kconfig
+ create mode 100644 drivers/scsi/mpi3mr/Makefile
+ create mode 100644 drivers/scsi/mpi3mr/mpi/mpi30_cnfg.h
+ create mode 100644 drivers/scsi/mpi3mr/mpi/mpi30_image.h
+ create mode 100644 drivers/scsi/mpi3mr/mpi/mpi30_init.h
+ create mode 100644 drivers/scsi/mpi3mr/mpi/mpi30_ioc.h
+ create mode 100644 drivers/scsi/mpi3mr/mpi/mpi30_sas.h
+ create mode 100644 drivers/scsi/mpi3mr/mpi/mpi30_transport.h
+ create mode 100644 drivers/scsi/mpi3mr/mpi3mr.h
+ create mode 100644 drivers/scsi/mpi3mr/mpi3mr_debug.h
+ create mode 100644 drivers/scsi/mpi3mr/mpi3mr_fw.c
+ create mode 100644 drivers/scsi/mpi3mr/mpi3mr_os.c
+Merging vhost/linux-next (7ff6e99e021c virtio_net: disable cb aggressively)
+$ git merge vhost/linux-next
+Auto-merging drivers/net/virtio_net.c
+Merge made by the 'recursive' strategy.
+ drivers/net/virtio_net.c | 35 +++++++++++++++++++++++++++++------
+ drivers/virtio/virtio_ring.c | 26 +++++++++++++++++++++++++-
+ 2 files changed, 54 insertions(+), 7 deletions(-)
+Merging rpmsg/for-next (c86976deb21c Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
+$ git merge rpmsg/for-next
+Auto-merging drivers/remoteproc/remoteproc_core.c
+Auto-merging MAINTAINERS
+Removing Documentation/devicetree/bindings/remoteproc/qcom,adsp.txt
+Merge made by the 'recursive' strategy.
+ .../hwlock/allwinner,sun6i-a31-hwspinlock.yaml | 45 ++
+ .../bindings/remoteproc/fsl,imx-rproc.yaml | 11 +-
+ .../devicetree/bindings/remoteproc/qcom,adsp.txt | 228 ---------
+ .../devicetree/bindings/remoteproc/qcom,adsp.yaml | 536 +++++++++++++++++++++
+ .../bindings/remoteproc/ti,k3-r5f-rproc.yaml | 31 +-
+ MAINTAINERS | 6 +
+ drivers/hwspinlock/Kconfig | 9 +
+ drivers/hwspinlock/Makefile | 1 +
+ drivers/hwspinlock/sun6i_hwspinlock.c | 210 ++++++++
+ drivers/remoteproc/imx_rproc.c | 196 ++++++--
+ drivers/remoteproc/remoteproc_core.c | 45 +-
+ drivers/remoteproc/remoteproc_elf_loader.c | 12 +-
+ drivers/remoteproc/remoteproc_virtio.c | 6 +-
+ drivers/remoteproc/stm32_rproc.c | 2 +-
+ drivers/remoteproc/ti_k3_r5_remoteproc.c | 151 ++++--
+ include/linux/remoteproc.h | 50 +-
+ 16 files changed, 1198 insertions(+), 341 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/hwlock/allwinner,sun6i-a31-hwspinlock.yaml
+ delete mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,adsp.txt
+ create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,adsp.yaml
+ create mode 100644 drivers/hwspinlock/sun6i_hwspinlock.c
+Merging gpio/for-next (7ac554888233 MAINTAINERS: Remove reference to non-existing file)
+$ git merge gpio/for-next
+Already up to date.
+Merging gpio-brgl/gpio/for-next (bd56b051c96b gpio: dwapb: Switch to use fwnode_irq_get())
+$ git merge gpio-brgl/gpio/for-next
+Auto-merging lib/bitmap.c
+Auto-merging drivers/gpio/gpio-xilinx.c
+Auto-merging drivers/gpio/gpio-tegra186.c
+Removing Documentation/devicetree/bindings/gpio/rockchip,rk3328-grf-gpio.txt
+Removing Documentation/devicetree/bindings/gpio/gpio-omap.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/gpio/gpio-omap.txt | 45 ---
+ .../bindings/gpio/rockchip,rk3328-grf-gpio.txt | 32 --
+ .../bindings/gpio/rockchip,rk3328-grf-gpio.yaml | 50 +++
+ .../devicetree/bindings/gpio/ti,omap-gpio.yaml | 108 ++++++
+ drivers/gpio/gpio-104-idio-16.c | 23 +-
+ drivers/gpio/gpio-adp5520.c | 18 +-
+ drivers/gpio/gpio-altera-a10sr.c | 11 +-
+ drivers/gpio/gpio-ath79.c | 9 +-
+ drivers/gpio/gpio-bd9571mwv.c | 11 +-
+ drivers/gpio/gpio-da9052.c | 11 +-
+ drivers/gpio/gpio-da9055.c | 11 +-
+ drivers/gpio/gpio-dwapb.c | 15 +-
+ drivers/gpio/gpio-logicvc.c | 4 +-
+ drivers/gpio/gpio-mockup.c | 9 +-
+ drivers/gpio/gpio-spear-spics.c | 12 +-
+ drivers/gpio/gpio-sprd.c | 10 +-
+ drivers/gpio/gpio-sta2x11.c | 10 +-
+ drivers/gpio/gpio-stmpe.c | 32 +-
+ drivers/gpio/gpio-tc3589x.c | 11 +-
+ drivers/gpio/gpio-tegra186.c | 14 +-
+ drivers/gpio/gpio-tps65218.c | 13 +-
+ drivers/gpio/gpio-tps6586x.c | 13 +-
+ drivers/gpio/gpio-tps65910.c | 12 +-
+ drivers/gpio/gpio-tps65912.c | 12 +-
+ drivers/gpio/gpio-tps68470.c | 12 +-
+ drivers/gpio/gpio-visconti.c | 10 +-
+ drivers/gpio/gpio-wm831x.c | 12 +-
+ drivers/gpio/gpio-wm8350.c | 12 +-
+ drivers/gpio/gpio-wm8994.c | 13 +-
+ drivers/gpio/gpio-xgene.c | 11 +-
+ drivers/gpio/gpio-xilinx.c | 383 +++++++++++----------
+ drivers/gpio/gpiolib-sysfs.c | 34 +-
+ drivers/gpio/gpiolib.c | 59 ++--
+ lib/bitmap.c | 5 +-
+ 34 files changed, 467 insertions(+), 580 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/gpio/gpio-omap.txt
+ delete mode 100644 Documentation/devicetree/bindings/gpio/rockchip,rk3328-grf-gpio.txt
+ create mode 100644 Documentation/devicetree/bindings/gpio/rockchip,rk3328-grf-gpio.yaml
+ create mode 100644 Documentation/devicetree/bindings/gpio/ti,omap-gpio.yaml
+Merging gpio-intel/for-next (2b71b66ac041 gpio: wcove: Split error handling for CTRL and IRQ registers)
+$ git merge gpio-intel/for-next
+Merge made by the 'recursive' strategy.
+ drivers/gpio/gpio-crystalcove.c | 10 +---------
+ drivers/gpio/gpio-wcove.c | 39 +++++++++++++++++++--------------------
+ 2 files changed, 20 insertions(+), 29 deletions(-)
+Merging pinctrl/for-next (2aefadc09b35 Merge branch 'devel' into for-next)
+$ git merge pinctrl/for-next
+Auto-merging include/linux/pinctrl/pinconf-generic.h
+CONFLICT (content): Merge conflict in include/linux/pinctrl/pinconf-generic.h
+Auto-merging MAINTAINERS
+Removing Documentation/devicetree/bindings/pinctrl/brcm,bcm4708-pinmux.txt
+Resolved 'include/linux/pinctrl/pinconf-generic.h' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master c2d31cb95a3f] Merge remote-tracking branch 'pinctrl/for-next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/pinctrl/apple,pinctrl.yaml | 106 ++
+ .../bindings/pinctrl/aspeed,ast2600-pinctrl.yaml | 10 +-
+ .../bindings/pinctrl/brcm,bcm4708-pinmux.txt | 55 -
+ .../bindings/pinctrl/brcm,ns-pinmux.yaml | 94 ++
+ .../devicetree/bindings/pinctrl/pinctrl-mt65xx.txt | 1 +
+ .../devicetree/bindings/pinctrl/qcom,pmic-gpio.txt | 2 +
+ .../devicetree/bindings/pinctrl/qcom,pmic-mpp.txt | 1 +
+ Documentation/driver-api/pin-control.rst | 2 +-
+ MAINTAINERS | 2 +
+ drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c | 4 +-
+ drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c | 28 +-
+ drivers/pinctrl/aspeed/pinctrl-aspeed.c | 3 +-
+ drivers/pinctrl/aspeed/pinmux-aspeed.c | 3 +-
+ drivers/pinctrl/aspeed/pinmux-aspeed.h | 9 +
+ drivers/pinctrl/bcm/pinctrl-bcm2835.c | 8 +-
+ drivers/pinctrl/bcm/pinctrl-iproc-gpio.c | 4 +-
+ drivers/pinctrl/mediatek/Kconfig | 6 +
+ drivers/pinctrl/mediatek/Makefile | 1 +
+ drivers/pinctrl/mediatek/pinctrl-mt2701.c | 3 +
+ drivers/pinctrl/mediatek/pinctrl-mt2712.c | 3 +
+ drivers/pinctrl/mediatek/pinctrl-mt6397.c | 3 +
+ drivers/pinctrl/mediatek/pinctrl-mt8127.c | 3 +
+ drivers/pinctrl/mediatek/pinctrl-mt8135.c | 3 +
+ drivers/pinctrl/mediatek/pinctrl-mt8167.c | 3 +
+ drivers/pinctrl/mediatek/pinctrl-mt8173.c | 3 +
+ drivers/pinctrl/mediatek/pinctrl-mt8365.c | 502 +++++++
+ drivers/pinctrl/mediatek/pinctrl-mt8516.c | 3 +
+ drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 17 +-
+ drivers/pinctrl/mediatek/pinctrl-mtk-common.h | 3 +
+ drivers/pinctrl/mediatek/pinctrl-mtk-mt8365.h | 1511 ++++++++++++++++++++
+ drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 4 +-
+ drivers/pinctrl/pinctrl-amd.c | 33 +-
+ drivers/pinctrl/pinctrl-at91.c | 14 +-
+ drivers/pinctrl/pinctrl-equilibrium.c | 1 +
+ drivers/pinctrl/pinctrl-ocelot.c | 4 +-
+ drivers/pinctrl/pinctrl-single.c | 2 +-
+ drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 1 +
+ drivers/pinctrl/qcom/pinctrl-spmi-mpp.c | 1 +
+ include/dt-bindings/pinctrl/apple.h | 13 +
+ include/dt-bindings/pinctrl/mt8365-pinfunc.h | 858 +++++++++++
+ include/linux/pinctrl/pinconf-generic.h | 20 +-
+ 41 files changed, 3238 insertions(+), 109 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/apple,pinctrl.yaml
+ delete mode 100644 Documentation/devicetree/bindings/pinctrl/brcm,bcm4708-pinmux.txt
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/brcm,ns-pinmux.yaml
+ create mode 100644 drivers/pinctrl/mediatek/pinctrl-mt8365.c
+ create mode 100644 drivers/pinctrl/mediatek/pinctrl-mtk-mt8365.h
+ create mode 100644 include/dt-bindings/pinctrl/apple.h
+ create mode 100644 include/dt-bindings/pinctrl/mt8365-pinfunc.h
+Merging pinctrl-intel/for-next (258435a1c818 pinctrl: tigerlake: Add Alder Lake-M ACPI ID)
+$ git merge pinctrl-intel/for-next
+Merge made by the 'recursive' strategy.
+ drivers/pinctrl/intel/pinctrl-tigerlake.c | 1 +
+ 1 file changed, 1 insertion(+)
+Merging pinctrl-renesas/renesas-pinctrl (85a242cdcd44 pinctrl: renesas: r8a77995: Add bias pinconf support)
+$ git merge pinctrl-renesas/renesas-pinctrl
+Merge made by the 'recursive' strategy.
+ drivers/pinctrl/renesas/pfc-r8a77470.c | 346 ++++++++++++++++++---
+ drivers/pinctrl/renesas/pfc-r8a7778.c | 3 -
+ drivers/pinctrl/renesas/pfc-r8a7790.c | 301 ++++++++++++++++++-
+ drivers/pinctrl/renesas/pfc-r8a7792.c | 533 ++++++++++++++++++++++++++++++++-
+ drivers/pinctrl/renesas/pfc-r8a7794.c | 360 +++++++++++++++++++++-
+ drivers/pinctrl/renesas/pfc-r8a77951.c | 4 +-
+ drivers/pinctrl/renesas/pfc-r8a7796.c | 10 +-
+ drivers/pinctrl/renesas/pfc-r8a77965.c | 79 ++---
+ drivers/pinctrl/renesas/pfc-r8a77970.c | 175 ++++++++++-
+ drivers/pinctrl/renesas/pfc-r8a77980.c | 209 ++++++++++++-
+ drivers/pinctrl/renesas/pfc-r8a77990.c | 16 +-
+ drivers/pinctrl/renesas/pfc-r8a77995.c | 246 ++++++++++++++-
+ 12 files changed, 2138 insertions(+), 144 deletions(-)
+Merging pinctrl-samsung/for-next (6efb943b8616 Linux 5.13-rc1)
+$ git merge pinctrl-samsung/for-next
+Already up to date.
+Merging pwm/for-next (98761ce4b91b pwm: spear: Implement .apply() callback)
+$ git merge pwm/for-next
+Merge made by the 'recursive' strategy.
+ drivers/pwm/core.c | 44 +++++++++++++-----------------------------
+ drivers/pwm/pwm-atmel-hlcdc.c | 2 --
+ drivers/pwm/pwm-atmel-tcb.c | 2 --
+ drivers/pwm/pwm-atmel.c | 2 --
+ drivers/pwm/pwm-bcm-iproc.c | 2 --
+ drivers/pwm/pwm-bcm-kona.c | 2 --
+ drivers/pwm/pwm-bcm2835.c | 2 --
+ drivers/pwm/pwm-berlin.c | 2 --
+ drivers/pwm/pwm-fsl-ftm.c | 2 --
+ drivers/pwm/pwm-hibvt.c | 2 --
+ drivers/pwm/pwm-imx-tpm.c | 2 --
+ drivers/pwm/pwm-imx27.c | 3 ---
+ drivers/pwm/pwm-jz4740.c | 2 --
+ drivers/pwm/pwm-lpc18xx-sct.c | 2 --
+ drivers/pwm/pwm-meson.c | 2 --
+ drivers/pwm/pwm-mxs.c | 2 --
+ drivers/pwm/pwm-omap-dmtimer.c | 2 --
+ drivers/pwm/pwm-renesas-tpu.c | 2 --
+ drivers/pwm/pwm-rockchip.c | 5 -----
+ drivers/pwm/pwm-samsung.c | 3 ---
+ drivers/pwm/pwm-sifive.c | 2 --
+ drivers/pwm/pwm-spear.c | 40 ++++++++++++++++++++++++++++++--------
+ drivers/pwm/pwm-stm32-lp.c | 2 --
+ drivers/pwm/pwm-stm32.c | 2 --
+ drivers/pwm/pwm-sun4i.c | 2 --
+ drivers/pwm/pwm-tiecap.c | 2 --
+ drivers/pwm/pwm-tiehrpwm.c | 2 --
+ drivers/pwm/pwm-visconti.c | 17 +++++++---------
+ drivers/pwm/pwm-vt8500.c | 2 --
+ 29 files changed, 52 insertions(+), 106 deletions(-)
+Merging userns/for-next (5e6b8a50a7ce cred: add missing return error code when set_cred_ucounts() failed)
+$ git merge userns/for-next
+Auto-merging tools/testing/selftests/Makefile
+Auto-merging mm/shmem.c
+Auto-merging mm/mmap.c
+Auto-merging mm/mlock.c
+Auto-merging kernel/user_namespace.c
+Auto-merging kernel/ucount.c
+CONFLICT (content): Merge conflict in kernel/ucount.c
+Auto-merging kernel/sys.c
+Auto-merging kernel/signal.c
+CONFLICT (content): Merge conflict in kernel/signal.c
+Auto-merging kernel/fork.c
+Auto-merging kernel/exit.c
+Auto-merging kernel/cred.c
+Auto-merging ipc/mqueue.c
+Auto-merging include/linux/user_namespace.h
+CONFLICT (content): Merge conflict in include/linux/user_namespace.h
+Auto-merging include/linux/sched/user.h
+CONFLICT (content): Merge conflict in include/linux/sched/user.h
+Auto-merging include/linux/mm.h
+Auto-merging include/linux/hugetlb.h
+Auto-merging include/linux/cred.h
+Auto-merging fs/proc/array.c
+Auto-merging fs/hugetlbfs/inode.c
+Resolved 'include/linux/sched/user.h' using previous resolution.
+Resolved 'include/linux/user_namespace.h' using previous resolution.
+Resolved 'kernel/signal.c' using previous resolution.
+Resolved 'kernel/ucount.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 676b0f7b56e6] Merge remote-tracking branch 'userns/for-next'
+$ git diff -M --stat --summary HEAD^..
+ fs/exec.c | 6 +-
+ fs/hugetlbfs/inode.c | 16 +-
+ fs/proc/array.c | 2 +-
+ include/linux/cred.h | 4 +
+ include/linux/hugetlb.h | 4 +-
+ include/linux/mm.h | 4 +-
+ include/linux/sched/user.h | 7 -
+ include/linux/shmem_fs.h | 2 +-
+ include/linux/signal_types.h | 4 +-
+ include/linux/user_namespace.h | 31 +++-
+ ipc/mqueue.c | 40 ++---
+ ipc/shm.c | 26 ++--
+ kernel/cred.c | 51 ++++++-
+ kernel/exit.c | 2 +-
+ kernel/fork.c | 18 ++-
+ kernel/signal.c | 25 ++--
+ kernel/sys.c | 14 +-
+ kernel/ucount.c | 116 +++++++++++----
+ kernel/user.c | 3 -
+ kernel/user_namespace.c | 9 +-
+ mm/memfd.c | 4 +-
+ mm/mlock.c | 22 ++-
+ mm/mmap.c | 4 +-
+ mm/shmem.c | 10 +-
+ tools/testing/selftests/Makefile | 1 +
+ tools/testing/selftests/rlimits/.gitignore | 2 +
+ tools/testing/selftests/rlimits/Makefile | 6 +
+ tools/testing/selftests/rlimits/config | 1 +
+ .../testing/selftests/rlimits/rlimits-per-userns.c | 161 +++++++++++++++++++++
+ 29 files changed, 468 insertions(+), 127 deletions(-)
+ create mode 100644 tools/testing/selftests/rlimits/.gitignore
+ create mode 100644 tools/testing/selftests/rlimits/Makefile
+ create mode 100644 tools/testing/selftests/rlimits/config
+ create mode 100644 tools/testing/selftests/rlimits/rlimits-per-userns.c
+Merging ktest/for-next (170f4869e662 ktest.pl: Fix the logic for truncating the size of the log file for email)
+$ git merge ktest/for-next
+Already up to date.
+Merging kselftest/next (d07f6ca923ea Linux 5.13-rc2)
+$ git merge kselftest/next
+Already up to date.
+Merging livepatching/for-next (c150bbbb1731 Merge branch 'for-5.13/signal' into for-next)
+$ git merge livepatching/for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging coresight/next (1efbcec2ef8c coresight: cti: Reduce scope for the variable “cs_fwnode” in cti_plat_create_connection())
+$ git merge coresight/next
+Merge made by the 'recursive' strategy.
+Merging rtc/rtc-next (bcae59d0d45b rtc: imxdi: add wakeup support)
+$ git merge rtc/rtc-next
+Removing Documentation/devicetree/bindings/rtc/faraday,ftrtc010.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/rtc/faraday,ftrtc010.txt | 28 ----------
+ .../devicetree/bindings/rtc/faraday,ftrtc010.yaml | 59 ++++++++++++++++++++++
+ .../devicetree/bindings/rtc/rtc-m41t80.txt | 9 ++++
+ drivers/rtc/Kconfig | 3 +-
+ drivers/rtc/proc.c | 4 +-
+ drivers/rtc/rtc-efi.c | 1 -
+ drivers/rtc/rtc-imxdi.c | 4 ++
+ drivers/rtc/rtc-m41t80.c | 12 +++++
+ drivers/rtc/rtc-mxc_v2.c | 1 +
+ 9 files changed, 89 insertions(+), 32 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/rtc/faraday,ftrtc010.txt
+ create mode 100644 Documentation/devicetree/bindings/rtc/faraday,ftrtc010.yaml
+Merging nvdimm/libnvdimm-for-next (30c10d32152d Merge branch 'for-5.12/cxl' into libnvdimm-for-next)
+$ git merge nvdimm/libnvdimm-for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging at24/at24/for-next (6efb943b8616 Linux 5.13-rc1)
+$ git merge at24/at24/for-next
+Already up to date.
+Merging ntb/ntb-next (5c8fe583cce5 Linux 5.11-rc1)
+$ git merge ntb/ntb-next
+Already up to date.
+Merging seccomp/for-next/seccomp (fe092fc9f14b selftests/seccomp: Flush benchmark output)
+$ git merge seccomp/for-next/seccomp
+Auto-merging tools/testing/selftests/seccomp/seccomp_bpf.c
+Auto-merging kernel/seccomp.c
+CONFLICT (content): Merge conflict in kernel/seccomp.c
+Resolved 'kernel/seccomp.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master edd0fbb9eeed] Merge remote-tracking branch 'seccomp/for-next/seccomp'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/userspace-api/seccomp_filter.rst | 12 +++++
+ include/uapi/linux/seccomp.h | 1 +
+ kernel/seccomp.c | 51 +++++++++++++++++++---
+ .../testing/selftests/seccomp/seccomp_benchmark.c | 2 +
+ tools/testing/selftests/seccomp/seccomp_bpf.c | 51 ++++++++++++++++++++--
+ 5 files changed, 107 insertions(+), 10 deletions(-)
+Merging kspp/for-next/kspp (bf02572fb113 Merge branch 'for-next/orphans' into for-next/kspp)
+$ git merge kspp/for-next/kspp
+Auto-merging include/linux/mm.h
+Auto-merging include/linux/compiler.h
+Auto-merging arch/x86/boot/Makefile
+Auto-merging arch/arm64/include/asm/memory.h
+Auto-merging Makefile
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/dev-tools/index.rst | 1 +
+ Documentation/dev-tools/pgo.rst | 127 +++++++++++
+ MAINTAINERS | 25 +++
+ Makefile | 3 +
+ arch/Kconfig | 1 +
+ arch/arm/include/asm/cpuidle.h | 5 +-
+ arch/arm64/include/asm/compiler.h | 16 ++
+ arch/arm64/include/asm/memory.h | 16 --
+ arch/x86/Kconfig | 1 +
+ arch/x86/boot/Makefile | 1 +
+ arch/x86/boot/compressed/Makefile | 1 +
+ arch/x86/crypto/Makefile | 3 +
+ arch/x86/entry/vdso/Makefile | 1 +
+ arch/x86/kernel/vmlinux.lds.S | 2 +
+ arch/x86/platform/efi/Makefile | 1 +
+ arch/x86/purgatory/Makefile | 1 +
+ arch/x86/realmode/rm/Makefile | 1 +
+ arch/x86/um/vdso/Makefile | 1 +
+ drivers/firmware/efi/libstub/Makefile | 1 +
+ include/asm-generic/vmlinux.lds.h | 35 +++
+ include/linux/compiler.h | 10 +
+ include/linux/mm.h | 10 -
+ kernel/Makefile | 1 +
+ kernel/pgo/Kconfig | 36 ++++
+ kernel/pgo/Makefile | 5 +
+ kernel/pgo/fs.c | 390 ++++++++++++++++++++++++++++++++++
+ kernel/pgo/instrument.c | 183 ++++++++++++++++
+ kernel/pgo/pgo.h | 211 ++++++++++++++++++
+ scripts/Makefile.lib | 10 +
+ 29 files changed, 1071 insertions(+), 28 deletions(-)
+ create mode 100644 Documentation/dev-tools/pgo.rst
+ create mode 100644 kernel/pgo/Kconfig
+ create mode 100644 kernel/pgo/Makefile
+ create mode 100644 kernel/pgo/fs.c
+ create mode 100644 kernel/pgo/instrument.c
+ create mode 100644 kernel/pgo/pgo.h
+Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1)
+$ git merge cisco/for-next
+Already up to date.
+Merging gnss/gnss-next (994adcbd3714 gnss: drop stray semicolons)
+$ git merge gnss/gnss-next
+Merge made by the 'recursive' strategy.
+ drivers/gnss/mtk.c | 2 +-
+ drivers/gnss/serial.c | 2 +-
+ drivers/gnss/sirf.c | 2 +-
+ drivers/gnss/ubx.c | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+Merging fsi/next (4a851d714ead fsi: aspeed: Support CFAM reset GPIO)
+$ git merge fsi/next
+Already up to date.
+Merging slimbus/for-next (0320ed0a8236 drivers: slimbus: Fix word resposible -> responsible in slimbus.h)
+$ git merge slimbus/for-next
+Auto-merging drivers/of/platform.c
+Auto-merging drivers/nvmem/Makefile
+CONFLICT (content): Merge conflict in drivers/nvmem/Makefile
+Auto-merging drivers/nvmem/Kconfig
+CONFLICT (content): Merge conflict in drivers/nvmem/Kconfig
+Resolved 'drivers/nvmem/Kconfig' using previous resolution.
+Resolved 'drivers/nvmem/Makefile' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master ad9abff5a2a0] Merge remote-tracking branch 'slimbus/for-next'
+$ git diff -M --stat --summary HEAD^..
+ drivers/slimbus/slimbus.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging nvmem/for-next (76a2b9a8ab44 nvmem: qfprom: Improve the comment about regulator setting)
+$ git merge nvmem/for-next
+Auto-merging drivers/nvmem/sprd-efuse.c
+Auto-merging drivers/nvmem/core.c
+Merge made by the 'recursive' strategy.
+ drivers/nvmem/core.c | 19 +++++++++++--------
+ drivers/nvmem/qcom-spmi-sdam.c | 1 +
+ drivers/nvmem/qfprom.c | 9 +++++----
+ drivers/nvmem/sc27xx-efuse.c | 1 +
+ drivers/nvmem/sprd-efuse.c | 1 +
+ drivers/nvmem/sunxi_sid.c | 1 +
+ 6 files changed, 20 insertions(+), 12 deletions(-)
+Merging xarray/main (2c7e57a02708 idr test suite: Improve reporting from idr_find_test_1)
+$ git merge xarray/main
+Already up to date.
+Merging hyperv/hyperv-next (9de6655cc5a6 drivers: hv: Fix missing error code in vmbus_connect())
+$ git merge hyperv/hyperv-next
+Merge made by the 'recursive' strategy.
+ arch/x86/kernel/cpu/mshyperv.c | 2 +-
+ drivers/hv/channel.c | 23 +++++----
+ drivers/hv/connection.c | 4 +-
+ drivers/hv/hv_balloon.c | 1 -
+ drivers/hv/hv_fcopy.c | 1 +
+ drivers/hv/hv_kvp.c | 1 +
+ drivers/hv/hv_util.c | 4 +-
+ drivers/hv/hyperv_vmbus.h | 2 +-
+ drivers/hv/ring_buffer.c | 95 ++++++++++++++++++++++++++++------
+ drivers/net/hyperv/hyperv_net.h | 7 +++
+ drivers/net/hyperv/netvsc.c | 10 ++--
+ drivers/net/hyperv/rndis_filter.c | 4 ++
+ drivers/scsi/storvsc_drv.c | 104 ++++++++++++++++++++++++++------------
+ include/linux/hyperv.h | 61 ++++++++++++++++++----
+ net/vmw_vsock/hyperv_transport.c | 4 +-
+ 15 files changed, 244 insertions(+), 79 deletions(-)
+Merging auxdisplay/auxdisplay (aecd79c09c2f auxdisplay: Add I2C gpio expander example)
+$ git merge auxdisplay/auxdisplay
+Merge made by the 'recursive' strategy.
+ .../bindings/auxdisplay/hit,hd44780.yaml | 31 +++++++++++++++++++++-
+ 1 file changed, 30 insertions(+), 1 deletion(-)
+Merging kgdb/kgdb/for-next (83fa2d13d628 kdb: Refactor env variables get/set code)
+$ git merge kgdb/kgdb/for-next
+Already up to date.
+Merging hmm/hmm (fe07bfda2fb9 Linux 5.12-rc1)
+$ git merge hmm/hmm
+Already up to date.
+Merging fpga/for-next (92c5ddbc93ab fpga: fpga-bridge: removed repeated word)
+$ git merge fpga/for-next
+Merge made by the 'recursive' strategy.
+ Documentation/driver-api/fpga/fpga-bridge.rst | 10 +++++-----
+ Documentation/driver-api/fpga/fpga-mgr.rst | 12 ++++++------
+ Documentation/driver-api/fpga/fpga-programming.rst | 8 ++++----
+ Documentation/driver-api/fpga/fpga-region.rst | 20 ++++++++++----------
+ Documentation/fpga/dfl.rst | 4 ++--
+ drivers/fpga/altera-cvp.c | 2 +-
+ drivers/fpga/dfl-fme-pr.c | 2 +-
+ drivers/fpga/dfl-n3000-nios.c | 2 +-
+ drivers/fpga/dfl.h | 2 +-
+ drivers/fpga/fpga-bridge.c | 8 ++++----
+ drivers/fpga/zynq-fpga.c | 6 +++---
+ include/linux/fpga/fpga-mgr.h | 2 +-
+ 12 files changed, 39 insertions(+), 39 deletions(-)
+Merging kunit/test (d07f6ca923ea Linux 5.13-rc2)
+$ git merge kunit/test
+Already up to date.
+Merging cfi/cfi/next (6efb943b8616 Linux 5.13-rc1)
+$ git merge cfi/cfi/next
+Already up to date.
+Merging kunit-next/kunit (d07f6ca923ea Linux 5.13-rc2)
+$ git merge kunit-next/kunit
+Already up to date.
+Merging trivial/for-next (9ff9b0d392ea Merge tag 'net-next-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
+$ git merge trivial/for-next
+Already up to date.
+Merging mhi/mhi-next (a610f3c65d3b bus: mhi: Wait for M2 state during system resume)
+$ git merge mhi/mhi-next
+Merge made by the 'recursive' strategy.
+ drivers/bus/mhi/core/main.c | 15 ++++++++++-----
+ drivers/bus/mhi/core/pm.c | 19 ++++++-------------
+ 2 files changed, 16 insertions(+), 18 deletions(-)
+Merging memblock/for-next (990e6d0e1de8 arm: extend pfn_valid to take into accound freed memory map alignment)
+$ git merge memblock/for-next
+Merge made by the 'recursive' strategy.
+ arch/arm/mm/init.c | 13 ++++++++++++-
+ mm/memblock.c | 23 ++++++++++++-----------
+ 2 files changed, 24 insertions(+), 12 deletions(-)
+Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy)
+$ git merge init/init-user-pointers
+Already up to date.
+Merging counters/counters (e71ba9452f0b Linux 5.11-rc2)
+$ git merge counters/counters
+Already up to date.
+Merging rust/rust-next (fef0214731cc rust: allow printing in the kernel crate)
+$ git merge rust/rust-next
+Auto-merging tools/lib/perf/include/perf/event.h
+Auto-merging scripts/kconfig/confdata.c
+Auto-merging scripts/Makefile.lib
+Auto-merging scripts/Makefile.build
+Auto-merging samples/Makefile
+Auto-merging samples/Kconfig
+Auto-merging lib/Kconfig.debug
+Auto-merging kernel/printk/printk.c
+CONFLICT (content): Merge conflict in kernel/printk/printk.c
+Auto-merging kernel/kallsyms.c
+Auto-merging init/Kconfig
+Auto-merging include/uapi/linux/android/binder.h
+CONFLICT (content): Merge conflict in include/uapi/linux/android/binder.h
+Auto-merging Makefile
+CONFLICT (content): Merge conflict in Makefile
+Auto-merging MAINTAINERS
+Auto-merging Documentation/process/changes.rst
+Auto-merging Documentation/index.rst
+Auto-merging .gitignore
+Resolved 'Makefile' using previous resolution.
+Resolved 'include/uapi/linux/android/binder.h' using previous resolution.
+Resolved 'kernel/printk/printk.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 12c13d996e31] Merge remote-tracking branch 'rust/rust-next'
+$ git diff -M --stat --summary HEAD^..
+ .gitignore | 5 +
+ .rustfmt.toml | 12 +
+ Documentation/doc-guide/kernel-doc.rst | 3 +
+ Documentation/index.rst | 1 +
+ Documentation/kbuild/kbuild.rst | 4 +
+ Documentation/process/changes.rst | 9 +
+ Documentation/rust/arch-support.rst | 32 ++
+ Documentation/rust/coding.rst | 92 ++++
+ Documentation/rust/docs.rst | 109 ++++
+ Documentation/rust/index.rst | 20 +
+ Documentation/rust/quick-start.rst | 220 ++++++++
+ Documentation/rust/rust-project.json | 35 ++
+ MAINTAINERS | 14 +
+ Makefile | 147 ++++-
+ arch/arm/rust/target.json | 28 +
+ arch/arm64/rust/target.json | 40 ++
+ arch/powerpc/rust/target.json | 30 ++
+ arch/x86/rust/target.json | 42 ++
+ drivers/android/Kconfig | 7 +
+ drivers/android/Makefile | 2 +
+ drivers/android/allocation.rs | 252 +++++++++
+ drivers/android/context.rs | 80 +++
+ drivers/android/defs.rs | 92 ++++
+ drivers/android/node.rs | 479 +++++++++++++++++
+ drivers/android/process.rs | 950 +++++++++++++++++++++++++++++++++
+ drivers/android/range_alloc.rs | 191 +++++++
+ drivers/android/rust_binder.rs | 128 +++++
+ drivers/android/thread.rs | 821 ++++++++++++++++++++++++++++
+ drivers/android/transaction.rs | 206 +++++++
+ include/linux/kallsyms.h | 2 +-
+ include/linux/spinlock.h | 17 +-
+ include/uapi/linux/android/binder.h | 28 +-
+ init/Kconfig | 27 +
+ kernel/kallsyms.c | 7 +
+ kernel/livepatch/core.c | 4 +-
+ kernel/printk/printk.c | 1 +
+ lib/Kconfig.debug | 106 ++++
+ rust/.gitignore | 5 +
+ rust/Makefile | 152 ++++++
+ rust/compiler_builtins.rs | 156 ++++++
+ rust/exports.c | 16 +
+ rust/helpers.c | 94 ++++
+ rust/kernel/allocator.rs | 68 +++
+ rust/kernel/bindings.rs | 22 +
+ rust/kernel/bindings_helper.h | 18 +
+ rust/kernel/buffer.rs | 39 ++
+ rust/kernel/c_types.rs | 133 +++++
+ rust/kernel/chrdev.rs | 162 ++++++
+ rust/kernel/error.rs | 106 ++++
+ rust/kernel/file_operations.rs | 674 +++++++++++++++++++++++
+ rust/kernel/lib.rs | 204 +++++++
+ rust/kernel/linked_list.rs | 245 +++++++++
+ rust/kernel/miscdev.rs | 109 ++++
+ rust/kernel/module_param.rs | 497 +++++++++++++++++
+ rust/kernel/pages.rs | 173 ++++++
+ rust/kernel/prelude.rs | 22 +
+ rust/kernel/print.rs | 463 ++++++++++++++++
+ rust/kernel/random.rs | 50 ++
+ rust/kernel/raw_list.rs | 361 +++++++++++++
+ rust/kernel/static_assert.rs | 38 ++
+ rust/kernel/sync/arc.rs | 184 +++++++
+ rust/kernel/sync/condvar.rs | 136 +++++
+ rust/kernel/sync/guard.rs | 82 +++
+ rust/kernel/sync/locked_by.rs | 112 ++++
+ rust/kernel/sync/mod.rs | 85 +++
+ rust/kernel/sync/mutex.rs | 101 ++++
+ rust/kernel/sync/spinlock.rs | 108 ++++
+ rust/kernel/sysctl.rs | 185 +++++++
+ rust/kernel/types.rs | 73 +++
+ rust/kernel/user_ptr.rs | 282 ++++++++++
+ rust/module.rs | 764 ++++++++++++++++++++++++++
+ samples/Kconfig | 2 +
+ samples/Makefile | 1 +
+ samples/rust/Kconfig | 113 ++++
+ samples/rust/Makefile | 12 +
+ samples/rust/rust_chrdev.rs | 55 ++
+ samples/rust/rust_minimal.rs | 40 ++
+ samples/rust/rust_miscdev.rs | 145 +++++
+ samples/rust/rust_module_parameters.rs | 72 +++
+ samples/rust/rust_print.rs | 58 ++
+ samples/rust/rust_random.rs | 60 +++
+ samples/rust/rust_semaphore.rs | 176 ++++++
+ samples/rust/rust_semaphore_c.c | 212 ++++++++
+ samples/rust/rust_stack_probing.rs | 42 ++
+ samples/rust/rust_sync.rs | 84 +++
+ scripts/Makefile.build | 19 +
+ scripts/Makefile.lib | 12 +
+ scripts/dummy-tools/elfedit | 1 +
+ scripts/kallsyms.c | 33 +-
+ scripts/kconfig/confdata.c | 67 ++-
+ scripts/rust-version.sh | 31 ++
+ tools/include/linux/kallsyms.h | 2 +-
+ tools/include/linux/lockdep.h | 2 +-
+ tools/lib/perf/include/perf/event.h | 2 +-
+ tools/lib/symbol/kallsyms.h | 2 +-
+ 95 files changed, 11357 insertions(+), 48 deletions(-)
+ create mode 100644 .rustfmt.toml
+ create mode 100644 Documentation/rust/arch-support.rst
+ create mode 100644 Documentation/rust/coding.rst
+ create mode 100644 Documentation/rust/docs.rst
+ create mode 100644 Documentation/rust/index.rst
+ create mode 100644 Documentation/rust/quick-start.rst
+ create mode 100644 Documentation/rust/rust-project.json
+ create mode 100644 arch/arm/rust/target.json
+ create mode 100644 arch/arm64/rust/target.json
+ create mode 100644 arch/powerpc/rust/target.json
+ create mode 100644 arch/x86/rust/target.json
+ create mode 100644 drivers/android/allocation.rs
+ create mode 100644 drivers/android/context.rs
+ create mode 100644 drivers/android/defs.rs
+ create mode 100644 drivers/android/node.rs
+ create mode 100644 drivers/android/process.rs
+ create mode 100644 drivers/android/range_alloc.rs
+ create mode 100644 drivers/android/rust_binder.rs
+ create mode 100644 drivers/android/thread.rs
+ create mode 100644 drivers/android/transaction.rs
+ create mode 100644 rust/.gitignore
+ create mode 100644 rust/Makefile
+ create mode 100644 rust/compiler_builtins.rs
+ create mode 100644 rust/exports.c
+ create mode 100644 rust/helpers.c
+ create mode 100644 rust/kernel/allocator.rs
+ create mode 100644 rust/kernel/bindings.rs
+ create mode 100644 rust/kernel/bindings_helper.h
+ create mode 100644 rust/kernel/buffer.rs
+ create mode 100644 rust/kernel/c_types.rs
+ create mode 100644 rust/kernel/chrdev.rs
+ create mode 100644 rust/kernel/error.rs
+ create mode 100644 rust/kernel/file_operations.rs
+ create mode 100644 rust/kernel/lib.rs
+ create mode 100644 rust/kernel/linked_list.rs
+ create mode 100644 rust/kernel/miscdev.rs
+ create mode 100644 rust/kernel/module_param.rs
+ create mode 100644 rust/kernel/pages.rs
+ create mode 100644 rust/kernel/prelude.rs
+ create mode 100644 rust/kernel/print.rs
+ create mode 100644 rust/kernel/random.rs
+ create mode 100644 rust/kernel/raw_list.rs
+ create mode 100644 rust/kernel/static_assert.rs
+ create mode 100644 rust/kernel/sync/arc.rs
+ create mode 100644 rust/kernel/sync/condvar.rs
+ create mode 100644 rust/kernel/sync/guard.rs
+ create mode 100644 rust/kernel/sync/locked_by.rs
+ create mode 100644 rust/kernel/sync/mod.rs
+ create mode 100644 rust/kernel/sync/mutex.rs
+ create mode 100644 rust/kernel/sync/spinlock.rs
+ create mode 100644 rust/kernel/sysctl.rs
+ create mode 100644 rust/kernel/types.rs
+ create mode 100644 rust/kernel/user_ptr.rs
+ create mode 100644 rust/module.rs
+ create mode 100644 samples/rust/Kconfig
+ create mode 100644 samples/rust/Makefile
+ create mode 100644 samples/rust/rust_chrdev.rs
+ create mode 100644 samples/rust/rust_minimal.rs
+ create mode 100644 samples/rust/rust_miscdev.rs
+ create mode 100644 samples/rust/rust_module_parameters.rs
+ create mode 100644 samples/rust/rust_print.rs
+ create mode 100644 samples/rust/rust_random.rs
+ create mode 100644 samples/rust/rust_semaphore.rs
+ create mode 100644 samples/rust/rust_semaphore_c.c
+ create mode 100644 samples/rust/rust_stack_probing.rs
+ create mode 100644 samples/rust/rust_sync.rs
+ create mode 120000 scripts/dummy-tools/elfedit
+ create mode 100755 scripts/rust-version.sh
+Merging cxl/next (6630d31c912e cxl/mem: Get rid of @cxlm.base)
+$ git merge cxl/next
+Removing drivers/cxl/bus.c
+Merge made by the 'recursive' strategy.
+ Documentation/driver-api/cxl/memory-devices.rst | 14 +-
+ drivers/cxl/Kconfig | 13 +-
+ drivers/cxl/Makefile | 8 +-
+ drivers/cxl/bus.c | 29 ---
+ drivers/cxl/core.c | 90 ++++++++
+ drivers/cxl/cxl.h | 82 +++----
+ drivers/cxl/mem.h | 79 +++++++
+ drivers/cxl/{mem.c => pci.c} | 289 +++++++++++-------------
+ 8 files changed, 345 insertions(+), 259 deletions(-)
+ delete mode 100644 drivers/cxl/bus.c
+ create mode 100644 drivers/cxl/core.c
+ create mode 100644 drivers/cxl/mem.h
+ rename drivers/cxl/{mem.c => pci.c} (92%)
+Merging tpmdd-jejb/tpmdd-for-next (69977d1aeeca Merge branch 'tpmdd-fixes' into tpmdd-for-next)
+$ git merge tpmdd-jejb/tpmdd-for-next
+Auto-merging security/keys/trusted-keys/trusted_tpm2.c
+Merge made by the 'recursive' strategy.
+Merging akpm-current/current (a0cb322813c8 linux-next-pre)
+$ git merge --no-ff akpm-current/current
+Auto-merging scripts/link-vmlinux.sh
+Auto-merging mm/util.c
+Auto-merging mm/slub.c
+Auto-merging mm/slab_common.c
+Auto-merging mm/slab.h
+Auto-merging mm/shmem.c
+Auto-merging mm/page-writeback.c
+Auto-merging mm/oom_kill.c
+Auto-merging mm/mmap.c
+Auto-merging mm/mlock.c
+Auto-merging mm/memblock.c
+Auto-merging lib/vsprintf.c
+Auto-merging lib/Makefile
+Auto-merging lib/Kconfig.debug
+Auto-merging kernel/sysctl.c
+Auto-merging kernel/signal.c
+Auto-merging kernel/rcu/tree.c
+Auto-merging kernel/fork.c
+Auto-merging kernel/events/uprobes.c
+Auto-merging kernel/events/core.c
+Auto-merging ipc/shm.c
+Auto-merging init/main.c
+Auto-merging include/linux/shmem_fs.h
+Auto-merging include/linux/sched.h
+Auto-merging include/linux/mm.h
+Auto-merging include/linux/kthread.h
+Auto-merging include/linux/hugetlb.h
+Auto-merging fs/open.c
+Auto-merging fs/nfsd/nfs4state.c
+Auto-merging fs/exec.c
+Auto-merging fs/Kconfig
+Auto-merging drivers/vfio/vfio_iommu_type1.c
+Auto-merging drivers/s390/char/sclp_vt220.c
+Auto-merging drivers/s390/char/con3215.c
+Auto-merging drivers/remoteproc/remoteproc_core.c
+Auto-merging drivers/misc/pvpanic/pvpanic.c
+Auto-merging drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c
+Auto-merging drivers/block/zram/zram_drv.h
+CONFLICT (content): Merge conflict in drivers/block/zram/zram_drv.h
+Auto-merging drivers/base/node.c
+Auto-merging arch/x86/kernel/setup.c
+Auto-merging arch/x86/kernel/cpu/mshyperv.c
+Auto-merging arch/x86/include/asm/desc.h
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/s390/include/asm/pgtable.h
+Auto-merging arch/s390/Kconfig
+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/platforms/Kconfig.cputype
+Auto-merging arch/powerpc/Kconfig
+Auto-merging arch/mips/Kconfig
+Auto-merging arch/m68k/Kconfig
+Auto-merging arch/arm64/mm/mmu.c
+Auto-merging arch/arm64/mm/init.c
+Auto-merging arch/arm64/kvm/mmu.c
+Auto-merging arch/arm64/kernel/setup.c
+Auto-merging arch/arm64/include/asm/pgtable.h
+Auto-merging arch/arm64/include/asm/memory.h
+Auto-merging MAINTAINERS
+Auto-merging Documentation/admin-guide/sysctl/vm.rst
+Auto-merging Documentation/admin-guide/sysctl/kernel.rst
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Resolved 'arch/riscv/Kconfig' using previous resolution.
+Resolved 'drivers/block/zram/zram_drv.h' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 0d7463b1fbd0] Merge branch 'akpm-current/current'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/admin-guide/kernel-parameters.txt | 25 +
+ Documentation/admin-guide/lockup-watchdogs.rst | 4 +-
+ Documentation/admin-guide/mm/hugetlbpage.rst | 11 +
+ Documentation/admin-guide/mm/memory-hotplug.rst | 729 ++++++++------
+ Documentation/admin-guide/mm/pagemap.rst | 2 +
+ Documentation/admin-guide/mm/userfaultfd.rst | 3 +-
+ Documentation/admin-guide/sysctl/kernel.rst | 10 +-
+ Documentation/admin-guide/sysctl/vm.rst | 30 +-
+ Documentation/filesystems/proc.rst | 48 +-
+ Documentation/vm/hmm.rst | 19 +-
+ Documentation/vm/unevictable-lru.rst | 33 +-
+ MAINTAINERS | 9 +
+ arch/alpha/Kconfig | 5 +-
+ arch/alpha/include/asm/pgtable.h | 1 -
+ arch/alpha/include/uapi/asm/mman.h | 3 +
+ arch/alpha/kernel/setup.c | 2 +-
+ arch/arc/include/asm/pgtable.h | 6 -
+ arch/arc/kernel/troubleshoot.c | 8 +-
+ arch/arm/Kconfig | 3 -
+ arch/arm64/Kconfig | 12 +-
+ arch/arm64/include/asm/hugetlb.h | 3 +-
+ arch/arm64/include/asm/memory.h | 2 +-
+ arch/arm64/include/asm/page.h | 3 +-
+ arch/arm64/include/asm/pgtable.h | 2 -
+ arch/arm64/kernel/setup.c | 1 +
+ arch/arm64/kvm/mmu.c | 4 +-
+ arch/arm64/mm/hugetlbpage.c | 5 +-
+ arch/arm64/mm/init.c | 14 +-
+ arch/arm64/mm/ioremap.c | 4 +-
+ arch/arm64/mm/mmu.c | 22 +-
+ arch/csky/include/asm/pgtable.h | 1 -
+ arch/hexagon/include/asm/pgtable.h | 3 -
+ arch/ia64/Kconfig | 7 +-
+ arch/ia64/include/asm/pal.h | 3 +-
+ arch/ia64/include/asm/pgtable.h | 1 -
+ arch/ia64/include/asm/spinlock.h | 2 +-
+ arch/ia64/include/asm/uv/uv_hub.h | 2 +-
+ arch/ia64/kernel/mca_drv.c | 2 +-
+ arch/m68k/Kconfig | 5 +-
+ arch/m68k/include/asm/pgtable_mm.h | 1 -
+ arch/m68k/kernel/sys_m68k.c | 4 +-
+ arch/microblaze/Kconfig | 4 +-
+ arch/microblaze/include/asm/pgtable.h | 2 -
+ arch/mips/Kconfig | 7 -
+ arch/mips/include/asm/pgtable-32.h | 1 -
+ arch/mips/include/asm/pgtable-64.h | 1 -
+ arch/mips/include/uapi/asm/mman.h | 3 +
+ arch/mips/kernel/relocate.c | 1 +
+ arch/mips/kernel/traps.c | 4 +-
+ arch/mips/mm/cache.c | 30 +-
+ arch/mips/sgi-ip22/ip22-reset.c | 1 +
+ arch/mips/sgi-ip32/ip32-reset.c | 1 +
+ arch/nios2/include/asm/pgtable.h | 2 -
+ arch/openrisc/include/asm/pgtable.h | 1 -
+ arch/parisc/include/asm/pgtable.h | 2 -
+ arch/parisc/include/uapi/asm/mman.h | 3 +
+ arch/parisc/kernel/pdc_chassis.c | 1 +
+ arch/powerpc/Kconfig | 6 +-
+ .../powerpc/include/asm/book3s/64/tlbflush-radix.h | 19 +-
+ arch/powerpc/include/asm/book3s/64/tlbflush.h | 29 +-
+ arch/powerpc/include/asm/book3s/pgtable.h | 1 -
+ arch/powerpc/include/asm/nohash/32/hugetlb-8xx.h | 5 +-
+ arch/powerpc/include/asm/nohash/32/mmu-8xx.h | 43 +
+ arch/powerpc/include/asm/nohash/32/pgtable.h | 1 -
+ arch/powerpc/include/asm/nohash/64/pgtable.h | 2 -
+ arch/powerpc/include/asm/tlb.h | 6 +
+ arch/powerpc/kernel/setup-common.c | 1 +
+ arch/powerpc/kvm/book3s_hv.c | 4 +-
+ arch/powerpc/kvm/book3s_hv_uvmem.c | 2 +-
+ arch/powerpc/mm/book3s64/radix_hugetlbpage.c | 4 +-
+ arch/powerpc/mm/book3s64/radix_tlb.c | 55 +-
+ arch/powerpc/platforms/Kconfig.cputype | 3 +
+ arch/riscv/Kconfig | 5 +-
+ arch/riscv/include/asm/pgtable.h | 2 -
+ arch/s390/Kconfig | 6 +-
+ arch/s390/include/asm/pgtable.h | 2 -
+ arch/s390/kernel/ipl.c | 1 +
+ arch/s390/mm/pgtable.c | 2 +-
+ arch/sh/include/asm/pgtable.h | 2 -
+ arch/sparc/Kconfig | 5 +-
+ arch/sparc/include/asm/pgtable_32.h | 1 -
+ arch/sparc/include/asm/pgtable_64.h | 6 +-
+ arch/sparc/kernel/sstate.c | 1 +
+ arch/sparc/mm/hugetlbpage.c | 6 +-
+ arch/sparc/mm/init_64.c | 1 +
+ arch/um/drivers/mconsole_kern.c | 1 +
+ arch/um/include/asm/pgtable-2level.h | 1 -
+ arch/um/include/asm/pgtable-3level.h | 1 -
+ arch/um/kernel/um_arch.c | 1 +
+ arch/x86/Kconfig | 17 +-
+ arch/x86/ia32/ia32_aout.c | 4 +-
+ arch/x86/include/asm/desc.h | 1 +
+ arch/x86/include/asm/pgtable_types.h | 2 -
+ arch/x86/kernel/cpu/mce/core.c | 13 +-
+ arch/x86/kernel/cpu/mshyperv.c | 1 +
+ arch/x86/kernel/cpu/sgx/encl.h | 4 +-
+ arch/x86/kernel/setup.c | 1 +
+ arch/x86/mm/init_64.c | 13 +-
+ arch/x86/mm/pgtable.c | 34 +-
+ arch/x86/purgatory/purgatory.c | 2 +
+ arch/x86/xen/enlighten.c | 1 +
+ arch/xtensa/include/asm/pgtable.h | 1 -
+ arch/xtensa/include/uapi/asm/mman.h | 3 +
+ arch/xtensa/platforms/iss/setup.c | 1 +
+ drivers/base/memory.c | 6 +-
+ drivers/base/node.c | 18 +-
+ drivers/block/zram/zram_drv.h | 2 +-
+ drivers/bus/brcmstb_gisb.c | 1 +
+ drivers/char/ipmi/ipmi_msghandler.c | 1 +
+ drivers/clk/analogbits/wrpll-cln28hpc.c | 4 +
+ drivers/edac/altera_edac.c | 1 +
+ drivers/firmware/google/gsmi.c | 1 +
+ drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 2 +-
+ drivers/gpu/drm/nouveau/include/nvif/if000c.h | 1 +
+ drivers/gpu/drm/nouveau/nouveau_svm.c | 156 ++-
+ drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.h | 1 +
+ drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgp100.c | 6 +
+ drivers/hv/vmbus_drv.c | 1 +
+ drivers/hwtracing/coresight/coresight-cpu-debug.c | 1 +
+ drivers/leds/trigger/ledtrig-activity.c | 1 +
+ drivers/leds/trigger/ledtrig-heartbeat.c | 1 +
+ drivers/leds/trigger/ledtrig-panic.c | 1 +
+ drivers/media/common/videobuf2/frame_vector.c | 2 +-
+ drivers/misc/bcm-vk/bcm_vk_dev.c | 1 +
+ drivers/misc/ibmasm/heartbeat.c | 1 +
+ drivers/misc/pvpanic/pvpanic.c | 1 +
+ drivers/misc/sgi-gru/grufault.c | 4 +-
+ drivers/net/ipa/ipa_smp2p.c | 1 +
+ drivers/parisc/power.c | 1 +
+ drivers/power/reset/ltc2952-poweroff.c | 1 +
+ drivers/remoteproc/remoteproc_core.c | 1 +
+ drivers/s390/char/con3215.c | 1 +
+ drivers/s390/char/con3270.c | 1 +
+ drivers/s390/char/sclp.c | 1 +
+ drivers/s390/char/sclp_con.c | 1 +
+ drivers/s390/char/sclp_vt220.c | 1 +
+ drivers/s390/char/zcore.c | 1 +
+ drivers/soc/bcm/brcmstb/pm/pm-arm.c | 1 +
+ drivers/staging/olpc_dcon/olpc_dcon.c | 1 +
+ drivers/vfio/vfio_iommu_type1.c | 2 +-
+ drivers/video/fbdev/hyperv_fb.c | 1 +
+ drivers/virtio/virtio_mem.c | 2 +
+ fs/Kconfig | 5 +
+ fs/binfmt_aout.c | 4 +-
+ fs/binfmt_elf.c | 2 +-
+ fs/binfmt_elf_fdpic.c | 11 +-
+ fs/binfmt_flat.c | 2 +-
+ fs/buffer.c | 56 +-
+ fs/exec.c | 3 -
+ fs/hfsplus/catalog.c | 16 +-
+ fs/hfsplus/dir.c | 4 +-
+ fs/hfsplus/hfsplus_raw.h | 12 +-
+ fs/hfsplus/xattr.c | 18 +-
+ fs/nfsd/nfs4state.c | 2 +-
+ fs/ocfs2/aops.c | 3 +-
+ fs/ocfs2/cluster/heartbeat.c | 7 +-
+ fs/ocfs2/dlm/dlmmaster.c | 2 +-
+ fs/ocfs2/file.c | 55 +-
+ fs/ocfs2/filecheck.c | 6 +-
+ fs/ocfs2/namei.c | 17 +-
+ fs/ocfs2/stackglue.c | 8 +-
+ fs/open.c | 13 +-
+ fs/proc/base.c | 6 +-
+ fs/proc/fd.c | 20 +-
+ fs/proc/kcore.c | 134 ++-
+ fs/proc/page.c | 40 +-
+ fs/proc/task_mmu.c | 36 +-
+ fs/seq_file.c | 43 +-
+ fs/squashfs/block.c | 5 +-
+ fs/squashfs/squashfs_fs_sb.h | 1 +
+ fs/squashfs/super.c | 86 ++
+ fs/userfaultfd.c | 15 +-
+ include/asm-generic/bug.h | 3 +-
+ include/kunit/test.h | 5 +-
+ include/linux/bootmem_info.h | 66 ++
+ include/linux/compat.h | 2 -
+ include/linux/compiler-clang.h | 17 +
+ include/linux/compiler-gcc.h | 6 +
+ include/linux/compiler_types.h | 2 +-
+ include/linux/cpuhotplug.h | 2 +-
+ include/linux/gfp.h | 9 +
+ include/linux/highmem.h | 28 +-
+ include/linux/huge_mm.h | 70 +-
+ include/linux/hugetlb.h | 55 +-
+ include/linux/hugetlb_cgroup.h | 19 +-
+ include/linux/kcore.h | 3 -
+ include/linux/kernel.h | 86 +-
+ include/linux/kthread.h | 2 +-
+ include/linux/memblock.h | 4 +-
+ include/linux/memcontrol.h | 46 +-
+ include/linux/memory_hotplug.h | 27 -
+ include/linux/mempolicy.h | 2 +-
+ include/linux/memremap.h | 8 +-
+ include/linux/migrate.h | 27 +-
+ include/linux/mm.h | 56 +-
+ include/linux/mm_types.h | 14 +-
+ include/linux/mm_types_task.h | 5 +
+ include/linux/mman.h | 2 +
+ include/linux/mmdebug.h | 3 +-
+ include/linux/mmu_notifier.h | 26 +-
+ include/linux/mmzone.h | 80 +-
+ include/linux/page-flags.h | 32 +-
+ include/linux/page_owner.h | 6 +-
+ include/linux/page_ref.h | 4 +-
+ include/linux/pageblock-flags.h | 2 +-
+ include/linux/panic.h | 98 ++
+ include/linux/panic_notifier.h | 12 +
+ include/linux/pgtable.h | 43 +-
+ include/linux/printk.h | 5 +
+ include/linux/rmap.h | 13 +-
+ include/linux/sched.h | 8 +
+ include/linux/sched/coredump.h | 8 +
+ include/linux/seq_file.h | 10 +-
+ include/linux/shmem_fs.h | 19 +-
+ include/linux/signal.h | 2 -
+ include/linux/slab.h | 58 +-
+ include/linux/string_helpers.h | 31 +-
+ include/linux/swap.h | 36 +-
+ include/linux/swapops.h | 130 ++-
+ include/linux/thread_info.h | 1 +
+ include/linux/userfaultfd_k.h | 5 +
+ include/linux/vmalloc.h | 15 +
+ include/linux/vmstat.h | 65 +-
+ include/uapi/asm-generic/mman-common.h | 3 +
+ include/uapi/linux/mempolicy.h | 1 -
+ include/uapi/linux/userfaultfd.h | 11 +-
+ init/main.c | 69 +-
+ ipc/msg.c | 6 +-
+ ipc/sem.c | 22 +-
+ ipc/shm.c | 6 +-
+ ipc/util.c | 44 +-
+ ipc/util.h | 3 +
+ kernel/crash_core.c | 4 +-
+ kernel/events/core.c | 2 -
+ kernel/events/uprobes.c | 4 +-
+ kernel/fork.c | 1 -
+ kernel/hung_task.c | 45 +
+ kernel/kexec_core.c | 1 +
+ kernel/panic.c | 1 +
+ kernel/rcu/tree.c | 2 +
+ kernel/signal.c | 14 +-
+ kernel/sysctl.c | 20 +-
+ kernel/trace/trace.c | 1 +
+ kernel/watchdog.c | 12 +-
+ lib/Kconfig.debug | 33 +
+ lib/Makefile | 1 +
+ lib/crc64.c | 2 +-
+ lib/decompress_bunzip2.c | 2 +-
+ lib/decompress_unlz4.c | 8 +
+ lib/decompress_unlzo.c | 3 +-
+ lib/dump_stack.c | 20 +-
+ lib/kunit/test.c | 18 +-
+ lib/lz4/lz4_decompress.c | 2 +-
+ lib/math/Makefile | 1 +
+ lib/math/rational-test.c | 56 ++
+ lib/math/rational.c | 16 +-
+ lib/slub_kunit.c | 152 +++
+ lib/string_helpers.c | 102 +-
+ lib/test-string_helpers.c | 157 ++-
+ lib/test_hmm.c | 132 ++-
+ lib/test_hmm_uapi.h | 2 +
+ lib/vsprintf.c | 2 +-
+ mm/Kconfig | 15 +
+ mm/Makefile | 2 +
+ mm/bootmem_info.c | 127 +++
+ mm/compaction.c | 10 +-
+ mm/debug.c | 25 +-
+ mm/debug_vm_pgtable.c | 174 ++--
+ mm/dmapool.c | 5 +-
+ mm/filemap.c | 10 +-
+ mm/gup.c | 73 +-
+ mm/hmm.c | 12 +-
+ mm/huge_memory.c | 280 +++---
+ mm/hugetlb.c | 276 ++++-
+ mm/hugetlb_vmemmap.c | 297 ++++++
+ mm/hugetlb_vmemmap.h | 45 +
+ mm/internal.h | 36 +-
+ mm/kasan/common.c | 3 +
+ mm/kasan/report.c | 6 +-
+ mm/kfence/core.c | 10 +-
+ mm/kfence/kfence_test.c | 5 +-
+ mm/khugepaged.c | 20 +-
+ mm/ksm.c | 6 +-
+ mm/madvise.c | 68 +-
+ mm/mapping_dirty_helpers.c | 2 +-
+ mm/memblock.c | 28 +-
+ mm/memcontrol.c | 329 ++++--
+ mm/memory-failure.c | 206 +++-
+ mm/memory.c | 247 ++++-
+ mm/memory_hotplug.c | 165 +--
+ mm/mempolicy.c | 217 ++--
+ mm/memremap.c | 20 +
+ mm/migrate.c | 274 ++---
+ mm/mlock.c | 10 +-
+ mm/mmap.c | 54 +-
+ mm/mmap_lock.c | 60 +-
+ mm/mprotect.c | 70 +-
+ mm/mremap.c | 45 +-
+ mm/nommu.c | 6 +-
+ mm/oom_kill.c | 2 +-
+ mm/page-writeback.c | 33 +-
+ mm/page_alloc.c | 522 ++++++----
+ mm/page_owner.c | 2 +-
+ mm/page_vma_mapped.c | 15 +-
+ mm/rmap.c | 610 ++++++++---
+ mm/shmem.c | 157 ++-
+ mm/slab.h | 18 +-
+ mm/slab_common.c | 46 +-
+ mm/slub.c | 139 ++-
+ mm/sparse-vmemmap.c | 267 +++++
+ mm/sparse.c | 21 +-
+ mm/swap.c | 4 +-
+ mm/swap_slots.c | 2 -
+ mm/swap_state.c | 16 +-
+ mm/swapfile.c | 179 ++--
+ mm/truncate.c | 8 +-
+ mm/userfaultfd.c | 225 +++--
+ mm/util.c | 40 +
+ mm/vmalloc.c | 157 ++-
+ mm/vmscan.c | 48 +-
+ mm/vmstat.c | 246 ++---
+ mm/workingset.c | 2 +-
+ mm/z3fold.c | 2 +
+ mm/zbud.c | 2 +
+ mm/zswap.c | 26 +-
+ net/ipv4/tcp.c | 4 +-
+ scripts/checkpatch.pl | 4 +-
+ scripts/kconfig/streamline_config.pl | 80 +-
+ scripts/link-vmlinux.sh | 4 +
+ scripts/spelling.txt | 16 +
+ tools/testing/selftests/proc/.gitignore | 1 +
+ tools/testing/selftests/vm/.gitignore | 3 +
+ tools/testing/selftests/vm/Makefile | 1 +
+ tools/testing/selftests/vm/gup_test.c | 96 +-
+ tools/testing/selftests/vm/hmm-tests.c | 158 +++
+ tools/testing/selftests/vm/khugepaged.c | 4 -
+ tools/testing/selftests/vm/madv_populate.c | 342 +++++++
+ tools/testing/selftests/vm/mremap_test.c | 118 ++-
+ tools/testing/selftests/vm/run_vmtests.sh | 16 +
+ tools/testing/selftests/vm/userfaultfd.c | 1054 ++++++++++----------
+ tools/vm/page_owner_sort.c | 4 +
+ virt/kvm/kvm_main.c | 2 +-
+ 342 files changed, 8456 insertions(+), 4041 deletions(-)
+ create mode 100644 include/linux/bootmem_info.h
+ create mode 100644 include/linux/panic.h
+ create mode 100644 include/linux/panic_notifier.h
+ create mode 100644 lib/math/rational-test.c
+ create mode 100644 lib/slub_kunit.c
+ create mode 100644 mm/bootmem_info.c
+ create mode 100644 mm/hugetlb_vmemmap.c
+ create mode 100644 mm/hugetlb_vmemmap.h
+ create mode 100644 tools/testing/selftests/vm/madv_populate.c
+$ 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/30)\rRebasing (2/30)\rRebasing (3/30)\rRebasing (4/30)\rRebasing (5/30)\rRebasing (6/30)\rRebasing (7/30)\rRebasing (8/30)\rRebasing (9/30)\rRebasing (10/30)\rRebasing (11/30)\rRebasing (12/30)\rRebasing (13/30)\rRebasing (14/30)\rRebasing (15/30)\rRebasing (16/30)\rRebasing (17/30)\rRebasing (18/30)\rRebasing (19/30)\rRebasing (20/30)\rRebasing (21/30)\rRebasing (22/30)\rRebasing (23/30)\rRebasing (24/30)\rRebasing (25/30)\rRebasing (26/30)\rRebasing (27/30)\rRebasing (28/30)\rRebasing (29/30)\rRebasing (30/30)\r\r\e[KSuccessfully rebased and updated refs/heads/akpm.
+$ cd ../next
+$ git fetch -f ../rebase-tmp akpm:akpm/master
+From ../rebase-tmp
+ + 7f23e04fc10d...0278f9c5b615 akpm -> akpm/master (forced update)
+$ rm -rf ../rebase-tmp
+Merging akpm/master (0278f9c5b615 kdump: use vmlinux_build_id to simplify)
+$ git merge --no-ff akpm/master
+Merge made by the 'recursive' strategy.
+ Documentation/core-api/printk-formats.rst | 11 ++
+ arch/arm64/include/asm/Kbuild | 1 -
+ arch/arm64/include/asm/cacheflush.h | 6 -
+ arch/arm64/include/asm/kfence.h | 2 +-
+ arch/arm64/include/asm/set_memory.h | 17 ++
+ arch/arm64/include/uapi/asm/unistd.h | 1 +
+ arch/arm64/kernel/machine_kexec.c | 1 +
+ arch/arm64/kernel/stacktrace.c | 2 +-
+ arch/arm64/mm/mmu.c | 7 +-
+ arch/arm64/mm/pageattr.c | 13 +-
+ arch/riscv/Kconfig | 4 +-
+ arch/riscv/include/asm/unistd.h | 1 +
+ arch/x86/entry/syscalls/syscall_32.tbl | 1 +
+ arch/x86/entry/syscalls/syscall_64.tbl | 1 +
+ arch/x86/kernel/dumpstack.c | 2 +-
+ include/linux/buildid.h | 8 +
+ include/linux/compaction.h | 4 +-
+ include/linux/crash_core.h | 12 +-
+ include/linux/hmm.h | 2 +-
+ include/linux/hugetlb.h | 6 +-
+ include/linux/kallsyms.h | 20 +-
+ include/linux/list_lru.h | 4 +-
+ include/linux/mmu_notifier.h | 8 +-
+ include/linux/module.h | 9 +-
+ include/linux/percpu-defs.h | 2 +-
+ include/linux/secretmem.h | 54 ++++++
+ include/linux/set_memory.h | 12 ++
+ include/linux/shrinker.h | 2 +-
+ include/linux/syscalls.h | 1 +
+ include/linux/vmalloc.h | 4 +-
+ include/uapi/asm-generic/unistd.h | 7 +-
+ include/uapi/linux/magic.h | 1 +
+ init/Kconfig | 1 +
+ init/main.c | 2 +
+ kernel/crash_core.c | 50 +----
+ kernel/kallsyms.c | 104 +++++++++--
+ kernel/module.c | 42 ++++-
+ kernel/power/hibernate.c | 5 +-
+ kernel/sys_ni.c | 2 +
+ lib/Kconfig.debug | 11 ++
+ lib/buildid.c | 74 ++++++--
+ lib/dump_stack.c | 13 +-
+ lib/vsprintf.c | 8 +-
+ mm/Kconfig | 4 +
+ mm/Makefile | 1 +
+ mm/gup.c | 12 ++
+ mm/internal.h | 3 +
+ mm/mlock.c | 3 +-
+ mm/mmap.c | 5 +-
+ mm/secretmem.c | 254 +++++++++++++++++++++++++
+ mm/slub.c | 79 +++++---
+ scripts/checksyscalls.sh | 4 +
+ scripts/decode_stacktrace.sh | 89 +++++++--
+ tools/testing/selftests/vm/.gitignore | 1 +
+ tools/testing/selftests/vm/Makefile | 3 +-
+ tools/testing/selftests/vm/memfd_secret.c | 296 ++++++++++++++++++++++++++++++
+ tools/testing/selftests/vm/run_vmtests.sh | 17 ++
+ 57 files changed, 1120 insertions(+), 189 deletions(-)
+ create mode 100644 arch/arm64/include/asm/set_memory.h
+ create mode 100644 include/linux/secretmem.h
+ create mode 100644 mm/secretmem.c
+ create mode 100644 tools/testing/selftests/vm/memfd_secret.c
projects / users / jedix / linux-maple.git / commitdiff