diff options
Diffstat (limited to 'Next/merge.log')
| -rw-r--r-- | Next/merge.log | 8100 |
1 files changed, 8100 insertions, 0 deletions
diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..d7d9c19929e3 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,8100 @@ +$ date -R +Fri, 22 Jan 2021 08:07:12 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 75439bc439e0 Merge tag 'net-5.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net +Merging origin/master (9f29bd8b2e71 Merge tag 'fs_for_v5.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs) +$ git merge origin/master +Updating 75439bc439e0..9f29bd8b2e71 +Fast-forward + MAINTAINERS | 12 +- + drivers/acpi/scan.c | 2 + + drivers/gpio/Kconfig | 5 +- + drivers/gpio/gpio-mvebu.c | 19 ++- + drivers/gpio/gpiolib-cdev.c | 145 +++++++++---------- + drivers/gpio/gpiolib.c | 3 + + drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c | 2 +- + drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c | 4 + + drivers/pinctrl/nomadik/pinctrl-nomadik.c | 1 - + drivers/pinctrl/pinctrl-ingenic.c | 80 +++++------ + drivers/pinctrl/qcom/pinctrl-msm.c | 96 ++++++++----- + drivers/pinctrl/qcom/pinctrl-msm.h | 2 + + fs/btrfs/backref.c | 2 +- + fs/btrfs/block-group.c | 3 +- + fs/btrfs/extent-tree.c | 10 +- + fs/btrfs/send.c | 15 ++ + fs/btrfs/transaction.c | 8 -- + fs/btrfs/volumes.c | 2 + + fs/fs-writeback.c | 24 ++-- + fs/udf/super.c | 7 +- + kernel/printk/printk.c | 40 ++++-- + kernel/printk/printk_ringbuffer.c | 2 +- + sound/core/seq/oss/seq_oss_synth.c | 3 +- + sound/pci/hda/hda_codec.c | 24 +--- + sound/pci/hda/hda_intel.c | 6 + + sound/pci/hda/patch_hdmi.c | 1 + + sound/pci/hda/patch_realtek.c | 8 ++ + sound/pci/hda/patch_via.c | 1 + + sound/soc/codecs/hdmi-codec.c | 2 +- + sound/soc/fsl/imx-hdmi.c | 2 +- + sound/soc/sof/intel/hda-codec.c | 37 +++-- + sound/soc/sof/intel/hda-dsp.c | 9 +- + sound/soc/sof/intel/hda.h | 2 +- + sound/usb/clock.c | 21 +-- + sound/usb/endpoint.c | 9 ++ + sound/usb/implicit.c | 17 +-- + sound/usb/pcm.c | 174 +++++++++++++++-------- + sound/usb/quirks.c | 28 ---- + tools/gpio/gpio-event-mon.c | 4 +- + tools/gpio/gpio-watch.c | 5 +- + 40 files changed, 474 insertions(+), 363 deletions(-) +Merging fixes/fixes (e71ba9452f0b Linux 5.11-rc2) +$ git merge fixes/fixes +Already up to date. +Merging kbuild-current/fixes (19c329f68089 Linux 5.11-rc4) +$ git merge kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (7c53f6b671f4 Linux 5.11-rc3) +$ git merge arc-current/for-curr +Already up to date. +Merging arm-current/fixes (e64ab473ddda ARM: 9034/1: __div64_32(): straighten up inline asm constraints) +$ git merge arm-current/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (3ed86b9a7140 kasan, arm64: fix pointer tags in KASAN reports) +$ git merge arm64-fixes/for-next/fixes +Merge made by the 'recursive' strategy. + arch/arm64/mm/fault.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) +Merging arm-soc-fixes/arm/fixes (8a996b2d8a03 ARM: dts: ux500: Reserve memory carveouts) +$ git merge arm-soc-fixes/arm/fixes +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/imx6q-tbs2910.dts | 7 +++++ + arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-kontron-samx6i.dtsi | 6 ++-- + arch/arm/boot/dts/ste-db8500.dtsi | 38 ++++++++++++++++++++++++++ + arch/arm/boot/dts/ste-db8520.dtsi | 38 ++++++++++++++++++++++++++ + arch/arm/boot/dts/ste-db9500.dtsi | 35 ++++++++++++++++++++++++ + arch/arm/boot/dts/ste-snowball.dts | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx8mn.dtsi | 2 +- + arch/arm64/configs/defconfig | 2 -- + drivers/bus/arm-integrator-lm.c | 1 + + drivers/soc/imx/Kconfig | 2 +- + 12 files changed, 127 insertions(+), 10 deletions(-) + create mode 100644 arch/arm/boot/dts/ste-db9500.dtsi +Merging drivers-memory-fixes/fixes (5c8fe583cce5 Linux 5.11-rc1) +$ git merge drivers-memory-fixes/fixes +Already up to date. +Merging m68k-current/for-linus (2ae92e8b9b7e MAINTAINERS: Update m68k Mac entry) +$ git merge m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (08685be7761d powerpc/64s: fix scv entry fallback flush vs interrupt) +$ git merge powerpc-fixes/fixes +Merge made by the 'recursive' strategy. + arch/powerpc/include/asm/exception-64s.h | 13 ++++++++++++ + arch/powerpc/include/asm/feature-fixups.h | 10 +++++++++ + arch/powerpc/kernel/entry_64.S | 2 +- + arch/powerpc/kernel/exceptions-64s.S | 19 +++++++++++++++++ + arch/powerpc/kernel/vmlinux.lds.S | 7 +++++++ + arch/powerpc/lib/feature-fixups.c | 24 +++++++++++++++++++--- + .../powerpc/alignment/alignment_handler.c | 5 ++++- + .../testing/selftests/powerpc/mm/pkey_exec_prot.c | 2 +- + tools/testing/selftests/powerpc/mm/pkey_siginfo.c | 2 +- + 9 files changed, 77 insertions(+), 7 deletions(-) +Merging s390-fixes/fixes (19c329f68089 Linux 5.11-rc4) +$ git merge s390-fixes/fixes +Already up to date. +Merging sparc/master (0a95a6d1a4cd sparc: use for_each_child_of_node() macro) +$ git merge sparc/master +Auto-merging arch/sparc/mm/srmmu.c +Auto-merging arch/sparc/kernel/signal_64.c +Auto-merging arch/sparc/kernel/signal_32.c +Auto-merging arch/sparc/Kconfig +Merge made by the 'recursive' strategy. + arch/sparc/Kconfig | 2 +- + arch/sparc/boot/piggyback.c | 4 ++++ + arch/sparc/include/asm/backoff.h | 2 +- + arch/sparc/include/asm/pgtsrmmu.h | 2 +- + arch/sparc/kernel/pci.c | 3 +-- + arch/sparc/kernel/viohs.c | 6 ++---- + arch/sparc/lib/memset.S | 1 + + arch/sparc/mm/srmmu.c | 18 +++++++++--------- + 8 files changed, 20 insertions(+), 18 deletions(-) +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 (35c715c30b95 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec) +$ git merge net/master +Merge made by the 'recursive' strategy. + drivers/net/dsa/microchip/ksz8795.c | 30 +++++++++++++------- + drivers/net/dsa/microchip/ksz_common.c | 4 +-- + net/key/af_key.c | 6 ++-- + net/xfrm/xfrm_input.c | 2 +- + net/xfrm/xfrm_policy.c | 30 +++++++++++++------- + tools/testing/selftests/net/xfrm_policy.sh | 45 +++++++++++++++++++++++++++++- + 6 files changed, 90 insertions(+), 27 deletions(-) +Merging bpf/master (75439bc439e0 Merge tag 'net-5.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge bpf/master +Already up to date. +Merging ipsec/master (da64ae2d35d3 xfrm: Fix wraparound in xfrm_policy_addr_delta()) +$ git merge ipsec/master +Already up to date. +Merging netfilter/master (c8a8ead01736 Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf) +$ git merge netfilter/master +Already up to date. +Merging ipvs/master (c8a8ead01736 Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf) +$ git merge ipvs/master +Already up to date. +Merging wireless-drivers/master (952de419b617 mt76: mt7663s: fix rx buffer refcounting) +$ git merge wireless-drivers/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c | 7 ------- + drivers/net/wireless/mediatek/mt76/mt7615/mcu.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7615/sdio_txrx.c | 9 ++++----- + drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 10 +++++----- + drivers/net/wireless/mediatek/mt7601u/dma.c | 3 +-- + 5 files changed, 11 insertions(+), 20 deletions(-) +Merging mac80211/master (dcf3c8fb32dd mac80211: 160MHz with extended NSS BW in CSA) +$ git merge mac80211/master +Merge made by the 'recursive' strategy. + net/mac80211/spectmgmt.c | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) +Merging rdma-fixes/for-rc (f068cb1db2cb RDMA/usnic: Fix misuse of sysfs_emit_at) +$ git merge rdma-fixes/for-rc +Merge made by the 'recursive' strategy. + drivers/infiniband/hw/cxgb4/qp.c | 2 +- + drivers/infiniband/hw/hns/hns_roce_device.h | 2 +- + drivers/infiniband/hw/hns/hns_roce_qp.c | 11 ++++++----- + drivers/infiniband/hw/mlx5/main.c | 6 ++---- + drivers/infiniband/hw/usnic/usnic_ib_sysfs.c | 7 +++---- + drivers/infiniband/hw/vmw_pvrdma/pvrdma.h | 14 ++++++++++++++ + drivers/infiniband/hw/vmw_pvrdma/pvrdma_cq.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/lib/mlx5.h | 5 +++++ + include/linux/mlx5/driver.h | 18 ------------------ + include/uapi/rdma/vmw_pvrdma-abi.h | 7 +++++++ + 10 files changed, 40 insertions(+), 34 deletions(-) +Merging sound-current/for-linus (506c203cc3de ALSA: usb-audio: Fix hw constraints dependencies) +$ git merge sound-current/for-linus +Already up to date. +Merging sound-asoc-fixes/for-linus (6da3017fab4b Merge remote-tracking branch 'asoc/for-5.11' into asoc-linus) +$ git merge sound-asoc-fixes/for-linus +Merge made by the 'recursive' strategy. + .../sound/mt8192-mt6359-rt1015-rt5682.yaml | 4 ++-- + include/dt-bindings/sound/apq8016-lpass.h | 7 +++---- + include/dt-bindings/sound/qcom,lpass.h | 15 +++++++++++++++ + include/dt-bindings/sound/sc7180-lpass.h | 6 ++---- + sound/soc/amd/renoir/rn-pci-acp3x.c | 18 ++++++++++++++++-- + sound/soc/codecs/wm_adsp.c | 3 +++ + sound/soc/intel/skylake/skl-topology.c | 15 ++++++++------- + sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c | 5 ++++- + .../mt8183/mt8183-mt6358-ts3a227-max98357.c | 5 ++++- + sound/soc/qcom/lpass-cpu.c | 22 ++++++++++++++++++++++ + sound/soc/qcom/lpass-ipq806x.c | 2 +- + sound/soc/qcom/lpass-platform.c | 12 ++++++++++++ + sound/soc/qcom/lpass-sc7180.c | 11 ++++------- + sound/soc/qcom/lpass.h | 2 +- + sound/soc/soc-topology.c | 11 ++++++----- + 15 files changed, 103 insertions(+), 35 deletions(-) + create mode 100644 include/dt-bindings/sound/qcom,lpass.h +Merging regmap-fixes/for-linus (19c329f68089 Linux 5.11-rc4) +$ git merge regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (82705e71def3 Merge remote-tracking branch 'regulator/for-5.11' into regulator-linus) +$ git merge regulator-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/regulator/core.c | 39 +++++++++++++++++++++++++++----------- + include/linux/regulator/consumer.h | 30 +++++++++++++++++++++++++++++ + 2 files changed, 58 insertions(+), 11 deletions(-) +Merging spi-fixes/for-linus (8d874842da43 Merge remote-tracking branch 'spi/for-5.11' into spi-linus) +$ git merge spi-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/spi/spi-altera.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging pci-current/for-linus (7c53f6b671f4 Linux 5.11-rc3) +$ git merge pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (e020ff611ba9 driver core: Fix device link device name collision) +$ git merge driver-core.current/driver-core-linus +Auto-merging drivers/base/core.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-devlink | 4 +- + Documentation/ABI/testing/sysfs-devices-consumer | 5 +- + Documentation/ABI/testing/sysfs-devices-supplier | 5 +- + drivers/base/core.c | 44 +++++++++++----- + drivers/base/dd.c | 9 +--- + drivers/base/platform.c | 2 + + fs/kernfs/file.c | 65 +++++++++--------------- + include/linux/device.h | 12 +++++ + 8 files changed, 79 insertions(+), 67 deletions(-) +Merging tty.current/tty-linus (494e63ee9c9f Merge 9bb48c82aced ("tty: implement write_iter") into tty-linus) +$ git merge tty.current/tty-linus +Merge made by the 'recursive' strategy. + drivers/tty/serial/mvebu-uart.c | 10 ++++++++- + drivers/tty/tty_io.c | 48 ++++++++++++++++++++++------------------- + 2 files changed, 35 insertions(+), 23 deletions(-) +Merging usb.current/usb-linus (ef02684c4e67 usb: bdc: Make bdc pci driver depend on BROKEN) +$ git merge usb.current/usb-linus +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 6 +++--- + drivers/thunderbolt/icm.c | 2 +- + drivers/usb/cdns3/cdns3-imx.c | 22 +++++++++++----------- + drivers/usb/gadget/udc/aspeed-vhub/epn.c | 5 ++++- + drivers/usb/gadget/udc/bdc/Kconfig | 2 +- + drivers/usb/gadget/udc/core.c | 13 ++++++++++--- + drivers/usb/gadget/udc/dummy_hcd.c | 10 +++++++--- + drivers/usb/host/ehci-hcd.c | 12 ++++++++++++ + drivers/usb/host/ehci-hub.c | 3 +++ + drivers/usb/host/xhci-ring.c | 2 ++ + drivers/usb/host/xhci-tegra.c | 7 +++++++ + 11 files changed, 61 insertions(+), 23 deletions(-) +Merging usb-gadget-fixes/fixes (129aa9734559 usb: raw-gadget: fix memory leak in gadget_setup) +$ git merge usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (43377df70480 USB: serial: cp210x: add new VID/PID for supporting Teraoka AD2000) +$ git merge usb-serial-fixes/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/serial/cp210x.c | 1 + + 1 file changed, 1 insertion(+) +Merging usb-chipidea-fixes/for-usb-fixes (491b1bea0004 MAINTAINERS: update Peter Chen's email address) +$ git merge usb-chipidea-fixes/for-usb-fixes +Already up to date. +Merging phy/fixes (36acd5e24e30 phy: lantiq: rcu-usb2: wait after clock enable) +$ git merge phy/fixes +Merge made by the 'recursive' strategy. + .../devicetree/bindings/phy/rockchip-emmc-phy.txt | 10 +++++----- + drivers/phy/ingenic/Makefile | 2 +- + drivers/phy/lantiq/phy-lantiq-rcu-usb2.c | 10 +++++++++- + drivers/phy/mediatek/Kconfig | 4 +++- + drivers/phy/motorola/phy-cpcap-usb.c | 21 ++++++++++++++------- + drivers/phy/rockchip/phy-rockchip-emmc.c | 12 +++++++----- + 6 files changed, 39 insertions(+), 20 deletions(-) +Merging staging.current/staging-linus (a1bfb0ccf94d Merge tag 'iio-fixes-for-5.11a' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus) +$ git merge staging.current/staging-linus +Merge made by the 'recursive' strategy. + .../bindings/iio/accel/bosch,bma255.yaml | 4 +-- + drivers/counter/ti-eqep.c | 35 ---------------------- + drivers/iio/adc/ti_am335x_adc.c | 6 +--- + drivers/iio/common/st_sensors/st_sensors_trigger.c | 31 ++++++++++--------- + drivers/iio/dac/ad5504.c | 4 +-- + drivers/iio/proximity/sx9310.c | 5 ++-- + drivers/iio/temperature/mlx90632.c | 6 ++++ + 7 files changed, 31 insertions(+), 60 deletions(-) +Merging char-misc.current/char-misc-linus (b11f623cc8e7 Merge tag 'misc-habanalabs-fixes-2021-01-21' of https://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux into char-misc-linus) +$ git merge char-misc.current/char-misc-linus +Merge made by the 'recursive' strategy. + drivers/hwtracing/intel_th/pci.c | 5 +++++ + drivers/hwtracing/stm/heartbeat.c | 6 ++++-- + drivers/misc/habanalabs/common/device.c | 11 ++++++++++- + drivers/misc/habanalabs/common/firmware_if.c | 5 +++++ + drivers/misc/habanalabs/common/habanalabs.h | 1 + + drivers/misc/habanalabs/common/habanalabs_ioctl.c | 2 ++ + drivers/misc/habanalabs/common/memory.c | 10 ++++++++-- + drivers/misc/habanalabs/common/mmu.c | 6 +++--- + drivers/misc/habanalabs/common/mmu_v1.c | 12 ++++++++++-- + drivers/misc/habanalabs/gaudi/gaudi.c | 3 ++- + drivers/misc/habanalabs/goya/goya.c | 3 ++- + 11 files changed, 52 insertions(+), 12 deletions(-) +Merging soundwire-fixes/fixes (5c8fe583cce5 Linux 5.11-rc1) +$ git merge soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (c14556fc0c7c thunderbolt: Drop duplicated 0x prefix from format string) +$ git merge thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (5d06f72dc29c Input: ariel-pwrbutton - remove unused variable ariel_pwrbutton_id_table) +$ git merge input-current/for-linus +Merge made by the 'recursive' strategy. + .../devicetree/bindings/input/adc-keys.txt | 22 +++++++++- + .../bindings/input/touchscreen/goodix.yaml | 1 + + drivers/input/misc/ariel-pwrbutton.c | 6 --- + drivers/input/serio/i8042-x86ia64io.h | 2 + + drivers/input/touchscreen/goodix.c | 2 + + drivers/input/touchscreen/ili210x.c | 26 ++++++++---- + drivers/input/touchscreen/st1232.c | 48 +++++++++++++++++++--- + 7 files changed, 86 insertions(+), 21 deletions(-) +Merging crypto-current/master (382811940303 crypto: omap-sham - Fix link error without crypto-engine) +$ 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 (e4eccb853664 vfio/pci: Bypass IGD init in case of -ENODEV) +$ git merge vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (7a6eb7c34a78 selftests: Skip BPF seftests by default) +$ git merge kselftest-fixes/fixes +Already up to date. +Merging modules-fixes/modules-linus (57baec7b1b04 scripts/nsdeps: make sure to pass all module source files to spatch) +$ git merge modules-fixes/modules-linus +Already up to date. +Merging dmaengine-fixes/fixes (e594443196d6 dmaengine: move channel device_node deletion to driver) +$ git merge dmaengine-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/dma/dmaengine.c | 1 - + drivers/dma/idxd/dma.c | 5 +- + drivers/dma/idxd/irq.c | 122 ++++++++++++++++++++++++++++-------------------- + 3 files changed, 75 insertions(+), 53 deletions(-) +Merging backlight-fixes/for-backlight-fixes (5c8fe583cce5 Linux 5.11-rc1) +$ git merge backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/mtd/fixes (b135b3358d73 mtd: rawnand: omap: Use BCH private fields in the specific OOB layout) +$ git merge mtd-fixes/mtd/fixes +Merge made by the 'recursive' strategy. + drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 2 +- + drivers/mtd/nand/raw/intel-nand-controller.c | 5 +++-- + drivers/mtd/nand/raw/nandsim.c | 7 +++---- + drivers/mtd/nand/raw/omap2.c | 15 +++++++++------ + drivers/mtd/nand/spi/core.c | 14 +++++++++++--- + 5 files changed, 27 insertions(+), 16 deletions(-) +Merging mfd-fixes/for-mfd-fixes (5c8fe583cce5 Linux 5.11-rc1) +$ git merge mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (95e9295daa84 media: Revert "media: videobuf2: Fix length check for single plane dmabuf queueing") +$ git merge v4l-dvb-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/media/common/videobuf2/videobuf2-v4l2.c | 3 +-- + drivers/media/i2c/ccs-pll.c | 8 +------- + drivers/media/i2c/ccs/ccs-data.c | 2 +- + drivers/media/pci/intel/ipu3/ipu3-cio2.c | 2 +- + drivers/media/platform/qcom/venus/core.c | 2 ++ + drivers/media/platform/rcar-vin/rcar-core.c | 2 +- + drivers/media/rc/ir-mce_kbd-decoder.c | 2 +- + drivers/media/rc/ite-cir.c | 2 +- + drivers/media/rc/rc-main.c | 8 ++++---- + drivers/media/rc/serial_ir.c | 2 +- + drivers/media/v4l2-core/v4l2-common.c | 4 ++-- + include/media/v4l2-common.h | 4 ++-- + 12 files changed, 18 insertions(+), 23 deletions(-) +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 (7b490a8ab0f2 MIPS: OCTEON: fix unreachable code in octeon_irq_init_ciu) +$ git merge mips-fixes/mips-fixes +Already up to date. +Merging at91-fixes/at91-fixes (5c8fe583cce5 Linux 5.11-rc1) +$ git merge at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (181739822cf6 ARM: dts; gta04: SPI panel chip select is active low) +$ git merge omap-fixes/fixes +Auto-merging drivers/soc/ti/omap_prm.c +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/omap3-gta04.dtsi | 3 +-- + arch/arm/mach-omap1/board-osk.c | 2 ++ + drivers/soc/ti/omap_prm.c | 11 +++++++++++ + 3 files changed, 14 insertions(+), 2 deletions(-) +Merging kvm-fixes/master (7c53f6b671f4 Linux 5.11-rc3) +$ 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 (f6aed68e8a2a hwmon: (ina2) update ti,ina2xx.yaml reference in documentation) +$ git merge hwmon-fixes/hwmon +Merge made by the 'recursive' strategy. + Documentation/hwmon/ina2xx.rst | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging nvdimm-fixes/libnvdimm-fixes (88b67edd7247 dax: Fix compilation for CONFIG_DAX && !CONFIG_FS_DAX) +$ git merge nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging btrfs-fixes/next-fixes (471db1e4bc9b Merge branch 'misc-5.11' into next-fixes) +$ git merge btrfs-fixes/next-fixes +Already up to date! +Merge made by the 'recursive' strategy. +Merging vfs-fixes/fixes (d36a1dd9f77a dump_common_audit_data(): fix racy accesses to ->d_name) +$ git merge vfs-fixes/fixes +Already up to date. +Merging dma-mapping-fixes/for-linus (892fc9f6835e dma-pool: Fix an uninitialized variable bug in atomic_pool_expand()) +$ git merge dma-mapping-fixes/for-linus +Already up to date. +Merging i3c-fixes/i3c/fixes (291b5c9870fc i3c/master/mipi-i3c-hci: Fix position of __maybe_unused in i3c_hci_of_match) +$ git merge i3c-fixes/i3c/fixes +Merge made by the 'recursive' strategy. + drivers/i3c/master/mipi-i3c-hci/core.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging drivers-x86-fixes/fixes (173aac2fef96 platform/x86: thinkpad_acpi: Add P53/73 firmware to fan_quirk_table for dual fan control) +$ git merge drivers-x86-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/platform/surface/Kconfig | 8 +++--- + drivers/platform/surface/surface_gpe.c | 4 +-- + drivers/platform/x86/amd-pmc.c | 2 +- + drivers/platform/x86/hp-wmi.c | 3 ++- + drivers/platform/x86/i2c-multi-instantiate.c | 31 +++++++++++++++++------ + drivers/platform/x86/ideapad-laptop.c | 15 ++++++++++- + drivers/platform/x86/intel-vbtn.c | 10 ++++---- + drivers/platform/x86/thinkpad_acpi.c | 5 ++-- + drivers/platform/x86/touchscreen_dmi.c | 18 +++++++++++++ + tools/power/x86/intel-speed-select/isst-config.c | 32 ++++++++++++++++++++++++ + 10 files changed, 104 insertions(+), 24 deletions(-) +Merging samsung-krzk-fixes/fixes (5c8fe583cce5 Linux 5.11-rc1) +$ git merge samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/fixes (5c8fe583cce5 Linux 5.11-rc1) +$ git merge pinctrl-samsung-fixes/fixes +Already up to date. +Merging devicetree-fixes/dt/linus (5c8fe583cce5 Linux 5.11-rc1) +$ git merge devicetree-fixes/dt/linus +Already up to date. +Merging scsi-fixes/fixes (aa2c24e7f415 scsi: qla2xxx: Fix description for parameter ql2xenforce_iocb_limit) +$ git merge scsi-fixes/fixes +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-driver-ufs | 36 ++++++++++++++++++----------- + drivers/scsi/fnic/vnic_dev.c | 8 ++++--- + drivers/scsi/ibmvscsi/ibmvfc.c | 8 ++++--- + drivers/scsi/libfc/fc_exch.c | 16 +++++++++++-- + drivers/scsi/megaraid/megaraid_sas_base.c | 6 ++--- + drivers/scsi/qla2xxx/qla_os.c | 2 +- + drivers/scsi/scsi_transport_srp.c | 9 +++++++- + drivers/scsi/ufs/Kconfig | 1 + + drivers/scsi/ufs/ufshcd.c | 37 ++++++++++++++++++++---------- + drivers/target/iscsi/iscsi_target_login.c | 2 +- + drivers/target/target_core_user.c | 11 ++++++--- + 11 files changed, 92 insertions(+), 44 deletions(-) +Merging drm-fixes/drm-fixes (19c329f68089 Linux 5.11-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 (1c4995b0a576 drm/i915: Only enable DFP 4:4:4->4:2:0 conversion when outputting YCbCr 4:4:4) +$ git merge drm-intel-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/display/intel_ddi.c | 2 +- + drivers/gpu/drm/i915/display/intel_dp.c | 9 +++---- + drivers/gpu/drm/i915/display/intel_dp.h | 3 ++- + drivers/gpu/drm/i915/display/intel_hdcp.c | 9 +++++++ + drivers/gpu/drm/i915/gt/intel_breadcrumbs.c | 9 ++----- + drivers/gpu/drm/i915/gt/intel_lrc.c | 3 +++ + drivers/gpu/drm/i915/gt/intel_timeline.c | 10 ++++---- + drivers/gpu/drm/i915/i915_pmu.c | 30 ++++++++++++----------- + drivers/gpu/drm/i915/i915_request.h | 37 +++++++++++++++++++++++++---- + 9 files changed, 74 insertions(+), 38 deletions(-) +Merging mmc-fixes/fixes (b503087445ce mmc: core: don't initialize block size from ext_csd if not present) +$ git merge mmc-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/mmc/core/queue.c | 4 +++- + drivers/mmc/host/sdhci-brcmstb.c | 6 +----- + drivers/mmc/host/sdhci-of-dwcmshc.c | 27 +++++++++++++++++++++++++++ + drivers/mmc/host/sdhci-xenon.c | 7 ++++++- + 4 files changed, 37 insertions(+), 7 deletions(-) +Merging rtc-fixes/rtc-fixes (5c8fe583cce5 Linux 5.11-rc1) +$ git merge rtc-fixes/rtc-fixes +Already up to date. +Merging gnss-fixes/gnss-linus (7c53f6b671f4 Linux 5.11-rc3) +$ git merge gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (fff7b5e6ee63 x86/hyperv: Initialize clockevents after LAPIC is initialized) +$ 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 (e557793799c5 RISC-V: Fix maximum allowed phsyical memory for RV32) +$ git merge risc-v-fixes/fixes +Already up to date. +Merging pidfd-fixes/fixes (a409ed156a90 Merge tag 'gpio-v5.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio) +$ git merge pidfd-fixes/fixes +Already up to date. +Merging fpga-fixes/fixes (5c8fe583cce5 Linux 5.11-rc1) +$ git merge fpga-fixes/fixes +Already up to date. +Merging spdx/spdx-linus (5c8fe583cce5 Linux 5.11-rc1) +$ git merge spdx/spdx-linus +Already up to date. +Merging gpio-brgl-fixes/gpio/for-current (298d75c9b188 gpio: tegra: Add missing dependencies) +$ git merge gpio-brgl-fixes/gpio/for-current +Already up to date. +Merging gpio-intel-fixes/fixes (5c8fe583cce5 Linux 5.11-rc1) +$ git merge gpio-intel-fixes/fixes +Already up to date. +Merging pinctrl-intel-fixes/fixes (5c8fe583cce5 Linux 5.11-rc1) +$ git merge pinctrl-intel-fixes/fixes +Already up to date. +Merging erofs-fixes/fixes (a30573b3cdc7 erofs: fix setting up pcluster for temporary pages) +$ 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 (2b8fdbbf1c61 kunit: tool: move kunitconfig parsing into __init__, make it optional) +$ git merge kunit-fixes/kunit-fixes +Merge made by the 'recursive' strategy. + Documentation/dev-tools/kunit/usage.rst | 57 +++++++++++++++++++++++ + tools/testing/kunit/kunit.py | 34 +++++--------- + tools/testing/kunit/kunit_config.py | 7 +-- + tools/testing/kunit/kunit_json.py | 2 +- + tools/testing/kunit/kunit_kernel.py | 54 +++++++++++----------- + tools/testing/kunit/kunit_parser.py | 81 ++++++++++++++++----------------- + 6 files changed, 141 insertions(+), 94 deletions(-) +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 +Merge made by the 'recursive' strategy. + mm/memblock.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging drm-misc-fixes/for-linux-next-fixes (a37eef63bc9e drm/syncobj: Fix use-after-free) +$ git merge drm-misc-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/drm_atomic_helper.c | 2 +- + drivers/gpu/drm/drm_gem_vram_helper.c | 14 +++++++++++--- + drivers/gpu/drm/drm_syncobj.c | 8 +++++--- + drivers/gpu/drm/ttm/ttm_pool.c | 11 ++++++----- + drivers/gpu/drm/vc4/vc4_hdmi.c | 1 + + 5 files changed, 24 insertions(+), 12 deletions(-) +Merging kspp-gustavo/for-next/kspp (36f9ff9e03de lib: Fix fall-through warnings for Clang) +$ git merge kspp-gustavo/for-next/kspp +Already up to date. +Merging kbuild/for-next (537896fabed1 kbuild: give the SUBLEVEL more room in KERNEL_VERSION) +$ git merge kbuild/for-next +Removing scripts/gcc-version.sh +Removing scripts/clang-version.sh +Merge made by the 'recursive' strategy. + Makefile | 9 ++- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 4 +- + drivers/scsi/gdth.c | 6 +- + drivers/usb/core/hcd.c | 4 +- + drivers/usb/gadget/udc/aspeed-vhub/hub.c | 4 +- + include/linux/compiler-clang.h | 10 ---- + include/linux/compiler-gcc.h | 11 ---- + include/linux/usb/composite.h | 4 +- + init/Kconfig | 9 +-- + kernel/sys.c | 2 +- + lib/Kconfig.debug | 1 - + scripts/Kconfig.include | 6 ++ + scripts/cc-version.sh | 82 ++++++++++++++++++++++++++ + scripts/clang-version.sh | 19 ------ + scripts/gcc-version.sh | 20 ------- + scripts/genksyms/genksyms.c | 2 +- + scripts/genksyms/genksyms.h | 2 +- + scripts/genksyms/lex.l | 56 +----------------- + tools/perf/tests/bpf-script-example.c | 2 +- + tools/perf/tests/bpf-script-test-kbuild.c | 2 +- + tools/perf/tests/bpf-script-test-prologue.c | 2 +- + 21 files changed, 117 insertions(+), 140 deletions(-) + create mode 100755 scripts/cc-version.sh + delete mode 100755 scripts/clang-version.sh + delete mode 100755 scripts/gcc-version.sh +Merging compiler-attributes/compiler-attributes (196793946264 Compiler Attributes: remove CONFIG_ENABLE_MUST_CHECK) +$ git merge compiler-attributes/compiler-attributes +Already up to date. +Merging dma-mapping/for-next (f726c72d6c05 dma-mapping: benchmark: check the validity of dma mask bits) +$ git merge dma-mapping/for-next +Merge made by the 'recursive' strategy. + kernel/dma/map_benchmark.c | 6 ++++++ + 1 file changed, 6 insertions(+) +Merging asm-generic/master (2c85ebc57b3e Linux 5.10) +$ git merge asm-generic/master +Already up to date. +Merging arc/for-next (def9d2780727 Linux 5.5-rc7) +$ git merge arc/for-next +Already up to date. +Merging arm/for-next (ecbbb88727ae Merge branch 'devel-stable' into for-next) +$ git merge arm/for-next +Already up to date. +Merging arm64/for-next/core (8e7bc9477994 Merge branches 'for-next/from-tip/irq/urgent', 'for-next/misc', 'for-next/perf', 'for-next/rng', 'for-next/selftests', 'for-next/stacktrace', 'for-next/topology' and 'for-next/vdso' into for-next/core) +$ git merge arm64/for-next/core +Merge made by the 'recursive' strategy. + arch/arm64/Makefile | 10 +- + arch/arm64/include/asm/kvm_asm.h | 8 +- + arch/arm64/include/asm/sysreg.h | 9 +- + arch/arm64/kernel/Makefile | 5 +- + arch/arm64/kernel/entry.S | 10 +- + arch/arm64/kernel/stacktrace.c | 13 +-- + arch/arm64/kernel/topology.c | 115 ++++++++++----------- + arch/arm64/kernel/{vdso/vdso.S => vdso-wrap.S} | 0 + arch/arm64/kernel/vdso/Makefile | 1 - + arch/arm64/kernel/vdso/gen_vdso_offsets.sh | 2 +- + arch/arm64/kernel/{vdso32/vdso.S => vdso32-wrap.S} | 0 + arch/arm64/kernel/vdso32/Makefile | 1 - + arch/arm64/mm/mmu.c | 2 + + drivers/irqchip/Kconfig | 5 +- + drivers/irqchip/irq-bcm2836.c | 4 +- + drivers/irqchip/irq-loongson-liointc.c | 4 +- + drivers/irqchip/irq-mips-cpu.c | 7 ++ + drivers/irqchip/irq-sl28cpld.c | 2 +- + drivers/perf/arm-cci.c | 2 +- + drivers/perf/arm-cmn.c | 2 +- + drivers/perf/arm_dmc620_pmu.c | 4 +- + drivers/perf/arm_pmu.c | 2 +- + drivers/perf/arm_smmuv3_pmu.c | 8 +- + drivers/perf/arm_spe_pmu.c | 23 ++++- + drivers/perf/fsl_imx8_ddr_perf.c | 10 +- + drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c | 2 +- + drivers/perf/hisilicon/hisi_uncore_hha_pmu.c | 2 +- + drivers/perf/hisilicon/hisi_uncore_l3c_pmu.c | 2 +- + drivers/perf/qcom_l2_pmu.c | 6 +- + drivers/perf/qcom_l3_pmu.c | 6 +- + include/linux/arm-smccc.h | 31 ++++++ + kernel/irq/manage.c | 1 + + kernel/irq/msi.c | 2 +- + .../selftests/arm64/mte/check_buffer_fill.c | 2 +- + 34 files changed, 176 insertions(+), 127 deletions(-) + rename arch/arm64/kernel/{vdso/vdso.S => vdso-wrap.S} (100%) + rename arch/arm64/kernel/{vdso32/vdso.S => vdso32-wrap.S} (100%) +Merging arm-perf/for-next/perf (f0c140481d1b perf: Constify static struct attribute_group) +$ git merge arm-perf/for-next/perf +Already up to date. +Merging arm-soc/for-next (5297ef205781 soc: document merges) +$ git merge arm-soc/for-next +Removing arch/arm/mach-picoxcell/common.c +Removing arch/arm/mach-picoxcell/Makefile +Removing arch/arm/mach-picoxcell/Kconfig +Removing arch/arm/mach-efm32/dtmachine.c +Removing arch/arm/mach-efm32/Makefile.boot +Removing arch/arm/mach-efm32/Makefile +Removing arch/arm/include/debug/efm32.S +Removing arch/arm/configs/efm32_defconfig +Removing arch/arm/boot/dts/picoxcell-pc7302-pc3x3.dts +Removing arch/arm/boot/dts/picoxcell-pc7302-pc3x2.dts +Removing arch/arm/boot/dts/picoxcell-pc3x3.dtsi +Removing arch/arm/boot/dts/picoxcell-pc3x2.dtsi +Removing arch/arm/boot/dts/efm32gg.dtsi +Removing arch/arm/boot/dts/efm32gg-dk3750.dts +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/renesas.yaml | 2 + + .../devicetree/bindings/vendor-prefixes.yaml | 4 +- + MAINTAINERS | 16 - + arch/arm/Kconfig | 12 +- + arch/arm/Kconfig.debug | 30 +- + arch/arm/Makefile | 2 - + arch/arm/arm-soc-for-next-contents.txt | 39 +++ + arch/arm/boot/dts/Makefile | 5 - + arch/arm/boot/dts/berlin2.dtsi | 12 +- + arch/arm/boot/dts/berlin2cd-google-chromecast.dts | 6 +- + arch/arm/boot/dts/berlin2cd.dtsi | 12 +- + arch/arm/boot/dts/berlin2q.dtsi | 12 +- + arch/arm/boot/dts/efm32gg-dk3750.dts | 88 ----- + arch/arm/boot/dts/efm32gg.dtsi | 177 ---------- + arch/arm/boot/dts/picoxcell-pc3x2.dtsi | 243 -------------- + arch/arm/boot/dts/picoxcell-pc3x3.dtsi | 355 --------------------- + arch/arm/boot/dts/picoxcell-pc7302-pc3x2.dts | 78 ----- + arch/arm/boot/dts/picoxcell-pc7302-pc3x3.dts | 84 ----- + arch/arm/configs/efm32_defconfig | 98 ------ + arch/arm/include/debug/efm32.S | 45 --- + arch/arm/mach-efm32/Makefile | 2 - + arch/arm/mach-efm32/Makefile.boot | 4 - + arch/arm/mach-efm32/dtmachine.c | 16 - + arch/arm/mach-picoxcell/Kconfig | 9 - + arch/arm/mach-picoxcell/Makefile | 2 - + arch/arm/mach-picoxcell/common.c | 81 ----- + arch/arm/mm/Kconfig | 1 - + arch/arm64/boot/dts/renesas/Makefile | 2 + + .../boot/dts/renesas/beacon-renesom-baseboard.dtsi | 137 ++++---- + .../arm64/boot/dts/renesas/beacon-renesom-som.dtsi | 43 ++- + .../boot/dts/renesas/r8a774a1-beacon-rzg2m-kit.dts | 41 +++ + arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 32 ++ + .../boot/dts/renesas/r8a774b1-beacon-rzg2n-kit.dts | 66 ++++ + arch/arm64/boot/dts/renesas/r8a774b1.dtsi | 32 ++ + arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 17 + + .../boot/dts/renesas/r8a774e1-beacon-rzg2h-kit.dts | 71 +++++ + arch/arm64/boot/dts/renesas/r8a774e1.dtsi | 32 ++ + arch/arm64/boot/dts/renesas/r8a77951.dtsi | 65 ++++ + arch/arm64/boot/dts/renesas/r8a77960.dtsi | 65 ++++ + arch/arm64/boot/dts/renesas/r8a77961.dtsi | 135 ++++++++ + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 65 ++++ + arch/arm64/boot/dts/renesas/r8a77990.dtsi | 65 ++++ + arch/arm64/boot/dts/renesas/r8a77995.dtsi | 135 ++++++++ + arch/arm64/boot/dts/renesas/r8a779a0-falcon.dts | 5 + + arch/arm64/boot/dts/renesas/r8a779a0.dtsi | 217 +++++++++++++ + arch/arm64/boot/dts/synaptics/as370.dtsi | 4 +- + arch/arm64/boot/dts/synaptics/berlin4ct.dtsi | 12 +- + 47 files changed, 1214 insertions(+), 1462 deletions(-) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + delete mode 100644 arch/arm/boot/dts/efm32gg-dk3750.dts + delete mode 100644 arch/arm/boot/dts/efm32gg.dtsi + delete mode 100644 arch/arm/boot/dts/picoxcell-pc3x2.dtsi + delete mode 100644 arch/arm/boot/dts/picoxcell-pc3x3.dtsi + delete mode 100644 arch/arm/boot/dts/picoxcell-pc7302-pc3x2.dts + delete mode 100644 arch/arm/boot/dts/picoxcell-pc7302-pc3x3.dts + delete mode 100644 arch/arm/configs/efm32_defconfig + delete mode 100644 arch/arm/include/debug/efm32.S + delete mode 100644 arch/arm/mach-efm32/Makefile + delete mode 100644 arch/arm/mach-efm32/Makefile.boot + delete mode 100644 arch/arm/mach-efm32/dtmachine.c + delete mode 100644 arch/arm/mach-picoxcell/Kconfig + delete mode 100644 arch/arm/mach-picoxcell/Makefile + delete mode 100644 arch/arm/mach-picoxcell/common.c + create mode 100644 arch/arm64/boot/dts/renesas/r8a774b1-beacon-rzg2n-kit.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a774e1-beacon-rzg2h-kit.dts +Merging actions/for-next (a501abf8d8cb Merge branch 'v5.12/soc' into for-next) +$ git merge actions/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + arch/arm/boot/dts/owl-s500-cubieboard6.dts | 7 -- + arch/arm/boot/dts/owl-s500-guitar-bb-rev-b.dts | 7 -- + arch/arm/boot/dts/owl-s500-labrador-base-m.dts | 7 -- + arch/arm/boot/dts/owl-s500-roseapplepi.dts | 97 ++++++++++++++++- + arch/arm/boot/dts/owl-s500-sparky.dts | 7 -- + arch/arm/boot/dts/owl-s500.dtsi | 140 +++++++++++++++++++++++++ + 7 files changed, 233 insertions(+), 33 deletions(-) +Merging amlogic/for-next (dc589daea7a0 Merge branch 'v5.12/dt64' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 2 +- + .../boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 4 ++-- + arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 4 ++-- + arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi | 19 +++++++++---------- + arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts | 8 ++++---- + 5 files changed, 18 insertions(+), 19 deletions(-) +Merging aspeed/for-next (41707a524026 Merge branches 'soc-for-v5.11' and 'defconfig-for-v5.11' into for-next) +$ git merge aspeed/for-next +Merge made by the 'recursive' strategy. + arch/arm/configs/aspeed_g5_defconfig | 4 ++++ + 1 file changed, 4 insertions(+) +Merging at91/at91-next (5086cfd2dbf0 Merge branch 'at91-dt' into at91-next) +$ git merge at91/at91-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/at91-kizbox3_common.dtsi | 1 - + arch/arm/boot/dts/at91-sama5d27_som1_ek.dts | 1 - + arch/arm/boot/dts/at91-sama5d27_wlsom1.dtsi | 22 ++++++++++++++++++++-- + arch/arm/boot/dts/at91-sama5d27_wlsom1_ek.dts | 1 - + arch/arm/boot/dts/at91-sama5d2_icp.dts | 1 - + arch/arm/boot/dts/at91-sama5d2_ptc_ek.dts | 1 - + arch/arm/boot/dts/at91-sama5d2_xplained.dts | 1 - + arch/arm/configs/at91_dt_defconfig | 1 - + arch/arm/configs/multi_v5_defconfig | 1 - + arch/arm/configs/multi_v7_defconfig | 1 - + arch/arm/configs/sama5_defconfig | 1 - + drivers/soc/atmel/soc.c | 12 ++++++++++++ + 12 files changed, 32 insertions(+), 12 deletions(-) +Merging drivers-memory/for-next (81053f0e95da Merge branch 'for-v5.12/tegra-mc' into for-next) +$ git merge drivers-memory/for-next +Removing include/soc/tegra/emc.h +Merge made by the 'recursive' strategy. + .../memory-controllers/renesas,rpc-if.yaml | 6 +- + drivers/clk/tegra/Kconfig | 3 + + drivers/clk/tegra/Makefile | 2 +- + drivers/clk/tegra/clk-tegra124-emc.c | 41 ++- + drivers/clk/tegra/clk-tegra124.c | 26 +- + drivers/clk/tegra/clk.h | 18 +- + drivers/memory/Kconfig | 6 +- + drivers/memory/emif.c | 3 +- + drivers/memory/mtk-smi.c | 4 +- + drivers/memory/tegra/Kconfig | 4 +- + drivers/memory/tegra/tegra124-emc.c | 377 ++++++++++++++++++--- + drivers/memory/tegra/tegra124.c | 82 ++++- + include/linux/clk/tegra.h | 8 + + include/soc/tegra/emc.h | 16 - + 14 files changed, 517 insertions(+), 79 deletions(-) + delete mode 100644 include/soc/tegra/emc.h +Merging imx-mxs/for-next (5df5ec0e41f3 Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/fsl.yaml | 21 + + .../bindings/display/panel/panel-simple.yaml | 19 +- + .../devicetree/bindings/soc/imx/imx8m-soc.yaml | 86 +++ + .../devicetree/bindings/vendor-prefixes.yaml | 4 + + arch/arm/boot/dts/Makefile | 8 + + arch/arm/boot/dts/e60k02.dtsi | 6 + + arch/arm/boot/dts/imx28.dtsi | 10 + + arch/arm/boot/dts/imx6-logicpd-baseboard.dtsi | 1 - + arch/arm/boot/dts/imx6dl-plybas.dts | 394 ++++++++++ + arch/arm/boot/dts/imx6dl-plym2m.dts | 446 +++++++++++ + arch/arm/boot/dts/imx6dl-prtmvt.dts | 852 +++++++++++++++++++++ + arch/arm/boot/dts/imx6dl-victgo.dts | 852 +++++++++++++++++++++ + arch/arm/boot/dts/imx6dl-vicut1.dts | 13 + + arch/arm/boot/dts/imx6q-vicut1.dts | 17 + + arch/arm/boot/dts/imx6q.dtsi | 20 +- + arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-sr-som.dtsi | 12 +- + arch/arm/boot/dts/imx6qdl-vicut1.dtsi | 803 +++++++++++++++++++ + arch/arm/boot/dts/imx6qdl.dtsi | 25 +- + arch/arm/boot/dts/imx6qp-vicutp.dts | 13 + + arch/arm/boot/dts/imx6sl-tolino-shine2hd.dts | 18 +- + arch/arm/boot/dts/imx6sl-tolino-shine3.dts | 15 +- + arch/arm/boot/dts/imx6sll-kobo-clarahd.dts | 13 +- + arch/arm/boot/dts/imx6sx-sdb.dtsi | 2 + + arch/arm/boot/dts/imx6ul-14x14-evk.dtsi | 54 +- + arch/arm/boot/dts/imx6ul-prti6g.dts | 356 +++++++++ + arch/arm/boot/dts/imx6ul.dtsi | 2 + + arch/arm/boot/dts/imx7d-flex-concentrator.dts | 1 + + arch/arm/boot/dts/imx7s.dtsi | 1 + + arch/arm/configs/imx_v6_v7_defconfig | 1 + + arch/arm/mach-imx/mach-imx6ul.c | 25 +- + arch/arm/mach-imx/suspend-imx6.S | 1 + + arch/arm64/boot/dts/freescale/Makefile | 6 + + arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts | 5 + + arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts | 5 + + arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 60 +- + .../fsl-ls1028a-kontron-kbox-a-230-ls.dts | 4 + + .../freescale/fsl-ls1028a-kontron-sl28-var1.dts | 62 ++ + .../fsl-ls1028a-kontron-sl28-var3-ads2.dts | 5 +- + arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 174 +++-- + arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 98 ++- + arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts | 3 + + arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 98 ++- + arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts | 6 +- + arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 122 ++- + arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi | 17 +- + arch/arm64/boot/dts/freescale/fsl-ls2088a.dtsi | 17 +- + arch/arm64/boot/dts/freescale/fsl-ls208xa-rdb.dtsi | 4 +- + arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 118 ++- + .../arm64/boot/dts/freescale/fsl-lx2160a-cex7.dtsi | 2 - + .../dts/freescale/fsl-lx2160a-clearfog-itx.dtsi | 12 + + arch/arm64/boot/dts/freescale/fsl-lx2160a-qds.dts | 2 + + arch/arm64/boot/dts/freescale/fsl-lx2160a-rdb.dts | 8 +- + arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 123 ++- + arch/arm64/boot/dts/freescale/fsl-lx2162a-qds.dts | 2 + + .../dts/freescale/imx8mm-beacon-baseboard.dtsi | 1 - + .../boot/dts/freescale/imx8mm-beacon-som.dtsi | 4 +- + .../boot/dts/freescale/imx8mm-venice-gw700x.dtsi | 495 ++++++++++++ + .../boot/dts/freescale/imx8mm-venice-gw71xx-0x.dts | 19 + + .../boot/dts/freescale/imx8mm-venice-gw71xx.dtsi | 186 +++++ + .../boot/dts/freescale/imx8mm-venice-gw72xx-0x.dts | 20 + + .../boot/dts/freescale/imx8mm-venice-gw72xx.dtsi | 311 ++++++++ + .../boot/dts/freescale/imx8mm-venice-gw73xx-0x.dts | 19 + + .../boot/dts/freescale/imx8mm-venice-gw73xx.dtsi | 362 +++++++++ + arch/arm64/boot/dts/freescale/imx8mm.dtsi | 23 +- + .../dts/freescale/imx8mn-beacon-baseboard.dtsi | 307 ++++++++ + .../arm64/boot/dts/freescale/imx8mn-beacon-kit.dts | 19 + + .../boot/dts/freescale/imx8mn-beacon-som.dtsi | 438 +++++++++++ + arch/arm64/boot/dts/freescale/imx8mn-evk.dtsi | 75 ++ + arch/arm64/boot/dts/freescale/imx8mn.dtsi | 31 +- + .../dts/freescale/imx8mp-phyboard-pollux-rdk.dts | 161 ++++ + .../boot/dts/freescale/imx8mp-phycore-som.dtsi | 293 +++++++ + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 25 +- + .../boot/dts/freescale/imx8mq-librem5-devkit.dts | 20 +- + .../arm64/boot/dts/freescale/imx8mq-librem5-r3.dts | 6 + + arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi | 28 +- + arch/arm64/boot/dts/freescale/imx8mq.dtsi | 70 +- + arch/arm64/boot/dts/freescale/qoriq-fman3-0.dtsi | 6 +- + arch/arm64/configs/defconfig | 16 + + drivers/clk/imx/clk-imx8qxp.c | 26 +- + drivers/firmware/imx/Kconfig | 1 + + drivers/soc/imx/soc-imx8m.c | 84 +- + include/dt-bindings/clock/imx8-clock.h | 2 + + 83 files changed, 7760 insertions(+), 333 deletions(-) + create mode 100644 Documentation/devicetree/bindings/soc/imx/imx8m-soc.yaml + create mode 100644 arch/arm/boot/dts/imx6dl-plybas.dts + create mode 100644 arch/arm/boot/dts/imx6dl-plym2m.dts + create mode 100644 arch/arm/boot/dts/imx6dl-prtmvt.dts + create mode 100644 arch/arm/boot/dts/imx6dl-victgo.dts + create mode 100644 arch/arm/boot/dts/imx6dl-vicut1.dts + create mode 100644 arch/arm/boot/dts/imx6q-vicut1.dts + create mode 100644 arch/arm/boot/dts/imx6qdl-vicut1.dtsi + create mode 100644 arch/arm/boot/dts/imx6qp-vicutp.dts + create mode 100644 arch/arm/boot/dts/imx6ul-prti6g.dts + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var1.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-venice-gw700x.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-venice-gw71xx-0x.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-venice-gw71xx.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-venice-gw72xx-0x.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-venice-gw72xx.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-venice-gw73xx-0x.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-venice-gw73xx.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mn-beacon-baseboard.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mn-beacon-kit.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mn-beacon-som.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-phyboard-pollux-rdk.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-phycore-som.dtsi +Merging keystone/next (b2a8f6ce4bdc Merge branch 'for_5.11/drivers-soc' into next) +$ git merge keystone/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging mediatek/for-next (727bfb2c55b0 Merge branch 'v5.10-next/soc' into for-next) +$ git merge mediatek/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (dc14300bb67b 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 (792952314166 Merge branch 'omap-for-v5.11/dt' into for-next) +$ git merge omap/for-next +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/boot/dts/omap3-gta04.dtsi +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/am335x-evm.dts | 13 ++++++---- + arch/arm/boot/dts/am335x-evmsk.dts | 14 +++++------ + arch/arm/boot/dts/am335x-icev2.dts | 14 +++++------ + arch/arm/boot/dts/am33xx-l4.dtsi | 49 ++++++++++++++++++++++++++++++++++++++ + arch/arm/boot/dts/am574x-idk.dts | 4 ++++ + arch/arm/boot/dts/dra71-evm.dts | 2 ++ + arch/arm/boot/dts/dra76x.dtsi | 36 ++++++++++++++++++++++++++++ + arch/arm/boot/dts/omap3-gta04.dtsi | 4 ++-- + 8 files changed, 113 insertions(+), 23 deletions(-) +Merging qcom/for-next (21adad137585 Merge branches 'arm64-defconfig-for-5.12', 'arm64-for-5.12', 'drivers-for-5.12' and 'dts-for-5.12' into for-next) +$ git merge qcom/for-next +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm/boot/dts/Makefile +Removing Documentation/devicetree/bindings/soc/qcom/qcom,smem.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/msm/qcom,llcc.yaml | 1 + + Documentation/devicetree/bindings/arm/qcom.yaml | 6 + + .../devicetree/bindings/soc/qcom/qcom,smem.txt | 57 -- + .../devicetree/bindings/soc/qcom/qcom,smem.yaml | 72 +++ + arch/arm/boot/dts/Makefile | 3 +- + arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts | 4 +- + arch/arm/boot/dts/qcom-pmx55.dtsi | 84 +++ + arch/arm/boot/dts/qcom-sdx55-mtp.dts | 230 ++++++++ + arch/arm/boot/dts/qcom-sdx55.dtsi | 408 +++++++++++++ + arch/arm64/boot/dts/qcom/Makefile | 3 + + arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts | 195 +++++++ + .../dts/qcom/msm8916-samsung-a2015-common.dtsi | 6 + + .../boot/dts/qcom/msm8916-samsung-a5u-eur.dts | 2 +- + arch/arm64/boot/dts/qcom/pm8150.dtsi | 10 + + arch/arm64/boot/dts/qcom/pm8150b.dtsi | 10 + + arch/arm64/boot/dts/qcom/pm8150l.dtsi | 10 + + arch/arm64/boot/dts/qcom/pmi8998.dtsi | 8 +- + arch/arm64/boot/dts/qcom/qrb5165-rb5.dts | 446 +++++++++++++- + arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 91 +-- + arch/arm64/boot/dts/qcom/sc7180.dtsi | 26 +- + arch/arm64/boot/dts/qcom/sdm630.dtsi | 12 +- + arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 8 +- + .../arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 623 ++++++++++++++++++++ + .../boot/dts/qcom/sdm845-oneplus-enchilada.dts | 19 + + arch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dts | 23 + + .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 16 +- + arch/arm64/boot/dts/qcom/sdm850.dtsi | 21 + + arch/arm64/boot/dts/qcom/sm8150.dtsi | 157 +++++ + arch/arm64/boot/dts/qcom/sm8250-mtp.dts | 269 +++++++++ + arch/arm64/boot/dts/qcom/sm8250.dtsi | 646 ++++++++++++++++++++- + arch/arm64/configs/defconfig | 11 +- + drivers/soc/qcom/llcc-qcom.c | 50 ++ + drivers/soc/qcom/rpmh-rsc.c | 24 +- + drivers/soc/qcom/smem.c | 4 +- + drivers/soc/qcom/socinfo.c | 105 +++- + include/linux/soc/qcom/llcc-qcom.h | 3 + + include/soc/qcom/tcs.h | 9 +- + 37 files changed, 3442 insertions(+), 230 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,smem.txt + create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,smem.yaml + create mode 100644 arch/arm/boot/dts/qcom-pmx55.dtsi + create mode 100644 arch/arm/boot/dts/qcom-sdx55-mtp.dts + create mode 100644 arch/arm/boot/dts/qcom-sdx55.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts + create mode 100644 arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sdm845-oneplus-enchilada.dts + create mode 100644 arch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dts + create mode 100644 arch/arm64/boot/dts/qcom/sdm850.dtsi +Merging raspberrypi/for-next (e10bb7f95cba ARM: dts: bcm2711: Use compatible string for BCM2711 DSI1) +$ git merge raspberrypi/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/bcm2711.dtsi | 1 + + 1 file changed, 1 insertion(+) +Merging realtek/for-next (486f29df6941 Merge branch 'v5.8/dt' into next) +$ git merge realtek/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging renesas/next (b72b30fb341d Merge branch 'renesas-arm-dt-for-v5.12' into renesas-next) +$ git merge renesas/next +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/renesas/r8a779a0.dtsi | 90 +++++++++++++++++++++++++++++++ + 1 file changed, 90 insertions(+) +Merging reset/reset/next (ac9b7554afeb reset: core: fix a kernel-doc markup) +$ git merge reset/reset/next +Removing Documentation/devicetree/bindings/reset/hisilicon,hi3660-reset.txt +Merge made by the 'recursive' strategy. + .../reset/brcm,bcm4908-misc-pcie-reset.yaml | 39 +++++++++++ + .../bindings/reset/hisilicon,hi3660-reset.txt | 44 ------------- + .../bindings/reset/hisilicon,hi3660-reset.yaml | 77 ++++++++++++++++++++++ + drivers/reset/Kconfig | 2 +- + drivers/reset/core.c | 4 +- + drivers/reset/hisilicon/reset-hi3660.c | 9 ++- + drivers/reset/reset-simple.c | 2 + + 7 files changed, 128 insertions(+), 49 deletions(-) + create mode 100644 Documentation/devicetree/bindings/reset/brcm,bcm4908-misc-pcie-reset.yaml + delete mode 100644 Documentation/devicetree/bindings/reset/hisilicon,hi3660-reset.txt + create mode 100644 Documentation/devicetree/bindings/reset/hisilicon,hi3660-reset.yaml +Merging rockchip/for-next (8ff9cfc48824 Merge branch 'v5.12-armsoc/dts64' into for-next) +$ git merge rockchip/for-next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/rockchip.yaml | 5 + + arch/arm/boot/dts/rk3036.dtsi | 52 +++ + arch/arm/boot/dts/rk3288-miqi.dts | 5 + + arch/arm/boot/dts/rk3288.dtsi | 34 +- + arch/arm/boot/dts/rk3xxx.dtsi | 25 +- + arch/arm/boot/dts/rv1108.dtsi | 11 + + arch/arm64/boot/dts/rockchip/Makefile | 1 + + arch/arm64/boot/dts/rockchip/px30.dtsi | 57 +-- + arch/arm64/boot/dts/rockchip/rk3308.dtsi | 15 + + arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts | 382 +++++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 56 ++- + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 4 + + arch/arm64/boot/dts/rockchip/rk3368.dtsi | 4 +- + .../boot/dts/rockchip/rk3399-pinebook-pro.dts | 1 - + arch/arm64/boot/dts/rockchip/rk3399-rock960.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi | 27 ++ + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 57 ++- + arch/arm64/configs/defconfig | 1 + + 18 files changed, 628 insertions(+), 111 deletions(-) + create mode 100644 arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts +Merging samsung-krzk/for-next (f9e152f18310 Merge branch 'next/drivers' into for-next) +$ git merge samsung-krzk/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/exynos3250-artik5.dtsi | 2 +- + arch/arm/boot/dts/exynos3250-monk.dts | 2 +- + arch/arm/boot/dts/exynos3250-rinato.dts | 2 +- + arch/arm/boot/dts/exynos4210-i9100.dts | 30 ++++--- + arch/arm/boot/dts/exynos5250-spring.dts | 2 +- + arch/arm/boot/dts/exynos5420-arndale-octa.dts | 2 +- + arch/arm/boot/dts/exynos5422-odroid-core.dtsi | 2 +- + arch/arm/boot/dts/exynos54xx.dtsi | 6 +- + arch/arm/mach-exynos/Kconfig | 1 - + .../boot/dts/exynos/exynos5433-tm2-common.dtsi | 4 +- + arch/arm64/boot/dts/exynos/exynos7-espresso.dts | 2 +- + drivers/soc/samsung/Kconfig | 12 ++- + drivers/soc/samsung/Makefile | 3 +- + drivers/soc/samsung/exynos-asv.c | 57 +++++-------- + drivers/soc/samsung/exynos-asv.h | 2 + + drivers/soc/samsung/exynos-chipid.c | 71 +++++++++++----- + drivers/soc/samsung/pm_domains.c | 97 +++++++++++----------- + 17 files changed, 155 insertions(+), 142 deletions(-) +Merging scmi/for-linux-next (550132a6d8f2 Merge tag 'scmi-updates-5.12' 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. + Documentation/devicetree/bindings/arm/arm,scmi.txt | 8 +++++ + MAINTAINERS | 2 ++ + drivers/firmware/arm_scmi/driver.c | 4 +-- + drivers/firmware/arm_scmi/smc.c | 42 +++++++++++++++++++++- + 4 files changed, 53 insertions(+), 3 deletions(-) +Merging stm32/stm32-next (8ba396551d5d ARM: dts: stm32: Disable KS8851 and FMC on PicoITX board) +$ git merge stm32/stm32-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/stm32mp157c-lxa-mc1.dts | 13 +++++++------ + arch/arm/boot/dts/stm32mp15xx-dhcom-drc02.dtsi | 16 +++++++++++----- + arch/arm/boot/dts/stm32mp15xx-dhcom-picoitx.dtsi | 12 ++++++++++-- + arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi | 18 ++++++++++++++++-- + 4 files changed, 44 insertions(+), 15 deletions(-) +Merging sunxi/sunxi/for-next (ab33b69c3299 Merge branch 'sunxi/drivers-for-5.12' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/sunxi.yaml | 19 +- + .../bindings/iio/adc/x-powers,axp209-adc.yaml | 12 +- + .../allwinner,sun7i-a20-sc-nmi.yaml | 3 + + .../media/allwinner,sun8i-h3-deinterlace.yaml | 3 + + .../bindings/rtc/allwinner,sun6i-a31-rtc.yaml | 1 - + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/sun4i-a10-a1000.dts | 4 +- + arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 4 +- + arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts | 1 + + arch/arm/boot/dts/sun4i-a10-inet1.dts | 1 + + arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts | 2 +- + arch/arm/boot/dts/sun4i-a10-marsboard.dts | 8 +- + arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts | 2 +- + arch/arm/boot/dts/sun4i-a10-pcduino.dts | 4 +- + arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts | 1 + + arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts | 2 +- + arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts | 2 +- + arch/arm/boot/dts/sun5i-a10s-mk802.dts | 2 +- + arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 2 +- + arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts | 2 +- + arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts | 2 +- + .../boot/dts/sun5i-a13-empire-electronix-d709.dts | 1 + + arch/arm/boot/dts/sun5i-a13-licheepi-one.dts | 6 +- + arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts | 2 +- + arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 2 +- + .../boot/dts/sun5i-a13-pocketbook-touch-lux-3.dts | 3 +- + arch/arm/boot/dts/sun5i-a13.dtsi | 2 +- + arch/arm/boot/dts/sun5i-gr8-evb.dts | 2 +- + .../boot/dts/sun5i-reference-design-tablet.dtsi | 1 + + arch/arm/boot/dts/sun5i.dtsi | 12 ++ + arch/arm/boot/dts/sun6i-a31-i7.dts | 2 +- + arch/arm/boot/dts/sun6i-a31-m9.dts | 2 +- + arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts | 2 +- + arch/arm/boot/dts/sun6i-a31.dtsi | 2 +- + arch/arm/boot/dts/sun6i-a31s-primo81.dts | 1 - + arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts | 77 +++++++- + arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts | 4 +- + arch/arm/boot/dts/sun7i-a20-bananapi.dts | 2 +- + arch/arm/boot/dts/sun7i-a20-bananapro.dts | 4 +- + arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 4 +- + arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 8 +- + arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts | 4 +- + arch/arm/boot/dts/sun7i-a20-itead-ibox.dts | 4 +- + arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts | 2 +- + arch/arm/boot/dts/sun7i-a20-m3.dts | 2 +- + arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts | 2 +- + arch/arm/boot/dts/sun7i-a20-olimex-som204-evb.dts | 6 +- + arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts | 2 +- + arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 2 +- + arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 2 +- + arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts | 4 +- + arch/arm/boot/dts/sun7i-a20-orangepi.dts | 2 +- + arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts | 6 +- + arch/arm/boot/dts/sun7i-a20-pcduino3.dts | 4 +- + arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts | 1 + + arch/arm/boot/dts/sun7i-a20.dtsi | 2 +- + arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dts | 2 +- + arch/arm/boot/dts/sun8i-a33-olinuxino.dts | 2 +- + arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts | 1 + + arch/arm/boot/dts/sun8i-a33.dtsi | 2 +- + arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts | 4 +- + arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts | 8 +- + arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts | 2 +- + arch/arm/boot/dts/sun8i-a83t.dtsi | 9 - + .../boot/dts/sun8i-h2-plus-bananapi-m2-zero.dts | 30 +++ + arch/arm/boot/dts/sun8i-h3-beelink-x2.dts | 4 +- + arch/arm/boot/dts/sun8i-h3-nanopi-duo2.dts | 4 +- + arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts | 4 +- + arch/arm/boot/dts/sun8i-h3-nanopi-r1.dts | 4 +- + arch/arm/boot/dts/sun8i-h3-nanopi.dtsi | 4 +- + arch/arm/boot/dts/sun8i-h3-orangepi-zero-plus2.dts | 4 +- + arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts | 6 +- + arch/arm/boot/dts/sun8i-r16-parrot.dts | 8 +- + arch/arm/boot/dts/sun8i-r40.dtsi | 35 ++-- + .../boot/dts/sun8i-reference-design-tablet.dtsi | 1 + + arch/arm/boot/dts/sun8i-s3-elimo-impetus.dtsi | 2 +- + arch/arm/boot/dts/sun8i-s3-pinecube.dts | 11 +- + arch/arm/boot/dts/sun8i-v3-sl631-imx179.dts | 12 ++ + arch/arm/boot/dts/sun8i-v3-sl631.dtsi | 138 +++++++++++++ + arch/arm/boot/dts/sun8i-v3s.dtsi | 17 +- + arch/arm/boot/dts/sun9i-a80-cubieboard4.dts | 4 +- + arch/arm/boot/dts/sunxi-bananapi-m2-plus.dtsi | 1 + + arch/arm64/boot/dts/allwinner/Makefile | 1 + + arch/arm64/boot/dts/allwinner/sun50i-a100.dtsi | 20 -- + .../boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | 6 +- + .../boot/dts/allwinner/sun50i-a64-nanopi-a64.dts | 2 +- + .../boot/dts/allwinner/sun50i-a64-pine64-lts.dts | 11 ++ + .../boot/dts/allwinner/sun50i-a64-pinebook.dts | 5 +- + .../dts/allwinner/sun50i-a64-pinephone-1.0.dts | 2 +- + .../dts/allwinner/sun50i-a64-pinephone-1.1.dts | 2 +- + .../dts/allwinner/sun50i-a64-pinephone-1.2.dts | 2 +- + .../boot/dts/allwinner/sun50i-a64-pinephone.dtsi | 18 +- + .../allwinner/sun50i-a64-pinetab-early-adopter.dts | 26 +++ + .../boot/dts/allwinner/sun50i-a64-pinetab.dts | 2 +- + .../dts/allwinner/sun50i-a64-sopine-baseboard.dts | 1 + + .../boot/dts/allwinner/sun50i-a64-sopine.dtsi | 1 - + .../boot/dts/allwinner/sun50i-a64-teres-i.dts | 4 +- + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 20 +- + .../dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts | 4 +- + .../boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts | 4 +- + .../boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts | 4 +- + .../dts/allwinner/sun50i-h5-orangepi-prime.dts | 4 +- + .../dts/allwinner/sun50i-h5-orangepi-zero-plus.dts | 4 +- + .../allwinner/sun50i-h5-orangepi-zero-plus2.dts | 4 +- + arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 19 +- + .../boot/dts/allwinner/sun50i-h6-beelink-gs1.dts | 2 +- + .../boot/dts/allwinner/sun50i-h6-cpu-opp.dtsi | 20 +- + .../boot/dts/allwinner/sun50i-h6-orangepi-3.dts | 4 +- + .../boot/dts/allwinner/sun50i-h6-orangepi.dtsi | 4 +- + .../dts/allwinner/sun50i-h6-pine-h64-model-b.dts | 15 ++ + .../boot/dts/allwinner/sun50i-h6-pine-h64.dts | 7 +- + arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 32 ++- + drivers/bus/sunxi-rsb.c | 215 +++++++++++++++------ + drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c | 5 + + drivers/clk/sunxi-ng/ccu-sun50i-h6-r.h | 2 +- + drivers/clk/sunxi-ng/ccu-sun50i-h6.c | 2 +- + drivers/mfd/axp20x-i2c.c | 4 +- + drivers/mfd/axp20x-rsb.c | 4 +- + drivers/mfd/axp20x.c | 4 +- + include/dt-bindings/clock/sun50i-h6-r-ccu.h | 2 + + include/dt-bindings/reset/sun50i-h6-r-ccu.h | 1 + + include/linux/mfd/axp20x.h | 2 +- + include/linux/sunxi-rsb.h | 2 +- + 123 files changed, 763 insertions(+), 311 deletions(-) + create mode 100644 arch/arm/boot/dts/sun8i-v3-sl631-imx179.dts + create mode 100644 arch/arm/boot/dts/sun8i-v3-sl631.dtsi + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab-early-adopter.dts +Merging tegra/for-next (de76ea4be40d Merge branch for-5.12/arm64/defconfig into for-next) +$ git merge tegra/for-next +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm/configs/multi_v7_defconfig +Merge made by the 'recursive' strategy. + arch/arm/configs/multi_v7_defconfig | 1 + + arch/arm/configs/tegra_defconfig | 1 + + arch/arm/mach-tegra/sleep-tegra20.S | 38 ++- + arch/arm/mach-tegra/sleep-tegra30.S | 94 ++++++-- + arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi | 8 + + arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts | 24 +- + .../boot/dts/nvidia/tegra210-audio-graph.dtsi | 153 ++++++++++++ + arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts | 262 +++++++++++++++++++++ + arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts | 146 ++++++++++++ + arch/arm64/boot/dts/nvidia/tegra210.dtsi | 2 + + arch/arm64/configs/defconfig | 2 + + 11 files changed, 705 insertions(+), 26 deletions(-) + create mode 100644 arch/arm64/boot/dts/nvidia/tegra210-audio-graph.dtsi +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 (34f13f0656c0 Merge branch 'ti-k3-dts-next' into ti-k3-next) +$ git merge ti-k3-new/ti-k3-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 12 +- + .../boot/dts/ti/k3-j7200-common-proc-board.dts | 38 +++++ + arch/arm64/boot/dts/ti/k3-j7200-main.dtsi | 153 ++++++++++++++++++++- + arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi | 42 +++++- + arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi | 80 ++++++++++- + arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 52 ++----- + 6 files changed, 324 insertions(+), 53 deletions(-) +Merging clk/clk-next (6370ad6c0e83 Merge branch 'clk-fixes' into clk-next) +$ git merge clk/clk-next +Merge made by the 'recursive' strategy. + drivers/clk/imx/Kconfig | 2 -- + drivers/clk/mmp/clk-audio.c | 6 ++++-- + drivers/clk/qcom/gcc-sc7180.c | 21 +++------------------ + drivers/clk/qcom/gcc-sm8250.c | 4 ++-- + include/linux/clk.h | 4 ++-- + 5 files changed, 11 insertions(+), 26 deletions(-) +Merging clk-renesas/renesas-clk (c706121386fe dt-bindings: clock: renesas: rcar-usb2-clock-sel: Add support for RZ/G2 M/N/H) +$ git merge clk-renesas/renesas-clk +Merge made by the 'recursive' strategy. + .../clock/renesas,rcar-usb2-clock-sel.yaml | 3 + + drivers/clk/renesas/Kconfig | 5 + + drivers/clk/renesas/Makefile | 1 + + drivers/clk/renesas/r8a7796-cpg-mssr.c | 5 + + drivers/clk/renesas/r8a77965-cpg-mssr.c | 5 + + drivers/clk/renesas/r8a77990-cpg-mssr.c | 5 + + drivers/clk/renesas/r8a77995-cpg-mssr.c | 5 + + drivers/clk/renesas/r8a779a0-cpg-mssr.c | 54 ++++- + drivers/clk/renesas/rcar-cpg-lib.c | 270 +++++++++++++++++++++ + drivers/clk/renesas/rcar-cpg-lib.h | 33 +++ + drivers/clk/renesas/rcar-gen3-cpg.c | 267 +------------------- + 11 files changed, 391 insertions(+), 262 deletions(-) + create mode 100644 drivers/clk/renesas/rcar-cpg-lib.c + create mode 100644 drivers/clk/renesas/rcar-cpg-lib.h +Merging clk-samsung/for-next (44a9e78f9242 clk: samsung: Prevent potential endless loop in the PLL ops) +$ git merge clk-samsung/for-next +Already up to date. +Merging csky/linux-next (717f1b1a7243 csky: Fixup pfn_valid error with wrong max_mapnr) +$ git merge csky/linux-next +Removing arch/csky/include/asm/atomic.h +Merge made by the 'recursive' strategy. + arch/csky/Kconfig | 24 +- + arch/csky/abiv1/inc/abi/ckmmu.h | 9 +- + arch/csky/abiv1/inc/abi/pgtable-bits.h | 39 ++- + arch/csky/abiv1/inc/abi/regdef.h | 5 + + arch/csky/abiv1/inc/abi/vdso.h | 18 +- + arch/csky/abiv2/cacheflush.c | 3 + + arch/csky/abiv2/inc/abi/ckmmu.h | 43 +++- + arch/csky/abiv2/inc/abi/entry.h | 19 +- + arch/csky/abiv2/inc/abi/pgtable-bits.h | 36 ++- + arch/csky/abiv2/inc/abi/regdef.h | 5 + + arch/csky/abiv2/inc/abi/vdso.h | 20 +- + arch/csky/include/asm/atomic.h | 212 ---------------- + arch/csky/include/asm/barrier.h | 82 +++++-- + arch/csky/include/asm/bug.h | 2 + + arch/csky/include/asm/clocksource.h | 8 + + arch/csky/include/asm/cmpxchg.h | 27 ++- + arch/csky/include/asm/futex.h | 121 ++++++++++ + arch/csky/include/asm/memory.h | 2 +- + arch/csky/include/asm/mmu_context.h | 9 +- + arch/csky/include/asm/page.h | 2 +- + arch/csky/include/asm/pgalloc.h | 2 +- + arch/csky/include/asm/pgtable.h | 78 +++--- + arch/csky/include/asm/processor.h | 2 +- + arch/csky/include/asm/segment.h | 2 +- + arch/csky/include/asm/spinlock.h | 167 ------------- + arch/csky/include/asm/spinlock_types.h | 10 - + arch/csky/include/asm/thread_info.h | 1 - + arch/csky/include/asm/vdso.h | 21 +- + arch/csky/include/asm/vdso/clocksource.h | 9 + + arch/csky/include/asm/vdso/gettimeofday.h | 114 +++++++++ + arch/csky/include/asm/vdso/processor.h | 12 + + arch/csky/include/asm/vdso/vsyscall.h | 22 ++ + arch/csky/kernel/Makefile | 2 +- + arch/csky/kernel/atomic.S | 24 +- + arch/csky/kernel/entry.S | 106 +------- + arch/csky/kernel/head.S | 10 +- + arch/csky/kernel/perf_event.c | 4 +- + arch/csky/kernel/probes/simulate-insn.c | 22 +- + arch/csky/kernel/ptrace.c | 128 +++++++++- + arch/csky/kernel/setup.c | 18 +- + arch/csky/kernel/signal.c | 4 +- + arch/csky/kernel/smp.c | 7 +- + arch/csky/kernel/traps.c | 10 +- + arch/csky/kernel/vdso.c | 127 ++++++---- + arch/csky/kernel/vdso/.gitignore | 4 + + arch/csky/kernel/vdso/Makefile | 72 ++++++ + arch/csky/kernel/vdso/note.S | 12 + + arch/csky/kernel/vdso/rt_sigreturn.S | 14 ++ + arch/csky/kernel/vdso/so2s.sh | 5 + + arch/csky/kernel/vdso/vdso.S | 16 ++ + arch/csky/kernel/vdso/vdso.lds.S | 58 +++++ + arch/csky/kernel/vdso/vgettimeofday.c | 28 +++ + arch/csky/kernel/vmlinux.lds.S | 2 +- + arch/csky/mm/fault.c | 388 ++++++++++++++++++------------ + arch/csky/mm/init.c | 39 ++- + arch/csky/mm/tlb.c | 42 +++- + include/linux/cpuhotplug.h | 1 + + 57 files changed, 1345 insertions(+), 924 deletions(-) + delete mode 100644 arch/csky/include/asm/atomic.h + create mode 100644 arch/csky/include/asm/clocksource.h + create mode 100644 arch/csky/include/asm/futex.h + create mode 100644 arch/csky/include/asm/vdso/clocksource.h + create mode 100644 arch/csky/include/asm/vdso/gettimeofday.h + create mode 100644 arch/csky/include/asm/vdso/processor.h + create mode 100644 arch/csky/include/asm/vdso/vsyscall.h + create mode 100644 arch/csky/kernel/vdso/.gitignore + create mode 100644 arch/csky/kernel/vdso/Makefile + create mode 100644 arch/csky/kernel/vdso/note.S + create mode 100644 arch/csky/kernel/vdso/rt_sigreturn.S + create mode 100755 arch/csky/kernel/vdso/so2s.sh + create mode 100644 arch/csky/kernel/vdso/vdso.S + create mode 100644 arch/csky/kernel/vdso/vdso.lds.S + create mode 100644 arch/csky/kernel/vdso/vgettimeofday.c +Merging h8300/h8300-next (8808515be0ed h8300: Replace <linux/clk-provider.h> by <linux/of_clk.h>) +$ git merge h8300/h8300-next +Auto-merging drivers/net/ethernet/smsc/smc91x.c +Auto-merging drivers/net/ethernet/smsc/Kconfig +Auto-merging drivers/clocksource/h8300_timer8.c +Auto-merging arch/h8300/kernel/setup.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 ia64/next (c331649e6371 ia64: Use libata instead of the legacy ide driver in defconfigs) +$ git merge ia64/next +Already up to date. +Merging m68k/for-next (2ae92e8b9b7e MAINTAINERS: Update m68k Mac entry) +$ git merge m68k/for-next +Already up to date. +Merging m68knommu/for-next (7c53f6b671f4 Linux 5.11-rc3) +$ git merge m68knommu/for-next +Already up to date. +Merging microblaze/next (57ddf08642f0 microblaze: do not select TRACING_SUPPORT directly) +$ git merge microblaze/next +Merge made by the 'recursive' strategy. + arch/microblaze/Kconfig | 1 - + 1 file changed, 1 deletion(-) +Merging mips/mips-next (01179ca04043 MIPS: IRQ: Add prototype for function init_IRQ) +$ git merge mips/mips-next +Auto-merging arch/mips/kernel/relocate.c +Removing arch/mips/kernel/irq-rm7000.c +Auto-merging arch/mips/include/asm/Kbuild +Merge made by the 'recursive' strategy. + .../bindings/mips/lantiq/lantiq,cgu.yaml | 32 ++++++ + .../bindings/mips/lantiq/lantiq,dma-xway.yaml | 32 ++++++ + .../bindings/mips/lantiq/lantiq,ebu.yaml | 32 ++++++ + .../bindings/mips/lantiq/lantiq,pmu.yaml | 32 ++++++ + arch/mips/Kconfig | 7 +- + arch/mips/Makefile | 19 ++++ + arch/mips/alchemy/common/prom.c | 4 - + arch/mips/ar7/memory.c | 5 - + arch/mips/ath25/prom.c | 4 - + arch/mips/ath79/prom.c | 5 - + arch/mips/bcm47xx/prom.c | 4 - + arch/mips/bcm63xx/prom.c | 4 - + arch/mips/bmips/setup.c | 6 +- + arch/mips/boot/compressed/head.S | 20 ++-- + arch/mips/cavium-octeon/setup.c | 9 +- + arch/mips/cobalt/setup.c | 5 - + arch/mips/configs/loongson3_defconfig | 2 + + arch/mips/fw/arc/memory.c | 2 +- + arch/mips/fw/sni/sniprom.c | 4 - + arch/mips/generic/init.c | 4 - + arch/mips/include/asm/Kbuild | 4 + + arch/mips/include/asm/asm.h | 18 ++++ + arch/mips/include/asm/atomic.h | 2 +- + arch/mips/include/asm/bitops.h | 12 +-- + arch/mips/include/asm/cmpxchg.h | 6 +- + arch/mips/include/asm/irq.h | 1 + + arch/mips/include/asm/irq_cpu.h | 2 - + arch/mips/include/asm/mach-generic/irq.h | 6 -- + arch/mips/include/asm/mach-loongson64/loongson.h | 2 +- + arch/mips/include/asm/pgtable.h | 12 +-- + arch/mips/include/asm/traps.h | 1 + + arch/mips/include/uapi/asm/Kbuild | 3 - + arch/mips/kernel/Makefile | 1 - + arch/mips/kernel/cacheinfo.c | 34 +++++-- + arch/mips/kernel/cevt-txx9.c | 2 +- + arch/mips/kernel/cps-vec.S | 1 - + arch/mips/kernel/cpu-probe.c | 15 +-- + arch/mips/kernel/irq-rm7000.c | 45 --------- + arch/mips/kernel/module.c | 109 ++++++++++----------- + arch/mips/kernel/perf_event_mipsxx.c | 22 +++-- + arch/mips/kernel/relocate.c | 54 +++++----- + arch/mips/kernel/smp-cps.c | 3 - + arch/mips/kernel/syscalls/Makefile | 16 +-- + arch/mips/kernel/vmlinux.lds.S | 11 ++- + arch/mips/kernel/vpe-cmp.c | 4 +- + arch/mips/kernel/vpe-mt.c | 4 +- + arch/mips/lantiq/irq.c | 10 +- + arch/mips/lantiq/prom.c | 6 +- + arch/mips/loongson2ef/common/init.c | 5 - + arch/mips/loongson32/common/prom.c | 4 - + arch/mips/loongson64/Platform | 22 ----- + arch/mips/loongson64/init.c | 54 +++++++++- + arch/mips/loongson64/numa.c | 52 +--------- + arch/mips/loongson64/smp.c | 8 +- + arch/mips/mm/c-r4k.c | 2 +- + arch/mips/mm/init.c | 5 + + arch/mips/mti-malta/malta-init.c | 1 - + arch/mips/mti-malta/malta-memory.c | 4 - + arch/mips/netlogic/xlp/setup.c | 5 - + arch/mips/netlogic/xlr/setup.c | 5 - + arch/mips/pci/pci-ar2315.c | 6 +- + arch/mips/pic32/pic32mzda/init.c | 6 +- + arch/mips/pistachio/init.c | 5 - + arch/mips/ralink/of.c | 2 +- + arch/mips/ralink/prom.c | 4 - + arch/mips/rb532/prom.c | 5 - + arch/mips/sgi-ip27/ip27-memory.c | 5 - + arch/mips/sgi-ip32/ip32-memory.c | 5 - + arch/mips/sibyte/common/cfe.c | 5 - + arch/mips/txx9/generic/setup.c | 4 - + arch/mips/vdso/Makefile | 5 +- + arch/mips/vr41xx/common/init.c | 4 - + include/asm-generic/vmlinux.lds.h | 6 +- + 73 files changed, 435 insertions(+), 432 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mips/lantiq/lantiq,cgu.yaml + create mode 100644 Documentation/devicetree/bindings/mips/lantiq/lantiq,dma-xway.yaml + create mode 100644 Documentation/devicetree/bindings/mips/lantiq/lantiq,ebu.yaml + create mode 100644 Documentation/devicetree/bindings/mips/lantiq/lantiq,pmu.yaml + delete mode 100644 arch/mips/kernel/irq-rm7000.c +Merging nds32/next (54bde873682b nds32: Fix bogus reference to <asm/procinfo.h>) +$ git merge nds32/next +Auto-merging arch/nds32/kernel/setup.c +Merge made by the 'recursive' strategy. + arch/nds32/configs/defconfig | 1 - + arch/nds32/kernel/setup.c | 2 +- + arch/nds32/kernel/time.c | 2 +- + arch/nds32/kernel/traps.c | 50 +++----------------------------------------- + 4 files changed, 5 insertions(+), 50 deletions(-) +Merging nios2/for-next (6b57fa4d374b nios2: signal: Mark expected switch fall-through) +$ git merge nios2/for-next +Already up to date. +Merging openrisc/for-next (3706f9f76a4f drivers/soc/litex: Add restart handler) +$ git merge openrisc/for-next +Merge made by the 'recursive' strategy. + arch/openrisc/Kbuild | 3 + + arch/openrisc/Makefile | 21 +++--- + arch/openrisc/boot/.gitignore | 2 + + arch/openrisc/boot/Makefile | 10 +++ + arch/openrisc/kernel/process.c | 13 +++- + drivers/soc/litex/Kconfig | 14 +++- + drivers/soc/litex/litex_soc_ctrl.c | 116 +++++++++++----------------- + include/linux/litex.h | 150 +++++++++++++++++++++++++------------ + 8 files changed, 194 insertions(+), 135 deletions(-) + create mode 100644 arch/openrisc/Kbuild + create mode 100644 arch/openrisc/boot/.gitignore + create mode 100644 arch/openrisc/boot/Makefile +Merging parisc-hd/for-next (2c85ebc57b3e Linux 5.10) +$ git merge parisc-hd/for-next +Already up to date. +Merging powerpc/next (e71ba9452f0b Linux 5.11-rc2) +$ git merge powerpc/next +Already up to date. +Merging fsl/next (a76bea0287ce powerpc/kmcent2: add ranges to the pci bridges) +$ git merge fsl/next +Already up to date. +Merging soc-fsl/next (e95f287deed2 soc: fsl: handle RCPM errata A-008646 on SoC LS1021A) +$ git merge soc-fsl/next +Already up to date. +Merging risc-v/for-next (f766f77a74f5 riscv/stacktrace: Fix stack output without ra on the stack top) +$ git merge risc-v/for-next +Auto-merging drivers/reset/Kconfig +Auto-merging arch/riscv/mm/init.c +Auto-merging arch/riscv/kernel/stacktrace.c +Auto-merging arch/riscv/kernel/setup.c +Auto-merging arch/riscv/include/asm/pgtable.h +Removing arch/riscv/boot/dts/kendryte/Makefile +Auto-merging arch/riscv/Kconfig +Auto-merging arch/arm64/mm/init.c +Auto-merging arch/arm64/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/gpio/sifive,gpio.yaml | 4 +- + .../bindings/mfd/canaan,k210-sysctl.yaml | 109 ++++++ + .../bindings/pinctrl/canaan,k210-fpioa.yaml | 171 +++++++++ + .../devicetree/bindings/pwm/pwm-sifive.yaml | 9 +- + .../devicetree/bindings/reset/canaan,k210-rst.yaml | 40 +++ + Documentation/devicetree/bindings/riscv/cpus.yaml | 6 + + .../devicetree/bindings/riscv/sifive-l2-cache.yaml | 34 +- + .../devicetree/bindings/riscv/sifive.yaml | 17 +- + MAINTAINERS | 15 + + arch/arm64/Kconfig | 1 + + arch/arm64/include/asm/numa.h | 48 +-- + arch/arm64/kernel/acpi_numa.c | 12 - + arch/arm64/mm/Makefile | 1 - + arch/arm64/mm/init.c | 4 +- + arch/riscv/Kconfig | 46 ++- + arch/riscv/Kconfig.socs | 32 +- + arch/riscv/Makefile | 14 +- + arch/riscv/boot/dts/Makefile | 2 +- + arch/riscv/boot/dts/canaan/Makefile | 5 + + arch/riscv/boot/dts/{kendryte => canaan}/k210.dts | 0 + arch/riscv/boot/dts/{kendryte => canaan}/k210.dtsi | 5 - + arch/riscv/boot/dts/kendryte/Makefile | 4 - + arch/riscv/boot/dts/sifive/Makefile | 3 +- + arch/riscv/boot/dts/sifive/fu740-c000.dtsi | 293 +++++++++++++++ + .../riscv/boot/dts/sifive/hifive-unmatched-a00.dts | 253 +++++++++++++ + arch/riscv/configs/nommu_k210_defconfig | 2 +- + arch/riscv/include/asm/bug.h | 1 + + arch/riscv/include/asm/kprobes.h | 40 +++ + arch/riscv/include/asm/mmzone.h | 13 + + arch/riscv/include/asm/numa.h | 8 + + arch/riscv/include/asm/pci.h | 14 + + arch/riscv/include/asm/pgtable.h | 21 ++ + arch/riscv/include/asm/probes.h | 24 ++ + arch/riscv/include/asm/processor.h | 1 + + arch/riscv/include/asm/ptrace.h | 35 ++ + arch/riscv/include/asm/sbi.h | 10 +- + arch/riscv/include/asm/soc.h | 38 -- + arch/riscv/include/asm/stackprotector.h | 3 +- + arch/riscv/include/asm/stacktrace.h | 2 + + arch/riscv/include/asm/thread_info.h | 4 +- + arch/riscv/include/asm/uprobes.h | 40 +++ + arch/riscv/kernel/Makefile | 6 +- + arch/riscv/kernel/asm-offsets.c | 3 + + arch/riscv/kernel/ftrace.c | 95 ++--- + arch/riscv/kernel/mcount-dyn.S | 342 ++++++++---------- + arch/riscv/kernel/patch.c | 8 +- + arch/riscv/kernel/probes/Makefile | 6 + + arch/riscv/kernel/probes/decode-insn.c | 48 +++ + arch/riscv/kernel/probes/decode-insn.h | 18 + + arch/riscv/kernel/probes/ftrace.c | 53 +++ + arch/riscv/kernel/probes/kprobes.c | 398 +++++++++++++++++++++ + arch/riscv/kernel/probes/kprobes_trampoline.S | 93 +++++ + arch/riscv/kernel/probes/simulate-insn.c | 85 +++++ + arch/riscv/kernel/probes/simulate-insn.h | 47 +++ + arch/riscv/kernel/probes/uprobes.c | 186 ++++++++++ + arch/riscv/kernel/process.c | 18 +- + arch/riscv/kernel/ptrace.c | 99 +++++ + arch/riscv/kernel/sbi.c | 4 +- + arch/riscv/kernel/setup.c | 23 +- + arch/riscv/kernel/signal.c | 3 + + arch/riscv/kernel/smpboot.c | 12 +- + arch/riscv/kernel/soc.c | 27 -- + arch/riscv/kernel/stacktrace.c | 22 +- + arch/riscv/kernel/traps.c | 22 +- + arch/riscv/lib/Makefile | 2 + + arch/riscv/lib/error-inject.c | 10 + + arch/riscv/mm/Makefile | 3 +- + arch/riscv/mm/fault.c | 38 +- + arch/riscv/mm/init.c | 16 +- + drivers/base/Kconfig | 6 + + drivers/base/Makefile | 1 + + arch/arm64/mm/numa.c => drivers/base/arch_numa.c | 27 +- + drivers/reset/Kconfig | 10 + + drivers/reset/Makefile | 1 + + drivers/reset/reset-k210.c | 131 +++++++ + drivers/soc/Kconfig | 2 +- + drivers/soc/Makefile | 2 +- + drivers/soc/{kendryte => canaan}/Kconfig | 4 +- + drivers/soc/{kendryte => canaan}/Makefile | 0 + drivers/soc/{kendryte => canaan}/k210-sysctl.c | 105 ++---- + drivers/soc/sifive/sifive_l2_cache.c | 27 +- + include/asm-generic/numa.h | 52 +++ + include/dt-bindings/pinctrl/k210-fpioa.h | 276 ++++++++++++++ + include/dt-bindings/reset/k210-rst.h | 42 +++ + include/soc/canaan/k210-sysctl.h | 41 +++ + 85 files changed, 3263 insertions(+), 535 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mfd/canaan,k210-sysctl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/canaan,k210-fpioa.yaml + create mode 100644 Documentation/devicetree/bindings/reset/canaan,k210-rst.yaml + create mode 100644 arch/riscv/boot/dts/canaan/Makefile + rename arch/riscv/boot/dts/{kendryte => canaan}/k210.dts (100%) + rename arch/riscv/boot/dts/{kendryte => canaan}/k210.dtsi (94%) + delete mode 100644 arch/riscv/boot/dts/kendryte/Makefile + create mode 100644 arch/riscv/boot/dts/sifive/fu740-c000.dtsi + create mode 100644 arch/riscv/boot/dts/sifive/hifive-unmatched-a00.dts + create mode 100644 arch/riscv/include/asm/mmzone.h + create mode 100644 arch/riscv/include/asm/numa.h + create mode 100644 arch/riscv/include/asm/probes.h + create mode 100644 arch/riscv/include/asm/uprobes.h + create mode 100644 arch/riscv/kernel/probes/Makefile + create mode 100644 arch/riscv/kernel/probes/decode-insn.c + create mode 100644 arch/riscv/kernel/probes/decode-insn.h + create mode 100644 arch/riscv/kernel/probes/ftrace.c + create mode 100644 arch/riscv/kernel/probes/kprobes.c + create mode 100644 arch/riscv/kernel/probes/kprobes_trampoline.S + create mode 100644 arch/riscv/kernel/probes/simulate-insn.c + create mode 100644 arch/riscv/kernel/probes/simulate-insn.h + create mode 100644 arch/riscv/kernel/probes/uprobes.c + create mode 100644 arch/riscv/lib/error-inject.c + rename arch/arm64/mm/numa.c => drivers/base/arch_numa.c (96%) + create mode 100644 drivers/reset/reset-k210.c + rename drivers/soc/{kendryte => canaan}/Kconfig (79%) + rename drivers/soc/{kendryte => canaan}/Makefile (100%) + rename drivers/soc/{kendryte => canaan}/k210-sysctl.c (63%) + create mode 100644 include/asm-generic/numa.h + create mode 100644 include/dt-bindings/pinctrl/k210-fpioa.h + create mode 100644 include/dt-bindings/reset/k210-rst.h + create mode 100644 include/soc/canaan/k210-sysctl.h +Merging s390/for-next (3a790cc1c9ef s390: pass struct pt_regs instead of registers to syscalls) +$ git merge s390/for-next +Merge made by the 'recursive' strategy. + arch/s390/Kconfig | 1 + + arch/s390/Kconfig.debug | 10 +- + arch/s390/configs/debug_defconfig | 3 +- + arch/s390/configs/defconfig | 2 +- + arch/s390/configs/zfcpdump_defconfig | 1 + + arch/s390/include/asm/atomic.h | 20 - + arch/s390/include/asm/bitops.h | 36 -- + arch/s390/include/asm/cputime.h | 2 + + arch/s390/include/asm/elf.h | 7 +- + arch/s390/include/asm/entry-common.h | 60 +++ + arch/s390/include/asm/fpu/api.h | 2 + + arch/s390/include/asm/idle.h | 4 +- + arch/s390/include/asm/lowcore.h | 4 +- + arch/s390/include/asm/nmi.h | 1 + + arch/s390/include/asm/preempt.h | 4 +- + arch/s390/include/asm/processor.h | 50 +- + arch/s390/include/asm/ptrace.h | 9 +- + arch/s390/include/asm/syscall.h | 11 +- + arch/s390/include/asm/syscall_wrapper.h | 128 +++-- + arch/s390/include/asm/thread_info.h | 3 + + arch/s390/include/asm/tlb.h | 5 +- + arch/s390/include/asm/uaccess.h | 2 +- + arch/s390/include/asm/vtime.h | 14 + + arch/s390/include/uapi/asm/ptrace.h | 5 +- + arch/s390/kernel/Makefile | 2 +- + arch/s390/kernel/asm-offsets.c | 19 +- + arch/s390/kernel/compat_signal.c | 1 + + arch/s390/kernel/entry.S | 803 ++++------------------------- + arch/s390/kernel/entry.h | 12 +- + arch/s390/kernel/fpu.c | 88 ++++ + arch/s390/kernel/idle.c | 24 + + arch/s390/kernel/irq.c | 89 +++- + arch/s390/kernel/nmi.c | 19 +- + arch/s390/kernel/process.c | 30 +- + arch/s390/kernel/ptrace.c | 117 +---- + arch/s390/kernel/setup.c | 3 +- + arch/s390/kernel/signal.c | 12 +- + arch/s390/kernel/smp.c | 2 +- + arch/s390/kernel/{sys_s390.c => syscall.c} | 66 +++ + arch/s390/kernel/traps.c | 65 +++ + arch/s390/kernel/uprobes.c | 6 +- + arch/s390/kvm/kvm-s390.c | 3 + + arch/s390/kvm/vsie.c | 3 + + arch/s390/lib/uaccess.c | 12 +- + arch/s390/mm/fault.c | 2 +- + drivers/s390/cio/css.c | 20 +- + drivers/s390/cio/device.c | 39 +- + 47 files changed, 769 insertions(+), 1052 deletions(-) + create mode 100644 arch/s390/include/asm/entry-common.h + rename arch/s390/kernel/{sys_s390.c => syscall.c} (61%) +Merging sh/for-next (b89bc060b53e sh/intc: Restore devm_ioremap() alignment) +$ git merge sh/for-next +Merge made by the 'recursive' strategy. + arch/sh/Kconfig | 1 - + arch/sh/boards/mach-sh03/rtc.c | 1 - + arch/sh/configs/landisk_defconfig | 9 ++++----- + arch/sh/configs/microdev_defconfig | 2 -- + arch/sh/configs/sdk7780_defconfig | 6 ++---- + arch/sh/configs/sdk7786_defconfig | 3 --- + arch/sh/configs/se7750_defconfig | 1 - + arch/sh/configs/sh03_defconfig | 3 --- + arch/sh/drivers/dma/Kconfig | 3 +-- + arch/sh/include/asm/gpio.h | 1 - + arch/sh/kernel/cpu/sh3/entry.S | 1 - + arch/sh/mm/Kconfig | 2 +- + arch/sh/mm/asids-debugfs.c | 15 ++------------- + arch/sh/mm/cache-debugfs.c | 15 ++------------- + arch/sh/mm/pmb.c | 15 ++------------- + drivers/sh/intc/core.c | 2 +- + drivers/sh/intc/virq-debugfs.c | 14 ++------------ + 17 files changed, 17 insertions(+), 77 deletions(-) +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 (1fb1abc83636 um: Fix build w/o CONFIG_PM_SLEEP) +$ git merge uml/linux-next +Already up to date. +Merging xtensa/xtensa-for-next (7b79eba1d0d1 xtensa: fix spelling mistake in Kconfig "wont" -> "won't") +$ git merge xtensa/xtensa-for-next +Auto-merging arch/xtensa/Kconfig +Merge made by the 'recursive' strategy. + arch/xtensa/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging fscrypt/master (a14d0b676491 fscrypt: allow deleting files with unsupported encryption policy) +$ git merge fscrypt/master +Already up to date. +Merging afs/afs-next (8409f67b6437 afs: Adjust the fileserver rotation algorithm to reprobe/retry more quickly) +$ git merge afs/afs-next +Already up to date. +Merging btrfs/for-next (5be0db194983 Merge branch 'for-next-next-v5.11-20210114' into for-next-20210114) +$ git merge btrfs/for-next +Auto-merging fs/btrfs/volumes.c +Auto-merging fs/btrfs/extent-tree.c +Auto-merging fs/btrfs/block-group.c +Auto-merging fs/btrfs/backref.c +Merge made by the 'recursive' strategy. + fs/btrfs/backref.c | 9 +- + fs/btrfs/backref.h | 9 +- + fs/btrfs/block-group.c | 35 ++++-- + fs/btrfs/btrfs_inode.h | 3 +- + fs/btrfs/ctree.c | 7 +- + fs/btrfs/ctree.h | 14 ++- + fs/btrfs/delayed-ref.c | 56 +++++---- + fs/btrfs/delayed-ref.h | 28 +++-- + fs/btrfs/dev-replace.c | 2 +- + fs/btrfs/disk-io.c | 35 +++--- + fs/btrfs/disk-io.h | 4 +- + fs/btrfs/extent-tree.c | 129 +++++--------------- + fs/btrfs/extent_io.c | 113 ++++++++--------- + fs/btrfs/file.c | 27 ++--- + fs/btrfs/free-space-cache.c | 8 +- + fs/btrfs/free-space-tree.c | 10 +- + fs/btrfs/inode.c | 37 +++--- + fs/btrfs/ioctl.c | 13 +- + fs/btrfs/ordered-data.c | 117 ++++++++++-------- + fs/btrfs/ordered-data.h | 10 +- + fs/btrfs/ref-verify.c | 43 +++---- + fs/btrfs/relocation.c | 54 +++++++-- + fs/btrfs/send.c | 16 --- + fs/btrfs/space-info.c | 281 +++++++++++++++++++++++++++++++++++-------- + fs/btrfs/space-info.h | 20 +++ + fs/btrfs/transaction.c | 104 ++++++++-------- + fs/btrfs/tree-log.c | 3 +- + fs/btrfs/volumes.c | 7 +- + include/trace/events/btrfs.h | 104 +++++++++++++++- + 29 files changed, 799 insertions(+), 499 deletions(-) +Merging ceph/master (9d5ae6f3c50a libceph: fix "Boolean result is used in bitwise operation" warning) +$ git merge ceph/master +Merge made by the 'recursive' strategy. + fs/ceph/mds_client.c | 34 ++++++++++++++--------------- + net/ceph/auth_x.c | 57 +++++++++++++++++++++++++++++-------------------- + net/ceph/crypto.c | 3 ++- + net/ceph/messenger_v1.c | 2 +- + net/ceph/messenger_v2.c | 45 +++++++++++++++++++++----------------- + net/ceph/mon_client.c | 14 ++++++------ + net/ceph/osd_client.c | 40 +++++++++++++++++----------------- + 7 files changed, 107 insertions(+), 88 deletions(-) +Merging cifs/for-next (541e553c9804 cifs: do not fail __smb_send_rqst if non-fatal signals are pending) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/connect.c | 4 ++-- + fs/cifs/transport.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) +Merging configfs/for-next (65cdb4a214c0 configfs: fix kernel-doc markup issue) +$ git merge configfs/for-next +Already up to date. +Merging ecryptfs/next (8b614cb8f1dc Merge tag '5.6-rc4-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6) +$ git merge ecryptfs/next +Already up to date. +Merging erofs/dev (d8b3df8b1048 erofs: avoid using generic_block_bmap) +$ git merge erofs/dev +Already up to date. +Merging exfat/dev (4b7bc2c32cba exfat: improve performance of exfat_free_cluster when using dirsync mount option) +$ git merge exfat/dev +Merge made by the 'recursive' strategy. + fs/exfat/balloc.c | 4 ++-- + fs/exfat/exfat_fs.h | 2 +- + fs/exfat/fatent.c | 42 ++++++++++++++++++++++++++++++++++++------ + 3 files changed, 39 insertions(+), 9 deletions(-) +Merging ext3/for_next (6309c460a76f Pull lazytime fixes from Eric Biggers) +$ git merge ext3/for_next +Auto-merging fs/ext4/inode.c +Merge made by the 'recursive' strategy. + Documentation/filesystems/vfs.rst | 5 +- + fs/ext4/inode.c | 20 +------ + fs/f2fs/super.c | 3 - + fs/fat/misc.c | 23 ++++---- + fs/fs-writeback.c | 116 ++++++++++++++++++++++--------------- + fs/gfs2/file.c | 4 +- + fs/gfs2/super.c | 2 - + fs/inode.c | 38 ++++++------ + fs/notify/fanotify/fanotify_user.c | 2 +- + fs/notify/group.c | 25 ++++++-- + fs/notify/inotify/inotify_user.c | 4 +- + fs/quota/quota_v2.c | 11 +++- + include/linux/fs.h | 33 +++++++++-- + include/linux/fsnotify_backend.h | 1 + + 14 files changed, 169 insertions(+), 118 deletions(-) +Merging ext4/dev (e9f53353e166 ext4: remove expensive flush on fast commit) +$ git merge ext4/dev +Already up to date. +Merging f2fs/dev (cd59300dcfed f2fs: add ckpt_thread_ioprio sysfs node) +$ git merge f2fs/dev +Auto-merging include/linux/fs.h +Removing fs/f2fs/trace.h +Removing fs/f2fs/trace.c +Auto-merging fs/f2fs/super.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-fs-f2fs | 31 +++ + Documentation/filesystems/f2fs.rst | 15 ++ + fs/f2fs/Kconfig | 20 +- + fs/f2fs/Makefile | 1 - + fs/f2fs/acl.c | 23 +- + fs/f2fs/checkpoint.c | 180 +++++++++++++- + fs/f2fs/compress.c | 195 ++++++++++++---- + fs/f2fs/data.c | 402 ++++++++++++-------------------- + fs/f2fs/debug.c | 12 + + fs/f2fs/f2fs.h | 104 +++++++-- + fs/f2fs/file.c | 43 +++- + fs/f2fs/gc.c | 8 +- + fs/f2fs/namei.c | 8 + + fs/f2fs/node.c | 4 +- + fs/f2fs/segment.c | 3 - + fs/f2fs/segment.h | 4 +- + fs/f2fs/super.c | 162 +++++++++++-- + fs/f2fs/sysfs.c | 128 +++++++++- + fs/f2fs/trace.c | 165 ------------- + fs/f2fs/trace.h | 43 ---- + fs/f2fs/xattr.c | 15 +- + fs/libfs.c | 8 +- + include/linux/f2fs_fs.h | 3 + + include/linux/fs.h | 5 - + 24 files changed, 984 insertions(+), 598 deletions(-) + delete mode 100644 fs/f2fs/trace.c + delete mode 100644 fs/f2fs/trace.h +Merging fsverity/fsverity (bde493349025 fs-verity: move structs needed for file signing to UAPI header) +$ git merge fsverity/fsverity +Already up to date. +Merging fuse/for-next (5d069dbe8aaf fuse: fix bad inode) +$ git merge fuse/for-next +Already up to date. +Merging jfs/jfs-next (3bef198f1b17 JFS: more checks for invalid superblock) +$ git merge jfs/jfs-next +Merge made by the 'recursive' strategy. + fs/jfs/jfs_filsys.h | 1 + + fs/jfs/jfs_mount.c | 10 ++++++++++ + 2 files changed, 11 insertions(+) +Merging nfs/linux-next (19c329f68089 Linux 5.11-rc4) +$ git merge nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (11392155f2bd NFS: Disable READ_PLUS by default) +$ git merge nfs-anna/linux-next +Auto-merging fs/nfs/nfs4proc.c +CONFLICT (content): Merge conflict in fs/nfs/nfs4proc.c +Resolved 'fs/nfs/nfs4proc.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master cc56524e6e16] Merge remote-tracking branch 'nfs-anna/linux-next' +$ git diff -M --stat --summary HEAD^.. +Merging nfsd/nfsd-next (c3213d260a23 SUNRPC: Fix oops in the rpc_xdr_buf event class) +$ git merge nfsd/nfsd-next +Already up to date. +Merging cel/for-next (1b4f9164e7b7 nfsd: report per-export stats) +$ git merge cel/for-next +Merge made by the 'recursive' strategy. + fs/lockd/svc4proc.c | 24 ++ + fs/lockd/svcproc.c | 24 ++ + fs/nfs/callback_xdr.c | 2 + + fs/nfs_common/nfsacl.c | 52 ++++ + fs/nfsd/export.c | 68 ++++- + fs/nfsd/export.h | 15 ++ + fs/nfsd/netns.h | 23 +- + fs/nfsd/nfs2acl.c | 67 +++-- + fs/nfsd/nfs3acl.c | 45 ++-- + fs/nfsd/nfs3proc.c | 93 +++++-- + fs/nfsd/nfs3xdr.c | 538 ++++++++++++++++++++++------------------ + fs/nfsd/nfs4proc.c | 4 +- + fs/nfsd/nfscache.c | 52 ++-- + fs/nfsd/nfsctl.c | 8 +- + fs/nfsd/nfsd.h | 2 +- + fs/nfsd/nfsfh.c | 4 +- + fs/nfsd/nfsproc.c | 92 ++++--- + fs/nfsd/nfssvc.c | 34 --- + fs/nfsd/nfsxdr.c | 350 ++++++++++++-------------- + fs/nfsd/stats.c | 114 ++++++--- + fs/nfsd/stats.h | 96 +++++-- + fs/nfsd/vfs.c | 4 +- + fs/nfsd/xdr.h | 12 +- + fs/nfsd/xdr3.h | 20 +- + include/linux/nfsacl.h | 3 + + include/linux/sunrpc/msg_prot.h | 3 - + include/linux/sunrpc/svc.h | 1 + + include/linux/sunrpc/xdr.h | 13 +- + include/trace/events/sunrpc.h | 15 +- + include/uapi/linux/nfs3.h | 6 + + 30 files changed, 1073 insertions(+), 711 deletions(-) +Merging orangefs/for-next (c1048828c3db orangefs: add splice file operations) +$ git merge orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (9c09be9e71c4 ovl: perform vfs_getxattr() with mounter creds) +$ git merge overlayfs/overlayfs-next +Merge made by the 'recursive' strategy. + Documentation/filesystems/overlayfs.rst | 8 ++++ + fs/ecryptfs/inode.c | 10 +++-- + fs/overlayfs/copy_up.c | 15 ++++---- + fs/overlayfs/file.c | 22 ++++++++++- + fs/overlayfs/inode.c | 2 + + fs/overlayfs/overlayfs.h | 1 + + fs/overlayfs/ovl_entry.h | 2 + + fs/overlayfs/readdir.c | 28 +++++--------- + fs/overlayfs/super.c | 38 +++++++++++++++---- + fs/overlayfs/util.c | 27 +++++++++++++ + security/commoncap.c | 67 +++++++++++++++++++++------------ + 11 files changed, 159 insertions(+), 61 deletions(-) +Merging ubifs/next (b80a974b8c58 ubifs: ubifs_dump_node: Dump all branches of the index node) +$ git merge ubifs/next +Already up to date. +Merging v9fs/9p-next (324a158fe535 fs: 9p: add generic splice_write file operation) +$ git merge v9fs/9p-next +Merge made by the 'recursive' strategy. +Merging xfs/for-next (e82226138b20 xfs: remove xfs_buf_t typedef) +$ git merge xfs/for-next +Already up to date. +Merging zonefs/for-next (4f8b848788f7 zonefs: select CONFIG_CRC32) +$ git merge zonefs/for-next +Already up to date. +Merging iomap/iomap-for-next (1a31182edd00 iomap: Call inode_dio_end() before generic_write_sync()) +$ 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 (8d1ddb5e7937 fcntl: Fix potential deadlock in send_sig{io, urg}()) +$ git merge file-locks/locks-next +Already up to date. +Merging vfs/for-next (98583cf6115c Merge branch 'work.audit' into for-next) +$ git merge vfs/for-next +Auto-merging fs/inode.c +Auto-merging arch/x86/Kconfig +Removing arch/sparc/mm/extable.c +Auto-merging arch/s390/Kconfig +Removing arch/mips/kernel/binfmt_elfo32.c +Removing arch/mips/kernel/binfmt_elfn32.c +Auto-merging arch/mips/kernel/Makefile +Auto-merging arch/mips/Kconfig +Auto-merging arch/arm64/Kconfig +Auto-merging arch/Kconfig +CONFLICT (content): Merge conflict in arch/Kconfig +Resolved 'arch/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master f13f32fd882b] Merge remote-tracking branch 'vfs/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/porting.rst | 7 + + arch/Kconfig | 3 + + arch/arm64/Kconfig | 1 - + arch/ia64/kernel/crash.c | 2 +- + arch/mips/Kconfig | 8 +- + arch/mips/include/asm/elf.h | 56 ++-- + arch/mips/include/asm/elfcore-compat.h | 29 ++ + arch/mips/kernel/Makefile | 4 +- + arch/mips/kernel/binfmt_elfn32.c | 113 -------- + arch/mips/kernel/binfmt_elfo32.c | 116 -------- + arch/mips/kernel/scall64-n64.S | 2 +- + arch/parisc/Kconfig | 1 - + arch/powerpc/Kconfig | 1 - + arch/powerpc/platforms/powernv/opal-core.c | 6 +- + arch/s390/Kconfig | 1 - + arch/s390/kernel/crash_dump.c | 2 +- + arch/sparc/Kconfig | 1 - + arch/sparc/include/asm/elf_64.h | 1 - + arch/sparc/include/asm/{extable_64.h => extable.h} | 4 +- + arch/sparc/include/asm/processor_32.h | 6 +- + arch/sparc/include/asm/thread_info_64.h | 1 + + arch/sparc/include/asm/uaccess.h | 3 + + arch/sparc/include/asm/uaccess_32.h | 38 --- + arch/sparc/include/asm/uaccess_64.h | 1 - + arch/sparc/kernel/head_32.S | 2 +- + arch/sparc/kernel/head_64.S | 2 +- + arch/sparc/kernel/process_32.c | 12 - + arch/sparc/kernel/setup_32.c | 3 - + arch/sparc/kernel/setup_64.c | 4 - + arch/sparc/kernel/unaligned_32.c | 106 +------ + arch/sparc/lib/checksum_32.S | 64 ++--- + arch/sparc/lib/copy_user.S | 315 ++++++++------------- + arch/sparc/lib/memset.S | 87 +++--- + arch/sparc/mm/Makefile | 2 +- + arch/sparc/mm/extable.c | 107 ------- + arch/sparc/mm/fault_32.c | 80 +----- + arch/sparc/mm/mm_32.h | 2 - + arch/x86/Kconfig | 2 +- + arch/x86/include/asm/compat.h | 11 - + arch/x86/include/asm/elf.h | 2 +- + arch/x86/include/asm/elfcore-compat.h | 31 ++ + drivers/infiniband/hw/qib/qib_fs.c | 68 +---- + fs/Kconfig.binfmt | 2 +- + fs/binfmt_elf.c | 22 +- + fs/binfmt_elf_fdpic.c | 22 +- + fs/cifs/cifs_debug.c | 4 +- + fs/compat_binfmt_elf.c | 7 +- + fs/coredump.c | 56 ++-- + fs/cramfs/inode.c | 18 +- + fs/dcache.c | 25 ++ + fs/erofs/namei.c | 4 +- + fs/inode.c | 1 + + fs/jfs/super.c | 1 - + fs/namei.c | 88 +++--- + fs/namespace.c | 53 ++-- + fs/open.c | 6 + + fs/orangefs/file.c | 5 +- + include/linux/binfmts.h | 1 + + include/linux/coredump.h | 11 +- + include/linux/dcache.h | 2 + + include/linux/elfcore-compat.h | 15 +- + include/linux/elfcore.h | 7 +- + include/linux/fcntl.h | 2 +- + include/linux/mount.h | 1 - + include/linux/namei.h | 1 + + include/uapi/linux/openat2.h | 4 + + kernel/kexec_core.c | 2 +- + lib/extable.c | 5 - + security/lsm_audit.c | 5 +- + 69 files changed, 496 insertions(+), 1181 deletions(-) + create mode 100644 arch/mips/include/asm/elfcore-compat.h + delete mode 100644 arch/mips/kernel/binfmt_elfn32.c + delete mode 100644 arch/mips/kernel/binfmt_elfo32.c + rename arch/sparc/include/asm/{extable_64.h => extable.h} (92%) + delete mode 100644 arch/sparc/mm/extable.c + create mode 100644 arch/x86/include/asm/elfcore-compat.h +Merging printk/for-next (e103e8f1e0bf Merge branch 'printk-rework' into for-next) +$ git merge printk/for-next +Auto-merging init/main.c +Merge made by the 'recursive' strategy. +Merging pci/next (f9812c033ad3 Merge branch 'remotes/lorenzo/pci/misc') +$ git merge pci/next +Merge made by the 'recursive' strategy. + .../PCI/endpoint/function/binding/pci-ntb.rst | 38 + + Documentation/PCI/endpoint/index.rst | 3 + + Documentation/PCI/endpoint/pci-endpoint-cfs.rst | 10 + + Documentation/PCI/endpoint/pci-ntb-function.rst | 351 ++++ + Documentation/PCI/endpoint/pci-ntb-howto.rst | 160 ++ + .../devicetree/bindings/pci/brcm,stb-pcie.yaml | 37 +- + .../devicetree/bindings/pci/layerscape-pci.txt | 1 + + drivers/misc/pci_endpoint_test.c | 1 - + drivers/ntb/hw/Kconfig | 1 + + drivers/ntb/hw/Makefile | 1 + + drivers/ntb/hw/epf/Kconfig | 6 + + drivers/ntb/hw/epf/Makefile | 1 + + drivers/ntb/hw/epf/ntb_hw_epf.c | 754 +++++++ + drivers/pci/controller/Kconfig | 11 +- + drivers/pci/controller/cadence/pcie-cadence-ep.c | 60 +- + drivers/pci/controller/dwc/pci-layerscape-ep.c | 7 + + drivers/pci/controller/dwc/pcie-designware-host.c | 6 +- + drivers/pci/controller/dwc/pcie-designware.c | 48 +- + drivers/pci/controller/dwc/pcie-designware.h | 1 + + drivers/pci/controller/dwc/pcie-qcom.c | 4 +- + drivers/pci/controller/pci-xgene-msi.c | 10 +- + drivers/pci/controller/pcie-altera-msi.c | 3 +- + drivers/pci/controller/pcie-brcmstb.c | 35 +- + drivers/pci/controller/pcie-rcar-host.c | 2 +- + drivers/pci/endpoint/functions/Kconfig | 12 + + drivers/pci/endpoint/functions/Makefile | 1 + + drivers/pci/endpoint/functions/pci-epf-ntb.c | 2114 ++++++++++++++++++++ + drivers/pci/endpoint/functions/pci-epf-test.c | 13 +- + drivers/pci/endpoint/pci-ep-cfs.c | 176 +- + drivers/pci/endpoint/pci-epc-core.c | 130 +- + drivers/pci/endpoint/pci-epf-core.c | 105 +- + drivers/pci/setup-res.c | 6 + + include/linux/pci-epc.h | 39 +- + include/linux/pci-epf.h | 28 +- + include/linux/pci_ids.h | 1 + + 35 files changed, 4065 insertions(+), 111 deletions(-) + create mode 100644 Documentation/PCI/endpoint/function/binding/pci-ntb.rst + create mode 100644 Documentation/PCI/endpoint/pci-ntb-function.rst + create mode 100644 Documentation/PCI/endpoint/pci-ntb-howto.rst + create mode 100644 drivers/ntb/hw/epf/Kconfig + create mode 100644 drivers/ntb/hw/epf/Makefile + create mode 100644 drivers/ntb/hw/epf/ntb_hw_epf.c + create mode 100644 drivers/pci/endpoint/functions/pci-epf-ntb.c +Merging pstore/for-next/pstore (26fecbf7602d pstore: Move kmsg_bytes default into Kconfig) +$ git merge pstore/for-next/pstore +Already up to date. +Merging hid/for-next (ab7fcff8a2e2 Merge branch 'for-5.12/i2c-hid' into for-next) +$ git merge hid/for-next +Removing include/linux/platform_data/i2c-hid.h +Auto-merging arch/arm64/configs/defconfig +CONFLICT (content): Merge conflict in arch/arm64/configs/defconfig +Resolved 'arch/arm64/configs/defconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master e7c375aeafc9] Merge remote-tracking branch 'hid/for-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/input/goodix,gt7375p.yaml | 65 ++++++ + Documentation/hid/amd-sfh-hid.rst | 22 +- + Documentation/hid/hid-alps.rst | 4 +- + Documentation/hid/hid-sensor.rst | 18 +- + Documentation/hid/hid-transport.rst | 12 +- + Documentation/hid/hiddev.rst | 10 +- + Documentation/hid/hidraw.rst | 5 +- + Documentation/hid/intel-ish-hid.rst | 78 +++---- + Documentation/hid/uhid.rst | 34 +-- + arch/arm64/configs/defconfig | 3 +- + drivers/hid/Kconfig | 1 + + drivers/hid/Makefile | 2 +- + drivers/hid/hid-chicony.c | 55 +++++ + drivers/hid/hid-core.c | 9 +- + drivers/hid/hid-ids.h | 7 +- + drivers/hid/hid-logitech-hidpp.c | 246 +++++++++++++++++++- + drivers/hid/hid-quirks.c | 1 - + drivers/hid/hid-sony.c | 20 +- + drivers/hid/hid-uclogic-core.c | 2 + + drivers/hid/hid-uclogic-params.c | 2 + + drivers/hid/i2c-hid/Kconfig | 47 +++- + drivers/hid/i2c-hid/Makefile | 6 +- + drivers/hid/i2c-hid/i2c-hid-acpi.c | 143 ++++++++++++ + drivers/hid/i2c-hid/i2c-hid-core.c | 252 ++++----------------- + drivers/hid/i2c-hid/i2c-hid-of-goodix.c | 116 ++++++++++ + drivers/hid/i2c-hid/i2c-hid-of.c | 143 ++++++++++++ + drivers/hid/i2c-hid/i2c-hid.h | 22 ++ + drivers/hid/intel-ish-hid/ipc/hw-ish.h | 1 + + drivers/hid/intel-ish-hid/ipc/ipc.c | 27 +++ + drivers/hid/intel-ish-hid/ipc/pci-ish.c | 54 ++++- + include/linux/platform_data/i2c-hid.h | 41 ---- + 31 files changed, 1077 insertions(+), 371 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/goodix,gt7375p.yaml + create mode 100644 drivers/hid/i2c-hid/i2c-hid-acpi.c + create mode 100644 drivers/hid/i2c-hid/i2c-hid-of-goodix.c + create mode 100644 drivers/hid/i2c-hid/i2c-hid-of.c + delete mode 100644 include/linux/platform_data/i2c-hid.h +Merging i2c/i2c/for-next (98babb378826 Merge branch 'i2c/for-5.12' into i2c/for-next) +$ git merge i2c/i2c/for-next +Removing drivers/i2c/busses/i2c-efm32.c +Auto-merging drivers/gpio/gpiolib.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/i2c/renesas,i2c.txt | 1 + + drivers/gpio/gpiolib.c | 4 + + drivers/i2c/busses/Kconfig | 7 - + drivers/i2c/busses/Makefile | 1 - + drivers/i2c/busses/i2c-bcm-iproc.c | 254 ++++++++--- + drivers/i2c/busses/i2c-efm32.c | 469 --------------------- + drivers/i2c/busses/i2c-elektor.c | 3 +- + drivers/i2c/busses/i2c-gpio.c | 2 +- + drivers/i2c/busses/i2c-hix5hd2.c | 4 +- + drivers/i2c/busses/i2c-i801.c | 13 +- + drivers/i2c/busses/i2c-imx.c | 6 +- + drivers/i2c/busses/i2c-mlxcpld.c | 97 +++-- + drivers/i2c/busses/i2c-octeon-core.c | 2 +- + drivers/i2c/busses/i2c-qcom-geni.c | 59 ++- + drivers/i2c/busses/i2c-rcar.c | 66 ++- + drivers/i2c/busses/i2c-tegra-bpmp.c | 2 +- + drivers/i2c/busses/i2c-tegra.c | 24 +- + drivers/i2c/i2c-core-acpi.c | 6 +- + drivers/i2c/i2c-core-smbus.c | 15 +- + drivers/i2c/i2c-stub.c | 1 - + drivers/i2c/muxes/i2c-mux-gpio.c | 112 +++-- + 21 files changed, 484 insertions(+), 664 deletions(-) + delete mode 100644 drivers/i2c/busses/i2c-efm32.c +Merging i3c/i3c/next (5c8fe583cce5 Linux 5.11-rc1) +$ 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 +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + drivers/firmware/dmi-id.c | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) +Merging hwmon-staging/hwmon-next (0d3771d52ed5 hwmon: (applesmc) Assign boolean values to a bool variable) +$ git merge hwmon-staging/hwmon-next +Removing drivers/hwmon/abx500.h +Removing drivers/hwmon/abx500.c +Removing drivers/hwmon/ab8500.c +Removing Documentation/hwmon/abx500.rst +Removing Documentation/hwmon/ab8500.rst +Merge made by the 'recursive' strategy. + Documentation/hwmon/ab8500.rst | 26 --- + Documentation/hwmon/abx500.rst | 32 --- + Documentation/hwmon/index.rst | 2 - + Documentation/hwmon/nct6683.rst | 1 + + drivers/hwmon/Kconfig | 13 -- + drivers/hwmon/Makefile | 1 - + drivers/hwmon/ab8500.c | 224 ------------------ + drivers/hwmon/abx500.c | 487 --------------------------------------- + drivers/hwmon/abx500.h | 69 ------ + drivers/hwmon/applesmc.c | 2 +- + drivers/hwmon/aspeed-pwm-tacho.c | 4 +- + drivers/hwmon/gpio-fan.c | 2 +- + drivers/hwmon/k10temp.c | 3 +- + drivers/hwmon/max6650.c | 2 +- + drivers/hwmon/nct6683.c | 3 + + drivers/hwmon/pc87360.c | 4 +- + drivers/hwmon/pmbus/ibm-cffps.c | 2 +- + drivers/hwmon/pmbus/pmbus_core.c | 8 +- + drivers/hwmon/pwm-fan.c | 111 +++++---- + drivers/hwmon/smsc47m1.c | 2 +- + drivers/hwmon/w83627ehf.c | 2 +- + include/linux/pmbus.h | 9 + + 22 files changed, 99 insertions(+), 910 deletions(-) + delete mode 100644 Documentation/hwmon/ab8500.rst + delete mode 100644 Documentation/hwmon/abx500.rst + delete mode 100644 drivers/hwmon/ab8500.c + delete mode 100644 drivers/hwmon/abx500.c + delete mode 100644 drivers/hwmon/abx500.h +Merging jc_docs/docs-next (3950b92f9691 selftests: kselftest_harness.h: partially fix kernel-doc markups) +$ git merge jc_docs/docs-next +Auto-merging fs/inode.c +Auto-merging fs/dcache.c +Auto-merging arch/Kconfig +Auto-merging Documentation/filesystems/vfs.rst +Merge made by the 'recursive' strategy. + Documentation/RCU/RTFP.txt | 94 +++++++++++----------- + Documentation/accounting/cgroupstats.rst | 4 +- + Documentation/admin-guide/cgroup-v1/memory.rst | 14 ++-- + Documentation/admin-guide/cgroup-v2.rst | 64 ++++++++------- + Documentation/admin-guide/cpu-load.rst | 2 +- + .../admin-guide/kernel-per-CPU-kthreads.rst | 2 +- + Documentation/driver-api/gpio/driver.rst | 4 +- + Documentation/driver-api/men-chameleon-bus.rst | 12 +++ + Documentation/filesystems/afs.rst | 8 +- + Documentation/filesystems/dax.txt | 17 +--- + Documentation/filesystems/index.rst | 1 + + Documentation/filesystems/vfs.rst | 2 +- + Documentation/gpu/todo.rst | 2 +- + Documentation/iio/ep93xx_adc.rst | 2 +- + Documentation/index.rst | 11 --- + Documentation/kernel-hacking/hacking.rst | 4 +- + Documentation/power/freezing-of-tasks.rst | 2 +- + Documentation/process/adding-syscalls.rst | 18 ++--- + Documentation/process/howto.rst | 20 ++--- + Documentation/process/submit-checklist.rst | 14 ++-- + Documentation/process/submitting-patches.rst | 9 ++- + Documentation/scheduler/sched-bwc.rst | 17 ++-- + Documentation/scheduler/sched-deadline.rst | 2 +- + Documentation/scheduler/sched-design-CFS.rst | 6 +- + Documentation/security/lsm-development.rst | 2 +- + Documentation/timers/timers-howto.rst | 2 +- + .../translations/it_IT/process/adding-syscalls.rst | 18 ++--- + .../it_IT/process/submitting-patches.rst | 4 +- + Documentation/translations/ja_JP/SubmittingPatches | 4 +- + Documentation/translations/ko_KR/howto.rst | 4 +- + Documentation/translations/ko_KR/index.rst | 15 ++++ + .../translations/zh_CN/admin-guide/cpu-load.rst | 2 +- + Documentation/translations/zh_CN/mips/booting.rst | 31 +++++++ + Documentation/translations/zh_CN/mips/features.rst | 10 +++ + Documentation/translations/zh_CN/mips/index.rst | 26 ++++++ + .../translations/zh_CN/mips/ingenic-tcu.rst | 69 ++++++++++++++++ + .../zh_CN/process/submitting-patches.rst | 4 +- + Documentation/vm/split_page_table_lock.rst | 2 +- + arch/Kconfig | 4 +- + drivers/parport/share.c | 2 +- + drivers/rapidio/rio.c | 2 +- + fs/dcache.c | 63 ++++++++------- + fs/inode.c | 4 +- + fs/pstore/zone.c | 2 +- + fs/seq_file.c | 5 +- + fs/super.c | 12 +-- + include/linux/connector.h | 2 +- + .../linux/firmware/intel/stratix10-svc-client.h | 10 +-- + include/linux/memblock.h | 4 +- + include/linux/parport.h | 31 +++++++ + include/linux/w1.h | 2 +- + lib/crc7.c | 2 +- + samples/kprobes/kprobe_example.c | 9 ++- + scripts/kernel-doc | 62 ++++++++++---- + tools/testing/selftests/kselftest_harness.h | 26 +++--- + 55 files changed, 498 insertions(+), 268 deletions(-) + create mode 100644 Documentation/translations/zh_CN/mips/booting.rst + create mode 100644 Documentation/translations/zh_CN/mips/features.rst + create mode 100644 Documentation/translations/zh_CN/mips/index.rst + create mode 100644 Documentation/translations/zh_CN/mips/ingenic-tcu.rst +Merging v4l-dvb/master (321af22a3d2f media: atomisp: convert comma to semicolon) +$ git merge v4l-dvb/master +Removing drivers/staging/media/allegro-dvt/TODO +Removing drivers/staging/media/allegro-dvt/Kconfig +Auto-merging drivers/media/platform/qcom/venus/core.c +Auto-merging drivers/media/pci/intel/ipu3/ipu3-cio2.c +Auto-merging drivers/media/i2c/ccs/ccs-data.c +Auto-merging drivers/media/i2c/ccs-pll.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/media/allegro.txt +Merge made by the 'recursive' strategy. + .../display/tegra/nvidia,tegra20-host1x.txt | 4 +- + .../devicetree/bindings/media/allegro,al5e.yaml | 105 + + .../devicetree/bindings/media/allegro.txt | 43 - + .../media/i2c/{ov5647.yaml => ovti,ov5647.yaml} | 0 + .../devicetree/bindings/media/i2c/ovti,ov5648.yaml | 115 + + .../devicetree/bindings/media/i2c/ovti,ov8865.yaml | 124 + + Documentation/driver-api/media/camera-sensor.rst | 20 +- + Documentation/driver-api/media/csi2.rst | 4 +- + Documentation/driver-api/media/drivers/ccs/ccs.rst | 13 + + Documentation/driver-api/media/v4l2-subdev.rst | 15 +- + Documentation/userspace-api/media/drivers/ccs.rst | 110 + + .../userspace-api/media/drivers/index.rst | 1 + + .../userspace-api/media/mediactl/media-types.rst | 7 + + .../userspace-api/media/v4l/ext-ctrls-codec.rst | 81 +- + MAINTAINERS | 9 +- + drivers/media/cec/core/cec-adap.c | 4 +- + drivers/media/cec/core/cec-api.c | 2 +- + drivers/media/common/videobuf2/videobuf2-core.c | 11 +- + drivers/media/dvb-frontends/cxd2841er.c | 2 +- + drivers/media/i2c/Kconfig | 26 + + drivers/media/i2c/Makefile | 2 + + drivers/media/i2c/ccs-pll.c | 116 +- + drivers/media/i2c/ccs-pll.h | 86 +- + drivers/media/i2c/ccs/ccs-core.c | 318 ++- + drivers/media/i2c/ccs/ccs-data.c | 25 +- + drivers/media/i2c/ccs/ccs-data.h | 2 + + drivers/media/i2c/ccs/ccs-reg-access.c | 29 +- + drivers/media/i2c/ccs/ccs.h | 8 +- + drivers/media/i2c/ccs/smiapp-reg-defs.h | 2 + + drivers/media/i2c/imx219.c | 8 +- + drivers/media/i2c/mt9v111.c | 6 - + drivers/media/i2c/ov5647.c | 1259 +++++++-- + drivers/media/i2c/ov5648.c | 2623 +++++++++++++++++ + drivers/media/i2c/ov5670.c | 3 +- + drivers/media/i2c/ov8865.c | 2972 ++++++++++++++++++++ + drivers/media/pci/intel/ipu3/Kconfig | 3 +- + drivers/media/pci/intel/ipu3/ipu3-cio2.c | 2 +- + drivers/media/pci/saa7134/saa7134-empress.c | 5 +- + drivers/media/platform/Kconfig | 17 +- + drivers/media/platform/Makefile | 1 + + .../media => media/platform}/allegro-dvt/Makefile | 0 + .../platform}/allegro-dvt/allegro-core.c | 183 +- + .../platform}/allegro-dvt/allegro-mail.c | 8 +- + .../platform}/allegro-dvt/allegro-mail.h | 4 +- + .../platform}/allegro-dvt/nal-h264.c | 0 + .../platform}/allegro-dvt/nal-h264.h | 0 + drivers/media/platform/aspeed-video.c | 6 +- + drivers/media/platform/davinci/vpif.c | 3 +- + .../media/platform/mtk-vcodec/vdec/vdec_vp9_if.c | 3 +- + drivers/media/platform/qcom/camss/camss-video.c | 3 +- + drivers/media/platform/qcom/venus/Makefile | 4 +- + drivers/media/platform/qcom/venus/core.c | 17 - + drivers/media/platform/qcom/venus/core.h | 74 +- + drivers/media/platform/qcom/venus/helpers.c | 136 +- + drivers/media/platform/qcom/venus/helpers.h | 2 +- + drivers/media/platform/qcom/venus/hfi.c | 18 +- + drivers/media/platform/qcom/venus/hfi_helper.h | 18 + + drivers/media/platform/qcom/venus/hfi_parser.c | 59 +- + drivers/media/platform/qcom/venus/hfi_parser.h | 7 +- + drivers/media/platform/qcom/venus/hfi_plat_bufs.h | 38 + + .../media/platform/qcom/venus/hfi_plat_bufs_v6.c | 1317 +++++++++ + drivers/media/platform/qcom/venus/hfi_platform.c | 65 + + drivers/media/platform/qcom/venus/hfi_platform.h | 67 + + .../media/platform/qcom/venus/hfi_platform_v4.c | 319 +++ + .../media/platform/qcom/venus/hfi_platform_v6.c | 326 +++ + drivers/media/platform/qcom/venus/hfi_venus.c | 80 +- + drivers/media/platform/qcom/venus/pm_helpers.c | 12 +- + drivers/media/platform/qcom/venus/vdec.c | 129 +- + drivers/media/platform/qcom/venus/venc.c | 129 +- + drivers/media/platform/qcom/venus/venc_ctrls.c | 121 +- + .../media/platform/rockchip/rkisp1/rkisp1-isp.c | 34 + + drivers/media/platform/sh_vou.c | 2 +- + drivers/media/platform/ti-vpe/cal-camerarx.c | 373 ++- + drivers/media/platform/ti-vpe/cal-video.c | 394 +-- + drivers/media/platform/ti-vpe/cal.c | 389 ++- + drivers/media/platform/ti-vpe/cal.h | 105 +- + drivers/media/platform/vsp1/vsp1.h | 20 +- + drivers/media/platform/vsp1/vsp1_drv.c | 4 +- + drivers/media/rc/ir_toy.c | 1 + + drivers/media/rc/mceusb.c | 2 +- + drivers/media/test-drivers/vivid/vivid-ctrls.c | 38 +- + drivers/media/usb/em28xx/em28xx-core.c | 6 +- + drivers/media/usb/pwc/pwc-if.c | 22 +- + drivers/media/usb/tm6000/tm6000-dvb.c | 4 + + drivers/media/v4l2-core/v4l2-ctrls.c | 16 + + drivers/media/v4l2-core/v4l2-dev.c | 15 +- + drivers/media/v4l2-core/v4l2-event.c | 17 + + drivers/media/v4l2-core/v4l2-ioctl.c | 36 +- + drivers/media/v4l2-core/v4l2-mem2mem.c | 15 +- + drivers/staging/media/Kconfig | 2 - + drivers/staging/media/Makefile | 1 - + drivers/staging/media/allegro-dvt/Kconfig | 16 - + drivers/staging/media/allegro-dvt/TODO | 4 - + drivers/staging/media/atomisp/pci/sh_css_params.c | 6 +- + drivers/staging/media/hantro/hantro_v4l2.c | 2 +- + drivers/staging/media/imx/Kconfig | 9 +- + drivers/staging/media/imx/Makefile | 2 +- + drivers/staging/media/imx/imx-media-capture.c | 10 +- + drivers/staging/media/imx/imx-media-csc-scaler.c | 4 - + drivers/staging/media/imx/imx-media-dev.c | 7 +- + drivers/staging/media/imx/imx7-media-csi.c | 27 +- + drivers/staging/media/omap4iss/iss.c | 1 - + drivers/staging/media/omap4iss/iss_video.h | 1 - + drivers/staging/media/rkvdec/rkvdec.c | 2 +- + drivers/staging/media/tegra-video/csi.c | 35 +- + drivers/staging/media/tegra-video/csi.h | 14 +- + drivers/staging/media/tegra-video/tegra210.c | 340 ++- + drivers/staging/media/tegra-video/vi.c | 338 ++- + drivers/staging/media/tegra-video/vi.h | 23 +- + drivers/staging/media/tegra-video/video.c | 18 + + drivers/staging/media/zoran/zoran_driver.c | 2 +- + include/media/v4l2-event.h | 13 +- + include/media/v4l2-fwnode.h | 6 +- + include/uapi/linux/ccs.h | 18 + + include/uapi/linux/media.h | 1 + + include/uapi/linux/v4l2-controls.h | 22 + + 116 files changed, 12155 insertions(+), 1593 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/allegro,al5e.yaml + delete mode 100644 Documentation/devicetree/bindings/media/allegro.txt + rename Documentation/devicetree/bindings/media/i2c/{ov5647.yaml => ovti,ov5647.yaml} (100%) + create mode 100644 Documentation/devicetree/bindings/media/i2c/ovti,ov5648.yaml + create mode 100644 Documentation/devicetree/bindings/media/i2c/ovti,ov8865.yaml + create mode 100644 Documentation/userspace-api/media/drivers/ccs.rst + create mode 100644 drivers/media/i2c/ov5648.c + create mode 100644 drivers/media/i2c/ov8865.c + rename drivers/{staging/media => media/platform}/allegro-dvt/Makefile (100%) + rename drivers/{staging/media => media/platform}/allegro-dvt/allegro-core.c (95%) + rename drivers/{staging/media => media/platform}/allegro-dvt/allegro-mail.c (98%) + rename drivers/{staging/media => media/platform}/allegro-dvt/allegro-mail.h (98%) + rename drivers/{staging/media => media/platform}/allegro-dvt/nal-h264.c (100%) + rename drivers/{staging/media => media/platform}/allegro-dvt/nal-h264.h (100%) + create mode 100644 drivers/media/platform/qcom/venus/hfi_plat_bufs.h + create mode 100644 drivers/media/platform/qcom/venus/hfi_plat_bufs_v6.c + create mode 100644 drivers/media/platform/qcom/venus/hfi_platform.c + create mode 100644 drivers/media/platform/qcom/venus/hfi_platform.h + create mode 100644 drivers/media/platform/qcom/venus/hfi_platform_v4.c + create mode 100644 drivers/media/platform/qcom/venus/hfi_platform_v6.c + delete mode 100644 drivers/staging/media/allegro-dvt/Kconfig + delete mode 100644 drivers/staging/media/allegro-dvt/TODO + create mode 100644 include/uapi/linux/ccs.h +Merging v4l-dvb-next/master (d0a9fffedca1 docs: fs: api-summary.rst: get rid of kernel-doc include) +$ git merge v4l-dvb-next/master +Auto-merging scripts/kernel-doc +Auto-merging include/linux/refcount.h +Auto-merging include/linux/phy.h +Auto-merging include/linux/pagemap.h +Auto-merging include/linux/blk-mq.h +Auto-merging drivers/infiniband/ulp/srpt/ib_srpt.h +Auto-merging drivers/gpu/drm/drm_edid.c +Auto-merging drivers/gpu/drm/drm_dp_helper.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_dp_helper.c +Auto-merging drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c +Auto-merging MAINTAINERS +Auto-merging Documentation/hwmon/index.rst +Auto-merging Documentation/dev-tools/kasan.rst +CONFLICT (content): Merge conflict in Documentation/dev-tools/kasan.rst +Auto-merging Documentation/conf.py +Resolved 'Documentation/dev-tools/kasan.rst' using previous resolution. +Resolved 'drivers/gpu/drm/drm_dp_helper.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 84c9b0f79a47] Merge remote-tracking branch 'v4l-dvb-next/master' +$ git diff -M --stat --summary HEAD^.. +Merging fbdev/fbdev-for-next (732146a3f1dc video: fbdev: imxfb: fix a typo in imxfb_probe()) +$ git merge fbdev/fbdev-for-next +Already up to date. +Merging pm/linux-next (d9ac95f54ba8 Merge branch 'pm-clk' into linux-next) +$ git merge pm/linux-next +Auto-merging include/linux/cpuhotplug.h +Auto-merging include/linux/clk.h +Auto-merging include/asm-generic/vmlinux.lds.h +Merge made by the 'recursive' strategy. + Documentation/power/index.rst | 1 + + Documentation/power/powercap/dtpm.rst | 212 +++++++++ + drivers/acpi/acpica/acapps.h | 4 +- + drivers/acpi/acpica/accommon.h | 2 +- + drivers/acpi/acpica/acconvert.h | 2 +- + drivers/acpi/acpica/acdebug.h | 2 +- + drivers/acpi/acpica/acdispat.h | 2 +- + drivers/acpi/acpica/acevents.h | 2 +- + drivers/acpi/acpica/acglobal.h | 2 +- + drivers/acpi/acpica/achware.h | 2 +- + drivers/acpi/acpica/acinterp.h | 2 +- + drivers/acpi/acpica/aclocal.h | 2 +- + drivers/acpi/acpica/acmacros.h | 2 +- + drivers/acpi/acpica/acnamesp.h | 2 +- + drivers/acpi/acpica/acobject.h | 2 +- + drivers/acpi/acpica/acopcode.h | 2 +- + drivers/acpi/acpica/acparser.h | 2 +- + drivers/acpi/acpica/acpredef.h | 2 +- + drivers/acpi/acpica/acresrc.h | 2 +- + drivers/acpi/acpica/acstruct.h | 2 +- + drivers/acpi/acpica/actables.h | 2 +- + drivers/acpi/acpica/acutils.h | 2 +- + drivers/acpi/acpica/amlcode.h | 2 +- + drivers/acpi/acpica/amlresrc.h | 2 +- + drivers/acpi/acpica/dbhistry.c | 2 +- + drivers/acpi/acpica/dbinput.c | 4 +- + drivers/acpi/acpica/dbobject.c | 2 +- + drivers/acpi/acpica/dsargs.c | 2 +- + drivers/acpi/acpica/dscontrol.c | 4 +- + drivers/acpi/acpica/dsdebug.c | 4 +- + drivers/acpi/acpica/dsfield.c | 2 +- + drivers/acpi/acpica/dsinit.c | 2 +- + drivers/acpi/acpica/dsmethod.c | 2 +- + drivers/acpi/acpica/dsobject.c | 2 +- + drivers/acpi/acpica/dsopcode.c | 2 +- + drivers/acpi/acpica/dspkginit.c | 2 +- + drivers/acpi/acpica/dswexec.c | 5 +- + drivers/acpi/acpica/dswload.c | 4 +- + drivers/acpi/acpica/dswload2.c | 4 +- + drivers/acpi/acpica/dswscope.c | 2 +- + drivers/acpi/acpica/dswstate.c | 2 +- + drivers/acpi/acpica/evevent.c | 2 +- + drivers/acpi/acpica/evglock.c | 2 +- + drivers/acpi/acpica/evgpe.c | 2 +- + drivers/acpi/acpica/evgpeblk.c | 2 +- + drivers/acpi/acpica/evgpeinit.c | 2 +- + drivers/acpi/acpica/evgpeutil.c | 2 +- + drivers/acpi/acpica/evhandler.c | 2 +- + drivers/acpi/acpica/evmisc.c | 2 +- + drivers/acpi/acpica/evregion.c | 2 +- + drivers/acpi/acpica/evrgnini.c | 2 +- + drivers/acpi/acpica/evxface.c | 2 +- + drivers/acpi/acpica/evxfevnt.c | 2 +- + drivers/acpi/acpica/evxfgpe.c | 2 +- + drivers/acpi/acpica/evxfregn.c | 2 +- + drivers/acpi/acpica/exconcat.c | 2 +- + drivers/acpi/acpica/exconfig.c | 2 +- + drivers/acpi/acpica/exconvrt.c | 2 +- + drivers/acpi/acpica/excreate.c | 2 +- + drivers/acpi/acpica/exdebug.c | 2 +- + drivers/acpi/acpica/exdump.c | 2 +- + drivers/acpi/acpica/exfield.c | 2 +- + drivers/acpi/acpica/exfldio.c | 4 +- + drivers/acpi/acpica/exmisc.c | 2 +- + drivers/acpi/acpica/exmutex.c | 2 +- + drivers/acpi/acpica/exnames.c | 2 +- + drivers/acpi/acpica/exoparg1.c | 2 +- + drivers/acpi/acpica/exoparg2.c | 2 +- + drivers/acpi/acpica/exoparg3.c | 2 +- + drivers/acpi/acpica/exoparg6.c | 2 +- + drivers/acpi/acpica/exprep.c | 2 +- + drivers/acpi/acpica/exregion.c | 2 +- + drivers/acpi/acpica/exresnte.c | 2 +- + drivers/acpi/acpica/exresolv.c | 2 +- + drivers/acpi/acpica/exresop.c | 6 +- + drivers/acpi/acpica/exserial.c | 2 +- + drivers/acpi/acpica/exstore.c | 6 +- + drivers/acpi/acpica/exstoren.c | 2 +- + drivers/acpi/acpica/exstorob.c | 2 +- + drivers/acpi/acpica/exsystem.c | 2 +- + drivers/acpi/acpica/extrace.c | 2 +- + drivers/acpi/acpica/exutils.c | 2 +- + drivers/acpi/acpica/hwacpi.c | 2 +- + drivers/acpi/acpica/hwesleep.c | 2 +- + drivers/acpi/acpica/hwgpe.c | 4 +- + drivers/acpi/acpica/hwsleep.c | 2 +- + drivers/acpi/acpica/hwtimer.c | 2 +- + drivers/acpi/acpica/hwvalid.c | 2 +- + drivers/acpi/acpica/hwxface.c | 2 +- + drivers/acpi/acpica/hwxfsleep.c | 2 +- + drivers/acpi/acpica/nsarguments.c | 2 +- + drivers/acpi/acpica/nsconvert.c | 2 +- + drivers/acpi/acpica/nsdump.c | 2 +- + drivers/acpi/acpica/nsdumpdv.c | 2 +- + drivers/acpi/acpica/nsinit.c | 2 +- + drivers/acpi/acpica/nsload.c | 2 +- + drivers/acpi/acpica/nsparse.c | 2 +- + drivers/acpi/acpica/nspredef.c | 2 +- + drivers/acpi/acpica/nsprepkg.c | 2 +- + drivers/acpi/acpica/nsrepair.c | 2 +- + drivers/acpi/acpica/nsrepair2.c | 2 +- + drivers/acpi/acpica/nsutils.c | 2 +- + drivers/acpi/acpica/nswalk.c | 2 +- + drivers/acpi/acpica/nsxfname.c | 2 +- + drivers/acpi/acpica/psargs.c | 2 +- + drivers/acpi/acpica/psloop.c | 5 +- + drivers/acpi/acpica/psobject.c | 2 +- + drivers/acpi/acpica/psopcode.c | 2 +- + drivers/acpi/acpica/psopinfo.c | 2 +- + drivers/acpi/acpica/psparse.c | 4 +- + drivers/acpi/acpica/psscope.c | 2 +- + drivers/acpi/acpica/pstree.c | 2 +- + drivers/acpi/acpica/psutils.c | 2 +- + drivers/acpi/acpica/pswalk.c | 2 +- + drivers/acpi/acpica/psxface.c | 2 +- + drivers/acpi/acpica/tbdata.c | 2 +- + drivers/acpi/acpica/tbfadt.c | 2 +- + drivers/acpi/acpica/tbfind.c | 2 +- + drivers/acpi/acpica/tbinstal.c | 2 +- + drivers/acpi/acpica/tbprint.c | 2 +- + drivers/acpi/acpica/tbutils.c | 2 +- + drivers/acpi/acpica/tbxface.c | 2 +- + drivers/acpi/acpica/tbxfload.c | 2 +- + drivers/acpi/acpica/tbxfroot.c | 2 +- + drivers/acpi/acpica/utaddress.c | 2 +- + drivers/acpi/acpica/utalloc.c | 2 +- + drivers/acpi/acpica/utascii.c | 2 +- + drivers/acpi/acpica/utbuffer.c | 2 +- + drivers/acpi/acpica/utcache.c | 2 +- + drivers/acpi/acpica/utcopy.c | 2 +- + drivers/acpi/acpica/utdebug.c | 2 +- + drivers/acpi/acpica/utdecode.c | 2 +- + drivers/acpi/acpica/utdelete.c | 2 +- + drivers/acpi/acpica/uteval.c | 2 +- + drivers/acpi/acpica/utglobal.c | 2 +- + drivers/acpi/acpica/uthex.c | 2 +- + drivers/acpi/acpica/utids.c | 2 +- + drivers/acpi/acpica/utinit.c | 2 +- + drivers/acpi/acpica/utlock.c | 2 +- + drivers/acpi/acpica/utobject.c | 2 +- + drivers/acpi/acpica/utosi.c | 2 +- + drivers/acpi/acpica/utpredef.c | 2 +- + drivers/acpi/acpica/utprint.c | 2 +- + drivers/acpi/acpica/utstrsuppt.c | 4 +- + drivers/acpi/acpica/uttrack.c | 2 +- + drivers/acpi/acpica/utuuid.c | 2 +- + drivers/acpi/acpica/utxface.c | 2 +- + drivers/acpi/acpica/utxfinit.c | 2 +- + drivers/base/power/clock_ops.c | 213 +++++++-- + drivers/clk/clk.c | 21 + + drivers/cpufreq/intel_pstate.c | 44 +- + drivers/powercap/Kconfig | 13 + + drivers/powercap/Makefile | 2 + + drivers/powercap/dtpm.c | 480 +++++++++++++++++++++ + drivers/powercap/dtpm_cpu.c | 257 +++++++++++ + include/acpi/acbuffer.h | 2 +- + include/acpi/acconfig.h | 2 +- + include/acpi/acexcep.h | 12 +- + include/acpi/acnames.h | 2 +- + include/acpi/acoutput.h | 2 +- + include/acpi/acpi.h | 2 +- + include/acpi/acpiosxf.h | 2 +- + include/acpi/acpixf.h | 4 +- + include/acpi/acrestyp.h | 2 +- + include/acpi/actbl.h | 2 +- + include/acpi/actbl1.h | 2 +- + include/acpi/actbl2.h | 26 +- + include/acpi/actbl3.h | 25 +- + include/acpi/actypes.h | 7 +- + include/acpi/acuuid.h | 2 +- + include/acpi/platform/acenv.h | 2 +- + include/acpi/platform/acenvex.h | 2 +- + include/acpi/platform/acgcc.h | 17 +- + include/acpi/platform/acgccex.h | 2 +- + include/acpi/platform/acintel.h | 2 +- + include/acpi/platform/aclinux.h | 2 +- + include/acpi/platform/aclinuxex.h | 2 +- + include/asm-generic/vmlinux.lds.h | 11 + + include/linux/clk.h | 24 +- + include/linux/cpuhotplug.h | 1 + + include/linux/dtpm.h | 77 ++++ + include/linux/pm.h | 2 + + include/linux/units.h | 4 + + tools/power/acpi/common/cmfsize.c | 2 +- + tools/power/acpi/common/getopt.c | 2 +- + .../acpi/os_specific/service_layers/oslinuxtbl.c | 2 +- + .../acpi/os_specific/service_layers/osunixdir.c | 2 +- + .../acpi/os_specific/service_layers/osunixmap.c | 2 +- + .../acpi/os_specific/service_layers/osunixxf.c | 2 +- + tools/power/acpi/tools/acpidump/acpidump.h | 2 +- + tools/power/acpi/tools/acpidump/apdump.c | 2 +- + tools/power/acpi/tools/acpidump/apfiles.c | 2 +- + tools/power/acpi/tools/acpidump/apmain.c | 2 +- + 193 files changed, 1519 insertions(+), 312 deletions(-) + create mode 100644 Documentation/power/powercap/dtpm.rst + create mode 100644 drivers/powercap/dtpm.c + create mode 100644 drivers/powercap/dtpm_cpu.c + create mode 100644 include/linux/dtpm.h +Merging cpufreq-arm/cpufreq/arm/linux-next (7114ebffd330 cpufreq: remove tango driver) +$ git merge cpufreq-arm/cpufreq/arm/linux-next +Removing drivers/cpufreq/tango-cpufreq.c +Merge made by the 'recursive' strategy. + drivers/cpufreq/Kconfig.arm | 5 ---- + drivers/cpufreq/Makefile | 1 - + drivers/cpufreq/brcmstb-avs-cpufreq.c | 24 +++++++++++++------ + drivers/cpufreq/cpufreq-dt-platdev.c | 2 -- + drivers/cpufreq/qcom-cpufreq-hw.c | 6 +++++ + drivers/cpufreq/tango-cpufreq.c | 38 ----------------------------- + drivers/cpufreq/tegra20-cpufreq.c | 45 +++++++++++++++++------------------ + 7 files changed, 45 insertions(+), 76 deletions(-) + delete mode 100644 drivers/cpufreq/tango-cpufreq.c +Merging cpupower/cpupower (fb7791e213a6 cpupower: add Makefile dependencies for install targets) +$ git merge cpupower/cpupower +Merge made by the 'recursive' strategy. + tools/power/cpupower/Makefile | 8 ++++---- + tools/power/cpupower/bench/Makefile | 2 +- + 2 files changed, 5 insertions(+), 5 deletions(-) +Merging devfreq/devfreq-next (ec894883de53 PM / devfreq: Replace devfreq->dev.parent as dev in devfreq_add_device) +$ git merge devfreq/devfreq-next +Merge made by the 'recursive' strategy. + drivers/devfreq/devfreq.c | 4 ++-- + drivers/devfreq/governor.h | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) +Merging opp/opp/linux-next (b9de80824191 opp: Remove dev_pm_opp_set_bw()) +$ git merge opp/opp/linux-next +Auto-merging drivers/cpufreq/qcom-cpufreq-hw.c +Merge made by the 'recursive' strategy. + drivers/cpufreq/qcom-cpufreq-hw.c | 2 +- + drivers/devfreq/tegra30-devfreq.c | 2 +- + drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 8 +- + drivers/opp/core.c | 561 +++++++++++++++++++++++----------- + drivers/opp/of.c | 9 +- + drivers/opp/opp.h | 4 + + include/linux/pm_opp.h | 39 ++- + 7 files changed, 426 insertions(+), 199 deletions(-) +Merging thermal/thermal/linux-next (7a583405f24b thermal: power allocator: fail binding for non-power actor devices) +$ git merge thermal/thermal/linux-next +Auto-merging drivers/hwmon/pwm-fan.c +Merge made by the 'recursive' strategy. + Documentation/driver-api/thermal/sysfs-api.rst | 13 ---- + drivers/acpi/thermal.c | 49 ++++--------- + drivers/hwmon/pwm-fan.c | 1 - + drivers/platform/x86/acerhdf.c | 3 +- + drivers/thermal/da9062-thermal.c | 4 +- + drivers/thermal/gov_power_allocator.c | 37 +++++++++- + drivers/thermal/gov_step_wise.c | 14 +--- + .../intel/int340x_thermal/int340x_thermal_zone.c | 6 ++ + drivers/thermal/intel/intel_pch_thermal.c | 6 ++ + drivers/thermal/khadas_mcu_fan.c | 1 - + drivers/thermal/thermal_core.c | 72 +++--------------- + drivers/thermal/thermal_core.h | 7 +- + drivers/thermal/thermal_helpers.c | 7 ++ + drivers/thermal/thermal_sysfs.c | 85 +--------------------- + drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 6 +- + include/linux/thermal.h | 18 +---- + 16 files changed, 98 insertions(+), 231 deletions(-) +Merging thermal-rzhang/next (54ecb8f7028c Linux 5.4-rc1) +$ git merge thermal-rzhang/next +Already up to date. +Merging thermal-soc/next (6c375eccded4 thermal: db8500: Rewrite to be a pure OF sensor) +$ git merge thermal-soc/next +Already up to date. +Merging ieee1394/for-next (67f8e65e4fc1 firewire: net: remove set but not used variable 'guid') +$ git merge ieee1394/for-next +Auto-merging drivers/firewire/net.c +Merge made by the 'recursive' strategy. + drivers/firewire/net.c | 2 -- + 1 file changed, 2 deletions(-) +Merging dlm/next (4f19d071f9be fs: dlm: check on existing node address) +$ git merge dlm/next +Already up to date. +Merging swiotlb/linux-next (e998879d4fb7 x86,swiotlb: Adjust SWIOTLB bounce buffer size for SEV guests) +$ git merge swiotlb/linux-next +Already up to date. +Merging rdma/for-next (7fbc3c373eef RDMA/rtrs: Fix KASAN: stack-out-of-bounds bug) +$ git merge rdma/for-next +Auto-merging drivers/infiniband/core/cma_configfs.c +Merge made by the 'recursive' strategy. + drivers/infiniband/core/cma_configfs.c | 12 +- + drivers/infiniband/core/rw.c | 2 +- + drivers/infiniband/hw/cxgb4/restrack.c | 2 +- + drivers/infiniband/hw/hfi1/qsfp.c | 4 +- + drivers/infiniband/hw/hfi1/sdma.c | 2 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 2 +- + drivers/infiniband/sw/rxe/rxe_mcast.c | 64 +++--- + drivers/infiniband/sw/rxe/rxe_pool.c | 226 +++++++++++++------- + drivers/infiniband/sw/rxe/rxe_pool.h | 94 ++++++-- + drivers/infiniband/sw/rxe/rxe_qp.c | 11 + + drivers/infiniband/sw/rxe/rxe_verbs.c | 16 +- + drivers/infiniband/sw/siw/siw.h | 2 +- + drivers/infiniband/sw/siw/siw_main.c | 2 +- + drivers/infiniband/sw/siw/siw_qp.c | 271 +++++++++++++----------- + drivers/infiniband/sw/siw/siw_qp_rx.c | 26 ++- + drivers/infiniband/sw/siw/siw_qp_tx.c | 4 +- + drivers/infiniband/sw/siw/siw_verbs.c | 20 +- + drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 2 +- + drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c | 2 +- + drivers/infiniband/ulp/rtrs/rtrs-clt-sysfs.c | 11 +- + drivers/infiniband/ulp/rtrs/rtrs-clt.c | 120 +++++------ + drivers/infiniband/ulp/rtrs/rtrs-clt.h | 3 +- + drivers/infiniband/ulp/rtrs/rtrs-pri.h | 5 +- + drivers/infiniband/ulp/rtrs/rtrs-srv-sysfs.c | 5 +- + drivers/infiniband/ulp/rtrs/rtrs-srv.c | 20 +- + drivers/infiniband/ulp/rtrs/rtrs.c | 32 +-- + 26 files changed, 563 insertions(+), 397 deletions(-) +Merging net-next/master (4026d80142b6 MAINTAINERS: add entry for Arrow SpeedChips XRS7000 driver) +$ git merge net-next/master +Auto-merging drivers/net/ethernet/smsc/smc91x.c +Auto-merging drivers/net/dsa/microchip/ksz_common.c +Auto-merging drivers/net/dsa/microchip/ksz8795.c +Removing drivers/net/can/dev.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/net/amlogic,meson-dwmac.yaml | 55 +- + .../bindings/net/brcm,bcm7445-switch-v4.0.txt | 101 +- + .../devicetree/bindings/net/can/fsl,flexcan.yaml | 11 + + .../devicetree/bindings/net/dsa/arrow,xrs700x.yaml | 73 + + .../devicetree/bindings/net/dsa/brcm,sf2.yaml | 173 +++ + .../devicetree/bindings/net/qca,ar803x.yaml | 16 + + .../bindings/net/ti,k3-am654-cpsw-nuss.yaml | 50 +- + .../devicetree/bindings/net/ti,k3-am654-cpts.yaml | 7 + + Documentation/networking/bonding.rst | 13 + + .../device_drivers/ethernet/marvell/octeontx2.rst | 70 + + Documentation/networking/filter.rst | 61 +- + Documentation/networking/phy.rst | 5 + + Documentation/networking/snmp_counter.rst | 28 +- + MAINTAINERS | 25 +- + arch/arm/net/bpf_jit_32.c | 7 +- + arch/arm64/net/bpf_jit_comp.c | 16 +- + arch/mips/net/ebpf_jit.c | 11 +- + arch/powerpc/net/bpf_jit_comp64.c | 25 +- + arch/riscv/net/bpf_jit_comp32.c | 20 +- + arch/riscv/net/bpf_jit_comp64.c | 16 +- + arch/s390/net/bpf_jit_comp.c | 27 +- + arch/sparc/net/bpf_jit_comp_64.c | 17 +- + arch/x86/net/bpf_jit_comp.c | 217 ++- + arch/x86/net/bpf_jit_comp32.c | 6 +- + drivers/bus/fsl-mc/fsl-mc-bus.c | 9 + + drivers/net/arcnet/com20020_cs.c | 2 +- + drivers/net/bareudp.c | 13 +- + drivers/net/bonding/bond_main.c | 174 ++- + drivers/net/bonding/bond_options.c | 55 +- + drivers/net/can/Makefile | 7 +- + drivers/net/can/at91_can.c | 4 +- + drivers/net/can/c_can/c_can.c | 4 +- + drivers/net/can/cc770/cc770.c | 4 +- + drivers/net/can/dev.c | 1338 ---------------- + drivers/net/can/dev/Makefile | 11 + + drivers/net/can/dev/bittiming.c | 261 ++++ + drivers/net/can/dev/dev.c | 467 ++++++ + drivers/net/can/dev/length.c | 90 ++ + drivers/net/can/dev/netlink.c | 379 +++++ + drivers/net/can/{ => dev}/rx-offload.c | 5 +- + drivers/net/can/dev/skb.c | 231 +++ + drivers/net/can/flexcan.c | 130 +- + drivers/net/can/grcan.c | 4 +- + drivers/net/can/ifi_canfd/ifi_canfd.c | 4 +- + drivers/net/can/kvaser_pciefd.c | 6 +- + drivers/net/can/m_can/Makefile | 4 + + drivers/net/can/m_can/m_can.c | 8 +- + .../net/can/m_can/{tcan4x5x.c => tcan4x5x-core.c} | 122 +- + drivers/net/can/m_can/tcan4x5x-regmap.c | 135 ++ + drivers/net/can/m_can/tcan4x5x.h | 57 + + drivers/net/can/mscan/mscan.c | 4 +- + drivers/net/can/pch_can.c | 4 +- + drivers/net/can/peak_canfd/peak_canfd.c | 4 +- + drivers/net/can/rcar/rcar_can.c | 4 +- + drivers/net/can/rcar/rcar_canfd.c | 4 +- + drivers/net/can/sja1000/sja1000.c | 4 +- + drivers/net/can/softing/softing_main.c | 4 +- + drivers/net/can/spi/hi311x.c | 4 +- + drivers/net/can/spi/mcp251x.c | 4 +- + drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 4 +- + drivers/net/can/sun4i_can.c | 4 +- + drivers/net/can/ti_hecc.c | 4 +- + drivers/net/can/usb/ems_usb.c | 4 +- + drivers/net/can/usb/esd_usb2.c | 4 +- + drivers/net/can/usb/gs_usb.c | 4 +- + drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c | 2 +- + drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c | 2 +- + drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c | 2 +- + drivers/net/can/usb/mcba_usb.c | 4 +- + drivers/net/can/usb/peak_usb/pcan_usb_core.c | 4 +- + drivers/net/can/usb/ucan.c | 4 +- + drivers/net/can/usb/usb_8dev.c | 4 +- + drivers/net/can/xilinx_can.c | 6 +- + drivers/net/dsa/Kconfig | 2 + + drivers/net/dsa/Makefile | 1 + + drivers/net/dsa/b53/b53_common.c | 113 +- + drivers/net/dsa/b53/b53_priv.h | 16 +- + drivers/net/dsa/bcm_sf2.c | 38 +- + drivers/net/dsa/bcm_sf2_cfp.c | 10 +- + drivers/net/dsa/bcm_sf2_regs.h | 1 + + drivers/net/dsa/dsa_loop.c | 74 +- + drivers/net/dsa/hirschmann/hellcreek.c | 45 +- + drivers/net/dsa/lan9303-core.c | 12 +- + drivers/net/dsa/lantiq_gswip.c | 103 +- + drivers/net/dsa/microchip/ksz8795.c | 78 +- + drivers/net/dsa/microchip/ksz9477.c | 98 +- + drivers/net/dsa/microchip/ksz_common.c | 25 +- + drivers/net/dsa/microchip/ksz_common.h | 8 +- + drivers/net/dsa/mt7530.c | 54 +- + drivers/net/dsa/mv88e6xxx/chip.c | 456 +++++- + drivers/net/dsa/mv88e6xxx/chip.h | 5 + + drivers/net/dsa/mv88e6xxx/global2.c | 8 +- + drivers/net/dsa/mv88e6xxx/global2.h | 17 + + drivers/net/dsa/mv88e6xxx/port.c | 21 + + drivers/net/dsa/mv88e6xxx/port.h | 5 + + drivers/net/dsa/ocelot/felix.c | 276 ++-- + drivers/net/dsa/ocelot/felix.h | 2 - + drivers/net/dsa/ocelot/felix_vsc9959.c | 37 +- + drivers/net/dsa/ocelot/seville_vsc9953.c | 20 +- + drivers/net/dsa/qca/ar9331.c | 165 +- + drivers/net/dsa/qca8k.c | 38 +- + drivers/net/dsa/realtek-smi-core.h | 9 +- + drivers/net/dsa/rtl8366.c | 152 +- + drivers/net/dsa/rtl8366rb.c | 3 +- + drivers/net/dsa/sja1105/sja1105.h | 3 +- + drivers/net/dsa/sja1105/sja1105_devlink.c | 9 +- + drivers/net/dsa/sja1105/sja1105_main.c | 101 +- + drivers/net/dsa/xrs700x/Kconfig | 26 + + drivers/net/dsa/xrs700x/Makefile | 4 + + drivers/net/dsa/xrs700x/xrs700x.c | 622 ++++++++ + drivers/net/dsa/xrs700x/xrs700x.h | 42 + + drivers/net/dsa/xrs700x/xrs700x_i2c.c | 150 ++ + drivers/net/dsa/xrs700x/xrs700x_mdio.c | 163 ++ + drivers/net/dsa/xrs700x/xrs700x_reg.h | 203 +++ + drivers/net/ethernet/amazon/ena/ena_netdev.c | 10 +- + drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 2 - + drivers/net/ethernet/broadcom/Kconfig | 1 - + drivers/net/ethernet/broadcom/bcm63xx_enet.c | 186 +-- + drivers/net/ethernet/broadcom/bcm63xx_enet.h | 14 +- + drivers/net/ethernet/broadcom/bcmsysport.c | 82 +- + drivers/net/ethernet/broadcom/bcmsysport.h | 37 +- + drivers/net/ethernet/broadcom/bgmac.c | 114 +- + drivers/net/ethernet/broadcom/bgmac.h | 59 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 2 - + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 4 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c | 9 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.h | 59 +- + drivers/net/ethernet/broadcom/genet/bcmmii.c | 6 +- + drivers/net/ethernet/broadcom/unimac.h | 68 + + drivers/net/ethernet/cavium/liquidio/lio_core.c | 2 +- + drivers/net/ethernet/cavium/liquidio/lio_main.c | 2 - + drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 2 - + .../net/ethernet/cavium/liquidio/octeon_device.c | 3 +- + drivers/net/ethernet/cavium/thunder/nicvf_main.c | 12 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 2 - + drivers/net/ethernet/chelsio/cxgb4/sge.c | 38 +- + .../chelsio/inline_crypto/ch_ipsec/chcr_ipsec.c | 3 - + drivers/net/ethernet/cisco/enic/enic_main.c | 4 - + drivers/net/ethernet/emulex/benet/be_main.c | 2 - + drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 10 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 133 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h | 13 + + .../net/ethernet/freescale/dpaa2/dpaa2-ethtool.c | 16 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c | 135 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h | 5 + + drivers/net/ethernet/freescale/dpaa2/dpni-cmd.h | 17 + + drivers/net/ethernet/freescale/dpaa2/dpni.c | 93 ++ + drivers/net/ethernet/freescale/dpaa2/dpni.h | 9 + + drivers/net/ethernet/freescale/enetc/enetc_mdio.c | 61 +- + drivers/net/ethernet/freescale/fman/fman_memac.c | 4 + + drivers/net/ethernet/freescale/gianfar.c | 1 - + drivers/net/ethernet/freescale/ucc_geth.c | 549 +++---- + drivers/net/ethernet/freescale/ucc_geth.h | 6 - + drivers/net/ethernet/hisilicon/hns/hns_enet.c | 2 +- + drivers/net/ethernet/ibm/ibmvnic.c | 181 +-- + drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 2 - + drivers/net/ethernet/intel/i40e/i40e_main.c | 2 - + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 18 +- + drivers/net/ethernet/intel/iavf/iavf_virtchnl.c | 2 +- + drivers/net/ethernet/intel/ice/ice_main.c | 2 - + drivers/net/ethernet/intel/ice/ice_txrx.c | 15 +- + drivers/net/ethernet/intel/ice/ice_txrx_lib.c | 7 +- + drivers/net/ethernet/intel/igb/igb_main.c | 32 +- + drivers/net/ethernet/intel/igbvf/netdev.c | 14 +- + drivers/net/ethernet/intel/igc/igc_main.c | 14 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 35 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 33 +- + drivers/net/ethernet/marvell/mvneta.c | 10 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.h | 2 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 14 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c | 64 +- + drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 2 +- + drivers/net/ethernet/marvell/octeontx2/af/npc.h | 5 + + drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 2 +- + .../ethernet/marvell/octeontx2/af/rvu_debugfs.c | 5 +- + .../ethernet/marvell/octeontx2/af/rvu_devlink.c | 652 +++++++- + .../ethernet/marvell/octeontx2/af/rvu_devlink.h | 27 + + .../net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c | 54 +- + .../net/ethernet/marvell/octeontx2/af/rvu_struct.h | 10 + + .../ethernet/marvell/octeontx2/nic/otx2_common.c | 26 +- + .../ethernet/marvell/octeontx2/nic/otx2_common.h | 11 +- + .../ethernet/marvell/octeontx2/nic/otx2_ethtool.c | 133 +- + .../ethernet/marvell/octeontx2/nic/otx2_flows.c | 153 +- + .../ethernet/marvell/prestera/prestera_switchdev.c | 71 +- + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 4 - + drivers/net/ethernet/mellanox/mlx4/en_rx.c | 9 +- + drivers/net/ethernet/mellanox/mlx5/core/Makefile | 1 + + drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c | 7 +- + .../mellanox/mlx5/core/en/tc_tun_mplsoudp.c | 4 +- + .../mellanox/mlx5/core/en_accel/en_accel.h | 4 +- + .../mellanox/mlx5/core/en_accel/ipsec_rxtx.c | 14 - + .../mellanox/mlx5/core/en_accel/ipsec_rxtx.h | 29 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 6 - + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 2 - + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 10 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 6 - + drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 3 +- + .../ethernet/mellanox/mlx5/core/lib/fs_chains.c | 7 +- + .../mellanox/mlx5/core/steering/dr_action.c | 579 +------ + .../mellanox/mlx5/core/steering/dr_domain.c | 6 + + .../mellanox/mlx5/core/steering/dr_matcher.c | 106 +- + .../ethernet/mellanox/mlx5/core/steering/dr_rule.c | 49 +- + .../ethernet/mellanox/mlx5/core/steering/dr_ste.c | 1592 +++---------------- + .../ethernet/mellanox/mlx5/core/steering/dr_ste.h | 167 ++ + .../mellanox/mlx5/core/steering/dr_ste_v0.c | 1640 ++++++++++++++++++++ + .../mellanox/mlx5/core/steering/dr_types.h | 182 ++- + .../mellanox/mlx5/core/steering/mlx5_ifc_dr.h | 85 - + drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2.c | 2 +- + drivers/net/ethernet/mellanox/mlxsw/pci.c | 56 +- + .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 165 +- + drivers/net/ethernet/micrel/Kconfig | 4 + + drivers/net/ethernet/micrel/ks8851.h | 2 + + drivers/net/ethernet/micrel/ks8851_common.c | 114 +- + drivers/net/ethernet/micrel/ks8851_par.c | 2 - + drivers/net/ethernet/micrel/ks8851_spi.c | 2 - + drivers/net/ethernet/mscc/Makefile | 3 +- + drivers/net/ethernet/mscc/ocelot.c | 50 +- + drivers/net/ethernet/mscc/ocelot.h | 10 +- + drivers/net/ethernet/mscc/ocelot_devlink.c | 885 +++++++++++ + drivers/net/ethernet/mscc/ocelot_net.c | 277 +++- + drivers/net/ethernet/mscc/ocelot_vsc7514.c | 143 +- + drivers/net/ethernet/netronome/nfp/bpf/jit.c | 14 +- + drivers/net/ethernet/netronome/nfp/bpf/main.h | 4 +- + drivers/net/ethernet/netronome/nfp/bpf/verifier.c | 15 +- + .../net/ethernet/netronome/nfp/nfp_net_common.c | 14 +- + drivers/net/ethernet/pensando/ionic/ionic_txrx.c | 2 +- + .../net/ethernet/qlogic/netxen/netxen_nic_ctx.c | 83 +- + .../net/ethernet/qlogic/netxen/netxen_nic_init.c | 49 +- + .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 22 +- + drivers/net/ethernet/qlogic/qede/qede_fp.c | 9 +- + drivers/net/ethernet/qlogic/qede/qede_main.c | 6 - + drivers/net/ethernet/qlogic/qla3xxx.c | 196 ++- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 2 - + drivers/net/ethernet/realtek/r8169_main.c | 397 +++-- + drivers/net/ethernet/renesas/ravb.h | 37 +- + drivers/net/ethernet/renesas/ravb_main.c | 6 +- + drivers/net/ethernet/rocker/rocker.h | 6 +- + drivers/net/ethernet/rocker/rocker_main.c | 61 +- + drivers/net/ethernet/rocker/rocker_ofdpa.c | 43 +- + drivers/net/ethernet/sfc/efx.c | 2 - + drivers/net/ethernet/sfc/rx.c | 10 +- + drivers/net/ethernet/smsc/smc91x.c | 2 +- + drivers/net/ethernet/smsc/smsc911x.c | 10 +- + drivers/net/ethernet/socionext/netsec.c | 9 +- + .../net/ethernet/stmicro/stmmac/dwmac-meson8b.c | 91 +- + drivers/net/ethernet/ti/am65-cpsw-nuss.c | 96 +- + drivers/net/ethernet/ti/am65-cpsw-nuss.h | 2 + + drivers/net/ethernet/ti/am65-cpsw-qos.c | 2 +- + drivers/net/ethernet/ti/am65-cpts.c | 2 +- + drivers/net/ethernet/ti/cpsw.c | 18 +- + drivers/net/ethernet/ti/cpsw_ale.c | 7 + + drivers/net/ethernet/ti/cpsw_new.c | 18 +- + drivers/net/ethernet/ti/cpsw_switchdev.c | 70 +- + drivers/net/ethernet/toshiba/ps3_gelic_net.c | 8 +- + drivers/net/ethernet/toshiba/spider_net.c | 18 +- + drivers/net/ethernet/xscale/ixp4xx_eth.c | 3 +- + drivers/net/geneve.c | 19 +- + drivers/net/gtp.c | 527 +++++-- + drivers/net/hyperv/netvsc.c | 40 +- + drivers/net/hyperv/netvsc_bpf.c | 14 +- + drivers/net/hyperv/netvsc_drv.c | 32 +- + drivers/net/hyperv/rndis_filter.c | 171 +- + drivers/net/ipa/Kconfig | 10 +- + drivers/net/ipa/gsi.c | 140 +- + drivers/net/ipa/gsi_trans.h | 1 + + drivers/net/ipa/ipa_clock.c | 194 +-- + drivers/net/ipa/ipa_data-sc7180.c | 38 +- + drivers/net/ipa/ipa_data-sdm845.c | 38 +- + drivers/net/ipa/ipa_data.h | 26 +- + drivers/net/ipa/ipa_endpoint.c | 4 +- + drivers/net/macvlan.c | 2 +- + drivers/net/mhi_net.c | 15 +- + drivers/net/netdevsim/netdev.c | 2 - + drivers/net/phy/at803x.c | 84 +- + drivers/net/phy/bcm7xxx.c | 2 + + drivers/net/phy/mdio_bus.c | 4 +- + drivers/net/phy/micrel.c | 2 +- + drivers/net/phy/national.c | 2 - + drivers/net/phy/phy.c | 2 +- + drivers/net/phy/phy_device.c | 2 +- + drivers/net/phy/sfp-bus.c | 20 +- + drivers/net/phy/sfp.c | 91 +- + drivers/net/ppp/pptp.c | 8 +- + drivers/net/tap.c | 12 +- + drivers/net/tun.c | 20 +- + drivers/net/usb/hso.c | 3 +- + drivers/net/usb/qmi_wwan.c | 3 +- + drivers/net/veth.c | 14 +- + drivers/net/virtio_net.c | 18 +- + drivers/net/vxlan.c | 20 +- + drivers/net/wan/ixp4xx_hss.c | 4 +- + drivers/net/wan/sbni.c | 2 +- + drivers/net/xen-netback/common.h | 3 +- + drivers/net/xen-netback/interface.c | 4 +- + drivers/net/xen-netback/netback.c | 5 +- + drivers/net/xen-netback/xenbus.c | 4 +- + drivers/net/xen-netfront.c | 16 +- + drivers/soc/fsl/qe/qe_common.c | 20 +- + drivers/staging/fsl-dpaa2/ethsw/ethsw.c | 115 +- + drivers/vhost/net.c | 30 +- + include/linux/bpf.h | 18 +- + include/linux/bpf_verifier.h | 3 + + include/linux/brcmphy.h | 1 + + include/linux/btf.h | 3 + + include/linux/buildid.h | 12 + + include/linux/can/bittiming.h | 44 + + include/linux/can/dev.h | 135 +- + include/linux/can/length.h | 174 +++ + include/linux/can/rx-offload.h | 3 +- + include/linux/can/skb.h | 80 + + include/linux/dsa/brcm.h | 16 + + include/linux/filter.h | 27 +- + include/linux/mdio.h | 23 +- + include/linux/mlx5/mlx5_ifc.h | 4 +- + include/linux/netdevice.h | 23 +- + include/linux/phy.h | 11 +- + include/linux/remoteproc/qcom_rproc.h | 4 +- + include/linux/skbuff.h | 115 +- + include/linux/soc/qcom/mdt_loader.h | 35 + + include/net/act_api.h | 5 +- + include/net/bonding.h | 4 + + include/net/dsa.h | 164 +- + include/net/sch_generic.h | 1 + + include/net/switchdev.h | 27 +- + include/net/udp_tunnel.h | 8 + + include/net/xdp.h | 19 + + include/soc/fsl/qe/qe.h | 15 +- + include/soc/fsl/qe/ucc_fast.h | 1 - + include/soc/mscc/ocelot.h | 58 +- + include/soc/mscc/ocelot_qsys.h | 7 +- + include/uapi/linux/bpf.h | 20 +- + include/uapi/linux/gtp.h | 12 + + include/uapi/linux/if_bonding.h | 1 + + include/uapi/linux/if_link.h | 1 + + include/uapi/linux/if_tunnel.h | 1 + + include/uapi/linux/mptcp.h | 1 + + include/uapi/linux/perf_event.h | 42 +- + include/uapi/linux/pkt_cls.h | 1 + + include/uapi/linux/tcp.h | 18 +- + kernel/bpf/btf.c | 31 +- + kernel/bpf/core.c | 90 +- + kernel/bpf/disasm.c | 43 +- + kernel/bpf/preload/iterators/iterators.c | 2 +- + kernel/bpf/stackmap.c | 143 +- + kernel/bpf/verifier.c | 231 ++- + kernel/events/core.c | 32 +- + lib/Makefile | 3 +- + lib/buildid.c | 149 ++ + lib/test_bpf.c | 14 +- + net/8021q/vlan_dev.c | 9 + + net/bpf/test_run.c | 11 +- + net/bridge/br.c | 2 +- + net/bridge/br_fdb.c | 1 + + net/bridge/br_forward.c | 3 +- + net/bridge/br_input.c | 2 +- + net/bridge/br_mrp.c | 6 +- + net/bridge/br_netlink.c | 12 +- + net/bridge/br_stp.c | 4 +- + net/bridge/br_switchdev.c | 6 +- + net/bridge/br_vlan.c | 2 +- + net/can/raw.c | 16 +- + net/core/dev.c | 290 ++-- + net/core/filter.c | 25 +- + net/core/flow_dissector.c | 29 +- + net/core/neighbour.c | 1 - + net/core/skbuff.c | 76 +- + net/core/sock_map.c | 2 +- + net/dsa/Kconfig | 6 + + net/dsa/Makefile | 1 + + net/dsa/dsa.c | 34 +- + net/dsa/dsa2.c | 256 ++- + net/dsa/dsa_priv.h | 85 +- + net/dsa/port.c | 182 ++- + net/dsa/slave.c | 375 +++-- + net/dsa/switch.c | 139 +- + net/dsa/tag_brcm.c | 1 + + net/dsa/tag_dsa.c | 17 +- + net/dsa/tag_xrs700x.c | 61 + + net/ipv4/gre_offload.c | 15 +- + net/ipv4/ip_output.c | 5 +- + net/ipv4/ip_tunnel_core.c | 9 +- + net/ipv4/nexthop.c | 105 +- + net/ipv4/tcp.c | 8 +- + net/ipv4/tcp_cubic.c | 11 +- + net/ipv4/tcp_output.c | 2 +- + net/ipv4/udp_offload.c | 4 +- + net/ipv4/udp_tunnel_core.c | 24 +- + net/ipv6/ip6_output.c | 5 +- + net/kcm/kcmsock.c | 8 +- + net/mptcp/mib.c | 2 + + net/mptcp/mib.h | 2 + + net/mptcp/options.c | 56 + + net/mptcp/pm.c | 8 + + net/mptcp/pm_netlink.c | 172 +- + net/mptcp/protocol.h | 11 + + net/nfc/hci/llc_shdlc.c | 2 +- + net/nfc/nci/core.c | 4 +- + net/nfc/netlink.c | 4 +- + net/openvswitch/actions.c | 12 +- + net/openvswitch/flow_netlink.c | 14 +- + net/sched/act_api.c | 104 +- + net/sched/act_ct.c | 1 + + net/sched/cls_api.c | 11 +- + net/sched/cls_flower.c | 4 +- + net/sched/sch_taprio.c | 6 +- + net/sctp/offload.c | 2 +- + net/switchdev/switchdev.c | 101 +- + net/tipc/monitor.c | 2 +- + net/tls/tls_device.c | 4 +- + net/tls/tls_device_fallback.c | 2 +- + samples/bpf/bpf_insn.h | 4 +- + samples/bpf/cookie_uid_helper_example.c | 8 +- + samples/bpf/sock_example.c | 2 +- + samples/bpf/test_cgrp2_attach.c | 5 +- + tools/bpf/bpftool/Makefile | 2 +- + tools/include/linux/filter.h | 24 +- + tools/include/uapi/linux/bpf.h | 20 +- + tools/include/uapi/linux/if_link.h | 1 + + tools/lib/bpf/bpf_core_read.h | 169 +- + tools/lib/bpf/bpf_helpers.h | 2 +- + tools/lib/bpf/libbpf.c | 50 +- + tools/testing/selftests/bpf/Makefile | 60 +- + .../selftests/bpf/bpf_testmod/bpf_testmod.c | 3 + + tools/testing/selftests/bpf/prog_tests/atomics.c | 246 +++ + .../selftests/bpf/prog_tests/btf_map_in_map.c | 33 - + .../selftests/bpf/prog_tests/cgroup_attach_multi.c | 4 +- + .../selftests/bpf/prog_tests/core_read_macros.c | 64 + + .../selftests/bpf/prog_tests/ksyms_module.c | 31 + + tools/testing/selftests/bpf/prog_tests/test_lsm.c | 1 - + tools/testing/selftests/bpf/progs/atomics.c | 154 ++ + tools/testing/selftests/bpf/progs/bind4_prog.c | 42 +- + tools/testing/selftests/bpf/progs/bind6_prog.c | 42 +- + .../selftests/bpf/progs/test_core_read_macros.c | 50 + + .../selftests/bpf/progs/test_ksyms_module.c | 26 + + tools/testing/selftests/bpf/test_cgroup_storage.c | 2 +- + tools/testing/selftests/bpf/test_progs.c | 11 + + tools/testing/selftests/bpf/test_progs.h | 1 + + tools/testing/selftests/bpf/verifier/atomic_and.c | 77 + + .../selftests/bpf/verifier/atomic_cmpxchg.c | 96 ++ + .../selftests/bpf/verifier/atomic_fetch_add.c | 106 ++ + tools/testing/selftests/bpf/verifier/atomic_or.c | 77 + + tools/testing/selftests/bpf/verifier/atomic_xchg.c | 46 + + tools/testing/selftests/bpf/verifier/atomic_xor.c | 77 + + tools/testing/selftests/bpf/verifier/ctx.c | 7 +- + .../selftests/bpf/verifier/direct_packet_access.c | 4 +- + tools/testing/selftests/bpf/verifier/leak_ptr.c | 10 +- + tools/testing/selftests/bpf/verifier/meta_access.c | 4 +- + tools/testing/selftests/bpf/verifier/unpriv.c | 3 +- + .../selftests/bpf/verifier/value_illegal_alu.c | 2 +- + tools/testing/selftests/bpf/verifier/xadd.c | 18 +- + tools/testing/selftests/net/fcnal-test.sh | 402 ++--- + .../testing/selftests/net/forwarding/tc_chains.sh | 4 +- + tools/testing/selftests/net/mptcp/mptcp_join.sh | 72 +- + tools/testing/selftests/net/mptcp/pm_netlink.sh | 41 +- + tools/testing/selftests/net/mptcp/pm_nl_ctl.c | 87 +- + tools/testing/selftests/net/nettest.c | 585 ++++--- + 457 files changed, 17933 insertions(+), 9690 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/dsa/arrow,xrs700x.yaml + create mode 100644 Documentation/devicetree/bindings/net/dsa/brcm,sf2.yaml + delete mode 100644 drivers/net/can/dev.c + create mode 100644 drivers/net/can/dev/Makefile + create mode 100644 drivers/net/can/dev/bittiming.c + create mode 100644 drivers/net/can/dev/dev.c + create mode 100644 drivers/net/can/dev/length.c + create mode 100644 drivers/net/can/dev/netlink.c + rename drivers/net/can/{ => dev}/rx-offload.c (98%) + create mode 100644 drivers/net/can/dev/skb.c + rename drivers/net/can/m_can/{tcan4x5x.c => tcan4x5x-core.c} (79%) + create mode 100644 drivers/net/can/m_can/tcan4x5x-regmap.c + create mode 100644 drivers/net/can/m_can/tcan4x5x.h + create mode 100644 drivers/net/dsa/xrs700x/Kconfig + create mode 100644 drivers/net/dsa/xrs700x/Makefile + create mode 100644 drivers/net/dsa/xrs700x/xrs700x.c + create mode 100644 drivers/net/dsa/xrs700x/xrs700x.h + create mode 100644 drivers/net/dsa/xrs700x/xrs700x_i2c.c + create mode 100644 drivers/net/dsa/xrs700x/xrs700x_mdio.c + create mode 100644 drivers/net/dsa/xrs700x/xrs700x_reg.h + create mode 100644 drivers/net/ethernet/broadcom/unimac.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste_v0.c + create mode 100644 drivers/net/ethernet/mscc/ocelot_devlink.c + create mode 100644 include/linux/buildid.h + create mode 100644 include/linux/can/bittiming.h + create mode 100644 include/linux/can/length.h + create mode 100644 include/linux/dsa/brcm.h + create mode 100644 lib/buildid.c + create mode 100644 net/dsa/tag_xrs700x.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/atomics.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/core_read_macros.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/ksyms_module.c + create mode 100644 tools/testing/selftests/bpf/progs/atomics.c + create mode 100644 tools/testing/selftests/bpf/progs/test_core_read_macros.c + create mode 100644 tools/testing/selftests/bpf/progs/test_ksyms_module.c + create mode 100644 tools/testing/selftests/bpf/verifier/atomic_and.c + create mode 100644 tools/testing/selftests/bpf/verifier/atomic_cmpxchg.c + create mode 100644 tools/testing/selftests/bpf/verifier/atomic_fetch_add.c + create mode 100644 tools/testing/selftests/bpf/verifier/atomic_or.c + create mode 100644 tools/testing/selftests/bpf/verifier/atomic_xchg.c + create mode 100644 tools/testing/selftests/bpf/verifier/atomic_xor.c +Merging bpf-next/for-next (443edcefb821 selftest/bpf: Fix typo) +$ git merge bpf-next/for-next +Removing tools/testing/selftests/bpf/test_current_pid_tgid_new_ns.c +Merge made by the 'recursive' strategy. + Documentation/bpf/bpf_design_QA.rst | 6 + + Documentation/networking/filter.rst | 24 +- + arch/x86/net/bpf_jit_comp.c | 140 ++++++-- + drivers/net/veth.c | 18 +- + include/linux/bpf-cgroup.h | 63 ++-- + include/linux/filter.h | 5 + + include/linux/indirect_call_wrapper.h | 6 + + include/net/sock.h | 2 + + include/net/tcp.h | 1 + + include/net/xdp.h | 5 + + include/trace/bpf_probe.h | 12 +- + kernel/bpf/btf.c | 5 - + kernel/bpf/cgroup.c | 112 ++++++- + kernel/bpf/cpumap.c | 46 +-- + lib/test_bpf.c | 7 +- + net/core/xdp.c | 59 ++++ + net/ipv4/af_inet.c | 9 +- + net/ipv4/tcp.c | 14 + + net/ipv4/tcp_ipv4.c | 1 + + net/ipv4/udp.c | 7 +- + net/ipv6/af_inet6.c | 9 +- + net/ipv6/tcp_ipv6.c | 1 + + net/ipv6/udp.c | 7 +- + net/socket.c | 3 + + samples/bpf/bpf_insn.h | 24 +- + tools/include/uapi/linux/tcp.h | 357 +++++++++++++++++++++ + tools/lib/bpf/btf.c | 12 +- + tools/testing/selftests/bpf/.gitignore | 1 - + tools/testing/selftests/bpf/Makefile | 3 +- + .../selftests/bpf/bpf_testmod/bpf_testmod-events.h | 6 + + .../selftests/bpf/bpf_testmod/bpf_testmod.c | 21 +- + .../selftests/bpf/bpf_testmod/bpf_testmod.h | 6 + + .../testing/selftests/bpf/prog_tests/bpf_tcp_ca.c | 1 + + tools/testing/selftests/bpf/prog_tests/btf.c | 25 +- + .../selftests/bpf/prog_tests/cls_redirect.c | 1 + + .../selftests/bpf/prog_tests/module_attach.c | 27 ++ + .../selftests/bpf/prog_tests/ns_current_pid_tgid.c | 118 +++---- + .../selftests/bpf/prog_tests/sockmap_basic.c | 1 + + .../testing/selftests/bpf/prog_tests/sockopt_sk.c | 28 ++ + tools/testing/selftests/bpf/progs/sockopt_sk.c | 23 +- + .../selftests/bpf/progs/test_module_attach.c | 10 + + .../selftests/bpf/progs/test_ns_current_pid_tgid.c | 28 +- + .../selftests/bpf/test_current_pid_tgid_new_ns.c | 160 --------- + tools/testing/selftests/bpf/test_progs.h | 1 - + tools/testing/selftests/bpf/test_verifier.c | 72 +++++ + tools/testing/selftests/bpf/verifier/jit.c | 24 ++ + 46 files changed, 1096 insertions(+), 415 deletions(-) + create mode 100644 tools/include/uapi/linux/tcp.h + delete mode 100644 tools/testing/selftests/bpf/test_current_pid_tgid_new_ns.c +Merging ipsec-next/master (18f976960bca xfrm: interface: enable TSO on xfrm interfaces) +$ git merge ipsec-next/master +Merge made by the 'recursive' strategy. + net/xfrm/xfrm_interface.c | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) +Merging mlx5-next/mlx5-next (ab0da5a57188 net/mlx5: Expose ifc bits for query modify header) +$ git merge mlx5-next/mlx5-next +Auto-merging include/linux/mlx5/mlx5_ifc.h +Merge made by the 'recursive' strategy. + include/linux/mlx5/mlx5_ifc.h | 12 ++++++++++++ + 1 file changed, 12 insertions(+) +Merging netfilter-next/master (09b5b5fb3902 ppp: clean up endianness conversions) +$ git merge netfilter-next/master +Already up to date. +Merging ipvs-next/master (09b5b5fb3902 ppp: clean up endianness conversions) +$ git merge ipvs-next/master +Already up to date. +Merging wireless-drivers-next/master (07ceefa3012f wlcore: Downgrade exceeded max RX BA sessions to debug) +$ git merge wireless-drivers-next/master +Auto-merging drivers/net/wireless/mediatek/mt7601u/dma.c +Merge made by the 'recursive' strategy. + drivers/net/wireless/ath/ath.h | 3 +- + drivers/net/wireless/ath/ath10k/ahb.c | 5 +- + drivers/net/wireless/ath/ath10k/core.c | 25 +++++ + drivers/net/wireless/ath/ath10k/core.h | 5 + + drivers/net/wireless/ath/ath10k/pci.c | 7 +- + drivers/net/wireless/ath/ath10k/sdio.c | 5 +- + drivers/net/wireless/ath/ath10k/snoc.c | 103 +++++++++++---------- + drivers/net/wireless/ath/ath11k/dp_rx.c | 2 +- + drivers/net/wireless/ath/ath11k/pci.c | 2 +- + drivers/net/wireless/ath/ath5k/mac80211-ops.c | 2 +- + drivers/net/wireless/ath/ath9k/htc_drv_main.c | 2 +- + drivers/net/wireless/ath/ath9k/hw.h | 1 + + drivers/net/wireless/ath/ath9k/main.c | 95 ++++++++++++++++++- + drivers/net/wireless/ath/key.c | 41 ++++---- + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 7 +- + .../wireless/broadcom/brcm80211/brcmfmac/chip.c | 1 + + .../broadcom/brcm80211/brcmfmac/firmware.c | 10 +- + .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 1 + + .../broadcom/brcm80211/include/brcm_hw_ids.h | 1 + + drivers/net/wireless/marvell/mwifiex/pcie.c | 2 +- + drivers/net/wireless/mediatek/mt7601u/dma.c | 1 + + drivers/net/wireless/mediatek/mt7601u/phy.c | 3 + + drivers/net/wireless/microchip/wilc1000/Kconfig | 2 +- + drivers/net/wireless/microchip/wilc1000/fw.h | 8 +- + drivers/net/wireless/quantenna/qtnfmac/pcie/pcie.c | 13 +-- + drivers/net/wireless/realtek/rtw88/coex.c | 4 +- + drivers/net/wireless/realtek/rtw88/debug.c | 2 +- + drivers/net/wireless/realtek/rtw88/main.c | 1 - + drivers/net/wireless/realtek/rtw88/rtw8821c.c | 7 -- + drivers/net/wireless/realtek/rtw88/tx.c | 2 +- + drivers/net/wireless/ti/wlcore/main.c | 2 +- + 31 files changed, 243 insertions(+), 122 deletions(-) +Merging bluetooth/master (ad3a9c0ec2d2 Bluetooth: hci_qca: Wait for SSR completion during suspend) +$ git merge bluetooth/master +Merge made by the 'recursive' strategy. + drivers/bluetooth/btintel.c | 21 +++++-------- + drivers/bluetooth/btmtksdio.c | 16 +++++----- + drivers/bluetooth/btqca.c | 67 ++++++++++++++++++++++++++++++++++++++++++ + drivers/bluetooth/btqca.h | 1 + + drivers/bluetooth/btqcomsmd.c | 27 ++++++++++++----- + drivers/bluetooth/btrtl.c | 25 ++++++++++++++-- + drivers/bluetooth/btusb.c | 48 ++++++++++++++++++------------ + drivers/bluetooth/hci_bcm.c | 1 + + drivers/bluetooth/hci_h5.c | 2 ++ + drivers/bluetooth/hci_ldisc.c | 7 ++--- + drivers/bluetooth/hci_qca.c | 18 +++++++----- + drivers/bluetooth/hci_serdev.c | 4 +-- + net/bluetooth/a2mp.c | 2 +- + net/bluetooth/hci_conn.c | 17 +++++++++++ + net/bluetooth/hci_request.c | 25 +++++----------- + net/bluetooth/mgmt.c | 8 +++++ + net/bluetooth/smp.c | 5 ++-- + 17 files changed, 210 insertions(+), 84 deletions(-) +Merging mac80211-next/master (791daf8fc49a cfg80211: avoid holding the RTNL when calling the driver) +$ git merge mac80211-next/master +Removing net/mac80211/rc80211_minstrel_debugfs.c +Removing net/mac80211/rc80211_minstrel.h +Removing net/mac80211/rc80211_minstrel.c +Merge made by the 'recursive' strategy. + drivers/net/usb/usbnet.c | 12 +- + drivers/net/wireless/ath/ath11k/reg.c | 4 +- + drivers/net/wireless/ath/ath6kl/core.c | 2 + + drivers/net/wireless/ath/ath6kl/init.c | 2 + + drivers/net/wireless/ath/wil6210/cfg80211.c | 2 + + drivers/net/wireless/ath/wil6210/netdev.c | 7 +- + drivers/net/wireless/ath/wil6210/pcie_bus.c | 2 + + .../wireless/broadcom/brcm80211/brcmfmac/core.c | 26 +- + .../wireless/broadcom/brcm80211/brcmfmac/core.h | 6 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 12 +- + drivers/net/wireless/intel/ipw2x00/ipw2100.c | 6 +- + drivers/net/wireless/intel/ipw2x00/ipw2200.c | 10 +- + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 4 +- + drivers/net/wireless/intel/iwlwifi/mvm/nvm.c | 2 +- + drivers/net/wireless/intersil/orinoco/main.c | 4 +- + drivers/net/wireless/mac80211_hwsim.c | 74 ++- + drivers/net/wireless/marvell/libertas/cfg.c | 2 +- + drivers/net/wireless/marvell/libertas/main.c | 2 +- + drivers/net/wireless/marvell/libertas/mesh.c | 6 +- + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 6 +- + drivers/net/wireless/marvell/mwifiex/main.c | 7 + + drivers/net/wireless/microchip/wilc1000/mon.c | 2 +- + drivers/net/wireless/microchip/wilc1000/netdev.c | 4 +- + drivers/net/wireless/quantenna/qtnfmac/core.c | 3 +- + drivers/net/wireless/rndis_wlan.c | 6 + + drivers/net/wireless/virt_wifi.c | 8 + + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 2 +- + drivers/staging/rtl8723bs/os_dep/os_intfs.c | 4 +- + drivers/staging/rtl8723bs/os_dep/osdep_service.c | 6 +- + drivers/staging/wlan-ng/p80211netdev.c | 4 +- + include/linux/usb/usbnet.h | 6 + + include/net/cfg80211.h | 114 +++- + include/net/fq.h | 11 +- + include/net/fq_impl.h | 171 ++++-- + include/net/mac80211.h | 26 +- + net/mac80211/Makefile | 2 - + net/mac80211/debugfs.c | 52 ++ + net/mac80211/debugfs_sta.c | 1 + + net/mac80211/driver-ops.h | 16 + + net/mac80211/he.c | 92 +++ + net/mac80211/ieee80211_i.h | 3 +- + net/mac80211/iface.c | 32 +- + net/mac80211/key.c | 4 +- + net/mac80211/main.c | 5 + + net/mac80211/pm.c | 6 +- + net/mac80211/rc80211_minstrel.c | 574 ------------------ + net/mac80211/rc80211_minstrel.h | 184 ------ + net/mac80211/rc80211_minstrel_debugfs.c | 172 ------ + net/mac80211/rc80211_minstrel_ht.c | 560 ++++++++++++------ + net/mac80211/rc80211_minstrel_ht.h | 96 ++- + net/mac80211/rc80211_minstrel_ht_debugfs.c | 57 +- + net/mac80211/rx.c | 243 +++++--- + net/mac80211/sta_info.h | 2 + + net/mac80211/tdls.c | 6 +- + net/mac80211/trace.h | 18 +- + net/mac80211/tx.c | 33 +- + net/mac80211/util.c | 14 +- + net/mac80211/vht.c | 9 +- + net/wireless/chan.c | 5 +- + net/wireless/core.c | 67 ++- + net/wireless/core.h | 2 +- + net/wireless/debugfs.c | 4 - + net/wireless/ibss.c | 3 +- + net/wireless/mlme.c | 6 +- + net/wireless/nl80211.c | 644 +++++++++++---------- + net/wireless/reg.c | 91 ++- + net/wireless/reg.h | 1 - + net/wireless/scan.c | 35 +- + net/wireless/sme.c | 5 +- + net/wireless/sysfs.c | 5 + + net/wireless/util.c | 39 +- + net/wireless/wext-compat.c | 271 ++++++--- + net/wireless/wext-sme.c | 4 +- + 74 files changed, 2051 insertions(+), 1879 deletions(-) + delete mode 100644 net/mac80211/rc80211_minstrel.c + delete mode 100644 net/mac80211/rc80211_minstrel.h + delete mode 100644 net/mac80211/rc80211_minstrel_debugfs.c +Merging gfs2/for-next (6c7c04f7bc18 gfs2: Fix invalid block size message) +$ git merge gfs2/for-next +Auto-merging fs/gfs2/super.c +Merge made by the 'recursive' strategy. + fs/gfs2/incore.h | 2 +- + fs/gfs2/lops.c | 2 +- + fs/gfs2/lops.h | 1 - + fs/gfs2/main.c | 4 ++-- + fs/gfs2/ops_fstype.c | 37 +++++++++++++++++++------------------ + fs/gfs2/recovery.c | 40 +++++++++++++++++++++++++++++----------- + fs/gfs2/super.c | 45 ++++----------------------------------------- + fs/gfs2/util.c | 43 +++++++++++++++++++++++++++++++++++++++++-- + fs/gfs2/util.h | 3 +++ + 9 files changed, 100 insertions(+), 77 deletions(-) +Merging mtd/mtd/next (341e4faf9cad mtd: remove redundant assignment to pointer eb) +$ git merge mtd/mtd/next +Merge made by the 'recursive' strategy. + drivers/mtd/devices/phram.c | 4 +++- + drivers/mtd/mtdswap.c | 1 - + 2 files changed, 3 insertions(+), 2 deletions(-) +Merging nand/nand/next (d986effd1409 mtd: rawnand: tango: Remove the driver) +$ git merge nand/nand/next +Removing drivers/mtd/nand/raw/tango_nand.c +Merge made by the 'recursive' strategy. + .../bindings/mtd/partitions/qcom,smem-part.yaml | 33 + + drivers/mtd/devices/st_spi_fsm.c | 2 +- + drivers/mtd/maps/pci.c | 8 +- + drivers/mtd/nand/raw/Kconfig | 7 - + drivers/mtd/nand/raw/Makefile | 1 - + drivers/mtd/nand/raw/marvell_nand.c | 2 +- + drivers/mtd/nand/raw/mxc_nand.c | 2 +- + drivers/mtd/nand/raw/qcom_nandc.c | 4 +- + drivers/mtd/nand/raw/tango_nand.c | 727 --------------------- + drivers/mtd/parsers/Kconfig | 8 + + drivers/mtd/parsers/Makefile | 1 + + drivers/mtd/parsers/afs.c | 4 +- + drivers/mtd/parsers/qcomsmempart.c | 170 +++++ + 13 files changed, 223 insertions(+), 746 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mtd/partitions/qcom,smem-part.yaml + delete mode 100644 drivers/mtd/nand/raw/tango_nand.c + create mode 100644 drivers/mtd/parsers/qcomsmempart.c +Merging spi-nor/spi-nor/next (19c329f68089 Linux 5.11-rc4) +$ git merge spi-nor/spi-nor/next +Already up to date. +Merging crypto/master (e2811196fbe0 crypto: keembay-ocs-hcu - Add dependency on HAS_IOMEM and ARCH_KEEMBAY) +$ git merge crypto/master +Removing drivers/crypto/picoxcell_crypto_regs.h +Removing drivers/crypto/picoxcell_crypto.c +Removing drivers/crypto/mediatek/mtk-sha.c +Removing drivers/crypto/mediatek/mtk-regs.h +Removing drivers/crypto/mediatek/mtk-platform.h +Removing drivers/crypto/mediatek/mtk-platform.c +Removing drivers/crypto/mediatek/mtk-aes.c +Removing drivers/crypto/mediatek/Makefile +Auto-merging drivers/crypto/Kconfig +Removing arch/x86/include/asm/crypto/serpent-avx.h +Removing arch/x86/include/asm/crypto/glue_helper.h +Removing arch/x86/crypto/glue_helper.c +Auto-merging MAINTAINERS +Auto-merging .mailmap +Merge made by the 'recursive' strategy. + .mailmap | 1 - + Documentation/crypto/api-skcipher.rst | 4 +- + .../bindings/crypto/intel,keembay-ocs-hcu.yaml | 46 + + .../bindings/crypto/samsung-slimsss.yaml | 1 - + .../devicetree/bindings/crypto/samsung-sss.yaml | 1 - + MAINTAINERS | 12 +- + arch/arm/crypto/Kconfig | 19 + + arch/arm/crypto/Makefile | 4 + + arch/arm/crypto/aes-neonbs-glue.c | 3 + + arch/arm/crypto/blake2b-neon-core.S | 347 ++++ + arch/arm/crypto/blake2b-neon-glue.c | 105 ++ + arch/arm/crypto/blake2s-core.S | 285 +++ + arch/arm/crypto/blake2s-glue.c | 78 + + arch/arm64/crypto/aes-glue.c | 50 +- + arch/arm64/crypto/aes-modes.S | 165 +- + arch/s390/crypto/aes_s390.c | 2 + + arch/x86/crypto/Makefile | 2 - + arch/x86/crypto/aesni-intel_asm.S | 482 +++++- + arch/x86/crypto/aesni-intel_glue.c | 683 ++++---- + arch/x86/crypto/blake2s-glue.c | 150 +- + arch/x86/crypto/blowfish_glue.c | 107 -- + arch/x86/crypto/camellia-aesni-avx-asm_64.S | 298 ---- + arch/x86/crypto/camellia-aesni-avx2-asm_64.S | 351 ---- + arch/x86/{include/asm => }/crypto/camellia.h | 24 - + arch/x86/crypto/camellia_aesni_avx2_glue.c | 198 +-- + arch/x86/crypto/camellia_aesni_avx_glue.c | 216 +-- + arch/x86/crypto/camellia_glue.c | 145 +- + arch/x86/crypto/cast5_avx_glue.c | 287 +--- + arch/x86/crypto/cast6-avx-x86_64-asm_64.S | 84 - + arch/x86/crypto/cast6_avx_glue.c | 207 +-- + arch/x86/crypto/des3_ede_glue.c | 104 -- + arch/x86/crypto/ecb_cbc_helpers.h | 76 + + arch/x86/crypto/glue_helper-asm-avx.S | 104 -- + arch/x86/crypto/glue_helper-asm-avx2.S | 136 -- + arch/x86/crypto/glue_helper.c | 381 ----- + arch/x86/crypto/serpent-avx-x86_64-asm_64.S | 68 - + arch/x86/crypto/serpent-avx.h | 21 + + arch/x86/crypto/serpent-avx2-asm_64.S | 87 - + arch/x86/{include/asm => }/crypto/serpent-sse2.h | 0 + arch/x86/crypto/serpent_avx2_glue.c | 185 +- + arch/x86/crypto/serpent_avx_glue.c | 215 +-- + arch/x86/crypto/serpent_sse2_glue.c | 150 +- + arch/x86/crypto/twofish-avx-x86_64-asm_64.S | 80 - + arch/x86/{include/asm => }/crypto/twofish.h | 4 - + arch/x86/crypto/twofish_avx_glue.c | 211 +-- + arch/x86/crypto/twofish_glue_3way.c | 160 +- + arch/x86/include/asm/crypto/glue_helper.h | 118 -- + arch/x86/include/asm/crypto/serpent-avx.h | 42 - + crypto/Kconfig | 31 +- + crypto/adiantum.c | 2 + + crypto/ansi_cprng.c | 2 + + crypto/blake2b_generic.c | 249 +-- + crypto/blake2s_generic.c | 158 +- + crypto/cbc.c | 1 + + crypto/ccm.c | 2 + + crypto/cfb.c | 2 + + crypto/cipher.c | 7 +- + crypto/cmac.c | 2 + + crypto/ctr.c | 2 + + crypto/drbg.c | 2 + + crypto/ecb.c | 1 + + crypto/essiv.c | 2 + + crypto/keywrap.c | 2 + + crypto/ofb.c | 2 + + crypto/pcbc.c | 2 + + crypto/skcipher.c | 8 +- + crypto/tcrypt.c | 20 +- + crypto/testmgr.c | 3 + + crypto/vmac.c | 2 + + crypto/xcbc.c | 2 + + crypto/xts.c | 2 + + drivers/char/hw_random/ingenic-trng.c | 6 +- + drivers/char/hw_random/iproc-rng200.c | 38 +- + drivers/crypto/Kconfig | 33 - + drivers/crypto/Makefile | 2 - + drivers/crypto/allwinner/Kconfig | 9 + + .../crypto/allwinner/sun4i-ss/sun4i-ss-cipher.c | 196 ++- + drivers/crypto/allwinner/sun4i-ss/sun4i-ss-core.c | 52 + + drivers/crypto/allwinner/sun4i-ss/sun4i-ss-hash.c | 6 + + drivers/crypto/allwinner/sun4i-ss/sun4i-ss-prng.c | 6 + + drivers/crypto/allwinner/sun4i-ss/sun4i-ss.h | 8 + + drivers/crypto/bcm/cipher.c | 2 +- + drivers/crypto/bcm/cipher.h | 4 +- + drivers/crypto/bcm/util.c | 2 +- + drivers/crypto/ccree/cc_driver.h | 1 - + drivers/crypto/geode-aes.c | 2 + + drivers/crypto/hisilicon/hpre/hpre_main.c | 54 + + drivers/crypto/hisilicon/qm.c | 8 +- + drivers/crypto/hisilicon/qm.h | 27 + + drivers/crypto/hisilicon/sec2/sec_main.c | 39 +- + drivers/crypto/hisilicon/zip/zip_main.c | 14 + + drivers/crypto/inside-secure/safexcel.c | 6 +- + drivers/crypto/inside-secure/safexcel_hash.c | 1 + + drivers/crypto/keembay/Kconfig | 31 + + drivers/crypto/keembay/Makefile | 3 + + drivers/crypto/keembay/keembay-ocs-hcu-core.c | 1264 ++++++++++++++ + drivers/crypto/keembay/ocs-hcu.c | 840 +++++++++ + drivers/crypto/keembay/ocs-hcu.h | 106 ++ + drivers/crypto/marvell/cesa/tdma.c | 2 +- + drivers/crypto/mediatek/Makefile | 3 - + drivers/crypto/mediatek/mtk-aes.c | 1271 -------------- + drivers/crypto/mediatek/mtk-platform.c | 586 ------- + drivers/crypto/mediatek/mtk-platform.h | 231 --- + drivers/crypto/mediatek/mtk-regs.h | 190 -- + drivers/crypto/mediatek/mtk-sha.c | 1353 --------------- + drivers/crypto/picoxcell_crypto.c | 1807 -------------------- + drivers/crypto/picoxcell_crypto_regs.h | 115 -- + drivers/crypto/qat/Kconfig | 2 +- + drivers/crypto/qat/qat_4xxx/adf_4xxx_hw_data.c | 14 +- + drivers/crypto/qat/qat_c3xxx/adf_c3xxx_hw_data.c | 17 +- + drivers/crypto/qat/qat_c62x/adf_c62x_hw_data.c | 27 +- + drivers/crypto/qat/qat_common/adf_accel_devices.h | 3 +- + drivers/crypto/qat/qat_common/adf_ctl_drv.c | 1 + + drivers/crypto/qat/qat_common/adf_hw_arbiter.c | 8 +- + drivers/crypto/qat/qat_common/adf_transport.c | 2 + + .../crypto/qat/qat_common/adf_transport_debug.c | 4 +- + drivers/crypto/qat/qat_common/qat_algs.c | 1 + + drivers/crypto/qat/qat_common/qat_asym_algs.c | 12 +- + .../crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.c | 28 +- + drivers/crypto/sahara.c | 7 - + drivers/crypto/stm32/stm32-cryp.c | 2 +- + drivers/crypto/vmx/aes.c | 1 + + drivers/crypto/vmx/aesp8-ppc.h | 6 + + drivers/crypto/vmx/vmx.c | 7 +- + drivers/net/Kconfig | 1 + + drivers/net/ethernet/chelsio/inline_crypto/Kconfig | 1 + + .../chelsio/inline_crypto/ch_ktls/chcr_ktls.c | 19 +- + include/crypto/algapi.h | 39 - + include/crypto/blake2b.h | 67 + + include/crypto/blake2s.h | 63 +- + include/crypto/internal/blake2b.h | 115 ++ + include/crypto/internal/blake2s.h | 109 +- + include/crypto/internal/cipher.h | 218 +++ + include/crypto/internal/skcipher.h | 2 +- + include/linux/crypto.h | 163 -- + lib/crypto/blake2s.c | 48 +- + 136 files changed, 5541 insertions(+), 10769 deletions(-) + create mode 100644 Documentation/devicetree/bindings/crypto/intel,keembay-ocs-hcu.yaml + create mode 100644 arch/arm/crypto/blake2b-neon-core.S + create mode 100644 arch/arm/crypto/blake2b-neon-glue.c + create mode 100644 arch/arm/crypto/blake2s-core.S + create mode 100644 arch/arm/crypto/blake2s-glue.c + rename arch/x86/{include/asm => }/crypto/camellia.h (69%) + create mode 100644 arch/x86/crypto/ecb_cbc_helpers.h + delete mode 100644 arch/x86/crypto/glue_helper.c + create mode 100644 arch/x86/crypto/serpent-avx.h + rename arch/x86/{include/asm => }/crypto/serpent-sse2.h (100%) + rename arch/x86/{include/asm => }/crypto/twofish.h (80%) + delete mode 100644 arch/x86/include/asm/crypto/glue_helper.h + delete mode 100644 arch/x86/include/asm/crypto/serpent-avx.h + create mode 100644 drivers/crypto/keembay/keembay-ocs-hcu-core.c + create mode 100644 drivers/crypto/keembay/ocs-hcu.c + create mode 100644 drivers/crypto/keembay/ocs-hcu.h + delete mode 100644 drivers/crypto/mediatek/Makefile + delete mode 100644 drivers/crypto/mediatek/mtk-aes.c + delete mode 100644 drivers/crypto/mediatek/mtk-platform.c + delete mode 100644 drivers/crypto/mediatek/mtk-platform.h + delete mode 100644 drivers/crypto/mediatek/mtk-regs.h + delete mode 100644 drivers/crypto/mediatek/mtk-sha.c + delete mode 100644 drivers/crypto/picoxcell_crypto.c + delete mode 100644 drivers/crypto/picoxcell_crypto_regs.h + create mode 100644 include/crypto/blake2b.h + create mode 100644 include/crypto/internal/blake2b.h + create mode 100644 include/crypto/internal/cipher.h +Merging drm/drm-next (d82afcf9caaa Merge tag 'drm-intel-gt-next-2021-01-21-1' of git://anongit.freedesktop.org/drm/drm-intel into drm-next) +$ git merge drm/drm-next +Removing drivers/gpu/drm/vmwgfx/vmwgfx_marker.c +Auto-merging drivers/gpu/drm/vc4/vc4_hdmi.c +Auto-merging drivers/gpu/drm/radeon/radeon_ttm.c +Removing drivers/gpu/drm/omapdrm/omap_connector.h +Removing drivers/gpu/drm/omapdrm/omap_connector.c +Removing drivers/gpu/drm/omapdrm/dss/omapdss-boot-init.c +Removing drivers/gpu/drm/omapdrm/dss/display.c +Removing drivers/gpu/drm/omapdrm/dss/Makefile +Removing drivers/gpu/drm/omapdrm/dss/Kconfig +Removing drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c +Removing drivers/gpu/drm/omapdrm/displays/Makefile +Removing drivers/gpu/drm/omapdrm/displays/Kconfig +Auto-merging drivers/gpu/drm/msm/msm_gem.c +Auto-merging drivers/gpu/drm/i915/i915_request.h +Auto-merging drivers/gpu/drm/i915/i915_pmu.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_pmu.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_cmd_parser.c +Auto-merging drivers/gpu/drm/i915/gvt/vgpu.c +Auto-merging drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c +Auto-merging drivers/gpu/drm/i915/gt/intel_timeline.c +Auto-merging drivers/gpu/drm/i915/gt/intel_ring_submission.c +Auto-merging drivers/gpu/drm/i915/gt/intel_lrc.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_lrc.c +Auto-merging drivers/gpu/drm/i915/gt/intel_breadcrumbs.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_breadcrumbs.c +Auto-merging drivers/gpu/drm/i915/gt/gen7_renderclear.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/gen7_renderclear.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +Auto-merging drivers/gpu/drm/i915/display/intel_panel.c +Auto-merging drivers/gpu/drm/i915/display/intel_dp.h +Auto-merging drivers/gpu/drm/i915/display/intel_dp.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dp.c +Auto-merging drivers/gpu/drm/i915/display/intel_display_types.h +Auto-merging drivers/gpu/drm/i915/display/intel_ddi.c +Auto-merging drivers/gpu/drm/i915/display/icl_dsi.c +Auto-merging drivers/gpu/drm/i915/Makefile +Removing drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c +Auto-merging drivers/gpu/drm/drm_plane.c +Auto-merging drivers/gpu/drm/drm_atomic_helper.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_link.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/soc15.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/dma-buf/dma-buf.c +Auto-merging arch/arm/configs/omap2plus_defconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Removing Documentation/devicetree/bindings/display/ste,mcde.txt +Auto-merging Documentation/devicetree/bindings/display/panel/panel-simple.yaml +Resolved 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h' using previous resolution. +Resolved 'drivers/gpu/drm/i915/display/intel_dp.c' using previous resolution. +Recorded preimage for 'drivers/gpu/drm/i915/gt/gen7_renderclear.c' +Resolved 'drivers/gpu/drm/i915/gt/intel_breadcrumbs.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/gt/intel_lrc.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/i915_pmu.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/gpu/drm/i915/gt/gen7_renderclear.c'. +[master 0cc9967a4250] Merge remote-tracking branch 'drm/drm-next' +$ git diff -M --stat --summary HEAD^.. + .../allwinner,sun4i-a10-display-backend.yaml | 23 +- + .../allwinner,sun4i-a10-display-frontend.yaml | 19 +- + .../bindings/display/allwinner,sun4i-a10-hdmi.yaml | 19 +- + .../bindings/display/allwinner,sun4i-a10-tcon.yaml | 25 +- + .../display/allwinner,sun4i-a10-tv-encoder.yaml | 6 +- + .../bindings/display/allwinner,sun6i-a31-drc.yaml | 19 +- + .../display/allwinner,sun6i-a31-mipi-dsi.yaml | 6 +- + .../display/allwinner,sun8i-a83t-de2-mixer.yaml | 19 +- + .../display/allwinner,sun8i-a83t-dw-hdmi.yaml | 19 +- + .../display/allwinner,sun8i-r40-tcon-top.yaml | 110 +- + .../bindings/display/allwinner,sun9i-a80-deu.yaml | 19 +- + .../bindings/display/amlogic,meson-dw-hdmi.yaml | 4 +- + .../bindings/display/amlogic,meson-vpu.yaml | 4 +- + .../bindings/display/brcm,bcm2835-dpi.yaml | 7 +- + .../bindings/display/brcm,bcm2835-dsi0.yaml | 1 + + .../bindings/display/bridge/analogix,anx7625.yaml | 6 +- + .../bindings/display/bridge/analogix,anx7814.yaml | 19 +- + .../bindings/display/bridge/anx6345.yaml | 18 +- + .../bindings/display/bridge/cdns,mhdp8546.yaml | 22 +- + .../bindings/display/bridge/chrontel,ch7033.yaml | 6 +- + .../bindings/display/bridge/intel,keembay-dsi.yaml | 14 +- + .../bindings/display/bridge/ite,it6505.yaml | 2 +- + .../bindings/display/bridge/lontium,lt9611.yaml | 70 +- + .../bindings/display/bridge/lvds-codec.yaml | 18 +- + .../bindings/display/bridge/nwl-dsi.yaml | 41 +- + .../devicetree/bindings/display/bridge/ps8640.yaml | 24 +- + .../bindings/display/bridge/renesas,lvds.yaml | 24 +- + .../bindings/display/bridge/simple-bridge.yaml | 18 +- + .../bindings/display/bridge/snps,dw-mipi-dsi.yaml | 7 +- + .../display/bridge/thine,thc63lvd1024.yaml | 35 +- + .../bindings/display/bridge/ti,sn65dsi86.yaml | 45 +- + .../bindings/display/bridge/ti,tfp410.yaml | 24 +- + .../bindings/display/bridge/toshiba,tc358762.yaml | 52 +- + .../bindings/display/bridge/toshiba,tc358768.yaml | 48 +- + .../bindings/display/bridge/toshiba,tc358775.yaml | 19 +- + .../display/connector/analog-tv-connector.yaml | 1 + + .../bindings/display/connector/dp-connector.yaml | 56 + + .../bindings/display/connector/dvi-connector.yaml | 1 + + .../bindings/display/connector/hdmi-connector.yaml | 1 + + .../bindings/display/connector/vga-connector.yaml | 1 + + .../bindings/display/imx/nxp,imx8mq-dcss.yaml | 2 +- + .../devicetree/bindings/display/ingenic,ipu.yaml | 5 +- + .../devicetree/bindings/display/ingenic,lcd.yaml | 10 +- + .../bindings/display/intel,keembay-display.yaml | 2 +- + .../display/panel/advantech,idk-2121wr.yaml | 21 +- + .../display/panel/mantix,mlaf057we51-x.yaml | 1 + + .../bindings/display/panel/panel-common.yaml | 11 +- + .../bindings/display/panel/panel-simple-dsi.yaml | 2 + + .../bindings/display/panel/panel-simple.yaml | 2 + + .../bindings/display/panel/samsung,s6e63m0.yaml | 4 +- + .../display/rockchip/rockchip,rk3066-hdmi.yaml | 16 +- + .../bindings/display/rockchip/rockchip-vop.yaml | 5 +- + .../devicetree/bindings/display/st,stm32-dsi.yaml | 12 +- + .../devicetree/bindings/display/st,stm32-ltdc.yaml | 8 +- + .../devicetree/bindings/display/ste,mcde.txt | 104 - + .../devicetree/bindings/display/ste,mcde.yaml | 168 + + .../bindings/display/ti/ti,am65x-dss.yaml | 19 +- + .../bindings/display/ti/ti,j721e-dss.yaml | 23 +- + .../devicetree/bindings/display/ti/ti,k2g-dss.yaml | 3 +- + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + Documentation/gpu/drm-kms.rst | 52 +- + Documentation/gpu/drm-uapi.rst | 3 + + Documentation/gpu/i915.rst | 2 +- + Documentation/gpu/vkms.rst | 82 + + MAINTAINERS | 11 +- + arch/arm/boot/dts/omap5.dtsi | 6 + + arch/arm/configs/omap2plus_defconfig | 2 +- + drivers/dma-buf/Kconfig | 8 + + drivers/dma-buf/dma-buf.c | 120 +- + drivers/gpu/drm/Kconfig | 5 - + drivers/gpu/drm/Makefile | 6 +- + drivers/gpu/drm/amd/amdgpu/Makefile | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | 1 - + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10_3.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 41 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fw_attestation.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.h | 40 + + drivers/gpu/drm/amd/amdgpu/amdgpu_i2c.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c | 45 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 195 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 17 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_securedisplay.c | 176 + + drivers/gpu/drm/amd/amdgpu/amdgpu_securedisplay.h | 36 + + drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 4 +- + drivers/gpu/drm/amd/amdgpu/athub_v2_0.c | 1 - + drivers/gpu/drm/amd/amdgpu/athub_v2_1.c | 1 - + drivers/gpu/drm/amd/amdgpu/cz_ih.c | 37 +- + drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 5 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 9 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 1 - + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 14 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 39 +- + drivers/gpu/drm/amd/amdgpu/hdp_v4_0.c | 137 + + drivers/gpu/drm/amd/amdgpu/hdp_v4_0.h | 31 + + drivers/gpu/drm/amd/amdgpu/hdp_v5_0.c | 212 + + drivers/gpu/drm/amd/amdgpu/hdp_v5_0.h | 31 + + drivers/gpu/drm/amd/amdgpu/iceland_ih.c | 36 +- + drivers/gpu/drm/amd/amdgpu/mes_v10_1.c | 2 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 1 + + drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c | 1 + + drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 478 +- + drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 10 - + drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c | 23 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c | 10 - + drivers/gpu/drm/amd/amdgpu/nbio_v7_2.c | 10 - + drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 10 - + drivers/gpu/drm/amd/amdgpu/nv.c | 206 +- + drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 12 +- + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 38 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 1 - + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 1 - + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 31 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 100 +- + drivers/gpu/drm/amd/amdgpu/ta_secureDisplay_if.h | 154 + + drivers/gpu/drm/amd/amdgpu/tonga_ih.c | 37 +- + drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 1 - + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 1 - + drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 483 +- + drivers/gpu/drm/amd/amdgpu/vega20_ih.c | 703 ++ + drivers/gpu/drm/amd/amdgpu/vega20_ih.h | 30 + + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 54 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 116 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 14 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 4 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 1 - + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 1 - + drivers/gpu/drm/amd/display/dc/basics/conversion.c | 9 +- + drivers/gpu/drm/amd/display/dc/basics/dc_common.c | 20 +- + drivers/gpu/drm/amd/display/dc/basics/dc_common.h | 4 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser.c | 119 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 29 +- + .../drm/amd/display/dc/bios/command_table_helper.c | 20 +- + .../amd/display/dc/bios/command_table_helper2.c | 20 +- + drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c | 13 +- + .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 3 +- + .../drm/amd/display/dc/clk_mgr/dcn301/dcn301_smu.c | 2 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 79 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 62 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 45 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 42 +- + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 5 +- + drivers/gpu/drm/amd/display/dc/core/dc_surface.c | 2 +- + drivers/gpu/drm/amd/display/dc/dc.h | 7 +- + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 3 + + drivers/gpu/drm/amd/display/dc/dc_helper.c | 1 + + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 1 + + drivers/gpu/drm/amd/display/dc/dc_link.h | 8 + + drivers/gpu/drm/amd/display/dc/dc_stream.h | 11 + + drivers/gpu/drm/amd/display/dc/dce/dce_audio.c | 2 +- + drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 8 +- + drivers/gpu/drm/amd/display/dc/dce/dce_aux.h | 1 - + .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 57 +- + drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 6 +- + drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.h | 2 - + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c | 4 +- + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_sw.c | 9 +- + .../gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 9 +- + drivers/gpu/drm/amd/display/dc/dce/dce_opp.c | 24 +- + drivers/gpu/drm/amd/display/dc/dce/dce_opp.h | 2 - + .../gpu/drm/amd/display/dc/dce/dce_panel_cntl.c | 8 +- + .../drm/amd/display/dc/dce/dce_stream_encoder.c | 3 +- + drivers/gpu/drm/amd/display/dc/dce/dce_transform.c | 15 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 22 +- + drivers/gpu/drm/amd/display/dc/dce100/Makefile | 2 + + .../drm/amd/display/dc/dce100/dce100_resource.c | 20 +- + drivers/gpu/drm/amd/display/dc/dce110/Makefile | 2 + + .../drm/amd/display/dc/dce110/dce110_compressor.c | 55 - + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 33 +- + .../drm/amd/display/dc/dce110/dce110_mem_input_v.c | 17 +- + .../drm/amd/display/dc/dce110/dce110_resource.c | 19 +- + .../display/dc/dce110/dce110_timing_generator.c | 76 +- + .../display/dc/dce110/dce110_timing_generator_v.c | 19 +- + .../drm/amd/display/dc/dce110/dce110_transform_v.c | 19 +- + drivers/gpu/drm/amd/display/dc/dce112/Makefile | 2 + + .../drm/amd/display/dc/dce112/dce112_resource.c | 20 +- + drivers/gpu/drm/amd/display/dc/dce120/Makefile | 2 + + .../amd/display/dc/dce120/dce120_hw_sequencer.c | 2 +- + .../drm/amd/display/dc/dce120/dce120_resource.c | 6 +- + .../display/dc/dce120/dce120_timing_generator.c | 99 +- + drivers/gpu/drm/amd/display/dc/dce60/Makefile | 2 + + .../gpu/drm/amd/display/dc/dce60/dce60_resource.c | 18 +- + .../amd/display/dc/dce60/dce60_timing_generator.c | 4 +- + drivers/gpu/drm/amd/display/dc/dce80/Makefile | 2 + + .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 4 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_cm.c | 2 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 36 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h | 5 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.c | 1 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 11 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h | 1 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 12 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.c | 1 + + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.c | 1 + + .../gpu/drm/amd/display/dc/dcn30/dcn30_dpp_cm.c | 7 - + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.h | 1 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 83 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.h | 6 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.c | 3 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.c | 1 + + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 4 + + .../gpu/drm/amd/display/dc/dcn301/dcn301_init.c | 1 + + .../drm/amd/display/dc/dcn302/dcn302_resource.c | 15 +- + .../amd/display/dc/dml/dcn20/display_mode_vba_20.c | 2 +- + .../amd/display/dc/dml/dcn21/display_mode_vba_21.c | 44 +- + .../amd/display/dc/dml/dcn30/display_mode_vba_30.c | 6 +- + .../display/dc/gpio/diagnostics/hw_factory_diag.c | 1 + + .../display/dc/gpio/diagnostics/hw_factory_diag.h | 2 + + .../dc/gpio/diagnostics/hw_translate_diag.c | 1 + + drivers/gpu/drm/amd/display/dc/gpio/hw_ddc.c | 7 +- + drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c | 14 - + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 1 + + .../drm/amd/display/dc/inc/hw/timing_generator.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 7 + + drivers/gpu/drm/amd/display/dc/irq/irq_service.c | 2 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn30.c | 1 + + .../amd/display/modules/info_packet/info_packet.c | 13 +- + .../drm/amd/display/modules/power/power_helpers.c | 6 +- + .../amd/include/asic_reg/oss/osssys_4_2_0_offset.h | 345 + + .../include/asic_reg/oss/osssys_4_2_0_sh_mask.h | 1300 ++++ + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 5 +- + drivers/gpu/drm/amd/include/renoir_ip_offset.h | 2 +- + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 191 +- + drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 542 ++ + .../gpu/drm/amd/pm/inc/smu11_driver_if_vangogh.h | 1 - + drivers/gpu/drm/amd/pm/inc/smu_types.h | 3 + + drivers/gpu/drm/amd/pm/inc/smu_v11_0.h | 2 +- + drivers/gpu/drm/amd/pm/powerplay/hwmgr/hwmgr.c | 2 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/ppatomctrl.c | 4 +- + .../amd/pm/powerplay/hwmgr/process_pptables_v1_0.c | 1 + + .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 4 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 137 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.h | 1 + + .../gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c | 11 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c | 11 +- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 22 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 2 +- + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 330 + + drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 1 + + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 1173 +++- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.h | 26 +- + drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c | 217 +- + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 58 +- + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 2 + + drivers/gpu/drm/arc/arcpgu_crtc.c | 9 +- + drivers/gpu/drm/arc/arcpgu_drv.c | 2 +- + drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 1 - + drivers/gpu/drm/arm/malidp_crtc.c | 1 - + drivers/gpu/drm/armada/armada_crtc.c | 1 - + drivers/gpu/drm/ast/ast_cursor.c | 55 +- + drivers/gpu/drm/ast/ast_drv.c | 4 +- + drivers/gpu/drm/ast/ast_drv.h | 2 - + drivers/gpu/drm/ast/ast_main.c | 25 +- + drivers/gpu/drm/ast/ast_mm.c | 17 +- + drivers/gpu/drm/ast/ast_mode.c | 6 +- + drivers/gpu/drm/ast/ast_post.c | 8 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 1 - + drivers/gpu/drm/bochs/bochs_drv.c | 1 - + drivers/gpu/drm/bochs/bochs_hw.c | 4 +- + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 6 +- + drivers/gpu/drm/bridge/display-connector.c | 46 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 6 +- + drivers/gpu/drm/bridge/thc63lvd1024.c | 2 +- + drivers/gpu/drm/drm_agpsupport.c | 67 +- + drivers/gpu/drm/drm_atomic_helper.c | 79 +- + drivers/gpu/drm/drm_blend.c | 6 - + drivers/gpu/drm/drm_bufs.c | 4 +- + drivers/gpu/drm/drm_cache.c | 33 + + drivers/gpu/drm/drm_color_mgmt.c | 125 +- + drivers/gpu/drm/drm_crtc.c | 130 +- + drivers/gpu/drm/drm_dp_helper.c | 567 ++ + drivers/gpu/drm/drm_dp_mst_topology.c | 2 +- + drivers/gpu/drm/drm_drv.c | 16 +- + drivers/gpu/drm/drm_dsc.c | 30 +- + drivers/gpu/drm/drm_dumb_buffers.c | 8 +- + drivers/gpu/drm/drm_edid.c | 110 +- + drivers/gpu/drm/drm_encoder.c | 113 +- + drivers/gpu/drm/drm_fb_helper.c | 25 +- + drivers/gpu/drm/drm_file.c | 8 +- + drivers/gpu/drm/drm_gem.c | 31 +- + drivers/gpu/drm/drm_gem_cma_helper.c | 141 +- + drivers/gpu/drm/drm_internal.h | 3 + + drivers/gpu/drm/drm_irq.c | 44 +- + drivers/gpu/drm/drm_legacy.h | 2 +- + drivers/gpu/drm/drm_memory.c | 51 - + drivers/gpu/drm/drm_mode_config.c | 51 +- + drivers/gpu/drm/drm_modes.c | 4 +- + drivers/gpu/drm/drm_pci.c | 59 +- + drivers/gpu/drm/drm_plane.c | 170 +- + drivers/gpu/drm/drm_prime.c | 66 +- + drivers/gpu/drm/drm_probe_helper.c | 3 +- + drivers/gpu/drm/drm_simple_kms_helper.c | 14 +- + drivers/gpu/drm/drm_vblank.c | 2 +- + drivers/gpu/drm/drm_vm.c | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 3 +- + drivers/gpu/drm/gma500/cdv_device.c | 30 +- + drivers/gpu/drm/gma500/cdv_intel_crt.c | 5 +- + drivers/gpu/drm/gma500/cdv_intel_display.c | 2 +- + drivers/gpu/drm/gma500/cdv_intel_dp.c | 4 +- + drivers/gpu/drm/gma500/cdv_intel_lvds.c | 11 +- + drivers/gpu/drm/gma500/framebuffer.c | 15 +- + drivers/gpu/drm/gma500/gem.c | 6 +- + drivers/gpu/drm/gma500/gem.h | 2 + + drivers/gpu/drm/gma500/gma_device.c | 4 +- + drivers/gpu/drm/gma500/gma_display.c | 12 +- + drivers/gpu/drm/gma500/gtt.c | 20 +- + drivers/gpu/drm/gma500/intel_bios.c | 8 +- + drivers/gpu/drm/gma500/intel_gmbus.c | 4 +- + drivers/gpu/drm/gma500/intel_i2c.c | 5 +- + drivers/gpu/drm/gma500/mdfld_device.c | 4 +- + drivers/gpu/drm/gma500/mdfld_dsi_dpi.c | 8 +- + drivers/gpu/drm/gma500/mdfld_dsi_output.c | 4 +- + drivers/gpu/drm/gma500/mdfld_intel_display.c | 6 +- + drivers/gpu/drm/gma500/mid_bios.c | 9 +- + drivers/gpu/drm/gma500/mmu.c | 15 +- + drivers/gpu/drm/gma500/oaktrail_crtc.c | 6 +- + drivers/gpu/drm/gma500/oaktrail_device.c | 5 +- + drivers/gpu/drm/gma500/oaktrail_hdmi_i2c.c | 22 +- + drivers/gpu/drm/gma500/oaktrail_lvds.c | 5 +- + drivers/gpu/drm/gma500/oaktrail_lvds_i2c.c | 10 +- + drivers/gpu/drm/gma500/opregion.c | 3 +- + drivers/gpu/drm/gma500/power.c | 21 +- + drivers/gpu/drm/gma500/psb_drv.c | 18 +- + drivers/gpu/drm/gma500/psb_drv.h | 8 +- + drivers/gpu/drm/gma500/psb_intel_display.c | 2 +- + drivers/gpu/drm/gma500/psb_intel_lvds.c | 7 +- + drivers/gpu/drm/gma500/psb_intel_modes.c | 3 +- + drivers/gpu/drm/gma500/psb_intel_sdvo.c | 8 +- + drivers/gpu/drm/gma500/psb_irq.c | 3 +- + drivers/gpu/drm/gma500/tc35876x-dsi-lvds.c | 36 +- + drivers/gpu/drm/hisilicon/hibmc/Makefile | 2 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 2 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 104 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 10 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_i2c.c | 2 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c | 20 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 61 - + drivers/gpu/drm/i915/Kconfig.debug | 22 +- + drivers/gpu/drm/i915/Makefile | 20 +- + drivers/gpu/drm/i915/display/i9xx_plane.c | 704 ++ + drivers/gpu/drm/i915/display/i9xx_plane.h | 24 + + drivers/gpu/drm/i915/display/icl_dsi.c | 3 + + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 3 + + drivers/gpu/drm/i915/display/intel_bios.c | 21 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 7 +- + drivers/gpu/drm/i915/display/intel_combo_phy.c | 20 +- + drivers/gpu/drm/i915/display/intel_connector.c | 29 +- + drivers/gpu/drm/i915/display/intel_connector.h | 3 +- + drivers/gpu/drm/i915/display/intel_cursor.c | 806 +++ + drivers/gpu/drm/i915/display/intel_cursor.h | 17 + + drivers/gpu/drm/i915/display/intel_ddi.c | 166 +- + drivers/gpu/drm/i915/display/intel_display.c | 2086 +----- + drivers/gpu/drm/i915/display/intel_display.h | 15 +- + .../gpu/drm/i915/display/intel_display_debugfs.c | 124 + + .../gpu/drm/i915/display/intel_display_debugfs.h | 3 + + drivers/gpu/drm/i915/display/intel_display_power.c | 127 +- + drivers/gpu/drm/i915/display/intel_display_power.h | 37 +- + drivers/gpu/drm/i915/display/intel_display_types.h | 65 +- + drivers/gpu/drm/i915/display/intel_dp.c | 603 +- + drivers/gpu/drm/i915/display/intel_dp.h | 4 + + .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 115 +- + .../gpu/drm/i915/display/intel_dsi_dcs_backlight.c | 21 +- + drivers/gpu/drm/i915/display/intel_dvo.c | 4 - + drivers/gpu/drm/i915/display/intel_fbc.c | 19 +- + drivers/gpu/drm/i915/display/intel_fbdev.c | 4 +- + drivers/gpu/drm/i915/display/intel_frontbuffer.c | 4 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 259 +- + drivers/gpu/drm/i915/display/intel_hdmi.h | 7 + + drivers/gpu/drm/i915/display/intel_lspcon.c | 162 +- + drivers/gpu/drm/i915/display/intel_lspcon.h | 12 + + drivers/gpu/drm/i915/display/intel_overlay.c | 5 +- + drivers/gpu/drm/i915/display/intel_panel.c | 226 +- + drivers/gpu/drm/i915/display/intel_psr.c | 131 +- + drivers/gpu/drm/i915/display/intel_sprite.c | 50 +- + drivers/gpu/drm/i915/display/intel_sprite.h | 10 + + drivers/gpu/drm/i915/display/intel_tc.c | 2 +- + drivers/gpu/drm/i915/display/intel_vbt_defs.h | 2 + + drivers/gpu/drm/i915/display/intel_vdsc.c | 4 +- + drivers/gpu/drm/i915/dma_resv_utils.c | 17 + + drivers/gpu/drm/i915/dma_resv_utils.h | 13 + + drivers/gpu/drm/i915/gem/i915_gem_context.c | 132 +- + drivers/gpu/drm/i915/gem/i915_gem_context.h | 1 - + drivers/gpu/drm/i915/gem/i915_gem_context_types.h | 1 - + drivers/gpu/drm/i915/gem/i915_gem_create.c | 113 + + drivers/gpu/drm/i915/gem/i915_gem_domain.c | 104 +- + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 24 +- + drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 15 +- + drivers/gpu/drm/i915/gem/i915_gem_lmem.h | 8 +- + drivers/gpu/drm/i915/gem/i915_gem_object.c | 47 - + drivers/gpu/drm/i915/gem/i915_gem_object.h | 36 +- + drivers/gpu/drm/i915/gem/i915_gem_object_blt.c | 9 +- + drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 19 +- + drivers/gpu/drm/i915/gem/i915_gem_pages.c | 51 +- + drivers/gpu/drm/i915/gem/i915_gem_phys.c | 4 +- + drivers/gpu/drm/i915/gem/i915_gem_pm.c | 41 +- + drivers/gpu/drm/i915/gem/i915_gem_region.c | 52 +- + drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 28 +- + drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 3 + + drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 75 +- + drivers/gpu/drm/i915/gem/i915_gem_stolen.h | 2 + + drivers/gpu/drm/i915/gem/i915_gem_tiling.c | 12 +- + drivers/gpu/drm/i915/gem/i915_gem_wait.c | 54 +- + .../gpu/drm/i915/gem/selftests/huge_gem_object.c | 2 +- + drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 22 + + .../drm/i915/gem/selftests/i915_gem_client_blt.c | 4 +- + .../drm/i915/gem/selftests/i915_gem_coherency.c | 1 + + drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 1 + + drivers/gpu/drm/i915/gem/selftests/igt_gem_utils.c | 1 + + drivers/gpu/drm/i915/gt/debugfs_gt_pm.c | 27 +- + drivers/gpu/drm/i915/gt/gen6_ppgtt.c | 15 +- + drivers/gpu/drm/i915/gt/gen7_renderclear.c | 23 +- + drivers/gpu/drm/i915/gt/gen8_engine_cs.c | 635 ++ + drivers/gpu/drm/i915/gt/gen8_engine_cs.h | 127 + + drivers/gpu/drm/i915/gt/gen8_ppgtt.c | 13 +- + drivers/gpu/drm/i915/gt/intel_breadcrumbs.c | 106 +- + drivers/gpu/drm/i915/gt/intel_breadcrumbs.h | 17 +- + drivers/gpu/drm/i915/gt/intel_breadcrumbs_types.h | 7 +- + drivers/gpu/drm/i915/gt/intel_context.h | 11 +- + drivers/gpu/drm/i915/gt/intel_context_sseu.c | 1 - + drivers/gpu/drm/i915/gt/intel_context_types.h | 25 +- + drivers/gpu/drm/i915/gt/intel_engine.h | 93 +- + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 167 +- + drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c | 59 +- + drivers/gpu/drm/i915/gt/intel_engine_pm.c | 22 +- + drivers/gpu/drm/i915/gt/intel_engine_stats.h | 60 + + drivers/gpu/drm/i915/gt/intel_engine_types.h | 22 +- + .../gpu/drm/i915/gt/intel_execlists_submission.c | 3896 +++++++++++ + .../gpu/drm/i915/gt/intel_execlists_submission.h | 47 + + drivers/gpu/drm/i915/gt/intel_ggtt.c | 18 +- + drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c | 22 +- + drivers/gpu/drm/i915/gt/intel_gt.c | 4 +- + drivers/gpu/drm/i915/gt/intel_gt_buffer_pool.c | 12 +- + drivers/gpu/drm/i915/gt/intel_gt_buffer_pool.h | 3 +- + .../gpu/drm/i915/gt/intel_gt_buffer_pool_types.h | 4 +- + drivers/gpu/drm/i915/gt/intel_gt_clock_utils.c | 197 +- + drivers/gpu/drm/i915/gt/intel_gt_clock_utils.h | 8 +- + drivers/gpu/drm/i915/gt/intel_gt_irq.c | 1 + + drivers/gpu/drm/i915/gt/intel_gt_pm.c | 49 + + drivers/gpu/drm/i915/gt/intel_gt_pm.h | 2 + + drivers/gpu/drm/i915/gt/intel_gt_requests.c | 7 +- + drivers/gpu/drm/i915/gt/intel_gt_types.h | 25 + + drivers/gpu/drm/i915/gt/intel_gtt.c | 29 + + drivers/gpu/drm/i915/gt/intel_gtt.h | 3 + + drivers/gpu/drm/i915/gt/intel_lrc.c | 6881 ++++---------------- + drivers/gpu/drm/i915/gt/intel_lrc.h | 167 +- + drivers/gpu/drm/i915/gt/intel_lrc_reg.h | 41 + + drivers/gpu/drm/i915/gt/intel_mocs.c | 4 +- + drivers/gpu/drm/i915/gt/intel_ppgtt.c | 2 +- + drivers/gpu/drm/i915/gt/intel_rc6.c | 2 +- + drivers/gpu/drm/i915/{ => gt}/intel_region_lmem.c | 4 +- + drivers/gpu/drm/i915/{ => gt}/intel_region_lmem.h | 2 - + drivers/gpu/drm/i915/gt/intel_renderstate.c | 3 +- + drivers/gpu/drm/i915/gt/intel_reset.c | 101 +- + drivers/gpu/drm/i915/gt/intel_reset.h | 2 + + drivers/gpu/drm/i915/gt/intel_ring.c | 4 +- + drivers/gpu/drm/i915/gt/intel_ring_submission.c | 272 +- + drivers/gpu/drm/i915/gt/intel_rps.c | 61 +- + drivers/gpu/drm/i915/gt/intel_rps_types.h | 2 +- + drivers/gpu/drm/i915/gt/intel_timeline.c | 103 +- + drivers/gpu/drm/i915/gt/intel_timeline.h | 25 +- + drivers/gpu/drm/i915/gt/intel_timeline_types.h | 2 + + drivers/gpu/drm/i915/gt/intel_workarounds.c | 646 +- + drivers/gpu/drm/i915/gt/mock_engine.c | 15 +- + drivers/gpu/drm/i915/gt/selftest_context.c | 2 +- + drivers/gpu/drm/i915/gt/selftest_engine_cs.c | 1 + + .../gpu/drm/i915/gt/selftest_engine_heartbeat.c | 13 +- + drivers/gpu/drm/i915/gt/selftest_engine_pm.c | 203 + + drivers/gpu/drm/i915/gt/selftest_execlists.c | 4741 ++++++++++++++ + drivers/gpu/drm/i915/gt/selftest_gt_pm.c | 8 +- + drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 173 +- + drivers/gpu/drm/i915/gt/selftest_lrc.c | 4771 +------------- + drivers/gpu/drm/i915/gt/selftest_mocs.c | 80 +- + drivers/gpu/drm/i915/gt/selftest_rc6.c | 1 + + drivers/gpu/drm/i915/gt/selftest_reset.c | 28 +- + drivers/gpu/drm/i915/gt/selftest_rps.c | 5 +- + drivers/gpu/drm/i915/gt/selftest_timeline.c | 14 +- + drivers/gpu/drm/i915/gt/selftest_workarounds.c | 196 +- + drivers/gpu/drm/i915/gt/shmem_utils.c | 2 +- + drivers/gpu/drm/i915/gt/uc/intel_guc.c | 16 +- + drivers/gpu/drm/i915/gt/uc/intel_guc.h | 7 - + drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 1 + + drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c | 13 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 457 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_submission.h | 1 + + drivers/gpu/drm/i915/gt/uc/intel_uc.c | 54 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 7 +- + drivers/gpu/drm/i915/gvt/cmd_parser.c | 336 +- + drivers/gpu/drm/i915/gvt/cmd_parser.h | 5 + + drivers/gpu/drm/i915/gvt/execlist.h | 3 - + drivers/gpu/drm/i915/gvt/fb_decoder.h | 6 +- + drivers/gpu/drm/i915/gvt/gtt.h | 11 +- + drivers/gpu/drm/i915/gvt/gvt.h | 41 +- + drivers/gpu/drm/i915/gvt/handlers.c | 22 +- + drivers/gpu/drm/i915/gvt/interrupt.h | 5 +- + drivers/gpu/drm/i915/gvt/mmio.h | 3 + + drivers/gpu/drm/i915/gvt/mmio_context.c | 1 + + drivers/gpu/drm/i915/gvt/mmio_context.h | 12 + + drivers/gpu/drm/i915/gvt/mpt.h | 2 + + drivers/gpu/drm/i915/gvt/reg.h | 2 + + drivers/gpu/drm/i915/gvt/scheduler.c | 24 +- + drivers/gpu/drm/i915/gvt/scheduler.h | 5 + + drivers/gpu/drm/i915/gvt/vgpu.c | 4 +- + drivers/gpu/drm/i915/i915_active.c | 7 +- + drivers/gpu/drm/i915/i915_cmd_parser.c | 3 +- + drivers/gpu/drm/i915/i915_debugfs.c | 763 +-- + drivers/gpu/drm/i915/i915_drv.c | 6 +- + drivers/gpu/drm/i915/i915_drv.h | 92 +- + drivers/gpu/drm/i915/i915_gem.c | 132 +- + drivers/gpu/drm/i915/i915_gem.h | 9 +- + drivers/gpu/drm/i915/i915_gem_evict.c | 13 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 25 +- + drivers/gpu/drm/i915/i915_getparam.c | 2 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 6 +- + drivers/gpu/drm/i915/i915_irq.c | 355 +- + drivers/gpu/drm/i915/i915_mm.c | 2 +- + drivers/gpu/drm/i915/i915_params.h | 1 + + drivers/gpu/drm/i915/i915_pci.c | 7 +- + drivers/gpu/drm/i915/i915_perf.c | 17 +- + drivers/gpu/drm/i915/i915_pmu.c | 95 +- + drivers/gpu/drm/i915/i915_pmu.h | 35 +- + drivers/gpu/drm/i915/i915_reg.h | 10 +- + drivers/gpu/drm/i915/i915_request.c | 178 +- + drivers/gpu/drm/i915/i915_request.h | 10 +- + drivers/gpu/drm/i915/i915_scheduler.c | 32 +- + drivers/gpu/drm/i915/i915_scheduler.h | 7 + + drivers/gpu/drm/i915/i915_scheduler_types.h | 10 + + drivers/gpu/drm/i915/i915_suspend.c | 33 +- + drivers/gpu/drm/i915/i915_sw_fence.c | 25 +- + drivers/gpu/drm/i915/i915_utils.c | 2 +- + drivers/gpu/drm/i915/i915_utils.h | 7 +- + drivers/gpu/drm/i915/i915_vma.h | 15 + + drivers/gpu/drm/i915/i915_vma_types.h | 3 + + drivers/gpu/drm/i915/intel_device_info.c | 159 +- + drivers/gpu/drm/i915/intel_device_info.h | 4 - + drivers/gpu/drm/i915/intel_memory_region.c | 2 +- + drivers/gpu/drm/i915/intel_memory_region.h | 13 +- + drivers/gpu/drm/i915/intel_pm.c | 552 +- + drivers/gpu/drm/i915/intel_sideband.c | 4 +- + drivers/gpu/drm/i915/intel_uncore.c | 4 +- + drivers/gpu/drm/i915/intel_uncore.h | 6 +- + drivers/gpu/drm/i915/selftests/i915_gem_evict.c | 28 +- + drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 1 + + drivers/gpu/drm/i915/selftests/i915_perf.c | 2 +- + drivers/gpu/drm/i915/selftests/i915_request.c | 9 +- + drivers/gpu/drm/i915/selftests/igt_spinner.c | 4 + + .../gpu/drm/i915/selftests/intel_memory_region.c | 110 +- + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 2 - + drivers/gpu/drm/i915/selftests/mock_region.c | 19 +- + drivers/gpu/drm/imx/Kconfig | 3 +- + drivers/gpu/drm/imx/dw_hdmi-imx.c | 95 +- + drivers/gpu/drm/imx/imx-ldb.c | 109 +- + drivers/gpu/drm/imx/imx-tve.c | 109 +- + drivers/gpu/drm/imx/ipuv3-crtc.c | 131 +- + drivers/gpu/drm/imx/ipuv3-plane.c | 69 +- + drivers/gpu/drm/imx/ipuv3-plane.h | 3 - + drivers/gpu/drm/imx/parallel-display.c | 93 +- + drivers/gpu/drm/ingenic/Kconfig | 1 + + drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 60 +- + drivers/gpu/drm/ingenic/ingenic-drm.h | 14 + + drivers/gpu/drm/kmb/kmb_drv.c | 4 +- + drivers/gpu/drm/kmb/kmb_plane.c | 3 + + drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 1 - + drivers/gpu/drm/mediatek/mtk_drm_gem.c | 2 +- + drivers/gpu/drm/mga/mga_ioc32.c | 14 +- + drivers/gpu/drm/mgag200/mgag200_drv.c | 20 +- + drivers/gpu/drm/mgag200/mgag200_i2c.c | 2 +- + drivers/gpu/drm/mgag200/mgag200_mm.c | 10 +- + drivers/gpu/drm/msm/msm_gem.c | 2 +- + drivers/gpu/drm/nouveau/dispnv04/arb.c | 12 +- + drivers/gpu/drm/nouveau/dispnv04/dfp.c | 5 +- + drivers/gpu/drm/nouveau/dispnv04/disp.h | 14 +- + drivers/gpu/drm/nouveau/dispnv04/hw.c | 10 +- + drivers/gpu/drm/nouveau/dispnv50/head.c | 2 - + drivers/gpu/drm/nouveau/nouveau_abi16.c | 7 +- + drivers/gpu/drm/nouveau/nouveau_acpi.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_bios.c | 11 +- + drivers/gpu/drm/nouveau/nouveau_bo.c | 20 +- + drivers/gpu/drm/nouveau/nouveau_connector.c | 10 +- + drivers/gpu/drm/nouveau/nouveau_display.c | 8 +- + drivers/gpu/drm/nouveau/nouveau_drm.c | 5 +- + drivers/gpu/drm/nouveau/nouveau_drv.h | 1 - + drivers/gpu/drm/nouveau/nouveau_fbcon.c | 6 +- + drivers/gpu/drm/nouveau/nouveau_prime.c | 4 +- + drivers/gpu/drm/nouveau/nouveau_sgdma.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_vga.c | 20 +- + drivers/gpu/drm/nouveau/nv17_fence.c | 2 +- + drivers/gpu/drm/nouveau/nv50_fence.c | 2 +- + drivers/gpu/drm/omapdrm/Kconfig | 120 +- + drivers/gpu/drm/omapdrm/Makefile | 19 +- + drivers/gpu/drm/omapdrm/displays/Kconfig | 10 - + drivers/gpu/drm/omapdrm/displays/Makefile | 2 - + drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c | 1385 ---- + drivers/gpu/drm/omapdrm/dss/Kconfig | 135 - + drivers/gpu/drm/omapdrm/dss/Makefile | 20 - + drivers/gpu/drm/omapdrm/dss/base.c | 87 +- + drivers/gpu/drm/omapdrm/dss/dispc.c | 202 +- + drivers/gpu/drm/omapdrm/dss/display.c | 60 - + drivers/gpu/drm/omapdrm/dss/dpi.c | 1 - + drivers/gpu/drm/omapdrm/dss/dsi.c | 1949 +++--- + drivers/gpu/drm/omapdrm/dss/dsi.h | 456 ++ + drivers/gpu/drm/omapdrm/dss/dss.c | 28 +- + drivers/gpu/drm/omapdrm/dss/dss.h | 72 +- + drivers/gpu/drm/omapdrm/dss/hdmi4.c | 1 - + drivers/gpu/drm/omapdrm/dss/hdmi5.c | 1 - + drivers/gpu/drm/omapdrm/dss/omapdss-boot-init.c | 229 - + drivers/gpu/drm/omapdrm/dss/omapdss.h | 347 +- + drivers/gpu/drm/omapdrm/dss/output.c | 57 +- + drivers/gpu/drm/omapdrm/dss/pll.c | 6 + + drivers/gpu/drm/omapdrm/dss/sdi.c | 1 - + drivers/gpu/drm/omapdrm/dss/venc.c | 2 - + drivers/gpu/drm/omapdrm/omap_connector.c | 157 - + drivers/gpu/drm/omapdrm/omap_connector.h | 28 - + drivers/gpu/drm/omapdrm/omap_crtc.c | 153 +- + drivers/gpu/drm/omapdrm/omap_crtc.h | 2 - + drivers/gpu/drm/omapdrm/omap_drv.c | 73 +- + drivers/gpu/drm/omapdrm/omap_drv.h | 3 +- + drivers/gpu/drm/omapdrm/omap_encoder.c | 59 +- + drivers/gpu/drm/omapdrm/omap_gem.c | 3 +- + drivers/gpu/drm/omapdrm/omap_irq.c | 34 +- + drivers/gpu/drm/omapdrm/omap_plane.c | 41 +- + drivers/gpu/drm/omapdrm/tcm-sita.c | 1 - + drivers/gpu/drm/panel/Kconfig | 20 + + drivers/gpu/drm/panel/Makefile | 2 + + drivers/gpu/drm/panel/panel-dsi-cm.c | 665 ++ + drivers/gpu/drm/panel/panel-khadas-ts050.c | 870 +++ + drivers/gpu/drm/panel/panel-mantix-mlaf057we51.c | 39 +- + drivers/gpu/drm/panel/panel-samsung-s6e63m0.c | 59 +- + drivers/gpu/drm/panel/panel-simple.c | 223 +- + drivers/gpu/drm/panel/panel-sitronix-st7703.c | 24 +- + drivers/gpu/drm/panfrost/panfrost_devfreq.c | 1 + + drivers/gpu/drm/pl111/pl111_drv.c | 2 +- + drivers/gpu/drm/qxl/qxl_dev.h | 16 +- + drivers/gpu/drm/qxl/qxl_drv.c | 2 +- + drivers/gpu/drm/qxl/qxl_drv.h | 1 - + drivers/gpu/drm/qxl/qxl_ioctl.c | 3 +- + drivers/gpu/drm/qxl/qxl_irq.c | 3 +- + drivers/gpu/drm/qxl/qxl_kms.c | 1 - + drivers/gpu/drm/qxl/qxl_object.h | 2 +- + drivers/gpu/drm/qxl/qxl_release.c | 2 +- + drivers/gpu/drm/qxl/qxl_ttm.c | 1 - + drivers/gpu/drm/r128/r128_ioc32.c | 14 +- + drivers/gpu/drm/radeon/atombios_encoders.c | 6 +- + drivers/gpu/drm/radeon/r100.c | 27 +- + drivers/gpu/drm/radeon/r600_cs.c | 4 +- + drivers/gpu/drm/radeon/radeon.h | 36 +- + drivers/gpu/drm/radeon/radeon_atombios.c | 89 +- + drivers/gpu/drm/radeon/radeon_bios.c | 6 +- + drivers/gpu/drm/radeon/radeon_combios.c | 55 +- + drivers/gpu/drm/radeon/radeon_cs.c | 6 +- + drivers/gpu/drm/radeon/radeon_device.c | 17 +- + drivers/gpu/drm/radeon/radeon_display.c | 2 +- + drivers/gpu/drm/radeon/radeon_drv.c | 7 +- + drivers/gpu/drm/radeon/radeon_fb.c | 2 +- + drivers/gpu/drm/radeon/radeon_gem.c | 6 +- + drivers/gpu/drm/radeon/radeon_i2c.c | 2 +- + drivers/gpu/drm/radeon/radeon_irq_kms.c | 2 +- + drivers/gpu/drm/radeon/radeon_kms.c | 24 +- + drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 6 +- + drivers/gpu/drm/radeon/radeon_object.c | 13 +- + drivers/gpu/drm/radeon/radeon_object.h | 4 +- + drivers/gpu/drm/radeon/radeon_prime.c | 4 +- + drivers/gpu/drm/radeon/radeon_trace.h | 2 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 15 +- + drivers/gpu/drm/radeon/radeon_uvd.c | 38 +- + drivers/gpu/drm/radeon/rs780_dpm.c | 7 +- + drivers/gpu/drm/rcar-du/rcar_cmm.c | 2 +- + drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 13 +- + drivers/gpu/drm/rcar-du/rcar_du_drv.c | 33 +- + drivers/gpu/drm/rcar-du/rcar_du_drv.h | 16 +- + drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 98 +- + drivers/gpu/drm/rcar-du/rcar_du_encoder.h | 2 - + drivers/gpu/drm/rcar-du/rcar_du_kms.c | 42 +- + drivers/gpu/drm/rcar-du/rcar_du_plane.c | 8 +- + drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 28 +- + drivers/gpu/drm/rcar-du/rcar_du_writeback.c | 2 +- + drivers/gpu/drm/rockchip/Kconfig | 2 +- + drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 2 +- + drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 1 - + drivers/gpu/drm/scheduler/sched_main.c | 123 +- + drivers/gpu/drm/sti/sti_cursor.c | 9 +- + drivers/gpu/drm/sti/sti_gdp.c | 9 +- + drivers/gpu/drm/sti/sti_hqvdp.c | 9 +- + drivers/gpu/drm/stm/ltdc.c | 1 - + drivers/gpu/drm/sun4i/sun4i_tcon.c | 21 +- + drivers/gpu/drm/sun4i/sun4i_tcon.h | 1 + + drivers/gpu/drm/sun4i/sun8i_csc.c | 109 +- + drivers/gpu/drm/sun4i/sun8i_mixer.h | 6 +- + drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 2 + + drivers/gpu/drm/tdfx/tdfx_drv.c | 2 +- + drivers/gpu/drm/tiny/cirrus.c | 1 - + drivers/gpu/drm/ttm/ttm_agp_backend.c | 1 - + drivers/gpu/drm/ttm/ttm_bo.c | 105 +- + drivers/gpu/drm/ttm/ttm_bo_util.c | 16 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 7 +- + drivers/gpu/drm/ttm/ttm_execbuf_util.c | 4 +- + drivers/gpu/drm/ttm/ttm_memory.c | 3 +- + drivers/gpu/drm/ttm/ttm_module.c | 3 +- + {include => drivers/gpu}/drm/ttm/ttm_module.h | 0 + drivers/gpu/drm/ttm/ttm_range_manager.c | 1 - + drivers/gpu/drm/ttm/ttm_tt.c | 15 +- + drivers/gpu/drm/tve200/tve200_display.c | 1 - + drivers/gpu/drm/tve200/tve200_drv.c | 1 - + drivers/gpu/drm/v3d/v3d_drv.c | 4 +- + drivers/gpu/drm/v3d/v3d_irq.c | 7 +- + drivers/gpu/drm/vboxvideo/vbox_drv.c | 11 +- + drivers/gpu/drm/vboxvideo/vbox_irq.c | 4 +- + drivers/gpu/drm/vboxvideo/vbox_main.c | 8 +- + drivers/gpu/drm/vboxvideo/vbox_ttm.c | 7 +- + drivers/gpu/drm/vc4/vc4_bo.c | 111 +- + drivers/gpu/drm/vc4/vc4_crtc.c | 38 +- + drivers/gpu/drm/vc4/vc4_drv.c | 19 +- + drivers/gpu/drm/vc4/vc4_drv.h | 30 +- + drivers/gpu/drm/vc4/vc4_dsi.c | 111 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 165 +- + drivers/gpu/drm/vc4/vc4_hdmi.h | 23 +- + drivers/gpu/drm/vc4/vc4_hdmi_phy.c | 8 +- + drivers/gpu/drm/vc4/vc4_hdmi_regs.h | 9 + + drivers/gpu/drm/vc4/vc4_hvs.c | 18 +- + drivers/gpu/drm/vc4/vc4_kms.c | 248 +- + drivers/gpu/drm/vc4/vc4_plane.c | 7 +- + drivers/gpu/drm/vc4/vc4_txp.c | 11 +- + drivers/gpu/drm/vgem/vgem_drv.c | 3 +- + drivers/gpu/drm/via/via_irq.c | 2 +- + drivers/gpu/drm/virtio/Kconfig | 3 +- + drivers/gpu/drm/virtio/virtgpu_debugfs.c | 24 +- + drivers/gpu/drm/virtio/virtgpu_drv.c | 1 - + drivers/gpu/drm/virtio/virtgpu_drv.h | 1 + + drivers/gpu/drm/virtio/virtgpu_fence.c | 81 +- + drivers/gpu/drm/virtio/virtgpu_gem.c | 8 +- + drivers/gpu/drm/virtio/virtgpu_vram.c | 3 + + drivers/gpu/drm/vkms/vkms_drv.c | 54 +- + drivers/gpu/drm/vkms/vkms_drv.h | 12 +- + drivers/gpu/drm/vkms/vkms_output.c | 13 +- + drivers/gpu/drm/vmwgfx/Makefile | 6 +- + drivers/gpu/drm/vmwgfx/ttm_object.c | 1 - + drivers/gpu/drm/vmwgfx/vmwgfx_binding.c | 52 +- + drivers/gpu/drm/vmwgfx/vmwgfx_blit.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 6 +- + .../gpu/drm/vmwgfx/{vmwgfx_fifo.c => vmwgfx_cmd.c} | 126 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c | 22 +- + drivers/gpu/drm/vmwgfx/vmwgfx_context.c | 40 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c | 14 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 236 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 94 +- + drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 26 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 12 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 28 +- + drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c | 8 +- + drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | 15 +- + drivers/gpu/drm/vmwgfx/vmwgfx_irq.c | 10 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 76 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 9 +- + drivers/gpu/drm/vmwgfx/vmwgfx_marker.c | 155 - + drivers/gpu/drm/vmwgfx/vmwgfx_mob.c | 16 +- + drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c | 8 +- + drivers/gpu/drm/vmwgfx/vmwgfx_page_dirty.c | 8 +- + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 28 +- + drivers/gpu/drm/vmwgfx/vmwgfx_shader.c | 27 +- + drivers/gpu/drm/vmwgfx/vmwgfx_so.c | 8 +- + drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 36 +- + drivers/gpu/drm/vmwgfx/vmwgfx_streamoutput.c | 8 +- + drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 47 +- + drivers/gpu/drm/vmwgfx/vmwgfx_thp.c | 1 - + drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 10 +- + drivers/gpu/drm/xen/xen_drm_front_gem.c | 4 +- + drivers/gpu/drm/zte/zx_plane.c | 7 +- + drivers/gpu/ipu-v3/ipu-di.c | 4 - + drivers/pci/pci.c | 12 +- + drivers/pci/pci.h | 1 - + drivers/video/fbdev/Kconfig | 2 +- + drivers/video/fbdev/aty/atyfb_base.c | 11 +- + drivers/video/fbdev/aty/mach64_ct.c | 15 +- + drivers/video/fbdev/aty/radeon_monitor.c | 4 +- + drivers/video/fbdev/bw2.c | 2 +- + drivers/video/fbdev/cg3.c | 2 +- + drivers/video/fbdev/cg6.c | 2 +- + drivers/video/fbdev/cirrusfb.c | 20 +- + drivers/video/fbdev/controlfb.c | 4 +- + drivers/video/fbdev/core/fb_notify.c | 7 + + drivers/video/fbdev/core/fbcon.c | 25 +- + drivers/video/fbdev/core/fbmon.c | 2 +- + drivers/video/fbdev/efifb.c | 3 +- + drivers/video/fbdev/ffb.c | 2 +- + drivers/video/fbdev/gbefb.c | 4 +- + drivers/video/fbdev/goldfishfb.c | 2 + + drivers/video/fbdev/hgafb.c | 10 +- + drivers/video/fbdev/leo.c | 2 +- + drivers/video/fbdev/mmp/hw/mmp_spi.c | 2 +- + drivers/video/fbdev/mx3fb.c | 13 +- + drivers/video/fbdev/neofb.c | 4 - + drivers/video/fbdev/nvidia/nv_setup.c | 7 +- + drivers/video/fbdev/omap2/omapfb/displays/Kconfig | 1 + + .../video/fbdev/omap2/omapfb/dss/dispc-compat.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/dsi.c | 14 +- + drivers/video/fbdev/omap2/omapfb/dss/hdmi4_core.c | 4 +- + drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.c | 4 +- + drivers/video/fbdev/p9100.c | 2 +- + drivers/video/fbdev/pm2fb.c | 8 +- + drivers/video/fbdev/riva/fbdev.c | 9 +- + drivers/video/fbdev/riva/riva_hw.c | 28 +- + drivers/video/fbdev/s1d13xxxfb.c | 3 +- + drivers/video/fbdev/s3c-fb.c | 11 +- + drivers/video/fbdev/sis/init.c | 33 +- + drivers/video/fbdev/sis/oem310.h | 2 + + drivers/video/fbdev/sis/sis.h | 1 - + drivers/video/fbdev/sis/sis_main.c | 9 +- + drivers/video/fbdev/sstfb.c | 2 +- + drivers/video/fbdev/tcx.c | 2 +- + drivers/video/fbdev/tdfxfb.c | 4 +- + drivers/video/fbdev/tgafb.c | 7 +- + drivers/video/fbdev/udlfb.c | 1 + + drivers/video/fbdev/uvesafb.c | 6 +- + drivers/video/fbdev/via/lcd.c | 4 +- + drivers/video/fbdev/wmt_ge_rops.c | 1 + + drivers/video/of_display_timing.c | 1 + + drivers/video/of_videomode.c | 6 +- + include/drm/drm_agpsupport.h | 18 - + include/drm/drm_atomic.h | 20 + + include/drm/drm_atomic_helper.h | 4 - + include/drm/drm_connector.h | 49 + + include/drm/drm_crtc.h | 33 + + include/drm/drm_device.h | 23 +- + include/drm/drm_dp_helper.h | 218 + + include/drm/drm_drv.h | 2 - + include/drm/drm_dsc.h | 1 + + include/drm/drm_edid.h | 30 + + include/drm/drm_encoder.h | 32 +- + include/drm/drm_gem.h | 3 - + include/drm/drm_gem_cma_helper.h | 14 +- + include/drm/drm_irq.h | 2 +- + include/drm/drm_legacy.h | 10 +- + include/drm/drm_managed.h | 2 - + include/drm/drm_mipi_dbi.h | 2 +- + include/drm/drm_modes.h | 10 + + include/drm/drm_modeset_helper_vtables.h | 29 +- + include/drm/drm_plane.h | 42 + + include/drm/drm_prime.h | 7 +- + include/drm/drm_property.h | 2 +- + include/drm/drm_rect.h | 13 + + include/drm/drm_simple_kms_helper.h | 24 + + include/drm/gpu_scheduler.h | 14 +- + include/drm/ttm/ttm_bo_api.h | 13 +- + include/drm/ttm/ttm_bo_driver.h | 6 +- + include/drm/ttm/ttm_resource.h | 5 +- + include/drm/ttm/ttm_tt.h | 2 - + include/linux/dma-buf.h | 45 +- + include/linux/pci.h | 9 + + include/linux/vgaarb.h | 6 +- + include/uapi/drm/drm.h | 97 +- + include/uapi/drm/drm_fourcc.h | 4 +- + include/uapi/drm/drm_mode.h | 13 +- + include/uapi/drm/i915_drm.h | 3 +- + include/video/sstfb.h | 4 +- + 879 files changed, 35218 insertions(+), 26703 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/connector/dp-connector.yaml + delete mode 100644 Documentation/devicetree/bindings/display/ste,mcde.txt + create mode 100644 Documentation/devicetree/bindings/display/ste,mcde.yaml + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_securedisplay.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_securedisplay.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/hdp_v4_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/hdp_v4_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/hdp_v5_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/hdp_v5_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/ta_secureDisplay_if.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/vega20_ih.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/vega20_ih.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/oss/osssys_4_2_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/oss/osssys_4_2_0_sh_mask.h + delete mode 100644 drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c + create mode 100644 drivers/gpu/drm/i915/display/i9xx_plane.c + create mode 100644 drivers/gpu/drm/i915/display/i9xx_plane.h + create mode 100644 drivers/gpu/drm/i915/display/intel_cursor.c + create mode 100644 drivers/gpu/drm/i915/display/intel_cursor.h + create mode 100644 drivers/gpu/drm/i915/dma_resv_utils.c + create mode 100644 drivers/gpu/drm/i915/dma_resv_utils.h + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_create.c + create mode 100644 drivers/gpu/drm/i915/gt/gen8_engine_cs.c + create mode 100644 drivers/gpu/drm/i915/gt/gen8_engine_cs.h + create mode 100644 drivers/gpu/drm/i915/gt/intel_engine_stats.h + create mode 100644 drivers/gpu/drm/i915/gt/intel_execlists_submission.c + create mode 100644 drivers/gpu/drm/i915/gt/intel_execlists_submission.h + rename drivers/gpu/drm/i915/{ => gt}/intel_region_lmem.c (96%) + rename drivers/gpu/drm/i915/{ => gt}/intel_region_lmem.h (80%) + create mode 100644 drivers/gpu/drm/i915/gt/selftest_execlists.c + delete mode 100644 drivers/gpu/drm/omapdrm/displays/Kconfig + delete mode 100644 drivers/gpu/drm/omapdrm/displays/Makefile + delete mode 100644 drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c + delete mode 100644 drivers/gpu/drm/omapdrm/dss/Kconfig + delete mode 100644 drivers/gpu/drm/omapdrm/dss/Makefile + delete mode 100644 drivers/gpu/drm/omapdrm/dss/display.c + create mode 100644 drivers/gpu/drm/omapdrm/dss/dsi.h + delete mode 100644 drivers/gpu/drm/omapdrm/dss/omapdss-boot-init.c + delete mode 100644 drivers/gpu/drm/omapdrm/omap_connector.c + delete mode 100644 drivers/gpu/drm/omapdrm/omap_connector.h + create mode 100644 drivers/gpu/drm/panel/panel-dsi-cm.c + create mode 100644 drivers/gpu/drm/panel/panel-khadas-ts050.c + rename {include => drivers/gpu}/drm/ttm/ttm_module.h (100%) + rename drivers/gpu/drm/vmwgfx/{vmwgfx_fifo.c => vmwgfx_cmd.c} (82%) + delete mode 100644 drivers/gpu/drm/vmwgfx/vmwgfx_marker.c +Merging amdgpu/drm-next (58f250ec1c77 ALSA: hda/hdmi - enable runtime pm for CI AMD display audio) +$ git merge amdgpu/drm-next +Auto-merging sound/pci/hda/hda_intel.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 1 - + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 23 ++- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c | 84 +++++++--- + drivers/gpu/drm/amd/amdkfd/Kconfig | 2 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 + + .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 24 +-- + drivers/gpu/drm/amd/display/dc/core/dc.c | 12 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 28 +++- + drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 6 + + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 7 +- + drivers/gpu/drm/amd/display/dc/dc.h | 8 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 18 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 9 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 7 +- + .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 182 ++++++++++++++++----- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.h | 3 +- + .../drm/amd/display/dc/dcn302/dcn302_resource.c | 5 +- + .../display/dc/dml/dcn20/display_mode_vba_20v2.c | 117 ++++++++----- + .../display/dc/dml/dcn30/display_rq_dlg_calc_30.c | 32 ++-- + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 3 +- + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 9 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.c | 11 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 9 +- + drivers/gpu/drm/amd/include/amd_pcie.h | 2 + + drivers/gpu/drm/amd/pm/inc/smu_types.h | 2 - + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 2 - + drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c | 4 +- + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 11 +- + drivers/usb/typec/ucsi/ucsi.c | 2 +- + 32 files changed, 468 insertions(+), 180 deletions(-) +Merging drm-intel/for-linux-next (fe7d52bccab6 drm/i915/dp: Don't use DPCD backlights that need PWM enable/disable) +$ git merge drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/display/intel_hdcp.c +Auto-merging drivers/gpu/drm/i915/display/intel_dp.c +Auto-merging drivers/gpu/drm/i915/display/intel_display.c +Auto-merging drivers/gpu/drm/i915/Makefile +Auto-merging drivers/gpu/drm/drm_dp_mst_topology.c +Auto-merging drivers/gpu/drm/drm_dp_helper.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/drm_dp_helper.c | 83 +- + drivers/gpu/drm/drm_dp_mst_topology.c | 3 +- + drivers/gpu/drm/i915/Makefile | 5 + + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 2 +- + drivers/gpu/drm/i915/display/intel_color.c | 16 + + drivers/gpu/drm/i915/display/intel_crtc.c | 325 +++ + drivers/gpu/drm/i915/display/intel_crtc.h | 22 + + drivers/gpu/drm/i915/display/intel_ddi.c | 57 +- + drivers/gpu/drm/i915/display/intel_ddi.h | 6 +- + drivers/gpu/drm/i915/display/intel_display.c | 2576 +------------------- + drivers/gpu/drm/i915/display/intel_display.h | 6 +- + .../gpu/drm/i915/display/intel_display_debugfs.c | 8 +- + drivers/gpu/drm/i915/display/intel_display_power.c | 6 +- + drivers/gpu/drm/i915/display/intel_display_types.h | 127 +- + drivers/gpu/drm/i915/display/intel_dp.c | 2301 +---------------- + drivers/gpu/drm/i915/display/intel_dp.h | 10 +- + drivers/gpu/drm/i915/display/intel_dp_aux.c | 692 ++++++ + drivers/gpu/drm/i915/display/intel_dp_aux.h | 18 + + .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 297 ++- + drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 186 +- + .../gpu/drm/i915/display/intel_dp_link_training.c | 36 +- + .../gpu/drm/i915/display/intel_dp_link_training.h | 3 + + drivers/gpu/drm/i915/display/intel_dp_mst.c | 12 +- + drivers/gpu/drm/i915/display/intel_dpll.c | 1363 +++++++++++ + drivers/gpu/drm/i915/display/intel_dpll.h | 23 + + .../gpu/drm/i915/display/intel_dsi_dcs_backlight.c | 2 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 2 +- + drivers/gpu/drm/i915/display/intel_fdi.c | 683 ++++++ + drivers/gpu/drm/i915/display/intel_fdi.h | 22 + + drivers/gpu/drm/i915/display/intel_hdcp.c | 294 ++- + drivers/gpu/drm/i915/display/intel_hdcp.h | 8 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 19 +- + drivers/gpu/drm/i915/display/intel_panel.c | 396 +-- + drivers/gpu/drm/i915/display/intel_panel.h | 4 + + drivers/gpu/drm/i915/display/intel_pps.c | 1406 +++++++++++ + drivers/gpu/drm/i915/display/intel_pps.h | 52 + + drivers/gpu/drm/i915/display/intel_psr.c | 5 +- + drivers/gpu/drm/i915/display/intel_sprite.c | 36 +- + drivers/gpu/drm/i915/i915_drv.c | 1 + + drivers/gpu/drm/i915/i915_drv.h | 7 +- + drivers/gpu/drm/i915/i915_irq.c | 28 +- + drivers/gpu/drm/i915/i915_irq.h | 3 - + drivers/gpu/drm/i915/i915_params.c | 2 +- + drivers/gpu/drm/i915/i915_reg.h | 40 + + drivers/gpu/drm/i915/intel_pch.c | 39 +- + drivers/gpu/drm/i915/intel_pm.c | 12 +- + drivers/gpu/drm/msm/dp/dp_ctrl.c | 6 +- + drivers/misc/mei/hdcp/mei_hdcp.c | 3 +- + include/drm/drm_dp_helper.h | 21 +- + include/drm/drm_hdcp.h | 8 +- + 50 files changed, 6063 insertions(+), 5219 deletions(-) + create mode 100644 drivers/gpu/drm/i915/display/intel_crtc.c + create mode 100644 drivers/gpu/drm/i915/display/intel_crtc.h + create mode 100644 drivers/gpu/drm/i915/display/intel_dp_aux.c + create mode 100644 drivers/gpu/drm/i915/display/intel_dp_aux.h + create mode 100644 drivers/gpu/drm/i915/display/intel_dpll.c + create mode 100644 drivers/gpu/drm/i915/display/intel_dpll.h + create mode 100644 drivers/gpu/drm/i915/display/intel_fdi.c + create mode 100644 drivers/gpu/drm/i915/display/intel_fdi.h + create mode 100644 drivers/gpu/drm/i915/display/intel_pps.c + create mode 100644 drivers/gpu/drm/i915/display/intel_pps.h +Merging drm-tegra/drm/tegra/for-next (dcdfe2712b68 drm/tegra: Fix reference leak when pm_runtime_get_sync() fails) +$ git merge drm-tegra/drm/tegra/for-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/tegra/dc.c | 2 +- + drivers/gpu/drm/tegra/drm.c | 2 ++ + drivers/gpu/drm/tegra/dsi.c | 2 +- + drivers/gpu/drm/tegra/falcon.c | 9 +++++---- + drivers/gpu/drm/tegra/gr2d.c | 9 +++++++-- + drivers/gpu/drm/tegra/hdmi.c | 2 +- + drivers/gpu/drm/tegra/hub.c | 2 +- + drivers/gpu/drm/tegra/sor.c | 2 +- + drivers/gpu/drm/tegra/vic.c | 35 ++++++++++++++++++++++++++--------- + 9 files changed, 45 insertions(+), 20 deletions(-) +Merging drm-misc/for-linux-next (6a56d09bdab7 drm: Update todo.rst) +$ git merge drm-misc/for-linux-next +Auto-merging drivers/gpu/drm/ttm/ttm_pool.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/ttm/ttm_pool.c +Auto-merging drivers/gpu/drm/radeon/radeon_ttm.c +Auto-merging drivers/gpu/drm/drm_syncobj.c +Auto-merging drivers/gpu/drm/drm_gem_vram_helper.c +Auto-merging drivers/gpu/drm/drm_atomic_helper.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu.h +Auto-merging Documentation/gpu/todo.rst +Resolved 'drivers/gpu/drm/ttm/ttm_pool.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 96f240a4df13] Merge remote-tracking branch 'drm-misc/for-linux-next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/display/connector/dp-connector.yaml | 1 - + Documentation/gpu/todo.rst | 28 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_fence.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 26 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 8 +- + drivers/gpu/drm/drm_atomic.c | 39 +++ + drivers/gpu/drm/drm_atomic_helper.c | 61 +--- + drivers/gpu/drm/drm_gem_vram_helper.c | 14 +- + drivers/gpu/drm/drm_panel_orientation_quirks.c | 14 + + drivers/gpu/drm/drm_syncobj.c | 12 + + drivers/gpu/drm/nouveau/nouveau_bo.c | 20 +- + drivers/gpu/drm/nouveau/nouveau_bo.h | 2 +- + drivers/gpu/drm/nouveau/nouveau_drv.h | 2 +- + drivers/gpu/drm/nouveau/nouveau_sgdma.c | 6 +- + drivers/gpu/drm/nouveau/nouveau_ttm.c | 10 +- + drivers/gpu/drm/nouveau/nouveau_ttm.h | 8 +- + drivers/gpu/drm/qxl/qxl_drv.h | 4 +- + drivers/gpu/drm/qxl/qxl_release.c | 6 +- + drivers/gpu/drm/qxl/qxl_ttm.c | 19 +- + drivers/gpu/drm/radeon/radeon.h | 6 +- + drivers/gpu/drm/radeon/radeon_object.c | 2 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 38 ++- + drivers/gpu/drm/ttm/Makefile | 2 +- + drivers/gpu/drm/ttm/ttm_agp_backend.c | 2 +- + drivers/gpu/drm/ttm/ttm_bo.c | 298 ++++--------------- + drivers/gpu/drm/ttm/ttm_bo_util.c | 24 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 24 +- + drivers/gpu/drm/ttm/ttm_device.c | 195 ++++++++++++ + drivers/gpu/drm/ttm/ttm_execbuf_util.c | 8 +- + drivers/gpu/drm/ttm/ttm_module.c | 4 + + drivers/gpu/drm/ttm/ttm_module.h | 6 +- + drivers/gpu/drm/ttm/ttm_pool.c | 144 ++++++--- + drivers/gpu/drm/ttm/ttm_range_manager.c | 4 +- + drivers/gpu/drm/ttm/ttm_resource.c | 4 +- + drivers/gpu/drm/ttm/ttm_tt.c | 26 +- + drivers/gpu/drm/vc4/vc4_kms.c | 17 +- + drivers/gpu/drm/vmwgfx/ttm_object.c | 25 +- + drivers/gpu/drm/vmwgfx/vmwgfx_binding.c | 9 +- + drivers/gpu/drm/vmwgfx/vmwgfx_blit.c | 5 +- + drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cmd.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c | 14 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c | 8 +- + drivers/gpu/drm/vmwgfx/vmwgfx_context.c | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c | 3 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 25 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 20 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 18 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 16 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_mob.c | 4 + + drivers/gpu/drm/vmwgfx/vmwgfx_msg.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c | 16 +- + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 12 +- + drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 10 +- + drivers/gpu/drm/vmwgfx/vmwgfx_shader.c | 10 +- + drivers/gpu/drm/vmwgfx/vmwgfx_so.c | 1 + + drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 9 +- + drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 17 +- + drivers/gpu/drm/vmwgfx/vmwgfx_thp.c | 1 + + drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 16 +- + drivers/gpu/drm/vmwgfx/vmwgfx_validation.c | 5 +- + drivers/video/fbdev/simplefb.c | 5 +- + include/drm/drm_atomic.h | 4 + + include/drm/drm_gem_vram_helper.h | 6 +- + include/drm/ttm/ttm_bo_api.h | 35 +-- + include/drm/ttm/ttm_bo_driver.h | 328 +-------------------- + include/drm/ttm/ttm_device.h | 319 ++++++++++++++++++++ + include/drm/ttm/ttm_resource.h | 4 +- + include/drm/ttm/ttm_tt.h | 10 +- + include/linux/lockdep.h | 5 + + include/linux/platform_data/simplefb.h | 1 + + 78 files changed, 1104 insertions(+), 985 deletions(-) + create mode 100644 drivers/gpu/drm/ttm/ttm_device.c + create mode 100644 include/drm/ttm/ttm_device.h +Merging drm-msm/msm-next (00fd44a1a470 drm/msm: Only enable A6xx LLCC code on A6xx) +$ git merge drm-msm/msm-next +Already up to date. +Merging imx-drm/imx-drm/next (82581fcf070b drm/modes: add non-OF stub for of_get_drm_display_mode) +$ git merge imx-drm/imx-drm/next +Already up to date. +Merging etnaviv/etnaviv/next (4612bad5701e drm/etnaviv: Add lockdep annotations for context lock) +$ git merge etnaviv/etnaviv/next +Already up to date. +Merging regmap/for-next (aa3233086b48 Merge remote-tracking branch 'regmap/for-5.12' into regmap-next) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + drivers/base/regmap/regcache.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging sound/for-next (85db1cfb13e3 ALSA: usb-audio: Fix "RANGE setting not yet supported" errors) +$ git merge sound/for-next +Auto-merging sound/pci/hda/hda_codec.c +Merge made by the 'recursive' strategy. + sound/aoa/codecs/onyx.c | 2 +- + sound/aoa/codecs/tas.c | 2 +- + sound/aoa/codecs/toonie.c | 2 +- + sound/aoa/core/alsa.c | 8 ++-- + sound/aoa/fabrics/layout.c | 6 +-- + sound/aoa/soundbus/sysfs.c | 2 +- + sound/arm/aaci.c | 6 +-- + sound/arm/pxa2xx-ac97.c | 2 +- + sound/core/compress_offload.c | 2 +- + sound/core/control.c | 20 +++++----- + sound/core/ctljack.c | 2 +- + sound/core/hwdep.c | 6 +-- + sound/core/init.c | 4 +- + sound/core/oss/mixer_oss.c | 14 +++---- + sound/core/oss/rate.c | 4 +- + sound/core/pcm.c | 2 +- + sound/core/pcm_native.c | 6 +-- + sound/core/rawmidi.c | 2 +- + sound/core/seq/oss/seq_oss_midi.c | 4 +- + sound/core/seq/oss/seq_oss_synth.c | 6 +-- + sound/core/seq/seq_clientmgr.c | 2 +- + sound/core/seq/seq_memory.c | 2 +- + sound/core/seq/seq_ports.c | 6 +-- + sound/core/timer.c | 10 ++--- + sound/core/timer_compat.c | 4 +- + sound/drivers/aloop.c | 2 +- + sound/drivers/dummy.c | 2 +- + sound/drivers/opl3/opl3_oss.c | 2 +- + sound/drivers/opl3/opl3_synth.c | 2 +- + sound/drivers/vx/vx_pcm.c | 3 +- + sound/firewire/bebob/bebob_hwdep.c | 2 +- + sound/firewire/dice/Makefile | 3 +- + sound/firewire/dice/dice-harman.c | 26 +++++++++++++ + sound/firewire/dice/dice-hwdep.c | 2 +- + sound/firewire/dice/dice.c | 12 ++++++ + sound/firewire/dice/dice.h | 1 + + sound/firewire/digi00x/digi00x-hwdep.c | 2 +- + sound/firewire/fireface/ff-hwdep.c | 2 +- + sound/firewire/fireworks/fireworks_hwdep.c | 2 +- + sound/firewire/motu/motu-hwdep.c | 2 +- + sound/firewire/oxfw/oxfw-hwdep.c | 2 +- + sound/firewire/tascam/tascam-hwdep.c | 2 +- + sound/hda/hdac_stream.c | 5 +-- + sound/i2c/i2c.c | 4 +- + sound/isa/ad1848/ad1848.c | 4 +- + sound/isa/cs423x/cs4231.c | 4 +- + sound/isa/cs423x/cs4236.c | 4 +- + sound/isa/es1688/es1688.c | 4 +- + sound/isa/sb/sb16_csp.c | 2 +- + sound/isa/sb/sb_mixer.c | 2 +- + sound/oss/dmasound/dmasound_core.c | 4 +- + sound/pci/ad1889.c | 3 +- + sound/pci/ali5451/ali5451.c | 3 +- + sound/pci/als300.c | 3 +- + sound/pci/als4000.c | 3 +- + sound/pci/asihpi/hpidebug.c | 2 +- + sound/pci/au88x0/au88x0.c | 3 +- + sound/pci/aw2/aw2-alsa.c | 3 +- + sound/pci/azt3328.c | 3 +- + sound/pci/bt87x.c | 3 +- + sound/pci/ca0106/ca0106_main.c | 3 +- + sound/pci/cs46xx/cs46xx_lib.c | 2 +- + sound/pci/cs5535audio/cs5535audio.c | 3 +- + sound/pci/cs5535audio/cs5535audio_olpc.c | 4 +- + sound/pci/ctxfi/cthw20k1.c | 8 +--- + sound/pci/ctxfi/cthw20k2.c | 8 +--- + sound/pci/ctxfi/ctpcm.c | 2 +- + sound/pci/ctxfi/ctresource.c | 2 +- + sound/pci/emu10k1/emu10k1.c | 4 +- + sound/pci/emu10k1/emu10k1_main.c | 2 +- + sound/pci/emu10k1/emufx.c | 6 +-- + sound/pci/emu10k1/memory.c | 2 +- + sound/pci/ens1370.c | 4 +- + sound/pci/es1938.c | 3 +- + sound/pci/es1968.c | 5 +-- + sound/pci/fm801.c | 2 +- + sound/pci/hda/hda_auto_parser.c | 2 +- + sound/pci/hda/hda_codec.c | 2 +- + sound/pci/hda/hda_controller.c | 2 +- + sound/pci/hda/hda_eld.c | 2 +- + sound/pci/hda/hda_generic.c | 2 +- + sound/pci/hda/hda_intel.c | 10 ++--- + sound/pci/hda/hda_jack.c | 2 +- + sound/pci/ice1712/ice1712.c | 3 +- + sound/pci/ice1712/juli.c | 2 +- + sound/pci/ice1712/psc724.c | 4 +- + sound/pci/ice1712/quartet.c | 2 +- + sound/pci/ice1712/wm8776.c | 2 +- + sound/pci/lola/lola.c | 2 +- + sound/pci/lola/lola_clock.c | 2 +- + sound/pci/lola/lola_pcm.c | 2 +- + sound/pci/maestro3.c | 5 +-- + sound/pci/rme9652/hdspm.c | 2 +- + sound/pci/sis7019.c | 2 +- + sound/pci/sonicvibes.c | 5 +-- + sound/pci/trident/trident_main.c | 7 ++-- + sound/ppc/keywest.c | 2 +- + sound/soc/qcom/qdsp6/q6afe.c | 2 +- + sound/soc/sh/rcar/core.c | 2 +- + sound/usb/bcd2000/bcd2000.c | 2 +- + sound/usb/caiaq/audio.c | 2 +- + sound/usb/caiaq/device.c | 6 +-- + sound/usb/caiaq/midi.c | 2 +- + sound/usb/card.c | 15 ++++---- + sound/usb/clock.c | 6 +++ + sound/usb/hiface/chip.c | 6 +-- + sound/usb/hiface/pcm.c | 2 +- + sound/usb/implicit.c | 3 +- + sound/usb/mixer.c | 30 +++++++++------ + sound/usb/mixer_quirks.c | 2 +- + sound/usb/mixer_scarlett.c | 2 +- + sound/usb/mixer_scarlett_gen2.c | 2 +- + sound/usb/mixer_us16x08.c | 2 +- + sound/usb/quirks-table.h | 60 ++++++++++++++++++++++++++++++ + sound/x86/intel_hdmi_audio.c | 5 +-- + sound/xen/xen_snd_front_cfg.c | 2 +- + 116 files changed, 307 insertions(+), 224 deletions(-) + create mode 100644 sound/firewire/dice/dice-harman.c +Merging sound-asoc/for-next (e3dba4b369a9 Merge remote-tracking branch 'asoc/for-5.12' into asoc-next) +$ git merge sound-asoc/for-next +Removing sound/soc/zte/zx-tdm.c +Removing sound/soc/zte/zx-spdif.c +Removing sound/soc/zte/zx-i2s.c +Removing sound/soc/zte/Makefile +Removing sound/soc/zte/Kconfig +Removing sound/soc/txx9/txx9aclc.h +Removing sound/soc/txx9/txx9aclc.c +Removing sound/soc/txx9/txx9aclc-generic.c +Removing sound/soc/txx9/txx9aclc-ac97.c +Removing sound/soc/txx9/Makefile +Removing sound/soc/txx9/Kconfig +Removing sound/soc/sirf/sirf-usp.h +Removing sound/soc/sirf/sirf-usp.c +Removing sound/soc/sirf/sirf-audio.c +Removing sound/soc/sirf/sirf-audio-port.c +Removing sound/soc/sirf/Makefile +Removing sound/soc/sirf/Kconfig +Auto-merging sound/soc/sh/rcar/core.c +Removing sound/soc/codecs/zx_aud96p22.c +Removing sound/soc/codecs/sirf-audio-codec.c +Removing Documentation/devicetree/bindings/sound/zte,zx-spdif.txt +Removing Documentation/devicetree/bindings/sound/zte,zx-i2s.txt +Removing Documentation/devicetree/bindings/sound/zte,zx-aud96p22.txt +Removing Documentation/devicetree/bindings/sound/zte,tdm.txt +Removing Documentation/devicetree/bindings/sound/sirf-usp.txt +Removing Documentation/devicetree/bindings/sound/sirf-audio-codec.txt +Merge made by the 'recursive' strategy. + .../bindings/sound/audio-graph-port.yaml | 3 - + .../bindings/sound/intel,keembay-i2s.yaml | 12 + + .../sound/mt8192-mt6359-rt1015-rt5682.yaml | 5 + + .../sound/nvidia,tegra-audio-graph-card.yaml | 187 +++++ + .../bindings/sound/nvidia,tegra186-dspk.yaml | 18 +- + .../bindings/sound/nvidia,tegra210-admaif.yaml | 13 +- + .../bindings/sound/nvidia,tegra210-ahub.yaml | 13 +- + .../bindings/sound/nvidia,tegra210-dmic.yaml | 18 +- + .../bindings/sound/nvidia,tegra210-i2s.yaml | 18 +- + .../devicetree/bindings/sound/sirf-audio-codec.txt | 17 - + .../devicetree/bindings/sound/sirf-usp.txt | 27 - + Documentation/devicetree/bindings/sound/wm8962.txt | 4 + + .../devicetree/bindings/sound/zte,tdm.txt | 30 - + .../devicetree/bindings/sound/zte,zx-aud96p22.txt | 24 - + .../devicetree/bindings/sound/zte,zx-i2s.txt | 45 -- + .../devicetree/bindings/sound/zte,zx-spdif.txt | 27 - + include/linux/platform_data/cros_ec_commands.h | 1 + + include/sound/rt5645.h | 2 + + include/sound/soc-dai.h | 4 +- + include/sound/soc.h | 4 +- + sound/soc/Kconfig | 20 +- + sound/soc/Makefile | 8 +- + sound/soc/adi/axi-i2s.c | 2 +- + sound/soc/amd/acp3x-rt5682-max9836.c | 4 +- + sound/soc/atmel/atmel-i2s.c | 2 +- + sound/soc/atmel/atmel-pcm-pdc.c | 78 +- + sound/soc/atmel/mchp-i2s-mcc.c | 4 +- + sound/soc/au1x/i2sc.c | 2 +- + sound/soc/bcm/bcm2835-i2s.c | 4 +- + sound/soc/bcm/bcm63xx-i2s-whistler.c | 2 +- + sound/soc/bcm/cygnus-pcm.c | 107 +-- + sound/soc/cirrus/ep93xx-i2s.c | 2 +- + sound/soc/codecs/Makefile | 4 - + sound/soc/codecs/ab8500-codec.c | 4 +- + sound/soc/codecs/adau1372.c | 2 +- + sound/soc/codecs/adau1373.c | 6 +- + sound/soc/codecs/adau1701.c | 2 +- + sound/soc/codecs/adau17x1.c | 3 +- + sound/soc/codecs/ak4554.c | 2 +- + sound/soc/codecs/ak4613.c | 2 +- + sound/soc/codecs/ak4641.c | 4 +- + sound/soc/codecs/ak4642.c | 2 +- + sound/soc/codecs/alc5632.c | 2 +- + sound/soc/codecs/cpcap.c | 127 +++- + sound/soc/codecs/cros_ec_codec.c | 12 + + sound/soc/codecs/cs35l32.c | 2 +- + sound/soc/codecs/cs35l33.c | 2 +- + sound/soc/codecs/cs35l34.c | 2 +- + sound/soc/codecs/cs35l35.c | 2 +- + sound/soc/codecs/cs35l36.c | 2 +- + sound/soc/codecs/cs4234.c | 2 +- + sound/soc/codecs/cs4271.c | 2 +- + sound/soc/codecs/cs42l56.c | 3 +- + sound/soc/codecs/cs42l73.c | 6 +- + sound/soc/codecs/cs43130.c | 6 +- + sound/soc/codecs/cs4341.c | 2 +- + sound/soc/codecs/cs4349.c | 2 +- + sound/soc/codecs/cs47l15.c | 12 +- + sound/soc/codecs/cs47l24.c | 12 +- + sound/soc/codecs/cs47l35.c | 12 +- + sound/soc/codecs/cs47l85.c | 16 +- + sound/soc/codecs/cs47l90.c | 16 +- + sound/soc/codecs/cs47l92.c | 12 +- + sound/soc/codecs/cs53l30.c | 2 +- + sound/soc/codecs/cx2072x.c | 2 +- + sound/soc/codecs/da7210.c | 2 +- + sound/soc/codecs/da7213.c | 2 +- + sound/soc/codecs/da7218.c | 4 +- + sound/soc/codecs/da7219.c | 4 +- + sound/soc/codecs/da9055.c | 2 +- + sound/soc/codecs/es8316.c | 5 +- + sound/soc/codecs/es8328.c | 5 +- + sound/soc/codecs/inno_rk3036.c | 2 +- + sound/soc/codecs/jz4740.c | 2 +- + sound/soc/codecs/lm49453.c | 2 +- + sound/soc/codecs/lochnagar-sc.c | 12 +- + sound/soc/codecs/max98373-sdw.c | 4 +- + sound/soc/codecs/max9860.c | 2 +- + sound/soc/codecs/max9867.c | 2 +- + sound/soc/codecs/mc13783.c | 2 +- + sound/soc/codecs/ml26124.c | 2 +- + sound/soc/codecs/mt6660.c | 4 +- + sound/soc/codecs/nau8810.c | 2 +- + sound/soc/codecs/nau8822.c | 2 +- + sound/soc/codecs/rt1015.c | 122 +-- + sound/soc/codecs/rt1015.h | 5 - + sound/soc/codecs/rt1308-sdw.c | 2 +- + sound/soc/codecs/rt274.c | 2 +- + sound/soc/codecs/rt286.c | 4 +- + sound/soc/codecs/rt298.c | 4 +- + sound/soc/codecs/rt5645.c | 78 +- + sound/soc/codecs/rt5670.c | 4 +- + sound/soc/codecs/rt5682-sdw.c | 21 +- + sound/soc/codecs/rt5682.c | 10 +- + sound/soc/codecs/rt5682.h | 2 +- + sound/soc/codecs/rt700-sdw.c | 2 +- + sound/soc/codecs/rt711-sdw.c | 2 +- + sound/soc/codecs/rt715-sdw.c | 2 +- + sound/soc/codecs/sgtl5000.c | 2 +- + sound/soc/codecs/sirf-audio-codec.c | 575 -------------- + sound/soc/codecs/ssm2602.c | 4 +- + sound/soc/codecs/tas2764.c | 2 +- + sound/soc/codecs/tas2770.c | 2 +- + sound/soc/codecs/tlv320adcx140.c | 2 +- + sound/soc/codecs/tlv320aic31xx.c | 4 +- + sound/soc/codecs/tlv320aic32x4.c | 2 +- + sound/soc/codecs/tlv320aic3x.c | 2 +- + sound/soc/codecs/tscs42xx.c | 4 +- + sound/soc/codecs/tscs454.c | 12 +- + sound/soc/codecs/wm5102.c | 12 +- + sound/soc/codecs/wm5110.c | 12 +- + sound/soc/codecs/wm8510.c | 2 +- + sound/soc/codecs/wm8731.c | 2 +- + sound/soc/codecs/wm8770.c | 2 +- + sound/soc/codecs/wm8804.c | 2 +- + sound/soc/codecs/wm8903.c | 2 +- + sound/soc/codecs/wm8904.c | 2 +- + sound/soc/codecs/wm8940.c | 2 +- + sound/soc/codecs/wm8960.c | 2 +- + sound/soc/codecs/wm8962.c | 2 +- + sound/soc/codecs/wm8974.c | 2 +- + sound/soc/codecs/wm8978.c | 2 +- + sound/soc/codecs/wm8983.c | 2 +- + sound/soc/codecs/wm8985.c | 2 +- + sound/soc/codecs/wm8988.c | 2 +- + sound/soc/codecs/wm8993.c | 2 +- + sound/soc/codecs/wm8994.c | 4 +- + sound/soc/codecs/wm8997.c | 8 +- + sound/soc/codecs/wm8998.c | 12 +- + sound/soc/codecs/wm9713.c | 2 +- + sound/soc/codecs/wm_adsp.c | 98 +-- + sound/soc/codecs/wmfw.h | 6 +- + sound/soc/codecs/zl38060.c | 4 +- + sound/soc/codecs/zx_aud96p22.c | 401 ---------- + sound/soc/fsl/Kconfig | 1 + + sound/soc/fsl/fsl_asrc.c | 5 - + sound/soc/fsl/fsl_esai.c | 8 +- + sound/soc/fsl/fsl_micfil.c | 7 +- + sound/soc/fsl/fsl_sai.c | 8 +- + sound/soc/fsl/fsl_spdif.c | 4 - + sound/soc/fsl/fsl_ssi.c | 12 +- + sound/soc/fsl/fsl_xcvr.c | 5 - + sound/soc/intel/Kconfig | 2 + + sound/soc/intel/boards/bytcht_es8316.c | 3 - + sound/soc/intel/boards/bytcr_rt5640.c | 52 +- + sound/soc/intel/boards/cht_bsw_nau8824.c | 15 +- + sound/soc/intel/boards/sof_rt5682.c | 7 - + sound/soc/intel/catpt/pcm.c | 12 +- + sound/soc/intel/common/soc-acpi-intel-ehl-match.c | 2 +- + sound/soc/intel/common/soc-acpi-intel-tgl-match.c | 2 +- + sound/soc/intel/keembay/kmb_platform.c | 157 +++- + sound/soc/intel/keembay/kmb_platform.h | 9 + + sound/soc/intel/skylake/skl.c | 8 +- + sound/soc/jz4740/jz4740-i2s.c | 2 +- + sound/soc/kirkwood/kirkwood-dma.c | 79 +- + sound/soc/mediatek/Kconfig | 2 +- + sound/soc/mediatek/mt2701/mt2701-afe-pcm.c | 10 +- + sound/soc/mediatek/mt6797/mt6797-dai-pcm.c | 8 +- + sound/soc/mediatek/mt8173/mt8173-afe-pcm.c | 2 +- + sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c | 6 - + sound/soc/mediatek/mt8183/mt8183-dai-pcm.c | 8 +- + .../mt8183/mt8183-mt6358-ts3a227-max98357.c | 6 - + sound/soc/mediatek/mt8192/mt8192-dai-pcm.c | 8 +- + sound/soc/mediatek/mt8192/mt8192-dai-tdm.c | 2 +- + .../mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c | 60 +- + sound/soc/meson/aiu-fifo-i2s.c | 1 - + sound/soc/meson/aiu-fifo-spdif.c | 1 - + sound/soc/meson/aiu-fifo.c | 18 +- + sound/soc/pxa/pxa2xx-i2s.c | 2 +- + sound/soc/qcom/lpass-cpu.c | 17 +- + sound/soc/qcom/qdsp6/q6asm-dai.c | 21 + + sound/soc/qcom/qdsp6/q6routing.c | 18 - + sound/soc/rockchip/rockchip_i2s.c | 4 +- + sound/soc/rockchip/rockchip_pdm.c | 2 +- + sound/soc/samsung/i2s.c | 2 +- + sound/soc/samsung/pcm.c | 2 +- + sound/soc/sh/rcar/core.c | 4 +- + sound/soc/sirf/Kconfig | 21 - + sound/soc/sirf/Makefile | 8 - + sound/soc/sirf/sirf-audio-port.c | 86 --- + sound/soc/sirf/sirf-audio.c | 160 ---- + sound/soc/sirf/sirf-usp.c | 435 ----------- + sound/soc/sirf/sirf-usp.h | 292 ------- + sound/soc/soc-pcm.c | 258 +++---- + sound/soc/soc-topology-test.c | 843 +++++++++++++++++++++ + sound/soc/soc-topology.c | 30 +- + sound/soc/sof/core.c | 9 + + sound/soc/sof/intel/hda.c | 8 +- + sound/soc/sof/intel/tgl.c | 3 +- + sound/soc/sof/ops.h | 19 +- + sound/soc/sof/sof-pci-dev.c | 12 +- + sound/soc/sof/sof-priv.h | 6 +- + sound/soc/sprd/sprd-mcdt.c | 10 +- + sound/soc/sunxi/sun4i-i2s.c | 2 +- + sound/soc/sunxi/sun8i-codec.c | 12 +- + sound/soc/tegra/Kconfig | 9 + + sound/soc/tegra/Makefile | 2 + + sound/soc/tegra/tegra186_dspk.c | 2 +- + sound/soc/tegra/tegra20_i2s.c | 2 +- + sound/soc/tegra/tegra210_dmic.c | 2 +- + sound/soc/tegra/tegra210_i2s.c | 2 +- + sound/soc/tegra/tegra30_i2s.c | 2 +- + sound/soc/tegra/tegra_audio_graph_card.c | 251 ++++++ + sound/soc/tegra/tegra_pcm.c | 6 +- + sound/soc/ti/davinci-mcasp.c | 2 +- + sound/soc/txx9/Kconfig | 30 - + sound/soc/txx9/Makefile | 12 - + sound/soc/txx9/txx9aclc-ac97.c | 230 ------ + sound/soc/txx9/txx9aclc-generic.c | 88 --- + sound/soc/txx9/txx9aclc.c | 422 ----------- + sound/soc/txx9/txx9aclc.h | 71 -- + sound/soc/zte/Kconfig | 26 - + sound/soc/zte/Makefile | 4 - + sound/soc/zte/zx-i2s.c | 452 ----------- + sound/soc/zte/zx-spdif.c | 363 --------- + sound/soc/zte/zx-tdm.c | 458 ----------- + 216 files changed, 2435 insertions(+), 5337 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-graph-card.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/sirf-audio-codec.txt + delete mode 100644 Documentation/devicetree/bindings/sound/sirf-usp.txt + delete mode 100644 Documentation/devicetree/bindings/sound/zte,tdm.txt + delete mode 100644 Documentation/devicetree/bindings/sound/zte,zx-aud96p22.txt + delete mode 100644 Documentation/devicetree/bindings/sound/zte,zx-i2s.txt + delete mode 100644 Documentation/devicetree/bindings/sound/zte,zx-spdif.txt + delete mode 100644 sound/soc/codecs/sirf-audio-codec.c + delete mode 100644 sound/soc/codecs/zx_aud96p22.c + delete mode 100644 sound/soc/sirf/Kconfig + delete mode 100644 sound/soc/sirf/Makefile + delete mode 100644 sound/soc/sirf/sirf-audio-port.c + delete mode 100644 sound/soc/sirf/sirf-audio.c + delete mode 100644 sound/soc/sirf/sirf-usp.c + delete mode 100644 sound/soc/sirf/sirf-usp.h + create mode 100644 sound/soc/soc-topology-test.c + create mode 100644 sound/soc/tegra/tegra_audio_graph_card.c + delete mode 100644 sound/soc/txx9/Kconfig + delete mode 100644 sound/soc/txx9/Makefile + delete mode 100644 sound/soc/txx9/txx9aclc-ac97.c + delete mode 100644 sound/soc/txx9/txx9aclc-generic.c + delete mode 100644 sound/soc/txx9/txx9aclc.c + delete mode 100644 sound/soc/txx9/txx9aclc.h + delete mode 100644 sound/soc/zte/Kconfig + delete mode 100644 sound/soc/zte/Makefile + delete mode 100644 sound/soc/zte/zx-i2s.c + delete mode 100644 sound/soc/zte/zx-spdif.c + delete mode 100644 sound/soc/zte/zx-tdm.c +Merging modules/modules-next (ec2a29593c83 module: harden ELF info handling) +$ git merge modules/modules-next +Merge made by the 'recursive' strategy. + kernel/module.c | 164 ++++++++++++++++++++++++++++++++++++++++------ + kernel/module_signature.c | 2 +- + kernel/module_signing.c | 2 +- + 3 files changed, 145 insertions(+), 23 deletions(-) +Merging input/next (6965eece2a89 Input: ads7846 - convert to one message) +$ git merge input/next +Auto-merging drivers/input/touchscreen/raydium_i2c_ts.c +Auto-merging drivers/input/touchscreen/ads7846.c +Merge made by the 'recursive' strategy. + drivers/input/keyboard/Kconfig | 2 +- + drivers/input/keyboard/omap4-keypad.c | 302 +++++++++++++---------- + drivers/input/misc/da7280.c | 3 + + drivers/input/mouse/synaptics.c | 7 +- + drivers/input/touchscreen/ads7846.c | 376 +++++++++++++++-------------- + drivers/input/touchscreen/melfas_mip4.c | 8 +- + drivers/input/touchscreen/raydium_i2c_ts.c | 3 +- + drivers/input/touchscreen/stmpe-ts.c | 1 + + drivers/input/touchscreen/surface3_spi.c | 2 - + drivers/input/touchscreen/usbtouchscreen.c | 3 + + 10 files changed, 391 insertions(+), 316 deletions(-) +Merging block/for-next (a9f7c7a1f408 Merge branch 'for-5.12/io_uring' into for-next) +$ git merge block/for-next +Auto-merging fs/io_uring.c +Merge made by the 'recursive' strategy. + fs/io_uring.c | 292 ++++++++++++++++++++++++++++++++-------------------------- + 1 file changed, 160 insertions(+), 132 deletions(-) +Merging device-mapper/for-next (61b8b2a834bf dm integrity: introduce the "fix_hmac" argument) +$ git merge device-mapper/for-next +Merge made by the 'recursive' strategy. + .../admin-guide/device-mapper/dm-integrity.rst | 22 ++- + drivers/md/dm-crypt.c | 8 +- + drivers/md/dm-dust.c | 2 +- + drivers/md/dm-integrity.c | 162 +++++++++++++++++++-- + drivers/md/dm-table.c | 15 +- + drivers/md/dm.c | 16 +- + drivers/md/persistent-data/dm-btree-internal.h | 2 +- + drivers/md/persistent-data/dm-btree-spine.c | 2 +- + 8 files changed, 197 insertions(+), 32 deletions(-) +Merging pcmcia/pcmcia-next (4ce6b242b78d pcmcia: Switch to using the new API kobj_to_dev()) +$ git merge pcmcia/pcmcia-next +Merge made by the 'recursive' strategy. + drivers/pcmcia/cistpl.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging mmc/next (22510bcd5547 mmc: sdhci-iproc: Add ACPI bindings for the RPi) +$ git merge mmc/next +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/mmc/mmci.txt +Merge made by the 'recursive' strategy. + .../bindings/mmc/allwinner,sun4i-a10-mmc.yaml | 8 + + .../devicetree/bindings/mmc/arm,pl18x.yaml | 203 ++++++++++++++++ + .../bindings/mmc/marvell,xenon-sdhci.txt | 1 + + Documentation/devicetree/bindings/mmc/mmci.txt | 74 ------ + .../devicetree/bindings/mmc/renesas,sdhi.yaml | 1 + + .../devicetree/bindings/mmc/sdhci-am654.yaml | 19 +- + .../devicetree/bindings/mmc/sdhci-msm.txt | 5 +- + MAINTAINERS | 9 + + drivers/mmc/core/core.c | 8 +- + drivers/mmc/core/host.c | 44 ++++ + drivers/mmc/core/mmc.c | 6 +- + drivers/mmc/core/mmc_test.c | 29 +-- + drivers/mmc/core/sd.c | 4 +- + drivers/mmc/core/sd.h | 2 +- + drivers/mmc/core/sdio.c | 2 +- + drivers/mmc/host/Kconfig | 14 ++ + drivers/mmc/host/jz4740_mmc.c | 1 - + drivers/mmc/host/meson-gx-mmc.c | 37 +-- + drivers/mmc/host/mtk-sd.c | 18 +- + drivers/mmc/host/mxs-mmc.c | 2 +- + drivers/mmc/host/omap_hsmmc.c | 18 +- + drivers/mmc/host/owl-mmc.c | 9 +- + drivers/mmc/host/renesas_sdhi_core.c | 16 +- + drivers/mmc/host/renesas_sdhi_internal_dmac.c | 91 +++++++- + drivers/mmc/host/rtsx_pci_sdmmc.c | 5 +- + drivers/mmc/host/sdhci-iproc.c | 18 ++ + drivers/mmc/host/sdhci-msm.c | 46 ++-- + drivers/mmc/host/sdhci-of-arasan.c | 65 +++--- + drivers/mmc/host/sdhci-of-aspeed-test.c | 98 ++++++++ + drivers/mmc/host/sdhci-of-aspeed.c | 255 ++++++++++++++++++++- + drivers/mmc/host/sdhci-of-dwcmshc.c | 1 + + drivers/mmc/host/sdhci-pci-gli.c | 23 +- + drivers/mmc/host/sdhci-sprd.c | 6 +- + drivers/mmc/host/sdhci-xenon.c | 1 + + drivers/mmc/host/sdhci_am654.c | 28 +++ + drivers/mmc/host/sunxi-mmc.c | 30 ++- + drivers/mmc/host/tmio_mmc.h | 2 +- + drivers/mmc/host/tmio_mmc_core.c | 8 +- + drivers/mmc/host/usdhi6rol0.c | 4 +- + include/linux/mmc/host.h | 13 ++ + include/linux/platform_data/mmc-omap.h | 3 +- + 41 files changed, 979 insertions(+), 248 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mmc/arm,pl18x.yaml + delete mode 100644 Documentation/devicetree/bindings/mmc/mmci.txt + create mode 100644 drivers/mmc/host/sdhci-of-aspeed-test.c +Merging mfd/for-mfd-next (d0e648f2186a mfd: intel-lpss: Add Intel Alder Lake PCH-P PCI IDs) +$ git merge mfd/for-mfd-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mfd/bd9571mwv.txt | 4 +- + Documentation/devicetree/bindings/mfd/iqs62x.yaml | 2 +- + drivers/gpio/gpio-bd9571mwv.c | 35 ++-- + drivers/mfd/Kconfig | 2 +- + drivers/mfd/ab8500-core.c | 42 ++--- + drivers/mfd/altera-sysmgr.c | 3 +- + drivers/mfd/bd9571mwv.c | 178 ++++++++++++++------- + drivers/mfd/db8500-prcmu.c | 6 +- + drivers/mfd/gateworks-gsc.c | 2 +- + drivers/mfd/intel-lpss-pci.c | 13 ++ + drivers/mfd/max8997.c | 4 +- + drivers/mfd/mcp-sa11x0.c | 3 +- + drivers/mfd/mt6360-core.c | 12 +- + drivers/regulator/bd9571mwv-regulator.c | 59 ++++--- + include/linux/mfd/bd9571mwv.h | 45 ++---- + include/linux/mfd/core.h | 6 +- + include/linux/mfd/rohm-generic.h | 2 + + 17 files changed, 240 insertions(+), 178 deletions(-) +Merging backlight/for-backlight-next (4a98e5ef88f8 backlight: sky81452-backlight: Convert comma to semicolon) +$ git merge backlight/for-backlight-next +Removing include/linux/spi/lms283gf05.h +Merge made by the 'recursive' strategy. + arch/arm/mach-pxa/z2.c | 12 +++++--- + drivers/video/backlight/lms283gf05.c | 43 +++++++++++----------------- + drivers/video/backlight/sky81452-backlight.c | 2 +- + include/linux/spi/lms283gf05.h | 16 ----------- + 4 files changed, 26 insertions(+), 47 deletions(-) + delete mode 100644 include/linux/spi/lms283gf05.h +Merging battery/for-next (a4bdea2004b2 power: supply: fix sbs-charger build, needs REGMAP_I2C) +$ git merge battery/for-next +Removing include/linux/power/max8903_charger.h +Auto-merging arch/arm/mach-pxa/z2.c +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-class-power-ltc4162l | 82 + + .../devicetree/bindings/arm/atmel-sysregs.txt | 5 +- + .../devicetree/bindings/power/supply/bq256xx.yaml | 110 ++ + .../bindings/power/supply/ltc4162-l.yaml | 69 + + arch/arm/mach-pxa/mioa701.c | 1 - + arch/arm/mach-pxa/palm27x.c | 1 - + arch/arm/mach-pxa/palmte2.c | 1 - + arch/arm/mach-pxa/z2.c | 12 +- + drivers/power/reset/Kconfig | 8 +- + drivers/power/reset/Makefile | 1 + + drivers/power/reset/at91-sama5d2_shdwc.c | 74 +- + drivers/power/reset/atc260x-poweroff.c | 262 +++ + drivers/power/reset/linkstation-poweroff.c | 1 + + drivers/power/supply/Kconfig | 27 + + drivers/power/supply/Makefile | 3 + + drivers/power/supply/ab8500_fg.c | 2 +- + drivers/power/supply/acer_a500_battery.c | 297 ++++ + drivers/power/supply/axp288_fuel_gauge.c | 6 + + drivers/power/supply/bq24190_charger.c | 2 +- + drivers/power/supply/bq256xx_charger.c | 1749 ++++++++++++++++++++ + drivers/power/supply/bq27xxx_battery.c | 39 +- + drivers/power/supply/charger-manager.c | 4 +- + drivers/power/supply/cpcap-battery.c | 217 ++- + drivers/power/supply/cpcap-charger.c | 262 +-- + drivers/power/supply/ds2780_battery.c | 8 +- + drivers/power/supply/ingenic-battery.c | 2 +- + drivers/power/supply/ltc4162-l-charger.c | 931 +++++++++++ + drivers/power/supply/max14656_charger_detector.c | 2 - + drivers/power/supply/max8903_charger.c | 360 ++-- + drivers/power/supply/max8997_charger.c | 96 ++ + drivers/power/supply/power_supply_hwmon.c | 2 - + drivers/power/supply/power_supply_sysfs.c | 2 +- + drivers/power/supply/wm97xx_battery.c | 45 +- + drivers/power/supply/z2_battery.c | 46 +- + include/linux/power/max8903_charger.h | 43 - + include/linux/wm97xx.h | 1 - + include/linux/z2_battery.h | 1 - + 37 files changed, 4318 insertions(+), 456 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-power-ltc4162l + create mode 100644 Documentation/devicetree/bindings/power/supply/bq256xx.yaml + create mode 100644 Documentation/devicetree/bindings/power/supply/ltc4162-l.yaml + create mode 100644 drivers/power/reset/atc260x-poweroff.c + create mode 100644 drivers/power/supply/acer_a500_battery.c + create mode 100644 drivers/power/supply/bq256xx_charger.c + create mode 100644 drivers/power/supply/ltc4162-l-charger.c + delete mode 100644 include/linux/power/max8903_charger.h +Merging regulator/for-next (3d71db314529 Merge remote-tracking branch 'regulator/for-5.12' into regulator-next) +$ git merge regulator/for-next +Removing include/linux/regulator/ab8500.h +Removing drivers/regulator/ab3100.c +Auto-merging drivers/mfd/ab8500-core.c +Auto-merging arch/arm64/boot/dts/qcom/qrb5165-rb5.dts +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/regulator/mcp16502-regulator.txt | 3 +- + .../bindings/regulator/nxp,pf8x00-regulator.yaml | 17 +- + .../bindings/regulator/qcom,rpmh-regulator.txt | 2 + + .../bindings/regulator/qcom-labibb-regulator.yaml | 30 +- + .../regulator/richtek,rt4831-regulator.yaml | 35 + + MAINTAINERS | 4 +- + arch/arm64/boot/dts/qcom/qrb5165-rb5.dts | 9 +- + drivers/mfd/ab8500-core.c | 1 - + drivers/regulator/Kconfig | 41 +- + drivers/regulator/Makefile | 4 +- + drivers/regulator/ab3100.c | 724 -------------------- + drivers/regulator/ab8500-ext.c | 422 +----------- + drivers/regulator/ab8500.c | 116 +++- + drivers/regulator/atc260x-regulator.c | 539 +++++++++++++++ + drivers/regulator/axp20x-regulator.c | 7 +- + drivers/regulator/bd70528-regulator.c | 11 +- + drivers/regulator/bd71828-regulator.c | 13 +- + drivers/regulator/bd718x7-regulator.c | 20 +- + drivers/regulator/core.c | 6 +- + drivers/regulator/mcp16502.c | 2 +- + drivers/regulator/mtk-dvfsrc-regulator.c | 215 ++++++ + drivers/regulator/pf8x00-regulator.c | 203 +++--- + drivers/regulator/qcom-labibb-regulator.c | 728 ++++++++++++++++++++- + drivers/regulator/qcom-rpmh-regulator.c | 34 + + drivers/regulator/rt4831-regulator.c | 198 ++++++ + drivers/regulator/s5m8767.c | 15 +- + include/linux/mfd/abx500/ab8500.h | 3 - + include/linux/regulator/ab8500.h | 166 ----- + lib/linear_ranges.c | 8 +- + 29 files changed, 2112 insertions(+), 1464 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regulator/richtek,rt4831-regulator.yaml + delete mode 100644 drivers/regulator/ab3100.c + create mode 100644 drivers/regulator/atc260x-regulator.c + create mode 100644 drivers/regulator/mtk-dvfsrc-regulator.c + create mode 100644 drivers/regulator/rt4831-regulator.c + delete mode 100644 include/linux/regulator/ab8500.h +Merging security/next-testing (9dcd47fc1f7d Merge branch 'fixes-v5.10' into next-testing) +$ git merge security/next-testing +Already up to date! +Merge made by the 'recursive' strategy. +Merging apparmor/apparmor-next (e37986097ba6 apparmor: Use true and false for bool variable) +$ git merge apparmor/apparmor-next +Already up to date. +Merging integrity/next-integrity (207cdd565dfc ima: Don't modify file descriptor mode on the fly) +$ git merge integrity/next-integrity +Already up to date. +Merging keys/keys-next (52db910f6fdf certs: Replace K{U,G}IDT_INIT() with GLOBAL_ROOT_{U,G}ID) +$ git merge keys/keys-next +Merge made by the 'recursive' strategy. + Documentation/security/keys/core.rst | 4 ++-- + certs/blacklist.c | 10 +++++----- + certs/system_keyring.c | 5 +++-- + crypto/asymmetric_keys/asymmetric_type.c | 6 ++++-- + crypto/asymmetric_keys/pkcs7_parser.h | 5 ++--- + crypto/asymmetric_keys/pkcs7_trust.c | 2 +- + crypto/asymmetric_keys/pkcs7_verify.c | 9 ++++----- + include/crypto/public_key.h | 1 - + include/keys/encrypted-type.h | 2 +- + include/linux/key.h | 5 +++-- + include/linux/verification.h | 2 ++ + samples/Kconfig | 2 +- + samples/watch_queue/watch_test.c | 2 +- + security/integrity/ima/ima_mok.c | 5 ++--- + security/keys/Kconfig | 8 ++++---- + security/keys/big_key.c | 9 +++------ + security/keys/key.c | 2 ++ + security/keys/keyctl.c | 2 +- + security/keys/keyctl_pkey.c | 2 -- + security/keys/keyring.c | 10 +++++----- + security/keys/process_keys.c | 1 + + 21 files changed, 47 insertions(+), 47 deletions(-) +Merging safesetid/safesetid-next (03ca0ec13892 LSM: SafeSetID: Fix warnings reported by test bot) +$ git merge safesetid/safesetid-next +Already up to date. +Merging selinux/next (365982aba1f2 fs: anon_inodes: rephrase to appropriate kernel-doc) +$ git merge selinux/next +Auto-merging fs/libfs.c +Merge made by the 'recursive' strategy. + fs/anon_inodes.c | 157 +++++++++++++++++++++++++++--------- + fs/libfs.c | 5 -- + fs/userfaultfd.c | 19 ++--- + include/linux/anon_inodes.h | 5 ++ + include/linux/lsm_hook_defs.h | 2 + + include/linux/lsm_hooks.h | 9 +++ + include/linux/security.h | 10 +++ + security/security.c | 8 ++ + security/selinux/avc.c | 10 +-- + security/selinux/hooks.c | 141 ++++++++++++++++++++++++++------ + security/selinux/ibpkey.c | 1 - + security/selinux/include/classmap.h | 2 + + security/selinux/include/security.h | 1 - + security/selinux/netif.c | 1 - + security/selinux/netlink.c | 2 +- + security/selinux/netnode.c | 1 - + security/selinux/netport.c | 1 - + security/selinux/selinuxfs.c | 4 +- + security/selinux/ss/avtab.c | 4 +- + security/selinux/ss/ebitmap.c | 2 +- + security/selinux/ss/hashtab.c | 2 +- + security/selinux/ss/services.c | 10 +-- + security/selinux/xfrm.c | 2 +- + 23 files changed, 294 insertions(+), 105 deletions(-) +Merging smack/next (9b0072e2b2b5 security/smack: remove unused varible 'rc') +$ git merge smack/next +Already up to date. +Merging tomoyo/master (dea8dcf2a9fa Merge tag 'for-5.11/dm-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm) +$ git merge tomoyo/master +Already up to date. +Merging tpmdd/next (225051939495 ABI: add sysfs description for tpm exports of PCR registers) +$ git merge tpmdd/next +Merge made by the 'recursive' strategy. + Documentation/ABI/stable/sysfs-class-tpm | 14 + + crypto/asymmetric_keys/restrict.c | 7 +- + drivers/char/tpm/Kconfig | 10 + + drivers/char/tpm/Makefile | 2 + + drivers/char/tpm/eventlog/tpm1.c | 1 + + drivers/char/tpm/tpm-dev-common.c | 1 - + drivers/char/tpm/tpm-sysfs.c | 179 +++++++ + drivers/char/tpm/tpm_tis_i2c_cr50.c | 790 +++++++++++++++++++++++++++++++ + include/linux/tpm.h | 9 +- + 9 files changed, 1008 insertions(+), 5 deletions(-) + create mode 100644 drivers/char/tpm/tpm_tis_i2c_cr50.c +Merging watchdog/master (7c53f6b671f4 Linux 5.11-rc3) +$ git merge watchdog/master +Already up to date. +Merging iommu/next (4dd6ce478003 iommu: Fix a check in iommu_check_bind_data()) +$ git merge iommu/next +Already up to date. +Merging audit/next (c1de44631eb5 audit: Remove leftover reference to the audit_tasklet) +$ git merge audit/next +Merge made by the 'recursive' strategy. + kernel/audit.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging devicetree/for-next (8a5a75e5e9e5 of/fdt: Make sure no-map does not remove already reserved regions) +$ git merge devicetree/for-next +Auto-merging Documentation/devicetree/bindings/usb/ti,j721e-usb.yaml +Auto-merging Documentation/devicetree/bindings/riscv/sifive-l2-cache.yaml +Auto-merging Documentation/devicetree/bindings/net/ti,k3-am654-cpts.yaml +Auto-merging Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml +Auto-merging Documentation/devicetree/bindings/display/panel/mantix,mlaf057we51-x.yaml +Resolved 'Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 19d8ac9fe76d] Merge remote-tracking branch 'devicetree/for-next' +$ git diff -M --stat --summary HEAD^.. + .../socionext/socionext,uniphier-system-cache.yaml | 4 +- + .../devicetree/bindings/ata/sata_highbank.yaml | 1 + + .../devicetree/bindings/clock/canaan,k210-clk.yaml | 1 + + .../bindings/connector/usb-connector.yaml | 17 +-- + .../bindings/display/brcm,bcm2711-hdmi.yaml | 1 + + .../bindings/display/brcm,bcm2835-hdmi.yaml | 1 + + .../bindings/display/panel/jdi,lt070me05000.yaml | 1 + + .../display/panel/mantix,mlaf057we51-x.yaml | 3 +- + .../bindings/display/panel/novatek,nt36672a.yaml | 1 + + Documentation/devicetree/bindings/dsp/fsl,dsp.yaml | 2 +- + Documentation/devicetree/bindings/eeprom/at25.yaml | 3 +- + .../devicetree/bindings/extcon/extcon-ptn5150.yaml | 2 + + .../devicetree/bindings/gpio/gpio-pca95xx.yaml | 1 + + Documentation/devicetree/bindings/graph.txt | 129 +-------------------- + .../devicetree/bindings/iio/adc/adi,ad7768-1.yaml | 2 + + .../bindings/iio/adc/aspeed,ast2400-adc.yaml | 1 + + .../devicetree/bindings/iio/adc/lltc,ltc2496.yaml | 2 +- + .../bindings/iio/adc/qcom,spmi-vadc.yaml | 1 + + .../devicetree/bindings/iio/adc/st,stm32-adc.yaml | 2 + + .../devicetree/bindings/iio/health/ti,afe4404.yaml | 2 +- + .../iio/magnetometer/asahi-kasei,ak8975.yaml | 1 + + .../bindings/iio/potentiometer/adi,ad5272.yaml | 1 + + .../input/touchscreen/elan,elants_i2c.yaml | 1 + + .../bindings/interrupt-controller/fsl,intmux.yaml | 2 +- + .../interrupt-controller/st,stm32-exti.yaml | 2 + + .../media/allwinner,sun4i-a10-video-engine.yaml | 1 + + .../devicetree/bindings/media/i2c/imx219.yaml | 1 + + .../bindings/memory-controllers/exynos-srom.yaml | 2 + + .../bindings/misc/fsl,dpaa2-console.yaml | 1 + + .../devicetree/bindings/mmc/mmc-controller.yaml | 2 + + .../bindings/net/ti,k3-am654-cpsw-nuss.yaml | 1 + + .../devicetree/bindings/net/ti,k3-am654-cpts.yaml | 1 + + .../bindings/phy/allwinner,sun4i-a10-usb-phy.yaml | 2 + + .../bindings/phy/allwinner,sun50i-a64-usb-phy.yaml | 2 + + .../bindings/phy/allwinner,sun50i-h6-usb-phy.yaml | 2 + + .../bindings/phy/allwinner,sun5i-a13-usb-phy.yaml | 2 + + .../bindings/phy/allwinner,sun6i-a31-usb-phy.yaml | 2 + + .../bindings/phy/allwinner,sun8i-a23-usb-phy.yaml | 2 + + .../bindings/phy/allwinner,sun8i-a83t-usb-phy.yaml | 2 + + .../bindings/phy/allwinner,sun8i-h3-usb-phy.yaml | 2 + + .../bindings/phy/allwinner,sun8i-r40-usb-phy.yaml | 2 + + .../bindings/phy/allwinner,sun8i-v3s-usb-phy.yaml | 2 + + .../bindings/phy/allwinner,sun9i-a80-usb-phy.yaml | 19 ++- + .../bindings/phy/socionext,uniphier-ahci-phy.yaml | 2 +- + .../bindings/phy/socionext,uniphier-pcie-phy.yaml | 2 +- + .../phy/socionext,uniphier-usb3hs-phy.yaml | 2 +- + .../phy/socionext,uniphier-usb3ss-phy.yaml | 2 +- + .../devicetree/bindings/phy/ti,phy-gmii-sel.yaml | 2 +- + .../bindings/pinctrl/aspeed,ast2400-pinctrl.yaml | 3 +- + .../bindings/pinctrl/aspeed,ast2500-pinctrl.yaml | 4 +- + .../devicetree/bindings/power/supply/bq25980.yaml | 1 + + .../bindings/remoteproc/ingenic,vpu.yaml | 2 +- + .../bindings/remoteproc/ti,omap-remoteproc.yaml | 3 + + .../devicetree/bindings/riscv/sifive-l2-cache.yaml | 1 + + .../devicetree/bindings/serial/renesas,hscif.yaml | 2 + + .../devicetree/bindings/serial/renesas,scif.yaml | 2 + + .../devicetree/bindings/serial/renesas,scifa.yaml | 2 + + .../devicetree/bindings/serial/renesas,scifb.yaml | 2 + + .../bindings/sound/allwinner,sun4i-a10-codec.yaml | 1 + + .../bindings/sound/google,sc7180-trogdor.yaml | 1 + + .../bindings/sound/samsung,aries-wm8994.yaml | 3 + + .../bindings/sound/samsung,midas-audio.yaml | 2 + + .../devicetree/bindings/sound/tas2562.yaml | 2 + + .../devicetree/bindings/sound/tas2770.yaml | 2 + + .../devicetree/bindings/sound/tlv320adcx140.yaml | 1 + + .../devicetree/bindings/spi/renesas,rspi.yaml | 2 + + Documentation/devicetree/bindings/sram/sram.yaml | 2 + + .../bindings/timer/allwinner,sun4i-a10-timer.yaml | 2 + + .../bindings/timer/intel,ixp4xx-timer.yaml | 2 +- + .../bindings/usb/allwinner,sun4i-a10-musb.yaml | 2 +- + .../devicetree/bindings/usb/brcm,usb-pinmap.yaml | 3 + + .../devicetree/bindings/usb/generic-ehci.yaml | 2 +- + .../devicetree/bindings/usb/generic-ohci.yaml | 2 +- + .../devicetree/bindings/usb/ingenic,musb.yaml | 2 +- + .../devicetree/bindings/usb/renesas,usb3-peri.yaml | 7 +- + .../devicetree/bindings/usb/renesas,usbhs.yaml | 1 + + .../devicetree/bindings/usb/ti,hd3ss3220.yaml | 8 +- + .../devicetree/bindings/usb/ti,j721e-usb.yaml | 3 +- + .../devicetree/bindings/usb/ti,keystone-dwc3.yaml | 2 + + drivers/of/base.c | 4 +- + drivers/of/fdt.c | 12 +- + 81 files changed, 149 insertions(+), 183 deletions(-) +Merging mailbox/mailbox-for-next (5a6338cce9f4 mailbox: arm_mhuv2: Add driver) +$ git merge mailbox/mailbox-for-next +Already up to date. +Merging spi/for-next (3ef2c406737c Merge remote-tracking branch 'spi/for-5.12' into spi-next) +$ git merge spi/for-next +Removing include/linux/platform_data/efm32-spi.h +Removing drivers/spi/spi-txx9.c +Removing drivers/spi/spi-sirf.c +Removing drivers/spi/spi-efm32.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/spi/spi-sirf.txt +Merge made by the 'recursive' strategy. + .../bindings/{mtd => spi}/cadence-quadspi.txt | 1 + + .../bindings/spi/nvidia,tegra210-quad.yaml | 117 ++ + .../devicetree/bindings/spi/renesas,sh-msiof.yaml | 1 + + .../devicetree/bindings/spi/spi-controller.yaml | 6 +- + Documentation/devicetree/bindings/spi/spi-sirf.txt | 42 - + MAINTAINERS | 8 + + drivers/spi/Kconfig | 33 +- + drivers/spi/Makefile | 4 +- + drivers/spi/spi-atmel.c | 2 +- + drivers/spi/spi-au1550.c | 20 +- + drivers/spi/spi-bcm-qspi.c | 2 +- + drivers/spi/spi-bcm2835.c | 8 +- + drivers/spi/spi-bcm2835aux.c | 2 +- + drivers/spi/spi-cadence-quadspi.c | 388 +++++- + drivers/spi/spi-efm32.c | 462 ------- + drivers/spi/spi-hisi-sfc-v3xx.c | 8 +- + drivers/spi/spi-imx.c | 2 +- + drivers/spi/spi-mem.c | 1 + + drivers/spi/spi-mpc52xx.c | 4 +- + drivers/spi/spi-orion.c | 55 +- + drivers/spi/spi-pxa2xx.c | 4 + + drivers/spi/spi-qcom-qspi.c | 3 +- + drivers/spi/spi-rockchip.c | 2 +- + drivers/spi/spi-rpc-if.c | 13 +- + drivers/spi/spi-sh-msiof.c | 14 +- + drivers/spi/spi-sirf.c | 1236 ----------------- + drivers/spi/spi-stm32.c | 36 +- + drivers/spi/spi-tegra210-quad.c | 1410 ++++++++++++++++++++ + drivers/spi/spi-txx9.c | 477 ------- + drivers/spi/spi.c | 25 +- + include/dt-bindings/clock/tegra210-car.h | 2 +- + include/linux/platform_data/efm32-spi.h | 15 - + include/linux/spi/spi.h | 42 +- + include/uapi/linux/spi/spi.h | 41 + + include/uapi/linux/spi/spidev.h | 30 +- + 35 files changed, 2087 insertions(+), 2429 deletions(-) + rename Documentation/devicetree/bindings/{mtd => spi}/cadence-quadspi.txt (97%) + create mode 100644 Documentation/devicetree/bindings/spi/nvidia,tegra210-quad.yaml + delete mode 100644 Documentation/devicetree/bindings/spi/spi-sirf.txt + delete mode 100644 drivers/spi/spi-efm32.c + delete mode 100644 drivers/spi/spi-sirf.c + create mode 100644 drivers/spi/spi-tegra210-quad.c + delete mode 100644 drivers/spi/spi-txx9.c + delete mode 100644 include/linux/platform_data/efm32-spi.h + create mode 100644 include/uapi/linux/spi/spi.h +Merging tip/auto-latest (e2f1899de97b Merge branch 'irq/urgent') +$ git merge tip/auto-latest +Removing include/linux/timekeeping32.h +Auto-merging include/linux/lockdep.h +Removing arch/x86/platform/goldfish/goldfish.c +Removing arch/x86/platform/goldfish/Makefile +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 11 +- + Documentation/asm-annotations.rst | 5 + + Documentation/scheduler/schedutil.txt | 169 +++++++++++ + arch/x86/Makefile | 28 +- + arch/x86/entry/common.c | 10 +- + arch/x86/entry/thunk_64.S | 15 +- + arch/x86/events/intel/uncore.c | 58 ++-- + arch/x86/events/intel/uncore.h | 5 +- + arch/x86/events/intel/uncore_snb.c | 2 +- + arch/x86/events/intel/uncore_snbep.c | 114 ++++--- + arch/x86/include/asm/insn.h | 45 +++ + arch/x86/include/asm/irq.h | 2 - + arch/x86/include/asm/kprobes.h | 11 +- + arch/x86/include/asm/microcode.h | 2 - + arch/x86/include/asm/msr.h | 4 +- + arch/x86/include/asm/orc_types.h | 10 + + arch/x86/include/asm/pgtable_types.h | 2 - + arch/x86/include/asm/resctrl.h | 11 +- + arch/x86/include/asm/special_insns.h | 6 +- + arch/x86/include/asm/topology.h | 4 +- + arch/x86/kernel/cpu/amd.c | 4 +- + arch/x86/kernel/cpu/mce/core.c | 22 +- + arch/x86/kernel/cpu/microcode/core.c | 2 +- + arch/x86/kernel/cpu/mtrr/cleanup.c | 4 +- + arch/x86/kernel/cpu/mtrr/generic.c | 1 - + arch/x86/kernel/cpu/mtrr/mtrr.c | 2 - + arch/x86/kernel/cpu/resctrl/internal.h | 1 + + arch/x86/kernel/cpu/resctrl/rdtgroup.c | 24 +- + arch/x86/kernel/cpu/sgx/main.c | 14 +- + arch/x86/kernel/cpu/topology.c | 2 +- + arch/x86/kernel/kprobes/core.c | 168 +++++------ + arch/x86/kernel/pci-iommu_table.c | 3 - + arch/x86/kernel/reboot.c | 9 + + arch/x86/kernel/sev-es.c | 14 +- + arch/x86/kernel/smpboot.c | 19 ++ + arch/x86/kernel/sys_x86_64.c | 8 +- + arch/x86/lib/insn.c | 119 ++++---- + arch/x86/mm/init.c | 19 +- + arch/x86/mm/mmio-mod.c | 2 - + arch/x86/platform/Makefile | 1 - + arch/x86/platform/geode/alix.c | 19 +- + arch/x86/platform/geode/geos.c | 19 +- + arch/x86/platform/geode/net5501.c | 13 +- + arch/x86/platform/goldfish/Makefile | 2 - + arch/x86/platform/goldfish/goldfish.c | 54 ---- + .../platform/intel-mid/device_libs/platform_bt.c | 4 +- + arch/x86/tools/Makefile | 8 +- + arch/x86/tools/insn_sanity.c | 4 - + drivers/thermal/cpufreq_cooling.c | 69 ++++- + include/linux/ktime.h | 1 - + include/linux/linkage.h | 5 + + include/linux/local_lock_internal.h | 5 +- + include/linux/lockdep.h | 15 +- + include/linux/lockdep_types.h | 18 +- + include/linux/sched.h | 5 + + include/linux/timekeeping32.h | 14 - + kernel/locking/lockdep.c | 192 ++++++++---- + kernel/sched/core.c | 121 +++++++- + kernel/sched/cpufreq_schedutil.c | 108 +------ + kernel/sched/deadline.c | 2 +- + kernel/sched/debug.c | 2 +- + kernel/sched/fair.c | 119 +++++--- + kernel/sched/rt.c | 2 +- + kernel/sched/sched.h | 22 +- + kernel/time/ntp.c | 4 +- + kernel/time/timekeeping.c | 3 +- + lib/locking-selftest.c | 334 ++++++++++++++++++++- + lib/test_fpu.c | 6 +- + tools/arch/x86/include/asm/insn.h | 45 +++ + tools/arch/x86/include/asm/orc_types.h | 10 + + tools/arch/x86/lib/insn.c | 119 ++++---- + tools/objtool/.gitignore | 2 +- + tools/objtool/Documentation/stack-validation.txt | 16 +- + tools/objtool/Makefile | 5 +- + tools/objtool/arch/x86/decode.c | 8 +- + .../objtool/arch/x86/include/{ => arch}/cfi_regs.h | 0 + .../arch/x86/include/{arch_elf.h => arch/elf.h} | 0 + tools/objtool/arch/x86/include/arch/endianness.h | 9 + + .../x86/include/{arch_special.h => arch/special.h} | 0 + tools/objtool/arch/x86/special.c | 4 +- + tools/objtool/builtin-check.c | 4 +- + tools/objtool/builtin-orc.c | 10 +- + tools/objtool/check.c | 272 ++++++++++------- + tools/objtool/elf.c | 47 +-- + tools/objtool/{ => include/objtool}/arch.h | 8 +- + tools/objtool/{ => include/objtool}/builtin.h | 0 + tools/objtool/{ => include/objtool}/cfi.h | 2 +- + tools/objtool/{ => include/objtool}/check.h | 26 +- + tools/objtool/{ => include/objtool}/elf.h | 0 + tools/objtool/include/objtool/endianness.h | 38 +++ + tools/objtool/{ => include/objtool}/objtool.h | 5 +- + tools/objtool/{ => include/objtool}/special.h | 4 +- + tools/objtool/{ => include/objtool}/warn.h | 2 +- + tools/objtool/objtool.c | 6 +- + tools/objtool/orc_dump.c | 9 +- + tools/objtool/orc_gen.c | 315 ++++++++++--------- + tools/objtool/special.c | 14 +- + tools/objtool/weak.c | 9 +- + tools/testing/selftests/x86/helpers.h | 24 +- + 99 files changed, 2026 insertions(+), 1109 deletions(-) + create mode 100644 Documentation/scheduler/schedutil.txt + delete mode 100644 arch/x86/platform/goldfish/Makefile + delete mode 100644 arch/x86/platform/goldfish/goldfish.c + delete mode 100644 include/linux/timekeeping32.h + rename tools/objtool/arch/x86/include/{ => arch}/cfi_regs.h (100%) + rename tools/objtool/arch/x86/include/{arch_elf.h => arch/elf.h} (100%) + create mode 100644 tools/objtool/arch/x86/include/arch/endianness.h + rename tools/objtool/arch/x86/include/{arch_special.h => arch/special.h} (100%) + rename tools/objtool/{ => include/objtool}/arch.h (94%) + rename tools/objtool/{ => include/objtool}/builtin.h (100%) + rename tools/objtool/{ => include/objtool}/cfi.h (96%) + rename tools/objtool/{ => include/objtool}/check.h (73%) + rename tools/objtool/{ => include/objtool}/elf.h (100%) + create mode 100644 tools/objtool/include/objtool/endianness.h + rename tools/objtool/{ => include/objtool}/objtool.h (84%) + rename tools/objtool/{ => include/objtool}/special.h (94%) + rename tools/objtool/{ => include/objtool}/warn.h (98%) +Merging clockevents/timers/drivers/next (8ae954caf49a clocksource/drivers/sh_cmt: Fix potential deadlock when calling runtime PM) +$ git merge clockevents/timers/drivers/next +Already up to date. +Merging edac/edac-for-next (83c0cf46675f Merge branch 'edac-misc' into edac-for-next) +$ git merge edac/edac-for-next +Removing drivers/edac/amd64_edac_inj.c +Removing drivers/edac/amd64_edac_dbg.c +Merge made by the 'recursive' strategy. + drivers/edac/Kconfig | 15 +- + drivers/edac/Makefile | 7 +- + drivers/edac/amd64_edac.c | 318 +++++++++++++++++++++++++++++++++++++++--- + drivers/edac/amd64_edac.h | 11 -- + drivers/edac/amd64_edac_dbg.c | 55 -------- + drivers/edac/amd64_edac_inj.c | 235 ------------------------------- + drivers/edac/ppc4xx_edac.c | 2 +- + drivers/edac/xgene_edac.c | 2 +- + 8 files changed, 312 insertions(+), 333 deletions(-) + delete mode 100644 drivers/edac/amd64_edac_dbg.c + delete mode 100644 drivers/edac/amd64_edac_inj.c +Merging irqchip/irq/irqchip-next (599b3063adf4 irqchip/mips-cpu: Set IPI domain parent chip) +$ git merge irqchip/irq/irqchip-next +Already up to date. +Merging ftrace/for-next (f6a694665f13 tracing: Offload eval map updates to a work queue) +$ git merge ftrace/for-next +Already up to date. +Merging rcu/rcu/next (68dda19311f0 kvfree_rcu: Make krc_this_cpu_unlock() use raw_spin_unlock_irqrestore()) +$ git merge rcu/rcu/next +Auto-merging mm/vmalloc.c +Auto-merging mm/slub.c +Auto-merging lib/Makefile +Auto-merging kernel/sched/sched.h +Auto-merging kernel/sched/core.c +Auto-merging include/linux/sched.h +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + .../Expedited-Grace-Periods.rst | 4 +- + .../RCU/Design/Requirements/Requirements.rst | 732 +++++++++++---------- + Documentation/RCU/checklist.rst | 10 +- + Documentation/RCU/rcubarrier.rst | 6 +- + Documentation/RCU/stallwarn.rst | 27 +- + Documentation/RCU/whatisRCU.rst | 10 +- + Documentation/admin-guide/kernel-parameters.txt | 70 +- + Documentation/dev-tools/kcsan.rst | 3 + + .../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/kvmclock.c | 2 +- + arch/x86/kernel/tsc.c | 3 +- + drivers/cpuidle/cpuidle-tegra.c | 2 +- + drivers/cpuidle/cpuidle.c | 33 +- + include/linux/clocksource.h | 2 +- + include/linux/cpu.h | 2 + + include/linux/kcsan-checks.h | 6 + + include/linux/kcsan.h | 7 + + include/linux/list.h | 2 +- + include/linux/mm.h | 6 + + include/linux/rcu_segcblist.h | 120 +++- + include/linux/rculist_nulls.h | 2 +- + include/linux/rcupdate.h | 44 +- + include/linux/sched.h | 11 + + include/linux/slab.h | 4 + + include/linux/srcu.h | 3 + + include/linux/srcutiny.h | 7 +- + include/linux/timer.h | 2 + + include/linux/torture.h | 27 +- + include/linux/vmalloc.h | 6 + + include/trace/events/rcu.h | 26 + + kernel/cpu.c | 7 + + kernel/entry/common.c | 10 + + kernel/kcsan/Makefile | 4 +- + kernel/kcsan/atomic.h | 5 + + kernel/kcsan/core.c | 31 +- + kernel/kcsan/debugfs.c | 5 + + kernel/kcsan/encoding.h | 5 + + kernel/kcsan/kcsan.h | 3 +- + kernel/kcsan/{kcsan-test.c => kcsan_test.c} | 118 ++-- + kernel/kcsan/report.c | 5 + + kernel/kcsan/selftest.c | 5 + + kernel/locking/locktorture.c | 1 - + kernel/rcu/Kconfig | 5 +- + kernel/rcu/rcu.h | 16 +- + kernel/rcu/rcu_segcblist.c | 216 ++++-- + kernel/rcu/rcu_segcblist.h | 57 +- + kernel/rcu/rcutorture.c | 470 ++++++++++--- + kernel/rcu/refscale.c | 23 +- + kernel/rcu/srcutiny.c | 77 ++- + kernel/rcu/srcutree.c | 147 ++++- + kernel/rcu/tasks.h | 79 +++ + kernel/rcu/tree.c | 199 ++++-- + kernel/rcu/tree.h | 4 +- + kernel/rcu/tree_exp.h | 2 +- + kernel/rcu/tree_plugin.h | 511 ++++++++++++-- + kernel/rcu/tree_stall.h | 60 +- + kernel/rcu/update.c | 4 +- + kernel/scftorture.c | 6 +- + kernel/sched/core.c | 75 ++- + kernel/sched/idle.c | 24 +- + kernel/sched/sched.h | 3 + + kernel/time/clocksource.c | 138 +++- + kernel/time/timer.c | 14 + + kernel/torture.c | 167 ++++- + lib/Kconfig.kcsan | 5 +- + lib/Makefile | 3 - + lib/percpu-refcount.c | 12 +- + mm/slab.c | 22 + + mm/slab.h | 14 + + mm/slab_common.c | 79 +++ + mm/slob.c | 8 + + mm/slub.c | 42 ++ + mm/util.c | 34 + + mm/vmalloc.c | 15 + + tools/include/nolibc/nolibc.h | 153 +++-- + tools/memory-model/Documentation/glossary.txt | 14 +- + tools/memory-model/Documentation/locking.txt | 320 +++++++++ + tools/memory-model/Documentation/simple.txt | 1 - + tools/memory-model/README | 2 +- + tools/memory-model/litmus-tests/.gitignore | 2 +- + .../litmus-tests/CoRR+poonceonce+Once.litmus | 4 +- + .../litmus-tests/CoRW+poonceonce+Once.litmus | 4 +- + .../litmus-tests/CoWR+poonceonce+Once.litmus | 4 +- + .../litmus-tests/CoWW+poonceonce.litmus | 4 +- + .../IRIW+fencembonceonces+OnceOnce.litmus | 5 +- + .../litmus-tests/IRIW+poonceonces+OnceOnce.litmus | 5 +- + .../ISA2+pooncelock+pooncelock+pombonce.litmus | 7 +- + .../litmus-tests/ISA2+poonceonces.litmus | 6 +- + ...cerelease+poacquirerelease+poacquireonce.litmus | 6 +- + .../LB+fencembonceonce+ctrlonceonce.litmus | 5 +- + .../LB+poacquireonce+pooncerelease.litmus | 5 +- + .../litmus-tests/LB+poonceonces.litmus | 5 +- + .../MP+fencewmbonceonce+fencermbonceonce.litmus | 5 +- + .../litmus-tests/MP+onceassign+derefonce.litmus | 4 +- + .../MP+polockmbonce+poacquiresilsil.litmus | 5 +- + .../MP+polockonce+poacquiresilsil.litmus | 5 +- + tools/memory-model/litmus-tests/MP+polocks.litmus | 6 +- + .../litmus-tests/MP+poonceonces.litmus | 5 +- + .../MP+pooncerelease+poacquireonce.litmus | 5 +- + .../memory-model/litmus-tests/MP+porevlocks.litmus | 6 +- + .../litmus-tests/R+fencembonceonces.litmus | 5 +- + .../memory-model/litmus-tests/R+poonceonces.litmus | 5 +- + .../S+fencewmbonceonce+poacquireonce.litmus | 5 +- + .../memory-model/litmus-tests/S+poonceonces.litmus | 5 +- + .../litmus-tests/SB+fencembonceonces.litmus | 5 +- + .../litmus-tests/SB+poonceonces.litmus | 5 +- + .../litmus-tests/SB+rfionceonce-poonceonces.litmus | 5 +- + .../litmus-tests/WRC+poonceonces+Once.litmus | 5 +- + .../WRC+pooncerelease+fencermbonceonce+Once.litmus | 5 +- + .../Z6.0+pooncelock+poonceLock+pombonce.litmus | 7 +- + .../Z6.0+pooncelock+pooncelock+pombonce.litmus | 7 +- + ...release+poacquirerelease+fencembonceonce.litmus | 6 +- + tools/memory-model/scripts/README | 16 +- + tools/memory-model/scripts/checkalllitmus.sh | 29 +- + tools/memory-model/scripts/checkghlitmus.sh | 11 +- + tools/memory-model/scripts/checklitmus.sh | 25 +- + tools/memory-model/scripts/checklitmushist.sh | 2 +- + tools/memory-model/scripts/checktheselitmus.sh | 43 ++ + tools/memory-model/scripts/cmplitmushist.sh | 49 +- + tools/memory-model/scripts/hwfnseg.sh | 20 + + tools/memory-model/scripts/initlitmushist.sh | 2 +- + tools/memory-model/scripts/judgelitmus.sh | 120 +++- + tools/memory-model/scripts/newlitmushist.sh | 4 +- + tools/memory-model/scripts/parseargs.sh | 21 +- + tools/memory-model/scripts/runlitmus.sh | 80 +++ + tools/memory-model/scripts/runlitmushist.sh | 29 +- + tools/memory-model/scripts/simpletest.sh | 35 + + .../testing/selftests/rcutorture/bin/config2csv.sh | 67 ++ + .../selftests/rcutorture/bin/console-badness.sh | 1 + + .../testing/selftests/rcutorture/bin/functions.sh | 36 +- + .../selftests/rcutorture/bin/kvm-find-errors.sh | 9 +- + .../selftests/rcutorture/bin/kvm-recheck.sh | 3 +- + .../selftests/rcutorture/bin/kvm-test-1-run.sh | 25 +- + tools/testing/selftests/rcutorture/bin/kvm.sh | 103 ++- + tools/testing/selftests/rcutorture/bin/mkinitrd.sh | 2 +- + .../selftests/rcutorture/bin/parse-build.sh | 2 +- + .../selftests/rcutorture/bin/parse-console.sh | 2 +- + tools/testing/selftests/rcutorture/bin/torture.sh | 442 +++++++++++++ + .../selftests/rcutorture/configs/rcu/RUDE01.boot | 1 + + .../selftests/rcutorture/configs/rcu/TASKS01.boot | 1 + + .../selftests/rcutorture/configs/rcu/TREE01.boot | 4 +- + .../selftests/rcutorture/configs/rcu/TREE03.boot | 1 + + 145 files changed, 4768 insertions(+), 1179 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 + rename kernel/kcsan/{kcsan-test.c => kcsan_test.c} (94%) + 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 100755 tools/testing/selftests/rcutorture/bin/config2csv.sh + create mode 100755 tools/testing/selftests/rcutorture/bin/torture.sh +$ git am -3 ../patches/s390-allow-reschedule-on-syscall-restart.patch +Applying: s390: allow reschedule on syscall restart +$ git reset HEAD^ +Unstaged changes after reset: +M arch/s390/kernel/syscall.c +$ git add -A . +$ git commit -v -a --amend +[master fcb4332f619f] Merge remote-tracking branch 'rcu/rcu/next' + Date: Fri Jan 22 13:25:28 2021 +1100 +Merging kvm/next (7c53f6b671f4 Linux 5.11-rc3) +$ git merge kvm/next +Already up to date. +Merging kvm-arm/next (139bc8a6146d KVM: Forbid the use of tagged userspace addresses for memslots) +$ git merge kvm-arm/next +Auto-merging virt/kvm/kvm_main.c +Auto-merging Documentation/virt/kvm/api.rst +Merge made by the 'recursive' strategy. + Documentation/virt/kvm/api.rst | 3 ++ + arch/arm64/kvm/arm.c | 3 +- + arch/arm64/kvm/hyp/nvhe/psci-relay.c | 13 ++--- + arch/arm64/kvm/pmu-emul.c | 10 ++-- + arch/arm64/kvm/sys_regs.c | 93 ++++++++++++++++++++++-------------- + virt/kvm/kvm_main.c | 1 + + 6 files changed, 74 insertions(+), 49 deletions(-) +Merging kvm-ppc/kvm-ppc-next (dc924b062488 KVM: SVM: check CR4 changes against vcpu->arch) +$ git merge kvm-ppc/kvm-ppc-next +Already up to date. +Merging kvms390/next (50a05be484cb KVM: s390: track synchronous pfault events in kvm_stat) +$ git merge kvms390/next +Already up to date. +Merging xen-tip/linux-next (bd9dcef67ffc x86/xen: fix 'nopvspin' build error) +$ git merge xen-tip/linux-next +Already up to date. +Merging percpu/for-next (7dd3050a0194 Merge branch 'for-5.12' into for-next) +$ git merge percpu/for-next +Merge made by the 'recursive' strategy. + mm/percpu.c | 32 ++++++++++++++++++-------------- + 1 file changed, 18 insertions(+), 14 deletions(-) +Merging workqueues/for-next (7bf9c4a88e3e workqueue: tracing the name of the workqueue instead of it's address) +$ git merge workqueues/for-next +Merge made by the 'recursive' strategy. + include/linux/workqueue.h | 2 +- + include/trace/events/workqueue.h | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) +Merging drivers-x86/for-next (0627cc334d40 sony-laptop: Remove unneeded semicolon) +$ git merge drivers-x86/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/driver-api/index.rst | 1 + + .../driver-api/surface_aggregator/client-api.rst | 38 + + .../driver-api/surface_aggregator/client.rst | 393 +++ + .../driver-api/surface_aggregator/clients/cdev.rst | 87 + + .../surface_aggregator/clients/index.rst | 21 + + .../driver-api/surface_aggregator/clients/san.rst | 44 + + .../driver-api/surface_aggregator/index.rst | 21 + + .../driver-api/surface_aggregator/internal-api.rst | 67 + + .../driver-api/surface_aggregator/internal.rst | 577 +++++ + .../driver-api/surface_aggregator/overview.rst | 77 + + .../driver-api/surface_aggregator/ssh.rst | 344 +++ + Documentation/userspace-api/ioctl/ioctl-number.rst | 2 + + MAINTAINERS | 15 +- + drivers/platform/surface/Kconfig | 38 + + drivers/platform/surface/Makefile | 3 + + drivers/platform/surface/aggregator/Kconfig | 68 + + drivers/platform/surface/aggregator/Makefile | 17 + + drivers/platform/surface/aggregator/bus.c | 415 ++++ + drivers/platform/surface/aggregator/bus.h | 27 + + drivers/platform/surface/aggregator/controller.c | 2579 ++++++++++++++++++++ + drivers/platform/surface/aggregator/controller.h | 285 +++ + drivers/platform/surface/aggregator/core.c | 839 +++++++ + drivers/platform/surface/aggregator/ssh_msgb.h | 205 ++ + .../platform/surface/aggregator/ssh_packet_layer.c | 2057 ++++++++++++++++ + .../platform/surface/aggregator/ssh_packet_layer.h | 190 ++ + drivers/platform/surface/aggregator/ssh_parser.c | 228 ++ + drivers/platform/surface/aggregator/ssh_parser.h | 154 ++ + .../surface/aggregator/ssh_request_layer.c | 1263 ++++++++++ + .../surface/aggregator/ssh_request_layer.h | 143 ++ + drivers/platform/surface/aggregator/trace.h | 632 +++++ + drivers/platform/surface/surface_acpi_notify.c | 886 +++++++ + drivers/platform/surface/surface_aggregator_cdev.c | 322 +++ + include/linux/mod_devicetable.h | 18 + + include/linux/sony-laptop.h | 2 +- + include/linux/surface_acpi_notify.h | 39 + + include/linux/surface_aggregator/controller.h | 824 +++++++ + include/linux/surface_aggregator/device.h | 423 ++++ + include/linux/surface_aggregator/serial_hub.h | 672 +++++ + include/uapi/linux/surface_aggregator/cdev.h | 78 + + scripts/mod/devicetable-offsets.c | 8 + + scripts/mod/file2alias.c | 23 + + 41 files changed, 14123 insertions(+), 2 deletions(-) + create mode 100644 Documentation/driver-api/surface_aggregator/client-api.rst + create mode 100644 Documentation/driver-api/surface_aggregator/client.rst + create mode 100644 Documentation/driver-api/surface_aggregator/clients/cdev.rst + create mode 100644 Documentation/driver-api/surface_aggregator/clients/index.rst + create mode 100644 Documentation/driver-api/surface_aggregator/clients/san.rst + create mode 100644 Documentation/driver-api/surface_aggregator/index.rst + create mode 100644 Documentation/driver-api/surface_aggregator/internal-api.rst + create mode 100644 Documentation/driver-api/surface_aggregator/internal.rst + create mode 100644 Documentation/driver-api/surface_aggregator/overview.rst + create mode 100644 Documentation/driver-api/surface_aggregator/ssh.rst + create mode 100644 drivers/platform/surface/aggregator/Kconfig + create mode 100644 drivers/platform/surface/aggregator/Makefile + create mode 100644 drivers/platform/surface/aggregator/bus.c + create mode 100644 drivers/platform/surface/aggregator/bus.h + create mode 100644 drivers/platform/surface/aggregator/controller.c + create mode 100644 drivers/platform/surface/aggregator/controller.h + create mode 100644 drivers/platform/surface/aggregator/core.c + create mode 100644 drivers/platform/surface/aggregator/ssh_msgb.h + create mode 100644 drivers/platform/surface/aggregator/ssh_packet_layer.c + create mode 100644 drivers/platform/surface/aggregator/ssh_packet_layer.h + create mode 100644 drivers/platform/surface/aggregator/ssh_parser.c + create mode 100644 drivers/platform/surface/aggregator/ssh_parser.h + create mode 100644 drivers/platform/surface/aggregator/ssh_request_layer.c + create mode 100644 drivers/platform/surface/aggregator/ssh_request_layer.h + create mode 100644 drivers/platform/surface/aggregator/trace.h + create mode 100644 drivers/platform/surface/surface_acpi_notify.c + create mode 100644 drivers/platform/surface/surface_aggregator_cdev.c + create mode 100644 include/linux/surface_acpi_notify.h + create mode 100644 include/linux/surface_aggregator/controller.h + create mode 100644 include/linux/surface_aggregator/device.h + create mode 100644 include/linux/surface_aggregator/serial_hub.h + create mode 100644 include/uapi/linux/surface_aggregator/cdev.h +Merging chrome-platform/for-next (4c2e9b3e1896 platform/chrome: cros_ec_sysfs: Add cold-ap-off to sysfs reboot.) +$ git merge chrome-platform/for-next +Auto-merging include/linux/platform_data/cros_ec_commands.h +Merge made by the 'recursive' strategy. + drivers/platform/chrome/cros_ec_lightbar.c | 2 +- + drivers/platform/chrome/cros_ec_proto.c | 12 +- + drivers/platform/chrome/cros_ec_sysfs.c | 5 +- + drivers/platform/chrome/cros_ec_typec.c | 247 +++++++++++++++++++++---- + drivers/platform/chrome/cros_ec_vbc.c | 2 +- + drivers/platform/chrome/wilco_ec/sysfs.c | 2 +- + include/linux/platform_data/cros_ec_commands.h | 18 ++ + 7 files changed, 237 insertions(+), 51 deletions(-) +Merging hsi/for-next (aa57e77b3d28 HSI: Fix PM usage counter unbalance in ssi_hw_init) +$ git merge hsi/for-next +Merge made by the 'recursive' strategy. + drivers/hsi/controllers/omap_ssi_core.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging leds/for-next (9a5ad5c5b2d2 leds: trigger: fix potential deadlock with libata) +$ git merge leds/for-next +Merge made by the 'recursive' strategy. + drivers/leds/led-triggers.c | 10 ++++++---- + drivers/leds/leds-ariel.c | 6 +++--- + drivers/leds/leds-blinkm.c | 24 ++++++++++++------------ + drivers/leds/leds-gpio.c | 3 ++- + drivers/leds/leds-lm3530.c | 10 +++++----- + drivers/leds/leds-lm3533.c | 4 ++-- + drivers/leds/leds-lm355x.c | 8 ++++---- + drivers/leds/leds-lm3642.c | 16 ++++++++-------- + drivers/leds/leds-max8997.c | 12 ++++++------ + drivers/leds/leds-netxbig.c | 12 ++++++------ + drivers/leds/leds-ss4200.c | 18 +++++++----------- + drivers/leds/leds-wm831x-status.c | 12 ++++++------ + 12 files changed, 67 insertions(+), 68 deletions(-) +Merging ipmi/for-next (dea8dcf2a9fa Merge tag 'for-5.11/dm-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm) +$ git merge ipmi/for-next +Already up to date. +Merging driver-core/driver-core-next (3ac6e56c325e Revert "drivers: core: Detach device from power domain on shutdown") +$ git merge driver-core/driver-core-next +Auto-merging include/linux/device.h +Auto-merging drivers/base/core.c +Auto-merging drivers/base/Kconfig +Merge made by the 'recursive' strategy. + drivers/base/Kconfig | 2 +- + drivers/base/bus.c | 17 --------- + drivers/base/core.c | 101 ++++++++++++++++++++++++++++++++++++++++++------- + include/linux/device.h | 2 + + 4 files changed, 91 insertions(+), 31 deletions(-) +Merging usb/usb-next (7a79f1f7f7e7 dt-bindings: usb: qcom,dwc3: Add bindings for SM8150, SM8250, SM8350) +$ git merge usb/usb-next +Auto-merging include/linux/usb/composite.h +Auto-merging drivers/usb/typec/ucsi/ucsi.c +Removing drivers/usb/host/ehci-tegra.c +Auto-merging drivers/usb/gadget/udc/core.c +Removing drivers/usb/gadget/udc/bdc/bdc_pci.c +Auto-merging drivers/usb/gadget/udc/bdc/Kconfig +CONFLICT (content): Merge conflict in drivers/usb/gadget/udc/bdc/Kconfig +Auto-merging arch/arm64/boot/dts/freescale/imx8mp.dtsi +Auto-merging arch/arm/configs/tegra_defconfig +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/usb/usb-xhci.txt +Removing Documentation/devicetree/bindings/usb/usb-device.txt +Auto-merging Documentation/devicetree/bindings/usb/ti,keystone-dwc3.yaml +Removing Documentation/devicetree/bindings/usb/mediatek,musb.txt +Removing Documentation/devicetree/bindings/usb/mediatek,mtu3.txt +Removing Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.txt +Removing Documentation/devicetree/bindings/usb/generic.txt +Removing Documentation/devicetree/bindings/usb/dwc3.txt +Resolved 'drivers/usb/gadget/udc/bdc/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 8f3ae4016e48] Merge remote-tracking branch 'usb/usb-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/net/btusb.txt | 2 +- + .../bindings/usb/amlogic,meson-g12a-usb-ctrl.yaml | 6 +- + Documentation/devicetree/bindings/usb/dwc3-st.txt | 4 +- + Documentation/devicetree/bindings/usb/dwc3.txt | 128 ----- + .../devicetree/bindings/usb/exynos-usb.txt | 2 +- + .../devicetree/bindings/usb/fsl,imx8mp-dwc3.yaml | 105 ++++ + .../devicetree/bindings/usb/generic-xhci.yaml | 65 +++ + Documentation/devicetree/bindings/usb/generic.txt | 57 -- + .../bindings/usb/intel,keembay-dwc3.yaml | 9 +- + .../devicetree/bindings/usb/mediatek,mtk-xhci.txt | 121 ----- + .../devicetree/bindings/usb/mediatek,mtk-xhci.yaml | 178 ++++++ + .../devicetree/bindings/usb/mediatek,mtu3.txt | 108 ---- + .../devicetree/bindings/usb/mediatek,mtu3.yaml | 287 ++++++++++ + .../devicetree/bindings/usb/mediatek,musb.txt | 57 -- + .../devicetree/bindings/usb/mediatek,musb.yaml | 113 ++++ + Documentation/devicetree/bindings/usb/omap-usb.txt | 2 +- + .../devicetree/bindings/usb/qcom,dwc3.yaml | 13 +- + .../devicetree/bindings/usb/renesas,usb-xhci.yaml | 4 +- + .../devicetree/bindings/usb/snps,dwc3.yaml | 332 +++++++++++ + .../devicetree/bindings/usb/ti,keystone-dwc3.yaml | 4 +- + .../devicetree/bindings/usb/usb-device.txt | 102 ---- + .../devicetree/bindings/usb/usb-device.yaml | 124 +++++ + Documentation/devicetree/bindings/usb/usb-drd.yaml | 78 +++ + Documentation/devicetree/bindings/usb/usb-hcd.yaml | 36 +- + Documentation/devicetree/bindings/usb/usb-xhci.txt | 41 -- + .../devicetree/bindings/usb/usb-xhci.yaml | 42 ++ + Documentation/devicetree/bindings/usb/usb.yaml | 60 ++ + Documentation/usb/gadget-testing.rst | 30 +- + MAINTAINERS | 4 +- + arch/arm/configs/tegra_defconfig | 3 +- + arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 21 + + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 82 +++ + drivers/base/swnode.c | 71 ++- + drivers/usb/chipidea/Kconfig | 3 +- + drivers/usb/chipidea/ci_hdrc_tegra.c | 344 ++++++++++-- + drivers/usb/chipidea/core.c | 10 +- + drivers/usb/chipidea/host.c | 104 +++- + drivers/usb/class/usbtmc.c | 85 ++- + drivers/usb/dwc2/params.c | 8 + + drivers/usb/dwc3/Kconfig | 10 + + drivers/usb/dwc3/Makefile | 1 + + drivers/usb/dwc3/core.c | 46 +- + drivers/usb/dwc3/core.h | 2 + + drivers/usb/dwc3/drd.c | 25 +- + drivers/usb/dwc3/dwc3-imx8mp.c | 363 +++++++++++++ + drivers/usb/dwc3/dwc3-keystone.c | 9 +- + drivers/usb/dwc3/dwc3-pci.c | 69 ++- + drivers/usb/dwc3/dwc3-qcom.c | 59 +- + drivers/usb/dwc3/gadget.c | 131 +++-- + drivers/usb/gadget/composite.c | 104 +++- + drivers/usb/gadget/configfs.c | 24 +- + drivers/usb/gadget/function/f_midi.c | 12 +- + drivers/usb/gadget/function/f_printer.c | 5 + + drivers/usb/gadget/function/u_audio.c | 135 +++-- + drivers/usb/gadget/function/u_ether.c | 33 +- + drivers/usb/gadget/function/u_ether.h | 12 + + drivers/usb/gadget/function/u_ether_configfs.h | 15 +- + drivers/usb/gadget/function/u_serial.c | 8 +- + drivers/usb/gadget/udc/bdc/Kconfig | 11 - + drivers/usb/gadget/udc/bdc/Makefile | 2 - + drivers/usb/gadget/udc/bdc/bdc.h | 134 ++--- + drivers/usb/gadget/udc/bdc/bdc_cmd.c | 2 +- + drivers/usb/gadget/udc/bdc/bdc_cmd.h | 21 +- + drivers/usb/gadget/udc/bdc/bdc_dbg.c | 2 +- + drivers/usb/gadget/udc/bdc/bdc_dbg.h | 10 +- + drivers/usb/gadget/udc/bdc/bdc_ep.c | 16 +- + drivers/usb/gadget/udc/bdc/bdc_ep.h | 10 +- + drivers/usb/gadget/udc/bdc/bdc_pci.c | 128 ----- + drivers/usb/gadget/udc/bdc/bdc_udc.c | 8 +- + drivers/usb/gadget/udc/core.c | 39 +- + drivers/usb/gadget/udc/snps_udc_core.c | 30 +- + drivers/usb/gadget/udc/udc-xilinx.c | 2 +- + drivers/usb/host/Kconfig | 10 +- + drivers/usb/host/Makefile | 1 - + drivers/usb/host/ehci-tegra.c | 604 --------------------- + drivers/usb/phy/phy-mxs-usb.c | 7 +- + drivers/usb/phy/phy-tegra-usb.c | 103 +++- + drivers/usb/typec/ucsi/Kconfig | 1 + + drivers/usb/typec/ucsi/ucsi.c | 55 +- + drivers/usb/typec/ucsi/ucsi.h | 3 + + drivers/usb/usbip/stub_main.c | 4 +- + drivers/usb/usbip/usbip_common.h | 29 + + drivers/usb/usbip/vhci_rx.c | 2 + + drivers/usb/usbip/vhci_sysfs.c | 1 + + include/linux/property.h | 3 + + include/linux/usb/ch9.h | 9 + + include/linux/usb/chipidea.h | 6 + + include/linux/usb/composite.h | 2 + + include/linux/usb/gadget.h | 11 + + include/linux/usb/tegra_usb_phy.h | 2 + + include/uapi/linux/usb/ch9.h | 13 + + include/uapi/linux/usb/tmc.h | 3 + + 92 files changed, 3296 insertions(+), 1896 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/usb/dwc3.txt + create mode 100644 Documentation/devicetree/bindings/usb/fsl,imx8mp-dwc3.yaml + create mode 100644 Documentation/devicetree/bindings/usb/generic-xhci.yaml + delete mode 100644 Documentation/devicetree/bindings/usb/generic.txt + delete mode 100644 Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.txt + create mode 100644 Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml + delete mode 100644 Documentation/devicetree/bindings/usb/mediatek,mtu3.txt + create mode 100644 Documentation/devicetree/bindings/usb/mediatek,mtu3.yaml + delete mode 100644 Documentation/devicetree/bindings/usb/mediatek,musb.txt + create mode 100644 Documentation/devicetree/bindings/usb/mediatek,musb.yaml + create mode 100644 Documentation/devicetree/bindings/usb/snps,dwc3.yaml + delete mode 100644 Documentation/devicetree/bindings/usb/usb-device.txt + create mode 100644 Documentation/devicetree/bindings/usb/usb-device.yaml + create mode 100644 Documentation/devicetree/bindings/usb/usb-drd.yaml + delete mode 100644 Documentation/devicetree/bindings/usb/usb-xhci.txt + create mode 100644 Documentation/devicetree/bindings/usb/usb-xhci.yaml + create mode 100644 Documentation/devicetree/bindings/usb/usb.yaml + create mode 100644 drivers/usb/dwc3/dwc3-imx8mp.c + delete mode 100644 drivers/usb/gadget/udc/bdc/bdc_pci.c + delete mode 100644 drivers/usb/host/ehci-tegra.c +Merging usb-gadget/next (b2c586eb07ef usb: dwc2: Fix INTR OUT transfers in DDMA mode.) +$ git merge usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (5f6225a7fb2c USB: cdc-acm: ignore Exar XR21V141X when serial driver is built) +$ git merge usb-serial/usb-next +Auto-merging drivers/usb/serial/cp210x.c +Merge made by the 'recursive' strategy. + drivers/usb/class/cdc-acm.c | 6 + + drivers/usb/serial/Kconfig | 9 + + drivers/usb/serial/Makefile | 1 + + drivers/usb/serial/cp210x.c | 100 +++++-- + drivers/usb/serial/f81232.c | 12 +- + drivers/usb/serial/f81534.c | 4 +- + drivers/usb/serial/io_ti.c | 8 +- + drivers/usb/serial/mos7720.c | 4 +- + drivers/usb/serial/mxuport.c | 7 - + drivers/usb/serial/pl2303.c | 8 +- + drivers/usb/serial/upd78f0730.c | 5 +- + drivers/usb/serial/xr_serial.c | 595 ++++++++++++++++++++++++++++++++++++++++ + 12 files changed, 708 insertions(+), 51 deletions(-) + create mode 100644 drivers/usb/serial/xr_serial.c +Merging usb-chipidea-next/for-usb-next (9fd53a5bd129 usb: cdnsp: fixes undefined reference to cdns_remove) +$ git merge usb-chipidea-next/for-usb-next +Auto-merging drivers/usb/cdns3/cdns3-imx.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 9 + + drivers/usb/Makefile | 2 + + drivers/usb/cdns3/Kconfig | 60 +- + drivers/usb/cdns3/Makefile | 43 +- + drivers/usb/cdns3/{debug.h => cdns3-debug.h} | 0 + drivers/usb/cdns3/{ep0.c => cdns3-ep0.c} | 8 +- + drivers/usb/cdns3/{gadget.c => cdns3-gadget.c} | 34 +- + drivers/usb/cdns3/{gadget.h => cdns3-gadget.h} | 0 + drivers/usb/cdns3/cdns3-imx.c | 2 +- + drivers/usb/cdns3/cdns3-plat.c | 315 +++ + drivers/usb/cdns3/{trace.c => cdns3-trace.c} | 2 +- + drivers/usb/cdns3/{trace.h => cdns3-trace.h} | 6 +- + drivers/usb/cdns3/cdnsp-debug.h | 583 ++++++ + drivers/usb/cdns3/cdnsp-ep0.c | 494 +++++ + drivers/usb/cdns3/cdnsp-gadget.c | 2011 +++++++++++++++++++ + drivers/usb/cdns3/cdnsp-gadget.h | 1601 ++++++++++++++++ + drivers/usb/cdns3/cdnsp-mem.c | 1336 +++++++++++++ + drivers/usb/cdns3/cdnsp-pci.c | 254 +++ + drivers/usb/cdns3/cdnsp-ring.c | 2439 ++++++++++++++++++++++++ + drivers/usb/cdns3/cdnsp-trace.c | 12 + + drivers/usb/cdns3/cdnsp-trace.h | 840 ++++++++ + drivers/usb/cdns3/core.c | 455 ++--- + drivers/usb/cdns3/core.h | 65 +- + drivers/usb/cdns3/drd.c | 224 ++- + drivers/usb/cdns3/drd.h | 94 +- + drivers/usb/cdns3/gadget-export.h | 22 +- + drivers/usb/cdns3/host-export.h | 18 +- + drivers/usb/cdns3/host.c | 26 +- + 28 files changed, 10432 insertions(+), 523 deletions(-) + rename drivers/usb/cdns3/{debug.h => cdns3-debug.h} (100%) + rename drivers/usb/cdns3/{ep0.c => cdns3-ep0.c} (99%) + rename drivers/usb/cdns3/{gadget.c => cdns3-gadget.c} (99%) + rename drivers/usb/cdns3/{gadget.h => cdns3-gadget.h} (100%) + create mode 100644 drivers/usb/cdns3/cdns3-plat.c + rename drivers/usb/cdns3/{trace.c => cdns3-trace.c} (89%) + rename drivers/usb/cdns3/{trace.h => cdns3-trace.h} (99%) + create mode 100644 drivers/usb/cdns3/cdnsp-debug.h + create mode 100644 drivers/usb/cdns3/cdnsp-ep0.c + create mode 100644 drivers/usb/cdns3/cdnsp-gadget.c + create mode 100644 drivers/usb/cdns3/cdnsp-gadget.h + create mode 100644 drivers/usb/cdns3/cdnsp-mem.c + create mode 100644 drivers/usb/cdns3/cdnsp-pci.c + create mode 100644 drivers/usb/cdns3/cdnsp-ring.c + create mode 100644 drivers/usb/cdns3/cdnsp-trace.c + create mode 100644 drivers/usb/cdns3/cdnsp-trace.h +Merging phy-next/next (71edb0b4fa0e dt-bindings: phy: qcom-qusb2: Document SDM660 compatible) +$ git merge phy-next/next +Removing Documentation/devicetree/bindings/phy/phy-mtk-xsphy.txt +Removing Documentation/devicetree/bindings/phy/phy-mtk-ufs.txt +Removing Documentation/devicetree/bindings/phy/phy-mtk-tphy.txt +Removing Documentation/devicetree/bindings/phy/brcm,brcmstb-usb-phy.txt +Merge made by the 'recursive' strategy. + .../bindings/display/mediatek/mediatek,dsi.txt | 18 +- + .../bindings/display/mediatek/mediatek,hdmi.txt | 18 +- + .../bindings/phy/brcm,brcmstb-usb-phy.txt | 86 ------ + .../bindings/phy/brcm,brcmstb-usb-phy.yaml | 196 ++++++++++++++ + .../devicetree/bindings/phy/mediatek,dsi-phy.yaml | 85 ++++++ + .../devicetree/bindings/phy/mediatek,hdmi-phy.yaml | 92 +++++++ + .../devicetree/bindings/phy/mediatek,tphy.yaml | 260 ++++++++++++++++++ + .../devicetree/bindings/phy/mediatek,ufs-phy.yaml | 64 +++++ + .../devicetree/bindings/phy/mediatek,xsphy.yaml | 199 ++++++++++++++ + .../devicetree/bindings/phy/phy-mtk-tphy.txt | 162 ----------- + .../devicetree/bindings/phy/phy-mtk-ufs.txt | 38 --- + .../devicetree/bindings/phy/phy-mtk-xsphy.txt | 109 -------- + .../devicetree/bindings/phy/phy-stm32-usbphyc.yaml | 22 +- + .../devicetree/bindings/phy/qcom,qmp-phy.yaml | 94 +++++++ + .../devicetree/bindings/phy/qcom,qusb2-phy.yaml | 1 + + .../bindings/phy/qcom,usb-snps-femto-v2.yaml | 2 + + .../devicetree/bindings/phy/ti,phy-j721e-wiz.yaml | 2 +- + drivers/phy/broadcom/Kconfig | 3 +- + drivers/phy/broadcom/phy-brcm-usb.c | 18 +- + drivers/phy/cadence/phy-cadence-torrent.c | 1 + + drivers/phy/ingenic/phy-ingenic-usb.c | 23 -- + drivers/phy/mediatek/phy-mtk-mipi-dsi.c | 2 +- + drivers/phy/qualcomm/phy-qcom-qmp.c | 295 +++++++++++++++++++++ + drivers/phy/qualcomm/phy-qcom-qmp.h | 100 +++++++ + drivers/phy/qualcomm/phy-qcom-qusb2.c | 30 ++- + drivers/phy/st/phy-stm32-usbphyc.c | 222 ++++++++++------ + 26 files changed, 1587 insertions(+), 555 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/phy/brcm,brcmstb-usb-phy.txt + create mode 100644 Documentation/devicetree/bindings/phy/brcm,brcmstb-usb-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/mediatek,dsi-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/mediatek,hdmi-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/mediatek,tphy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/mediatek,ufs-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/mediatek,xsphy.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/phy-mtk-tphy.txt + delete mode 100644 Documentation/devicetree/bindings/phy/phy-mtk-ufs.txt + delete mode 100644 Documentation/devicetree/bindings/phy/phy-mtk-xsphy.txt +Merging tty/tty-next (3cfade53c773 Merge branch 'tty-splice' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into tty-next) +$ git merge tty/tty-next +Removing include/linux/platform_data/efm32-uart.h +Removing include/linux/kd.h +Removing drivers/tty/serial/sirfsoc_uart.h +Removing drivers/tty/serial/sirfsoc_uart.c +Removing drivers/tty/serial/efm32-uart.c +Auto-merging drivers/bluetooth/hci_ldisc.c +Removing Documentation/devicetree/bindings/serial/sirf-uart.txt +Auto-merging Documentation/devicetree/bindings/serial/renesas,hscif.yaml +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-class-led-trigger-tty | 6 + + .../devicetree/bindings/serial/renesas,hscif.yaml | 1 + + .../devicetree/bindings/serial/sirf-uart.txt | 34 - + .../devicetree/bindings/serial/st,stm32-uart.yaml | 13 +- + Documentation/networking/caif/caif.rst | 1 - + drivers/accessibility/speakup/spk_ttyio.c | 2 +- + drivers/bluetooth/hci_ldisc.c | 34 +- + drivers/char/pcmcia/synclink_cs.c | 2 - + drivers/input/serio/serport.c | 4 +- + drivers/leds/trigger/Kconfig | 9 + + drivers/leds/trigger/Makefile | 1 + + drivers/leds/trigger/ledtrig-tty.c | 183 +++ + drivers/net/caif/caif_serial.c | 3 +- + drivers/net/ppp/ppp_async.c | 3 +- + drivers/net/ppp/ppp_synctty.c | 3 +- + drivers/s390/char/con3215.c | 1 - + drivers/s390/char/sclp_tty.c | 1 - + drivers/s390/char/sclp_vt220.c | 1 - + drivers/s390/char/tty3270.c | 2 - + drivers/tty/amiserial.c | 3 - + drivers/tty/hvc/hvcs.c | 5 +- + drivers/tty/ipwireless/tty.c | 1 - + drivers/tty/mxser.c | 1 - + drivers/tty/n_gsm.c | 3 +- + drivers/tty/n_hdlc.c | 60 +- + drivers/tty/n_null.c | 3 +- + drivers/tty/n_r3964.c | 10 +- + drivers/tty/n_tracerouter.c | 4 +- + drivers/tty/n_tracesink.c | 4 +- + drivers/tty/n_tty.c | 153 +- + drivers/tty/pty.c | 16 +- + drivers/tty/serial/8250/8250_tegra.c | 11 +- + drivers/tty/serial/Kconfig | 35 - + drivers/tty/serial/Makefile | 2 - + drivers/tty/serial/cpm_uart/cpm_uart_core.c | 43 +- + drivers/tty/serial/efm32-uart.c | 852 ----------- + drivers/tty/serial/fsl_lpuart.c | 4 +- + drivers/tty/serial/icom.c | 4 +- + drivers/tty/serial/ifx6x60.c | 3 - + drivers/tty/serial/imx.c | 2 +- + drivers/tty/serial/lantiq.c | 2 +- + drivers/tty/serial/max3100.c | 3 - + drivers/tty/serial/mxs-auart.c | 45 +- + drivers/tty/serial/owl-uart.c | 38 + + drivers/tty/serial/serial_core.c | 3 - + drivers/tty/serial/sirfsoc_uart.c | 1503 -------------------- + drivers/tty/serial/sirfsoc_uart.h | 447 ------ + drivers/tty/serial/stm32-usart.c | 415 +++--- + drivers/tty/synclink_gt.c | 1 - + drivers/tty/tty_io.c | 200 ++- + drivers/tty/vcc.c | 10 +- + drivers/tty/vt/consolemap.c | 2 +- + drivers/tty/vt/defkeymap.c_shipped | 82 +- + drivers/tty/vt/keyboard.c | 16 +- + drivers/tty/vt/vt.c | 42 +- + drivers/tty/vt/vt_ioctl.c | 151 -- + drivers/video/console/vgacon.c | 19 - + include/linux/kbd_kern.h | 10 +- + include/linux/kd.h | 8 - + include/linux/platform_data/efm32-uart.h | 19 - + include/linux/tty.h | 11 +- + include/linux/tty_ldisc.h | 3 +- + include/linux/vt_kern.h | 12 - + include/uapi/linux/serial_core.h | 3 - + include/uapi/linux/termios.h | 15 - + net/nfc/nci/uart.c | 3 +- + 66 files changed, 939 insertions(+), 3647 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-led-trigger-tty + delete mode 100644 Documentation/devicetree/bindings/serial/sirf-uart.txt + create mode 100644 drivers/leds/trigger/ledtrig-tty.c + delete mode 100644 drivers/tty/serial/efm32-uart.c + delete mode 100644 drivers/tty/serial/sirfsoc_uart.c + delete mode 100644 drivers/tty/serial/sirfsoc_uart.h + delete mode 100644 include/linux/kd.h + delete mode 100644 include/linux/platform_data/efm32-uart.h +Merging char-misc/char-misc-next (f6f1f8e6e3ee misc: eeprom_93xx46: Add quirk to support Microchip 93LC46B eeprom) +$ git merge char-misc/char-misc-next +Auto-merging scripts/mod/file2alias.c +CONFLICT (content): Merge conflict in scripts/mod/file2alias.c +Auto-merging scripts/mod/devicetable-offsets.c +CONFLICT (content): Merge conflict in scripts/mod/devicetable-offsets.c +Auto-merging include/linux/mod_devicetable.h +CONFLICT (content): Merge conflict in include/linux/mod_devicetable.h +Removing drivers/misc/atmel_tclib.c +Auto-merging drivers/memory/Kconfig +Auto-merging drivers/bus/fsl-mc/fsl-mc-bus.c +Auto-merging MAINTAINERS +Resolved 'include/linux/mod_devicetable.h' using previous resolution. +Resolved 'scripts/mod/devicetable-offsets.c' using previous resolution. +Resolved 'scripts/mod/file2alias.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 0809d4cca94c] Merge remote-tracking branch 'char-misc/char-misc-next' +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-bus-dfl-devices-emif | 25 + + .../ABI/testing/sysfs-bus-dfl-devices-n3000-nios | 47 ++ + .../devicetree/bindings/misc/eeprom-93xx46.txt | 1 + + Documentation/fpga/dfl.rst | 28 + + MAINTAINERS | 3 +- + drivers/bus/fsl-mc/fsl-mc-bus.c | 2 +- + drivers/fpga/Kconfig | 11 + + drivers/fpga/Makefile | 2 + + drivers/fpga/dfl-fme-perf.c | 6 +- + drivers/fpga/dfl-n3000-nios.c | 588 +++++++++++++++++++++ + drivers/fpga/dfl-pci.c | 165 ++++-- + drivers/fpga/dfl.c | 4 +- + drivers/fpga/dfl.h | 85 +-- + drivers/fpga/fpga-bridge.c | 4 +- + drivers/greybus/greybus_trace.h | 6 +- + drivers/memory/Kconfig | 9 + + drivers/memory/Makefile | 2 + + drivers/memory/dfl-emif.c | 207 ++++++++ + drivers/misc/Kconfig | 8 - + drivers/misc/Makefile | 1 - + drivers/misc/atmel_tclib.c | 200 ------- + drivers/misc/cardreader/rtsx_pcr.c | 6 - + drivers/misc/eeprom/eeprom_93xx46.c | 17 + + drivers/misc/ocxl/file.c | 3 +- + drivers/w1/masters/ds2490.c | 25 +- + drivers/w1/w1.c | 39 +- + include/linux/dfl.h | 86 +++ + include/linux/eeprom_93xx46.h | 2 + + include/linux/mod_devicetable.h | 24 + + scripts/mod/devicetable-offsets.c | 4 + + scripts/mod/file2alias.c | 13 + + 31 files changed, 1267 insertions(+), 356 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-dfl-devices-emif + create mode 100644 Documentation/ABI/testing/sysfs-bus-dfl-devices-n3000-nios + create mode 100644 drivers/fpga/dfl-n3000-nios.c + create mode 100644 drivers/memory/dfl-emif.c + delete mode 100644 drivers/misc/atmel_tclib.c + create mode 100644 include/linux/dfl.h +Merging extcon/extcon-next (226d336c1c75 extcon: max8997: Add CHGINS and CHGRM interrupt handling) +$ git merge extcon/extcon-next +Merge made by the 'recursive' strategy. + drivers/extcon/extcon-max8997.c | 4 ++++ + include/linux/extcon.h | 23 +++++++++++++++++++++++ + 2 files changed, 27 insertions(+) +Merging soundwire/next (9a0c798c7a98 soundwire: cadence: adjust verbosity in response handling) +$ git merge soundwire/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + drivers/soundwire/bus.c | 11 ++++++----- + drivers/soundwire/cadence_master.c | 31 ++++++++++++++++--------------- + drivers/soundwire/debugfs.c | 2 +- + drivers/soundwire/intel.c | 8 +++++--- + drivers/soundwire/slave.c | 10 ++++------ + drivers/soundwire/sysfs_slave.c | 2 +- + 7 files changed, 34 insertions(+), 31 deletions(-) +Merging thunderbolt/next (3da88be24997 thunderbolt: Add support for de-authorizing devices) +$ git merge thunderbolt/next +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-bus-thunderbolt | 20 ++++++-- + Documentation/admin-guide/thunderbolt.rst | 16 +++++++ + drivers/thunderbolt/dma_test.c | 4 +- + drivers/thunderbolt/domain.c | 34 +++++++++++-- + drivers/thunderbolt/lc.c | 35 ++++++++++++++ + drivers/thunderbolt/switch.c | 63 +++++++++++++++++++++++-- + drivers/thunderbolt/tb.c | 20 ++++++++ + drivers/thunderbolt/tb.h | 4 ++ + drivers/thunderbolt/tb_regs.h | 1 + + drivers/thunderbolt/xdomain.c | 4 +- + 10 files changed, 186 insertions(+), 15 deletions(-) +Merging vfio/next (bdfae1c9a913 vfio/type1: Add vfio_group_iommu_domain()) +$ git merge vfio/next +Already up to date. +Merging staging/staging-next (3dba1da360da Merge 5.11-rc3 into staging-next) +$ git merge staging/staging-next +Merge made by the 'recursive' strategy. + drivers/staging/android/ashmem.c | 2 +- + drivers/staging/board/Kconfig | 9 ++- + drivers/staging/fwserial/fwserial.c | 2 + + drivers/staging/greybus/light.c | 3 +- + drivers/staging/most/net/net.c | 3 +- + drivers/staging/mt7621-dts/mt7621.dtsi | 51 ++++++------ + drivers/staging/rtl8192e/Kconfig | 1 + + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 4 +- + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 4 +- + drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 4 +- + drivers/staging/rtl8192e/rtllib_rx.c | 5 +- + drivers/staging/rtl8192e/rtllib_tx.c | 8 +- + drivers/staging/rtl8192u/Kconfig | 1 + + drivers/staging/rtl8192u/r8192U_core.c | 2 + + drivers/staging/rtl8723bs/core/rtw_security.c | 24 ++---- + drivers/staging/unisys/visorhba/visorhba_main.c | 90 ++++------------------ + drivers/staging/vc04_services/interface/TODO | 4 + + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 22 +++--- + .../interface/vchiq_arm/vchiq_connected.c | 3 +- + 19 files changed, 91 insertions(+), 151 deletions(-) +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 (23145465c5b0 Merge branch 'icc-msm8939' into icc-next) +$ git merge icc/icc-next +Removing Documentation/devicetree/bindings/interconnect/qcom,qcs404.yaml +Merge made by the 'recursive' strategy. + .../bindings/interconnect/qcom,qcs404.yaml | 77 ----- + .../{qcom,msm8916.yaml => qcom,rpm.yaml} | 22 +- + drivers/interconnect/qcom/Kconfig | 9 + + drivers/interconnect/qcom/Makefile | 4 +- + drivers/interconnect/qcom/icc-rpm.c | 191 +++++++++++ + drivers/interconnect/qcom/icc-rpm.h | 73 +++++ + drivers/interconnect/qcom/msm8916.c | 241 +------------- + drivers/interconnect/qcom/msm8939.c | 355 +++++++++++++++++++++ + drivers/interconnect/qcom/qcs404.c | 242 +------------- + include/dt-bindings/interconnect/qcom,msm8939.h | 105 ++++++ + 10 files changed, 769 insertions(+), 550 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/interconnect/qcom,qcs404.yaml + rename Documentation/devicetree/bindings/interconnect/{qcom,msm8916.yaml => qcom,rpm.yaml} (77%) + create mode 100644 drivers/interconnect/qcom/icc-rpm.c + create mode 100644 drivers/interconnect/qcom/icc-rpm.h + create mode 100644 drivers/interconnect/qcom/msm8939.c + create mode 100644 include/dt-bindings/interconnect/qcom,msm8939.h +Merging dmaengine/next (c06e424be5f5 dmaengine: idxd: set DMA channel to be private) +$ git merge dmaengine/next +Removing include/linux/platform_data/dma-atmel.h +Auto-merging drivers/dma/ti/k3-udma.c +Auto-merging drivers/dma/qcom/gpi.c +Auto-merging drivers/dma/idxd/dma.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/dma/intel,ldma.yaml | 116 ++ + Documentation/devicetree/bindings/dma/owl-dma.yaml | 7 +- + MAINTAINERS | 1 - + drivers/dma/Kconfig | 2 + + drivers/dma/Makefile | 1 + + drivers/dma/at_hdmac.c | 19 + + drivers/dma/at_hdmac_regs.h | 28 +- + drivers/dma/fsldma.c | 6 + + drivers/dma/hsu/pci.c | 21 +- + drivers/dma/idxd/dma.c | 1 + + drivers/dma/idxd/init.c | 3 +- + drivers/dma/lgm/Kconfig | 9 + + drivers/dma/lgm/Makefile | 2 + + drivers/dma/lgm/lgm-dma.c | 1739 ++++++++++++++++++++ + drivers/dma/owl-dma.c | 4 +- + drivers/dma/qcom/gpi.c | 4 +- + drivers/dma/ti/k3-udma.c | 131 +- + include/linux/dmaengine.h | 2 + + include/linux/platform_data/dma-atmel.h | 61 - + 19 files changed, 2062 insertions(+), 95 deletions(-) + create mode 100644 Documentation/devicetree/bindings/dma/intel,ldma.yaml + create mode 100644 drivers/dma/lgm/Kconfig + create mode 100644 drivers/dma/lgm/Makefile + create mode 100644 drivers/dma/lgm/lgm-dma.c + delete mode 100644 include/linux/platform_data/dma-atmel.h +Merging cgroup/for-next (00bfa16052cd Merge branch 'for-5.11-fixes' into for-next) +$ git merge cgroup/for-next +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/cgroup-v2.rst +Merge made by the 'recursive' strategy. + Documentation/admin-guide/cgroup-v2.rst | 6 ++-- + MAINTAINERS | 6 ++-- + kernel/cgroup/cgroup-v1.c | 3 ++ + kernel/cgroup/cgroup.c | 59 ++++++++++----------------------- + kernel/cgroup/cpuset.c | 6 ++-- + 5 files changed, 28 insertions(+), 52 deletions(-) +Merging scsi/for-next (a7ed11fc0b72 Merge branch 'fixes' into for-next) +$ git merge scsi/for-next +Merge made by the 'recursive' strategy. + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 5 - + drivers/scsi/ibmvscsi/ibmvfc.c | 379 ++++++++++++++++++++++----------- + drivers/scsi/ibmvscsi/ibmvfc.h | 54 +++-- + drivers/scsi/lpfc/lpfc.h | 4 +- + drivers/scsi/lpfc/lpfc_attr.c | 9 +- + drivers/scsi/lpfc/lpfc_crtn.h | 6 +- + drivers/scsi/lpfc/lpfc_disc.h | 15 +- + drivers/scsi/lpfc/lpfc_els.c | 47 ++-- + drivers/scsi/lpfc/lpfc_hbadisc.c | 21 +- + drivers/scsi/lpfc/lpfc_init.c | 241 +++++++++++++-------- + drivers/scsi/lpfc/lpfc_nportdisc.c | 21 +- + drivers/scsi/lpfc/lpfc_nvme.c | 45 ++-- + drivers/scsi/lpfc/lpfc_nvmet.c | 33 ++- + drivers/scsi/lpfc/lpfc_scsi.c | 58 ++++- + drivers/scsi/lpfc/lpfc_sli.c | 141 +++++++----- + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/lpfc/lpfc_vport.c | 2 +- + drivers/scsi/storvsc_drv.c | 58 +++-- + drivers/scsi/ufs/Kconfig | 14 +- + drivers/scsi/ufs/ufs-exynos.c | 8 +- + drivers/scsi/ufs/ufs-mediatek.c | 1 + + drivers/scsi/ufs/ufs-sysfs.c | 30 +-- + drivers/scsi/ufs/ufs.h | 17 ++ + drivers/scsi/ufs/ufshcd.c | 112 ++++++---- + drivers/scsi/ufs/ufshcd.h | 6 + + include/trace/events/ufs.h | 108 ++++++---- + 26 files changed, 946 insertions(+), 491 deletions(-) +Merging scsi-mkp/for-next (348e1bc5f4b7 scsi: ufs: Clean up and refactor clk-scaling feature) +$ git merge scsi-mkp/for-next +Auto-merging drivers/scsi/ufs/ufshcd.c +CONFLICT (content): Merge conflict in drivers/scsi/ufs/ufshcd.c +Auto-merging drivers/scsi/qla2xxx/qla_os.c +Auto-merging drivers/scsi/ibmvscsi/ibmvfc.c +Auto-merging MAINTAINERS +Auto-merging Documentation/ABI/testing/sysfs-driver-ufs +Resolved 'drivers/scsi/ufs/ufshcd.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 2cd8836f780a] Merge remote-tracking branch 'scsi-mkp/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-driver-ufs | 11 + + MAINTAINERS | 1 - + drivers/scsi/aha1542.c | 133 +++-- + drivers/scsi/aha1542.h | 33 +- + drivers/scsi/ibmvscsi/ibmvfc.c | 917 +++++++++++++++++++++++++---- + drivers/scsi/ibmvscsi/ibmvfc.h | 39 ++ + drivers/scsi/isci/request.c | 4 +- + drivers/scsi/lpfc/lpfc_bsg.c | 4 +- + drivers/scsi/lpfc/lpfc_scsi.c | 1 + + drivers/scsi/pm8001/pm8001_hwi.c | 15 +- + drivers/scsi/pm8001/pm8001_init.c | 20 +- + drivers/scsi/pm8001/pm8001_sas.c | 9 + + drivers/scsi/pm8001/pm8001_sas.h | 2 + + drivers/scsi/pm8001/pm80xx_hwi.c | 234 +++++--- + drivers/scsi/pm8001/pm80xx_hwi.h | 17 +- + drivers/scsi/qedf/qedf_main.c | 2 +- + drivers/scsi/qla2xxx/qla_attr.c | 9 + + drivers/scsi/qla2xxx/qla_bsg.c | 342 +++++++++++ + drivers/scsi/qla2xxx/qla_bsg.h | 5 + + drivers/scsi/qla2xxx/qla_dbg.c | 1 + + drivers/scsi/qla2xxx/qla_def.h | 83 +++ + drivers/scsi/qla2xxx/qla_dfs.c | 28 + + drivers/scsi/qla2xxx/qla_fw.h | 27 +- + drivers/scsi/qla2xxx/qla_gbl.h | 29 + + drivers/scsi/qla2xxx/qla_gs.c | 1 + + drivers/scsi/qla2xxx/qla_init.c | 230 +++++++- + drivers/scsi/qla2xxx/qla_iocb.c | 8 + + drivers/scsi/qla2xxx/qla_isr.c | 83 ++- + drivers/scsi/qla2xxx/qla_mbx.c | 18 +- + drivers/scsi/qla2xxx/qla_nvme.c | 91 ++- + drivers/scsi/qla2xxx/qla_os.c | 25 + + drivers/scsi/qla2xxx/qla_version.h | 4 +- + drivers/scsi/scsi_error.c | 23 +- + drivers/scsi/scsi_lib.c | 1 + + drivers/scsi/scsi_transport_fc.c | 118 +++- + drivers/scsi/ufs/Makefile | 13 +- + drivers/scsi/ufs/ufs-debugfs.c | 56 ++ + drivers/scsi/ufs/ufs-debugfs.h | 22 + + drivers/scsi/ufs/ufs-exynos.c | 3 +- + drivers/scsi/ufs/ufs-qcom.c | 18 +- + drivers/scsi/ufs/ufs-sysfs.c | 155 ++++- + drivers/scsi/ufs/ufs.h | 35 +- + drivers/scsi/ufs/ufshcd-crypto.c | 4 +- + drivers/scsi/ufs/ufshcd.c | 416 +++++++------ + drivers/scsi/ufs/ufshcd.h | 35 +- + drivers/target/target_core_file.c | 2 +- + include/scsi/scsi.h | 1 + + include/scsi/scsi_host.h | 6 + + include/scsi/scsi_transport_fc.h | 4 +- + 49 files changed, 2739 insertions(+), 599 deletions(-) + create mode 100644 drivers/scsi/ufs/ufs-debugfs.c + create mode 100644 drivers/scsi/ufs/ufs-debugfs.h +Merging vhost/linux-next (79991caf5202 vdpa_sim_net: Add support for user supported devices) +$ git merge vhost/linux-next +Merge made by the 'recursive' strategy. + drivers/vdpa/Kconfig | 1 + + drivers/vdpa/ifcvf/ifcvf_main.c | 2 +- + drivers/vdpa/mlx5/core/mlx5_vdpa.h | 1 + + drivers/vdpa/mlx5/core/mr.c | 28 +- + drivers/vdpa/mlx5/net/mlx5_vnet.c | 2 +- + drivers/vdpa/vdpa.c | 503 ++++++++++++++++++++++++++++++++++- + drivers/vdpa/vdpa_sim/vdpa_sim.c | 3 +- + drivers/vdpa/vdpa_sim/vdpa_sim.h | 2 + + drivers/vdpa/vdpa_sim/vdpa_sim_net.c | 98 +++++-- + drivers/virtio/virtio_mem.c | 2 +- + include/linux/vdpa.h | 44 ++- + include/uapi/linux/vdpa.h | 40 +++ + 12 files changed, 671 insertions(+), 55 deletions(-) + create mode 100644 include/uapi/linux/vdpa.h +Merging rpmsg/for-next (7cb4f293777e Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/remoteproc/qcom,wcnss-pil.txt | 1 + + MAINTAINERS | 2 ++ + drivers/remoteproc/pru_rproc.c | 18 ++++++++++++++++++ + drivers/remoteproc/qcom_pil_info.c | 2 +- + drivers/remoteproc/qcom_wcnss_iris.c | 1 + + drivers/rpmsg/qcom_glink_ssr.c | 17 +++++++++-------- + include/linux/rpmsg/qcom_glink.h | 8 ++++++-- + 7 files changed, 38 insertions(+), 11 deletions(-) +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 (ba74da3e5d69 selftests: gpio: add CONFIG_GPIO_CDEV to config) +$ git merge gpio-brgl/gpio/for-next +Removing tools/testing/selftests/gpio/gpio-mockup-chardev.c +Auto-merging tools/testing/selftests/Makefile +Auto-merging drivers/gpio/Kconfig +CONFLICT (content): Merge conflict in drivers/gpio/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/gpio/gpio-pca95xx.yaml +Resolved 'drivers/gpio/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 65f0ce01a178] Merge remote-tracking branch 'gpio-brgl/gpio/for-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/gpio/gpio-davinci.txt | 1 + + .../devicetree/bindings/gpio/gpio-pca95xx.yaml | 3 +- + .../bindings/gpio/renesas,rcar-gpio.yaml | 3 + + .../bindings/gpio/toshiba,gpio-visconti.yaml | 70 +++ + Documentation/driver-api/gpio/consumer.rst | 5 +- + Documentation/driver-api/gpio/intro.rst | 8 +- + MAINTAINERS | 2 + + arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts | 4 + + arch/arm64/boot/dts/toshiba/tmpv7708.dtsi | 11 + + drivers/gpio/Kconfig | 16 +- + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio-bd70528.c | 59 ++- + drivers/gpio/gpio-bd71828.c | 39 +- + drivers/gpio/gpio-pca953x.c | 2 + + drivers/gpio/gpio-rcar.c | 85 ++-- + drivers/gpio/gpio-sl28cpld.c | 4 +- + drivers/gpio/gpio-tegra.c | 226 +++++++--- + drivers/gpio/gpio-visconti.c | 218 +++++++++ + drivers/pinctrl/visconti/pinctrl-common.c | 23 + + tools/gpio/gpio-utils.c | 89 ---- + tools/gpio/gpio-utils.h | 6 - + tools/testing/selftests/Makefile | 9 - + tools/testing/selftests/gpio/Makefile | 26 +- + tools/testing/selftests/gpio/config | 1 + + tools/testing/selftests/gpio/gpio-mockup-cdev.c | 198 ++++++++ + tools/testing/selftests/gpio/gpio-mockup-chardev.c | 323 ------------- + tools/testing/selftests/gpio/gpio-mockup-sysfs.sh | 168 +++---- + tools/testing/selftests/gpio/gpio-mockup.sh | 497 ++++++++++++++------- + tools/testing/selftests/kselftest_deps.sh | 4 +- + 29 files changed, 1215 insertions(+), 886 deletions(-) + create mode 100644 Documentation/devicetree/bindings/gpio/toshiba,gpio-visconti.yaml + create mode 100644 drivers/gpio/gpio-visconti.c + create mode 100644 tools/testing/selftests/gpio/gpio-mockup-cdev.c + delete mode 100644 tools/testing/selftests/gpio/gpio-mockup-chardev.c +Merging gpio-intel/for-next (4cfd197609d2 gpio: merrifield: Make bias configuration available for GPIOs) +$ git merge gpio-intel/for-next +Merge made by the 'recursive' strategy. + drivers/gpio/gpio-merrifield.c | 5 +++++ + drivers/gpio/gpio-wcove.c | 2 +- + 2 files changed, 6 insertions(+), 1 deletion(-) +Merging pinctrl/for-next (f205fa436042 Merge branch 'devel' into for-next) +$ git merge pinctrl/for-next +Merge made by the 'recursive' strategy. + .../bindings/pinctrl/microchip,sparx5-sgpio.yaml | 4 +- + .../bindings/pinctrl/ralink,rt2880-pinmux.yaml | 62 +- + .../devicetree/bindings/pinctrl/renesas,pfc.yaml | 3 +- + drivers/pinctrl/actions/pinctrl-owl.c | 1 - + drivers/pinctrl/bcm/pinctrl-ns2-mux.c | 2 +- + drivers/pinctrl/core.c | 1 - + drivers/pinctrl/freescale/pinctrl-imx1-core.c | 1 - + drivers/pinctrl/mediatek/pinctrl-moore.c | 4 +- + drivers/pinctrl/mediatek/pinctrl-paris.c | 4 +- + drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 1 - + drivers/pinctrl/pinctrl-at91.c | 3 +- + drivers/pinctrl/pinctrl-ingenic.c | 60 +- + drivers/pinctrl/pinctrl-st.c | 1 - + drivers/pinctrl/pinctrl-sx150x.c | 1 - + drivers/pinctrl/qcom/pinctrl-sdm845.c | 1 - + drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c | 1 - + drivers/pinctrl/ralink/pinctrl-rt2880.c | 47 +- + drivers/pinctrl/renesas/Kconfig | 5 + + drivers/pinctrl/renesas/Makefile | 1 + + drivers/pinctrl/renesas/core.c | 38 +- + drivers/pinctrl/renesas/pfc-r8a77950.c | 1 - + drivers/pinctrl/renesas/pfc-r8a77951.c | 1 - + drivers/pinctrl/renesas/pfc-r8a7796.c | 1 - + drivers/pinctrl/renesas/pfc-r8a77965.c | 1 - + drivers/pinctrl/renesas/pfc-r8a779a0.c | 4460 ++++++++++++++++++++ + drivers/pinctrl/renesas/pinctrl.c | 16 +- + drivers/pinctrl/renesas/sh_pfc.h | 28 +- + drivers/pinctrl/sprd/pinctrl-sprd.c | 2 +- + drivers/pinctrl/sunxi/pinctrl-sun50i-h6-r.c | 2 + + drivers/pinctrl/ti/pinctrl-ti-iodelay.c | 7 +- + include/linux/kconfig.h | 6 + + 31 files changed, 4652 insertions(+), 114 deletions(-) + create mode 100644 drivers/pinctrl/renesas/pfc-r8a779a0.c +Merging pinctrl-intel/for-next (0e793a4e2834 pinctrl: tigerlake: Add Alder Lake-P ACPI ID) +$ git merge pinctrl-intel/for-next +Merge made by the 'recursive' strategy. + drivers/pinctrl/intel/pinctrl-intel.c | 117 +++++++++++++++++++++--------- + drivers/pinctrl/intel/pinctrl-intel.h | 4 + + drivers/pinctrl/intel/pinctrl-tigerlake.c | 1 + + 3 files changed, 88 insertions(+), 34 deletions(-) +Merging pinctrl-renesas/renesas-pinctrl (a5cda861ed57 pinctrl: renesas: r8a779a0: Add TPU pins, groups and functions) +$ git merge pinctrl-renesas/renesas-pinctrl +Already up to date. +Merging pinctrl-samsung/for-next (5c8fe583cce5 Linux 5.11-rc1) +$ git merge pinctrl-samsung/for-next +Already up to date. +Merging pwm/for-next (a2bc9b21fd3f pwm: Remove ZTE ZX driver) +$ git merge pwm/for-next +Removing drivers/pwm/pwm-zx.c +Removing Documentation/devicetree/bindings/pwm/pwm-zx.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/pwm/pwm-zx.txt | 22 -- + drivers/pwm/Kconfig | 10 - + drivers/pwm/Makefile | 1 - + drivers/pwm/pwm-zx.c | 278 ----------------------- + 4 files changed, 311 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/pwm/pwm-zx.txt + delete mode 100644 drivers/pwm/pwm-zx.c +Merging userns/for-next (95ebabde382c capabilities: Don't allow writing ambiguous v3 file capabilities) +$ git merge userns/for-next +Auto-merging security/commoncap.c +Merge made by the 'recursive' strategy. + security/commoncap.c | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) +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 random/dev (ab9a7e27044b random: avoid warnings for !CONFIG_NUMA builds) +$ git merge random/dev +Already up to date. +Merging kselftest/next (df00d0298902 selftests/vDSO: fix -Wformat warning in vdso_test_correctness) +$ git merge kselftest/next +Already up to date. +Merging y2038/y2038 (c4e71212a245 Revert "drm/etnaviv: reject timeouts with tv_nsec >= NSEC_PER_SEC") +$ git merge y2038/y2038 +Already up to date. +Merging livepatching/for-next (59fc1e476962 Merge branch 'for-5.10/flive-patching' 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. + drivers/hwtracing/coresight/coresight-cti-platform.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) +Merging rtc/rtc-next (12b1ef321a73 rtc: tps65910: remove tps65910_rtc_ops_noirq) +$ git merge rtc/rtc-next +Removing drivers/rtc/rtc-tx4939.c +Merge made by the 'recursive' strategy. + .../bindings/rtc/atmel,at91rm9200-rtc.yaml | 1 + + drivers/rtc/Kconfig | 8 +- + drivers/rtc/Makefile | 1 - + drivers/rtc/class.c | 5 + + drivers/rtc/interface.c | 12 +- + drivers/rtc/rtc-armada38x.c | 21 +- + drivers/rtc/rtc-cmos.c | 12 +- + drivers/rtc/rtc-m41t80.c | 14 +- + drivers/rtc/rtc-m48t59.c | 22 +- + drivers/rtc/rtc-mv.c | 14 +- + drivers/rtc/rtc-opal.c | 27 +- + drivers/rtc/rtc-pcf2127.c | 11 +- + drivers/rtc/rtc-pcf85063.c | 11 +- + drivers/rtc/rtc-pcf85363.c | 8 +- + drivers/rtc/rtc-pl031.c | 8 +- + drivers/rtc/rtc-pm8xxx.c | 9 + + drivers/rtc/rtc-rv3028.c | 11 +- + drivers/rtc/rtc-rv3029c2.c | 11 +- + drivers/rtc/rtc-rv3032.c | 11 +- + drivers/rtc/rtc-rv8803.c | 11 +- + drivers/rtc/rtc-rx6110.c | 4 +- + drivers/rtc/rtc-rx8010.c | 13 +- + drivers/rtc/rtc-s5m.c | 33 +-- + drivers/rtc/rtc-tps65910.c | 15 +- + drivers/rtc/rtc-tx4939.c | 303 --------------------- + include/linux/rtc.h | 2 + + include/uapi/linux/rtc.h | 5 + + 27 files changed, 121 insertions(+), 482 deletions(-) + delete mode 100644 drivers/rtc/rtc-tx4939.c +Merging nvdimm/libnvdimm-for-next (127c3d2e7e8a Merge branch 'for-5.11/dax' into for-5.11/libnvdimm) +$ git merge nvdimm/libnvdimm-for-next +Already up to date. +Merging at24/at24/for-next (5c8fe583cce5 Linux 5.11-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 (2c07343abd89 selftests/seccomp: Update kernel config) +$ git merge seccomp/for-next/seccomp +Already up to date. +Merging kspp/for-next/kspp (112b6a8e038d arm64: allow LTO to be selected) +$ git merge kspp/for-next/kspp +Auto-merging kernel/trace/Kconfig +Auto-merging init/Kconfig +Auto-merging include/linux/pci.h +Auto-merging include/asm-generic/vmlinux.lds.h +CONFLICT (content): Merge conflict in include/asm-generic/vmlinux.lds.h +Auto-merging arch/arm64/kernel/vdso/Makefile +Auto-merging arch/arm64/Kconfig +Auto-merging arch/Kconfig +Auto-merging Makefile +Resolved 'include/asm-generic/vmlinux.lds.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 08a38ac0afb7] Merge remote-tracking branch 'kspp/for-next/kspp' +$ git diff -M --stat --summary HEAD^.. + .gitignore | 1 + + Makefile | 45 ++++-- + arch/Kconfig | 90 ++++++++++++ + arch/arm64/Kconfig | 4 + + arch/arm64/kernel/vdso/Makefile | 3 +- + drivers/firmware/efi/libstub/Makefile | 2 + + drivers/misc/lkdtm/Makefile | 1 + + include/asm-generic/vmlinux.lds.h | 5 +- + include/linux/init.h | 79 ++++++++-- + include/linux/pci.h | 27 +++- + init/Kconfig | 1 + + kernel/trace/Kconfig | 16 ++ + scripts/Makefile.build | 48 +++++- + scripts/Makefile.lib | 6 +- + scripts/Makefile.modfinal | 9 +- + scripts/Makefile.modpost | 25 +++- + scripts/generate_initcall_order.pl | 270 ++++++++++++++++++++++++++++++++++ + scripts/link-vmlinux.sh | 70 +++++++-- + scripts/lto-used-symbollist.txt | 5 + + scripts/mod/Makefile | 1 + + scripts/mod/modpost.c | 16 +- + scripts/mod/modpost.h | 9 ++ + scripts/mod/sumversion.c | 6 +- + scripts/module.lds.S | 24 +++ + 24 files changed, 704 insertions(+), 59 deletions(-) + create mode 100755 scripts/generate_initcall_order.pl + create mode 100644 scripts/lto-used-symbollist.txt +Merging gnss/gnss-next (45d5996e034c 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 (5c8fe583cce5 Linux 5.11-rc1) +$ git merge slimbus/for-next +Already up to date. +Merging nvmem/for-next (2bf4fd065384 nvmem: Add driver to expose reserved memory as nvmem) +$ git merge nvmem/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/nvmem/rmem.yaml | 49 ++++++++++++ + drivers/nvmem/Kconfig | 8 ++ + drivers/nvmem/Makefile | 2 + + drivers/nvmem/core.c | 1 + + drivers/nvmem/imx-iim.c | 7 +- + drivers/nvmem/rmem.c | 97 +++++++++++++++++++++++ + drivers/of/platform.c | 1 + + 7 files changed, 159 insertions(+), 6 deletions(-) + create mode 100644 Documentation/devicetree/bindings/nvmem/rmem.yaml + create mode 100644 drivers/nvmem/rmem.c +Merging xarray/main (80c1dbebf308 XArray: Fix splitting to non-zero orders) +$ git merge xarray/main +Merge made by the 'recursive' strategy. + lib/test_xarray.c | 26 ++++++++++++++------------ + lib/xarray.c | 11 ++++++----- + 2 files changed, 20 insertions(+), 17 deletions(-) +Merging hyperv/hyperv-next (aa7fb666092d Drivers: hv: vmbus: Add /sys/bus/vmbus/hibernation) +$ git merge hyperv/hyperv-next +Auto-merging drivers/scsi/storvsc_drv.c +Auto-merging drivers/net/hyperv/rndis_filter.c +Auto-merging drivers/net/hyperv/netvsc.c +Auto-merging drivers/hv/vmbus_drv.c +Merge made by the 'recursive' strategy. + Documentation/ABI/stable/sysfs-bus-vmbus | 7 + + drivers/hv/channel.c | 13 +- + drivers/hv/channel_mgmt.c | 39 +++++- + drivers/hv/hv_fcopy.c | 37 ++++-- + drivers/hv/hv_kvp.c | 123 +++++++++-------- + drivers/hv/hv_snapshot.c | 89 +++++++------ + drivers/hv/hv_util.c | 222 +++++++++++++++++++------------ + drivers/hv/hyperv_vmbus.h | 2 +- + drivers/hv/ring_buffer.c | 82 ++++++++++-- + drivers/hv/vmbus_drv.c | 61 ++++++--- + drivers/net/hyperv/hyperv_net.h | 3 + + drivers/net/hyperv/netvsc.c | 2 + + drivers/net/hyperv/rndis_filter.c | 2 + + drivers/scsi/storvsc_drv.c | 10 ++ + include/linux/hyperv.h | 58 ++++++-- + net/vmw_vsock/hyperv_transport.c | 4 +- + 16 files changed, 520 insertions(+), 234 deletions(-) +Merging auxdisplay/auxdisplay (351dcacc6d77 auxdisplay: panel: Remove redundant charlcd_ops structures) +$ git merge auxdisplay/auxdisplay +Already up to date. +Merging kgdb/kgdb/for-next (d081a6e35316 kdb: Fix pager search for multi-line strings) +$ git merge kgdb/kgdb/for-next +Already up to date. +Merging pidfd/for-next (cb5021ca622f kthread: remove comments about old _do_fork() helper) +$ git merge pidfd/for-next +Auto-merging kernel/signal.c +Merge made by the 'recursive' strategy. + include/trace/events/sched.h | 2 +- + kernel/fork.c | 6 ++---- + kernel/kthread.c | 2 +- + kernel/signal.c | 3 ++- + 4 files changed, 6 insertions(+), 7 deletions(-) +Merging hmm/hmm (3650b228f83a Linux 5.10-rc1) +$ git merge hmm/hmm +Already up to date. +Merging fpga/for-next (e41d4c011706 fpga: dfl: fme: Constify static attribute_group structs) +$ git merge fpga/for-next +Already up to date. +Merging kunit/test (e71ba9452f0b Linux 5.11-rc2) +$ git merge kunit/test +Already up to date. +Merging generic-ioremap/for-next (4bdc0d676a64 remove ioremap_nocache and devm_ioremap_nocache) +$ git merge generic-ioremap/for-next +Already up to date. +Merging cfi/cfi/next (5de15b610f78 mtd: hyperbus: add Renesas RPC-IF driver) +$ git merge cfi/cfi/next +Already up to date. +Merging kunit-next/kunit (e71ba9452f0b Linux 5.11-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 zx2c4/for-next (16fbf79b0f83 Linux 5.6-rc7) +$ git merge zx2c4/for-next +Already up to date. +Merging mhi/mhi-next (a8f75cb348fd mhi: core: Factorize mhi queuing) +$ git merge mhi/mhi-next +Merge made by the 'recursive' strategy. + drivers/bus/mhi/core/init.c | 9 +- + drivers/bus/mhi/core/main.c | 182 ++++++++------------- + drivers/bus/mhi/pci_generic.c | 371 +++++++++++++++++++++++++++++++++++++++--- + include/linux/mhi.h | 13 +- + 4 files changed, 430 insertions(+), 145 deletions(-) +Merging notifications/notifications-pipe-core (06ef6a8b925d watch_queue: sample: Display mount tree change notifications) +$ git merge notifications/notifications-pipe-core +Auto-merging security/security.c +Auto-merging security/keys/Kconfig +CONFLICT (content): Merge conflict in security/keys/Kconfig +Auto-merging samples/watch_queue/watch_test.c +CONFLICT (content): Merge conflict in samples/watch_queue/watch_test.c +Auto-merging samples/Kconfig +CONFLICT (content): Merge conflict in samples/Kconfig +Auto-merging include/linux/security.h +Auto-merging include/linux/lsm_hooks.h +Auto-merging include/linux/lsm_hook_defs.h +Auto-merging include/linux/dcache.h +Auto-merging fs/namespace.c +Auto-merging Documentation/security/keys/core.rst +CONFLICT (content): Merge conflict in Documentation/security/keys/core.rst +Recorded preimage for 'Documentation/security/keys/core.rst' +Recorded preimage for 'samples/Kconfig' +Recorded preimage for 'samples/watch_queue/watch_test.c' +Recorded preimage for 'security/keys/Kconfig' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'Documentation/security/keys/core.rst'. +Recorded resolution for 'samples/Kconfig'. +Recorded resolution for 'samples/watch_queue/watch_test.c'. +Recorded resolution for 'security/keys/Kconfig'. +[master b3b306191909] Merge remote-tracking branch 'notifications/notifications-pipe-core' +$ git diff -M --stat --summary HEAD^.. + Documentation/security/keys/core.rst | 4 +- + Documentation/watch_queue.rst | 12 +- + arch/alpha/kernel/syscalls/syscall.tbl | 1 + + arch/arm/tools/syscall.tbl | 1 + + arch/arm64/include/asm/unistd.h | 2 +- + arch/arm64/include/asm/unistd32.h | 2 + + arch/ia64/kernel/syscalls/syscall.tbl | 1 + + arch/m68k/kernel/syscalls/syscall.tbl | 1 + + arch/microblaze/kernel/syscalls/syscall.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n32.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n64.tbl | 1 + + arch/mips/kernel/syscalls/syscall_o32.tbl | 1 + + arch/parisc/kernel/syscalls/syscall.tbl | 1 + + arch/powerpc/kernel/syscalls/syscall.tbl | 1 + + arch/s390/kernel/syscalls/syscall.tbl | 1 + + arch/sh/kernel/syscalls/syscall.tbl | 1 + + arch/sparc/kernel/syscalls/syscall.tbl | 1 + + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + arch/xtensa/kernel/syscalls/syscall.tbl | 1 + + fs/Kconfig | 9 ++ + fs/Makefile | 1 + + fs/mount.h | 18 +++ + fs/mount_notify.c | 222 ++++++++++++++++++++++++++++ + fs/namespace.c | 22 +++ + include/linux/dcache.h | 1 + + include/linux/lsm_hook_defs.h | 3 + + include/linux/lsm_hooks.h | 6 + + include/linux/security.h | 8 + + include/linux/syscalls.h | 2 + + include/linux/watch_queue.h | 7 +- + include/uapi/asm-generic/unistd.h | 4 +- + include/uapi/linux/watch_queue.h | 31 +++- + kernel/sys_ni.c | 3 + + samples/Kconfig | 7 +- + samples/watch_queue/watch_test.c | 43 +++++- + security/keys/Kconfig | 8 +- + security/security.c | 7 + + 38 files changed, 422 insertions(+), 16 deletions(-) + create mode 100644 fs/mount_notify.c +Merging memblock/for-next (097d43d85704 mm: memblock: remove return value of memblock_free_all()) +$ git merge memblock/for-next +Auto-merging mm/memblock.c +Auto-merging include/linux/memblock.h +Merge made by the 'recursive' strategy. + include/linux/memblock.h | 2 +- + mm/memblock.c | 6 +----- + 2 files changed, 2 insertions(+), 6 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 iomem-mmap-vs-gup/topic/iomem-mmap-vs-gup (74b30195395c sysfs: Support zapping of binary attr mmaps) +$ git merge iomem-mmap-vs-gup/topic/iomem-mmap-vs-gup +Auto-merging include/linux/mm.h +Auto-merging drivers/misc/habanalabs/common/memory.c +Auto-merging drivers/misc/habanalabs/common/habanalabs.h +Merge made by the 'recursive' strategy. + drivers/char/mem.c | 86 +------------------ + drivers/gpu/drm/exynos/Kconfig | 1 - + drivers/gpu/drm/exynos/exynos_drm_g2d.c | 48 +++++------ + drivers/media/common/videobuf2/Kconfig | 1 - + drivers/media/common/videobuf2/Makefile | 1 + + .../media/common/videobuf2}/frame_vector.c | 55 +++++------- + drivers/media/common/videobuf2/videobuf2-memops.c | 3 +- + drivers/media/platform/omap/Kconfig | 1 - + drivers/misc/habanalabs/Kconfig | 1 - + drivers/misc/habanalabs/common/habanalabs.h | 6 +- + drivers/misc/habanalabs/common/memory.c | 52 +++++------- + drivers/pci/proc.c | 5 ++ + fs/sysfs/file.c | 11 +++ + include/linux/ioport.h | 6 +- + include/linux/mm.h | 45 +--------- + include/linux/sysfs.h | 2 + + include/media/frame_vector.h | 47 +++++++++++ + include/media/videobuf2-core.h | 1 + + kernel/resource.c | 98 +++++++++++++++++++++- + mm/Kconfig | 3 - + mm/Makefile | 1 - + mm/memory.c | 46 +++++++++- + 22 files changed, 275 insertions(+), 245 deletions(-) + rename {mm => drivers/media/common/videobuf2}/frame_vector.c (85%) + create mode 100644 include/media/frame_vector.h +Merging oprofile-removal/oprofile/removal (bae6ac7b1c6a fs: Remove dcookies support) +$ git merge oprofile-removal/oprofile/removal +Auto-merging kernel/sys.c +Auto-merging init/Kconfig +Removing include/linux/oprofile.h +Removing include/linux/dcookies.h +Removing fs/dcookies.c +Auto-merging fs/Makefile +Removing drivers/oprofile/timer_int.c +Removing drivers/oprofile/oprofilefs.c +Removing drivers/oprofile/oprofile_stats.h +Removing drivers/oprofile/oprofile_stats.c +Removing drivers/oprofile/oprofile_perf.c +Removing drivers/oprofile/oprofile_files.c +Removing drivers/oprofile/oprof.h +Removing drivers/oprofile/oprof.c +Removing drivers/oprofile/nmi_timer_int.c +Removing drivers/oprofile/event_buffer.h +Removing drivers/oprofile/event_buffer.c +Removing drivers/oprofile/cpu_buffer.h +Removing drivers/oprofile/cpu_buffer.c +Removing drivers/oprofile/buffer_sync.h +Removing drivers/oprofile/buffer_sync.c +Removing arch/xtensa/oprofile/init.c +Removing arch/xtensa/oprofile/backtrace.c +Removing arch/xtensa/oprofile/Makefile +Auto-merging arch/xtensa/Kconfig +Removing arch/x86/oprofile/op_x86_model.h +Removing arch/x86/oprofile/op_model_ppro.c +Removing arch/x86/oprofile/op_model_p4.c +Removing arch/x86/oprofile/op_model_amd.c +Removing arch/x86/oprofile/op_counter.h +Removing arch/x86/oprofile/nmi_int.c +Removing arch/x86/oprofile/init.c +Removing arch/x86/oprofile/backtrace.c +Removing arch/x86/oprofile/Makefile +Auto-merging arch/x86/Makefile +Auto-merging arch/x86/Kconfig +Removing arch/sparc/oprofile/init.c +Removing arch/sparc/oprofile/Makefile +Auto-merging arch/sparc/Kconfig +Removing arch/sh/oprofile/common.c +Removing arch/sh/oprofile/backtrace.c +Removing arch/sh/oprofile/Makefile +Auto-merging arch/sh/configs/sh03_defconfig +Auto-merging arch/sh/configs/sdk7786_defconfig +Auto-merging arch/sh/Kconfig +Removing arch/s390/oprofile/init.c +Removing arch/s390/oprofile/Makefile +Auto-merging arch/s390/configs/defconfig +Auto-merging arch/s390/configs/debug_defconfig +Auto-merging arch/s390/Kconfig +Removing arch/powerpc/platforms/cell/spu_notify.c +Removing arch/powerpc/oprofile/op_model_power4.c +Removing arch/powerpc/oprofile/op_model_pa6t.c +Removing arch/powerpc/oprofile/op_model_fsl_emb.c +Removing arch/powerpc/oprofile/op_model_cell.c +Removing arch/powerpc/oprofile/op_model_7450.c +Removing arch/powerpc/oprofile/common.c +Removing arch/powerpc/oprofile/cell/vma_map.c +Removing arch/powerpc/oprofile/cell/spu_task_sync.c +Removing arch/powerpc/oprofile/cell/spu_profiler.c +Removing arch/powerpc/oprofile/cell/pr_util.h +Removing arch/powerpc/oprofile/backtrace.c +Removing arch/powerpc/oprofile/Makefile +Removing arch/powerpc/include/asm/oprofile_impl.h +Auto-merging arch/powerpc/Kconfig +Removing arch/parisc/oprofile/init.c +Removing arch/parisc/oprofile/Makefile +Auto-merging arch/parisc/Kconfig +Removing arch/mips/oprofile/op_model_mipsxx.c +Removing arch/mips/oprofile/op_model_loongson3.c +Removing arch/mips/oprofile/op_model_loongson2.c +Removing arch/mips/oprofile/op_impl.h +Removing arch/mips/oprofile/common.c +Removing arch/mips/oprofile/backtrace.c +Removing arch/mips/oprofile/Makefile +Auto-merging arch/mips/Makefile +Auto-merging arch/mips/Kconfig +Removing arch/microblaze/oprofile/microblaze_oprofile.c +Removing arch/microblaze/oprofile/Makefile +Auto-merging arch/microblaze/Kconfig +Removing arch/ia64/oprofile/init.c +Removing arch/ia64/oprofile/backtrace.c +Removing arch/ia64/oprofile/Makefile +Removing arch/ia64/kernel/perfmon_montecito.h +Removing arch/ia64/kernel/perfmon_mckinley.h +Removing arch/ia64/kernel/perfmon_generic.h +Removing arch/ia64/kernel/perfmon_default_smpl.c +Removing arch/ia64/include/uapi/asm/perfmon_default_smpl.h +Removing arch/ia64/include/uapi/asm/perfmon.h +Removing arch/ia64/include/asm/perfmon.h +Removing arch/arm/oprofile/common.c +Removing arch/arm/oprofile/Makefile +Auto-merging arch/arm/configs/omap2plus_defconfig +Auto-merging arch/arm/configs/multi_v5_defconfig +Auto-merging arch/arm/Makefile +Auto-merging arch/arm/Kconfig +Removing arch/arc/oprofile/common.c +Removing arch/arc/oprofile/Makefile +Removing arch/alpha/oprofile/op_model_ev67.c +Removing arch/alpha/oprofile/op_model_ev6.c +Removing arch/alpha/oprofile/op_model_ev5.c +Removing arch/alpha/oprofile/op_model_ev4.c +Removing arch/alpha/oprofile/op_impl.h +Removing arch/alpha/oprofile/common.c +Removing arch/alpha/oprofile/Makefile +Auto-merging arch/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/RCU/NMI-RCU.rst | 3 +- + Documentation/admin-guide/kernel-parameters.txt | 14 - + Documentation/kbuild/makefiles.rst | 1 - + Documentation/process/magic-number.rst | 1 - + .../translations/it_IT/process/magic-number.rst | 1 - + .../translations/zh_CN/process/magic-number.rst | 1 - + MAINTAINERS | 11 - + arch/Kconfig | 32 - + arch/alpha/Kconfig | 1 - + arch/alpha/Makefile | 1 - + arch/alpha/oprofile/Makefile | 20 - + arch/alpha/oprofile/common.c | 189 --- + arch/alpha/oprofile/op_impl.h | 55 - + arch/alpha/oprofile/op_model_ev4.c | 114 -- + arch/alpha/oprofile/op_model_ev5.c | 209 --- + arch/alpha/oprofile/op_model_ev6.c | 101 -- + arch/alpha/oprofile/op_model_ev67.c | 261 --- + arch/arc/Kconfig | 1 - + arch/arc/Makefile | 2 - + arch/arc/oprofile/Makefile | 10 - + arch/arc/oprofile/common.c | 23 - + arch/arm/Kconfig | 1 - + arch/arm/Makefile | 2 - + arch/arm/configs/bcm2835_defconfig | 1 - + arch/arm/configs/cns3420vb_defconfig | 1 - + arch/arm/configs/corgi_defconfig | 1 - + arch/arm/configs/imx_v4_v5_defconfig | 1 - + arch/arm/configs/keystone_defconfig | 1 - + arch/arm/configs/multi_v5_defconfig | 1 - + arch/arm/configs/mv78xx0_defconfig | 1 - + arch/arm/configs/mvebu_v5_defconfig | 1 - + arch/arm/configs/omap1_defconfig | 1 - + arch/arm/configs/omap2plus_defconfig | 1 - + arch/arm/configs/orion5x_defconfig | 1 - + arch/arm/configs/pxa_defconfig | 1 - + arch/arm/configs/qcom_defconfig | 1 - + arch/arm/configs/socfpga_defconfig | 1 - + arch/arm/configs/spitz_defconfig | 1 - + arch/arm/configs/vexpress_defconfig | 1 - + arch/arm/oprofile/Makefile | 14 - + arch/arm/oprofile/common.c | 132 -- + arch/hexagon/Kconfig | 1 - + arch/ia64/Kconfig | 1 - + arch/ia64/Makefile | 1 - + arch/ia64/configs/bigsur_defconfig | 1 - + arch/ia64/include/asm/hw_irq.h | 1 - + arch/ia64/include/asm/perfmon.h | 111 -- + arch/ia64/include/uapi/asm/perfmon.h | 178 -- + arch/ia64/include/uapi/asm/perfmon_default_smpl.h | 84 - + arch/ia64/kernel/palinfo.c | 41 - + arch/ia64/kernel/perfmon_default_smpl.c | 297 ---- + arch/ia64/kernel/perfmon_generic.h | 46 - + arch/ia64/kernel/perfmon_itanium.h | 2 +- + arch/ia64/kernel/perfmon_mckinley.h | 188 --- + arch/ia64/kernel/perfmon_montecito.h | 270 ---- + arch/ia64/oprofile/Makefile | 10 - + arch/ia64/oprofile/backtrace.c | 131 -- + arch/ia64/oprofile/init.c | 28 - + arch/microblaze/Kconfig | 1 - + arch/microblaze/Makefile | 2 - + arch/microblaze/oprofile/Makefile | 14 - + arch/microblaze/oprofile/microblaze_oprofile.c | 22 - + arch/mips/Kconfig | 3 +- + arch/mips/Makefile | 1 - + arch/mips/configs/fuloong2e_defconfig | 1 - + arch/mips/configs/ip32_defconfig | 1 - + arch/mips/configs/lemote2f_defconfig | 1 - + arch/mips/configs/mtx1_defconfig | 1 - + arch/mips/configs/rs90_defconfig | 1 - + arch/mips/include/asm/mach-loongson2ef/loongson.h | 9 - + arch/mips/loongson2ef/fuloong-2e/irq.c | 2 +- + arch/mips/loongson2ef/lemote-2f/irq.c | 1 - + arch/mips/oprofile/Makefile | 18 - + arch/mips/oprofile/backtrace.c | 177 -- + arch/mips/oprofile/common.c | 147 -- + arch/mips/oprofile/op_impl.h | 41 - + arch/mips/oprofile/op_model_loongson2.c | 161 -- + arch/mips/oprofile/op_model_loongson3.c | 213 --- + arch/mips/oprofile/op_model_mipsxx.c | 479 ------ + arch/parisc/Kconfig | 1 - + arch/parisc/Makefile | 2 - + arch/parisc/oprofile/Makefile | 10 - + arch/parisc/oprofile/init.c | 23 - + arch/powerpc/Kconfig | 1 - + arch/powerpc/Makefile | 2 - + arch/powerpc/configs/44x/akebono_defconfig | 1 - + arch/powerpc/configs/44x/currituck_defconfig | 1 - + arch/powerpc/configs/44x/fsp2_defconfig | 1 - + arch/powerpc/configs/44x/iss476-smp_defconfig | 1 - + arch/powerpc/configs/cell_defconfig | 1 - + arch/powerpc/configs/g5_defconfig | 1 - + arch/powerpc/configs/maple_defconfig | 1 - + arch/powerpc/configs/pasemi_defconfig | 1 - + arch/powerpc/configs/pmac32_defconfig | 1 - + arch/powerpc/configs/powernv_defconfig | 1 - + arch/powerpc/configs/ppc64_defconfig | 1 - + arch/powerpc/configs/ppc64e_defconfig | 1 - + arch/powerpc/configs/ppc6xx_defconfig | 1 - + arch/powerpc/configs/ps3_defconfig | 1 - + arch/powerpc/configs/pseries_defconfig | 1 - + arch/powerpc/include/asm/cputable.h | 20 - + arch/powerpc/include/asm/oprofile_impl.h | 135 -- + arch/powerpc/include/asm/spu.h | 33 - + arch/powerpc/kernel/cputable.c | 67 - + arch/powerpc/kernel/dt_cpu_ftrs.c | 2 - + arch/powerpc/oprofile/Makefile | 19 - + arch/powerpc/oprofile/backtrace.c | 120 -- + arch/powerpc/oprofile/cell/pr_util.h | 110 -- + arch/powerpc/oprofile/cell/spu_profiler.c | 248 --- + arch/powerpc/oprofile/cell/spu_task_sync.c | 657 -------- + arch/powerpc/oprofile/cell/vma_map.c | 279 ---- + arch/powerpc/oprofile/common.c | 243 --- + arch/powerpc/oprofile/op_model_7450.c | 207 --- + arch/powerpc/oprofile/op_model_cell.c | 1709 -------------------- + arch/powerpc/oprofile/op_model_fsl_emb.c | 380 ----- + arch/powerpc/oprofile/op_model_pa6t.c | 227 --- + arch/powerpc/oprofile/op_model_power4.c | 438 ----- + arch/powerpc/platforms/cell/Kconfig | 5 - + arch/powerpc/platforms/cell/Makefile | 1 - + arch/powerpc/platforms/cell/spu_notify.c | 55 - + arch/powerpc/platforms/cell/spufs/run.c | 6 +- + arch/powerpc/platforms/cell/spufs/sched.c | 5 - + arch/powerpc/platforms/cell/spufs/spufs.h | 1 - + arch/s390/Kconfig | 1 - + arch/s390/Makefile | 3 - + arch/s390/configs/debug_defconfig | 1 - + arch/s390/configs/defconfig | 1 - + arch/s390/oprofile/Makefile | 10 - + arch/s390/oprofile/init.c | 37 - + arch/sh/Kconfig | 1 - + arch/sh/Makefile | 1 - + arch/sh/configs/espt_defconfig | 1 - + arch/sh/configs/migor_defconfig | 1 - + arch/sh/configs/r7780mp_defconfig | 1 - + arch/sh/configs/r7785rp_defconfig | 1 - + arch/sh/configs/rsk7201_defconfig | 1 - + arch/sh/configs/rsk7203_defconfig | 1 - + arch/sh/configs/rts7751r2d1_defconfig | 1 - + arch/sh/configs/rts7751r2dplus_defconfig | 1 - + arch/sh/configs/sdk7786_defconfig | 1 - + arch/sh/configs/se7206_defconfig | 1 - + arch/sh/configs/sh03_defconfig | 1 - + arch/sh/configs/sh7724_generic_defconfig | 1 - + arch/sh/configs/sh7763rdp_defconfig | 1 - + arch/sh/configs/sh7770_generic_defconfig | 1 - + arch/sh/configs/shx3_defconfig | 1 - + arch/sh/oprofile/Makefile | 16 - + arch/sh/oprofile/backtrace.c | 80 - + arch/sh/oprofile/common.c | 64 - + arch/sparc/Kconfig | 1 - + arch/sparc/Makefile | 1 - + arch/sparc/configs/sparc64_defconfig | 1 - + arch/sparc/oprofile/Makefile | 10 - + arch/sparc/oprofile/init.c | 87 - + arch/x86/Kconfig | 1 - + arch/x86/Makefile | 3 - + arch/x86/include/asm/nmi.h | 1 - + arch/x86/kernel/cpu/perfctr-watchdog.c | 11 +- + arch/x86/oprofile/Makefile | 12 - + arch/x86/oprofile/backtrace.c | 127 -- + arch/x86/oprofile/init.c | 38 - + arch/x86/oprofile/nmi_int.c | 780 --------- + arch/x86/oprofile/op_counter.h | 30 - + arch/x86/oprofile/op_model_amd.c | 542 ------- + arch/x86/oprofile/op_model_p4.c | 723 --------- + arch/x86/oprofile/op_model_ppro.c | 245 --- + arch/x86/oprofile/op_x86_model.h | 90 -- + arch/xtensa/Kconfig | 1 - + arch/xtensa/Makefile | 1 - + arch/xtensa/configs/audio_kc705_defconfig | 1 - + arch/xtensa/configs/generic_kc705_defconfig | 1 - + arch/xtensa/configs/smp_lx200_defconfig | 1 - + arch/xtensa/configs/xip_kc705_defconfig | 1 - + arch/xtensa/kernel/stacktrace.c | 2 +- + arch/xtensa/oprofile/Makefile | 10 - + arch/xtensa/oprofile/backtrace.c | 27 - + arch/xtensa/oprofile/init.c | 26 - + drivers/oprofile/buffer_sync.c | 591 ------- + drivers/oprofile/buffer_sync.h | 22 - + drivers/oprofile/cpu_buffer.c | 465 ------ + drivers/oprofile/cpu_buffer.h | 121 -- + drivers/oprofile/event_buffer.c | 209 --- + drivers/oprofile/event_buffer.h | 40 - + drivers/oprofile/nmi_timer_int.c | 157 -- + drivers/oprofile/oprof.c | 286 ---- + drivers/oprofile/oprof.h | 50 - + drivers/oprofile/oprofile_files.c | 201 --- + drivers/oprofile/oprofile_perf.c | 328 ---- + drivers/oprofile/oprofile_stats.c | 84 - + drivers/oprofile/oprofile_stats.h | 33 - + drivers/oprofile/oprofilefs.c | 300 ---- + drivers/oprofile/timer_int.c | 122 -- + fs/Makefile | 1 - + fs/dcookies.c | 356 ---- + include/linux/dcookies.h | 69 - + include/linux/oprofile.h | 209 --- + init/Kconfig | 2 +- + kernel/sys.c | 1 - + usr/include/Makefile | 2 - + 199 files changed, 8 insertions(+), 15569 deletions(-) + delete mode 100644 arch/alpha/oprofile/Makefile + delete mode 100644 arch/alpha/oprofile/common.c + delete mode 100644 arch/alpha/oprofile/op_impl.h + delete mode 100644 arch/alpha/oprofile/op_model_ev4.c + delete mode 100644 arch/alpha/oprofile/op_model_ev5.c + delete mode 100644 arch/alpha/oprofile/op_model_ev6.c + delete mode 100644 arch/alpha/oprofile/op_model_ev67.c + delete mode 100644 arch/arc/oprofile/Makefile + delete mode 100644 arch/arc/oprofile/common.c + delete mode 100644 arch/arm/oprofile/Makefile + delete mode 100644 arch/arm/oprofile/common.c + delete mode 100644 arch/ia64/include/asm/perfmon.h + delete mode 100644 arch/ia64/include/uapi/asm/perfmon.h + delete mode 100644 arch/ia64/include/uapi/asm/perfmon_default_smpl.h + delete mode 100644 arch/ia64/kernel/perfmon_default_smpl.c + delete mode 100644 arch/ia64/kernel/perfmon_generic.h + delete mode 100644 arch/ia64/kernel/perfmon_mckinley.h + delete mode 100644 arch/ia64/kernel/perfmon_montecito.h + delete mode 100644 arch/ia64/oprofile/Makefile + delete mode 100644 arch/ia64/oprofile/backtrace.c + delete mode 100644 arch/ia64/oprofile/init.c + delete mode 100644 arch/microblaze/oprofile/Makefile + delete mode 100644 arch/microblaze/oprofile/microblaze_oprofile.c + delete mode 100644 arch/mips/oprofile/Makefile + delete mode 100644 arch/mips/oprofile/backtrace.c + delete mode 100644 arch/mips/oprofile/common.c + delete mode 100644 arch/mips/oprofile/op_impl.h + delete mode 100644 arch/mips/oprofile/op_model_loongson2.c + delete mode 100644 arch/mips/oprofile/op_model_loongson3.c + delete mode 100644 arch/mips/oprofile/op_model_mipsxx.c + delete mode 100644 arch/parisc/oprofile/Makefile + delete mode 100644 arch/parisc/oprofile/init.c + delete mode 100644 arch/powerpc/include/asm/oprofile_impl.h + delete mode 100644 arch/powerpc/oprofile/Makefile + delete mode 100644 arch/powerpc/oprofile/backtrace.c + delete mode 100644 arch/powerpc/oprofile/cell/pr_util.h + delete mode 100644 arch/powerpc/oprofile/cell/spu_profiler.c + delete mode 100644 arch/powerpc/oprofile/cell/spu_task_sync.c + delete mode 100644 arch/powerpc/oprofile/cell/vma_map.c + delete mode 100644 arch/powerpc/oprofile/common.c + delete mode 100644 arch/powerpc/oprofile/op_model_7450.c + delete mode 100644 arch/powerpc/oprofile/op_model_cell.c + delete mode 100644 arch/powerpc/oprofile/op_model_fsl_emb.c + delete mode 100644 arch/powerpc/oprofile/op_model_pa6t.c + delete mode 100644 arch/powerpc/oprofile/op_model_power4.c + delete mode 100644 arch/powerpc/platforms/cell/spu_notify.c + delete mode 100644 arch/s390/oprofile/Makefile + delete mode 100644 arch/s390/oprofile/init.c + delete mode 100644 arch/sh/oprofile/Makefile + delete mode 100644 arch/sh/oprofile/backtrace.c + delete mode 100644 arch/sh/oprofile/common.c + delete mode 100644 arch/sparc/oprofile/Makefile + delete mode 100644 arch/sparc/oprofile/init.c + delete mode 100644 arch/x86/oprofile/Makefile + delete mode 100644 arch/x86/oprofile/backtrace.c + delete mode 100644 arch/x86/oprofile/init.c + delete mode 100644 arch/x86/oprofile/nmi_int.c + delete mode 100644 arch/x86/oprofile/op_counter.h + delete mode 100644 arch/x86/oprofile/op_model_amd.c + delete mode 100644 arch/x86/oprofile/op_model_p4.c + delete mode 100644 arch/x86/oprofile/op_model_ppro.c + delete mode 100644 arch/x86/oprofile/op_x86_model.h + delete mode 100644 arch/xtensa/oprofile/Makefile + delete mode 100644 arch/xtensa/oprofile/backtrace.c + delete mode 100644 arch/xtensa/oprofile/init.c + delete mode 100644 drivers/oprofile/buffer_sync.c + delete mode 100644 drivers/oprofile/buffer_sync.h + delete mode 100644 drivers/oprofile/cpu_buffer.c + delete mode 100644 drivers/oprofile/cpu_buffer.h + delete mode 100644 drivers/oprofile/event_buffer.c + delete mode 100644 drivers/oprofile/event_buffer.h + delete mode 100644 drivers/oprofile/nmi_timer_int.c + delete mode 100644 drivers/oprofile/oprof.c + delete mode 100644 drivers/oprofile/oprof.h + delete mode 100644 drivers/oprofile/oprofile_files.c + delete mode 100644 drivers/oprofile/oprofile_perf.c + delete mode 100644 drivers/oprofile/oprofile_stats.c + delete mode 100644 drivers/oprofile/oprofile_stats.h + delete mode 100644 drivers/oprofile/oprofilefs.c + delete mode 100644 drivers/oprofile/timer_int.c + delete mode 100644 fs/dcookies.c + delete mode 100644 include/linux/dcookies.h + delete mode 100644 include/linux/oprofile.h +Merging akpm-current/current (d6c9fafd938c initramfs-panic-with-memory-information-fix) +$ git merge --no-ff akpm-current/current +Auto-merging tools/objtool/check.c +Auto-merging mm/slub.c +Auto-merging mm/slob.c +Auto-merging mm/slab_common.c +Auto-merging mm/slab.h +Auto-merging mm/slab.c +Auto-merging mm/memblock.c +Auto-merging mm/Makefile +Auto-merging lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging init/Kconfig +Auto-merging include/linux/vmalloc.h +Auto-merging include/linux/sched.h +Removing include/linux/mm-arch-hooks.h +Removing include/asm-generic/mm-arch-hooks.h +Auto-merging fs/seq_file.c +Auto-merging fs/dcache.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/arm64/mm/mmu.c +Auto-merging arch/arm64/mm/fault.c +Auto-merging arch/arm64/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/cgroup-v2.rst +Merge made by the 'recursive' strategy. + Documentation/admin-guide/cgroup-v2.rst | 4 + + Documentation/admin-guide/sysctl/vm.rst | 4 +- + Documentation/dev-tools/index.rst | 1 + + Documentation/dev-tools/kasan.rst | 51 +- + Documentation/dev-tools/kfence.rst | 298 +++++++++++ + Documentation/vm/arch_pgtable_helpers.rst | 8 +- + MAINTAINERS | 14 + + arch/alpha/configs/defconfig | 1 - + arch/arm64/Kconfig | 1 + + arch/arm64/include/asm/kfence.h | 22 + + arch/arm64/include/asm/memory.h | 1 + + arch/arm64/include/asm/mte-kasan.h | 12 + + arch/arm64/kernel/mte.c | 12 + + arch/arm64/kernel/sleep.S | 2 +- + arch/arm64/mm/fault.c | 24 +- + arch/arm64/mm/mmu.c | 7 +- + arch/hexagon/configs/comet_defconfig | 1 - + arch/mips/include/asm/highmem.h | 1 + + arch/mips/mm/pgtable-32.c | 1 - + arch/mips/mm/pgtable-64.c | 1 - + arch/powerpc/include/asm/highmem.h | 2 + + arch/sparc/include/asm/highmem.h | 9 +- + arch/um/include/asm/Kbuild | 1 - + arch/x86/Kconfig | 1 + + arch/x86/include/asm/kfence.h | 64 +++ + arch/x86/kernel/acpi/wakeup_64.S | 2 +- + arch/x86/kernel/setup.c | 20 +- + arch/x86/mm/fault.c | 6 + + drivers/base/node.c | 33 +- + fs/aio.c | 9 +- + fs/block_dev.c | 2 +- + fs/buffer.c | 56 +- + fs/dcache.c | 4 +- + fs/direct-io.c | 4 +- + fs/exec.c | 4 +- + fs/fhandle.c | 2 +- + fs/fuse/dev.c | 6 +- + fs/hugetlbfs/inode.c | 38 +- + fs/iomap/seek.c | 125 +---- + fs/ocfs2/dlm/dlmast.c | 10 - + fs/ocfs2/dlm/dlmcommon.h | 4 - + fs/ocfs2/namei.c | 17 +- + fs/ocfs2/super.c | 2 - + fs/pipe.c | 2 +- + fs/proc/base.c | 19 +- + fs/proc/meminfo.c | 10 +- + fs/proc/page.c | 40 +- + fs/proc/proc_sysctl.c | 7 +- + fs/proc/vmcore.c | 7 +- + fs/ramfs/inode.c | 12 + + fs/seq_file.c | 3 + + include/asm-generic/Kbuild | 1 - + include/asm-generic/mm-arch-hooks.h | 16 - + include/linux/bitops.h | 2 +- + include/linux/cpumask.h | 2 +- + include/linux/fortify-string.h | 302 +++++++++++ + include/linux/gfp.h | 2 + + include/linux/hugetlb.h | 4 +- + include/linux/kasan-checks.h | 6 + + include/linux/kasan.h | 39 +- + include/linux/kfence.h | 222 ++++++++ + include/linux/khugepaged.h | 2 + + include/linux/memcontrol.h | 36 +- + include/linux/memory_hotplug.h | 17 +- + include/linux/memremap.h | 12 + + include/linux/migrate.h | 2 +- + include/linux/mm-arch-hooks.h | 22 - + include/linux/mmzone.h | 54 +- + include/linux/nmi.h | 1 + + include/linux/page-flags.h | 4 +- + include/linux/page_counter.h | 9 +- + include/linux/pagemap.h | 8 +- + include/linux/pagevec.h | 4 - + include/linux/printk.h | 8 +- + include/linux/sched.h | 8 + + include/linux/slab_def.h | 3 + + include/linux/slub_def.h | 3 + + include/linux/string.h | 282 +--------- + include/linux/swap.h | 8 +- + include/linux/vmalloc.h | 6 +- + include/linux/wait.h | 4 +- + include/linux/zpool.h | 3 + + include/trace/events/error_report.h | 74 +++ + include/trace/events/kmem.h | 24 +- + include/uapi/linux/mempolicy.h | 4 +- + init/Kconfig | 1 - + init/initramfs.c | 19 +- + init/main.c | 11 +- + init/version.c | 8 - + kernel/gcov/Kconfig | 2 +- + kernel/hung_task.c | 44 ++ + kernel/sysctl.c | 16 +- + kernel/trace/Makefile | 1 + + kernel/trace/error_report-traces.c | 12 + + kernel/watchdog.c | 21 + + kernel/watchdog_hld.c | 1 + + lib/Kconfig.debug | 7 + + lib/Kconfig.kasan | 14 +- + lib/Kconfig.kfence | 82 +++ + lib/Kconfig.ubsan | 1 + + lib/Makefile | 2 +- + lib/cpumask.c | 73 ++- + lib/genalloc.c | 3 +- + lib/hexdump.c | 9 +- + lib/seq_buf.c | 9 +- + lib/test_kasan.c | 424 +++++++++++---- + lib/test_kasan_module.c | 5 +- + mm/Makefile | 1 + + mm/backing-dev.c | 3 +- + mm/cma.c | 17 + + mm/compaction.c | 58 +- + mm/debug.c | 10 +- + mm/debug_vm_pgtable.c | 86 ++- + mm/dmapool.c | 3 +- + mm/filemap.c | 360 ++++++++----- + mm/highmem.c | 7 +- + mm/huge_memory.c | 19 +- + mm/hugetlb.c | 118 ++-- + mm/internal.h | 4 +- + mm/kasan/common.c | 64 ++- + mm/kasan/generic.c | 41 +- + mm/kasan/hw_tags.c | 77 ++- + mm/kasan/init.c | 23 +- + mm/kasan/kasan.h | 80 ++- + mm/kasan/quarantine.c | 22 +- + mm/kasan/report.c | 23 +- + mm/kasan/report_generic.c | 10 +- + mm/kasan/report_hw_tags.c | 8 +- + mm/kasan/report_sw_tags.c | 8 +- + mm/kasan/shadow.c | 39 +- + mm/kasan/sw_tags.c | 20 +- + mm/kfence/Makefile | 6 + + mm/kfence/core.c | 845 +++++++++++++++++++++++++++++ + mm/kfence/kfence.h | 113 ++++ + mm/kfence/kfence_test.c | 858 ++++++++++++++++++++++++++++++ + mm/kfence/report.c | 260 +++++++++ + mm/khugepaged.c | 28 +- + mm/memblock.c | 49 +- + mm/memcontrol.c | 208 ++++---- + mm/memory-failure.c | 26 +- + mm/memory_hotplug.c | 69 +++ + mm/mempolicy.c | 16 + + mm/mempool.c | 2 +- + mm/memremap.c | 35 ++ + mm/migrate.c | 35 +- + mm/mmap.c | 47 +- + mm/mprotect.c | 7 +- + mm/mremap.c | 10 +- + mm/msync.c | 6 +- + mm/page_alloc.c | 93 ++-- + mm/page_poison.c | 2 +- + mm/page_reporting.c | 2 +- + mm/rmap.c | 35 +- + mm/shmem.c | 152 ++---- + mm/slab.c | 44 +- + mm/slab.h | 14 +- + mm/slab_common.c | 39 +- + mm/slob.c | 2 +- + mm/slub.c | 201 ++++--- + mm/swap.c | 38 +- + mm/swap_slots.c | 3 +- + mm/swap_state.c | 36 +- + mm/truncate.c | 131 +---- + mm/vmscan.c | 68 ++- + mm/vmstat.c | 48 +- + mm/z3fold.c | 12 +- + mm/zbud.c | 1 + + mm/zpool.c | 13 + + mm/zsmalloc.c | 3 +- + mm/zswap.c | 56 +- + scripts/Makefile.kasan | 10 +- + scripts/checkpatch.pl | 129 +++-- + scripts/gdb/linux/lists.py | 5 + + scripts/spelling.txt | 1 + + tools/objtool/check.c | 2 +- + 175 files changed, 5772 insertions(+), 2035 deletions(-) + create mode 100644 Documentation/dev-tools/kfence.rst + create mode 100644 arch/arm64/include/asm/kfence.h + create mode 100644 arch/x86/include/asm/kfence.h + delete mode 100644 include/asm-generic/mm-arch-hooks.h + create mode 100644 include/linux/fortify-string.h + create mode 100644 include/linux/kfence.h + delete mode 100644 include/linux/mm-arch-hooks.h + create mode 100644 include/trace/events/error_report.h + create mode 100644 kernel/trace/error_report-traces.c + create mode 100644 lib/Kconfig.kfence + create mode 100644 mm/kfence/Makefile + create mode 100644 mm/kfence/core.c + create mode 100644 mm/kfence/kfence.h + create mode 100644 mm/kfence/kfence_test.c + create mode 100644 mm/kfence/report.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/11)
Rebasing (2/11)
Rebasing (3/11)
Rebasing (4/11)
Rebasing (5/11)
Rebasing (6/11)
Rebasing (7/11)
Rebasing (8/11)
Rebasing (9/11)
Rebasing (10/11)
Rebasing (11/11)
[KSuccessfully rebased and updated refs/heads/akpm. +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 0ec48f18c633...a9bb9ddf7f1a akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (a9bb9ddf7f1a secretmem: test: add basic selftest for memfd_secret(2)) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + arch/arm64/include/asm/Kbuild | 1 - + arch/arm64/include/asm/cacheflush.h | 6 - + 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/mm/mmu.c | 6 +- + arch/arm64/mm/pageattr.c | 23 +- + arch/riscv/Kconfig | 4 +- + arch/riscv/include/asm/set_memory.h | 4 +- + arch/riscv/include/asm/unistd.h | 1 + + arch/riscv/mm/pageattr.c | 8 +- + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + arch/x86/include/asm/set_memory.h | 4 +- + arch/x86/mm/pat/set_memory.c | 8 +- + fs/dax.c | 11 +- + include/linux/pgtable.h | 3 + + include/linux/secretmem.h | 30 ++ + include/linux/set_memory.h | 16 +- + include/linux/syscalls.h | 1 + + include/uapi/asm-generic/unistd.h | 6 +- + include/uapi/linux/magic.h | 1 + + kernel/power/hibernate.c | 5 +- + kernel/power/snapshot.c | 4 +- + kernel/sys_ni.c | 2 + + mm/Kconfig | 5 + + mm/Makefile | 1 + + mm/filemap.c | 3 +- + mm/gup.c | 10 + + mm/internal.h | 3 + + mm/mmap.c | 5 +- + mm/secretmem.c | 451 ++++++++++++++++++++++++++++++ + mm/vmalloc.c | 5 +- + scripts/checksyscalls.sh | 4 + + 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 | 17 ++ + 38 files changed, 917 insertions(+), 52 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 |