summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2024-02-28 15:14:43 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2024-02-28 15:14:43 +1100
commit20af1ca418d2c0b11bc2a1fe8c0c88f67bcc2a7e (patch)
tree2511e32aefe2a5a8c25d44d5dba8c3cde7995de2
parent652f20b1be1e424935ee6f844b45db7c88d1d02f (diff)
downloadlinux-20af1ca418d2c0b11bc2a1fe8c0c88f67bcc2a7e.tar.gz
linux-20af1ca418d2c0b11bc2a1fe8c0c88f67bcc2a7e.tar.xz
Add linux-next specific files for 20240228next-20240228
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Diffstat
-rw-r--r--Next/SHA1s371
-rw-r--r--Next/Trees373
-rw-r--r--Next/merge.log13101
-rw-r--r--localversion-next1
4 files changed, 13846 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s
new file mode 100644
index 000000000000..5095f5f729f5
--- /dev/null
+++ b/Next/SHA1s
@@ -0,0 +1,371 @@
+Name SHA1
+---- ----
+origin 45ec2f5f6ed3ec3a79ba1329ad585497cdcbe663
+fixes 2dde18cd1d8fac735875f2e4987f11817cc0bc2c
+mm-hotfixes 1e6a4bad7f15f2ff6d72893c7ce92a5678b9106f
+kbuild-current b401b621758e46812da61fa58a67c3fd8d91de0d
+arc-current 861deac3b092f37b2c5e6871732f3e11486f7082
+arm-current 6613476e225e090cc9aad49be7fa504e290dd33d
+arm64-fixes d7b77a0d565b048cb0808fa8a4fb031352b22a01
+arm-soc-fixes dcb8e53e339e534eecfd86fb21674d7eef7380eb
+davinci-current 6613476e225e090cc9aad49be7fa504e290dd33d
+drivers-memory-fixes 6613476e225e090cc9aad49be7fa504e290dd33d
+sophgo-fixes 41bccc98fb7931d63d03f326a746ac4d429c1dd3
+tee-fixes ceaa837f96adb69c0df0397937cd74991d5d821a
+m68k-current e8a7824856def1c8608401b0d7d05566d6e81c95
+powerpc-fixes 20c8c4dafe93e82441583e93bd68c0d256d7bed4
+s390-fixes 5ef1dc40ffa6a6cb968b0fdc43c3a61727a9e950
+fscrypt-current 4bcf6f827a79c59806c695dc280e763c5b6a6813
+fsverity-current a075bacde257f755bea0e53400c9f1cdd1b8e8e6
+net 1ce7d306ea63f3e379557c79abd88052e0483813
+bpf dced881ead78e4d6add3735d02a9186ba2415630
+ipsec 1a807e46aa93ebad1dfbed4f82dc3bf779423a6e
+netfilter 359e54a93ab43d32ee1bff3c2f9f10cb9f6b6e79
+ipvs 40b9385dd8e6a0515e1c9cd06a277483556b7286
+wireless 413dafc8170fcb925fb17af8842f06af305f8e0b
+wpan b85ea95d086471afb4ad062012a4d73cd328fa86
+rdma-fixes eb5c7465c3240151cd42a55c7ace9da0026308a1
+sound-current b34bf65838f7c6e785f62681605a538b73c2808c
+sound-asoc-fixes 50ee641643dd0f46702e9a99354398196e1734c2
+regmap-fixes 2f0dbb24f78a333433a2b875c0b76bf55c119cd4
+regulator-fixes e5d40e9afd84cec01cdbbbfe62d52f89959ab3ee
+spi-fixes 6415c7fe7cf420fa469095a34d9153f991391116
+pci-current 6613476e225e090cc9aad49be7fa504e290dd33d
+driver-core.current b401b621758e46812da61fa58a67c3fd8d91de0d
+tty.current d206a76d7d2726f3b096037f2079ce0bd3ba329b
+usb.current d206a76d7d2726f3b096037f2079ce0bd3ba329b
+usb-serial-fixes 54be6c6c5ae8e0d93a6c4641cb7528eb0b6ba478
+phy d4c08d8b23b22807c712208cd05cb047e92e7672
+staging.current 6613476e225e090cc9aad49be7fa504e290dd33d
+iio-fixes 11dadb631007324c7a8bcb2650eda88ed2b9eed0
+counter-current c83ccdc9586b3e9882da9e27507c046751999d59
+char-misc.current daaf5286b6d2528a73c651aa2d4059bc1bd67c2e
+soundwire-fixes 6613476e225e090cc9aad49be7fa504e290dd33d
+thunderbolt-fixes d3d17e23d1a0d1f959b4fa55b35f1802d9c584fa
+input-current 4255447ad34c5c3785fcdcf76cfa0271d6e5ed39
+crypto-current 1c0cf6d19690141002889d72622b90fc01562ce4
+vfio-fixes 4ea95c04fa6b9043a1a301240996aeebe3cb28ec
+kselftest-fixes b54761f6e9773350c0d1fb8e1e5aacaba7769d0f
+modules-fixes f412eef03938d3a40d4f6f5a79d0f98ed89b596d
+dmaengine-fixes df2515a17914ecfc2a0594509deaf7fcb8d191ac
+backlight-fixes 6613476e225e090cc9aad49be7fa504e290dd33d
+mtd-fixes e6a30d0c48a1e8a68f1cc413bee65302ab03ddfb
+mfd-fixes 6613476e225e090cc9aad49be7fa504e290dd33d
+v4l-dvb-fixes 346c84e281a963437b9fe9dfcd92c531630289de
+reset-fixes 4a6756f56bcf8e64c87144a626ce53aea4899c0e
+mips-fixes b401b621758e46812da61fa58a67c3fd8d91de0d
+at91-fixes 6613476e225e090cc9aad49be7fa504e290dd33d
+omap-fixes 9b6a51aab5f5f9f71d2fa16e8b4d530e1643dfcb
+kvm-fixes 5ef1d8c1ddbf696e47b226e11888eaf8d9e8e807
+kvms390-fixes 83303a4c776ce1032d88df59e811183479acea77
+hwmon-fixes d206a76d7d2726f3b096037f2079ce0bd3ba329b
+nvdimm-fixes 33908660e814203e996f6e775d033c5c32fcf9a7
+cxl-fixes d206a76d7d2726f3b096037f2079ce0bd3ba329b
+btrfs-fixes eb90d142fc1bc3bc59d42f14e7af7b7e3508f2e0
+vfs-fixes aa23317d0268b309bb3f0801ddd0d61813ff5afb
+dma-mapping-fixes d5090484b021794271280ab64d20253883b7f6fd
+drivers-x86-fixes 427c70dec738318b7f71e1b9d829ff0e9771d493
+samsung-krzk-fixes eab4f56d3e75dad697acf8dc2c8be3c341d6c63e
+pinctrl-samsung-fixes 6613476e225e090cc9aad49be7fa504e290dd33d
+devicetree-fixes 4e06ec0774f5bebf10e27bc7a5ace4b48ae0fa56
+dt-krzk-fixes 6613476e225e090cc9aad49be7fa504e290dd33d
+scsi-fixes ee0017c3ed8a8abfa4d40e42f908fb38c31e7515
+drm-fixes d206a76d7d2726f3b096037f2079ce0bd3ba329b
+drm-intel-fixes e567857cb41c4c4f5bb33fd0ff3c282c5c3c4577
+mmc-fixes 6b1ba3f9040be5efc4396d86c9752cdc564730be
+rtc-fixes 08279468a294d8c996a657ecc9e51bd5c084c75d
+gnss-fixes 54be6c6c5ae8e0d93a6c4641cb7528eb0b6ba478
+hyperv-fixes 564eac2860bdbe6ac651e6909ac07ecd93d778f3
+soc-fsl-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+risc-v-fixes d82f32202e0df7bf40d4b67c8a4ff9cea32df4d9
+riscv-dt-fixes ce6b6d1513965f500a05f3facf223fa01fd74920
+riscv-soc-fixes d206a76d7d2726f3b096037f2079ce0bd3ba329b
+fpga-fixes 6613476e225e090cc9aad49be7fa504e290dd33d
+spdx 6613476e225e090cc9aad49be7fa504e290dd33d
+gpio-brgl-fixes ae366ba8576da0135d7d3db2dfa6304f3338d0c2
+gpio-intel-fixes 6613476e225e090cc9aad49be7fa504e290dd33d
+pinctrl-intel-fixes 6613476e225e090cc9aad49be7fa504e290dd33d
+auxdisplay-fixes 6613476e225e090cc9aad49be7fa504e290dd33d
+erofs-fixes 56ee7db31187dc36d501622cb5f1415e88e01c2a
+kunit-fixes 829388b725f8d266ccec32a2f446717d8693eaba
+ubifs-fixes 2241ab53cbb5cdb08a6b2d4688feb13971058f65
+memblock-fixes 6a9531c3a88096a26cf3ac582f7ec44f94a7dcb2
+nfsd-fixes 5ea9a7c5fe4149f165f0e3b624fe08df02b6c301
+renesas-fixes 8c987693dc2d292d777f1be63cb35233049ae25e
+perf-current fdd0ae72b34e56eb5e896d067c49a78ecb451032
+efi-fixes 2ce507f57ba9c78c080d4a050ebdc97263239de8
+zstd-fixes 77618db346455129424fadbbaec596a09feaf3bb
+battery-fixes 2df70149e73e79783bcbc7db4fa51ecef0e2022c
+uml-fixes 73a23d7710331a530e972903318528b75e5a5f58
+iommufd-fixes 510325e5ac5f45c1180189d3bfc108c54bf64544
+rust-fixes b401b621758e46812da61fa58a67c3fd8d91de0d
+v9fs-fixes 6613476e225e090cc9aad49be7fa504e290dd33d
+w1-fixes 6613476e225e090cc9aad49be7fa504e290dd33d
+pmdomain-fixes eb5555d422d0fc325e1574a7353d3c616f82d8b5
+overlayfs-fixes 420332b94119cdc7db4477cc88484691cb92ae71
+i2c-host-fixes cf8281b1aeab93a03c87033a741075c39ace80d4
+drm-misc-fixes 00d6a284fcf3fad1b7e1b5bc3cd87cbfb60ce03f
+mm-stable c44ed5b7596f0b0421803f16c819ee9c02c50240
+mm-nonmm-stable 2932fb0a927d30690b8cb70c71d511fd9054bb61
+mm 8706905dce7c0dbd145743ae3dbca731ef69350f
+kbuild 5270316c9fec8cc99aa0e0a258509c5c7f789d12
+clang-format 5a205c6a9f79d14db38006aa2d7c4f4e76b1bfc7
+perf ef5de1613d7d92bdc975e6beb34bb0fa94f34078
+compiler-attributes 2993eb7a8d34aee6165e1f6676e81cdf1d22aa62
+dma-mapping eaebbcf6a25296457f9cf16c768dff321bcdbf68
+asm-generic 34b2321cc648a246d08cc51e423532eac690ccf1
+arc 0bb80ecc33a8fb5a682236443c1e740d5c917d1d
+arm b9920fdd5a751df129808e7fa512e9928223ee05
+arm64 e8e5eae6f56d00cee5c8466249a398ef2ef89187
+arm-perf fd185a245155be9cb90839fa451ba8f2c3e4004c
+arm-soc d6f69171ea309b76ee2b03a184bdb1047eb1a387
+amlogic 7092cfae086f0bc235baca413d0bd904f182670c
+asahi-soc ffc253263a1375a65fa6c9f62a893e9767fbebfa
+aspeed 0c30853731ec7e70941cf008bf5227fb9e327810
+at91 6315946ad24244f076605a01352e0ac367b9eff8
+broadcom 412c6bd2c649bcacc057e274dccb0b93f69fd1c7
+davinci 6613476e225e090cc9aad49be7fa504e290dd33d
+drivers-memory e46076906722ee6f9e7fd5abad7f909cd11a26af
+imx-mxs edb0d16255f62fefb0bc56c87b3395dc2f866354
+mediatek ba90af39ba57b3fe3ecfdba0c87a80d20c7b788d
+mvebu 33649b8049114bb45f4fa6343780c09b2a26064b
+omap 98f3f68169bd6133ab5878cca78e1d0f0ff69883
+qcom f6265e31fc717283224752dde476128191737d69
+renesas 06a019816e5194bbabfe2df324371f6c962ff7f1
+reset c721f189e89c0d4db119d7bb2b46768d0fb5f6b1
+rockchip c2a265fa6c5afa860d14c9cfc43ac20125800a2d
+samsung-krzk 8b9d2e71b42c958986a4296757b23e3624532126
+scmi a2b8119375a172cf4079bc2630261d2d08573e65
+sophgo 0f46e1339ef113f0dedf7ad376452cc722dbcfe6
+stm32 7fd195f01ae52871b04b752447f865e1a6661487
+sunxi c1d7282e4e920ca2caea6147162ef77ca2fdea6e
+tee 58ea7e692a9e95c8d945d1febf7cec22ca00a8f0
+tegra c85c30fad06dabdefbf59911ed303553e77490f2
+ti 68818060efdbc68477ac58499698a38919112e8c
+xilinx 2d81f5ef567ce96f29e698939673226d2d1b0fcb
+clk 948d9ddad4236d0772577d7a7557ea5c9b4b7efc
+clk-imx 13269dc6c70444528f0093585e3559cd2f38850a
+clk-renesas 81a7a88a98062ffcd8d7d5ac3b540a96dbff5490
+csky 2c40c1c6adab90ee4660caf03722b3a3ec67767b
+loongarch a6be9b65a61e220945805f35146d8267a3da50f3
+m68k 6b9c045b0602cf64b33ea6da5e6aa6f81dd47ae8
+m68knommu b401b621758e46812da61fa58a67c3fd8d91de0d
+microblaze 6613476e225e090cc9aad49be7fa504e290dd33d
+mips 188942f05ce45f80c06f7242ad7478bd204c3387
+openrisc c289330331eb93bc6a3c68b9119ccd7d4285a4a2
+parisc-hd 0568b6f0d863643db2edcc7be31165740c89fa82
+powerpc a3e1820186b5ed3703e690eb064ad7c6c7477cfb
+soc-fsl fb9c384625dd604e8a5be1f42b35e83104b90670
+risc-v 45e0b0fd6dc574101825ac2738b890da024e4cda
+riscv-dt d0653996b7ea1286678efed9351dd2fc24752e32
+riscv-soc 6613476e225e090cc9aad49be7fa504e290dd33d
+s390 6a42aaf8e867f4876370c3d482ee0c21769dff58
+sh 0a2d3ce0031f504b2e3ad47625e149ad5759ad33
+uml 83aec96c631e0fa75cfe6d6a1b113a32151aaa88
+xtensa 7ab7acb68adf053c78a2cdf32bf1a3dce95912ec
+bcachefs bf85b528ab11ca8a2a80b07564ebfd714805ea53
+pidfd a901a3568fd26ca9c4a82d8bc5ed5b3ed844d451
+fscrypt 8c62f31eddb71c6f6878258579318c1156045247
+afs abcbd3bfbbfe97a8912d0c929d4aa18f50d9bc52
+btrfs 2653677ec90137e71de5c2c716de76f4683f995e
+ceph 51d31149a88b5c5a8d2d33f06df93f6187a25b4c
+cifs ac79e0d1b4d496b5ad73a8440b1b369608f7065d
+configfs 4425c1d9b44ded655d2668e1ce95a62bccf7b21b
+ecryptfs a3d78fe3e1ae8c6a1901635c54a1a799656f72c8
+erofs b401b621758e46812da61fa58a67c3fd8d91de0d
+exfat f3cb82f5008f2439b3d70973c1aef7e2c6f753b3
+exportfs 42c3732fa8073717dd7d924472f1c0bc5b452fdc
+ext3 21fea055bb748ddaca5af38cc6184c4976a9a638
+ext4 1f85b452e07c370448fb4eb4472cd55fc6bf115c
+f2fs 0f1c6ede6da9f7c5dd7380b74a64850298279168
+fsverity 8e43fb06e10d2c811797740dd578c5099a3e6378
+fuse 3f84a8008c75ee77bf9bf83f7c1cca457f94de3d
+gfs2 6b89b6af459fdd6f2741d0c2e33c67af8193697e
+jfs e42e29cc442395d62f1a8963ec2dfb700ba6a5d7
+ksmbd 342c3b87c95b9553cc8ab6c87e59909c51d01222
+nfs 052d534373b7ed33712a63d5e17b2b6cdbce84fd
+nfs-anna 57331a59ac0d680f606403eb24edd3c35aecba31
+nfsd 26102396d4e0559e0cf147e1f36123d7ee6afaca
+ntfs3 622cd3daa8eae37359a6fd3c07c36d19f66606b5
+orangefs 9bf93dcfc453fae192fe5d7874b89699e8f800ac
+overlayfs d17bb4620f90f81d8a8a45c3d025c679a1b5efcd
+ubifs 3ce485803da1b79b2692b6d0c2792829292ad838
+v9fs be3193e58ec210b2a72fb1134c2a0695088a911d
+v9fs-ericvh be57855f505003c5cafff40338d5d0f23b00ba4d
+xfs 8a800a1e9004ee19a7601353b239d2d296612342
+zonefs 567e629fd296561aacd04547a603b163de3dabbe
+iomap 3ac974796e5d94509b85a403449132ea660127c2
+djw-vfs ce85a1e04645b1ed386b074297df27ab5b8801c0
+file-locks e0152e7481c6c63764d6ea8ee41af5cf9dfac5e9
+iversion e0152e7481c6c63764d6ea8ee41af5cf9dfac5e9
+vfs-brauner 872365adb67a380540604b84444eaa737bc86233
+vfs 052d534373b7ed33712a63d5e17b2b6cdbce84fd
+printk e7081d5a9d976b84f61f497316d7c940a4a2e67a
+pci 5b52c9afa3dd95ea0903b6d16225e5744f20ad5b
+pstore 98bc7e26e14fbb26a6abf97603d59532475e97f8
+hid 33d8d768a2ce2138e36643cd1c3e87d7bb478a6a
+i2c d206a76d7d2726f3b096037f2079ce0bd3ba329b
+i2c-host 197ecadad842855437a36ffc161648418ae02a97
+i3c 8f06fb45853900b4deaa52e2a9e16f3d9550b011
+hwmon-staging 5b1d7a0f904b0785d1f6e12770648410093744ac
+jc_docs 32ed7930304ca7600a54c2e702098bd2ce7086af
+v4l-dvb 8c64f4cdf4e6cc5682c52523713af8c39c94e6d5
+v4l-dvb-next e0b8eb0f6d652981bfd9ba7c619c9d81ed087ad0
+pm 377070604cce56dce4b795d8cb26bcd5e13bf2af
+cpufreq-arm 3093fa33539b54db77171d2919352ad4f044a1c5
+cpupower babb46746cc5683fc930fea7d0ef6d5323d6a6cd
+devfreq b401b621758e46812da61fa58a67c3fd8d91de0d
+pmdomain 713240877a26f3cc035d6531795bd819dfaa633c
+opp ace4b31b297dfd7b8c969ff5046c8128c3e025be
+thermal 9ac53d5532cc4bb595bbee86ccba2172ccc336c3
+dlm 5beebc1dda47719dac85830c53bca1a0ab497d96
+rdma 14b526f55ba5916856126f9793309fd6de5c5e7e
+net-next f8cbf6bde4c8d5d32330bcceafa7b139fec89f97
+bpf-next e59997d9052599feb17419289f2a57ed300e1dfa
+ipsec-next aceb147b20a2eda9a10bdd4b5650718f731ef3e1
+mlx5-next d727d27db536faea7178290c677cc0567f647231
+netfilter-next a4634aa71fee11f5e3e13bf7d80ee1480a64ce70
+ipvs-next 26f4dac11775a1ca24e2605cb30e828d4dbdea93
+bluetooth 715b938b3a0fe772d52fc810402e0c91e1adca4d
+wireless-next 734940143fbdde7998c75607f85a5e438dd93c8e
+wpan-next 42683294cc0a9ba010de5d978fd23fd1e778b192
+wpan-staging 42683294cc0a9ba010de5d978fd23fd1e778b192
+mtd 77bf032528393d2dc9430b3cea1fee8d0762a86f
+nand 65a7f244b15684856241d04b8f3287d9124bd1ff
+spi-nor 6a9eda34418fc4dc05c2a7d6741c475e287d418c
+crypto a24e3b583ea2db3418f0c6ae1f12b07ca96531cc
+drm f112b68f273fb0121cb64e0c3ac06adcb91e32b8
+drm-exynos 40d47c5fb4f2a7c1ef168598f01bdcbd31ba4038
+drm-misc 9fa2679b7fe1bf4e6010051767d3c163b3aee68b
+amdgpu 1cb96a8a59c67bbada098e945b97c633e1f2c0aa
+drm-intel e60cff453b82789a652239c6200bd90d5178d2a0
+drm-tegra 2429b3c529da29d4277d519bd66d034842dcd70c
+drm-msm 18397519cb62248865ca33266a483dbcf7d08b5f
+drm-msm-lumag e3b1f369db5a75854ab893fb4cfa0109efd0bdb2
+drm-xe e275d61c5f3ffc250b2a9601d36fbd11b4db774b
+etnaviv c9959996a8fc171bbb2c2d9c7478306f331a6cca
+fbdev 72fee6b0a3a4ad6c5131d4c20e8ab7253b16e38b
+regmap 62861ddcb27e356c6332b54d4a953e1b8c01fe73
+sound a55bc334d3dfbfdc075632a144e821a564da38d5
+ieee1394 41ebb53b1bffb24547e21015ea53f382f922a099
+sound-asoc adcb38c12e9dff3b5d716f88a1ea9946860177b7
+modules d1909c0221739356f31c721de4743e7d219a56cc
+input d03f030115fe930de1222fef294730ba21b93045
+block eea16a07dfe4db16342ef0db5f48ce1fef54ea1d
+device-mapper 6006301c6a838a07dbf614ae11e7c9860ad0372d
+libata c1bc6ed01c16958ec7d0704df64adefc452c99a1
+pcmcia 1bec7691b32710ea27741f0f8b00c1dc98d92930
+mmc 25e69172db8a31ef8564ce1cf755ac5cb8374daa
+mfd ec0131916367e73420c66e9c4089f11872e028f1
+backlight 770c0f4975fd7b4bb68ca7cf150d3b1c9c864a99
+battery 8fbb11162504f2de167a8ccd2d2c55a849d2c5ea
+regulator b915fdf06b41068e80829e6d09597ebfc649f48c
+security 8f49397828ee61b6b3002c1de2956b120b7f832a
+apparmor 8ead196be219adade3bd0d4115cc9b8506643121
+integrity 85445b96429057d87446bcb24ec0cac9ea9c7fdf
+selinux a1fc79343abbdc5bebb80c2a9032063442df8b59
+smack 69b6d71052b54fb10feba68564ccb41c0f0ce1e9
+tomoyo 0bb80ecc33a8fb5a682236443c1e740d5c917d1d
+tpmdd 27eaacc62adefa804a0ceed10b580aff59ec5122
+watchdog 41bccc98fb7931d63d03f326a746ac4d429c1dd3
+iommu 43400fa1ca4c580d4540623191fe970f6b6393a3
+audit aa13b709084a0287ef250a9fbde5993e4dfc3078
+devicetree 1447c13051c7ed6f43a73eeee8e26280c4016e5d
+dt-krzk 8c82b4eef2972200f6171aaa260d7bba2ad29889
+mailbox cd795fb0c352c1f70e5fa437b01572c8693e1b77
+spi 65e97e8afcd4b9959b7343407c3e6b5134894b25
+tip e453cb32af61debd5652dc077d467489a7339254
+clockevents c819dbd078321f948101ef7a19f1e171164bb3cf
+edac 3513ecaa685c6627a943b1f610421754734301fa
+ftrace a641f0533adb832f31a6d4a8ddf857c8e508ed96
+rcu 10395f8cfef8e360355770776945aff5d23f793b
+kvm 0cbca1bf44a0b8666c91ce3438f235c6fe70fbf1
+kvm-arm 8b177908c5fe6e38911f46c82dfa0fec7644d6dc
+kvms390 00de073e2420df02ac0f1a19dbfb60ff8eb198be
+kvm-ppc 41bccc98fb7931d63d03f326a746ac4d429c1dd3
+kvm-riscv f072b272aa27d57cf7fe6fdedb30fb50f391974e
+kvm-x86 f3ac6b5aec49c3f8ced623802ee9efa6484263eb
+xen-tip fa765c4b4aed2d64266b694520ecb025c862c5a9
+percpu 2d9ad81ef93570bc0d4929d05d0601ea400d6fcf
+workqueues a0b5824d0a114ad3da367a6d4561c18f70ef0de3
+drivers-x86 dcea652564a44ed33e3302826df4ab99dff73b3d
+chrome-platform 6613476e225e090cc9aad49be7fa504e290dd33d
+chrome-platform-firmware 8a0a62941a042612f7487f6c4ff291f9054ff214
+hsi 3693760295e8c8a1a88cb3da5b178959b3cc7c75
+leds-lj 3e7b2b9309cd3eb1b82121b8a978d2dd19301924
+ipmi 296455ade1fdcf5f8f8c033201633b60946c589a
+driver-core 01aacda0b10eca95444bf481ffdef858a0a883cc
+usb a560a5672826fc1e057068bda93b3d4c98d037a2
+thunderbolt b8a730836c6b1788ca2fbd6bcc2ac99e97ef7de9
+usb-serial 54be6c6c5ae8e0d93a6c4641cb7528eb0b6ba478
+tty 13a44ba0dca8c133a4368323683a270a3874d88c
+char-misc d4551c189d6e6a3fcf7f625bd4b273e770fad35a
+accel 576d7cc5a9e29e4cc579ffb0f9afc209e34eea31
+coresight a4f3057d19ffe1f5a7b9320303471a6725f11379
+fastrpc 5169a077f22a23d27660d048d5f43a592fd2c62f
+fpga ff49b00e9621402cf723c3cb11489dff2d09a738
+icc 6025a81ae63e7796479755e31a4f7b20786c1a5f
+iio 205bbf0d2dd2e0fcd6bf2a15b7df6fc570967e3b
+phy-next 00ca8a15dafa990d391abc37f2b8256ddf909b35
+soundwire 81a7d0c4d059cb5c122110acbeec7bedfb91a741
+extcon 16c6e3aff8d71e81a0b2c116437af66aacdf5151
+gnss 54be6c6c5ae8e0d93a6c4641cb7528eb0b6ba478
+vfio 701ab935859fcfd4a8c8a97f3ee4fb5294a9d481
+w1 d97d263132a69a0bda54efce3df04e55fa6341f7
+spmi b85ea95d086471afb4ad062012a4d73cd328fa86
+staging 455c5e12a3b7d08c2ab47b7dd54944901c69cdcd
+counter-next 3bb282ef1149a08a94bc5321b758825bc99c84c0
+mux 44c026a73be8038f03dbdeef028b642880cf1511
+dmaengine 716141d366f45d62ffe4dd53a045867b26e29d19
+cgroup 8d4c171f451d384f3a287eb14bd60825d0b2381b
+scsi 7b020ab8a0096db229749d6618b64659cf699331
+scsi-mkp b914227e421560e118029334fe6c4840b4da11ee
+vhost fd0b29af02bb75acc94eb08c06e2c10cbce2ea67
+rpmsg 929654e8f1add50b01d5a56171a31c311b0a739a
+gpio 0bb80ecc33a8fb5a682236443c1e740d5c917d1d
+gpio-brgl 0d776cfd5e5b559fdf2e38285c2aea4b7048acbd
+gpio-intel 6613476e225e090cc9aad49be7fa504e290dd33d
+pinctrl d2db5cd3721e98be5bc670e89857a27690eaef74
+pinctrl-intel 6613476e225e090cc9aad49be7fa504e290dd33d
+pinctrl-renesas a6f06b909fee72c679c565adfa7f080f9595e336
+pinctrl-samsung 6613476e225e090cc9aad49be7fa504e290dd33d
+pwm 9e3440d2d57b459cd12c5a4d15e95a1181568e4f
+ktest 7dc8e24f0e09834341f84d37433840b353d64bc8
+kselftest 539cd3f4da3fdbe7dc353634e004e4b0e725c35a
+kunit 6613476e225e090cc9aad49be7fa504e290dd33d
+kunit-next 717083f6645014268637224f1fdcfecc46b45ca9
+livepatching 602bf18307981f3bfd9ebf19921791a4256d3fd1
+rtc 6613476e225e090cc9aad49be7fa504e290dd33d
+nvdimm bc22374c96d959084bea1287cfc6ea0fd9ca4e40
+at24 6613476e225e090cc9aad49be7fa504e290dd33d
+ntb 9341b37ec17a8793e8439e9b18354ba69556b786
+seccomp 56af94aace8a0489fb1a32fd6f1cf0c548fe3911
+fsi c5eeb63edac9497f9a0d46d3b75cf8b293771ecf
+slimbus 6e8ba95e17eede7045e673d9e1b6b8ee1055a46c
+nvmem 6b475e23544a560b4bf2acfab8dc54c4e7b1749e
+xarray 2a15de80dd0f7e04a823291aa9eb49c5294f56af
+hyperv ce9ecca0238b140b88f43859b211c9fdfd8e5b70
+auxdisplay a9bcd02fa42217c795bc9538a149936c82648476
+kgdb 4f41d30cd6dc865c3cbc1a852372321eba6d4e4c
+hmm 6613476e225e090cc9aad49be7fa504e290dd33d
+cfi 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+mhi 2ec11b5d6d900b17c7d001fbee4751fd2aa58917
+memblock 2159bd4e905704b1765b6b883ea15e51ad986a6a
+cxl 73bf93edeeea866b0b6efbc8d2595bdaaba7f1a5
+zstd 3f832dfb8a8eafee3cecd479d99651a64a61485a
+efi 841c35169323cd833294798e58b9bf63fa4fa1de
+unicode 101c3fad29d7a0a90ff063b1aad586a0211911ec
+slab e3757988c8290b2aa6e2fbdba74b5f7a7be5a390
+random 1f719a2f3fa67665578c759ac34fd3d3690c1a20
+landlock bdbf17bc7d65d3835564e15410ced15dca683f1c
+rust e944171070b65521c0513c01c56174ec8fd7d249
+sysctl 4f1136a55dc8e2c27d51e934d0675e12331c7291
+execve d3f0d7bbaefd3465e95da2500640732a5cc8bedf
+bitmap fd8ed16c2419e23b7496e008e5f7be98da7fe2d5
+hte b85ea95d086471afb4ad062012a4d73cd328fa86
+kspp c427b1a5e0f80a59be43d44a5222a1080ff2a9c4
+kspp-gustavo 6613476e225e090cc9aad49be7fa504e290dd33d
+nolibc 6613476e225e090cc9aad49be7fa504e290dd33d
+tsm f4738f56d1dc62aaba69b33702a5ab098f1b8c63
+iommufd 6613476e225e090cc9aad49be7fa504e290dd33d
+header_cleanup 5f4c01f1e3c7b0c8d1e5dd6f080531de7aa5e47b
diff --git a/Next/Trees b/Next/Trees
new file mode 100644
index 000000000000..38fab0373ee0
--- /dev/null
+++ b/Next/Trees
@@ -0,0 +1,373 @@
+Trees included into this release:
+
+Name Type Url
+---- ---- ---
+origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master
+fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#fixes
+mm-hotfixes git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-hotfixes-unstable
+kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#fixes
+arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr
+arm-current git git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git#fixes
+arm64-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/fixes
+arm-soc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#arm/fixes
+davinci-current git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#davinci/for-current
+drivers-memory-fixes git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#fixes
+sophgo-fixes git https://github.com/sophgo/linux.git#fixes
+tee-fixes git https://git.linaro.org/people/jens.wiklander/linux-tee.git#fixes
+m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus
+powerpc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes
+s390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#fixes
+fscrypt-current git git://git.kernel.org/pub/scm/fs/fscrypt/linux.git#for-current
+fsverity-current git git://git.kernel.org/pub/scm/fs/fsverity/linux.git#for-current
+net git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git#main
+bpf git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git#master
+ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master
+netfilter git git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git#main
+ipvs git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git#main
+wireless git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git#for-next
+wpan git git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan.git#master
+rdma-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-rc
+sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus
+sound-asoc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-linus
+regmap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-linus
+regulator-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-linus
+spi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-linus
+pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git#for-linus
+driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-linus
+tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus
+usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus
+usb-serial-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-linus
+phy git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#fixes
+staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus
+iio-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#fixes-togreg
+counter-current git git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git#counter-current
+char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus
+soundwire-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#fixes
+thunderbolt-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#fixes
+input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus
+crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master
+vfio-fixes git git://github.com/awilliam/linux-vfio.git#for-linus
+kselftest-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes
+modules-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#modules-linus
+dmaengine-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#fixes
+backlight-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-fixes
+mtd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/fixes
+mfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-fixes
+v4l-dvb-fixes git https://git.linuxtv.org/media_stage.git#fixes
+reset-fixes git https://git.pengutronix.de/git/pza/linux#reset/fixes
+mips-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-fixes
+at91-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-fixes
+omap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#fixes
+kvm-fixes git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#master
+kvms390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#master
+hwmon-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon
+nvdimm-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-fixes
+cxl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#fixes
+btrfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#next-fixes
+vfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#fixes
+dma-mapping-fixes git git://git.infradead.org/users/hch/dma-mapping.git#for-linus
+drivers-x86-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#fixes
+samsung-krzk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#fixes
+pinctrl-samsung-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#fixes
+devicetree-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#dt/linus
+dt-krzk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git#fixes
+scsi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#fixes
+drm-fixes git git://git.freedesktop.org/git/drm/drm.git#drm-fixes
+drm-intel-fixes git git://anongit.freedesktop.org/drm-intel#for-linux-next-fixes
+mmc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#fixes
+rtc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-fixes
+gnss-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-linus
+hyperv-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-fixes
+soc-fsl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#fix
+risc-v-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#fixes
+riscv-dt-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-dt-fixes
+riscv-soc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-soc-fixes
+fpga-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git#fixes
+spdx git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git#spdx-linus
+gpio-brgl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-current
+gpio-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#fixes
+pinctrl-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#fixes
+auxdisplay-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git#fixes
+erofs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#fixes
+kunit-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit-fixes
+ubifs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#fixes
+memblock-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#fixes
+nfsd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#nfsd-fixes
+renesas-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#fixes
+perf-current git git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools#perf-tools
+efi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#urgent
+zstd-fixes git https://github.com/terrelln/linux.git#zstd-linus
+battery-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#fixes
+uml-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git#fixes
+iommufd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git#for-rc
+rust-fixes git https://github.com/Rust-for-Linux/linux.git#rust-fixes
+v9fs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#fixes/next
+w1-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git#fixes
+pmdomain-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git#fixes
+overlayfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git#ovl-fixes
+i2c-host-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git#i2c/i2c-host-fixes
+drm-misc-fixes git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next-fixes
+mm-stable git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-stable
+mm-nonmm-stable git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-nonmm-stable
+mm git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-everything
+kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#for-next
+clang-format git https://github.com/ojeda/linux.git#clang-format
+perf git git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git#perf-tools-next
+compiler-attributes git https://github.com/ojeda/linux.git#compiler-attributes
+dma-mapping git git://git.infradead.org/users/hch/dma-mapping.git#for-next
+asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master
+arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next
+arm git git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git#for-next
+arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core
+arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf
+arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#for-next
+amlogic git git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git#for-next
+asahi-soc git https://github.com/AsahiLinux/linux.git#asahi-soc/for-next
+aspeed git git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git#for-next
+at91 git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-next
+broadcom git https://github.com/Broadcom/stblinux.git#next
+davinci git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#davinci/for-next
+drivers-memory git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#for-next
+imx-mxs git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next
+mediatek git git://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux.git#for-next
+mvebu git git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git#for-next
+omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#for-next
+qcom git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git#for-next
+renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#next
+reset git https://git.pengutronix.de/git/pza/linux#reset/next
+rockchip git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next
+samsung-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next
+scmi git git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git#for-linux-next
+sophgo git https://github.com/sophgo/linux.git#for-next
+stm32 git git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git#stm32-next
+sunxi git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git#sunxi/for-next
+tee git https://git.linaro.org/people/jens.wiklander/linux-tee.git#next
+tegra git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next
+ti git git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git#ti-next
+xilinx git git://github.com/Xilinx/linux-xlnx.git#for-next
+clk git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next
+clk-imx git git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git#for-next
+clk-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-clk
+csky git git://github.com/c-sky/csky-linux.git#linux-next
+loongarch git git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git#loongarch-next
+m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next
+m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next
+microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next
+mips git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-next
+openrisc git git://github.com/openrisc/linux.git#for-next
+parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next
+powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next
+soc-fsl git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#next
+risc-v git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#for-next
+riscv-dt git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-dt-for-next
+riscv-soc git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-soc-for-next
+s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#for-next
+sh git git:git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux.git#for-next
+uml git git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git#next
+xtensa git git://github.com/jcmvbkbc/linux-xtensa.git#xtensa-for-next
+bcachefs git https://evilpiepirate.org/git/bcachefs.git#for-next
+pidfd git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#for-next
+fscrypt git git://git.kernel.org/pub/scm/fs/fscrypt/linux.git#for-next
+afs git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#afs-next
+btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next
+ceph git git://github.com/ceph/ceph-client.git#master
+cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next
+configfs git git://git.infradead.org/users/hch/configfs.git#for-next
+ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next
+erofs git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#dev
+exfat git git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git#dev
+exportfs git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#exportfs-next
+ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next
+ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev
+f2fs git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev
+fsverity git git://git.kernel.org/pub/scm/fs/fsverity/linux.git#for-next
+fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next
+gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next
+jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next
+ksmbd git https://github.com/smfrench/smb3-kernel.git#ksmbd-for-next
+nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next
+nfs-anna git git://git.linux-nfs.org/projects/anna/linux-nfs.git#linux-next
+nfsd git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#nfsd-next
+ntfs3 git https://github.com/Paragon-Software-Group/linux-ntfs3.git#master
+orangefs git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux#for-next
+overlayfs git git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git#overlayfs-next
+ubifs git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#next
+v9fs git git://github.com/martinetd/linux#9p-next
+v9fs-ericvh git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#ericvh/for-next
+xfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#for-next
+zonefs git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git#for-next
+iomap git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#iomap-for-next
+djw-vfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#vfs-for-next
+file-locks git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#locks-next
+iversion git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#iversion-next
+vfs-brauner git git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git#vfs.all
+vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#for-next
+printk git git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git#for-next
+pci git git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git#next
+pstore git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/pstore
+hid git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git#for-next
+i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next
+i2c-host git git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git#i2c/i2c-host
+i3c git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/next
+hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next
+jc_docs git git://git.lwn.net/linux.git#docs-next
+v4l-dvb git git://linuxtv.org/media_tree.git#master
+v4l-dvb-next git git://linuxtv.org/mchehab/media-next.git#master
+pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next
+cpufreq-arm git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#cpufreq/arm/linux-next
+cpupower git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#cpupower
+devfreq git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git#devfreq-next
+pmdomain git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git#next
+opp git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#opp/linux-next
+thermal git git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git#thermal/linux-next
+dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next
+rdma git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-next
+net-next git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git#main
+bpf-next git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git#for-next
+ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master
+mlx5-next git git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git#mlx5-next
+netfilter-next git git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next.git#main
+ipvs-next git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#main
+bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master
+wireless-next git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git#for-next
+wpan-next git git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git#master
+wpan-staging git git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git#staging
+mtd git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/next
+nand git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#nand/next
+spi-nor git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#spi-nor/next
+crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master
+drm git git://git.freedesktop.org/git/drm/drm.git#drm-next
+drm-exynos git git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git#for-linux-next
+drm-misc git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next
+amdgpu git https://gitlab.freedesktop.org/agd5f/linux#drm-next
+drm-intel git git://anongit.freedesktop.org/drm-intel#for-linux-next
+drm-tegra git https://gitlab.freedesktop.org/drm/tegra.git#for-next
+drm-msm git https://gitlab.freedesktop.org/drm/msm.git#msm-next
+drm-msm-lumag git https://gitlab.freedesktop.org/lumag/msm.git#msm-next-lumag
+drm-xe git https://gitlab.freedesktop.org/drm/xe/kernel#drm-xe-next
+etnaviv git https://git.pengutronix.de/git/lst/linux#etnaviv/next
+fbdev git git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git#for-next
+regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next
+sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next
+ieee1394 git https://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next
+sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next
+modules git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#modules-next
+input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next
+block git git://git.kernel.dk/linux-block.git#for-next
+device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next
+libata git git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux#for-next
+pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git#pcmcia-next
+mmc git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#next
+mfd git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next
+backlight git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next
+battery git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#for-next
+regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next
+security git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git#next
+apparmor git git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor#apparmor-next
+integrity git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next-integrity
+selinux git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#next
+smack git git://github.com/cschaufler/smack-next#next
+tomoyo git https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git#master
+tpmdd git git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git#next
+watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master
+iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next
+audit git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git#next
+devicetree git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next
+dt-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git#for-next
+mailbox git git://git.kernel.org/pub/scm/linux/kernel/git/jassibrar/mailbox.git#for-next
+spi git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next
+tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#master
+clockevents git git://git.linaro.org/people/daniel.lezcano/linux.git#timers/drivers/next
+edac git git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git#edac-for-next
+ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#for-next
+rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next
+kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#next
+kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next
+kvms390 git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#next
+kvm-ppc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#topic/ppc-kvm
+kvm-riscv git https://github.com/kvm-riscv/linux.git#riscv_kvm_next
+kvm-x86 git https://github.com/kvm-x86/linux.git#next
+xen-tip git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next
+percpu git git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git#for-next
+workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next
+drivers-x86 git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#for-next
+chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git#for-next
+chrome-platform-firmware git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git#for-firmware-next
+hsi git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next
+leds-lj git git://git.kernel.org/pub/scm/linux/kernel/git/lee/leds.git#for-leds-next
+ipmi git git://github.com/cminyard/linux-ipmi.git#for-next
+driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next
+usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next
+thunderbolt git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#next
+usb-serial git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-next
+tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next
+char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next
+accel git git://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux.git#habanalabs-next
+coresight git git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git#next
+fastrpc git git://git.kernel.org/pub/scm/linux/kernel/git/srini/fastrpc.git#for-next
+fpga git git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git#for-next
+icc git git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git#icc-next
+iio git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#togreg
+phy-next git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#next
+soundwire git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#next
+extcon git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next
+gnss git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-next
+vfio git git://github.com/awilliam/linux-vfio.git#next
+w1 git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git#for-next
+spmi git git://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git#spmi-next
+staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next
+counter-next git git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git#counter-next
+mux git https://gitlab.com/peda-linux/mux.git#for-next
+dmaengine git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#next
+cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next
+scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next
+scsi-mkp git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#for-next
+vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next
+rpmsg git git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git#for-next
+gpio git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next
+gpio-brgl git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-next
+gpio-intel git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#for-next
+pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next
+pinctrl-intel git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#for-next
+pinctrl-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-pinctrl
+pinctrl-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#for-next
+pwm git git://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git#pwm/for-next
+ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next
+kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next
+kunit git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#test
+kunit-next git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit
+livepatching git git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching#for-next
+rtc git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next
+nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next
+at24 git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#at24/for-next
+ntb git https://github.com/jonmason/ntb.git#ntb-next
+seccomp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/seccomp
+fsi git git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git#next
+slimbus git git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git#for-next
+nvmem git git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git#for-next
+xarray git git://git.infradead.org/users/willy/xarray.git#main
+hyperv git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-next
+auxdisplay git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git#for-next
+kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git#kgdb/for-next
+hmm git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#hmm
+cfi git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#cfi/next
+mhi git git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git#mhi-next
+memblock git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#for-next
+cxl git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#next
+zstd git https://github.com/terrelln/linux.git#zstd-next
+efi git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#next
+unicode git git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git#for-next
+slab git git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git#slab/for-next
+random git git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git#master
+landlock git git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git#next
+rust git https://github.com/Rust-for-Linux/linux.git#rust-next
+sysctl git git://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl.git#sysctl-next
+execve git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/execve
+bitmap git https://github.com/norov/linux.git#bitmap-for-next
+hte git git://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git#for-next
+kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp
+kspp-gustavo git git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git#for-next/kspp
+nolibc git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#nolibc
+tsm git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/linux#tsm-next
+iommufd git git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git#for-next
+header_cleanup git https://evilpiepirate.org/git/bcachefs.git#header_cleanup
diff --git a/Next/merge.log b/Next/merge.log
new file mode 100644
index 000000000000..ea89016d3a14
--- /dev/null
+++ b/Next/merge.log
@@ -0,0 +1,13101 @@
+$ date -R
+Wed, 28 Feb 2024 08:13:03 +1100
+$ git checkout master
+Already on 'master'
+$ git reset --hard stable
+Updating files: 58% (5221/8997) Updating files: 59% (5309/8997) Updating files: 60% (5399/8997) Updating files: 61% (5489/8997) Updating files: 62% (5579/8997) Updating files: 63% (5669/8997) Updating files: 64% (5759/8997) Updating files: 65% (5849/8997) Updating files: 66% (5939/8997) Updating files: 67% (6028/8997) Updating files: 68% (6118/8997) Updating files: 69% (6208/8997) Updating files: 70% (6298/8997) Updating files: 71% (6388/8997) Updating files: 72% (6478/8997) Updating files: 73% (6568/8997) Updating files: 74% (6658/8997) Updating files: 75% (6748/8997) Updating files: 76% (6838/8997) Updating files: 77% (6928/8997) Updating files: 78% (7018/8997) Updating files: 79% (7108/8997) Updating files: 80% (7198/8997) Updating files: 81% (7288/8997) Updating files: 82% (7378/8997) Updating files: 83% (7468/8997) Updating files: 84% (7558/8997) Updating files: 85% (7648/8997) Updating files: 86% (7738/8997) Updating files: 87% (7828/8997) Updating files: 88% (7918/8997) Updating files: 89% (8008/8997) Updating files: 90% (8098/8997) Updating files: 91% (8188/8997) Updating files: 92% (8278/8997) Updating files: 93% (8368/8997) Updating files: 94% (8458/8997) Updating files: 95% (8548/8997) Updating files: 96% (8638/8997) Updating files: 97% (8728/8997) Updating files: 98% (8818/8997) Updating files: 99% (8908/8997) Updating files: 100% (8997/8997) Updating files: 100% (8997/8997), done.
+HEAD is now at 45ec2f5f6ed3 Merge tag 'mtd/fixes-for-6.8-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux
+Merging origin/master (45ec2f5f6ed3 Merge tag 'mtd/fixes-for-6.8-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master
+Already up to date.
+Merging fixes/fixes (2dde18cd1d8f Linux 6.5)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git fixes/fixes
+Already up to date.
+Merging mm-hotfixes/mm-hotfixes-unstable (1e6a4bad7f15 init/Kconfig: lower GCC version check for -Warray-bounds)
+$ git merge -m Merge branch 'mm-hotfixes-unstable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-hotfixes/mm-hotfixes-unstable
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ MAINTAINERS | 11 +++
+ include/linux/gfp.h | 9 ++
+ include/linux/poison.h | 3 +
+ init/Kconfig | 6 +-
+ lib/stackdepot.c | 254 +++++++++++++++++++++++++------------------------
+ mm/compaction.c | 7 +-
+ mm/debug_vm_pgtable.c | 8 ++
+ mm/filemap.c | 51 +++++-----
+ mm/kasan/common.c | 8 +-
+ mm/kasan/generic.c | 68 ++-----------
+ mm/kasan/kasan.h | 10 --
+ mm/kasan/quarantine.c | 5 +-
+ mm/migrate.c | 8 ++
+ mm/mmap.c | 10 +-
+ mm/page_alloc.c | 10 +-
+ mm/userfaultfd.c | 6 +-
+ mm/vmscan.c | 5 +-
+ 17 files changed, 234 insertions(+), 245 deletions(-)
+Merging kbuild-current/fixes (b401b621758e Linux 6.8-rc5)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild-current/fixes
+Already up to date.
+Merging arc-current/for-curr (861deac3b092 Linux 6.7-rc7)
+$ git merge -m Merge branch 'for-curr' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc-current/for-curr
+Already up to date.
+Merging arm-current/fixes (6613476e225e Linux 6.8-rc1)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git arm-current/fixes
+Already up to date.
+Merging arm64-fixes/for-next/fixes (d7b77a0d565b arm64/sme: Restore SMCR_EL1.EZT0 on exit from suspend)
+$ git merge -m Merge branch 'for-next/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64-fixes/for-next/fixes
+Already up to date.
+Merging arm-soc-fixes/arm/fixes (dcb8e53e339e Merge tag 'renesas-fixes-for-v6.8-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel into arm/fixes)
+$ git merge -m Merge branch 'arm/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc-fixes/arm/fixes
+Already up to date.
+Merging davinci-current/davinci/for-current (6613476e225e Linux 6.8-rc1)
+$ git merge -m Merge branch 'davinci/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git davinci-current/davinci/for-current
+Already up to date.
+Merging drivers-memory-fixes/fixes (6613476e225e Linux 6.8-rc1)
+$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory-fixes/fixes
+Already up to date.
+Merging sophgo-fixes/fixes (41bccc98fb79 Linux 6.8-rc2)
+$ git merge -m Merge branch 'fixes' of https://github.com/sophgo/linux.git sophgo-fixes/fixes
+Already up to date.
+Merging tee-fixes/fixes (ceaa837f96ad Linux 6.2-rc8)
+$ git merge -m Merge branch 'fixes' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee-fixes/fixes
+Already up to date.
+Merging m68k-current/for-linus (e8a7824856de m68k: defconfig: Update defconfigs for v6.8-rc1)
+$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k-current/for-linus
+Merge made by the 'ort' strategy.
+ arch/m68k/configs/amiga_defconfig | 3 ---
+ arch/m68k/configs/apollo_defconfig | 3 ---
+ arch/m68k/configs/atari_defconfig | 3 ---
+ arch/m68k/configs/bvme6000_defconfig | 3 ---
+ arch/m68k/configs/hp300_defconfig | 3 ---
+ arch/m68k/configs/mac_defconfig | 3 ---
+ arch/m68k/configs/multi_defconfig | 3 ---
+ arch/m68k/configs/mvme147_defconfig | 3 ---
+ arch/m68k/configs/mvme16x_defconfig | 3 ---
+ arch/m68k/configs/q40_defconfig | 3 ---
+ arch/m68k/configs/sun3_defconfig | 3 ---
+ arch/m68k/configs/sun3x_defconfig | 3 ---
+ drivers/zorro/zorro-driver.c | 2 +-
+ drivers/zorro/zorro.h | 2 +-
+ 14 files changed, 2 insertions(+), 38 deletions(-)
+Merging powerpc-fixes/fixes (20c8c4dafe93 KVM: PPC: Book3S HV: Fix L2 guest reboot failure due to empty 'arch_compat')
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc-fixes/fixes
+Already up to date.
+Merging s390-fixes/fixes (5ef1dc40ffa6 s390/cio: fix invalid -EBUSY on ccw_device_start)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390-fixes/fixes
+Already up to date.
+Merging fscrypt-current/for-current (4bcf6f827a79 fscrypt: check for NULL keyring in fscrypt_put_master_key_activeref())
+$ git merge -m Merge branch 'for-current' of git://git.kernel.org/pub/scm/fs/fscrypt/linux.git fscrypt-current/for-current
+Already up to date.
+Merging fsverity-current/for-current (a075bacde257 fsverity: don't drop pagecache at end of FS_IOC_ENABLE_VERITY)
+$ git merge -m Merge branch 'for-current' of git://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity-current/for-current
+Already up to date.
+Merging net/main (1ce7d306ea63 veth: try harder when allocating queue memory)
+$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/main
+Merge made by the 'ort' strategy.
+ drivers/dpll/dpll_core.c | 2 +-
+ drivers/dpll/dpll_core.h | 2 +
+ drivers/net/ethernet/freescale/fman/fman_memac.c | 18 ++---
+ drivers/net/ethernet/intel/ice/ice_base.c | 10 +--
+ drivers/net/ethernet/intel/ice/ice_dpll.c | 91 ++++++++++++++++++----
+ drivers/net/ethernet/intel/ice/ice_lib.c | 88 ++++++++++++++++-----
+ drivers/net/ethernet/intel/ice/ice_lib.h | 10 ++-
+ drivers/net/ethernet/intel/ice/ice_main.c | 3 +-
+ .../net/ethernet/pensando/ionic/ionic_bus_pci.c | 15 ++--
+ drivers/net/ethernet/pensando/ionic/ionic_dev.c | 10 +++
+ .../net/ethernet/pensando/ionic/ionic_ethtool.c | 7 +-
+ drivers/net/ethernet/pensando/ionic/ionic_fw.c | 5 ++
+ drivers/net/ethernet/pensando/ionic/ionic_lif.c | 5 +-
+ drivers/net/ethernet/pensando/ionic/ionic_main.c | 3 +
+ drivers/net/ethernet/toshiba/ps3_gelic_net.c | 12 +--
+ drivers/net/tun.c | 1 +
+ drivers/net/usb/lan78xx.c | 3 +-
+ drivers/net/usb/smsc95xx.c | 5 ++
+ drivers/net/veth.c | 40 +++++-----
+ include/linux/dpll.h | 11 +++
+ include/linux/netdevice.h | 11 +--
+ include/net/mctp.h | 1 +
+ lib/nlattr.c | 4 +
+ net/core/dev.c | 2 +-
+ net/ipv4/ip_tunnel.c | 28 +++++--
+ net/ipv6/addrconf.c | 7 +-
+ net/mctp/route.c | 10 ++-
+ net/mptcp/diag.c | 3 +
+ net/mptcp/options.c | 2 +-
+ net/mptcp/pm_userspace.c | 10 +++
+ net/mptcp/protocol.c | 52 ++++++++++++-
+ net/mptcp/protocol.h | 21 ++---
+ net/netlink/af_netlink.c | 2 +-
+ tools/testing/selftests/net/mptcp/diag.sh | 30 ++++++-
+ tools/testing/selftests/net/mptcp/mptcp_join.sh | 33 +++++---
+ tools/testing/selftests/net/mptcp/mptcp_lib.sh | 4 +-
+ tools/testing/selftests/net/veth.sh | 14 ++++
+ 37 files changed, 439 insertions(+), 136 deletions(-)
+Merging bpf/master (dced881ead78 Merge branch 'check-bpf_func_state-callback_depth-when-pruning-states')
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git bpf/master
+Merge made by the 'ort' strategy.
+ kernel/bpf/verifier.c | 3 +
+ .../bpf/progs/verifier_iterating_callbacks.c | 70 ++++++++++++++++++++++
+ 2 files changed, 73 insertions(+)
+Merging ipsec/master (1a807e46aa93 xfrm: Avoid clang fortify warning in copy_to_user_tmpl())
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master
+Auto-merging net/xfrm/xfrm_user.c
+Merge made by the 'ort' strategy.
+ net/xfrm/xfrm_device.c | 2 +-
+ net/xfrm/xfrm_policy.c | 2 +-
+ net/xfrm/xfrm_user.c | 3 +++
+ 3 files changed, 5 insertions(+), 2 deletions(-)
+Merging netfilter/main (359e54a93ab4 l2tp: pass correct message length to ip6_append_data)
+$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git netfilter/main
+Already up to date.
+Merging ipvs/main (40b9385dd8e6 enic: Avoid false positive under FORTIFY_SOURCE)
+$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git ipvs/main
+Already up to date.
+Merging wireless/for-next (413dafc8170f wifi: mac80211: only call drv_sta_rc_update for uploaded stations)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ MAINTAINERS | 11 +++++----
+ drivers/net/wireless/intel/iwlwifi/fw/api/txq.h | 12 +++++++++-
+ drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 9 +++++++-
+ drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 11 +++++++++
+ drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 8 +++++--
+ drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 28 +++++++++++++++++++++++
+ drivers/net/wireless/intel/iwlwifi/mvm/sta.h | 3 ++-
+ net/mac80211/rate.c | 3 ++-
+ net/wireless/nl80211.c | 2 ++
+ 9 files changed, 76 insertions(+), 11 deletions(-)
+Merging wpan/master (b85ea95d0864 Linux 6.7-rc1)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan.git wpan/master
+Already up to date.
+Merging rdma-fixes/for-rc (eb5c7465c324 RDMA/srpt: fix function pointer cast warnings)
+$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma-fixes/for-rc
+Already up to date.
+Merging sound-current/for-linus (b34bf65838f7 ALSA: hda/realtek - ALC285 reduce pop noise from Headphone port)
+$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus
+Merge made by the 'ort' strategy.
+ include/uapi/sound/asound.h | 4 ++--
+ sound/core/Makefile | 1 -
+ sound/core/pcm_native.c | 5 +++++
+ sound/core/ump.c | 4 ++--
+ sound/firewire/amdtp-stream.c | 2 +-
+ sound/pci/hda/patch_realtek.c | 34 ++++++++++++++++++++++++++++++++--
+ 6 files changed, 42 insertions(+), 8 deletions(-)
+Merging sound-asoc-fixes/for-linus (50ee641643dd ASoC: amd: yc: Add Lenovo ThinkBook 21J0 into DMI quirk table)
+$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc-fixes/for-linus
+Merge made by the 'ort' strategy.
+ include/sound/soc-card.h | 2 ++
+ sound/soc/amd/yc/acp6x-mach.c | 7 +++++++
+ sound/soc/codecs/cs35l45.c | 2 +-
+ sound/soc/codecs/cs35l56-shared.c | 1 +
+ sound/soc/codecs/cs35l56.c | 2 +-
+ sound/soc/fsl/fsl_xcvr.c | 12 +++++++++++-
+ sound/soc/qcom/lpass-cdc-dma.c | 2 +-
+ sound/soc/soc-card.c | 24 ++++++++++++++++++++++--
+ 8 files changed, 46 insertions(+), 6 deletions(-)
+Merging regmap-fixes/for-linus (2f0dbb24f78a regmap: kunit: Ensure that changed bytes are actually different)
+$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap-fixes/for-linus
+Already up to date.
+Merging regulator-fixes/for-linus (e5d40e9afd84 regulator: max5970: Fix regulator child node name)
+$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ MAINTAINERS | 2 +-
+ drivers/regulator/max5970-regulator.c | 8 ++++----
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+Merging spi-fixes/for-linus (6415c7fe7cf4 spi: Drop mismerged fix)
+$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi-fixes/for-linus
+Merge made by the 'ort' strategy.
+ drivers/spi/spi-cadence-quadspi.c | 35 ++++++++++++++++++++++-------------
+ drivers/spi/spi-ppc4xx.c | 14 +++++++-------
+ 2 files changed, 29 insertions(+), 20 deletions(-)
+Merging pci-current/for-linus (6613476e225e Linux 6.8-rc1)
+$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci-current/for-linus
+Already up to date.
+Merging driver-core.current/driver-core-linus (b401b621758e Linux 6.8-rc5)
+$ git merge -m Merge branch 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core.current/driver-core-linus
+Already up to date.
+Merging tty.current/tty-linus (d206a76d7d27 Linux 6.8-rc6)
+$ git merge -m Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty.current/tty-linus
+Already up to date.
+Merging usb.current/usb-linus (d206a76d7d27 Linux 6.8-rc6)
+$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus
+Already up to date.
+Merging usb-serial-fixes/usb-linus (54be6c6c5ae8 Linux 6.8-rc3)
+$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial-fixes/usb-linus
+Already up to date.
+Merging phy/fixes (d4c08d8b23b2 phy: qcom-qmp-usb: fix v3 offsets data)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy/fixes
+Merge made by the 'ort' strategy.
+ drivers/phy/freescale/phy-fsl-imx8-mipi-dphy.c | 2 +-
+ drivers/phy/qualcomm/phy-qcom-eusb2-repeater.c | 160 +++++++++----------------
+ drivers/phy/qualcomm/phy-qcom-m31.c | 2 +-
+ drivers/phy/qualcomm/phy-qcom-qmp-usb.c | 10 +-
+ 4 files changed, 66 insertions(+), 108 deletions(-)
+Merging staging.current/staging-linus (6613476e225e Linux 6.8-rc1)
+$ git merge -m Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging.current/staging-linus
+Already up to date.
+Merging iio-fixes/fixes-togreg (11dadb631007 iio: accel: adxl367: fix I2C FIFO data register)
+$ git merge -m Merge branch 'fixes-togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio-fixes/fixes-togreg
+Merge made by the 'ort' strategy.
+ drivers/iio/accel/adxl367.c | 8 +++--
+ drivers/iio/accel/adxl367_i2c.c | 2 +-
+ drivers/iio/imu/inv_mpu6050/inv_mpu_ring.c | 2 ++
+ drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c | 5 +++
+ drivers/iio/pressure/bmp280-spi.c | 50 ++++++++++++++++++++++++++-
+ drivers/iio/pressure/dlhl60d.c | 7 ++--
+ 6 files changed, 66 insertions(+), 8 deletions(-)
+Merging counter-current/counter-current (c83ccdc9586b counter: fix privdata alignment)
+$ git merge -m Merge branch 'counter-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-current/counter-current
+Merge made by the 'ort' strategy.
+ drivers/counter/counter-core.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+Merging char-misc.current/char-misc-linus (daaf5286b6d2 mei: Add Meteor Lake support for IVSC device)
+$ git merge -m Merge branch 'char-misc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc.current/char-misc-linus
+Merge made by the 'ort' strategy.
+ drivers/misc/mei/hw-me-regs.h | 2 ++
+ drivers/misc/mei/pci-me.c | 2 ++
+ drivers/misc/mei/vsc-tp.c | 1 +
+ 3 files changed, 5 insertions(+)
+Merging soundwire-fixes/fixes (6613476e225e Linux 6.8-rc1)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire-fixes/fixes
+Already up to date.
+Merging thunderbolt-fixes/fixes (d3d17e23d1a0 thunderbolt: Fix NULL pointer dereference in tb_port_update_credits())
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt-fixes/fixes
+Merge made by the 'ort' strategy.
+ drivers/thunderbolt/switch.c | 3 +++
+ 1 file changed, 3 insertions(+)
+Merging input-current/for-linus (4255447ad34c Input: i8042 - add Fujitsu Lifebook U728 to i8042 quirk table)
+$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input-current/for-linus
+Already up to date.
+Merging crypto-current/master (1c0cf6d19690 crypto: arm64/neonbs - fix out-of-bounds access on short input)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git crypto-current/master
+Merge made by the 'ort' strategy.
+ arch/arm64/crypto/aes-neonbs-glue.c | 11 +++++++++++
+ crypto/lskcipher.c | 6 ++----
+ 2 files changed, 13 insertions(+), 4 deletions(-)
+Merging vfio-fixes/for-linus (4ea95c04fa6b vfio: Drop vfio_file_iommu_group() stub to fudge around a KVM wart)
+$ git merge -m Merge branch 'for-linus' of git://github.com/awilliam/linux-vfio.git vfio-fixes/for-linus
+Already up to date.
+Merging kselftest-fixes/fixes (b54761f6e977 kselftest/seccomp: Report each expectation we assert as a KTAP test)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest-fixes/fixes
+Already up to date.
+Merging modules-fixes/modules-linus (f412eef03938 Documentation: livepatch: module-elf-format: Remove local klp_modinfo definition)
+$ git merge -m Merge branch 'modules-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules-fixes/modules-linus
+Already up to date.
+Merging dmaengine-fixes/fixes (df2515a17914 dmaengine: ptdma: use consistent DMA masks)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine-fixes/fixes
+Merge made by the 'ort' strategy.
+ drivers/dma/dw-edma/dw-edma-v0-core.c | 17 +++++++++++++++
+ drivers/dma/dw-edma/dw-hdma-v0-core.c | 39 ++++++++++++++++++++++------------
+ drivers/dma/dw-edma/dw-hdma-v0-regs.h | 2 +-
+ drivers/dma/fsl-edma-common.c | 2 +-
+ drivers/dma/fsl-edma-common.h | 5 +++--
+ drivers/dma/fsl-edma-main.c | 4 +++-
+ drivers/dma/fsl-qdma.c | 40 +++++++++++++++++------------------
+ drivers/dma/idxd/cdev.c | 2 +-
+ drivers/dma/idxd/debugfs.c | 2 +-
+ drivers/dma/idxd/idxd.h | 1 -
+ drivers/dma/idxd/init.c | 15 ++++++++++---
+ drivers/dma/idxd/irq.c | 3 +--
+ drivers/dma/ptdma/ptdma-dmaengine.c | 2 --
+ 13 files changed, 86 insertions(+), 48 deletions(-)
+Merging backlight-fixes/for-backlight-fixes (6613476e225e Linux 6.8-rc1)
+$ git merge -m Merge branch 'for-backlight-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight-fixes/for-backlight-fixes
+Already up to date.
+Merging mtd-fixes/mtd/fixes (e6a30d0c48a1 mtd: rawnand: marvell: fix layouts)
+$ git merge -m Merge branch 'mtd/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd-fixes/mtd/fixes
+Already up to date.
+Merging mfd-fixes/for-mfd-fixes (6613476e225e Linux 6.8-rc1)
+$ git merge -m Merge branch 'for-mfd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd-fixes/for-mfd-fixes
+Already up to date.
+Merging v4l-dvb-fixes/fixes (346c84e281a9 media: pwm-ir-tx: Depend on CONFIG_HIGH_RES_TIMERS)
+$ git merge -m Merge branch 'fixes' of https://git.linuxtv.org/media_stage.git v4l-dvb-fixes/fixes
+Already up to date.
+Merging reset-fixes/reset/fixes (4a6756f56bcf reset: Fix crash when freeing non-existent optional resets)
+$ git merge -m Merge branch 'reset/fixes' of https://git.pengutronix.de/git/pza/linux reset-fixes/reset/fixes
+Already up to date.
+Merging mips-fixes/mips-fixes (b401b621758e Linux 6.8-rc5)
+$ git merge -m Merge branch 'mips-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips-fixes/mips-fixes
+Already up to date.
+Merging at91-fixes/at91-fixes (6613476e225e Linux 6.8-rc1)
+$ git merge -m Merge branch 'at91-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91-fixes/at91-fixes
+Already up to date.
+Merging omap-fixes/fixes (9b6a51aab5f5 ARM: dts: Fix occasional boot hang for am3 usb)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap-fixes/fixes
+Already up to date.
+Merging kvm-fixes/master (5ef1d8c1ddbf KVM: SVM: Flush pages under kvm->lock to fix UAF in svm_register_enc_region())
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm-fixes/master
+Merge made by the 'ort' strategy.
+ arch/x86/kvm/svm/sev.c | 18 ++++++++++--------
+ 1 file changed, 10 insertions(+), 8 deletions(-)
+Merging kvms390-fixes/master (83303a4c776c KVM: s390: fix cc for successful PQAP)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390-fixes/master
+Already up to date.
+Merging hwmon-fixes/hwmon (d206a76d7d27 Linux 6.8-rc6)
+$ git merge -m Merge branch 'hwmon' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon
+Already up to date.
+Merging nvdimm-fixes/libnvdimm-fixes (33908660e814 ACPI: NFIT: Fix incorrect calculation of idt size)
+$ git merge -m Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm-fixes/libnvdimm-fixes
+Already up to date.
+Merging cxl-fixes/fixes (d206a76d7d27 Linux 6.8-rc6)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl-fixes/fixes
+Already up to date.
+Merging btrfs-fixes/next-fixes (eb90d142fc1b Merge branch 'misc-6.8' into next-fixes)
+$ git merge -m Merge branch 'next-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs-fixes/next-fixes
+Merge made by the 'ort' strategy.
+ fs/btrfs/volumes.c | 44 ++++++++++++++++++++++++++++++++++----------
+ 1 file changed, 34 insertions(+), 10 deletions(-)
+Merging vfs-fixes/fixes (aa23317d0268 qibfs: fix dentry leak)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs-fixes/fixes
+Merge made by the 'ort' strategy.
+ drivers/infiniband/hw/qib/qib_fs.c | 1 +
+ 1 file changed, 1 insertion(+)
+Merging dma-mapping-fixes/for-linus (d5090484b021 swiotlb: do not try to allocate a TLB bigger than MAX_ORDER pages)
+$ git merge -m Merge branch 'for-linus' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping-fixes/for-linus
+Already up to date.
+Merging drivers-x86-fixes/fixes (427c70dec738 platform/x86: thinkpad_acpi: Only update profile if successfully converted)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86-fixes/fixes
+Already up to date.
+Merging samsung-krzk-fixes/fixes (eab4f56d3e75 ARM: dts: exynos4212-tab3: add samsung,invert-vclk flag to fimd)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk-fixes/fixes
+Already up to date.
+Merging pinctrl-samsung-fixes/fixes (6613476e225e Linux 6.8-rc1)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung-fixes/fixes
+Already up to date.
+Merging devicetree-fixes/dt/linus (4e06ec0774f5 dt-bindings: ufs: samsung,exynos-ufs: Add size constraints on "samsung,sysreg")
+$ git merge -m Merge branch 'dt/linus' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree-fixes/dt/linus
+Already up to date.
+Merging dt-krzk-fixes/fixes (6613476e225e Linux 6.8-rc1)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk-fixes/fixes
+Already up to date.
+Merging scsi-fixes/fixes (ee0017c3ed8a scsi: mpt3sas: Prevent sending diag_reset when the controller is ready)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-fixes/fixes
+Merge made by the 'ort' strategy.
+ drivers/scsi/mpi3mr/mpi3mr_transport.c | 7 ++++++-
+ drivers/scsi/mpt3sas/mpt3sas_base.c | 4 +++-
+ 2 files changed, 9 insertions(+), 2 deletions(-)
+Merging drm-fixes/drm-fixes (d206a76d7d27 Linux 6.8-rc6)
+$ git merge -m Merge branch 'drm-fixes' of git://git.freedesktop.org/git/drm/drm.git drm-fixes/drm-fixes
+Already up to date.
+Merging drm-intel-fixes/for-linux-next-fixes (e567857cb41c drm/i915/hdcp: Extract hdcp structure from correct connector)
+$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm-intel drm-intel-fixes/for-linux-next-fixes
+Merge made by the 'ort' strategy.
+ drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 47 ++++++++++------------------
+ 1 file changed, 16 insertions(+), 31 deletions(-)
+Merging mmc-fixes/fixes (6b1ba3f9040b mmc: mmci: stm32: fix DMA API overlapping mappings warning)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes
+Merge made by the 'ort' strategy.
+ drivers/mmc/core/mmc.c | 2 ++
+ drivers/mmc/host/mmci_stm32_sdmmc.c | 24 ++++++++++++++++++++++++
+ 2 files changed, 26 insertions(+)
+Merging rtc-fixes/rtc-fixes (08279468a294 rtc: sunplus: fix format string for printing resource)
+$ git merge -m Merge branch 'rtc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc-fixes/rtc-fixes
+Already up to date.
+Merging gnss-fixes/gnss-linus (54be6c6c5ae8 Linux 6.8-rc3)
+$ git merge -m Merge branch 'gnss-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss-fixes/gnss-linus
+Already up to date.
+Merging hyperv-fixes/hyperv-fixes (564eac2860bd hv_utils: Allow implicit ICTIMESYNCFLAG_SYNC)
+$ git merge -m Merge branch 'hyperv-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes
+Merge made by the 'ort' strategy.
+ drivers/hv/hv_util.c | 31 ++++++++++++++++++++++++++++++-
+ 1 file changed, 30 insertions(+), 1 deletion(-)
+Merging soc-fsl-fixes/fix (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl-fixes/fix
+Already up to date.
+Merging risc-v-fixes/fixes (d82f32202e0d RISC-V: Ignore V from the riscv,isa DT property on older T-Head CPUs)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v-fixes/fixes
+Merge made by the 'ort' strategy.
+ arch/riscv/Kconfig | 1 -
+ arch/riscv/include/asm/ftrace.h | 5 ++++
+ arch/riscv/include/asm/hugetlb.h | 2 ++
+ arch/riscv/include/asm/pgalloc.h | 20 +++++++++++++---
+ arch/riscv/include/asm/pgtable-64.h | 2 +-
+ arch/riscv/kernel/Makefile | 2 ++
+ arch/riscv/kernel/cpufeature.c | 15 ++++++++++++
+ arch/riscv/kernel/return_address.c | 48 +++++++++++++++++++++++++++++++++++++
+ arch/riscv/mm/hugetlbpage.c | 2 ++
+ scripts/Kconfig.include | 2 +-
+ scripts/Makefile.compiler | 2 +-
+ 11 files changed, 94 insertions(+), 7 deletions(-)
+ create mode 100644 arch/riscv/kernel/return_address.c
+Merging riscv-dt-fixes/riscv-dt-fixes (ce6b6d151396 riscv: dts: sifive: add missing #interrupt-cells to pmic)
+$ git merge -m Merge branch 'riscv-dt-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt-fixes/riscv-dt-fixes
+Already up to date.
+Merging riscv-soc-fixes/riscv-soc-fixes (d206a76d7d27 Linux 6.8-rc6)
+$ git merge -m Merge branch 'riscv-soc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc-fixes/riscv-soc-fixes
+Already up to date.
+Merging fpga-fixes/fixes (6613476e225e Linux 6.8-rc1)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga-fixes/fixes
+Already up to date.
+Merging spdx/spdx-linus (6613476e225e Linux 6.8-rc1)
+$ git merge -m Merge branch 'spdx-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git spdx/spdx-linus
+Already up to date.
+Merging gpio-brgl-fixes/gpio/for-current (ae366ba8576d gpiolib: Handle no pin_ranges in gpiochip_generic_config())
+$ git merge -m Merge branch 'gpio/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl-fixes/gpio/for-current
+Already up to date.
+Merging gpio-intel-fixes/fixes (6613476e225e Linux 6.8-rc1)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel-fixes/fixes
+Already up to date.
+Merging pinctrl-intel-fixes/fixes (6613476e225e Linux 6.8-rc1)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel-fixes/fixes
+Already up to date.
+Merging auxdisplay-fixes/fixes (6613476e225e Linux 6.8-rc1)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git auxdisplay-fixes/fixes
+Already up to date.
+Merging erofs-fixes/fixes (56ee7db31187 erofs: fix refcount on the metabuf used for inode lookup)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs-fixes/fixes
+Already up to date.
+Merging kunit-fixes/kunit-fixes (829388b725f8 kunit: device: Unregister the kunit_bus on shutdown)
+$ git merge -m Merge branch 'kunit-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-fixes/kunit-fixes
+Already up to date.
+Merging ubifs-fixes/fixes (2241ab53cbb5 Linux 6.2-rc5)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs-fixes/fixes
+Already up to date.
+Merging memblock-fixes/fixes (6a9531c3a880 memblock: fix crash when reserved memory is not added to memory)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock-fixes/fixes
+Already up to date.
+Merging nfsd-fixes/nfsd-fixes (5ea9a7c5fe41 nfsd: don't take fi_lock in nfsd_break_deleg_cb())
+$ git merge -m Merge branch 'nfsd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd-fixes/nfsd-fixes
+Already up to date.
+Merging renesas-fixes/fixes (8c987693dc2d ARM: dts: renesas: rcar-gen2: Add missing #interrupt-cells to DA9063 nodes)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas-fixes/fixes
+Already up to date.
+Merging perf-current/perf-tools (fdd0ae72b34e perf tools headers: update the asm-generic/unaligned.h copy with the kernel sources)
+$ git merge -m Merge branch 'perf-tools' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools perf-current/perf-tools
+Already up to date.
+Merging efi-fixes/urgent (2ce507f57ba9 efivarfs: Drop 'duplicates' bool parameter on efivar_init())
+$ git merge -m Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-fixes/urgent
+Merge made by the 'ort' strategy.
+ drivers/firmware/efi/capsule-loader.c | 2 +-
+ fs/efivarfs/internal.h | 2 +-
+ fs/efivarfs/super.c | 7 +------
+ fs/efivarfs/vars.c | 23 +++++++++++++----------
+ 4 files changed, 16 insertions(+), 18 deletions(-)
+Merging zstd-fixes/zstd-linus (77618db34645 zstd: Fix array-index-out-of-bounds UBSAN warning)
+$ git merge -m Merge branch 'zstd-linus' of https://github.com/terrelln/linux.git zstd-fixes/zstd-linus
+Already up to date.
+Merging battery-fixes/fixes (2df70149e73e power: supply: bq27xxx-i2c: Do not free non existing IRQ)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery-fixes/fixes
+Merge made by the 'ort' strategy.
+ drivers/power/supply/Kconfig | 1 +
+ drivers/power/supply/bq27xxx_battery_i2c.c | 4 +++-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+Merging uml-fixes/fixes (73a23d771033 um: harddog: fix modular build)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml-fixes/fixes
+Already up to date.
+Merging iommufd-fixes/for-rc (510325e5ac5f selftests/iommu: fix the config fragment)
+$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd-fixes/for-rc
+Already up to date.
+Merging rust-fixes/rust-fixes (b401b621758e Linux 6.8-rc5)
+$ git merge -m Merge branch 'rust-fixes' of https://github.com/Rust-for-Linux/linux.git rust-fixes/rust-fixes
+Already up to date.
+Merging v9fs-fixes/fixes/next (6613476e225e Linux 6.8-rc1)
+$ git merge -m Merge branch 'fixes/next' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git v9fs-fixes/fixes/next
+Already up to date.
+Merging w1-fixes/fixes (6613476e225e Linux 6.8-rc1)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git w1-fixes/fixes
+Already up to date.
+Merging pmdomain-fixes/fixes (eb5555d422d0 pmdomain: arm: Fix NULL dereference on scmi_perf_domain removal)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git pmdomain-fixes/fixes
+Merge made by the 'ort' strategy.
+ drivers/pmdomain/arm/scmi_perf_domain.c | 3 +++
+ 1 file changed, 3 insertions(+)
+Merging overlayfs-fixes/ovl-fixes (420332b94119 ovl: mark xwhiteouts directory with overlay.opaque='x')
+$ git merge -m Merge branch 'ovl-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git overlayfs-fixes/ovl-fixes
+Already up to date.
+Merging i2c-host-fixes/i2c/i2c-host-fixes (cf8281b1aeab i2c: imx: when being a target, mark the last read as processed)
+$ git merge -m Merge branch 'i2c/i2c-host-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git i2c-host-fixes/i2c/i2c-host-fixes
+Merge made by the 'ort' strategy.
+Merging drm-misc-fixes/for-linux-next-fixes (00d6a284fcf3 fbcon: always restore the old font data in fbcon_do_set_font())
+$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm/drm-misc drm-misc-fixes/for-linux-next-fixes
+Merge made by the 'ort' strategy.
+ drivers/gpu/drm/Kconfig | 5 ++-
+ drivers/gpu/drm/bridge/aux-hpd-bridge.c | 70 ++++++++++++++++++++++++++-------
+ drivers/gpu/drm/tegra/drm.c | 23 +++++++++--
+ drivers/gpu/host1x/dev.c | 15 ++++---
+ drivers/gpu/host1x/dev.h | 6 +++
+ drivers/soc/qcom/pmic_glink.c | 21 +++++-----
+ drivers/soc/qcom/pmic_glink_altmode.c | 16 ++++++--
+ drivers/video/fbdev/core/fbcon.c | 8 ++--
+ include/drm/bridge/aux-bridge.h | 15 +++++++
+ 9 files changed, 135 insertions(+), 44 deletions(-)
+Merging mm-stable/mm-stable (c44ed5b7596f writeback: remove a use of write_cache_pages() from do_writepages())
+$ git merge -m Merge branch 'mm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-stable/mm-stable
+Auto-merging MAINTAINERS
+Auto-merging arch/loongarch/kernel/setup.c
+Auto-merging arch/riscv/Kconfig
+Auto-merging arch/riscv/kernel/Makefile
+Auto-merging include/linux/gfp.h
+Auto-merging mm/compaction.c
+Auto-merging mm/mmap.c
+Auto-merging mm/page_alloc.c
+Auto-merging mm/userfaultfd.c
+Auto-merging mm/vmscan.c
+Merge made by the 'ort' strategy.
+ Documentation/ABI/testing/sysfs-bus-dax | 153 ++
+ Documentation/ABI/testing/sysfs-kernel-mm-cma | 6 +
+ Documentation/ABI/testing/sysfs-kernel-mm-damon | 16 +-
+ .../ABI/testing/sysfs-kernel-mm-mempolicy | 4 +
+ .../sysfs-kernel-mm-mempolicy-weighted-interleave | 25 +
+ Documentation/admin-guide/kdump/vmcoreinfo.rst | 8 +-
+ Documentation/admin-guide/mm/damon/reclaim.rst | 27 +
+ Documentation/admin-guide/mm/damon/usage.rst | 156 +-
+ .../admin-guide/mm/numa_memory_policy.rst | 9 +
+ Documentation/dev-tools/kasan.rst | 20 +-
+ Documentation/mm/damon/design.rst | 70 +-
+ Documentation/mm/damon/maintainer-profile.rst | 8 +-
+ Documentation/mm/page_owner.rst | 45 +
+ .../zh_CN/admin-guide/mm/damon/usage.rst | 20 +-
+ .../translations/zh_CN/dev-tools/kasan.rst | 20 +-
+ .../zh_TW/admin-guide/mm/damon/usage.rst | 20 +-
+ .../translations/zh_TW/dev-tools/kasan.rst | 20 +-
+ MAINTAINERS | 12 +
+ arch/arc/Kconfig | 1 +
+ arch/arc/include/asm/cachetype.h | 9 +
+ arch/arm/Kconfig | 1 +
+ arch/arm/Kconfig.debug | 2 +-
+ arch/arm/configs/aspeed_g4_defconfig | 2 +-
+ arch/arm/configs/aspeed_g5_defconfig | 2 +-
+ arch/arm/include/asm/cachetype.h | 2 +
+ arch/arm/include/asm/pgtable.h | 2 +
+ arch/arm/include/asm/ptdump.h | 6 +-
+ arch/arm/kernel/Makefile | 1 +
+ arch/arm/kernel/machine_kexec.c | 7 -
+ arch/arm/kernel/setup.c | 4 +-
+ arch/arm/kernel/vmcore_info.c | 10 +
+ arch/arm/mm/init.c | 2 +-
+ arch/arm/mm/mmu.c | 2 +-
+ arch/arm64/Kconfig | 11 +-
+ .../include/asm/{crash_core.h => crash_reserve.h} | 4 +-
+ arch/arm64/include/asm/kexec.h | 2 +-
+ arch/arm64/include/asm/pgtable.h | 431 ++++-
+ arch/arm64/include/asm/ptdump.h | 7 -
+ arch/arm64/include/asm/tlbflush.h | 13 +-
+ arch/arm64/kernel/Makefile | 2 +-
+ arch/arm64/kernel/efi.c | 4 +-
+ arch/arm64/kernel/machine_kexec.c | 2 +-
+ arch/arm64/kernel/machine_kexec_file.c | 10 +-
+ arch/arm64/kernel/mte.c | 2 +-
+ arch/arm64/kernel/{crash_core.c => vmcore_info.c} | 3 +-
+ arch/arm64/kvm/guest.c | 2 +-
+ arch/arm64/mm/Makefile | 1 +
+ arch/arm64/mm/contpte.c | 404 +++++
+ arch/arm64/mm/fault.c | 12 +-
+ arch/arm64/mm/fixmap.c | 4 +-
+ arch/arm64/mm/hugetlbpage.c | 47 +-
+ arch/arm64/mm/init.c | 2 +-
+ arch/arm64/mm/kasan_init.c | 6 +-
+ arch/arm64/mm/mmu.c | 18 +-
+ arch/arm64/mm/pageattr.c | 6 +-
+ arch/arm64/mm/ptdump.c | 11 +-
+ arch/arm64/mm/trans_pgd.c | 6 +-
+ arch/csky/Kconfig | 1 +
+ arch/csky/include/asm/cachetype.h | 9 +
+ arch/loongarch/kernel/setup.c | 2 +-
+ arch/m68k/Kconfig | 1 +
+ arch/m68k/include/asm/cachetype.h | 9 +
+ arch/mips/Kconfig | 1 +
+ arch/mips/include/asm/cachetype.h | 9 +
+ arch/mips/kernel/setup.c | 17 +-
+ arch/nios2/Kconfig | 1 +
+ arch/nios2/include/asm/cachetype.h | 10 +
+ arch/nios2/include/asm/pgtable.h | 2 +
+ arch/parisc/Kconfig | 1 +
+ arch/parisc/include/asm/cachetype.h | 9 +
+ arch/powerpc/Kconfig | 7 +-
+ arch/powerpc/include/asm/pgtable.h | 2 +
+ arch/powerpc/include/asm/tlb.h | 2 +
+ arch/powerpc/kernel/setup-common.c | 2 +-
+ arch/powerpc/kexec/Makefile | 1 +
+ arch/powerpc/kexec/core.c | 28 -
+ arch/powerpc/kexec/vmcore_info.c | 32 +
+ arch/powerpc/mm/hugetlbpage.c | 4 +-
+ arch/powerpc/mm/mmu_decl.h | 6 -
+ arch/powerpc/mm/nohash/kaslr_booke.c | 4 +-
+ arch/powerpc/mm/pgtable.c | 5 +-
+ arch/powerpc/mm/pgtable_32.c | 4 -
+ arch/powerpc/mm/pgtable_64.c | 3 -
+ arch/powerpc/mm/ptdump/ptdump.c | 21 +-
+ arch/powerpc/platforms/powernv/opal-core.c | 2 +-
+ arch/riscv/Kconfig | 2 +-
+ .../include/asm/{crash_core.h => crash_reserve.h} | 4 +-
+ arch/riscv/include/asm/pgtable.h | 2 +
+ arch/riscv/include/asm/ptdump.h | 22 -
+ arch/riscv/kernel/Makefile | 2 +-
+ arch/riscv/kernel/elf_kexec.c | 9 +-
+ arch/riscv/kernel/{crash_core.c => vmcore_info.c} | 3 +-
+ arch/riscv/mm/init.c | 5 +-
+ arch/riscv/mm/ptdump.c | 12 +-
+ arch/s390/Kconfig | 1 +
+ arch/s390/include/asm/pgtable.h | 2 +
+ arch/s390/include/asm/ptdump.h | 14 -
+ arch/s390/include/asm/tlb.h | 30 +-
+ arch/s390/kernel/Makefile | 1 +
+ arch/s390/kernel/kexec_elf.c | 2 +
+ arch/s390/kernel/kexec_image.c | 2 +
+ arch/s390/kernel/machine_kexec.c | 15 -
+ arch/s390/kernel/machine_kexec_file.c | 10 +
+ arch/s390/kernel/vmcore_info.c | 21 +
+ arch/s390/mm/dump_pagetables.c | 21 +-
+ arch/s390/mm/init.c | 5 -
+ arch/s390/mm/pgtable.c | 4 +-
+ arch/s390/mm/vmem.c | 62 +-
+ arch/sh/Kconfig | 1 +
+ arch/sh/include/asm/cachetype.h | 9 +
+ arch/sh/kernel/Makefile | 1 +
+ arch/sh/kernel/machine_kexec.c | 14 +-
+ arch/sh/kernel/setup.c | 2 +-
+ arch/sh/kernel/vmcore_info.c | 15 +
+ arch/sparc/Kconfig | 1 +
+ arch/sparc/include/asm/cachetype.h | 14 +
+ arch/sparc/include/asm/pgtable_64.h | 2 +
+ arch/x86/Kconfig | 2 +-
+ .../include/asm/{crash_core.h => crash_reserve.h} | 6 +-
+ arch/x86/include/asm/mmu.h | 2 +-
+ arch/x86/include/asm/pgtable.h | 13 +-
+ arch/x86/kernel/Makefile | 6 +-
+ arch/x86/kernel/alternative.c | 2 +-
+ arch/x86/kernel/cpu/mshyperv.c | 10 +-
+ arch/x86/kernel/kexec-bzimage64.c | 4 +
+ arch/x86/kernel/kvm.c | 4 +-
+ arch/x86/kernel/machine_kexec_64.c | 3 +
+ arch/x86/kernel/reboot.c | 4 +-
+ arch/x86/kernel/setup.c | 2 +-
+ arch/x86/kernel/smp.c | 2 +-
+ .../kernel/{crash_core_32.c => vmcore_info_32.c} | 2 +-
+ .../kernel/{crash_core_64.c => vmcore_info_64.c} | 2 +-
+ arch/x86/mm/dump_pagetables.c | 24 +-
+ arch/x86/mm/init_32.c | 2 -
+ arch/x86/mm/init_64.c | 2 -
+ arch/x86/mm/tlb.c | 37 +-
+ arch/x86/xen/enlighten_hvm.c | 4 +
+ arch/x86/xen/mmu_pv.c | 4 +-
+ arch/xtensa/Kconfig | 1 +
+ arch/xtensa/include/asm/cachetype.h | 10 +
+ drivers/base/cacheinfo.c | 50 +-
+ drivers/base/cpu.c | 6 +-
+ drivers/base/memory.c | 23 +-
+ drivers/block/zram/zcomp.c | 5 +-
+ drivers/block/zram/zram_drv.c | 2 +-
+ drivers/cpuidle/cpuidle.c | 2 +-
+ drivers/dax/bus.c | 295 +++-
+ drivers/dax/super.c | 14 +
+ drivers/firmware/qemu_fw_cfg.c | 14 +-
+ drivers/md/dm.c | 17 +-
+ drivers/nvdimm/pmem.c | 23 +-
+ drivers/of/kexec.c | 2 +
+ drivers/s390/block/dcssblk.c | 11 +-
+ drivers/s390/char/sclp_cmd.c | 44 +-
+ fs/Kconfig | 1 -
+ fs/fuse/virtio_fs.c | 15 +-
+ fs/proc/Kconfig | 2 +-
+ fs/proc/kcore.c | 2 +-
+ fs/proc/task_mmu.c | 17 +-
+ fs/userfaultfd.c | 86 +-
+ include/asm-generic/tlb.h | 44 +-
+ include/linux/buildid.h | 2 +-
+ include/linux/cacheinfo.h | 6 +
+ include/linux/cma.h | 6 +-
+ include/linux/crash_core.h | 158 +-
+ include/linux/crash_reserve.h | 48 +
+ include/linux/damon.h | 89 +-
+ include/linux/dax.h | 17 +-
+ include/linux/efi.h | 5 +
+ include/linux/gfp.h | 2 +-
+ include/linux/highmem.h | 14 +
+ include/linux/kexec.h | 47 +-
+ include/linux/list_lru.h | 20 +-
+ include/linux/memcontrol.h | 1 +
+ include/linux/memory.h | 9 +
+ include/linux/memory_hotplug.h | 24 +-
+ include/linux/memremap.h | 3 +-
+ include/linux/mm.h | 17 +-
+ include/linux/mm_types.h | 37 +-
+ include/linux/mmu_context.h | 2 +-
+ include/linux/mmzone.h | 6 +-
+ include/linux/page_counter.h | 2 +-
+ include/linux/pagevec.h | 18 +
+ include/linux/pgtable.h | 137 +-
+ include/linux/ptdump.h | 10 +
+ include/linux/sched.h | 10 +-
+ include/linux/sched/mm.h | 55 +-
+ include/linux/stackdepot.h | 58 +
+ include/linux/swapops.h | 13 +
+ include/linux/userfaultfd_k.h | 75 +-
+ include/linux/vmalloc.h | 1 -
+ include/linux/vmcore_info.h | 81 +
+ include/linux/writeback.h | 12 +-
+ include/linux/zswap.h | 11 +-
+ include/trace/events/compaction.h | 6 +-
+ include/uapi/linux/mempolicy.h | 1 +
+ init/initramfs.c | 2 +-
+ init/main.c | 2 +
+ kernel/Kconfig.kexec | 12 +-
+ kernel/Makefile | 5 +-
+ kernel/crash_core.c | 816 +++-------
+ kernel/crash_reserve.c | 464 ++++++
+ kernel/dma/contiguous.c | 6 -
+ kernel/{crash_dump.c => elfcorehdr.c} | 0
+ kernel/events/uprobes.c | 2 +-
+ kernel/kallsyms_selftest.c | 1 -
+ kernel/kexec.c | 11 +-
+ kernel/kexec_core.c | 250 +--
+ kernel/kexec_file.c | 15 +-
+ kernel/kexec_internal.h | 2 +
+ kernel/ksysfs.c | 10 +-
+ kernel/printk/printk.c | 4 +-
+ kernel/vmcore_info.c | 230 +++
+ lib/buildid.c | 2 +-
+ lib/maple_tree.c | 6 +-
+ lib/stackdepot.c | 65 +-
+ lib/test_xarray.c | 230 +++
+ mm/Kconfig | 37 +-
+ mm/cma.c | 28 +-
+ mm/cma.h | 5 +
+ mm/cma_sysfs.c | 15 +
+ mm/compaction.c | 361 +++--
+ mm/damon/Kconfig | 7 +-
+ mm/damon/core.c | 120 +-
+ mm/damon/dbgfs.c | 26 +-
+ mm/damon/reclaim.c | 53 +
+ mm/damon/sysfs-common.h | 8 +-
+ mm/damon/sysfs-schemes.c | 146 +-
+ mm/damon/sysfs.c | 54 +-
+ mm/filemap.c | 4 +-
+ mm/huge_memory.c | 197 ++-
+ mm/hugetlb.c | 64 +-
+ mm/internal.h | 13 +-
+ mm/kasan/common.c | 2 +-
+ mm/kasan/kasan_test.c | 82 +-
+ mm/kasan/kasan_test_module.c | 4 +-
+ mm/kasan/report.c | 2 +-
+ mm/khugepaged.c | 22 +-
+ mm/kmsan/hooks.c | 50 +-
+ mm/list_lru.c | 20 +-
+ mm/madvise.c | 2 +-
+ mm/memcontrol.c | 97 +-
+ mm/memory-tiers.c | 26 +-
+ mm/memory.c | 466 ++++--
+ mm/memory_hotplug.c | 34 +-
+ mm/mempolicy.c | 492 +++++-
+ mm/migrate.c | 7 +-
+ mm/mmap.c | 110 +-
+ mm/mmu_gather.c | 121 +-
+ mm/mprotect.c | 4 +-
+ mm/nommu.c | 2 -
+ mm/page-writeback.c | 390 +++--
+ mm/page_alloc.c | 63 +-
+ mm/page_owner.c | 200 ++-
+ mm/ptdump.c | 22 +
+ mm/readahead.c | 6 +-
+ mm/rmap.c | 14 +-
+ mm/shmem.c | 18 +
+ mm/sparse.c | 3 +-
+ mm/swap.c | 12 +-
+ mm/swap_slots.c | 3 +
+ mm/swap_state.c | 15 +-
+ mm/swapfile.c | 32 +-
+ mm/userfaultfd.c | 488 ++++--
+ mm/vmalloc.c | 1094 +++++++++----
+ mm/vmscan.c | 165 +-
+ mm/z3fold.c | 5 +-
+ mm/zsmalloc.c | 118 +-
+ mm/zswap.c | 1696 ++++++++++----------
+ scripts/gdb/linux/vmalloc.py | 56 +-
+ tools/mm/Makefile | 9 +-
+ tools/mm/thpmaps | 675 ++++++++
+ tools/testing/selftests/cgroup/test_zswap.c | 122 +-
+ tools/testing/selftests/damon/.gitignore | 2 +
+ tools/testing/selftests/damon/Makefile | 5 +
+ tools/testing/selftests/damon/_chk_dependency.sh | 20 +-
+ tools/testing/selftests/damon/_damon_sysfs.py | 77 +-
+ tools/testing/selftests/damon/_debugfs_common.sh | 7 +
+ .../selftests/damon/damos_apply_interval.py | 67 +
+ tools/testing/selftests/damon/damos_quota.py | 67 +
+ .../selftests/damon/debugfs_empty_targets.sh | 12 +-
+ .../selftests/damon/debugfs_target_ids_pid_leak.c | 68 +
+ .../selftests/damon/debugfs_target_ids_pid_leak.sh | 22 +
+ ...debugfs_target_ids_read_before_terminate_race.c | 80 +
+ ...ebugfs_target_ids_read_before_terminate_race.sh | 14 +
+ tools/testing/selftests/memfd/memfd_test.c | 10 -
+ tools/testing/selftests/mm/.gitignore | 1 +
+ tools/testing/selftests/mm/Makefile | 1 +
+ tools/testing/selftests/mm/compaction_test.c | 37 +-
+ tools/testing/selftests/mm/hugetlb_madv_vs_map.c | 124 ++
+ tools/testing/selftests/mm/ksm_functional_tests.c | 4 +-
+ tools/testing/selftests/mm/map_fixed_noreplace.c | 96 +-
+ tools/testing/selftests/mm/map_hugetlb.c | 42 +-
+ tools/testing/selftests/mm/map_populate.c | 37 +-
+ tools/testing/selftests/mm/mlock-random-test.c | 136 +-
+ tools/testing/selftests/mm/mlock2-tests.c | 282 ++--
+ tools/testing/selftests/mm/mlock2.h | 11 +-
+ tools/testing/selftests/mm/mrelease_test.c | 80 +-
+ tools/testing/selftests/mm/mremap_dontunmap.c | 32 +-
+ tools/testing/selftests/mm/run_vmtests.sh | 12 +
+ tools/testing/selftests/mm/split_huge_page_test.c | 163 +-
+ tools/testing/selftests/mm/thuge-gen.c | 147 +-
+ tools/testing/selftests/mm/transhuge-stress.c | 36 +-
+ tools/testing/selftests/mm/virtual_address_range.c | 44 +-
+ tools/testing/selftests/mm/vm_util.c | 6 +-
+ 305 files changed, 10740 insertions(+), 5057 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-bus-dax
+ create mode 100644 Documentation/ABI/testing/sysfs-kernel-mm-mempolicy
+ create mode 100644 Documentation/ABI/testing/sysfs-kernel-mm-mempolicy-weighted-interleave
+ create mode 100644 arch/arc/include/asm/cachetype.h
+ create mode 100644 arch/arm/kernel/vmcore_info.c
+ rename arch/arm64/include/asm/{crash_core.h => crash_reserve.h} (81%)
+ rename arch/arm64/kernel/{crash_core.c => vmcore_info.c} (92%)
+ create mode 100644 arch/arm64/mm/contpte.c
+ create mode 100644 arch/csky/include/asm/cachetype.h
+ create mode 100644 arch/m68k/include/asm/cachetype.h
+ create mode 100644 arch/mips/include/asm/cachetype.h
+ create mode 100644 arch/nios2/include/asm/cachetype.h
+ create mode 100644 arch/parisc/include/asm/cachetype.h
+ create mode 100644 arch/powerpc/kexec/vmcore_info.c
+ rename arch/riscv/include/asm/{crash_core.h => crash_reserve.h} (78%)
+ delete mode 100644 arch/riscv/include/asm/ptdump.h
+ rename arch/riscv/kernel/{crash_core.c => vmcore_info.c} (88%)
+ delete mode 100644 arch/s390/include/asm/ptdump.h
+ create mode 100644 arch/s390/kernel/vmcore_info.c
+ create mode 100644 arch/sh/include/asm/cachetype.h
+ create mode 100644 arch/sh/kernel/vmcore_info.c
+ create mode 100644 arch/sparc/include/asm/cachetype.h
+ rename arch/x86/include/asm/{crash_core.h => crash_reserve.h} (92%)
+ rename arch/x86/kernel/{crash_core_32.c => vmcore_info_32.c} (90%)
+ rename arch/x86/kernel/{crash_core_64.c => vmcore_info_64.c} (94%)
+ create mode 100644 arch/xtensa/include/asm/cachetype.h
+ create mode 100644 include/linux/crash_reserve.h
+ create mode 100644 include/linux/vmcore_info.h
+ create mode 100644 kernel/crash_reserve.c
+ rename kernel/{crash_dump.c => elfcorehdr.c} (100%)
+ create mode 100644 kernel/vmcore_info.c
+ create mode 100644 tools/mm/thpmaps
+ create mode 100644 tools/testing/selftests/damon/damos_apply_interval.py
+ create mode 100644 tools/testing/selftests/damon/damos_quota.py
+ create mode 100644 tools/testing/selftests/damon/debugfs_target_ids_pid_leak.c
+ create mode 100644 tools/testing/selftests/damon/debugfs_target_ids_pid_leak.sh
+ create mode 100644 tools/testing/selftests/damon/debugfs_target_ids_read_before_terminate_race.c
+ create mode 100644 tools/testing/selftests/damon/debugfs_target_ids_read_before_terminate_race.sh
+ create mode 100644 tools/testing/selftests/mm/hugetlb_madv_vs_map.c
+Merging mm-nonmm-stable/mm-nonmm-stable (2932fb0a927d list: leverage list_is_head() for list_entry_is_head())
+$ git merge -m Merge branch 'mm-nonmm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-nonmm-stable/mm-nonmm-stable
+Auto-merging MAINTAINERS
+Auto-merging Makefile
+Auto-merging arch/arm64/Kconfig
+Auto-merging arch/powerpc/Kconfig
+Auto-merging arch/riscv/Kconfig
+Auto-merging arch/riscv/include/asm/ftrace.h
+CONFLICT (content): Merge conflict in arch/riscv/include/asm/ftrace.h
+Auto-merging init/main.c
+Auto-merging lib/Kconfig.debug
+Auto-merging tools/testing/selftests/mm/Makefile
+Auto-merging tools/testing/selftests/mm/run_vmtests.sh
+Resolved 'arch/riscv/include/asm/ftrace.h' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 83e0c8f0e777] Merge branch 'mm-nonmm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
+$ git diff -M --stat --summary HEAD^..
+ Documentation/admin-guide/kernel-parameters.txt | 1 +
+ Documentation/admin-guide/sysctl/kernel.rst | 15 +-
+ Documentation/process/changes.rst | 2 +-
+ MAINTAINERS | 1 -
+ Makefile | 8 -
+ arch/arm/include/asm/current.h | 8 +-
+ arch/arm64/Kconfig | 9 +-
+ arch/powerpc/Kconfig | 1 -
+ arch/powerpc/Makefile | 4 +-
+ arch/powerpc/kvm/book3s_hv_nested.c | 2 +-
+ arch/riscv/Kconfig | 4 +-
+ arch/riscv/include/asm/ftrace.h | 14 +-
+ arch/riscv/kernel/mcount.S | 10 +-
+ arch/s390/include/asm/ftrace.h | 2 +-
+ arch/x86/Makefile | 6 -
+ arch/x86/power/Makefile | 2 +-
+ crypto/blake2b_generic.c | 2 +-
+ drivers/android/binder.c | 4 +-
+ drivers/firmware/efi/libstub/Makefile | 2 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c | 2 +-
+ drivers/md/bcache/sysfs.c | 8 +-
+ drivers/media/test-drivers/vicodec/codec-fwht.c | 2 +-
+ drivers/regulator/Kconfig | 2 +-
+ fs/fat/nfs.c | 6 +
+ fs/nilfs2/alloc.c | 89 +++---
+ fs/nilfs2/bmap.c | 3 -
+ fs/nilfs2/cpfile.c | 323 ++++++++++++++-------
+ fs/nilfs2/cpfile.h | 10 +-
+ fs/nilfs2/dat.c | 38 +--
+ fs/nilfs2/ifile.c | 21 +-
+ fs/nilfs2/ifile.h | 10 +-
+ fs/nilfs2/inode.c | 44 ++-
+ fs/nilfs2/mdt.c | 4 +-
+ fs/nilfs2/nilfs.h | 3 +-
+ fs/nilfs2/page.c | 8 +-
+ fs/nilfs2/recovery.c | 4 +-
+ fs/nilfs2/segbuf.c | 4 +-
+ fs/nilfs2/segment.c | 121 +++-----
+ fs/nilfs2/sufile.c | 86 +++---
+ fs/nilfs2/super.c | 31 +-
+ fs/ocfs2/dlmglue.c | 2 +-
+ include/asm-generic/vmlinux.lds.h | 2 +-
+ include/linux/compiler-clang.h | 10 +-
+ include/linux/flex_proportions.h | 32 --
+ include/linux/list.h | 17 +-
+ include/linux/min_heap.h | 42 +--
+ include/linux/smp.h | 2 +-
+ include/linux/start_kernel.h | 2 -
+ include/linux/win_minmax.h | 4 +-
+ init/main.c | 9 +-
+ ipc/ipc_sysctl.c | 37 ++-
+ ipc/mq_sysctl.c | 36 +++
+ kernel/bounds.c | 2 +-
+ kernel/panic.c | 9 +
+ kernel/ptrace.c | 13 +-
+ kernel/user_namespace.c | 2 +-
+ lib/Kconfig.debug | 4 +-
+ lib/Kconfig.kasan | 2 +-
+ lib/dhry_1.c | 2 +-
+ lib/dhry_run.c | 1 -
+ lib/flex_proportions.c | 77 -----
+ lib/raid6/Makefile | 2 +-
+ lib/sort.c | 20 +-
+ lib/stackinit_kunit.c | 2 +-
+ mm/slab_common.c | 2 +-
+ net/bridge/br_multicast.c | 2 +-
+ scripts/const_structs.checkpatch | 1 +
+ scripts/min-tool-version.sh | 2 +-
+ scripts/recordmcount.pl | 2 +-
+ security/Kconfig | 2 -
+ tools/objtool/noreturns.h | 1 -
+ .../selftests/filesystems/eventfd/.gitignore | 2 +
+ .../testing/selftests/filesystems/eventfd/Makefile | 7 +
+ .../selftests/filesystems/eventfd/eventfd_test.c | 186 ++++++++++++
+ tools/testing/selftests/mm/Makefile | 5 +
+ .../selftests/mm/charge_reserved_hugetlb.sh | 4 +
+ .../selftests/mm/hugetlb_reparenting_test.sh | 9 +-
+ tools/testing/selftests/mm/on-fault-limit.c | 38 ++-
+ tools/testing/selftests/mm/protection_keys.c | 34 +++
+ tools/testing/selftests/mm/run_vmtests.sh | 17 +-
+ 80 files changed, 909 insertions(+), 652 deletions(-)
+ create mode 100644 tools/testing/selftests/filesystems/eventfd/.gitignore
+ create mode 100644 tools/testing/selftests/filesystems/eventfd/Makefile
+ create mode 100644 tools/testing/selftests/filesystems/eventfd/eventfd_test.c
+Merging mm/mm-everything (8706905dce7c Merge branch 'mm-nonmm-unstable' into mm-everything)
+$ git merge -m Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm/mm-everything
+Auto-merging net/iucv/iucv.c
+Merge made by the 'ort' strategy.
+ Documentation/admin-guide/cgroup-v2.rst | 18 +-
+ Documentation/mm/damon/design.rst | 2 +-
+ arch/arm64/mm/contpte.c | 46 +--
+ arch/powerpc/mm/hugetlbpage.c | 2 +-
+ arch/sparc/kernel/chmc.c | 2 +-
+ arch/sparc/kernel/ds.c | 2 +-
+ arch/x86/mm/tlb.c | 10 +-
+ drivers/block/sunvdc.c | 2 +-
+ drivers/block/zram/zcomp.h | 1 -
+ drivers/char/hw_random/n2-drv.c | 2 +-
+ drivers/char/tpm/st33zp24/i2c.c | 2 +-
+ drivers/char/tpm/st33zp24/spi.c | 2 +-
+ drivers/char/tpm/st33zp24/st33zp24.c | 2 +-
+ drivers/char/tpm/tpm-interface.c | 2 +-
+ drivers/char/tpm/tpm_atmel.c | 2 +-
+ drivers/char/tpm/tpm_i2c_nuvoton.c | 2 +-
+ drivers/char/tpm/tpm_nsc.c | 2 +-
+ drivers/char/tpm/tpm_tis.c | 2 +-
+ drivers/char/tpm/tpm_tis_core.c | 2 +-
+ drivers/char/tpm/tpm_vtpm_proxy.c | 2 +-
+ drivers/crypto/n2_core.c | 2 +-
+ drivers/hwmon/dell-smm-hwmon.c | 2 +-
+ drivers/hwmon/ultra45_env.c | 2 +-
+ drivers/i2c/muxes/i2c-mux-mlxcpld.c | 2 +-
+ drivers/leds/leds-sunfire.c | 2 +-
+ drivers/media/common/siano/smscoreapi.c | 2 +-
+ drivers/media/common/siano/smsdvb-main.c | 2 +-
+ drivers/media/dvb-frontends/cx24117.c | 2 +-
+ drivers/media/usb/siano/smsusb.c | 2 +-
+ drivers/net/ethernet/broadcom/tg3.c | 2 +-
+ drivers/net/ethernet/sun/cassini.c | 2 +-
+ drivers/net/ethernet/sun/niu.c | 2 +-
+ drivers/net/ethernet/sun/sunhme.c | 2 +-
+ drivers/net/ethernet/sun/sunvnet.c | 2 +-
+ drivers/net/ethernet/sun/sunvnet_common.c | 2 +-
+ drivers/net/ppp/pptp.c | 2 +-
+ drivers/platform/x86/compal-laptop.c | 2 +-
+ drivers/platform/x86/intel/oaktrail.c | 2 +-
+ drivers/platform/x86/mlx-platform.c | 2 +-
+ drivers/s390/net/fsm.c | 2 +-
+ drivers/sbus/char/openprom.c | 2 +-
+ drivers/scsi/esp_scsi.c | 2 +-
+ drivers/scsi/jazz_esp.c | 2 +-
+ drivers/scsi/mesh.c | 2 +-
+ drivers/scsi/qlogicpti.c | 2 +-
+ drivers/scsi/sun3x_esp.c | 2 +-
+ drivers/scsi/sun_esp.c | 2 +-
+ drivers/video/fbdev/hgafb.c | 2 +-
+ fs/Kconfig | 1 +
+ include/linux/gfp_types.h | 94 ++++--
+ include/linux/huge_mm.h | 21 +-
+ include/linux/hugetlb.h | 2 +-
+ include/linux/memcontrol.h | 30 +-
+ include/linux/mm.h | 26 +-
+ include/linux/moduleloader.h | 8 +
+ include/linux/padata.h | 14 +-
+ include/linux/page_owner.h | 14 +-
+ include/linux/swap.h | 13 +-
+ include/trace/events/kmem.h | 39 +++
+ include/trace/events/oom.h | 36 ++-
+ init/main.c | 5 +-
+ kernel/module/main.c | 9 +-
+ kernel/padata.c | 14 +-
+ kernel/sched/fair.c | 6 +
+ kernel/signal.c | 28 +-
+ kernel/vmcore_info.c | 3 +
+ lib/dynamic_debug.c | 7 +-
+ lib/stackdepot.c | 2 +-
+ lib/test_vmalloc.c | 11 +-
+ mm/damon/paddr.c | 2 +-
+ mm/filemap.c | 2 -
+ mm/huge_memory.c | 173 ++++++++---
+ mm/hugetlb.c | 329 +++++++++++++--------
+ mm/internal.h | 103 ++++++-
+ mm/kasan/kasan_test.c | 6 +-
+ mm/khugepaged.c | 36 ++-
+ mm/madvise.c | 8 +-
+ mm/memcontrol.c | 85 ++++--
+ mm/memfd.c | 47 ++-
+ mm/memory.c | 80 +----
+ mm/mempolicy.c | 40 ++-
+ mm/mlock.c | 3 +-
+ mm/mm_init.c | 1 +
+ mm/oom_kill.c | 6 +-
+ mm/page_alloc.c | 164 ++++++----
+ mm/page_isolation.c | 2 +-
+ mm/page_owner.c | 6 +-
+ mm/readahead.c | 3 -
+ mm/swap.c | 200 +++++++------
+ mm/swap_state.c | 35 ++-
+ mm/util.c | 6 +-
+ mm/vmscan.c | 125 ++++----
+ mm/zsmalloc.c | 206 ++++---------
+ mm/zswap.c | 211 ++++++-------
+ net/ipv4/gre_demux.c | 2 +-
+ net/ipv6/ip6_gre.c | 2 +-
+ net/iucv/iucv.c | 2 +-
+ net/mpls/mpls_gso.c | 2 +-
+ scripts/const_structs.checkpatch | 1 +
+ tools/testing/selftests/damon/.gitignore | 1 +
+ .../sysfs_update_schemes_tried_regions_hang.py | 2 +-
+ ..._update_schemes_tried_regions_wss_estimation.py | 2 +-
+ tools/testing/selftests/mm/split_huge_page_test.c | 115 ++++++-
+ 103 files changed, 1514 insertions(+), 1040 deletions(-)
+Merging kbuild/for-next (5270316c9fec kbuild: Use -fmin-function-alignment when available)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild/for-next
+Auto-merging Makefile
+Auto-merging arch/parisc/Kconfig
+Auto-merging init/Kconfig
+Auto-merging lib/Kconfig.debug
+Auto-merging mm/Kconfig
+Merge made by the 'ort' strategy.
+ .gitignore | 1 +
+ Documentation/kbuild/kconfig.rst | 363 ++++++++++-----------
+ Makefile | 13 +-
+ arch/Kconfig | 12 +
+ arch/alpha/Kconfig | 15 +-
+ arch/hexagon/Kconfig | 12 +-
+ arch/parisc/Kconfig | 4 +-
+ arch/riscv/kernel/tests/Kconfig.debug | 2 +-
+ arch/x86/entry/vdso/Makefile | 2 +
+ arch/x86/kvm/Kconfig | 2 +-
+ arch/x86/kvm/Makefile | 3 +-
+ arch/x86/xen/Kconfig | 1 -
+ drivers/acpi/Kconfig | 1 -
+ drivers/iommu/intel/Kconfig | 2 +-
+ drivers/md/Kconfig | 1 -
+ include/linux/compiler_types.h | 10 +-
+ init/Kconfig | 2 +-
+ kernel/module/Kconfig | 3 +-
+ lib/Kconfig.debug | 2 +-
+ mm/Kconfig | 7 +-
+ net/dccp/ccids/Kconfig | 2 +-
+ scripts/Kbuild.include | 6 -
+ scripts/Makefile.build | 22 +-
+ scripts/Makefile.dtbinst | 32 +-
+ scripts/Makefile.lib | 24 +-
+ scripts/kconfig/array_size.h | 11 +
+ scripts/kconfig/conf.c | 12 +-
+ scripts/kconfig/confdata.c | 91 +-----
+ scripts/kconfig/expr.h | 24 +-
+ scripts/kconfig/hashtable.h | 48 +++
+ scripts/kconfig/internal.h | 12 +
+ scripts/kconfig/lexer.l | 128 ++++----
+ scripts/kconfig/list.h | 254 ++++++++++----
+ scripts/kconfig/list_types.h | 17 +
+ scripts/kconfig/lkc.h | 6 +-
+ scripts/kconfig/lkc_proto.h | 15 -
+ scripts/kconfig/lxdialog/checklist.c | 5 +-
+ scripts/kconfig/mconf.c | 1 +
+ scripts/kconfig/menu.c | 24 +-
+ scripts/kconfig/nconf.c | 1 +
+ scripts/kconfig/parser.y | 109 ++++---
+ scripts/kconfig/preprocess.c | 23 +-
+ scripts/kconfig/preprocess.h | 19 ++
+ scripts/kconfig/qconf.cc | 2 +-
+ scripts/kconfig/symbol.c | 45 +--
+ .../tests/err_recursive_dep/expected_stderr | 24 +-
+ scripts/kconfig/util.c | 47 ++-
+ scripts/package/builddeb | 48 +--
+ scripts/package/debian/rules | 63 +++-
+ scripts/package/kernel.spec | 35 +-
+ 50 files changed, 899 insertions(+), 709 deletions(-)
+ create mode 100644 scripts/kconfig/array_size.h
+ create mode 100644 scripts/kconfig/hashtable.h
+ create mode 100644 scripts/kconfig/list_types.h
+ create mode 100644 scripts/kconfig/preprocess.h
+Merging clang-format/clang-format (5a205c6a9f79 clang-format: Update with v6.7-rc4's `for_each` macro list)
+$ git merge -m Merge branch 'clang-format' of https://github.com/ojeda/linux.git clang-format/clang-format
+Already up to date.
+Merging perf/perf-tools-next (ef5de1613d7d perf pmu: Fix a potential memory leak in perf_pmu__lookup())
+$ git merge -m Merge branch 'perf-tools-next' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git perf/perf-tools-next
+Merge made by the 'ort' strategy.
+ tools/build/Makefile.feature | 2 +
+ tools/build/feature/Makefile | 4 +
+ tools/build/feature/test-all.c | 4 +
+ tools/build/feature/test-libcapstone.c | 11 +
+ tools/lib/subcmd/run-command.c | 2 +
+ tools/lib/subcmd/run-command.h | 2 +
+ tools/perf/Documentation/perf-intel-pt.txt | 14 +-
+ tools/perf/Documentation/perf-report.txt | 29 +-
+ tools/perf/Documentation/perf-script-python.txt | 4 +-
+ tools/perf/Documentation/perf-script.txt | 20 +-
+ tools/perf/Documentation/perf-stat.txt | 11 +
+ tools/perf/Documentation/perf-top.txt | 32 +-
+ tools/perf/Documentation/perf.txt | 2 +
+ tools/perf/Documentation/tips.txt | 31 +-
+ tools/perf/Makefile.config | 142 +-
+ tools/perf/Makefile.perf | 18 +-
+ tools/perf/arch/arm/util/perf_regs.c | 7 +-
+ tools/perf/arch/arm/util/pmu.c | 3 +
+ tools/perf/arch/arm64/Makefile | 2 +-
+ tools/perf/arch/arm64/util/machine.c | 2 +
+ tools/perf/arch/arm64/util/mem-events.c | 39 +-
+ tools/perf/arch/arm64/util/mem-events.h | 7 +
+ tools/perf/arch/arm64/util/perf_regs.c | 7 +-
+ tools/perf/arch/csky/util/perf_regs.c | 7 +-
+ tools/perf/arch/loongarch/Makefile | 2 +-
+ tools/perf/arch/loongarch/util/perf_regs.c | 7 +-
+ tools/perf/arch/mips/Makefile | 2 +-
+ tools/perf/arch/mips/util/perf_regs.c | 7 +-
+ tools/perf/arch/powerpc/Makefile | 2 +-
+ tools/perf/arch/powerpc/util/Build | 1 +
+ tools/perf/arch/powerpc/util/kvm-stat.c | 2 +-
+ tools/perf/arch/powerpc/util/mem-events.c | 16 +-
+ tools/perf/arch/powerpc/util/mem-events.h | 7 +
+ tools/perf/arch/powerpc/util/perf_regs.c | 7 +-
+ tools/perf/arch/powerpc/util/pmu.c | 12 +
+ tools/perf/arch/riscv/util/perf_regs.c | 7 +-
+ tools/perf/arch/s390/Makefile | 2 +-
+ tools/perf/arch/s390/util/perf_regs.c | 7 +-
+ tools/perf/arch/x86/Makefile | 2 +-
+ tools/perf/arch/x86/tests/dwarf-unwind.c | 1 +
+ tools/perf/arch/x86/tests/hybrid.c | 5 +-
+ tools/perf/arch/x86/util/mem-events.c | 99 +-
+ tools/perf/arch/x86/util/mem-events.h | 10 +
+ tools/perf/arch/x86/util/perf_regs.c | 7 +-
+ tools/perf/arch/x86/util/pmu.c | 19 +-
+ tools/perf/arch/x86/util/tsc.c | 4 +-
+ tools/perf/builtin-c2c.c | 45 +-
+ tools/perf/builtin-list.c | 21 +-
+ tools/perf/builtin-mem.c | 48 +-
+ tools/perf/builtin-record.c | 19 +-
+ tools/perf/builtin-report.c | 4 +-
+ tools/perf/builtin-sched.c | 220 +-
+ tools/perf/builtin-script.c | 66 +-
+ tools/perf/builtin-stat.c | 52 +-
+ tools/perf/builtin-top.c | 2 +-
+ tools/perf/builtin-version.c | 2 +
+ tools/perf/pmu-events/arch/powerpc/mapfile.csv | 1 +
+ .../perf/pmu-events/arch/s390/cf_z16/extended.json | 62 +-
+ .../pmu-events/arch/x86/alderlake/adl-metrics.json | 509 ++--
+ .../arch/x86/alderlake/floating-point.json | 30 +-
+ .../arch/x86/alderlake/metricgroups.json | 11 +-
+ .../perf/pmu-events/arch/x86/alderlake/other.json | 10 +
+ .../pmu-events/arch/x86/alderlake/pipeline.json | 13 +
+ .../perf/pmu-events/arch/x86/alderlaken/other.json | 9 +
+ .../pmu-events/arch/x86/alderlaken/pipeline.json | 9 +
+ .../pmu-events/arch/x86/broadwell/bdw-metrics.json | 212 +-
+ .../perf/pmu-events/arch/x86/broadwell/memory.json | 2 +-
+ .../arch/x86/broadwell/metricgroups.json | 7 +-
+ .../arch/x86/broadwellde/bdwde-metrics.json | 199 +-
+ .../arch/x86/broadwellde/metricgroups.json | 7 +-
+ .../arch/x86/broadwellx/bdx-metrics.json | 260 +-
+ .../arch/x86/broadwellx/metricgroups.json | 7 +-
+ .../arch/x86/cascadelakex/clx-metrics.json | 578 ++--
+ .../arch/x86/cascadelakex/metricgroups.json | 12 +-
+ .../arch/x86/emeraldrapids/uncore-cache.json | 152 ++
+ .../perf/pmu-events/arch/x86/grandridge/cache.json | 185 ++
+ .../arch/x86/grandridge/floating-point.json | 68 +
+ .../pmu-events/arch/x86/grandridge/frontend.json | 16 +
+ .../pmu-events/arch/x86/grandridge/memory.json | 66 +
+ .../perf/pmu-events/arch/x86/grandridge/other.json | 16 +
+ .../pmu-events/arch/x86/grandridge/pipeline.json | 353 +++
+ .../arch/x86/grandridge/uncore-cache.json | 1795 ++++++++++++
+ .../arch/x86/grandridge/uncore-interconnect.json | 175 ++
+ .../pmu-events/arch/x86/grandridge/uncore-io.json | 1187 ++++++++
+ .../arch/x86/grandridge/uncore-memory.json | 385 +++
+ .../arch/x86/grandridge/uncore-power.json | 10 +
+ .../arch/x86/grandridge/virtual-memory.json | 113 +-
+ .../pmu-events/arch/x86/haswell/hsw-metrics.json | 186 +-
+ tools/perf/pmu-events/arch/x86/haswell/memory.json | 2 +-
+ .../pmu-events/arch/x86/haswell/metricgroups.json | 7 +-
+ .../pmu-events/arch/x86/haswellx/hsx-metrics.json | 234 +-
+ .../pmu-events/arch/x86/haswellx/metricgroups.json | 7 +-
+ .../pmu-events/arch/x86/icelake/icl-metrics.json | 430 +--
+ tools/perf/pmu-events/arch/x86/icelake/memory.json | 1 +
+ .../pmu-events/arch/x86/icelake/metricgroups.json | 12 +-
+ tools/perf/pmu-events/arch/x86/icelake/other.json | 2 +-
+ .../perf/pmu-events/arch/x86/icelake/pipeline.json | 10 +-
+ .../pmu-events/arch/x86/icelakex/icx-metrics.json | 606 +++--
+ .../pmu-events/arch/x86/icelakex/metricgroups.json | 12 +-
+ .../pmu-events/arch/x86/ivybridge/ivb-metrics.json | 205 +-
+ .../arch/x86/ivybridge/metricgroups.json | 7 +-
+ .../pmu-events/arch/x86/ivytown/ivt-metrics.json | 208 +-
+ .../pmu-events/arch/x86/ivytown/metricgroups.json | 7 +-
+ .../pmu-events/arch/x86/jaketown/jkt-metrics.json | 64 +-
+ .../pmu-events/arch/x86/jaketown/metricgroups.json | 7 +-
+ tools/perf/pmu-events/arch/x86/mapfile.csv | 24 +-
+ .../perf/pmu-events/arch/x86/meteorlake/cache.json | 8 +-
+ .../arch/x86/meteorlake/floating-point.json | 86 +-
+ .../perf/pmu-events/arch/x86/meteorlake/other.json | 10 +
+ .../pmu-events/arch/x86/meteorlake/pipeline.json | 76 +
+ .../arch/x86/meteorlake/virtual-memory.json | 36 +
+ .../pmu-events/arch/x86/rocketlake/memory.json | 1 +
+ .../arch/x86/rocketlake/metricgroups.json | 12 +-
+ .../perf/pmu-events/arch/x86/rocketlake/other.json | 2 +-
+ .../pmu-events/arch/x86/rocketlake/pipeline.json | 10 +-
+ .../arch/x86/rocketlake/rkl-metrics.json | 438 +--
+ .../arch/x86/sandybridge/metricgroups.json | 7 +-
+ .../arch/x86/sandybridge/snb-metrics.json | 71 +-
+ .../arch/x86/sapphirerapids/metricgroups.json | 12 +-
+ .../arch/x86/sapphirerapids/spr-metrics.json | 777 ++++--
+ .../pmu-events/arch/x86/sierraforest/cache.json | 185 ++
+ .../arch/x86/sierraforest/floating-point.json | 68 +
+ .../pmu-events/arch/x86/sierraforest/frontend.json | 16 +
+ .../pmu-events/arch/x86/sierraforest/memory.json | 66 +
+ .../pmu-events/arch/x86/sierraforest/other.json | 16 +
+ .../pmu-events/arch/x86/sierraforest/pipeline.json | 360 +++
+ .../arch/x86/sierraforest/uncore-cache.json | 2853 ++++++++++++++++++++
+ .../arch/x86/sierraforest/uncore-cxl.json | 10 +
+ .../arch/x86/sierraforest/uncore-interconnect.json | 1228 +++++++++
+ .../arch/x86/sierraforest/uncore-io.json | 1634 +++++++++++
+ .../arch/x86/sierraforest/uncore-memory.json | 385 +++
+ .../arch/x86/sierraforest/uncore-power.json | 10 +
+ .../arch/x86/sierraforest/virtual-memory.json | 113 +-
+ tools/perf/pmu-events/arch/x86/skylake/memory.json | 2 +-
+ .../pmu-events/arch/x86/skylake/metricgroups.json | 12 +-
+ .../perf/pmu-events/arch/x86/skylake/pipeline.json | 2 +-
+ .../pmu-events/arch/x86/skylake/skl-metrics.json | 413 +--
+ .../arch/x86/skylake/virtual-memory.json | 2 +-
+ .../pmu-events/arch/x86/skylakex/metricgroups.json | 12 +-
+ .../pmu-events/arch/x86/skylakex/skx-metrics.json | 560 ++--
+ .../arch/x86/tigerlake/metricgroups.json | 12 +-
+ .../perf/pmu-events/arch/x86/tigerlake/other.json | 2 +-
+ .../pmu-events/arch/x86/tigerlake/pipeline.json | 10 +-
+ .../pmu-events/arch/x86/tigerlake/tgl-metrics.json | 438 +--
+ .../arch/x86/tigerlake/uncore-interconnect.json | 2 +
+ tools/perf/pmu-events/jevents.py | 23 +-
+ tools/perf/tests/Build | 2 +-
+ tools/perf/tests/builtin-test-list.c | 207 --
+ tools/perf/tests/builtin-test-list.h | 12 -
+ tools/perf/tests/builtin-test.c | 410 +--
+ tools/perf/tests/expand-cgroup.c | 3 +-
+ tools/perf/tests/make | 4 +-
+ tools/perf/tests/maps.c | 3 +
+ tools/perf/tests/parse-events.c | 9 +-
+ tools/perf/tests/pmu-events.c | 22 +-
+ tools/perf/tests/shell/base_probe/settings.sh | 48 +
+ .../tests/shell/base_probe/test_adding_kernel.sh | 278 ++
+ .../tests/shell/common/check_all_lines_matched.pl | 39 +
+ .../tests/shell/common/check_all_patterns_found.pl | 34 +
+ .../tests/shell/common/check_no_patterns_found.pl | 34 +
+ tools/perf/tests/shell/common/init.sh | 117 +
+ tools/perf/tests/shell/common/patterns.sh | 268 ++
+ tools/perf/tests/shell/common/settings.sh | 79 +
+ tools/perf/tests/shell/lib/perf_has_symbol.sh | 2 +-
+ .../perf/tests/shell/lib/perf_json_output_lint.py | 4 +-
+ .../perf/tests/shell/lib/perf_metric_validation.py | 229 +-
+ tools/perf/tests/shell/lib/stat_output.sh | 12 +
+ tools/perf/tests/shell/perftool-testsuite_probe.sh | 23 +
+ tools/perf/tests/shell/stat+csv_output.sh | 2 +
+ tools/perf/tests/shell/stat+json_output.sh | 13 +
+ tools/perf/tests/shell/stat+std_output.sh | 4 +-
+ tools/perf/tests/shell/stat_bpf_counters.sh | 12 +-
+ tools/perf/tests/shell/stat_metrics_values.sh | 4 +-
+ tools/perf/tests/shell/test_arm_callgraph_fp.sh | 6 +
+ tools/perf/tests/symbols.c | 68 +
+ tools/perf/tests/tests-scripts.c | 257 ++
+ tools/perf/tests/tests-scripts.h | 9 +
+ tools/perf/tests/tests.h | 16 +-
+ tools/perf/tests/thread-maps-share.c | 8 +-
+ tools/perf/tests/vmlinux-kallsyms.c | 10 +-
+ tools/perf/ui/browsers/res_sample.c | 2 +-
+ tools/perf/ui/browsers/scripts.c | 2 +-
+ tools/perf/util/Build | 1 +
+ tools/perf/util/annotate-data.c | 119 +-
+ tools/perf/util/annotate-data.h | 8 +-
+ tools/perf/util/annotate.c | 153 +-
+ tools/perf/util/annotate.h | 12 +-
+ tools/perf/util/bpf-event.c | 1 +
+ .../util/bpf_skel/augmented_raw_syscalls.bpf.c | 15 +-
+ tools/perf/util/bpf_skel/vmlinux/vmlinux.h | 7 +
+ tools/perf/util/callchain.c | 2 +-
+ tools/perf/util/cpumap.c | 33 +-
+ tools/perf/util/cpumap.h | 19 +-
+ tools/perf/util/data-convert-json.c | 4 +-
+ tools/perf/util/data.c | 10 +-
+ tools/perf/util/data.h | 6 +-
+ tools/perf/util/debug.c | 3 +
+ tools/perf/util/debug.h | 1 +
+ tools/perf/util/dwarf-aux.c | 187 +-
+ tools/perf/util/dwarf-aux.h | 18 +
+ tools/perf/util/env.h | 1 +
+ tools/perf/util/event.c | 4 +-
+ tools/perf/util/evsel.c | 34 +-
+ tools/perf/util/evsel.h | 1 +
+ tools/perf/util/expr.c | 20 +-
+ tools/perf/util/expr.l | 9 +
+ tools/perf/util/machine.c | 34 +-
+ tools/perf/util/map.c | 9 +-
+ tools/perf/util/maps.c | 1396 ++++++----
+ tools/perf/util/maps.h | 65 +-
+ tools/perf/util/mem-events.c | 221 +-
+ tools/perf/util/mem-events.h | 19 +-
+ tools/perf/util/metricgroup.c | 2 +
+ tools/perf/util/parse-events.c | 96 +-
+ tools/perf/util/parse-events.h | 14 +-
+ tools/perf/util/parse-events.y | 2 -
+ tools/perf/util/parse-regs-options.c | 8 +-
+ tools/perf/util/perf-regs-arch/perf_regs_aarch64.c | 4 -
+ tools/perf/util/perf-regs-arch/perf_regs_arm.c | 4 -
+ tools/perf/util/perf-regs-arch/perf_regs_csky.c | 4 -
+ .../perf/util/perf-regs-arch/perf_regs_loongarch.c | 4 -
+ tools/perf/util/perf-regs-arch/perf_regs_mips.c | 4 -
+ tools/perf/util/perf-regs-arch/perf_regs_powerpc.c | 4 -
+ tools/perf/util/perf-regs-arch/perf_regs_riscv.c | 4 -
+ tools/perf/util/perf-regs-arch/perf_regs_s390.c | 4 -
+ tools/perf/util/perf-regs-arch/perf_regs_x86.c | 4 -
+ tools/perf/util/perf_regs.c | 11 +-
+ tools/perf/util/perf_regs.h | 34 +-
+ tools/perf/util/pmu.c | 32 +-
+ tools/perf/util/pmu.h | 7 +
+ tools/perf/util/pmus.c | 6 -
+ tools/perf/util/pmus.h | 1 -
+ tools/perf/util/print-events.c | 40 +-
+ tools/perf/util/print_insn.c | 135 +
+ tools/perf/util/print_insn.h | 16 +
+ tools/perf/util/probe-event.c | 1 +
+ tools/perf/util/python-ext-sources | 1 +
+ tools/perf/util/python.c | 1 +
+ .../util/scripting-engines/trace-event-python.c | 8 +-
+ tools/perf/util/session.c | 11 +
+ tools/perf/util/session.h | 2 +
+ tools/perf/util/setup.py | 1 +
+ tools/perf/util/sort.c | 2 +-
+ tools/perf/util/srcline.c | 2 +
+ tools/perf/util/stat-display.c | 24 +-
+ tools/perf/util/stat-shadow.c | 72 +-
+ tools/perf/util/stat.h | 1 +
+ tools/perf/util/symbol-elf.c | 79 +-
+ tools/perf/util/symbol.c | 52 +-
+ tools/perf/util/thread.c | 2 +-
+ tools/perf/util/thread.h | 1 -
+ tools/perf/util/thread_map.c | 11 +-
+ tools/perf/util/trace-event-parse.c | 113 +
+ tools/perf/util/trace-event.h | 3 +
+ tools/perf/util/unwind-libdw.c | 2 +-
+ tools/perf/util/unwind-libunwind-local.c | 2 +-
+ tools/perf/util/unwind-libunwind.c | 7 +-
+ tools/perf/util/util.c | 19 +
+ tools/perf/util/util.h | 8 +
+ tools/scripts/Makefile.include | 2 +-
+ tools/testing/selftests/kvm/Makefile | 4 +-
+ 261 files changed, 20582 insertions(+), 4532 deletions(-)
+ create mode 100644 tools/build/feature/test-libcapstone.c
+ create mode 100644 tools/perf/arch/arm64/util/mem-events.h
+ create mode 100644 tools/perf/arch/powerpc/util/mem-events.h
+ create mode 100644 tools/perf/arch/powerpc/util/pmu.c
+ create mode 100644 tools/perf/arch/x86/util/mem-events.h
+ create mode 100644 tools/perf/pmu-events/arch/x86/grandridge/floating-point.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/grandridge/uncore-cache.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/grandridge/uncore-interconnect.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/grandridge/uncore-io.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/grandridge/uncore-memory.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/grandridge/uncore-power.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/sierraforest/floating-point.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/sierraforest/uncore-cache.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/sierraforest/uncore-cxl.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/sierraforest/uncore-interconnect.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/sierraforest/uncore-io.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/sierraforest/uncore-memory.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/sierraforest/uncore-power.json
+ delete mode 100644 tools/perf/tests/builtin-test-list.c
+ delete mode 100644 tools/perf/tests/builtin-test-list.h
+ create mode 100644 tools/perf/tests/shell/base_probe/settings.sh
+ create mode 100755 tools/perf/tests/shell/base_probe/test_adding_kernel.sh
+ create mode 100755 tools/perf/tests/shell/common/check_all_lines_matched.pl
+ create mode 100755 tools/perf/tests/shell/common/check_all_patterns_found.pl
+ create mode 100755 tools/perf/tests/shell/common/check_no_patterns_found.pl
+ create mode 100644 tools/perf/tests/shell/common/init.sh
+ create mode 100644 tools/perf/tests/shell/common/patterns.sh
+ create mode 100644 tools/perf/tests/shell/common/settings.sh
+ create mode 100755 tools/perf/tests/shell/perftool-testsuite_probe.sh
+ create mode 100644 tools/perf/tests/tests-scripts.c
+ create mode 100644 tools/perf/tests/tests-scripts.h
+ create mode 100644 tools/perf/util/print_insn.c
+ create mode 100644 tools/perf/util/print_insn.h
+Merging compiler-attributes/compiler-attributes (2993eb7a8d34 Compiler Attributes: counted_by: fixup clang URL)
+$ git merge -m Merge branch 'compiler-attributes' of https://github.com/ojeda/linux.git compiler-attributes/compiler-attributes
+Merge made by the 'ort' strategy.
+ include/linux/compiler_attributes.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+Merging dma-mapping/for-next (eaebbcf6a252 dma-contiguous: remove debug code to removed CONFIG_CMA_DEBUG)
+$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping/for-next
+Merge made by the 'ort' strategy.
+ include/linux/swiotlb.h | 3 +++
+ kernel/dma/direct.c | 9 +++++----
+ kernel/dma/swiotlb.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 54 insertions(+), 4 deletions(-)
+Merging asm-generic/master (34b2321cc648 MAINTAINERS: Add Andreas Larsson as co-maintainer for arch/sparc)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git asm-generic/master
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+Merging arc/for-next (0bb80ecc33a8 Linux 6.6-rc1)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc/for-next
+Already up to date.
+Merging arm/for-next (b9920fdd5a75 ARM: 9352/1: iwmmxt: Remove support for PJ4/PJ4B cores)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git arm/for-next
+Auto-merging arch/arm/Kconfig
+Auto-merging arch/arm/Kconfig.debug
+Auto-merging arch/arm/kernel/Makefile
+Auto-merging arch/arm/mm/fault.c
+Auto-merging arch/arm/mm/init.c
+Merge made by the 'ort' strategy.
+ arch/arm/Kconfig | 4 +-
+ arch/arm/Kconfig.debug | 3 --
+ arch/arm/kernel/Makefile | 2 -
+ arch/arm/kernel/iwmmxt.S | 51 +++++-------------
+ arch/arm/kernel/pj4-cp0.c | 135 ----------------------------------------------
+ arch/arm/kernel/traps.c | 2 +-
+ arch/arm/kernel/unwind.c | 2 +
+ arch/arm/mm/fault.c | 8 +++
+ arch/arm/mm/init.c | 2 +-
+ 9 files changed, 27 insertions(+), 182 deletions(-)
+ delete mode 100644 arch/arm/kernel/pj4-cp0.c
+Merging arm64/for-next/core (e8e5eae6f56d Merge branch 'for-next/stage1-lpa2' into for-next/core)
+$ git merge -m Merge branch 'for-next/core' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64/for-next/core
+Auto-merging Documentation/arch/arm64/silicon-errata.rst
+Auto-merging Makefile
+Auto-merging arch/arm64/Kconfig
+Auto-merging arch/arm64/include/asm/cpufeature.h
+Auto-merging arch/arm64/include/asm/pgtable.h
+Auto-merging arch/arm64/kernel/Makefile
+Auto-merging arch/arm64/kernel/fpsimd.c
+Auto-merging arch/arm64/kernel/signal.c
+Auto-merging arch/arm64/mm/fault.c
+Auto-merging arch/arm64/mm/fixmap.c
+Auto-merging arch/arm64/mm/init.c
+Auto-merging arch/arm64/mm/kasan_init.c
+Auto-merging arch/arm64/mm/mmu.c
+Auto-merging arch/arm64/mm/ptdump.c
+Auto-merging arch/x86/Makefile
+Auto-merging mm/mmap.c
+Merge made by the 'ort' strategy.
+ Documentation/arch/arm64/silicon-errata.rst | 5 +-
+ Documentation/arch/arm64/sme.rst | 11 +-
+ Documentation/arch/arm64/sve.rst | 10 +-
+ Documentation/rust/arch-support.rst | 1 +
+ Makefile | 1 -
+ arch/arm64/Kconfig | 64 +-
+ arch/arm64/Makefile | 4 +
+ arch/arm64/configs/defconfig | 1 -
+ arch/arm64/include/asm/archrandom.h | 2 -
+ arch/arm64/include/asm/assembler.h | 55 +-
+ arch/arm64/include/asm/brk-imm.h | 2 +
+ arch/arm64/include/asm/cpufeature.h | 116 ++
+ arch/arm64/include/asm/esr.h | 13 +-
+ arch/arm64/include/asm/exception.h | 2 +-
+ arch/arm64/include/asm/fixmap.h | 2 +-
+ arch/arm64/include/asm/io.h | 12 +-
+ arch/arm64/include/asm/kasan.h | 2 -
+ arch/arm64/include/asm/kernel-pgtable.h | 103 +-
+ arch/arm64/include/asm/kvm_emulate.h | 10 +-
+ arch/arm64/include/asm/memory.h | 31 +-
+ arch/arm64/include/asm/mman.h | 36 +
+ arch/arm64/include/asm/mmu.h | 40 +-
+ arch/arm64/include/asm/mmu_context.h | 83 +-
+ arch/arm64/include/asm/pgalloc.h | 53 +-
+ arch/arm64/include/asm/pgtable-hwdef.h | 33 +-
+ arch/arm64/include/asm/pgtable-prot.h | 20 +-
+ arch/arm64/include/asm/pgtable-types.h | 6 +
+ arch/arm64/include/asm/pgtable.h | 237 +++-
+ arch/arm64/include/asm/scs.h | 36 +-
+ arch/arm64/include/asm/setup.h | 3 -
+ arch/arm64/include/asm/tlb.h | 3 +
+ arch/arm64/include/uapi/asm/sve_context.h | 11 +
+ arch/arm64/kernel/Makefile | 13 +-
+ arch/arm64/kernel/asm-offsets.c | 2 +-
+ arch/arm64/kernel/cpufeature.c | 102 +-
+ arch/arm64/kernel/entry-common.c | 36 +-
+ arch/arm64/kernel/fpsimd.c | 5 +
+ arch/arm64/kernel/head.S | 463 +------
+ arch/arm64/kernel/image-vars.h | 35 +
+ arch/arm64/kernel/kaslr.c | 4 +-
+ arch/arm64/kernel/module.c | 2 +-
+ arch/arm64/kernel/pi/.gitignore | 3 +
+ arch/arm64/kernel/pi/Makefile | 27 +-
+ arch/arm64/kernel/{ => pi}/idreg-override.c | 80 +-
+ arch/arm64/kernel/pi/kaslr_early.c | 82 +-
+ arch/arm64/kernel/pi/map_kernel.c | 276 ++++
+ arch/arm64/kernel/pi/map_range.c | 105 ++
+ arch/arm64/kernel/{ => pi}/patch-scs.c | 36 +-
+ arch/arm64/kernel/pi/pi.h | 36 +
+ arch/arm64/kernel/pi/relacheck.c | 130 ++
+ arch/arm64/kernel/pi/relocate.c | 64 +
+ arch/arm64/kernel/probes/kprobes.c | 21 +-
+ arch/arm64/kernel/probes/kprobes_trampoline.S | 78 +-
+ arch/arm64/kernel/process.c | 3 -
+ arch/arm64/kernel/setup.c | 22 -
+ arch/arm64/kernel/signal.c | 39 +-
+ arch/arm64/kernel/sleep.S | 3 -
+ arch/arm64/kernel/vmlinux.lds.S | 17 +-
+ arch/arm64/kvm/mmu.c | 17 +-
+ arch/arm64/mm/fault.c | 30 +-
+ arch/arm64/mm/fixmap.c | 39 +-
+ arch/arm64/mm/init.c | 2 +-
+ arch/arm64/mm/kasan_init.c | 165 ++-
+ arch/arm64/mm/mmap.c | 4 +
+ arch/arm64/mm/mmu.c | 253 ++--
+ arch/arm64/mm/pgd.c | 17 +-
+ arch/arm64/mm/proc.S | 122 +-
+ arch/arm64/mm/ptdump.c | 77 +-
+ arch/arm64/tools/cpucaps | 1 +
+ arch/arm64/tools/sysreg | 43 +-
+ arch/loongarch/Makefile | 1 +
+ arch/x86/Makefile | 1 +
+ include/linux/mman.h | 15 +
+ mm/mmap.c | 3 +
+ rust/Makefile | 6 +-
+ scripts/Makefile | 4 +-
+ scripts/generate_rust_target.rs | 4 +-
+ tools/testing/selftests/arm64/fp/.gitignore | 1 +
+ tools/testing/selftests/arm64/fp/Makefile | 5 +-
+ tools/testing/selftests/arm64/fp/fp-ptrace-asm.S | 279 ++++
+ tools/testing/selftests/arm64/fp/fp-ptrace.c | 1503 ++++++++++++++++++++++
+ tools/testing/selftests/arm64/fp/fp-ptrace.h | 13 +
+ 82 files changed, 3963 insertions(+), 1334 deletions(-)
+ create mode 100644 arch/arm64/kernel/pi/.gitignore
+ rename arch/arm64/kernel/{ => pi}/idreg-override.c (83%)
+ create mode 100644 arch/arm64/kernel/pi/map_kernel.c
+ create mode 100644 arch/arm64/kernel/pi/map_range.c
+ rename arch/arm64/kernel/{ => pi}/patch-scs.c (89%)
+ create mode 100644 arch/arm64/kernel/pi/pi.h
+ create mode 100644 arch/arm64/kernel/pi/relacheck.c
+ create mode 100644 arch/arm64/kernel/pi/relocate.c
+ create mode 100644 tools/testing/selftests/arm64/fp/fp-ptrace-asm.S
+ create mode 100644 tools/testing/selftests/arm64/fp/fp-ptrace.c
+ create mode 100644 tools/testing/selftests/arm64/fp/fp-ptrace.h
+Merging arm-perf/for-next/perf (fd185a245155 perf/arm_cspmu: Add devicetree support)
+$ git merge -m Merge branch 'for-next/perf' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git arm-perf/for-next/perf
+Auto-merging drivers/perf/arm-cmn.c
+Merge made by the 'ort' strategy.
+ .../bindings/perf/arm,coresight-pmu.yaml | 39 +++++
+ drivers/perf/alibaba_uncore_drw_pmu.c | 6 +-
+ drivers/perf/amlogic/meson_g12_ddr_pmu.c | 6 +-
+ drivers/perf/arm-cci.c | 8 +-
+ drivers/perf/arm-ccn.c | 6 +-
+ drivers/perf/arm-cmn.c | 14 +-
+ drivers/perf/arm_cspmu/arm_cspmu.c | 159 ++++++++++++---------
+ drivers/perf/arm_cspmu/arm_cspmu.h | 1 +
+ drivers/perf/arm_cspmu/nvidia_cspmu.c | 6 -
+ drivers/perf/arm_dmc620_pmu.c | 6 +-
+ drivers/perf/arm_dsu_pmu.c | 6 +-
+ drivers/perf/arm_smmuv3_pmu.c | 6 +-
+ drivers/perf/arm_spe_pmu.c | 5 +-
+ drivers/perf/fsl_imx8_ddr_perf.c | 5 +-
+ drivers/perf/fsl_imx9_ddr_perf.c | 6 +-
+ drivers/perf/hisilicon/hisi_uncore_cpa_pmu.c | 5 +-
+ drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c | 5 +-
+ drivers/perf/hisilicon/hisi_uncore_hha_pmu.c | 5 +-
+ drivers/perf/hisilicon/hisi_uncore_l3c_pmu.c | 5 +-
+ drivers/perf/hisilicon/hisi_uncore_pa_pmu.c | 5 +-
+ drivers/perf/hisilicon/hisi_uncore_sllc_pmu.c | 5 +-
+ drivers/perf/marvell_cn10k_ddr_pmu.c | 5 +-
+ drivers/perf/marvell_cn10k_tad_pmu.c | 6 +-
+ drivers/perf/qcom_l2_pmu.c | 5 +-
+ drivers/perf/thunderx2_pmu.c | 5 +-
+ drivers/perf/xgene_pmu.c | 6 +-
+ 26 files changed, 178 insertions(+), 158 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/perf/arm,coresight-pmu.yaml
+Merging arm-soc/for-next (d6f69171ea30 soc: document merges)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next
+Auto-merging MAINTAINERS
+Auto-merging arch/arm64/configs/defconfig
+Auto-merging scripts/Makefile.lib
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/i2c/i2c-exynos5.yaml | 1 +
+ .../memory-controllers/nvidia,tegra20-emc.yaml | 2 +-
+ .../soc/samsung/samsung,exynos-sysreg.yaml | 2 +
+ MAINTAINERS | 2 -
+ arch/arm/arm-soc-for-next-contents.txt | 50 ++++++
+ arch/arm/configs/multi_v7_defconfig | 18 +-
+ arch/arm/configs/shmobile_defconfig | 2 -
+ arch/arm64/configs/defconfig | 1 +
+ arch/arm64/configs/virt.config | 4 +
+ drivers/memory/emif.c | 65 +++----
+ drivers/soc/mediatek/Kconfig | 9 +
+ drivers/soc/mediatek/Makefile | 1 +
+ drivers/soc/mediatek/mtk-socinfo.c | 191 +++++++++++++++++++++
+ drivers/soc/renesas/Kconfig | 17 +-
+ drivers/soc/renesas/rcar-rst.c | 1 +
+ drivers/soc/renesas/renesas-soc.c | 8 +
+ drivers/soc/tegra/fuse/fuse-tegra30.c | 3 +-
+ scripts/Makefile.lib | 3 +-
+ 18 files changed, 327 insertions(+), 53 deletions(-)
+ create mode 100644 arch/arm/arm-soc-for-next-contents.txt
+ create mode 100644 drivers/soc/mediatek/mtk-socinfo.c
+Merging amlogic/for-next (7092cfae086f Merge branch 'v6.9/arm64-dt' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git amlogic/for-next
+Merge made by the 'ort' strategy.
+ Documentation/devicetree/bindings/arm/amlogic.yaml | 15 +-
+ .../devicetree/bindings/vendor-prefixes.yaml | 2 +
+ arch/arm/boot/dts/amlogic/meson.dtsi | 6 +-
+ arch/arm/boot/dts/amlogic/meson8.dtsi | 1 -
+ arch/arm/boot/dts/amlogic/meson8b.dtsi | 1 -
+ arch/arm64/boot/dts/amlogic/Makefile | 6 +
+ arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi | 7 +
+ arch/arm64/boot/dts/amlogic/amlogic-t7.dtsi | 2 +-
+ arch/arm64/boot/dts/amlogic/meson-a1-ad402.dts | 2 +-
+ arch/arm64/boot/dts/amlogic/meson-a1.dtsi | 2 +
+ .../dts/amlogic/meson-axg-jethome-jethub-j1xx.dtsi | 30 +-
+ arch/arm64/boot/dts/amlogic/meson-axg-s400.dts | 16 +-
+ arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 8 +
+ arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 3 +
+ .../boot/dts/amlogic/meson-g12a-fbx8am-brcm.dtso | 31 ++
+ .../dts/amlogic/meson-g12a-fbx8am-realtek.dtso | 21 +
+ arch/arm64/boot/dts/amlogic/meson-g12a-fbx8am.dts | 462 +++++++++++++++++++++
+ .../boot/dts/amlogic/meson-g12a-radxa-zero.dts | 12 +-
+ arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts | 14 +-
+ arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts | 16 +-
+ arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts | 14 +-
+ .../boot/dts/amlogic/meson-g12b-odroid-n2.dtsi | 2 +-
+ arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi | 20 +-
+ arch/arm64/boot/dts/amlogic/meson-g12b-w400.dtsi | 10 +-
+ .../boot/dts/amlogic/meson-gx-libretech-pc.dtsi | 12 +-
+ .../arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 8 +-
+ .../boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts | 6 +-
+ .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 8 +-
+ arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts | 4 +-
+ arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi | 6 +-
+ .../boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 8 +-
+ arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi | 8 +-
+ .../dts/amlogic/meson-gxl-s805x-libretech-ac.dts | 8 +-
+ .../boot/dts/amlogic/meson-gxl-s805x-p241.dts | 8 +-
+ .../amlogic/meson-gxl-s905w-jethome-jethub-j80.dts | 8 +-
+ .../dts/amlogic/meson-gxl-s905x-hwacom-amazetv.dts | 6 +-
+ .../amlogic/meson-gxl-s905x-libretech-cc-v2.dts | 12 +-
+ .../dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 6 +-
+ .../dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts | 6 +-
+ .../boot/dts/amlogic/meson-gxl-s905x-p212.dtsi | 8 +-
+ .../boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 8 +-
+ .../dts/amlogic/meson-gxm-s912-libretech-pc.dts | 2 +-
+ arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi | 16 +-
+ .../dts/amlogic/meson-libretech-cottonwood.dtsi | 6 +-
+ arch/arm64/boot/dts/amlogic/meson-sm1-ac2xx.dtsi | 10 +-
+ .../arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi | 14 +-
+ .../boot/dts/amlogic/meson-sm1-odroid-hc4.dts | 4 +-
+ arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi | 20 +-
+ arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts | 12 +-
+ 49 files changed, 717 insertions(+), 200 deletions(-)
+ create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12a-fbx8am-brcm.dtso
+ create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12a-fbx8am-realtek.dtso
+ create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12a-fbx8am.dts
+Merging asahi-soc/asahi-soc/for-next (ffc253263a13 Linux 6.6)
+$ git merge -m Merge branch 'asahi-soc/for-next' of https://github.com/AsahiLinux/linux.git asahi-soc/asahi-soc/for-next
+Already up to date.
+Merging aspeed/for-next (0c30853731ec ARM: dts: aspeed: x4tf: Add dts for asus x4tf project)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git aspeed/for-next
+Auto-merging arch/arm/boot/dts/aspeed/aspeed-g6.dtsi
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/arm/aspeed/aspeed.yaml | 6 +
+ arch/arm/boot/dts/aspeed/Makefile | 8 +-
+ .../dts/aspeed/aspeed-bmc-asrock-e3c256d4i.dts | 322 ++++
+ .../dts/aspeed/aspeed-bmc-asrock-spc621d8hm3.dts | 324 ++++
+ .../boot/dts/aspeed/aspeed-bmc-asrock-x570d4u.dts | 377 +++++
+ arch/arm/boot/dts/aspeed/aspeed-bmc-asus-x4tf.dts | 592 +++++++
+ .../boot/dts/aspeed/aspeed-bmc-facebook-harma.dts | 620 ++++++++
+ .../dts/aspeed/aspeed-bmc-facebook-minerva-cmc.dts | 265 ----
+ .../dts/aspeed/aspeed-bmc-facebook-minerva.dts | 543 +++++++
+ .../arm/boot/dts/aspeed/aspeed-bmc-ibm-system1.dts | 1623 ++++++++++++++++++++
+ arch/arm/boot/dts/aspeed/aspeed-g6.dtsi | 4 +
+ arch/arm/boot/dts/aspeed/ibm-power10-dual.dtsi | 2 +
+ 12 files changed, 4420 insertions(+), 266 deletions(-)
+ create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-e3c256d4i.dts
+ create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-spc621d8hm3.dts
+ create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-x570d4u.dts
+ create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-asus-x4tf.dts
+ create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts
+ delete mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva-cmc.dts
+ create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts
+ create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-system1.dts
+Merging at91/at91-next (6315946ad242 Merge branch 'at91-dt' into at91-next)
+$ git merge -m Merge branch 'at91-next' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91/at91-next
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/arm/atmel-at91.yaml | 6 +
+ .../bindings/net/can/microchip,mpfs-can.yaml | 6 +-
+ arch/arm/boot/dts/microchip/Makefile | 2 +
+ .../boot/dts/microchip/at91-sama7g54_curiosity.dts | 482 +++++++++++++++++++++
+ .../at91sam9g25-gardena-smart-gateway.dts | 2 +
+ arch/arm/boot/dts/microchip/at91sam9x5ek.dtsi | 2 +
+ arch/arm/boot/dts/microchip/sam9x60.dtsi | 64 +--
+ arch/arm/boot/dts/microchip/sama7g5.dtsi | 56 ++-
+ drivers/clk/microchip/clk-mpfs.c | 154 ++++---
+ include/dt-bindings/clock/microchip,mpfs-clock.h | 5 +
+ 10 files changed, 662 insertions(+), 117 deletions(-)
+ create mode 100644 arch/arm/boot/dts/microchip/at91-sama7g54_curiosity.dts
+Merging broadcom/next (412c6bd2c649 Merge branch 'soc/next' into next)
+$ git merge -m Merge branch 'next' of https://github.com/Broadcom/stblinux.git broadcom/next
+Merge made by the 'ort' strategy.
+ Documentation/devicetree/bindings/bus/brcm,gisb-arb.yaml | 1 +
+ arch/arm/include/debug/brcmstb.S | 8 +++++---
+ .../boot/dts/broadcom/bcmbca/bcm4908-asus-gt-ac5300.dts | 13 +++++++------
+ arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi | 3 ---
+ drivers/bus/brcmstb_gisb.c | 15 +++++++++++++++
+ 5 files changed, 28 insertions(+), 12 deletions(-)
+Merging davinci/davinci/for-next (6613476e225e Linux 6.8-rc1)
+$ git merge -m Merge branch 'davinci/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git davinci/davinci/for-next
+Already up to date.
+Merging drivers-memory/for-next (e46076906722 memory: stm32-fmc2-ebi: keep power domain on)
+$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory/for-next
+Merge made by the 'ort' strategy.
+ Documentation/devicetree/bindings/bus/imx-weim.txt | 117 ----
+ .../fsl/fsl,imx-weim-peripherals.yaml | 31 +
+ .../memory-controllers/fsl/fsl,imx-weim.yaml | 204 ++++++
+ .../memory-controllers/mc-peripheral-props.yaml | 1 +
+ .../memory-controllers/renesas,rpc-if.yaml | 1 +
+ .../memory-controllers/st,stm32-fmc2-ebi.yaml | 7 +-
+ drivers/memory/stm32-fmc2-ebi.c | 729 +++++++++++++++++++--
+ drivers/memory/tegra/tegra234.c | 48 +-
+ .../bindings/fieldbus/arcx,anybus-controller.txt | 2 +-
+ 9 files changed, 963 insertions(+), 177 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/bus/imx-weim.txt
+ create mode 100644 Documentation/devicetree/bindings/memory-controllers/fsl/fsl,imx-weim-peripherals.yaml
+ create mode 100644 Documentation/devicetree/bindings/memory-controllers/fsl/fsl,imx-weim.yaml
+Merging imx-mxs/for-next (edb0d16255f6 Merge branch 'imx/defconfig' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git imx-mxs/for-next
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml
+Auto-merging MAINTAINERS
+Auto-merging arch/arm64/boot/dts/freescale/Makefile
+Auto-merging arch/arm64/configs/defconfig
+Merge made by the 'ort' strategy.
+ Documentation/devicetree/bindings/arm/fsl.yaml | 41 +-
+ .../devicetree/bindings/vendor-prefixes.yaml | 2 +
+ MAINTAINERS | 16 +-
+ arch/arm/boot/dts/nxp/imx/Makefile | 6 +
+ arch/arm/boot/dts/nxp/imx/imx1-apf9328.dts | 2 +-
+ arch/arm/boot/dts/nxp/imx/imx1.dtsi | 2 +-
+ arch/arm/boot/dts/nxp/imx/imx27.dtsi | 2 +-
+ arch/arm/boot/dts/nxp/imx/imx31.dtsi | 2 +-
+ arch/arm/boot/dts/nxp/imx/imx35.dtsi | 2 +-
+ arch/arm/boot/dts/nxp/imx/imx51.dtsi | 2 +-
+ arch/arm/boot/dts/nxp/imx/imx53-qsb-hdmi.dtso | 87 ++++
+ arch/arm/boot/dts/nxp/imx/imx6dl-sielaff.dts | 533 +++++++++++++++++++
+ arch/arm/boot/dts/nxp/imx/imx6dl-yapp4-common.dtsi | 25 +-
+ .../boot/dts/nxp/imx/imx6q-apalis-eval-v1.2.dts | 200 ++++++++
+ arch/arm/boot/dts/nxp/imx/imx6q-apalis-eval.dts | 108 +---
+ arch/arm/boot/dts/nxp/imx/imx6q-apalis-eval.dtsi | 120 +++++
+ .../arm/boot/dts/nxp/imx/imx6qdl-hummingboard.dtsi | 7 +-
+ .../boot/dts/nxp/imx/imx6qdl-hummingboard2.dtsi | 5 +
+ arch/arm/boot/dts/nxp/imx/imx6qdl-skov-cpu.dtsi | 10 +-
+ arch/arm/boot/dts/nxp/imx/imx6qdl.dtsi | 2 +-
+ .../boot/dts/nxp/imx/imx6sl-tolino-shine2hd.dts | 6 +-
+ arch/arm/boot/dts/nxp/imx/imx6sl.dtsi | 2 +-
+ arch/arm/boot/dts/nxp/imx/imx6sx.dtsi | 2 +-
+ arch/arm/boot/dts/nxp/imx/imx6ul-14x14-evk.dtsi | 2 +-
+ arch/arm/boot/dts/nxp/imx/imx6ul-geam.dts | 2 +-
+ .../dts/nxp/imx/imx6ul-imx6ull-opos6uldev.dtsi | 2 +-
+ arch/arm/boot/dts/nxp/imx/imx6ul.dtsi | 18 +-
+ .../dts/nxp/imx/imx6ull-dhcom-som-cfg-sdcard.dtsi | 4 +-
+ arch/arm/boot/dts/nxp/imx/imx6ull-dhcom-som.dtsi | 4 +-
+ arch/arm/boot/dts/nxp/imx/imx6ull-dhcor-som.dtsi | 7 +-
+ arch/arm/boot/dts/nxp/imx/imx6ull.dtsi | 2 +-
+ arch/arm/boot/dts/nxp/imx/imx7-mba7.dtsi | 315 +++++++-----
+ arch/arm/boot/dts/nxp/imx/imx7-tqma7.dtsi | 144 +++---
+ arch/arm/boot/dts/nxp/imx/imx7d-mba7.dts | 94 ++--
+ arch/arm/boot/dts/nxp/imx/imx7s.dtsi | 26 -
+ arch/arm/boot/dts/nxp/ls/ls1021a.dtsi | 2 +
+ arch/arm/boot/dts/nxp/mxs/imx28-evk.dts | 2 +-
+ arch/arm/configs/imx_v6_v7_defconfig | 2 +
+ arch/arm/mach-imx/mmdc.c | 6 +-
+ arch/arm64/boot/dts/freescale/Makefile | 8 +
+ arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 10 +-
+ arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 1 -
+ arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 6 +
+ arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 32 +-
+ .../boot/dts/freescale/imx8-apalis-eval-v1.1.dtsi | 26 +
+ .../boot/dts/freescale/imx8-apalis-eval-v1.2.dtsi | 124 +++++
+ .../arm64/boot/dts/freescale/imx8-apalis-eval.dtsi | 22 -
+ .../arm64/boot/dts/freescale/imx8-apalis-v1.1.dtsi | 1 -
+ arch/arm64/boot/dts/freescale/imx8-ss-audio.dtsi | 330 ++++++++++++
+ arch/arm64/boot/dts/freescale/imx8-ss-dma.dtsi | 63 +--
+ arch/arm64/boot/dts/freescale/imx8-ss-gpu0.dtsi | 27 +
+ arch/arm64/boot/dts/freescale/imx8dxl-evk.dts | 101 ++++
+ arch/arm64/boot/dts/freescale/imx8dxl-ss-adma.dtsi | 77 +++
+ arch/arm64/boot/dts/freescale/imx8dxl.dtsi | 1 +
+ .../boot/dts/freescale/imx8dxp-tqma8xdp-mba8xx.dts | 16 +
+ .../arm64/boot/dts/freescale/imx8dxp-tqma8xdp.dtsi | 24 +
+ arch/arm64/boot/dts/freescale/imx8dxp.dtsi | 24 +
+ arch/arm64/boot/dts/freescale/imx8mm-evk.dtsi | 69 +++
+ .../boot/dts/freescale/imx8mm-kontron-bl-osm-s.dts | 294 ++++-------
+ .../arm64/boot/dts/freescale/imx8mm-kontron-bl.dts | 38 +-
+ .../boot/dts/freescale/imx8mm-kontron-osm-s.dtsi | 567 ++++++++++++++++++++-
+ .../boot/dts/freescale/imx8mm-kontron-sl.dtsi | 4 +-
+ .../boot/dts/freescale/imx8mm-tqma8mqml-mba8mx.dts | 14 +-
+ .../boot/dts/freescale/imx8mm-venice-gw71xx.dtsi | 40 +-
+ .../boot/dts/freescale/imx8mm-venice-gw7901.dts | 14 +-
+ .../arm64/boot/dts/freescale/imx8mn-beacon-kit.dts | 2 -
+ arch/arm64/boot/dts/freescale/imx8mn-evk.dtsi | 36 ++
+ .../boot/dts/freescale/imx8mn-rve-gateway.dts | 2 +-
+ .../freescale/imx8mn-tqma8mqnl-mba8mx-usbotg.dtso | 64 +++
+ .../boot/dts/freescale/imx8mn-tqma8mqnl-mba8mx.dts | 5 +-
+ arch/arm64/boot/dts/freescale/imx8mn.dtsi | 2 +-
+ .../boot/dts/freescale/imx8mp-beacon-som.dtsi | 71 +++
+ .../dts/freescale/imx8mp-data-modul-edm-sbc.dts | 82 ++-
+ .../arm64/boot/dts/freescale/imx8mp-dhcom-som.dtsi | 2 +-
+ arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 33 +-
+ .../dts/freescale/imx8mp-phyboard-pollux-rdk.dts | 107 +++-
+ .../boot/dts/freescale/imx8mp-phycore-som.dtsi | 1 -
+ .../boot/dts/freescale/imx8mp-venice-gw71xx.dtsi | 10 +-
+ arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi | 3 +-
+ arch/arm64/boot/dts/freescale/imx8mp.dtsi | 14 +-
+ .../boot/dts/freescale/imx8mq-tqma8mq-mba8mx.dts | 24 +-
+ .../boot/dts/freescale/imx8qm-apalis-eval-v1.2.dts | 16 +
+ .../boot/dts/freescale/imx8qm-apalis-eval.dts | 2 +-
+ .../dts/freescale/imx8qm-apalis-v1.1-eval-v1.2.dts | 26 +
+ .../boot/dts/freescale/imx8qm-apalis-v1.1-eval.dts | 2 +-
+ arch/arm64/boot/dts/freescale/imx8qm-mek.dts | 26 +
+ arch/arm64/boot/dts/freescale/imx8qm-ss-conn.dtsi | 5 +
+ arch/arm64/boot/dts/freescale/imx8qm-ss-dma.dtsi | 55 +-
+ arch/arm64/boot/dts/freescale/imx8qm.dtsi | 41 ++
+ .../boot/dts/freescale/imx8qxp-tqma8xqp-mba8xx.dts | 16 +
+ .../arm64/boot/dts/freescale/imx8qxp-tqma8xqp.dtsi | 14 +
+ arch/arm64/boot/dts/freescale/imx8qxp.dtsi | 8 +
+ arch/arm64/boot/dts/freescale/imx8ulp-evk.dts | 2 +-
+ .../boot/dts/freescale/imx93-phyboard-segin.dts | 117 +++++
+ .../boot/dts/freescale/imx93-phycore-som.dtsi | 126 +++++
+ arch/arm64/boot/dts/freescale/imx93-tqma9352.dtsi | 4 +-
+ .../boot/dts/freescale/imx93-var-som-symphony.dts | 351 +++++++++++++
+ arch/arm64/boot/dts/freescale/imx93-var-som.dtsi | 110 ++++
+ arch/arm64/boot/dts/freescale/imx93.dtsi | 4 +-
+ arch/arm64/boot/dts/freescale/mba8mx.dtsi | 21 +-
+ arch/arm64/boot/dts/freescale/mba8xx.dtsi | 554 ++++++++++++++++++++
+ arch/arm64/boot/dts/freescale/tqma8xx.dtsi | 265 ++++++++++
+ arch/arm64/configs/defconfig | 8 +
+ 103 files changed, 5144 insertions(+), 836 deletions(-)
+ create mode 100644 arch/arm/boot/dts/nxp/imx/imx53-qsb-hdmi.dtso
+ create mode 100644 arch/arm/boot/dts/nxp/imx/imx6dl-sielaff.dts
+ create mode 100644 arch/arm/boot/dts/nxp/imx/imx6q-apalis-eval-v1.2.dts
+ create mode 100644 arch/arm/boot/dts/nxp/imx/imx6q-apalis-eval.dtsi
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8-apalis-eval-v1.1.dtsi
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8-apalis-eval-v1.2.dtsi
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8-ss-gpu0.dtsi
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8dxp-tqma8xdp-mba8xx.dts
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8dxp-tqma8xdp.dtsi
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8dxp.dtsi
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mn-tqma8mqnl-mba8mx-usbotg.dtso
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8qm-apalis-eval-v1.2.dts
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8qm-apalis-v1.1-eval-v1.2.dts
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8qxp-tqma8xqp-mba8xx.dts
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8qxp-tqma8xqp.dtsi
+ create mode 100644 arch/arm64/boot/dts/freescale/imx93-phyboard-segin.dts
+ create mode 100644 arch/arm64/boot/dts/freescale/imx93-phycore-som.dtsi
+ create mode 100644 arch/arm64/boot/dts/freescale/imx93-var-som-symphony.dts
+ create mode 100644 arch/arm64/boot/dts/freescale/imx93-var-som.dtsi
+ create mode 100644 arch/arm64/boot/dts/freescale/mba8xx.dtsi
+ create mode 100644 arch/arm64/boot/dts/freescale/tqma8xx.dtsi
+Merging mediatek/for-next (ba90af39ba57 arm64: dts: mediatek: mt8183-pico6: Fix wake-on-X event node names)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux.git mediatek/for-next
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml
+Auto-merging arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi
+Auto-merging arch/arm64/boot/dts/mediatek/mt8192-asurada.dtsi
+Auto-merging arch/arm64/boot/dts/mediatek/mt8195-demo.dts
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/arm/mediatek.yaml | 198 ++-
+ .../bindings/media/mediatek,vcodec-encoder.yaml | 31 +-
+ .../bindings/media/mediatek-jpeg-encoder.yaml | 3 +-
+ .../devicetree/bindings/vendor-prefixes.yaml | 2 +
+ arch/arm64/boot/dts/mediatek/Makefile | 14 +
+ arch/arm64/boot/dts/mediatek/mt2712-evb.dts | 4 +-
+ arch/arm64/boot/dts/mediatek/mt2712e.dtsi | 2 +-
+ arch/arm64/boot/dts/mediatek/mt6797.dtsi | 8 +-
+ .../boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts | 13 +
+ arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts | 25 +
+ .../boot/dts/mediatek/mt7981b-xiaomi-ax3000t.dts | 15 +
+ arch/arm64/boot/dts/mediatek/mt7981b.dtsi | 105 ++
+ .../dts/mediatek/mt7986a-acelink-ew-7886cax.dts | 173 ++
+ .../dts/mediatek/mt7986a-bananapi-bpi-r3-nand.dtso | 2 +-
+ .../boot/dts/mediatek/mt7986a-bananapi-bpi-r3.dts | 2 +-
+ arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts | 31 +-
+ arch/arm64/boot/dts/mediatek/mt7986a.dtsi | 222 +--
+ arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts | 31 +-
+ .../boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dts | 11 +
+ arch/arm64/boot/dts/mediatek/mt7988a.dtsi | 136 ++
+ .../boot/dts/mediatek/mt8173-elm-hana-rev7.dts | 2 +-
+ arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi | 3 +-
+ arch/arm64/boot/dts/mediatek/mt8173-evb.dts | 2 +-
+ arch/arm64/boot/dts/mediatek/mt8173.dtsi | 19 +-
+ .../dts/mediatek/mt8183-kukui-jacuzzi-pico6.dts | 8 +-
+ .../boot/dts/mediatek/mt8183-kukui-jacuzzi.dtsi | 25 +-
+ .../boot/dts/mediatek/mt8183-kukui-kakadu.dtsi | 4 +
+ .../boot/dts/mediatek/mt8183-kukui-kodama.dtsi | 4 +
+ .../boot/dts/mediatek/mt8183-kukui-krane.dtsi | 4 +
+ arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 7 +-
+ arch/arm64/boot/dts/mediatek/mt8183-pumpkin.dts | 2 +-
+ arch/arm64/boot/dts/mediatek/mt8183.dtsi | 11 +-
+ .../boot/dts/mediatek/mt8186-corsola-krabby.dtsi | 129 ++
+ .../mediatek/mt8186-corsola-magneton-sku393216.dts | 39 +
+ .../mediatek/mt8186-corsola-magneton-sku393217.dts | 39 +
+ .../mediatek/mt8186-corsola-magneton-sku393218.dts | 26 +
+ .../mediatek/mt8186-corsola-rusty-sku196608.dts | 26 +
+ .../mediatek/mt8186-corsola-steelix-sku131072.dts | 18 +
+ .../mediatek/mt8186-corsola-steelix-sku131073.dts | 18 +
+ .../boot/dts/mediatek/mt8186-corsola-steelix.dtsi | 199 +++
+ .../mt8186-corsola-tentacool-sku327681.dts | 57 +
+ .../mt8186-corsola-tentacool-sku327683.dts | 24 +
+ .../mt8186-corsola-tentacruel-sku262144.dts | 44 +
+ .../mt8186-corsola-tentacruel-sku262148.dts | 26 +
+ arch/arm64/boot/dts/mediatek/mt8186-corsola.dtsi | 1681 ++++++++++++++++++++
+ arch/arm64/boot/dts/mediatek/mt8186.dtsi | 93 +-
+ arch/arm64/boot/dts/mediatek/mt8192-asurada.dtsi | 5 +-
+ arch/arm64/boot/dts/mediatek/mt8192.dtsi | 10 +-
+ .../boot/dts/mediatek/mt8195-cherry-tomato-r1.dts | 4 +
+ .../boot/dts/mediatek/mt8195-cherry-tomato-r2.dts | 4 +
+ .../boot/dts/mediatek/mt8195-cherry-tomato-r3.dts | 4 +
+ arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi | 27 +-
+ arch/arm64/boot/dts/mediatek/mt8195-demo.dts | 18 +-
+ arch/arm64/boot/dts/mediatek/mt8195-evb.dts | 12 +
+ arch/arm64/boot/dts/mediatek/mt8195.dtsi | 128 +-
+ .../boot/dts/mediatek/mt8395-genio-1200-evk.dts | 17 +-
+ .../boot/dts/mediatek/mt8395-radxa-nio-12l.dts | 825 ++++++++++
+ drivers/soc/mediatek/Kconfig | 1 +
+ 58 files changed, 4287 insertions(+), 306 deletions(-)
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt7981b-xiaomi-ax3000t.dts
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt7981b.dtsi
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt7986a-acelink-ew-7886cax.dts
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dts
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt7988a.dtsi
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8186-corsola-krabby.dtsi
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8186-corsola-magneton-sku393216.dts
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8186-corsola-magneton-sku393217.dts
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8186-corsola-magneton-sku393218.dts
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8186-corsola-rusty-sku196608.dts
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8186-corsola-steelix-sku131072.dts
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8186-corsola-steelix-sku131073.dts
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8186-corsola-steelix.dtsi
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8186-corsola-tentacool-sku327681.dts
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8186-corsola-tentacool-sku327683.dts
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8186-corsola-tentacruel-sku262144.dts
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8186-corsola-tentacruel-sku262148.dts
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8186-corsola.dtsi
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8395-radxa-nio-12l.dts
+Merging mvebu/for-next (33649b804911 Merge branch 'mvebu/dt64' into mvebu/for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git mvebu/for-next
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/arm/marvell/armada-38x.txt | 27 -----
+ .../bindings/arm/marvell/armada-38x.yaml | 70 +++++++++++
+ .../dts/marvell/armada-385-clearfog-gtr-l8.dts | 38 ++++--
+ .../dts/marvell/armada-385-clearfog-gtr-s4.dts | 2 +
+ .../boot/dts/marvell/armada-385-clearfog-gtr.dtsi | 130 ++++++++++++++-------
+ arch/arm/boot/dts/marvell/armada-388-clearfog.dts | 5 +-
+ arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi | 31 ++++-
+ arch/arm64/boot/dts/marvell/ac5-98dx35xx-rd.dts | 4 +
+ arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 10 +-
+ arch/arm64/boot/dts/marvell/armada-ap807.dtsi | 3 +
+ arch/arm64/boot/dts/marvell/armada-cp11x.dtsi | 10 +-
+ 11 files changed, 237 insertions(+), 93 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/arm/marvell/armada-38x.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/marvell/armada-38x.yaml
+Merging omap/for-next (98f3f68169bd Merge branch 'omap-for-v6.9/dt' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap/for-next
+Auto-merging MAINTAINERS
+Auto-merging arch/arm/boot/dts/ti/omap/am5729-beagleboneai.dts
+Merge made by the 'ort' strategy.
+ .../{img,powervr.yaml => img,powervr-rogue.yaml} | 4 +-
+ .../devicetree/bindings/gpu/img,powervr-sgx.yaml | 138 ++++++
+ MAINTAINERS | 3 +-
+ arch/arm/boot/dts/ti/omap/am335x-baltos-ir2110.dts | 2 +-
+ arch/arm/boot/dts/ti/omap/am335x-baltos-ir3220.dts | 2 +-
+ arch/arm/boot/dts/ti/omap/am335x-baltos-ir5221.dts | 2 +-
+ arch/arm/boot/dts/ti/omap/am335x-baltos-leds.dtsi | 2 +-
+ arch/arm/boot/dts/ti/omap/am335x-baltos.dtsi | 2 +-
+ arch/arm/boot/dts/ti/omap/am335x-base0033.dts | 2 +-
+ arch/arm/boot/dts/ti/omap/am335x-bone-common.dtsi | 4 +-
+ arch/arm/boot/dts/ti/omap/am335x-cm-t335.dts | 2 +-
+ arch/arm/boot/dts/ti/omap/am335x-evmsk.dts | 2 +-
+ arch/arm/boot/dts/ti/omap/am335x-guardian.dts | 4 +-
+ arch/arm/boot/dts/ti/omap/am335x-icev2.dts | 2 +-
+ arch/arm/boot/dts/ti/omap/am335x-igep0033.dtsi | 2 +-
+ arch/arm/boot/dts/ti/omap/am335x-myirtech-myc.dtsi | 2 +-
+ arch/arm/boot/dts/ti/omap/am335x-myirtech-myd.dts | 2 +-
+ arch/arm/boot/dts/ti/omap/am335x-nano.dts | 2 +-
+ .../boot/dts/ti/omap/am335x-netcan-plus-1xx.dts | 2 +-
+ .../boot/dts/ti/omap/am335x-netcom-plus-2xx.dts | 2 +-
+ .../boot/dts/ti/omap/am335x-netcom-plus-8xx.dts | 2 +-
+ arch/arm/boot/dts/ti/omap/am335x-pdu001.dts | 2 +-
+ .../ti/omap/am335x-sancloud-bbe-extended-wifi.dts | 2 +-
+ .../boot/dts/ti/omap/am335x-sancloud-bbe-lite.dts | 2 +-
+ arch/arm/boot/dts/ti/omap/am335x-sbc-t335.dts | 2 +-
+ arch/arm/boot/dts/ti/omap/am335x-sl50.dts | 3 +-
+ arch/arm/boot/dts/ti/omap/am33xx-clocks.dtsi | 39 +-
+ arch/arm/boot/dts/ti/omap/am33xx.dtsi | 9 +-
+ arch/arm/boot/dts/ti/omap/am3517.dtsi | 11 +-
+ arch/arm/boot/dts/ti/omap/am35xx-clocks.dtsi | 18 +-
+ arch/arm/boot/dts/ti/omap/am4372.dtsi | 6 +
+ arch/arm/boot/dts/ti/omap/am437x-cm-t43.dts | 2 +-
+ arch/arm/boot/dts/ti/omap/am437x-sbc-t43.dts | 2 +-
+ arch/arm/boot/dts/ti/omap/am5729-beagleboneai.dts | 2 +-
+ arch/arm/boot/dts/ti/omap/am57xx-cl-som-am57x.dts | 2 +-
+ arch/arm/boot/dts/ti/omap/am57xx-sbc-am57x.dts | 2 +-
+ arch/arm/boot/dts/ti/omap/compulab-sb-som.dtsi | 2 +-
+ arch/arm/boot/dts/ti/omap/dra7-l4.dtsi | 2 +-
+ arch/arm/boot/dts/ti/omap/dra7.dtsi | 17 +-
+ arch/arm/boot/dts/ti/omap/dra74x-p.dtsi | 2 +-
+ arch/arm/boot/dts/ti/omap/dra7xx-clocks.dtsi | 2 +-
+ arch/arm/boot/dts/ti/omap/omap3430es1-clocks.dtsi | 52 ++-
+ .../boot/dts/ti/omap/omap34xx-omap36xx-clocks.dtsi | 86 ++--
+ arch/arm/boot/dts/ti/omap/omap34xx.dtsi | 11 +-
+ .../omap36xx-am35xx-omap3430es2plus-clocks.dtsi | 28 +-
+ arch/arm/boot/dts/ti/omap/omap36xx-clocks.dtsi | 7 +-
+ .../ti/omap/omap36xx-omap3430es2plus-clocks.dtsi | 46 +-
+ arch/arm/boot/dts/ti/omap/omap36xx.dtsi | 9 +-
+ arch/arm/boot/dts/ti/omap/omap3xxx-clocks.dtsi | 510 +++++++++++----------
+ arch/arm/boot/dts/ti/omap/omap4-epson-embt2ws.dts | 1 +
+ arch/arm/boot/dts/ti/omap/omap4-panda-common.dtsi | 1 +
+ arch/arm/boot/dts/ti/omap/omap4-sdp.dts | 2 +-
+ arch/arm/boot/dts/ti/omap/omap4.dtsi | 9 +-
+ arch/arm/boot/dts/ti/omap/omap5-igep0050.dts | 2 +-
+ arch/arm/boot/dts/ti/omap/omap5.dtsi | 9 +-
+ arch/arm/boot/dts/ti/omap/twl4030.dtsi | 2 +-
+ arch/arm/boot/dts/ti/omap/twl6030.dtsi | 4 +-
+ arch/arm/mach-omap2/am33xx-restart.c | 2 +-
+ arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c | 2 +-
+ arch/arm/mach-omap2/clockdomain.c | 4 +-
+ arch/arm/mach-omap2/cm33xx.c | 2 +-
+ arch/arm/mach-omap2/cminst44xx.c | 2 +-
+ arch/arm/mach-omap2/omap-secure.c | 4 +-
+ arch/arm/mach-omap2/omap_hwmod.c | 9 +-
+ arch/arm/mach-omap2/omap_hwmod_common_data.c | 6 +-
+ arch/arm/mach-omap2/pmic-cpcap.c | 24 +-
+ arch/arm/mach-omap2/powerdomain.c | 2 +-
+ arch/arm/mach-omap2/prm44xx.c | 2 +-
+ arch/arm/mach-omap2/prm_common.c | 4 +-
+ arch/arm/mach-omap2/wd_timer.c | 4 +-
+ arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 7 +
+ drivers/clk/ti/apll.c | 11 +-
+ drivers/clk/ti/clk.c | 71 ++-
+ drivers/clk/ti/clock.h | 1 +
+ drivers/clk/ti/divider.c | 5 +-
+ drivers/clk/ti/gate.c | 9 +-
+ drivers/clk/ti/interface.c | 4 +-
+ drivers/clk/ti/mux.c | 6 +-
+ include/linux/clk/ti.h | 3 +
+ 79 files changed, 768 insertions(+), 509 deletions(-)
+ rename Documentation/devicetree/bindings/gpu/{img,powervr.yaml => img,powervr-rogue.yaml} (91%)
+ create mode 100644 Documentation/devicetree/bindings/gpu/img,powervr-sgx.yaml
+Merging qcom/for-next (f6265e31fc71 Merge branches 'arm32-for-6.9', 'arm64-defconfig-for-6.9', 'arm64-fixes-for-6.8', 'arm64-for-6.9', 'clk-for-6.9' and 'drivers-for-6.9' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git qcom/for-next
+Auto-merging arch/arm/boot/dts/qcom/qcom-sdx55.dtsi
+Auto-merging arch/arm64/boot/dts/qcom/ipq6018.dtsi
+Auto-merging arch/arm64/boot/dts/qcom/ipq8074.dtsi
+Auto-merging arch/arm64/configs/defconfig
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/arm/msm/qcom,saw2.txt | 58 -
+ Documentation/devicetree/bindings/arm/qcom.yaml | 58 +-
+ .../bindings/clock/qcom,gcc-sc8180x.yaml | 7 +
+ .../devicetree/bindings/clock/qcom,gpucc.yaml | 9 +
+ .../devicetree/bindings/clock/qcom,q6sstopcc.yaml | 2 +-
+ .../devicetree/bindings/clock/qcom,sc7180-mss.yaml | 61 -
+ .../bindings/clock/qcom,sm8450-camcc.yaml | 2 +
+ .../bindings/clock/qcom,sm8450-gpucc.yaml | 2 +
+ .../bindings/clock/qcom,sm8550-dispcc.yaml | 7 +-
+ .../bindings/clock/qcom,sm8550-tcsr.yaml | 1 +
+ .../bindings/clock/qcom,sm8650-dispcc.yaml | 106 -
+ .../devicetree/bindings/soc/qcom/qcom,pbs.yaml | 46 +
+ .../bindings/soc/qcom/qcom,pmic-glink.yaml | 2 +
+ .../bindings/soc/qcom/qcom,rpm-master-stats.yaml | 2 +
+ .../soc/qcom/{qcom,spm.yaml => qcom,saw2.yaml} | 46 +-
+ arch/arm/Makefile | 4 +-
+ arch/arm/boot/dts/qcom/Makefile | 1 +
+ arch/arm/boot/dts/qcom/qcom-apq8026-lg-lenok.dts | 38 +
+ .../dts/qcom/qcom-apq8026-samsung-matisse-wifi.dts | 452 +---
+ arch/arm/boot/dts/qcom/qcom-apq8064.dtsi | 70 +-
+ arch/arm/boot/dts/qcom/qcom-apq8084.dtsi | 13 +-
+ arch/arm/boot/dts/qcom/qcom-ipq4019-ap.dk01.1.dtsi | 146 +-
+ arch/arm/boot/dts/qcom/qcom-ipq4019.dtsi | 35 +-
+ arch/arm/boot/dts/qcom/qcom-ipq8064.dtsi | 12 +-
+ .../qcom/qcom-msm8226-samsung-matisse-common.dtsi | 457 ++++
+ arch/arm/boot/dts/qcom/qcom-msm8226.dtsi | 764 +++---
+ arch/arm/boot/dts/qcom/qcom-msm8660.dtsi | 17 +-
+ arch/arm/boot/dts/qcom/qcom-msm8926-htc-memul.dts | 15 +-
+ .../dts/qcom/qcom-msm8926-samsung-matisselte.dts | 37 +
+ arch/arm/boot/dts/qcom/qcom-msm8960-pins.dtsi | 21 +
+ .../dts/qcom/qcom-msm8960-samsung-expressatt.dts | 71 +-
+ arch/arm/boot/dts/qcom/qcom-msm8960.dtsi | 48 +-
+ arch/arm/boot/dts/qcom/qcom-msm8974.dtsi | 33 +-
+ arch/arm/boot/dts/qcom/qcom-sdx55.dtsi | 32 +-
+ arch/arm/boot/dts/qcom/qcom-sdx65.dtsi | 48 +-
+ arch/arm/mach-qcom/Kconfig | 41 +-
+ arch/arm64/boot/dts/qcom/Makefile | 6 +
+ .../dts/qcom/apq8016-sbc-d3-camera-mezzanine.dts | 8 +-
+ arch/arm64/boot/dts/qcom/ipq5332.dtsi | 8 +-
+ arch/arm64/boot/dts/qcom/ipq6018.dtsi | 159 ++
+ arch/arm64/boot/dts/qcom/ipq8074.dtsi | 16 +
+ arch/arm64/boot/dts/qcom/ipq9574.dtsi | 12 +-
+ .../boot/dts/qcom/msm8216-samsung-fortuna3g.dts | 11 +
+ .../dts/qcom/msm8916-samsung-fortuna-common.dtsi | 203 ++
+ .../boot/dts/qcom/msm8916-samsung-gprimeltecan.dts | 27 +
+ .../dts/qcom/msm8916-samsung-grandprimelte.dts | 16 +
+ .../dts/qcom/msm8916-samsung-rossa-common.dtsi | 16 +
+ arch/arm64/boot/dts/qcom/msm8916-samsung-rossa.dts | 16 +
+ arch/arm64/boot/dts/qcom/msm8916.dtsi | 9 +
+ arch/arm64/boot/dts/qcom/msm8939.dtsi | 11 +-
+ arch/arm64/boot/dts/qcom/msm8953.dtsi | 155 +-
+ .../boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi | 2 +-
+ .../dts/qcom/msm8994-sony-xperia-kitakami.dtsi | 2 +-
+ arch/arm64/boot/dts/qcom/msm8994.dtsi | 4 +-
+ arch/arm64/boot/dts/qcom/msm8996.dtsi | 18 +-
+ arch/arm64/boot/dts/qcom/msm8998.dtsi | 26 +-
+ .../boot/dts/qcom/{pm2250.dtsi => pm4125.dtsi} | 38 +-
+ arch/arm64/boot/dts/qcom/pmi632.dtsi | 39 +
+ arch/arm64/boot/dts/qcom/qcm2290.dtsi | 7 +
+ arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts | 56 +-
+ arch/arm64/boot/dts/qcom/qcm6490-idp.dts | 39 +-
+ arch/arm64/boot/dts/qcom/qcs404.dtsi | 16 +
+ arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts | 23 +-
+ arch/arm64/boot/dts/qcom/qrb2210-rb1.dts | 96 +-
+ arch/arm64/boot/dts/qcom/qrb4210-rb2.dts | 50 +-
+ arch/arm64/boot/dts/qcom/sa8295p-adp.dts | 68 +
+ arch/arm64/boot/dts/qcom/sa8540p-ride.dts | 4 +-
+ arch/arm64/boot/dts/qcom/sa8540p.dtsi | 3 +
+ arch/arm64/boot/dts/qcom/sa8775p.dtsi | 121 +-
+ arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 1 +
+ arch/arm64/boot/dts/qcom/sc7180.dtsi | 86 +-
+ arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi | 28 +
+ arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi | 1 +
+ arch/arm64/boot/dts/qcom/sc7280-idp-ec-h1.dtsi | 1 +
+ arch/arm64/boot/dts/qcom/sc7280.dtsi | 125 +-
+ arch/arm64/boot/dts/qcom/sc8180x.dtsi | 141 +-
+ .../dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 39 +-
+ arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi | 39 +-
+ arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 601 ++++-
+ .../arm64/boot/dts/qcom/sda660-inforce-ifc6560.dts | 5 +
+ arch/arm64/boot/dts/qcom/sdm450-motorola-ali.dts | 2 +-
+ arch/arm64/boot/dts/qcom/sdm450.dtsi | 14 +
+ .../boot/dts/qcom/sdm630-sony-xperia-nile.dtsi | 16 +
+ arch/arm64/boot/dts/qcom/sdm630.dtsi | 62 +-
+ arch/arm64/boot/dts/qcom/sdm632.dtsi | 8 +
+ .../arm64/boot/dts/qcom/sdm660-xiaomi-lavender.dts | 6 +
+ arch/arm64/boot/dts/qcom/sdm670.dtsi | 14 +-
+ arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 1 +
+ arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 2 +-
+ .../arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 8 +-
+ arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts | 2 +-
+ arch/arm64/boot/dts/qcom/sdm845.dtsi | 63 +-
+ arch/arm64/boot/dts/qcom/sm4450.dtsi | 2 +-
+ arch/arm64/boot/dts/qcom/sm6115.dtsi | 98 +-
+ arch/arm64/boot/dts/qcom/sm6125.dtsi | 17 +-
+ arch/arm64/boot/dts/qcom/sm6350.dtsi | 597 ++++-
+ arch/arm64/boot/dts/qcom/sm6375.dtsi | 12 +-
+ arch/arm64/boot/dts/qcom/sm7125-xiaomi-common.dtsi | 26 +
+ arch/arm64/boot/dts/qcom/sm7125-xiaomi-curtana.dts | 16 +
+ arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts | 61 +-
+ arch/arm64/boot/dts/qcom/sm8150.dtsi | 115 +-
+ arch/arm64/boot/dts/qcom/sm8250.dtsi | 107 +-
+ arch/arm64/boot/dts/qcom/sm8350.dtsi | 87 +-
+ arch/arm64/boot/dts/qcom/sm8450-hdk.dts | 6 +-
+ arch/arm64/boot/dts/qcom/sm8450.dtsi | 81 +-
+ arch/arm64/boot/dts/qcom/sm8550-hdk.dts | 1306 ++++++++++
+ arch/arm64/boot/dts/qcom/sm8550-mtp.dts | 11 +-
+ arch/arm64/boot/dts/qcom/sm8550-qrd.dts | 53 +-
+ arch/arm64/boot/dts/qcom/sm8550.dtsi | 187 +-
+ arch/arm64/boot/dts/qcom/sm8650-mtp.dts | 157 +-
+ arch/arm64/boot/dts/qcom/sm8650-qrd.dts | 441 +++-
+ arch/arm64/boot/dts/qcom/sm8650.dtsi | 81 +-
+ arch/arm64/boot/dts/qcom/x1e80100-crd.dts | 450 ++++
+ arch/arm64/boot/dts/qcom/x1e80100-qcp.dts | 175 +-
+ arch/arm64/boot/dts/qcom/x1e80100.dtsi | 1777 +++++++++++++-
+ arch/arm64/configs/defconfig | 17 +-
+ drivers/clk/qcom/Kconfig | 45 +-
+ drivers/clk/qcom/Makefile | 5 +-
+ drivers/clk/qcom/camcc-sc7180.c | 12 +-
+ drivers/clk/qcom/camcc-sc7280.c | 12 +-
+ drivers/clk/qcom/camcc-sc8280xp.c | 6 +-
+ drivers/clk/qcom/camcc-sdm845.c | 12 +-
+ drivers/clk/qcom/camcc-sm6350.c | 12 +-
+ drivers/clk/qcom/camcc-sm8550.c | 10 +-
+ drivers/clk/qcom/camcc-x1e80100.c | 2486 ++++++++++++++++++++
+ drivers/clk/qcom/clk-alpha-pll.c | 16 +
+ drivers/clk/qcom/clk-alpha-pll.h | 4 +
+ drivers/clk/qcom/clk-branch.h | 6 +
+ drivers/clk/qcom/dispcc-qcm2290.c | 16 +-
+ drivers/clk/qcom/dispcc-sc7180.c | 12 +-
+ drivers/clk/qcom/dispcc-sc7280.c | 19 +-
+ drivers/clk/qcom/dispcc-sc8280xp.c | 16 +-
+ drivers/clk/qcom/dispcc-sdm845.c | 14 +-
+ drivers/clk/qcom/dispcc-sm6115.c | 4 +-
+ drivers/clk/qcom/dispcc-sm6125.c | 12 +-
+ drivers/clk/qcom/dispcc-sm6350.c | 12 +-
+ drivers/clk/qcom/dispcc-sm6375.c | 12 +-
+ drivers/clk/qcom/dispcc-sm8250.c | 134 +-
+ drivers/clk/qcom/dispcc-sm8450.c | 19 +-
+ drivers/clk/qcom/dispcc-sm8550.c | 19 +-
+ drivers/clk/qcom/dispcc-sm8650.c | 16 +-
+ drivers/clk/qcom/dispcc-x1e80100.c | 1718 ++++++++++++++
+ drivers/clk/qcom/gcc-ipq6018.c | 17 +
+ drivers/clk/qcom/gcc-msm8953.c | 4 +
+ drivers/clk/qcom/gcc-sa8775p.c | 29 +-
+ drivers/clk/qcom/gcc-sc7180.c | 22 +-
+ drivers/clk/qcom/gcc-sc7280.c | 20 +-
+ drivers/clk/qcom/gcc-sc8180x.c | 62 +-
+ drivers/clk/qcom/gcc-sc8280xp.c | 29 +-
+ drivers/clk/qcom/gcc-sdm845.c | 1 +
+ drivers/clk/qcom/gcc-sdx55.c | 12 +-
+ drivers/clk/qcom/gcc-sdx65.c | 13 +-
+ drivers/clk/qcom/gcc-sdx75.c | 10 +-
+ drivers/clk/qcom/gcc-sm4450.c | 32 +-
+ drivers/clk/qcom/gcc-sm6375.c | 11 +-
+ drivers/clk/qcom/gcc-sm7150.c | 25 +-
+ drivers/clk/qcom/gcc-sm8150.c | 352 +--
+ drivers/clk/qcom/gcc-sm8250.c | 23 +-
+ drivers/clk/qcom/gcc-sm8350.c | 24 +-
+ drivers/clk/qcom/gcc-sm8450.c | 25 +-
+ drivers/clk/qcom/gcc-sm8550.c | 25 +-
+ drivers/clk/qcom/gcc-sm8650.c | 20 +-
+ drivers/clk/qcom/gcc-x1e80100.c | 16 +-
+ drivers/clk/qcom/gdsc.c | 12 +-
+ drivers/clk/qcom/gpucc-sa8775p.c | 12 +-
+ drivers/clk/qcom/gpucc-sc7180.c | 12 +-
+ drivers/clk/qcom/gpucc-sc7280.c | 21 +-
+ drivers/clk/qcom/gpucc-sc8280xp.c | 10 +-
+ drivers/clk/qcom/gpucc-sdm845.c | 12 +-
+ drivers/clk/qcom/gpucc-sm8150.c | 12 +-
+ drivers/clk/qcom/gpucc-sm8250.c | 12 +-
+ drivers/clk/qcom/gpucc-sm8350.c | 12 +-
+ drivers/clk/qcom/gpucc-sm8550.c | 22 +-
+ drivers/clk/qcom/gpucc-x1e80100.c | 656 ++++++
+ drivers/clk/qcom/lpasscorecc-sc7180.c | 7 +-
+ drivers/clk/qcom/mss-sc7180.c | 140 --
+ drivers/clk/qcom/reset.c | 27 +-
+ drivers/clk/qcom/reset.h | 2 +-
+ drivers/clk/qcom/tcsrcc-x1e80100.c | 285 +++
+ drivers/clk/qcom/videocc-sc7180.c | 12 +-
+ drivers/clk/qcom/videocc-sc7280.c | 12 +-
+ drivers/clk/qcom/videocc-sdm845.c | 12 +-
+ drivers/clk/qcom/videocc-sm8150.c | 14 +-
+ drivers/clk/qcom/videocc-sm8250.c | 22 +-
+ drivers/clk/qcom/videocc-sm8350.c | 14 +-
+ drivers/clk/qcom/videocc-sm8450.c | 29 +-
+ drivers/clk/qcom/videocc-sm8550.c | 29 +-
+ drivers/iommu/Kconfig | 2 +-
+ drivers/pmdomain/qcom/rpmhpd.c | 1 -
+ drivers/soc/qcom/Kconfig | 9 +
+ drivers/soc/qcom/Makefile | 2 +
+ drivers/soc/qcom/apr.c | 2 +-
+ drivers/soc/qcom/llcc-qcom.c | 2 +
+ drivers/soc/qcom/qcom-pbs.c | 236 ++
+ drivers/soc/qcom/qcom_aoss.c | 103 +-
+ drivers/soc/qcom/smem.c | 11 -
+ drivers/soc/qcom/smp2p.c | 6 +-
+ drivers/soc/qcom/socinfo.c | 7 +-
+ drivers/soc/qcom/spm.c | 254 +-
+ drivers/soc/qcom/trace-aoss.h | 48 +
+ include/dt-bindings/arm/qcom,ids.h | 5 +
+ include/dt-bindings/clock/qcom,gcc-msm8953.h | 4 +
+ include/dt-bindings/clock/qcom,gcc-sc8180x.h | 2 +
+ include/dt-bindings/clock/qcom,gcc-sm8150.h | 3 +
+ include/dt-bindings/clock/qcom,x1e80100-camcc.h | 135 ++
+ include/dt-bindings/clock/qcom,x1e80100-dispcc.h | 98 +
+ include/dt-bindings/clock/qcom,x1e80100-gpucc.h | 41 +
+ include/dt-bindings/clock/qcom,x1e80100-tcsr.h | 23 +
+ include/dt-bindings/reset/qcom,x1e80100-gpucc.h | 19 +
+ include/linux/soc/qcom/apr.h | 2 +-
+ include/linux/soc/qcom/qcom-pbs.h | 30 +
+ include/soc/qcom/qcom-spmi-pmic.h | 2 +-
+ include/soc/qcom/spm.h | 23 +-
+ 213 files changed, 16290 insertions(+), 2793 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/arm/msm/qcom,saw2.txt
+ delete mode 100644 Documentation/devicetree/bindings/clock/qcom,sc7180-mss.yaml
+ delete mode 100644 Documentation/devicetree/bindings/clock/qcom,sm8650-dispcc.yaml
+ create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,pbs.yaml
+ rename Documentation/devicetree/bindings/soc/qcom/{qcom,spm.yaml => qcom,saw2.yaml} (53%)
+ create mode 100644 arch/arm/boot/dts/qcom/qcom-msm8226-samsung-matisse-common.dtsi
+ create mode 100644 arch/arm/boot/dts/qcom/qcom-msm8926-samsung-matisselte.dts
+ create mode 100644 arch/arm/boot/dts/qcom/qcom-msm8960-pins.dtsi
+ create mode 100644 arch/arm64/boot/dts/qcom/msm8216-samsung-fortuna3g.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/msm8916-samsung-fortuna-common.dtsi
+ create mode 100644 arch/arm64/boot/dts/qcom/msm8916-samsung-gprimeltecan.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/msm8916-samsung-grandprimelte.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/msm8916-samsung-rossa-common.dtsi
+ create mode 100644 arch/arm64/boot/dts/qcom/msm8916-samsung-rossa.dts
+ rename arch/arm64/boot/dts/qcom/{pm2250.dtsi => pm4125.dtsi} (56%)
+ create mode 100644 arch/arm64/boot/dts/qcom/sdm450.dtsi
+ create mode 100644 arch/arm64/boot/dts/qcom/sm7125-xiaomi-curtana.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/sm8550-hdk.dts
+ create mode 100644 drivers/clk/qcom/camcc-x1e80100.c
+ create mode 100644 drivers/clk/qcom/dispcc-x1e80100.c
+ create mode 100644 drivers/clk/qcom/gpucc-x1e80100.c
+ delete mode 100644 drivers/clk/qcom/mss-sc7180.c
+ create mode 100644 drivers/clk/qcom/tcsrcc-x1e80100.c
+ create mode 100644 drivers/soc/qcom/qcom-pbs.c
+ create mode 100644 drivers/soc/qcom/trace-aoss.h
+ create mode 100644 include/dt-bindings/clock/qcom,x1e80100-camcc.h
+ create mode 100644 include/dt-bindings/clock/qcom,x1e80100-dispcc.h
+ create mode 100644 include/dt-bindings/clock/qcom,x1e80100-gpucc.h
+ create mode 100644 include/dt-bindings/clock/qcom,x1e80100-tcsr.h
+ create mode 100644 include/dt-bindings/reset/qcom,x1e80100-gpucc.h
+ create mode 100644 include/linux/soc/qcom/qcom-pbs.h
+Merging renesas/next (06a019816e51 Merge branch 'renesas-dts-for-v6.9' into renesas-next)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas/next
+Auto-merging arch/arm64/boot/dts/renesas/ulcb-kf.dtsi
+Merge made by the 'ort' strategy.
+ .../bindings/clock/renesas,cpg-mssr.yaml | 1 +
+ .../bindings/power/renesas,rcar-sysc.yaml | 1 +
+ .../devicetree/bindings/reset/renesas,rst.yaml | 1 +
+ .../bindings/soc/renesas/renesas-soc.yaml | 73 +++
+ .../devicetree/bindings/soc/renesas/renesas.yaml | 25 +-
+ arch/arm/boot/dts/renesas/r8a73a4-ape6evm.dts | 12 +
+ arch/arm/boot/dts/renesas/r8a73a4.dtsi | 23 +-
+ arch/arm/boot/dts/renesas/r8a7740.dtsi | 2 +
+ arch/arm/boot/dts/renesas/r8a7778.dtsi | 11 +-
+ arch/arm/boot/dts/renesas/r8a7779.dtsi | 9 +-
+ arch/arm64/boot/dts/renesas/Makefile | 8 +
+ arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 11 +-
+ arch/arm64/boot/dts/renesas/r8a774b1.dtsi | 11 +-
+ arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 11 +-
+ arch/arm64/boot/dts/renesas/r8a774e1.dtsi | 11 +-
+ arch/arm64/boot/dts/renesas/r8a77951.dtsi | 11 +-
+ arch/arm64/boot/dts/renesas/r8a77960.dtsi | 11 +-
+ arch/arm64/boot/dts/renesas/r8a77961.dtsi | 11 +-
+ arch/arm64/boot/dts/renesas/r8a77965.dtsi | 11 +-
+ arch/arm64/boot/dts/renesas/r8a77970.dtsi | 11 +-
+ arch/arm64/boot/dts/renesas/r8a77980.dtsi | 17 +-
+ arch/arm64/boot/dts/renesas/r8a77990.dtsi | 11 +-
+ arch/arm64/boot/dts/renesas/r8a77995.dtsi | 11 +-
+ arch/arm64/boot/dts/renesas/r8a779a0.dtsi | 21 +-
+ arch/arm64/boot/dts/renesas/r8a779f0.dtsi | 17 +-
+ .../boot/dts/renesas/r8a779g0-white-hawk-cpu.dts | 13 +
+ .../boot/dts/renesas/r8a779g0-white-hawk-cpu.dtsi | 368 +-----------
+ .../arm64/boot/dts/renesas/r8a779g0-white-hawk.dts | 58 +-
+ arch/arm64/boot/dts/renesas/r8a779g0.dtsi | 105 ++--
+ .../dts/renesas/r8a779g2-white-hawk-single.dts | 26 +
+ arch/arm64/boot/dts/renesas/r8a779g2.dtsi | 12 +
+ .../boot/dts/renesas/r8a779h0-gray-hawk-single.dts | 230 +++++++
+ arch/arm64/boot/dts/renesas/r8a779h0.dtsi | 664 +++++++++++++++++++++
+ arch/arm64/boot/dts/renesas/r9a07g043u.dtsi | 81 ++-
+ .../renesas/r9a07g043u11-smarc-cru-csi-ov5645.dtso | 21 +
+ arch/arm64/boot/dts/renesas/r9a07g044.dtsi | 68 ++-
+ arch/arm64/boot/dts/renesas/r9a07g054.dtsi | 69 ++-
+ arch/arm64/boot/dts/renesas/r9a08g045.dtsi | 27 +-
+ arch/arm64/boot/dts/renesas/rzg2l-smarc.dtsi | 14 +-
+ arch/arm64/boot/dts/renesas/rzg2lc-smarc.dtsi | 14 +-
+ arch/arm64/boot/dts/renesas/rzg3s-smarc-som.dtsi | 9 +
+ arch/arm64/boot/dts/renesas/rzg3s-smarc.dtsi | 53 ++
+ arch/arm64/boot/dts/renesas/ulcb-kf.dtsi | 81 +--
+ arch/arm64/boot/dts/renesas/white-hawk-common.dtsi | 65 ++
+ .../boot/dts/renesas/white-hawk-cpu-common.dtsi | 375 ++++++++++++
+ ...e-hawk-csi-dsi.dtsi => white-hawk-csi-dsi.dtsi} | 2 +-
+ ...hawk-ethernet.dtsi => white-hawk-ethernet.dtsi} | 2 +-
+ .../dt-bindings/clock/renesas,r8a779h0-cpg-mssr.h | 96 +++
+ include/dt-bindings/power/renesas,r8a779h0-sysc.h | 49 ++
+ 49 files changed, 2261 insertions(+), 583 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/soc/renesas/renesas-soc.yaml
+ create mode 100644 arch/arm64/boot/dts/renesas/r8a779g0-white-hawk-cpu.dts
+ create mode 100644 arch/arm64/boot/dts/renesas/r8a779g2-white-hawk-single.dts
+ create mode 100644 arch/arm64/boot/dts/renesas/r8a779g2.dtsi
+ create mode 100644 arch/arm64/boot/dts/renesas/r8a779h0-gray-hawk-single.dts
+ create mode 100644 arch/arm64/boot/dts/renesas/r8a779h0.dtsi
+ create mode 100644 arch/arm64/boot/dts/renesas/r9a07g043u11-smarc-cru-csi-ov5645.dtso
+ create mode 100644 arch/arm64/boot/dts/renesas/white-hawk-common.dtsi
+ create mode 100644 arch/arm64/boot/dts/renesas/white-hawk-cpu-common.dtsi
+ rename arch/arm64/boot/dts/renesas/{r8a779g0-white-hawk-csi-dsi.dtsi => white-hawk-csi-dsi.dtsi} (97%)
+ rename arch/arm64/boot/dts/renesas/{r8a779g0-white-hawk-ethernet.dtsi => white-hawk-ethernet.dtsi} (76%)
+ create mode 100644 include/dt-bindings/clock/renesas,r8a779h0-cpg-mssr.h
+ create mode 100644 include/dt-bindings/power/renesas,r8a779h0-sysc.h
+Merging reset/reset/next (c721f189e89c reset: Instantiate reset GPIO controller for shared reset-gpios)
+$ git merge -m Merge branch 'reset/next' of https://git.pengutronix.de/git/pza/linux reset/reset/next
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ .../bindings/reset/sophgo,sg2042-reset.yaml | 35 ++++
+ MAINTAINERS | 5 +
+ drivers/reset/Kconfig | 12 +-
+ drivers/reset/Makefile | 1 +
+ drivers/reset/core.c | 224 +++++++++++++++++++--
+ drivers/reset/reset-gpio.c | 119 +++++++++++
+ drivers/reset/reset-simple.c | 2 +
+ include/dt-bindings/reset/sophgo,sg2042-reset.h | 87 ++++++++
+ include/linux/cpufreq.h | 3 +-
+ include/linux/of.h | 16 ++
+ include/linux/reset-controller.h | 4 +
+ 11 files changed, 492 insertions(+), 16 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/reset/sophgo,sg2042-reset.yaml
+ create mode 100644 drivers/reset/reset-gpio.c
+ create mode 100644 include/dt-bindings/reset/sophgo,sg2042-reset.h
+Merging rockchip/for-next (c2a265fa6c5a Merge branch 'v6.9-clk/next' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git rockchip/for-next
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/arm/rockchip.yaml | 47 +-
+ .../devicetree/bindings/soc/rockchip/grf.yaml | 22 +
+ arch/arm/boot/dts/rockchip/rk3128-xpi-3128.dts | 29 +
+ arch/arm/boot/dts/rockchip/rk3128.dtsi | 60 ++
+ arch/arm/boot/dts/rockchip/rk322x.dtsi | 16 +-
+ arch/arm/boot/dts/rockchip/rk3288.dtsi | 16 +-
+ arch/arm64/boot/dts/rockchip/Makefile | 8 +
+ .../boot/dts/rockchip/px30-ringneck-haikou.dts | 1 +
+ arch/arm64/boot/dts/rockchip/px30-ringneck.dtsi | 6 +
+ arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts | 4 +-
+ arch/arm64/boot/dts/rockchip/rk3328.dtsi | 11 +-
+ .../boot/dts/rockchip/rk3399-kobol-helios64.dts | 3 -
+ .../arm64/boot/dts/rockchip/rk3399-puma-haikou.dts | 3 +-
+ arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a.dts | 2 +-
+ arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b.dts | 2 +-
+ arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4c.dts | 2 +-
+ arch/arm64/boot/dts/rockchip/rk3399.dtsi | 82 +-
+ .../boot/dts/rockchip/rk3566-anbernic-rg-arc-d.dts | 60 ++
+ .../boot/dts/rockchip/rk3566-anbernic-rg-arc-s.dts | 19 +
+ .../boot/dts/rockchip/rk3566-anbernic-rg-arc.dtsi | 237 ++++++
+ .../boot/dts/rockchip/rk3566-anbernic-rg353x.dtsi | 74 ++
+ .../boot/dts/rockchip/rk3566-anbernic-rg503.dts | 74 ++
+ .../boot/dts/rockchip/rk3566-anbernic-rgxx3.dtsi | 74 --
+ .../boot/dts/rockchip/rk3566-pinetab2-v0.1.dts | 28 +
+ .../boot/dts/rockchip/rk3566-pinetab2-v2.0.dts | 48 ++
+ arch/arm64/boot/dts/rockchip/rk3566-pinetab2.dtsi | 943 +++++++++++++++++++++
+ .../dts/rockchip/rk3566-powkiddy-rgb10max3.dts | 87 ++
+ .../boot/dts/rockchip/rk3566-powkiddy-rgb30.dts | 18 +
+ .../boot/dts/rockchip/rk3566-powkiddy-rk2023.dts | 18 +
+ .../boot/dts/rockchip/rk3566-powkiddy-rk2023.dtsi | 18 +-
+ .../dts/rockchip/rk3588-edgeble-neu6a-common.dtsi | 466 ++++++++++
+ .../boot/dts/rockchip/rk3588-edgeble-neu6a-io.dts | 10 +-
+ .../boot/dts/rockchip/rk3588-edgeble-neu6a-io.dtsi | 232 +++++
+ .../dts/rockchip/rk3588-edgeble-neu6a-wifi.dtso | 56 ++
+ .../boot/dts/rockchip/rk3588-edgeble-neu6a.dtsi | 25 +-
+ .../boot/dts/rockchip/rk3588-edgeble-neu6b-io.dts | 76 +-
+ .../boot/dts/rockchip/rk3588-edgeble-neu6b.dtsi | 383 +--------
+ arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts | 31 +-
+ .../boot/dts/rockchip/rk3588-orangepi-5-plus.dts | 1 -
+ .../arm64/boot/dts/rockchip/rk3588-quartzpro64.dts | 1 -
+ arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 8 +-
+ .../boot/dts/rockchip/rk3588s-indiedroid-nova.dts | 8 +
+ .../arm64/boot/dts/rockchip/rk3588s-nanopi-r6c.dts | 14 +
+ .../arm64/boot/dts/rockchip/rk3588s-nanopi-r6s.dts | 764 +++++++++++++++++
+ arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts | 1 -
+ drivers/clk/rockchip/clk-rk3568.c | 1 +
+ drivers/clk/rockchip/clk-rk3588.c | 55 +-
+ drivers/clk/rockchip/clk.c | 17 +
+ drivers/clk/rockchip/clk.h | 2 +
+ include/dt-bindings/clock/rockchip,rk3588-cru.h | 3 +-
+ 50 files changed, 3509 insertions(+), 657 deletions(-)
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg-arc-d.dts
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg-arc-s.dts
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg-arc.dtsi
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-pinetab2-v0.1.dts
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-pinetab2-v2.0.dts
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-pinetab2.dtsi
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-powkiddy-rgb10max3.dts
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6a-common.dtsi
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6a-io.dtsi
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6a-wifi.dtso
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6c.dts
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6s.dts
+Merging samsung-krzk/for-next (8b9d2e71b42c Merge branch 'next/clk' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk/for-next
+Auto-merging MAINTAINERS
+Auto-merging arch/arm/configs/multi_v7_defconfig
+Merge made by the 'ort' strategy.
+ .../bindings/clock/google,gs101-clock.yaml | 28 +-
+ .../bindings/clock/samsung,exynos850-clock.yaml | 42 +
+ .../devicetree/bindings/clock/tesla,fsd-clock.yaml | 2 +-
+ MAINTAINERS | 1 +
+ arch/arm/boot/dts/samsung/exynos4412-i9300.dts | 2 +-
+ arch/arm/boot/dts/samsung/exynos4412-i9305.dts | 2 +-
+ arch/arm/boot/dts/samsung/exynos4412-n710x.dts | 2 +-
+ arch/arm/boot/dts/samsung/exynos4412-p4note.dtsi | 53 +-
+ .../dts/samsung/exynos5420-galaxy-tab-common.dtsi | 34 +-
+ arch/arm/boot/dts/samsung/exynos5420-peach-pit.dts | 1 +
+ .../dts/samsung/exynos5422-odroidxu3-common.dtsi | 16 +-
+ arch/arm/boot/dts/samsung/exynos5800-peach-pi.dts | 1 +
+ arch/arm/configs/exynos_defconfig | 3 +
+ arch/arm/configs/multi_v7_defconfig | 3 +
+ arch/arm/mach-s3c/cpu.h | 2 +-
+ arch/arm/mach-s3c/s3c6410.c | 2 +-
+ arch/arm/mach-s3c/s3c64xx.c | 2 +-
+ arch/arm/mach-s5pv210/pm.c | 2 +-
+ arch/arm64/boot/dts/exynos/exynos850.dtsi | 64 ++
+ arch/arm64/boot/dts/exynos/google/gs101-oriole.dts | 24 +
+ .../boot/dts/exynos/google/gs101-pinctrl.dtsi | 2 +-
+ arch/arm64/boot/dts/exynos/google/gs101.dtsi | 131 ++-
+ arch/arm64/boot/dts/tesla/fsd.dtsi | 2 +
+ drivers/clk/samsung/clk-cpu.c | 564 +++++++++----
+ drivers/clk/samsung/clk-cpu.h | 53 +-
+ drivers/clk/samsung/clk-exynos3250.c | 2 +-
+ drivers/clk/samsung/clk-exynos4.c | 9 +-
+ drivers/clk/samsung/clk-exynos5250.c | 5 +-
+ drivers/clk/samsung/clk-exynos5420.c | 16 +-
+ drivers/clk/samsung/clk-exynos5433.c | 10 +-
+ drivers/clk/samsung/clk-exynos850.c | 43 +-
+ drivers/clk/samsung/clk-gs101.c | 940 ++++++++++++++++++++-
+ drivers/clk/samsung/clk.h | 5 +-
+ drivers/soc/samsung/Kconfig | 1 +
+ drivers/soc/samsung/exynos-pmu.c | 235 +++++-
+ drivers/soc/samsung/exynos-pmu.h | 1 +
+ drivers/watchdog/Kconfig | 1 -
+ drivers/watchdog/s3c2410_wdt.c | 8 +-
+ include/dt-bindings/clock/exynos850.h | 56 ++
+ include/dt-bindings/clock/google,gs101.h | 129 +++
+ include/linux/soc/samsung/exynos-pmu.h | 11 +-
+ 41 files changed, 2219 insertions(+), 291 deletions(-)
+Merging scmi/for-linux-next (a2b8119375a1 Merge tags 'vexpress-update-6.9', 'ffa-update-6.9' and 'scmi-updates-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next)
+$ git merge -m Merge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git scmi/for-linux-next
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ MAINTAINERS | 1 +
+ arch/arm/boot/dts/arm/vexpress-v2p-ca9.dts | 4 +-
+ drivers/firmware/arm_ffa/bus.c | 2 +-
+ drivers/firmware/arm_scmi/bus.c | 26 +++-
+ drivers/firmware/arm_scmi/clock.c | 194 ++++++++++++++++++++++++-----
+ drivers/firmware/arm_scmi/common.h | 2 +-
+ drivers/firmware/arm_scmi/driver.c | 99 ++++++++++++++-
+ drivers/firmware/arm_scmi/notify.c | 17 ++-
+ drivers/firmware/arm_scmi/notify.h | 4 +
+ drivers/firmware/arm_scmi/optee.c | 6 +-
+ drivers/firmware/arm_scmi/perf.c | 163 +++++++++++++++++++++---
+ drivers/firmware/arm_scmi/power.c | 30 ++++-
+ drivers/firmware/arm_scmi/powercap.c | 45 ++++++-
+ drivers/firmware/arm_scmi/protocols.h | 5 +
+ drivers/firmware/arm_scmi/reset.c | 37 ++++--
+ drivers/firmware/arm_scmi/sensors.c | 37 +++++-
+ drivers/firmware/arm_scmi/smc.c | 7 ++
+ drivers/firmware/arm_scmi/system.c | 16 +++
+ include/linux/arm_ffa.h | 2 +-
+ include/linux/scmi_protocol.h | 21 +++-
+ 20 files changed, 640 insertions(+), 78 deletions(-)
+Merging sophgo/for-next (0f46e1339ef1 MAINTAINERS: Setup proper info for SOPHGO vendor support)
+$ git merge -m Merge branch 'for-next' of https://github.com/sophgo/linux.git sophgo/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ MAINTAINERS | 10 ++++++----
+ arch/riscv/boot/dts/sophgo/sg2042.dtsi | 9 +++++++++
+ 2 files changed, 15 insertions(+), 4 deletions(-)
+Merging stm32/stm32-next (7fd195f01ae5 ARM: dts: stm32: lxa-tac: reduce RGMII interface drive strength)
+$ git merge -m Merge branch 'stm32-next' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next
+Merge made by the 'ort' strategy.
+ arch/arm/boot/dts/st/stm32mp157.dtsi | 2 +-
+ arch/arm/boot/dts/st/stm32mp157a-dk1-scmi.dts | 2 +-
+ arch/arm/boot/dts/st/stm32mp157c-dk2-scmi.dts | 2 +-
+ arch/arm/boot/dts/st/stm32mp157c-ed1-scmi.dts | 2 +-
+ arch/arm/boot/dts/st/stm32mp157c-ev1-scmi.dts | 2 +-
+ arch/arm/boot/dts/st/stm32mp157c-lxa-tac-gen2.dts | 2 +-
+ arch/arm/boot/dts/st/stm32mp15xc-lxa-tac.dtsi | 6 +++++-
+ 7 files changed, 11 insertions(+), 7 deletions(-)
+Merging sunxi/sunxi/for-next (c1d7282e4e92 Merge branch 'sunxi/dt-for-6.9' into sunxi/for-next)
+$ git merge -m Merge branch 'sunxi/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git sunxi/sunxi/for-next
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml
+Merge made by the 'ort' strategy.
+ Documentation/devicetree/bindings/arm/sunxi.yaml | 12 +
+ .../sram/allwinner,sun4i-a10-system-control.yaml | 2 +-
+ .../devicetree/bindings/vendor-prefixes.yaml | 2 +
+ arch/arm/boot/dts/allwinner/sun8i-r40-feta40i.dtsi | 7 +
+ arch/arm64/boot/dts/allwinner/Makefile | 3 +
+ .../boot/dts/allwinner/sun50i-h6-beelink-gs1.dts | 2 +
+ arch/arm64/boot/dts/allwinner/sun50i-h6-tanix.dtsi | 2 +
+ arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 7 +-
+ .../sun50i-h616-bigtreetech-cb1-manta.dts | 2 +-
+ .../dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi | 4 +-
+ .../dts/allwinner/sun50i-h616-bigtreetech-pi.dts | 2 +-
+ arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi | 155 +++++++++
+ .../allwinner/sun50i-h618-longan-module-3h.dtsi | 75 +++++
+ .../boot/dts/allwinner/sun50i-h618-longanpi-3h.dts | 144 +++++++++
+ .../allwinner/sun50i-h618-transpeed-8k618-t.dts | 23 ++
+ .../dts/allwinner/sun50i-h64-remix-mini-pc.dts | 356 +++++++++++++++++++++
+ drivers/bus/sunxi-rsb.c | 4 +-
+ drivers/clk/sunxi/clk-a20-gmac.c | 21 +-
+ drivers/clk/sunxi/clk-sun9i-cpus.c | 7 +-
+ drivers/clk/sunxi/clk-usb.c | 9 +-
+ 20 files changed, 812 insertions(+), 27 deletions(-)
+ create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h618-longan-module-3h.dtsi
+ create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h618-longanpi-3h.dts
+ create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h64-remix-mini-pc.dts
+Merging tee/next (58ea7e692a9e Merge branch 'tee_bus_type_for_v6.9' into next)
+$ git merge -m Merge branch 'next' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee/next
+Merge made by the 'ort' strategy.
+ drivers/tee/tee_core.c | 2 +-
+ include/linux/tee_drv.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+Merging tegra/for-next (c85c30fad06d Merge branch for-6.9/arm64/dt into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra/for-next
+Auto-merging drivers/soc/tegra/fuse/fuse-tegra30.c
+Auto-merging mm/util.c
+Merge made by the 'ort' strategy.
+ Documentation/devicetree/bindings/arm/tegra.yaml | 8 +
+ .../bindings/arm/tegra/nvidia,tegra186-pmc.yaml | 54 +-
+ arch/arm/boot/dts/nvidia/Makefile | 2 +
+ arch/arm/boot/dts/nvidia/tegra124-nyan.dtsi | 1 +
+ arch/arm/boot/dts/nvidia/tegra124-venice2.dts | 1 +
+ .../nvidia/tegra30-asus-nexus7-grouper-common.dtsi | 3 +
+ arch/arm/boot/dts/nvidia/tegra30-lg-p880.dts | 489 +++++
+ arch/arm/boot/dts/nvidia/tegra30-lg-p895.dts | 496 +++++
+ arch/arm/boot/dts/nvidia/tegra30-lg-x3.dtsi | 1812 +++++++++++++++++
+ arch/arm64/boot/dts/nvidia/tegra132-norrin.dts | 1 +
+ arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi | 50 +
+ arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts | 51 +-
+ arch/arm64/boot/dts/nvidia/tegra194-p3668.dtsi | 27 +
+ arch/arm64/boot/dts/nvidia/tegra234-p3701.dtsi | 1953 +-----------------
+ .../dts/nvidia/tegra234-p3737-0000+p3701-0000.dts | 3 +-
+ .../arm64/boot/dts/nvidia/tegra234-p3767-0000.dtsi | 14 -
+ .../arm64/boot/dts/nvidia/tegra234-p3767-0005.dtsi | 14 -
+ arch/arm64/boot/dts/nvidia/tegra234-p3767.dtsi | 86 +
+ .../dts/nvidia/tegra234-p3768-0000+p3767-0000.dts | 7 +-
+ .../dts/nvidia/tegra234-p3768-0000+p3767-0005.dts | 12 +-
+ arch/arm64/boot/dts/nvidia/tegra234-sim-vdk.dts | 1 -
+ arch/arm64/boot/dts/nvidia/tegra234.dtsi | 2144 +++++++++++++++++++-
+ drivers/bus/Kconfig | 5 +-
+ drivers/firmware/tegra/bpmp-debugfs.c | 2 +-
+ drivers/soc/tegra/Kconfig | 5 +
+ drivers/soc/tegra/fuse/fuse-tegra.c | 118 +-
+ drivers/soc/tegra/fuse/fuse-tegra30.c | 20 +
+ drivers/soc/tegra/fuse/fuse.h | 8 +-
+ drivers/soc/tegra/fuse/tegra-apbmisc.c | 110 +-
+ drivers/soc/tegra/pmc.c | 87 +-
+ include/linux/string.h | 1 +
+ include/soc/tegra/fuse.h | 1 +
+ include/soc/tegra/pmc.h | 18 -
+ mm/util.c | 17 +
+ 34 files changed, 5484 insertions(+), 2137 deletions(-)
+ create mode 100644 arch/arm/boot/dts/nvidia/tegra30-lg-p880.dts
+ create mode 100644 arch/arm/boot/dts/nvidia/tegra30-lg-p895.dts
+ create mode 100644 arch/arm/boot/dts/nvidia/tegra30-lg-x3.dtsi
+ delete mode 100644 arch/arm64/boot/dts/nvidia/tegra234-p3767-0000.dtsi
+ delete mode 100644 arch/arm64/boot/dts/nvidia/tegra234-p3767-0005.dtsi
+Merging ti/ti-next (68818060efdb Merge branch 'ti-k3-dts-next' into ti-next)
+$ git merge -m Merge branch 'ti-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git ti/ti-next
+Auto-merging arch/arm/configs/multi_v7_defconfig
+Auto-merging arch/arm64/boot/dts/ti/k3-am65-main.dtsi
+Auto-merging arch/arm64/configs/defconfig
+Merge made by the 'ort' strategy.
+ Documentation/devicetree/bindings/arm/ti/k3.yaml | 14 +
+ arch/arm/boot/dts/ti/keystone/keystone-clocks.dtsi | 2 +-
+ .../boot/dts/ti/keystone/keystone-k2e-clocks.dtsi | 2 +-
+ arch/arm/boot/dts/ti/keystone/keystone-k2e-evm.dts | 2 +-
+ .../boot/dts/ti/keystone/keystone-k2e-netcp.dtsi | 2 +-
+ arch/arm/boot/dts/ti/keystone/keystone-k2e.dtsi | 2 +-
+ arch/arm/boot/dts/ti/keystone/keystone-k2g-evm.dts | 2 +-
+ arch/arm/boot/dts/ti/keystone/keystone-k2g-ice.dts | 2 +-
+ .../boot/dts/ti/keystone/keystone-k2g-netcp.dtsi | 2 +-
+ arch/arm/boot/dts/ti/keystone/keystone-k2g.dtsi | 2 +-
+ .../boot/dts/ti/keystone/keystone-k2hk-clocks.dtsi | 2 +-
+ .../arm/boot/dts/ti/keystone/keystone-k2hk-evm.dts | 2 +-
+ .../boot/dts/ti/keystone/keystone-k2hk-netcp.dtsi | 2 +-
+ arch/arm/boot/dts/ti/keystone/keystone-k2hk.dtsi | 2 +-
+ .../boot/dts/ti/keystone/keystone-k2l-clocks.dtsi | 2 +-
+ arch/arm/boot/dts/ti/keystone/keystone-k2l-evm.dts | 2 +-
+ .../boot/dts/ti/keystone/keystone-k2l-netcp.dtsi | 2 +-
+ arch/arm/boot/dts/ti/keystone/keystone-k2l.dtsi | 2 +-
+ arch/arm/boot/dts/ti/keystone/keystone.dtsi | 2 +-
+ arch/arm64/boot/dts/ti/Makefile | 55 +-
+ arch/arm64/boot/dts/ti/k3-am62-lp-sk.dts | 4 +-
+ arch/arm64/boot/dts/ti/k3-am62-main.dtsi | 30 +-
+ arch/arm64/boot/dts/ti/k3-am62-mcu.dtsi | 4 +-
+ arch/arm64/boot/dts/ti/k3-am62-phycore-som.dtsi | 5 +-
+ arch/arm64/boot/dts/ti/k3-am62-thermal.dtsi | 5 +-
+ arch/arm64/boot/dts/ti/k3-am62-verdin-dahlia.dtsi | 1 -
+ arch/arm64/boot/dts/ti/k3-am62-verdin-dev.dtsi | 1 -
+ arch/arm64/boot/dts/ti/k3-am62-verdin-mallow.dtsi | 10 +
+ arch/arm64/boot/dts/ti/k3-am62-verdin-wifi.dtsi | 1 -
+ arch/arm64/boot/dts/ti/k3-am62-verdin.dtsi | 59 +-
+ arch/arm64/boot/dts/ti/k3-am62-wakeup.dtsi | 38 +-
+ arch/arm64/boot/dts/ti/k3-am62.dtsi | 4 +-
+ .../dts/ti/k3-am625-beagleplay-csi2-ov5640.dtso | 4 +-
+ .../ti/k3-am625-beagleplay-csi2-tevi-ov5640.dtso | 4 +-
+ arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts | 54 +-
+ .../boot/dts/ti/k3-am625-phyboard-lyra-rdk.dts | 6 +-
+ arch/arm64/boot/dts/ti/k3-am625-sk.dts | 4 +-
+ arch/arm64/boot/dts/ti/k3-am625.dtsi | 4 +-
+ arch/arm64/boot/dts/ti/k3-am62a-main.dtsi | 80 +-
+ arch/arm64/boot/dts/ti/k3-am62a-mcu.dtsi | 4 +-
+ arch/arm64/boot/dts/ti/k3-am62a-thermal.dtsi | 5 +-
+ arch/arm64/boot/dts/ti/k3-am62a-wakeup.dtsi | 4 +-
+ arch/arm64/boot/dts/ti/k3-am62a.dtsi | 4 +-
+ arch/arm64/boot/dts/ti/k3-am62a7-sk.dts | 123 ++-
+ arch/arm64/boot/dts/ti/k3-am62a7.dtsi | 4 +-
+ arch/arm64/boot/dts/ti/k3-am62p-main.dtsi | 154 +++-
+ arch/arm64/boot/dts/ti/k3-am62p-mcu.dtsi | 6 +-
+ arch/arm64/boot/dts/ti/k3-am62p-thermal.dtsi | 5 +-
+ arch/arm64/boot/dts/ti/k3-am62p-wakeup.dtsi | 5 +-
+ arch/arm64/boot/dts/ti/k3-am62p.dtsi | 6 +-
+ arch/arm64/boot/dts/ti/k3-am62p5-sk.dts | 11 +-
+ arch/arm64/boot/dts/ti/k3-am62p5.dtsi | 4 +-
+ .../dts/ti/k3-am62x-phyboard-lyra-gpio-fan.dtso | 50 ++
+ arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi | 8 +-
+ .../arm64/boot/dts/ti/k3-am62x-sk-csi2-imx219.dtso | 4 +-
+ .../arm64/boot/dts/ti/k3-am62x-sk-csi2-ov5640.dtso | 4 +-
+ .../boot/dts/ti/k3-am62x-sk-csi2-tevi-ov5640.dtso | 4 +-
+ arch/arm64/boot/dts/ti/k3-am62x-sk-hdmi-audio.dtso | 4 +-
+ arch/arm64/boot/dts/ti/k3-am64-main.dtsi | 69 +-
+ arch/arm64/boot/dts/ti/k3-am64-mcu.dtsi | 4 +-
+ arch/arm64/boot/dts/ti/k3-am64-phycore-som.dtsi | 13 +-
+ arch/arm64/boot/dts/ti/k3-am64-thermal.dtsi | 5 +-
+ arch/arm64/boot/dts/ti/k3-am64.dtsi | 4 +-
+ .../boot/dts/ti/k3-am642-evm-icssg1-dualemac.dtso | 79 ++
+ arch/arm64/boot/dts/ti/k3-am642-evm.dts | 119 ++-
+ .../boot/dts/ti/k3-am642-hummingboard-t-pcie.dtso | 45 ++
+ .../boot/dts/ti/k3-am642-hummingboard-t-usb3.dtso | 44 +
+ arch/arm64/boot/dts/ti/k3-am642-hummingboard-t.dts | 292 +++++++
+ .../boot/dts/ti/k3-am642-phyboard-electra-rdk.dts | 30 +-
+ arch/arm64/boot/dts/ti/k3-am642-sk.dts | 14 +-
+ arch/arm64/boot/dts/ti/k3-am642-sr-som.dtsi | 594 ++++++++++++++
+ .../boot/dts/ti/k3-am642-tqma64xxl-mbax4xxl.dts | 1 -
+ arch/arm64/boot/dts/ti/k3-am642.dtsi | 4 +-
+ .../dts/ti/k3-am65-iot2050-arduino-connector.dtsi | 768 ++++++++++++++++++
+ .../boot/dts/ti/k3-am65-iot2050-common-pg1.dtsi | 7 +-
+ .../boot/dts/ti/k3-am65-iot2050-common-pg2.dtsi | 27 +-
+ arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi | 887 +--------------------
+ arch/arm64/boot/dts/ti/k3-am65-iot2050-dp.dtsi | 98 +++
+ arch/arm64/boot/dts/ti/k3-am65-iot2050-usb3.dtsi | 27 +
+ arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 37 +-
+ arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi | 4 +-
+ arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi | 4 +-
+ arch/arm64/boot/dts/ti/k3-am65.dtsi | 4 +-
+ arch/arm64/boot/dts/ti/k3-am652.dtsi | 4 +-
+ .../dts/ti/k3-am6528-iot2050-basic-common.dtsi | 8 +-
+ .../boot/dts/ti/k3-am6528-iot2050-basic-pg2.dts | 4 +-
+ arch/arm64/boot/dts/ti/k3-am6528-iot2050-basic.dts | 7 +-
+ .../k3-am654-base-board-rocktech-rk101-panel.dtso | 4 +-
+ arch/arm64/boot/dts/ti/k3-am654-base-board.dts | 8 +-
+ arch/arm64/boot/dts/ti/k3-am654-icssg2.dtso | 4 +-
+ arch/arm64/boot/dts/ti/k3-am654-idk.dtso | 4 +-
+ .../boot/dts/ti/k3-am654-industrial-thermal.dtsi | 5 +-
+ arch/arm64/boot/dts/ti/k3-am654-pcie-usb2.dtso | 59 ++
+ arch/arm64/boot/dts/ti/k3-am654-pcie-usb3.dtso | 61 ++
+ arch/arm64/boot/dts/ti/k3-am654.dtsi | 4 +-
+ .../dts/ti/k3-am6548-iot2050-advanced-common.dtsi | 2 +-
+ .../boot/dts/ti/k3-am6548-iot2050-advanced-m2.dts | 22 +-
+ .../boot/dts/ti/k3-am6548-iot2050-advanced-pg2.dts | 12 +-
+ .../boot/dts/ti/k3-am6548-iot2050-advanced-sm.dts | 189 +++++
+ .../boot/dts/ti/k3-am6548-iot2050-advanced.dts | 3 +-
+ arch/arm64/boot/dts/ti/k3-am68-sk-base-board.dts | 54 +-
+ arch/arm64/boot/dts/ti/k3-am68-sk-som.dtsi | 20 +-
+ arch/arm64/boot/dts/ti/k3-am69-sk.dts | 253 +++++-
+ .../boot/dts/ti/k3-j7200-common-proc-board.dts | 109 ++-
+ .../dts/ti/k3-j7200-evm-quad-port-eth-exp.dtso | 4 +-
+ arch/arm64/boot/dts/ti/k3-j7200-main.dtsi | 315 +++++++-
+ arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi | 57 +-
+ arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi | 47 +-
+ arch/arm64/boot/dts/ti/k3-j7200-thermal.dtsi | 5 +-
+ arch/arm64/boot/dts/ti/k3-j7200.dtsi | 4 +-
+ arch/arm64/boot/dts/ti/k3-j721e-beagleboneai64.dts | 26 +-
+ .../boot/dts/ti/k3-j721e-common-proc-board.dts | 4 +-
+ .../boot/dts/ti/k3-j721e-evm-gesi-exp-board.dtso | 4 +-
+ arch/arm64/boot/dts/ti/k3-j721e-evm-pcie0-ep.dtso | 4 +-
+ .../dts/ti/k3-j721e-evm-quad-port-eth-exp.dtso | 4 +-
+ arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 149 +++-
+ arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 8 +-
+ .../boot/dts/ti/k3-j721e-sk-csi2-dual-imx219.dtso | 165 ++++
+ arch/arm64/boot/dts/ti/k3-j721e-sk.dts | 45 +-
+ arch/arm64/boot/dts/ti/k3-j721e-som-p0.dtsi | 22 +-
+ arch/arm64/boot/dts/ti/k3-j721e-thermal.dtsi | 5 +-
+ arch/arm64/boot/dts/ti/k3-j721e.dtsi | 4 +-
+ .../boot/dts/ti/k3-j721s2-common-proc-board.dts | 31 +-
+ .../boot/dts/ti/k3-j721s2-evm-gesi-exp-board.dtso | 4 +-
+ arch/arm64/boot/dts/ti/k3-j721s2-evm-pcie1-ep.dtso | 4 +-
+ arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi | 143 +++-
+ arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi | 6 +-
+ arch/arm64/boot/dts/ti/k3-j721s2-som-p0.dtsi | 20 +-
+ arch/arm64/boot/dts/ti/k3-j721s2-thermal.dtsi | 5 +-
+ arch/arm64/boot/dts/ti/k3-j721s2.dtsi | 4 +-
+ arch/arm64/boot/dts/ti/k3-j722s-evm.dts | 383 +++++++++
+ arch/arm64/boot/dts/ti/k3-j722s.dtsi | 89 +++
+ arch/arm64/boot/dts/ti/k3-j784s4-evm.dts | 32 +-
+ arch/arm64/boot/dts/ti/k3-j784s4-main.dtsi | 215 ++++-
+ arch/arm64/boot/dts/ti/k3-j784s4-mcu-wakeup.dtsi | 6 +-
+ arch/arm64/boot/dts/ti/k3-j784s4-thermal.dtsi | 5 +-
+ arch/arm64/boot/dts/ti/k3-j784s4.dtsi | 6 +-
+ arch/arm64/boot/dts/ti/k3-pinctrl.h | 7 +-
+ arch/arm64/boot/dts/ti/k3-serdes.h | 4 +-
+ arch/arm64/configs/defconfig | 1 +
+ 140 files changed, 5268 insertions(+), 1417 deletions(-)
+ create mode 100644 arch/arm64/boot/dts/ti/k3-am62x-phyboard-lyra-gpio-fan.dtso
+ create mode 100644 arch/arm64/boot/dts/ti/k3-am642-evm-icssg1-dualemac.dtso
+ create mode 100644 arch/arm64/boot/dts/ti/k3-am642-hummingboard-t-pcie.dtso
+ create mode 100644 arch/arm64/boot/dts/ti/k3-am642-hummingboard-t-usb3.dtso
+ create mode 100644 arch/arm64/boot/dts/ti/k3-am642-hummingboard-t.dts
+ create mode 100644 arch/arm64/boot/dts/ti/k3-am642-sr-som.dtsi
+ create mode 100644 arch/arm64/boot/dts/ti/k3-am65-iot2050-arduino-connector.dtsi
+ create mode 100644 arch/arm64/boot/dts/ti/k3-am65-iot2050-dp.dtsi
+ create mode 100644 arch/arm64/boot/dts/ti/k3-am65-iot2050-usb3.dtsi
+ create mode 100644 arch/arm64/boot/dts/ti/k3-am654-pcie-usb2.dtso
+ create mode 100644 arch/arm64/boot/dts/ti/k3-am654-pcie-usb3.dtso
+ create mode 100644 arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-sm.dts
+ create mode 100644 arch/arm64/boot/dts/ti/k3-j721e-sk-csi2-dual-imx219.dtso
+ create mode 100644 arch/arm64/boot/dts/ti/k3-j722s-evm.dts
+ create mode 100644 arch/arm64/boot/dts/ti/k3-j722s.dtsi
+Merging xilinx/for-next (2d81f5ef567c Merge remote-tracking branch 'git/zynqmp/dt' into for-next)
+$ git merge -m Merge branch 'for-next' of git://github.com/Xilinx/linux-xlnx.git xilinx/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ .../firmware/xilinx/xlnx,zynqmp-firmware.yaml | 96 +++++++++++++++++++---
+ .../devicetree/bindings/fpga/xlnx,versal-fpga.yaml | 2 +-
+ .../devicetree/bindings/soc/xilinx/xilinx.yaml | 70 +++++++++++++---
+ MAINTAINERS | 2 +-
+ arch/arm/mach-zynq/slcr.c | 5 +-
+ arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi | 16 +++-
+ .../boot/dts/xilinx/zynqmp-sck-kv-g-revA.dtso | 36 +++++++-
+ .../boot/dts/xilinx/zynqmp-sck-kv-g-revB.dtso | 37 ++++++++-
+ .../boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts | 2 +-
+ .../boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts | 2 +-
+ .../boot/dts/xilinx/zynqmp-zc1751-xm019-dc5.dts | 4 +-
+ arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts | 2 +-
+ arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts | 6 +-
+ arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts | 2 +-
+ arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts | 2 +-
+ arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts | 6 +-
+ arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts | 4 +-
+ arch/arm64/boot/dts/xilinx/zynqmp-zcu1275-revA.dts | 2 +-
+ arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 85 +++++++++++--------
+ 19 files changed, 298 insertions(+), 83 deletions(-)
+Merging clk/clk-next (948d9ddad423 Merge branch 'clk-mobileye' into clk-next)
+$ git merge -m Merge branch 'clk-next' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk/clk-next
+Auto-merging CREDITS
+Auto-merging MAINTAINERS
+Auto-merging include/linux/of.h
+Merge made by the 'ort' strategy.
+ CREDITS | 5 +
+ .../bindings/arm/mediatek/mediatek,hifsys.txt | 26 ---
+ .../bindings/arm/mediatek/mediatek,pciesys.txt | 25 ---
+ .../bindings/arm/mediatek/mediatek,ssusbsys.txt | 25 ---
+ .../bindings/clock/mediatek,mt2701-hifsys.yaml | 50 +++++
+ .../bindings/clock/mediatek,mt7622-pciesys.yaml | 45 ++++
+ .../bindings/clock/mediatek,mt7622-ssusbsys.yaml | 45 ++++
+ .../bindings/clock/mobileye,eyeq5-clk.yaml | 51 +++++
+ .../bindings/reset/mobileye,eyeq5-reset.yaml | 43 ++++
+ MAINTAINERS | 1 -
+ drivers/clk/clk-ast2600.c | 7 +-
+ drivers/clk/clk-cdce925.c | 1 -
+ drivers/clk/clk-devres.c | 40 ++++
+ drivers/clk/clk-fixed-factor.c | 103 +++++++--
+ drivers/clk/hisilicon/clk-hi3519.c | 2 +-
+ drivers/clk/hisilicon/clk-hi3559a.c | 4 +-
+ drivers/clk/keystone/sci-clk.c | 12 +-
+ drivers/clk/mediatek/clk-mt7622-apmixedsys.c | 1 -
+ drivers/clk/mediatek/clk-mt7981-topckgen.c | 5 +-
+ drivers/clk/mediatek/clk-mt7988-infracfg.c | 23 ++
+ drivers/clk/mediatek/clk-mt8135-apmixedsys.c | 4 +-
+ drivers/clk/mediatek/clk-mt8183.c | 2 +-
+ drivers/clk/renesas/Kconfig | 5 +
+ drivers/clk/renesas/Makefile | 1 +
+ drivers/clk/renesas/clk-mstp.c | 16 +-
+ drivers/clk/renesas/r8a779g0-cpg-mssr.c | 2 +-
+ drivers/clk/renesas/r8a779h0-cpg-mssr.c | 249 +++++++++++++++++++++
+ drivers/clk/renesas/r9a07g043-cpg.c | 31 +++
+ drivers/clk/renesas/r9a08g045-cpg.c | 3 +
+ drivers/clk/renesas/rcar-gen4-cpg.c | 10 +-
+ drivers/clk/renesas/renesas-cpg-mssr.c | 117 +++++++++-
+ drivers/clk/renesas/renesas-cpg-mssr.h | 1 +
+ drivers/of/base.c | 123 +++++++---
+ include/dt-bindings/clock/ast2600-clock.h | 1 +
+ include/dt-bindings/clock/mobileye,eyeq5-clk.h | 22 ++
+ include/dt-bindings/reset/mediatek,mt7988-resets.h | 6 +
+ include/linux/clk-provider.h | 26 ++-
+ include/linux/clk.h | 22 ++
+ include/linux/of.h | 11 +
+ 39 files changed, 1000 insertions(+), 166 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,hifsys.txt
+ delete mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,pciesys.txt
+ delete mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,ssusbsys.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/mediatek,mt2701-hifsys.yaml
+ create mode 100644 Documentation/devicetree/bindings/clock/mediatek,mt7622-pciesys.yaml
+ create mode 100644 Documentation/devicetree/bindings/clock/mediatek,mt7622-ssusbsys.yaml
+ create mode 100644 Documentation/devicetree/bindings/clock/mobileye,eyeq5-clk.yaml
+ create mode 100644 Documentation/devicetree/bindings/reset/mobileye,eyeq5-reset.yaml
+ create mode 100644 drivers/clk/renesas/r8a779h0-cpg-mssr.c
+ create mode 100644 include/dt-bindings/clock/mobileye,eyeq5-clk.h
+Merging clk-imx/for-next (13269dc6c704 clk: imx: imx8mp: Fix SAI_MCLK_SEL definition)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk-imx/for-next
+Merge made by the 'ort' strategy.
+ drivers/clk/imx/clk-composite-8m.c | 16 +++++++++-------
+ drivers/clk/imx/clk-imx8mp-audiomix.c | 11 ++++++++---
+ drivers/clk/imx/clk-scu.c | 22 ++++++++++------------
+ 3 files changed, 27 insertions(+), 22 deletions(-)
+Merging clk-renesas/renesas-clk (81a7a88a9806 clk: renesas: r8a779h0: Add RPC-IF clock)
+$ git merge -m Merge branch 'renesas-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git clk-renesas/renesas-clk
+Merge made by the 'ort' strategy.
+ drivers/clk/renesas/r8a779f0-cpg-mssr.c | 2 +-
+ drivers/clk/renesas/r8a779g0-cpg-mssr.c | 11 ++++++-----
+ drivers/clk/renesas/r8a779h0-cpg-mssr.c | 7 +++++++
+ drivers/clk/renesas/r9a07g043-cpg.c | 6 +++---
+ drivers/clk/renesas/r9a07g044-cpg.c | 6 +++---
+ include/dt-bindings/clock/r8a779g0-cpg-mssr.h | 1 +
+ 6 files changed, 21 insertions(+), 12 deletions(-)
+Merging csky/linux-next (2c40c1c6adab Merge tag 'usb-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb)
+$ git merge -m Merge branch 'linux-next' of git://github.com/c-sky/csky-linux.git csky/linux-next
+Already up to date.
+Merging loongarch/loongarch-next (a6be9b65a61e LoongArch: Add kernel livepatching support)
+$ git merge -m Merge branch 'loongarch-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git loongarch/loongarch-next
+Auto-merging arch/loongarch/Makefile
+CONFLICT (content): Merge conflict in arch/loongarch/Makefile
+Auto-merging arch/loongarch/kernel/setup.c
+Auto-merging scripts/Makefile
+Resolved 'arch/loongarch/Makefile' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 06a13ea8226d] Merge branch 'loongarch-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git
+$ git diff -M --stat --summary HEAD^..
+ arch/loongarch/Kconfig | 6 +
+ arch/loongarch/Kconfig.debug | 11 +
+ arch/loongarch/Makefile | 23 +-
+ arch/loongarch/include/asm/Kbuild | 2 +
+ arch/loongarch/include/asm/bug.h | 1 +
+ arch/loongarch/include/asm/exception.h | 2 +
+ arch/loongarch/include/asm/module.h | 7 +
+ arch/loongarch/include/asm/orc_header.h | 18 +
+ arch/loongarch/include/asm/orc_lookup.h | 31 ++
+ arch/loongarch/include/asm/orc_types.h | 58 +++
+ arch/loongarch/include/asm/stackframe.h | 3 +
+ arch/loongarch/include/asm/thread_info.h | 2 +
+ arch/loongarch/include/asm/unwind.h | 20 +-
+ arch/loongarch/include/asm/unwind_hints.h | 28 ++
+ arch/loongarch/kernel/Makefile | 4 +
+ arch/loongarch/kernel/entry.S | 5 +
+ arch/loongarch/kernel/fpu.S | 7 +
+ arch/loongarch/kernel/genex.S | 6 +
+ arch/loongarch/kernel/lbt.S | 3 +
+ arch/loongarch/kernel/mcount_dyn.S | 6 +
+ arch/loongarch/kernel/module.c | 22 +-
+ arch/loongarch/kernel/relocate_kernel.S | 7 +-
+ arch/loongarch/kernel/rethook_trampoline.S | 1 +
+ arch/loongarch/kernel/setup.c | 2 +
+ arch/loongarch/kernel/stacktrace.c | 41 ++
+ arch/loongarch/kernel/traps.c | 42 +-
+ arch/loongarch/kernel/unwind_orc.c | 528 +++++++++++++++++++++
+ arch/loongarch/kernel/vmlinux.lds.S | 3 +
+ arch/loongarch/kvm/switch.S | 9 +-
+ arch/loongarch/lib/clear_user.S | 3 +
+ arch/loongarch/lib/copy_user.S | 3 +
+ arch/loongarch/lib/memcpy.S | 3 +
+ arch/loongarch/lib/memset.S | 3 +
+ arch/loongarch/mm/tlb.c | 27 +-
+ arch/loongarch/mm/tlbex.S | 9 +
+ arch/loongarch/vdso/Makefile | 1 +
+ include/linux/compiler.h | 9 +
+ scripts/Makefile | 7 +-
+ tools/arch/loongarch/include/asm/inst.h | 161 +++++++
+ tools/arch/loongarch/include/asm/orc_types.h | 58 +++
+ tools/include/linux/bitops.h | 11 +
+ tools/objtool/Makefile | 4 +
+ tools/objtool/arch/loongarch/Build | 3 +
+ tools/objtool/arch/loongarch/decode.c | 356 ++++++++++++++
+ .../objtool/arch/loongarch/include/arch/cfi_regs.h | 22 +
+ tools/objtool/arch/loongarch/include/arch/elf.h | 30 ++
+ .../objtool/arch/loongarch/include/arch/special.h | 33 ++
+ tools/objtool/arch/loongarch/orc.c | 171 +++++++
+ tools/objtool/arch/loongarch/special.c | 15 +
+ tools/objtool/arch/x86/Build | 1 +
+ tools/objtool/arch/x86/orc.c | 188 ++++++++
+ tools/objtool/check.c | 52 +-
+ tools/objtool/include/objtool/elf.h | 1 +
+ tools/objtool/include/objtool/orc.h | 14 +
+ tools/objtool/orc_dump.c | 69 +--
+ tools/objtool/orc_gen.c | 113 +----
+ 56 files changed, 2026 insertions(+), 239 deletions(-)
+ create mode 100644 arch/loongarch/include/asm/orc_header.h
+ create mode 100644 arch/loongarch/include/asm/orc_lookup.h
+ create mode 100644 arch/loongarch/include/asm/orc_types.h
+ create mode 100644 arch/loongarch/include/asm/unwind_hints.h
+ create mode 100644 arch/loongarch/kernel/unwind_orc.c
+ create mode 100644 tools/arch/loongarch/include/asm/inst.h
+ create mode 100644 tools/arch/loongarch/include/asm/orc_types.h
+ create mode 100644 tools/objtool/arch/loongarch/Build
+ create mode 100644 tools/objtool/arch/loongarch/decode.c
+ create mode 100644 tools/objtool/arch/loongarch/include/arch/cfi_regs.h
+ create mode 100644 tools/objtool/arch/loongarch/include/arch/elf.h
+ create mode 100644 tools/objtool/arch/loongarch/include/arch/special.h
+ create mode 100644 tools/objtool/arch/loongarch/orc.c
+ create mode 100644 tools/objtool/arch/loongarch/special.c
+ create mode 100644 tools/objtool/arch/x86/orc.c
+ create mode 100644 tools/objtool/include/objtool/orc.h
+Merging m68k/for-next (6b9c045b0602 m68k: defconfig: Update defconfigs for v6.7-rc1)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k/for-next
+Already up to date.
+Merging m68knommu/for-next (b401b621758e Linux 6.8-rc5)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git m68knommu/for-next
+Already up to date.
+Merging microblaze/next (6613476e225e Linux 6.8-rc1)
+$ git merge -m Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze.git microblaze/next
+Already up to date.
+Merging mips/mips-next (188942f05ce4 tty: mips_ejtag_fdc: Fix passing incompatible pointer type warning)
+$ git merge -m Merge branch 'mips-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml
+Auto-merging MAINTAINERS
+Auto-merging arch/mips/Kconfig
+Merge made by the 'ort' strategy.
+ Documentation/devicetree/bindings/mips/cpus.yaml | 15 +-
+ .../devicetree/bindings/mips/mobileye.yaml | 32 ++
+ .../devicetree/bindings/vendor-prefixes.yaml | 2 +
+ MAINTAINERS | 23 ++
+ arch/mips/Kbuild | 1 +
+ arch/mips/Kbuild.platforms | 1 +
+ arch/mips/Kconfig | 138 +++++--
+ arch/mips/Makefile | 46 ++-
+ arch/mips/alchemy/common/clock.c | 2 +-
+ arch/mips/boot/compressed/uart-16550.c | 2 +
+ arch/mips/boot/compressed/uart-alchemy.c | 2 +
+ arch/mips/boot/compressed/uart-prom.c | 2 +
+ arch/mips/boot/dts/Makefile | 1 +
+ arch/mips/boot/dts/mobileye/Makefile | 4 +
+ arch/mips/boot/dts/mobileye/eyeq5-epm5.dts | 23 ++
+ .../mips/boot/dts/mobileye/eyeq5-fixed-clocks.dtsi | 292 ++++++++++++++
+ arch/mips/boot/dts/mobileye/eyeq5.dtsi | 124 ++++++
+ arch/mips/configs/eyeq5_defconfig | 108 ++++++
+ arch/mips/generic/Makefile | 6 +-
+ arch/mips/include/asm/addrspace.h | 5 +
+ arch/mips/include/asm/asmmacro.h | 22 +-
+ arch/mips/include/asm/cdmm.h | 2 +-
+ arch/mips/include/asm/mach-generic/spaces.h | 4 +
+ arch/mips/include/asm/mips-cm.h | 1 +
+ arch/mips/include/asm/mipsmtregs.h | 256 +++++++-----
+ arch/mips/include/asm/mipsregs.h | 271 ++++++++++---
+ arch/mips/include/asm/regdef.h | 91 +++++
+ arch/mips/include/asm/smp-cps.h | 9 +-
+ arch/mips/kernel/cps-vec.S | 54 +--
+ arch/mips/kernel/pm-cps.c | 134 +++----
+ arch/mips/kernel/smp-cps.c | 141 +++++--
+ arch/mips/kernel/traps.c | 13 +-
+ arch/mips/kernel/vpe-mt.c | 4 +-
+ arch/mips/kvm/entry.c | 431 +++++++++------------
+ arch/mips/mm/page.c | 202 +++++-----
+ arch/mips/mm/tlbex.c | 214 +++++-----
+ arch/mips/mobileye/Makefile | 1 +
+ arch/mips/mobileye/Platform | 15 +
+ arch/mips/mobileye/board-epm5.its.S | 24 ++
+ arch/mips/mobileye/vmlinux.its.S | 32 ++
+ arch/mips/pci/fixup-ath79.c | 2 +-
+ arch/mips/pci/fixup-lantiq.c | 9 -
+ arch/mips/pci/ops-tx4927.c | 18 +-
+ arch/mips/sgi-ip22/ip22-gio.c | 4 +-
+ arch/mips/txx9/generic/setup.c | 2 +-
+ drivers/bus/mips_cdmm.c | 2 +-
+ drivers/tc/tc-driver.c | 2 +-
+ drivers/tty/mips_ejtag_fdc.c | 2 +-
+ include/linux/tc.h | 2 +-
+ 49 files changed, 1916 insertions(+), 877 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mips/mobileye.yaml
+ create mode 100644 arch/mips/boot/dts/mobileye/Makefile
+ create mode 100644 arch/mips/boot/dts/mobileye/eyeq5-epm5.dts
+ create mode 100644 arch/mips/boot/dts/mobileye/eyeq5-fixed-clocks.dtsi
+ create mode 100644 arch/mips/boot/dts/mobileye/eyeq5.dtsi
+ create mode 100644 arch/mips/configs/eyeq5_defconfig
+ create mode 100644 arch/mips/mobileye/Makefile
+ create mode 100644 arch/mips/mobileye/Platform
+ create mode 100644 arch/mips/mobileye/board-epm5.its.S
+ create mode 100644 arch/mips/mobileye/vmlinux.its.S
+Merging openrisc/for-next (c289330331eb openrisc: Remove kernel-doc marker from ioremap comment)
+$ git merge -m Merge branch 'for-next' of git://github.com/openrisc/linux.git openrisc/for-next
+Already up to date.
+Merging parisc-hd/for-next (0568b6f0d863 parisc: Strip upper 32 bit of sum in csum_ipv6_magic for 64-bit builds)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git parisc-hd/for-next
+Merge made by the 'ort' strategy.
+ arch/parisc/include/asm/assembly.h | 18 +++++++++--------
+ arch/parisc/include/asm/checksum.h | 10 ++++++----
+ arch/parisc/include/asm/parisc-device.h | 2 +-
+ arch/parisc/kernel/drivers.c | 2 +-
+ arch/parisc/kernel/irq.c | 4 ++--
+ arch/parisc/kernel/unaligned.c | 34 ++++++++++++++++++---------------
+ arch/parisc/math-emu/dfsqrt.c | 4 ++--
+ arch/parisc/math-emu/fcnvff.c | 8 ++++----
+ arch/parisc/math-emu/fcnvfu.c | 16 ++++++++--------
+ arch/parisc/math-emu/fcnvfut.c | 16 ++++++++--------
+ arch/parisc/math-emu/fcnvfx.c | 16 ++++++++--------
+ arch/parisc/math-emu/fcnvfxt.c | 16 ++++++++--------
+ arch/parisc/math-emu/fcnvuf.c | 16 ++++++++--------
+ arch/parisc/math-emu/fcnvxf.c | 16 ++++++++--------
+ arch/parisc/math-emu/frnd.c | 8 ++++----
+ arch/parisc/math-emu/sfsqrt.c | 4 ++--
+ 16 files changed, 99 insertions(+), 91 deletions(-)
+Merging powerpc/next (a3e1820186b5 powerpc: pmi: Convert to platform remove callback returning void)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next
+Auto-merging arch/powerpc/include/asm/reg.h
+Auto-merging arch/powerpc/kernel/setup-common.c
+Auto-merging arch/powerpc/kvm/book3s_hv.c
+Merge made by the 'ort' strategy.
+ arch/powerpc/configs/ps3_defconfig | 1 -
+ arch/powerpc/include/asm/cputable.h | 14 +-
+ arch/powerpc/include/asm/ibmebus.h | 2 +-
+ arch/powerpc/include/asm/macio.h | 2 +-
+ arch/powerpc/include/asm/mmu.h | 1 +
+ arch/powerpc/include/asm/mpic.h | 2 +-
+ arch/powerpc/include/asm/paca.h | 4 -
+ arch/powerpc/include/asm/ppc_asm.h | 6 +-
+ arch/powerpc/include/asm/reg.h | 2 +
+ arch/powerpc/include/asm/smp.h | 1 +
+ arch/powerpc/include/asm/vio.h | 2 +-
+ arch/powerpc/include/asm/vmalloc.h | 4 +-
+ arch/powerpc/kernel/Makefile | 1 -
+ arch/powerpc/kernel/asm-offsets.c | 2 -
+ arch/powerpc/kernel/cpu_specs_book3s_64.h | 34 ++++
+ arch/powerpc/kernel/dt_cpu_ftrs.c | 10 +
+ arch/powerpc/kernel/prom.c | 32 +++-
+ arch/powerpc/kernel/prom_init.c | 10 +-
+ arch/powerpc/kernel/setup-common.c | 58 ++++--
+ arch/powerpc/kvm/book3s_hv.c | 1 +
+ arch/powerpc/perf/core-book3s.c | 2 +
+ arch/powerpc/perf/internal.h | 1 +
+ arch/powerpc/perf/power10-pmu.c | 27 +++
+ arch/powerpc/platforms/85xx/sgy_cts1000.c | 6 +-
+ arch/powerpc/platforms/pasemi/gpio_mdio.c | 6 +-
+ arch/powerpc/platforms/powermac/feature.c | 2 -
+ arch/powerpc/platforms/powernv/opal-prd.c | 5 +-
+ arch/powerpc/platforms/ps3/hvcall.S | 298 +++++++++++++++++-------------
+ arch/powerpc/platforms/pseries/ibmebus.c | 4 +-
+ arch/powerpc/platforms/pseries/papr_scm.c | 6 +-
+ arch/powerpc/platforms/pseries/vio.c | 61 +++---
+ arch/powerpc/sysdev/fsl_msi.c | 6 +-
+ arch/powerpc/sysdev/mpic.c | 2 +-
+ arch/powerpc/sysdev/pmi.c | 6 +-
+ arch/powerpc/xmon/xmon.c | 2 -
+ drivers/macintosh/macio_asic.c | 2 +-
+ drivers/macintosh/therm_windtunnel.c | 6 +-
+ drivers/macintosh/windfarm_pm112.c | 6 +-
+ drivers/macintosh/windfarm_pm121.c | 5 +-
+ drivers/macintosh/windfarm_pm72.c | 7 +-
+ drivers/macintosh/windfarm_pm81.c | 8 +-
+ drivers/macintosh/windfarm_pm91.c | 8 +-
+ drivers/macintosh/windfarm_rm31.c | 7 +-
+ include/uapi/linux/auxvec.h | 2 +
+ 44 files changed, 411 insertions(+), 263 deletions(-)
+Merging soc-fsl/next (fb9c384625dd bus: fsl-mc: fsl-mc-allocator: Drop a write-only variable)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl/next
+Already up to date.
+Merging risc-v/for-next (45e0b0fd6dc5 riscv: defconfig: Enable mmc and dma drivers for T-Head TH1520)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v/for-next
+Auto-merging MAINTAINERS
+Auto-merging arch/riscv/Kconfig
+Auto-merging arch/riscv/include/asm/bitops.h
+CONFLICT (content): Merge conflict in arch/riscv/include/asm/bitops.h
+Auto-merging arch/riscv/include/asm/pgtable.h
+Auto-merging arch/riscv/include/asm/tlb.h
+Auto-merging arch/riscv/mm/init.c
+Auto-merging include/linux/mm.h
+Auto-merging init/Kconfig
+Auto-merging kernel/sched/membarrier.c
+Auto-merging mm/mmap.c
+Resolved 'arch/riscv/include/asm/bitops.h' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master ee975be3ddfb] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git
+$ git diff -M --stat --summary HEAD^..
+ .../sched/membarrier-sync-core/arch-support.txt | 18 +-
+ Documentation/scheduler/index.rst | 1 +
+ Documentation/scheduler/membarrier.rst | 39 ++
+ MAINTAINERS | 4 +-
+ arch/riscv/Kbuild | 1 +
+ arch/riscv/Kconfig | 22 +-
+ arch/riscv/Makefile | 5 +
+ arch/riscv/configs/defconfig | 2 +
+ arch/riscv/crypto/Kconfig | 93 ++++
+ arch/riscv/crypto/Makefile | 23 +
+ arch/riscv/crypto/aes-macros.S | 156 ++++++
+ arch/riscv/crypto/aes-riscv64-glue.c | 550 +++++++++++++++++++++
+ arch/riscv/crypto/aes-riscv64-zvkned-zvbb-zvkg.S | 312 ++++++++++++
+ arch/riscv/crypto/aes-riscv64-zvkned-zvkb.S | 146 ++++++
+ arch/riscv/crypto/aes-riscv64-zvkned.S | 180 +++++++
+ arch/riscv/crypto/chacha-riscv64-glue.c | 101 ++++
+ arch/riscv/crypto/chacha-riscv64-zvkb.S | 294 +++++++++++
+ arch/riscv/crypto/ghash-riscv64-glue.c | 168 +++++++
+ arch/riscv/crypto/ghash-riscv64-zvkg.S | 72 +++
+ arch/riscv/crypto/sha256-riscv64-glue.c | 137 +++++
+ .../crypto/sha256-riscv64-zvknha_or_zvknhb-zvkb.S | 225 +++++++++
+ arch/riscv/crypto/sha512-riscv64-glue.c | 133 +++++
+ arch/riscv/crypto/sha512-riscv64-zvknhb-zvkb.S | 203 ++++++++
+ arch/riscv/crypto/sm3-riscv64-glue.c | 112 +++++
+ arch/riscv/crypto/sm3-riscv64-zvksh-zvkb.S | 123 +++++
+ arch/riscv/crypto/sm4-riscv64-glue.c | 107 ++++
+ arch/riscv/crypto/sm4-riscv64-zvksed-zvkb.S | 117 +++++
+ arch/riscv/include/asm/asm.h | 10 +
+ arch/riscv/include/asm/bitops.h | 138 +-----
+ arch/riscv/include/asm/membarrier.h | 50 ++
+ arch/riscv/include/asm/pgalloc.h | 67 ++-
+ arch/riscv/include/asm/pgtable.h | 6 +
+ arch/riscv/include/asm/sync_core.h | 29 ++
+ arch/riscv/include/asm/tlb.h | 18 +
+ arch/riscv/include/asm/vector.h | 11 +
+ arch/riscv/kernel/entry.S | 3 +
+ arch/riscv/kernel/pi/Makefile | 3 +
+ arch/riscv/kernel/smpboot.c | 1 -
+ arch/riscv/kernel/traps.c | 17 +-
+ arch/riscv/lib/uaccess_vector.S | 1 -
+ arch/riscv/mm/context.c | 2 +
+ arch/riscv/mm/init.c | 6 +
+ crypto/Kconfig | 3 +
+ drivers/clocksource/timer-clint.c | 2 +-
+ drivers/clocksource/timer-riscv.c | 2 +-
+ include/asm-generic/bitops/__ffs.h | 8 +-
+ include/asm-generic/bitops/__fls.h | 8 +-
+ include/asm-generic/bitops/ffs.h | 8 +-
+ include/asm-generic/bitops/fls.h | 8 +-
+ include/linux/mm.h | 2 +-
+ include/linux/sync_core.h | 16 +-
+ init/Kconfig | 3 +
+ kernel/sched/core.c | 16 +-
+ kernel/sched/membarrier.c | 13 +-
+ mm/mmap.c | 2 +-
+ 55 files changed, 3632 insertions(+), 165 deletions(-)
+ create mode 100644 Documentation/scheduler/membarrier.rst
+ create mode 100644 arch/riscv/crypto/Kconfig
+ create mode 100644 arch/riscv/crypto/Makefile
+ create mode 100644 arch/riscv/crypto/aes-macros.S
+ create mode 100644 arch/riscv/crypto/aes-riscv64-glue.c
+ create mode 100644 arch/riscv/crypto/aes-riscv64-zvkned-zvbb-zvkg.S
+ create mode 100644 arch/riscv/crypto/aes-riscv64-zvkned-zvkb.S
+ create mode 100644 arch/riscv/crypto/aes-riscv64-zvkned.S
+ create mode 100644 arch/riscv/crypto/chacha-riscv64-glue.c
+ create mode 100644 arch/riscv/crypto/chacha-riscv64-zvkb.S
+ create mode 100644 arch/riscv/crypto/ghash-riscv64-glue.c
+ create mode 100644 arch/riscv/crypto/ghash-riscv64-zvkg.S
+ create mode 100644 arch/riscv/crypto/sha256-riscv64-glue.c
+ create mode 100644 arch/riscv/crypto/sha256-riscv64-zvknha_or_zvknhb-zvkb.S
+ create mode 100644 arch/riscv/crypto/sha512-riscv64-glue.c
+ create mode 100644 arch/riscv/crypto/sha512-riscv64-zvknhb-zvkb.S
+ create mode 100644 arch/riscv/crypto/sm3-riscv64-glue.c
+ create mode 100644 arch/riscv/crypto/sm3-riscv64-zvksh-zvkb.S
+ create mode 100644 arch/riscv/crypto/sm4-riscv64-glue.c
+ create mode 100644 arch/riscv/crypto/sm4-riscv64-zvksed-zvkb.S
+ create mode 100644 arch/riscv/include/asm/membarrier.h
+ create mode 100644 arch/riscv/include/asm/sync_core.h
+Merging riscv-dt/riscv-dt-for-next (d0653996b7ea dt-bindings: pwm: opencores: Add compatible for StarFive JH8100)
+$ git merge -m Merge branch 'riscv-dt-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt/riscv-dt-for-next
+Auto-merging arch/riscv/boot/dts/starfive/jh7100.dtsi
+Auto-merging arch/riscv/boot/dts/starfive/jh7110.dtsi
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/pwm/opencores,pwm.yaml | 56 +++++++++++
+ Documentation/devicetree/bindings/riscv/cpus.yaml | 4 +
+ arch/riscv/boot/dts/microchip/mpfs.dtsi | 6 +-
+ .../boot/dts/starfive/jh7100-beaglev-starlight.dts | 11 +++
+ arch/riscv/boot/dts/starfive/jh7100-common.dtsi | 108 +++++++++++++++++++++
+ .../dts/starfive/jh7100-starfive-visionfive-v1.dts | 22 ++++-
+ arch/riscv/boot/dts/starfive/jh7100.dtsi | 45 +++++++++
+ .../dts/starfive/jh7110-starfive-visionfive-2.dtsi | 22 +++++
+ arch/riscv/boot/dts/starfive/jh7110.dtsi | 9 ++
+ 9 files changed, 279 insertions(+), 4 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/pwm/opencores,pwm.yaml
+Merging riscv-soc/riscv-soc-for-next (6613476e225e Linux 6.8-rc1)
+$ git merge -m Merge branch 'riscv-soc-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc/riscv-soc-for-next
+Already up to date.
+Merging s390/for-next (6a42aaf8e867 Merge branch 'features' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390/for-next
+Auto-merging arch/s390/Kconfig
+Auto-merging arch/s390/kernel/machine_kexec.c
+Auto-merging arch/s390/kvm/vsie.c
+Auto-merging include/linux/compiler_attributes.h
+Merge made by the 'ort' strategy.
+ arch/s390/Kconfig | 18 +-
+ arch/s390/Makefile | 10 +-
+ arch/s390/boot/.gitignore | 1 +
+ arch/s390/boot/Makefile | 25 +-
+ arch/s390/boot/boot.h | 6 +
+ arch/s390/boot/startup.c | 75 +++-
+ arch/s390/boot/vmlinux.lds.S | 48 ++
+ arch/s390/crypto/chacha-glue.c | 4 +-
+ arch/s390/crypto/chacha-s390.S | 2 +-
+ arch/s390/crypto/crc32-vx.c | 11 +-
+ arch/s390/crypto/crc32-vx.h | 12 +
+ arch/s390/crypto/{crc32be-vx.S => crc32be-vx.c} | 171 +++-----
+ arch/s390/crypto/{crc32le-vx.S => crc32le-vx.c} | 239 +++++-----
+ arch/s390/hypfs/hypfs_diag0c.c | 3 +-
+ arch/s390/hypfs/hypfs_sprp.c | 4 +-
+ arch/s390/include/asm/access-regs.h | 38 ++
+ arch/s390/include/asm/appldata.h | 4 +-
+ arch/s390/include/asm/asm-prototypes.h | 2 +-
+ arch/s390/include/asm/bug.h | 4 +-
+ arch/s390/include/asm/checksum.h | 29 +-
+ arch/s390/include/asm/diag.h | 15 +-
+ arch/s390/include/asm/entry-common.h | 5 +-
+ .../include/asm/{vx-insn-asm.h => fpu-insn-asm.h} | 71 ++-
+ arch/s390/include/asm/fpu-insn.h | 486 +++++++++++++++++++++
+ arch/s390/include/asm/fpu-types.h | 51 +++
+ arch/s390/include/asm/fpu.h | 295 +++++++++++++
+ arch/s390/include/asm/fpu/api.h | 126 ------
+ arch/s390/include/asm/fpu/internal.h | 67 ---
+ arch/s390/include/asm/fpu/types.h | 38 --
+ arch/s390/include/asm/kvm_host.h | 5 +-
+ arch/s390/include/asm/lowcore.h | 2 +-
+ arch/s390/include/asm/pai.h | 3 +-
+ arch/s390/include/asm/pci.h | 3 +-
+ arch/s390/include/asm/physmem_info.h | 1 +
+ arch/s390/include/asm/processor.h | 11 +-
+ arch/s390/include/asm/ptrace.h | 4 +
+ arch/s390/include/asm/stacktrace.h | 1 -
+ arch/s390/include/asm/switch_to.h | 49 ---
+ arch/s390/include/asm/vx-insn.h | 19 -
+ arch/s390/kernel/compat_signal.c | 22 +-
+ arch/s390/kernel/crash_dump.c | 2 +-
+ arch/s390/kernel/diag.c | 31 +-
+ arch/s390/kernel/early.c | 3 +-
+ arch/s390/kernel/entry.S | 19 +-
+ arch/s390/kernel/entry.h | 1 +
+ arch/s390/kernel/fpu.c | 380 +++++++---------
+ arch/s390/kernel/ipl.c | 3 +-
+ arch/s390/kernel/machine_kexec.c | 3 +-
+ arch/s390/kernel/nmi.c | 168 ++-----
+ arch/s390/kernel/os_info.c | 6 +-
+ arch/s390/kernel/perf_pai_crypto.c | 79 ++--
+ arch/s390/kernel/perf_pai_ext.c | 47 +-
+ arch/s390/kernel/perf_regs.c | 10 +-
+ arch/s390/kernel/process.c | 31 +-
+ arch/s390/kernel/ptrace.c | 101 ++---
+ arch/s390/kernel/setup.c | 12 +-
+ arch/s390/kernel/signal.c | 20 +-
+ arch/s390/kernel/smp.c | 3 +-
+ arch/s390/kernel/sysinfo.c | 27 +-
+ arch/s390/kernel/text_amode31.S | 2 +-
+ arch/s390/kernel/time.c | 6 +-
+ arch/s390/kernel/traps.c | 12 +-
+ arch/s390/kernel/uprobes.c | 1 -
+ arch/s390/kernel/vdso32/Makefile | 2 +-
+ arch/s390/kernel/vdso32/vdso32.lds.S | 1 -
+ arch/s390/kernel/vdso64/Makefile | 3 +-
+ arch/s390/kernel/vdso64/vdso64.lds.S | 1 -
+ arch/s390/kernel/vmlinux.lds.S | 54 +++
+ arch/s390/kvm/gaccess.c | 5 +-
+ arch/s390/kvm/interrupt.c | 6 +-
+ arch/s390/kvm/kvm-s390.c | 33 +-
+ arch/s390/kvm/kvm-s390.h | 18 +
+ arch/s390/kvm/vsie.c | 3 -
+ arch/s390/lib/Makefile | 1 +
+ arch/s390/lib/csum-partial.c | 91 ++++
+ arch/s390/mm/extmem.c | 4 +-
+ arch/s390/mm/mmap.c | 19 +-
+ arch/s390/pci/pci.c | 20 +-
+ arch/s390/pci/pci_debug.c | 10 +-
+ arch/s390/pci/pci_event.c | 15 +-
+ arch/s390/pci/pci_sysfs.c | 70 +--
+ arch/s390/tools/.gitignore | 1 +
+ arch/s390/tools/Makefile | 5 +
+ arch/s390/tools/relocs.c | 385 ++++++++++++++++
+ drivers/pci/hotplug/s390_pci_hpc.c | 65 ++-
+ drivers/s390/char/vmur.c | 4 +-
+ drivers/s390/char/zcore.c | 1 -
+ drivers/s390/cio/ccwgroup.c | 4 +-
+ drivers/s390/cio/chsc.c | 4 +-
+ drivers/s390/cio/chsc_sch.c | 20 +-
+ drivers/s390/cio/cmf.c | 6 +-
+ drivers/s390/cio/css.c | 4 +-
+ drivers/s390/cio/device.c | 4 +-
+ drivers/s390/cio/scm.c | 4 +-
+ drivers/s390/crypto/ap_bus.c | 45 +-
+ drivers/s390/crypto/ap_debug.h | 4 +-
+ drivers/s390/crypto/ap_queue.c | 31 +-
+ drivers/s390/crypto/pkey_api.c | 187 ++++----
+ drivers/s390/crypto/vfio_ap_drv.c | 2 +-
+ drivers/s390/crypto/zcrypt_api.c | 60 ++-
+ drivers/s390/crypto/zcrypt_ccamisc.c | 214 ++++-----
+ drivers/s390/crypto/zcrypt_debug.h | 4 +-
+ drivers/s390/crypto/zcrypt_ep11misc.c | 127 +++---
+ drivers/s390/crypto/zcrypt_msgtype50.c | 14 +-
+ drivers/s390/crypto/zcrypt_msgtype6.c | 45 +-
+ include/linux/compiler_attributes.h | 12 +
+ lib/raid6/s390vx.uc | 62 +--
+ tools/testing/selftests/kvm/s390x/memop.c | 31 ++
+ 108 files changed, 2919 insertions(+), 1729 deletions(-)
+ create mode 100644 arch/s390/crypto/crc32-vx.h
+ rename arch/s390/crypto/{crc32be-vx.S => crc32be-vx.c} (56%)
+ rename arch/s390/crypto/{crc32le-vx.S => crc32le-vx.c} (52%)
+ create mode 100644 arch/s390/include/asm/access-regs.h
+ rename arch/s390/include/asm/{vx-insn-asm.h => fpu-insn-asm.h} (86%)
+ create mode 100644 arch/s390/include/asm/fpu-insn.h
+ create mode 100644 arch/s390/include/asm/fpu-types.h
+ create mode 100644 arch/s390/include/asm/fpu.h
+ delete mode 100644 arch/s390/include/asm/fpu/api.h
+ delete mode 100644 arch/s390/include/asm/fpu/internal.h
+ delete mode 100644 arch/s390/include/asm/fpu/types.h
+ delete mode 100644 arch/s390/include/asm/switch_to.h
+ delete mode 100644 arch/s390/include/asm/vx-insn.h
+ create mode 100644 arch/s390/lib/csum-partial.c
+ create mode 100644 arch/s390/tools/relocs.c
+Merging sh/for-next (0a2d3ce0031f sh: hd64461: Make setup_hd64461 static)
+$ git merge -m Merge branch 'for-next' of git:git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux.git sh/for-next
+Merge made by the 'ort' strategy.
+ arch/sh/cchips/hd6446x/hd64461.c | 2 +-
+ arch/sh/drivers/dma/dma-sysfs.c | 2 +-
+ drivers/sh/intc/core.c | 2 +-
+ drivers/sh/intc/internals.h | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+Merging uml/next (83aec96c631e um: Mark 32bit syscall helpers as clobbering memory)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml/next
+Already up to date.
+Merging xtensa/xtensa-for-next (7ab7acb68adf xtensa: fix MAKE_PC_FROM_RA second argument)
+$ git merge -m Merge branch 'xtensa-for-next' of git://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next
+Merge made by the 'ort' strategy.
+ arch/xtensa/include/asm/processor.h | 8 ++++----
+ arch/xtensa/include/asm/ptrace.h | 2 +-
+ arch/xtensa/kernel/process.c | 5 +++--
+ arch/xtensa/kernel/stacktrace.c | 3 ++-
+ 4 files changed, 10 insertions(+), 8 deletions(-)
+Merging bcachefs/for-next (bf85b528ab11 bcachefs: split out ignore_blacklisted, ignore_not_dirty)
+$ git merge -m Merge branch 'for-next' of https://evilpiepirate.org/git/bcachefs.git bcachefs/for-next
+Auto-merging MAINTAINERS
+Auto-merging drivers/md/bcache/sysfs.c
+Auto-merging include/linux/sched.h
+Auto-merging include/linux/sched/mm.h
+Auto-merging lib/Kconfig.debug
+Auto-merging lib/sort.c
+Merge made by the 'ort' strategy.
+ Documentation/filesystems/bcachefs/errorcodes.rst | 30 +
+ MAINTAINERS | 39 +
+ drivers/md/bcache/Kconfig | 1 +
+ drivers/md/bcache/bcache.h | 1 +
+ drivers/md/bcache/bset.c | 6 +-
+ drivers/md/bcache/bset.h | 1 +
+ drivers/md/bcache/btree.c | 6 +-
+ drivers/md/bcache/super.c | 7 +
+ drivers/md/bcache/sysfs.c | 25 +-
+ drivers/md/bcache/util.c | 30 -
+ drivers/md/bcache/util.h | 52 +-
+ fs/bcachefs/Kconfig | 11 +-
+ fs/bcachefs/Makefile | 6 +-
+ fs/bcachefs/alloc_background.c | 157 +++-
+ fs/bcachefs/alloc_background.h | 1 +
+ fs/bcachefs/alloc_foreground.c | 13 +-
+ fs/bcachefs/backpointers.c | 140 ++--
+ fs/bcachefs/bbpos_types.h | 2 +-
+ fs/bcachefs/bcachefs.h | 29 +-
+ fs/bcachefs/bcachefs_format.h | 53 +-
+ fs/bcachefs/bset.c | 2 +-
+ fs/bcachefs/btree_cache.c | 39 +-
+ fs/bcachefs/btree_gc.c | 23 +-
+ fs/bcachefs/btree_io.c | 19 +-
+ fs/bcachefs/btree_iter.c | 24 +-
+ fs/bcachefs/btree_journal_iter.c | 180 +++--
+ fs/bcachefs/btree_journal_iter.h | 14 +-
+ fs/bcachefs/btree_locking.c | 3 +-
+ fs/bcachefs/btree_locking.h | 2 +-
+ fs/bcachefs/btree_types.h | 11 +-
+ fs/bcachefs/btree_update.c | 23 +
+ fs/bcachefs/btree_update.h | 3 +-
+ fs/bcachefs/btree_update_interior.c | 13 +-
+ fs/bcachefs/btree_write_buffer.c | 4 +-
+ fs/bcachefs/btree_write_buffer_types.h | 2 +-
+ fs/bcachefs/buckets.c | 32 +-
+ fs/bcachefs/chardev.c | 57 +-
+ fs/bcachefs/checksum.c | 2 +-
+ fs/bcachefs/compress.c | 14 +-
+ fs/bcachefs/debug.c | 6 +-
+ fs/bcachefs/dirent.c | 145 ++--
+ fs/bcachefs/dirent.h | 6 +-
+ fs/bcachefs/ec.c | 4 +-
+ fs/bcachefs/errcode.c | 15 +-
+ fs/bcachefs/errcode.h | 11 +-
+ fs/bcachefs/error.c | 14 +-
+ fs/bcachefs/error.h | 2 +-
+ fs/bcachefs/fifo.h | 4 +-
+ fs/bcachefs/fs-common.c | 74 +-
+ fs/bcachefs/fs.c | 224 ++++--
+ fs/bcachefs/fsck.c | 865 ++++++++++++++-------
+ fs/bcachefs/fsck.h | 1 +
+ fs/bcachefs/inode.c | 50 +-
+ fs/bcachefs/inode.h | 19 +
+ fs/bcachefs/io_read.c | 4 +-
+ fs/bcachefs/io_write.c | 20 +-
+ fs/bcachefs/journal.c | 310 +++++---
+ fs/bcachefs/journal.h | 7 +-
+ fs/bcachefs/journal_io.c | 408 +++++-----
+ fs/bcachefs/journal_io.h | 47 +-
+ fs/bcachefs/journal_reclaim.c | 29 +-
+ fs/bcachefs/journal_sb.c | 2 +-
+ fs/bcachefs/journal_seq_blacklist.c | 6 +-
+ fs/bcachefs/journal_types.h | 36 +-
+ fs/bcachefs/lru.c | 4 +-
+ fs/bcachefs/migrate.c | 8 +-
+ fs/bcachefs/nocow_locking.c | 2 +-
+ fs/bcachefs/opts.h | 5 +
+ fs/bcachefs/rebalance.c | 4 +-
+ fs/bcachefs/recovery.c | 24 +-
+ fs/bcachefs/recovery_types.h | 2 +
+ fs/bcachefs/replicas.c | 19 +-
+ fs/bcachefs/replicas.h | 3 +-
+ fs/bcachefs/sb-clean.c | 16 -
+ fs/bcachefs/sb-downgrade.c | 11 +-
+ fs/bcachefs/sb-errors_types.h | 20 +-
+ fs/bcachefs/sb-members.h | 2 +-
+ fs/bcachefs/str_hash.h | 15 +-
+ fs/bcachefs/subvolume.c | 187 ++++-
+ fs/bcachefs/subvolume.h | 9 +-
+ fs/bcachefs/subvolume_format.h | 4 +-
+ fs/bcachefs/subvolume_types.h | 2 +-
+ fs/bcachefs/super-io.c | 14 +-
+ fs/bcachefs/super-io.h | 2 +-
+ fs/bcachefs/super.c | 66 +-
+ fs/bcachefs/sysfs.c | 4 +-
+ fs/bcachefs/thread_with_file.c | 299 -------
+ fs/bcachefs/thread_with_file.h | 41 -
+ fs/bcachefs/thread_with_file_types.h | 16 -
+ fs/bcachefs/trace.h | 19 +
+ fs/bcachefs/util.c | 370 +--------
+ fs/bcachefs/util.h | 159 +---
+ {fs/bcachefs => include/linux}/darray.h | 61 +-
+ include/linux/darray_types.h | 22 +
+ {fs/bcachefs => include/linux}/eytzinger.h | 58 +-
+ {fs/bcachefs => include/linux}/mean_and_variance.h | 14 +-
+ include/linux/mempool.h | 13 +
+ include/linux/sched.h | 4 +-
+ include/linux/sched/mm.h | 60 +-
+ include/linux/thread_with_file.h | 79 ++
+ include/linux/thread_with_file_types.h | 25 +
+ include/linux/time_stats.h | 167 ++++
+ kernel/hung_task.c | 1 +
+ lib/Kconfig | 7 +
+ lib/Kconfig.debug | 9 +
+ lib/Makefile | 5 +-
+ {fs/bcachefs => lib}/darray.c | 12 +-
+ lib/math/Kconfig | 3 +
+ lib/math/Makefile | 2 +
+ {fs/bcachefs => lib/math}/mean_and_variance.c | 31 +-
+ {fs/bcachefs => lib/math}/mean_and_variance_test.c | 83 +-
+ lib/sort.c | 89 +++
+ lib/thread_with_file.c | 454 +++++++++++
+ lib/time_stats.c | 373 +++++++++
+ mm/mempool.c | 13 +
+ 115 files changed, 3915 insertions(+), 2383 deletions(-)
+ create mode 100644 Documentation/filesystems/bcachefs/errorcodes.rst
+ delete mode 100644 fs/bcachefs/thread_with_file.c
+ delete mode 100644 fs/bcachefs/thread_with_file.h
+ delete mode 100644 fs/bcachefs/thread_with_file_types.h
+ rename {fs/bcachefs => include/linux}/darray.h (66%)
+ create mode 100644 include/linux/darray_types.h
+ rename {fs/bcachefs => include/linux}/eytzinger.h (77%)
+ rename {fs/bcachefs => include/linux}/mean_and_variance.h (96%)
+ create mode 100644 include/linux/thread_with_file.h
+ create mode 100644 include/linux/thread_with_file_types.h
+ create mode 100644 include/linux/time_stats.h
+ rename {fs/bcachefs => lib}/darray.c (56%)
+ rename {fs/bcachefs => lib/math}/mean_and_variance.c (90%)
+ rename {fs/bcachefs => lib/math}/mean_and_variance_test.c (78%)
+ create mode 100644 lib/thread_with_file.c
+ create mode 100644 lib/time_stats.c
+Merging pidfd/for-next (a901a3568fd2 Merge tag 'iomap-6.5-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git pidfd/for-next
+Already up to date.
+Merging fscrypt/for-next (8c62f31eddb7 fscrypt: shrink the size of struct fscrypt_inode_info slightly)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/fscrypt/linux.git fscrypt/for-next
+Merge made by the 'ort' strategy.
+ Documentation/filesystems/fscrypt.rst | 27 +++++++++++++++------------
+ fs/crypto/fscrypt_private.h | 14 ++++++++------
+ fs/crypto/keyring.c | 8 ++++++--
+ fs/crypto/keysetup.c | 11 +++++++----
+ 4 files changed, 36 insertions(+), 24 deletions(-)
+Merging afs/afs-next (abcbd3bfbbfe afs: trace: Log afs_make_call(), including server address)
+$ git merge -m Merge branch 'afs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git afs/afs-next
+Already up to date.
+Merging btrfs/for-next (2653677ec901 Merge branch 'for-next-next-v6.8-20240222' into for-next-20240222)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next
+Auto-merging fs/btrfs/volumes.c
+Merge made by the 'ort' strategy.
+ fs/btrfs/Kconfig | 1 +
+ fs/btrfs/accessors.c | 15 +-
+ fs/btrfs/accessors.h | 50 ++----
+ fs/btrfs/acl.c | 1 -
+ fs/btrfs/acl.h | 11 ++
+ fs/btrfs/async-thread.c | 1 -
+ fs/btrfs/async-thread.h | 3 +
+ fs/btrfs/backref.c | 114 +++++++++++-
+ fs/btrfs/backref.h | 136 +++-----------
+ fs/btrfs/bio.c | 17 +-
+ fs/btrfs/bio.h | 2 +
+ fs/btrfs/block-group.c | 39 ++--
+ fs/btrfs/block-group.h | 14 ++
+ fs/btrfs/block-rsv.c | 1 -
+ fs/btrfs/block-rsv.h | 7 +
+ fs/btrfs/btrfs_inode.h | 25 ++-
+ fs/btrfs/compression.c | 132 ++++++++------
+ fs/btrfs/compression.h | 53 +++---
+ fs/btrfs/ctree.c | 10 +-
+ fs/btrfs/ctree.h | 28 ++-
+ fs/btrfs/defrag.c | 155 ++++++++--------
+ fs/btrfs/defrag.h | 10 ++
+ fs/btrfs/delalloc-space.c | 2 -
+ fs/btrfs/delalloc-space.h | 4 +
+ fs/btrfs/delayed-inode.c | 21 ++-
+ fs/btrfs/delayed-inode.h | 21 +--
+ fs/btrfs/delayed-ref.c | 89 +++++++--
+ fs/btrfs/delayed-ref.h | 82 ++-------
+ fs/btrfs/dev-replace.c | 2 -
+ fs/btrfs/dev-replace.h | 4 +
+ fs/btrfs/dir-item.h | 6 +
+ fs/btrfs/disk-io.c | 41 +++--
+ fs/btrfs/disk-io.h | 20 ++-
+ fs/btrfs/export.c | 12 +-
+ fs/btrfs/export.h | 4 +
+ fs/btrfs/extent-io-tree.c | 2 +-
+ fs/btrfs/extent-io-tree.h | 7 +
+ fs/btrfs/extent-tree.c | 63 ++++---
+ fs/btrfs/extent-tree.h | 10 ++
+ fs/btrfs/extent_io.c | 298 +++++++++++++++++++-----------
+ fs/btrfs/extent_io.h | 46 +++--
+ fs/btrfs/extent_map.c | 20 ++-
+ fs/btrfs/extent_map.h | 8 +
+ fs/btrfs/file-item.c | 6 -
+ fs/btrfs/file-item.h | 13 ++
+ fs/btrfs/file.c | 43 +++--
+ fs/btrfs/file.h | 15 ++
+ fs/btrfs/free-space-cache.c | 10 +-
+ fs/btrfs/free-space-cache.h | 15 +-
+ fs/btrfs/free-space-tree.c | 56 +++---
+ fs/btrfs/free-space-tree.h | 6 +
+ fs/btrfs/fs.h | 69 ++++++-
+ fs/btrfs/inode-item.c | 1 -
+ fs/btrfs/inode-item.h | 5 +-
+ fs/btrfs/inode.c | 379 +++++++++++++++++++++------------------
+ fs/btrfs/ioctl.c | 104 +++++++----
+ fs/btrfs/ioctl.h | 9 +
+ fs/btrfs/locking.c | 3 +-
+ fs/btrfs/locking.h | 8 +-
+ fs/btrfs/lru_cache.h | 7 +-
+ fs/btrfs/lzo.c | 91 +++++-----
+ fs/btrfs/messages.c | 2 -
+ fs/btrfs/misc.h | 2 +
+ fs/btrfs/ordered-data.c | 6 +-
+ fs/btrfs/ordered-data.h | 15 ++
+ fs/btrfs/orphan.c | 1 -
+ fs/btrfs/orphan.h | 5 +
+ fs/btrfs/print-tree.h | 3 +
+ fs/btrfs/props.c | 3 +-
+ fs/btrfs/props.h | 7 +-
+ fs/btrfs/qgroup.c | 6 +-
+ fs/btrfs/qgroup.h | 17 +-
+ fs/btrfs/raid-stripe-tree.c | 1 -
+ fs/btrfs/raid-stripe-tree.h | 5 +
+ fs/btrfs/raid56.c | 31 +++-
+ fs/btrfs/raid56.h | 9 +
+ fs/btrfs/rcu-string.h | 6 +
+ fs/btrfs/ref-verify.h | 9 +
+ fs/btrfs/reflink.c | 12 +-
+ fs/btrfs/reflink.h | 4 +-
+ fs/btrfs/relocation.c | 110 ++++++------
+ fs/btrfs/relocation.h | 9 +
+ fs/btrfs/root-tree.c | 17 +-
+ fs/btrfs/root-tree.h | 10 ++
+ fs/btrfs/scrub.c | 9 +-
+ fs/btrfs/scrub.h | 6 +
+ fs/btrfs/send.c | 108 ++++++-----
+ fs/btrfs/send.h | 8 +-
+ fs/btrfs/space-info.c | 166 ++++++++++++++++-
+ fs/btrfs/space-info.h | 37 ++++
+ fs/btrfs/subpage.h | 5 +
+ fs/btrfs/super.c | 9 +-
+ fs/btrfs/super.h | 7 +
+ fs/btrfs/sysfs.c | 132 +++++++++++++-
+ fs/btrfs/sysfs.h | 9 +
+ fs/btrfs/tests/extent-io-tests.c | 28 ++-
+ fs/btrfs/tests/inode-tests.c | 40 ++---
+ fs/btrfs/transaction.c | 20 +--
+ fs/btrfs/transaction.h | 18 +-
+ fs/btrfs/tree-checker.c | 8 +-
+ fs/btrfs/tree-checker.h | 2 +
+ fs/btrfs/tree-log.c | 141 +++++++++++----
+ fs/btrfs/tree-log.h | 49 +++--
+ fs/btrfs/tree-mod-log.c | 13 +-
+ fs/btrfs/tree-mod-log.h | 8 +-
+ fs/btrfs/ulist.c | 1 -
+ fs/btrfs/ulist.h | 1 +
+ fs/btrfs/uuid-tree.c | 3 +-
+ fs/btrfs/uuid-tree.h | 5 +
+ fs/btrfs/verity.c | 1 -
+ fs/btrfs/verity.h | 7 +
+ fs/btrfs/volumes.c | 64 ++++++-
+ fs/btrfs/volumes.h | 49 ++++-
+ fs/btrfs/xattr.h | 6 +-
+ fs/btrfs/zlib.c | 112 ++++++------
+ fs/btrfs/zoned.c | 2 -
+ fs/btrfs/zoned.h | 15 ++
+ fs/btrfs/zstd.c | 154 +++++++---------
+ 118 files changed, 2588 insertions(+), 1372 deletions(-)
+Merging ceph/master (51d31149a88b ceph: switch to corrected encoding of max_xattr_size in mdsmap)
+$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master
+Merge made by the 'ort' strategy.
+ fs/ceph/mdsmap.c | 7 ++++---
+ fs/ceph/mdsmap.h | 6 +++++-
+ 2 files changed, 9 insertions(+), 4 deletions(-)
+Merging cifs/for-next (ac79e0d1b4d4 cifs: update internal module version number for cifs.ko)
+$ git merge -m Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git cifs/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ MAINTAINERS | 1 +
+ fs/smb/client/Makefile | 2 +-
+ fs/smb/client/cifs_debug.c | 2 +
+ fs/smb/client/cifsfs.c | 4 +-
+ fs/smb/client/cifsfs.h | 4 +-
+ fs/smb/client/cifsglob.h | 55 +++--
+ fs/smb/client/cifsproto.h | 14 +-
+ fs/smb/client/cifssmb.c | 4 +-
+ fs/smb/client/connect.c | 2 +
+ fs/smb/client/file.c | 321 +++++++++++++++------------
+ fs/smb/client/fs_context.c | 60 ++++-
+ fs/smb/client/fs_context.h | 9 +
+ fs/smb/client/inode.c | 117 +++-------
+ fs/smb/client/misc.c | 22 ++
+ fs/smb/client/readdir.c | 20 +-
+ fs/smb/client/reparse.c | 532 +++++++++++++++++++++++++++++++++++++++++++++
+ fs/smb/client/reparse.h | 113 ++++++++++
+ fs/smb/client/smb2glob.h | 3 +-
+ fs/smb/client/smb2inode.c | 478 +++++++++++++++++++++++++++++-----------
+ fs/smb/client/smb2ops.c | 254 +---------------------
+ fs/smb/client/smb2pdu.c | 17 ++
+ fs/smb/client/smb2pdu.h | 36 ++-
+ fs/smb/client/smb2proto.h | 15 +-
+ fs/smb/client/trace.h | 2 +
+ fs/smb/common/smbfsctl.h | 6 -
+ 25 files changed, 1420 insertions(+), 673 deletions(-)
+ create mode 100644 fs/smb/client/reparse.c
+ create mode 100644 fs/smb/client/reparse.h
+Merging configfs/for-next (4425c1d9b44d configfs: improve item creation performance)
+$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/configfs.git configfs/for-next
+Auto-merging fs/configfs/inode.c
+Merge made by the 'ort' strategy.
+ fs/configfs/configfs_internal.h | 4 ++--
+ fs/configfs/dir.c | 42 +++++++++++++++++++++++++++++++----------
+ fs/configfs/inode.c | 24 -----------------------
+ 3 files changed, 34 insertions(+), 36 deletions(-)
+Merging ecryptfs/next (a3d78fe3e1ae fs: ecryptfs: comment typo fix)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git ecryptfs/next
+Auto-merging fs/ecryptfs/crypto.c
+Auto-merging fs/ecryptfs/read_write.c
+Merge made by the 'ort' strategy.
+ fs/ecryptfs/crypto.c | 2 +-
+ fs/ecryptfs/keystore.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+Merging erofs/dev (b401b621758e Linux 6.8-rc5)
+$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs/dev
+Already up to date.
+Merging exfat/dev (f3cb82f5008f exfat: remove SLAB_MEM_SPREAD flag usage)
+$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev
+Auto-merging fs/exfat/super.c
+Merge made by the 'ort' strategy.
+ fs/exfat/cache.c | 2 +-
+ fs/exfat/file.c | 35 +++++++++++++++++++++--------------
+ fs/exfat/super.c | 2 +-
+ 3 files changed, 23 insertions(+), 16 deletions(-)
+Merging exportfs/exportfs-next (42c3732fa807 fs: Create a generic is_dot_dotdot() utility)
+$ git merge -m Merge branch 'exportfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux exportfs/exportfs-next
+Auto-merging fs/ecryptfs/crypto.c
+Auto-merging fs/f2fs/f2fs.h
+Auto-merging fs/namei.c
+Auto-merging include/linux/fs.h
+Merge made by the 'ort' strategy.
+ fs/crypto/fname.c | 8 +-------
+ fs/ecryptfs/crypto.c | 10 ----------
+ fs/exportfs/expfs.c | 2 +-
+ fs/f2fs/f2fs.h | 11 -----------
+ fs/namei.c | 6 ++----
+ include/linux/fs.h | 11 +++++++++++
+ 6 files changed, 15 insertions(+), 33 deletions(-)
+Merging ext3/for_next (21fea055bb74 Pull UDF mount API conversion)
+$ git merge -m Merge branch 'for_next' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git ext3/for_next
+Auto-merging MAINTAINERS
+Auto-merging fs/ext4/ext4.h
+Auto-merging fs/ext4/super.c
+Auto-merging fs/f2fs/f2fs.h
+Auto-merging include/linux/fs.h
+Auto-merging mm/shmem.c
+Merge made by the 'ort' strategy.
+ MAINTAINERS | 1 +
+ fs/ext2/balloc.c | 2 +-
+ fs/ext2/ext2.h | 2 +-
+ fs/ext2/inode.c | 2 +-
+ fs/ext2/super.c | 2 +-
+ fs/ext2/xattr.c | 2 +-
+ fs/ext4/ext4.h | 2 +-
+ fs/ext4/super.c | 2 +-
+ fs/f2fs/f2fs.h | 2 +-
+ fs/f2fs/super.c | 2 +-
+ fs/isofs/inode.c | 18 +-
+ fs/jfs/jfs_incore.h | 2 +-
+ fs/jfs/super.c | 2 +-
+ fs/notify/fsnotify.c | 28 ++-
+ fs/ocfs2/inode.h | 2 +-
+ fs/ocfs2/quota_global.c | 12 ++
+ fs/ocfs2/quota_local.c | 3 +
+ fs/ocfs2/super.c | 2 +-
+ fs/quota/dquot.c | 172 ++++++++-------
+ fs/quota/quota_tree.c | 152 +++++++++----
+ fs/quota/quota_v1.c | 6 +
+ fs/quota/quota_v2.c | 35 ++-
+ fs/reiserfs/reiserfs.h | 2 +-
+ fs/reiserfs/super.c | 2 +-
+ fs/udf/dir.c | 2 +-
+ fs/udf/inode.c | 2 +-
+ fs/udf/namei.c | 23 +-
+ fs/udf/super.c | 551 +++++++++++++++++++++++++----------------------
+ fs/udf/udf_sb.h | 1 +
+ include/linux/fs.h | 2 +-
+ include/linux/fsnotify.h | 12 +-
+ include/linux/shmem_fs.h | 2 +-
+ mm/shmem.c | 2 +-
+ 33 files changed, 622 insertions(+), 432 deletions(-)
+Merging ext4/dev (1f85b452e07c ext4: verify s_clusters_per_group even without bigalloc)
+$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev
+Auto-merging fs/ext4/super.c
+Merge made by the 'ort' strategy.
+ fs/ext4/extents.c | 6 +-
+ fs/ext4/inode.c | 10 +-
+ fs/ext4/mballoc-test.c | 502 +++++++++++++++++++++++++++++++++++++++++++++++++
+ fs/ext4/mballoc.c | 46 +++--
+ fs/ext4/resize.c | 3 +-
+ fs/ext4/super.c | 42 +++--
+ fs/ext4/xattr.c | 153 +++++++--------
+ 7 files changed, 635 insertions(+), 127 deletions(-)
+Merging f2fs/dev (0f1c6ede6da9 f2fs: introduce get_available_block_count() for cleanup)
+$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev
+Auto-merging fs/f2fs/f2fs.h
+Auto-merging fs/f2fs/super.c
+Merge made by the 'ort' strategy.
+ Documentation/ABI/testing/sysfs-fs-f2fs | 51 +++----
+ Documentation/filesystems/f2fs.rst | 53 ++++---
+ fs/f2fs/checkpoint.c | 29 ++--
+ fs/f2fs/compress.c | 45 +++---
+ fs/f2fs/data.c | 161 ++++++++-------------
+ fs/f2fs/debug.c | 6 +-
+ fs/f2fs/dir.c | 10 +-
+ fs/f2fs/f2fs.h | 193 +++++++++++++++----------
+ fs/f2fs/file.c | 114 ++++++++++-----
+ fs/f2fs/gc.c | 110 +++++++-------
+ fs/f2fs/namei.c | 36 +++--
+ fs/f2fs/node.c | 6 +-
+ fs/f2fs/node.h | 4 +-
+ fs/f2fs/recovery.c | 35 +++--
+ fs/f2fs/segment.c | 244 ++++++++++++++++----------------
+ fs/f2fs/segment.h | 64 ++++-----
+ fs/f2fs/super.c | 172 ++++++----------------
+ fs/f2fs/sysfs.c | 6 +-
+ fs/f2fs/verity.c | 16 ++-
+ include/linux/f2fs_fs.h | 6 -
+ 20 files changed, 670 insertions(+), 691 deletions(-)
+Merging fsverity/for-next (8e43fb06e10d fsverity: remove hash page spin lock)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity/for-next
+Merge made by the 'ort' strategy.
+ fs/verity/fsverity_private.h | 1 -
+ fs/verity/open.c | 1 -
+ fs/verity/verify.c | 48 ++++++++++++++++++++++----------------------
+ 3 files changed, 24 insertions(+), 26 deletions(-)
+Merging fuse/for-next (3f84a8008c75 fuse: implement passthrough for mmap)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next
+Auto-merging fs/fuse/fuse_i.h
+Auto-merging fs/fuse/inode.c
+CONFLICT (content): Merge conflict in fs/fuse/inode.c
+Auto-merging fs/fuse/virtio_fs.c
+Resolved 'fs/fuse/inode.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 9ea114595d5d] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/testing/sysfs-fs-virtiofs | 11 +
+ fs/fuse/Kconfig | 11 +
+ fs/fuse/Makefile | 2 +
+ fs/fuse/dev.c | 96 ++++++--
+ fs/fuse/dir.c | 47 +++-
+ fs/fuse/file.c | 370 +++++++++++++++++++---------
+ fs/fuse/fuse_i.h | 145 ++++++++++-
+ fs/fuse/inode.c | 31 +++
+ fs/fuse/iomode.c | 253 +++++++++++++++++++
+ fs/fuse/passthrough.c | 355 ++++++++++++++++++++++++++
+ fs/fuse/virtio_fs.c | 137 ++++++++--
+ include/uapi/linux/fuse.h | 23 +-
+ 12 files changed, 1287 insertions(+), 194 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-fs-virtiofs
+ create mode 100644 fs/fuse/iomode.c
+ create mode 100644 fs/fuse/passthrough.c
+Merging gfs2/for-next (6b89b6af459f Merge tag 'gfs2-v6.8-rc2-revert' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next
+Already up to date.
+Merging jfs/jfs-next (e42e29cc4423 Revert "jfs: fix shift-out-of-bounds in dbJoin")
+$ git merge -m Merge branch 'jfs-next' of git://github.com/kleikamp/linux-shaggy.git jfs/jfs-next
+Already up to date.
+Merging ksmbd/ksmbd-for-next (342c3b87c95b ksmbd: retrieve number of blocks using vfs_getattr in set_file_allocation_info)
+$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next
+Merge made by the 'ort' strategy.
+ fs/smb/server/smb2pdu.c | 180 +++++++++++++++++++++++++++++----------------
+ fs/smb/server/smb_common.c | 11 ++-
+ fs/smb/server/vfs.c | 12 ++-
+ 3 files changed, 135 insertions(+), 68 deletions(-)
+Merging nfs/linux-next (052d534373b7 Merge tag 'exfat-for-6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat)
+$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git nfs/linux-next
+Already up to date.
+Merging nfs-anna/linux-next (57331a59ac0d NFSv4.1: Use the nfs_client's rpc timeouts for backchannel)
+$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/anna/linux-nfs.git nfs-anna/linux-next
+Already up to date.
+Merging nfsd/nfsd-next (26102396d4e0 NFSD: Document nfsd_setattr() fill-attributes behavior)
+$ git merge -m Merge branch 'nfsd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/nfsd-next
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ MAINTAINERS | 1 +
+ fs/lockd/svc.c | 3 -
+ fs/nfs/callback.c | 3 -
+ fs/nfsd/blocklayout.c | 4 +-
+ fs/nfsd/cache.h | 2 -
+ fs/nfsd/filecache.c | 76 ++-
+ fs/nfsd/filecache.h | 1 +
+ fs/nfsd/netns.h | 29 +-
+ fs/nfsd/nfs3proc.c | 6 +-
+ fs/nfsd/nfs3xdr.c | 5 +-
+ fs/nfsd/nfs4callback.c | 193 +++++--
+ fs/nfsd/nfs4layouts.c | 63 ++-
+ fs/nfsd/nfs4proc.c | 13 +-
+ fs/nfsd/nfs4state.c | 843 +++++++++++++++++++++--------
+ fs/nfsd/nfs4xdr.c | 29 +-
+ fs/nfsd/nfscache.c | 43 +-
+ fs/nfsd/nfsctl.c | 17 +-
+ fs/nfsd/nfsd.h | 3 +
+ fs/nfsd/nfsfh.c | 3 +-
+ fs/nfsd/nfsproc.c | 6 +-
+ fs/nfsd/nfssvc.c | 16 +-
+ fs/nfsd/pnfs.h | 8 +-
+ fs/nfsd/state.h | 83 ++-
+ fs/nfsd/stats.c | 52 +-
+ fs/nfsd/stats.h | 70 +--
+ fs/nfsd/trace.h | 194 ++++++-
+ fs/nfsd/vfs.c | 84 ++-
+ fs/nfsd/vfs.h | 4 +-
+ fs/nfsd/xdr3.h | 2 +-
+ fs/nfsd/xdr4cb.h | 18 +
+ include/linux/sunrpc/svc.h | 5 +-
+ include/linux/sunrpc/svc_rdma.h | 55 +-
+ include/trace/events/rpcrdma.h | 4 +
+ include/trace/misc/nfs.h | 34 ++
+ net/sunrpc/auth_gss/gss_krb5_crypto.c | 14 +-
+ net/sunrpc/auth_gss/gss_krb5_mech.c | 11 +-
+ net/sunrpc/auth_gss/gss_rpc_xdr.c | 27 +-
+ net/sunrpc/stats.c | 2 +-
+ net/sunrpc/svc.c | 40 +-
+ net/sunrpc/xprtrdma/svc_rdma_backchannel.c | 2 +-
+ net/sunrpc/xprtrdma/svc_rdma_rw.c | 245 ++++++---
+ net/sunrpc/xprtrdma/svc_rdma_sendto.c | 151 +++---
+ net/sunrpc/xprtrdma/svc_rdma_transport.c | 15 +-
+ net/sunrpc/xprtsock.c | 9 -
+ 44 files changed, 1745 insertions(+), 743 deletions(-)
+Merging ntfs3/master (622cd3daa8ea fs/ntfs3: Slightly simplify ntfs_inode_printk())
+$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master
+Already up to date.
+Merging orangefs/for-next (9bf93dcfc453 Julia Lawall reported this null pointer dereference, this should fix it.)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux orangefs/for-next
+Merge made by the 'ort' strategy.
+ fs/orangefs/orangefs-cache.c | 2 +-
+ fs/orangefs/orangefs-kernel.h | 10 ----------
+ fs/orangefs/super.c | 4 ++--
+ 3 files changed, 3 insertions(+), 13 deletions(-)
+Merging overlayfs/overlayfs-next (d17bb4620f90 overlayfs.rst: fix ReST formatting)
+$ git merge -m Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git overlayfs/overlayfs-next
+Already up to date.
+Merging ubifs/next (3ce485803da1 mtd: ubi: provide NVMEM layer over UBI volumes)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs/next
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ .../bindings/mtd/partitions/linux,ubi.yaml | 75 ++++
+ .../bindings/mtd/partitions/ubi-volume.yaml | 40 ++
+ Documentation/mm/page_cache.rst | 10 +
+ MAINTAINERS | 2 +
+ drivers/mtd/ubi/Kconfig | 13 +
+ drivers/mtd/ubi/Makefile | 1 +
+ drivers/mtd/ubi/block.c | 136 +++----
+ drivers/mtd/ubi/build.c | 168 +++++---
+ drivers/mtd/ubi/eba.c | 7 +
+ drivers/mtd/ubi/fastmap.c | 7 +-
+ drivers/mtd/ubi/kapi.c | 56 ++-
+ drivers/mtd/ubi/nvmem.c | 188 +++++++++
+ drivers/mtd/ubi/ubi.h | 3 +
+ drivers/mtd/ubi/vmt.c | 75 +++-
+ drivers/mtd/ubi/vtbl.c | 6 +
+ fs/ubifs/debug.c | 9 +-
+ fs/ubifs/dir.c | 2 +
+ fs/ubifs/file.c | 443 ++++++++++-----------
+ fs/ubifs/find.c | 32 +-
+ fs/ubifs/journal.c | 171 +++++++-
+ fs/ubifs/lprops.c | 6 +-
+ fs/ubifs/lpt_commit.c | 1 -
+ fs/ubifs/super.c | 2 +
+ fs/ubifs/tnc.c | 9 +-
+ fs/ubifs/tnc_misc.c | 22 +
+ fs/ubifs/ubifs.h | 5 +
+ include/linux/mtd/ubi.h | 2 +
+ 27 files changed, 1064 insertions(+), 427 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mtd/partitions/linux,ubi.yaml
+ create mode 100644 Documentation/devicetree/bindings/mtd/partitions/ubi-volume.yaml
+ create mode 100644 drivers/mtd/ubi/nvmem.c
+Merging v9fs/9p-next (be3193e58ec2 9p: Fix read/write debug statements to report server reply)
+$ git merge -m Merge branch '9p-next' of git://github.com/martinetd/linux v9fs/9p-next
+Merge made by the 'ort' strategy.
+ net/9p/client.c | 10 +++++-----
+ net/9p/trans_fd.c | 1 -
+ 2 files changed, 5 insertions(+), 6 deletions(-)
+Merging v9fs-ericvh/ericvh/for-next (be57855f5050 fs/9p: fix dups even in uncached mode)
+$ git merge -m Merge branch 'ericvh/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git v9fs-ericvh/ericvh/for-next
+Merge made by the 'ort' strategy.
+ fs/9p/v9fs.h | 31 ++------
+ fs/9p/v9fs_vfs.h | 11 ++-
+ fs/9p/vfs_dir.c | 4 +-
+ fs/9p/vfs_inode.c | 150 ++++++--------------------------------
+ fs/9p/vfs_inode_dotl.c | 194 +++++++++----------------------------------------
+ fs/9p/vfs_super.c | 45 +-----------
+ 6 files changed, 71 insertions(+), 364 deletions(-)
+Merging xfs/for-next (8a800a1e9004 Merge tag 'xfs-6.8-fixes-3' into xfs-for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next
+Auto-merging include/linux/shmem_fs.h
+Auto-merging include/linux/swap.h
+Auto-merging mm/filemap.c
+Auto-merging mm/internal.h
+Auto-merging mm/shmem.c
+Merge made by the 'ort' strategy.
+ .../filesystems/xfs/xfs-online-fsck-design.rst | 30 +-
+ fs/xfs/Kconfig | 13 +
+ fs/xfs/Makefile | 15 +-
+ fs/xfs/kmem.c | 30 -
+ fs/xfs/kmem.h | 83 -
+ fs/xfs/libxfs/xfs_ag.c | 68 +-
+ fs/xfs/libxfs/xfs_ag.h | 18 +-
+ fs/xfs/libxfs/xfs_alloc.c | 258 +--
+ fs/xfs/libxfs/xfs_alloc_btree.c | 191 ++-
+ fs/xfs/libxfs/xfs_alloc_btree.h | 10 +-
+ fs/xfs/libxfs/xfs_attr.c | 5 +-
+ fs/xfs/libxfs/xfs_attr_leaf.c | 22 +-
+ fs/xfs/libxfs/xfs_attr_remote.c | 37 +-
+ fs/xfs/libxfs/xfs_bmap.c | 365 +++--
+ fs/xfs/libxfs/xfs_bmap.h | 19 +-
+ fs/xfs/libxfs/xfs_bmap_btree.c | 152 +-
+ fs/xfs/libxfs/xfs_bmap_btree.h | 5 +-
+ fs/xfs/libxfs/xfs_btree.c | 1098 ++++++++-----
+ fs/xfs/libxfs/xfs_btree.h | 274 ++--
+ fs/xfs/libxfs/xfs_btree_mem.c | 347 ++++
+ fs/xfs/libxfs/xfs_btree_mem.h | 75 +
+ fs/xfs/libxfs/xfs_btree_staging.c | 133 +-
+ fs/xfs/libxfs/xfs_btree_staging.h | 10 +-
+ fs/xfs/libxfs/xfs_da_btree.c | 59 +-
+ fs/xfs/libxfs/xfs_da_format.h | 11 +
+ fs/xfs/libxfs/xfs_defer.c | 25 +-
+ fs/xfs/libxfs/xfs_dir2.c | 59 +-
+ fs/xfs/libxfs/xfs_dir2.h | 13 +
+ fs/xfs/libxfs/xfs_dir2_block.c | 8 +-
+ fs/xfs/libxfs/xfs_dir2_data.c | 3 +
+ fs/xfs/libxfs/xfs_dir2_leaf.c | 3 +
+ fs/xfs/libxfs/xfs_dir2_node.c | 7 +
+ fs/xfs/libxfs/xfs_dir2_sf.c | 16 +-
+ fs/xfs/libxfs/xfs_format.h | 21 +-
+ fs/xfs/libxfs/xfs_fs.h | 8 +-
+ fs/xfs/libxfs/xfs_health.h | 95 +-
+ fs/xfs/libxfs/xfs_ialloc.c | 240 ++-
+ fs/xfs/libxfs/xfs_ialloc_btree.c | 159 +-
+ fs/xfs/libxfs/xfs_ialloc_btree.h | 11 +-
+ fs/xfs/libxfs/xfs_iext_tree.c | 26 +-
+ fs/xfs/libxfs/xfs_inode_buf.c | 12 +-
+ fs/xfs/libxfs/xfs_inode_fork.c | 49 +-
+ fs/xfs/libxfs/xfs_inode_fork.h | 1 +
+ fs/xfs/libxfs/xfs_log_format.h | 4 +-
+ fs/xfs/libxfs/xfs_refcount.c | 69 +-
+ fs/xfs/libxfs/xfs_refcount_btree.c | 80 +-
+ fs/xfs/libxfs/xfs_refcount_btree.h | 2 -
+ fs/xfs/libxfs/xfs_rmap.c | 284 +++-
+ fs/xfs/libxfs/xfs_rmap.h | 31 +-
+ fs/xfs/libxfs/xfs_rmap_btree.c | 239 ++-
+ fs/xfs/libxfs/xfs_rmap_btree.h | 8 +-
+ fs/xfs/libxfs/xfs_rtbitmap.c | 11 +-
+ fs/xfs/libxfs/xfs_sb.c | 2 +
+ fs/xfs/libxfs/xfs_shared.h | 67 +-
+ fs/xfs/libxfs/xfs_symlink_remote.c | 155 +-
+ fs/xfs/libxfs/xfs_symlink_remote.h | 26 +
+ fs/xfs/libxfs/xfs_trans_inode.c | 6 +-
+ fs/xfs/libxfs/xfs_types.h | 26 +-
+ fs/xfs/mrlock.h | 78 -
+ fs/xfs/scrub/agb_bitmap.h | 5 +
+ fs/xfs/scrub/agheader.c | 12 +-
+ fs/xfs/scrub/agheader_repair.c | 47 +-
+ fs/xfs/scrub/alloc_repair.c | 27 +-
+ fs/xfs/scrub/bitmap.c | 14 +
+ fs/xfs/scrub/bitmap.h | 2 +
+ fs/xfs/scrub/bmap.c | 2 +-
+ fs/xfs/scrub/bmap_repair.c | 8 +-
+ fs/xfs/scrub/btree.c | 58 +-
+ fs/xfs/scrub/common.c | 133 +-
+ fs/xfs/scrub/common.h | 13 +
+ fs/xfs/scrub/cow_repair.c | 2 +-
+ fs/xfs/scrub/dir.c | 4 +-
+ fs/xfs/scrub/fscounters.c | 29 +-
+ fs/xfs/scrub/fscounters.h | 20 +
+ fs/xfs/scrub/fscounters_repair.c | 72 +
+ fs/xfs/scrub/health.c | 140 +-
+ fs/xfs/scrub/health.h | 5 +-
+ fs/xfs/scrub/ialloc.c | 20 +-
+ fs/xfs/scrub/ialloc_repair.c | 10 +-
+ fs/xfs/scrub/inode_repair.c | 237 ++-
+ fs/xfs/scrub/iscan.c | 767 +++++++++
+ fs/xfs/scrub/iscan.h | 84 +
+ fs/xfs/scrub/newbt.c | 14 +-
+ fs/xfs/scrub/newbt.h | 7 +
+ fs/xfs/scrub/nlinks.c | 930 +++++++++++
+ fs/xfs/scrub/nlinks.h | 102 ++
+ fs/xfs/scrub/nlinks_repair.c | 223 +++
+ fs/xfs/scrub/quotacheck.c | 867 ++++++++++
+ fs/xfs/scrub/quotacheck.h | 76 +
+ fs/xfs/scrub/quotacheck_repair.c | 261 +++
+ fs/xfs/scrub/rcbag.c | 307 ++++
+ fs/xfs/scrub/rcbag.h | 28 +
+ fs/xfs/scrub/rcbag_btree.c | 370 +++++
+ fs/xfs/scrub/rcbag_btree.h | 81 +
+ fs/xfs/scrub/readdir.c | 4 +-
+ fs/xfs/scrub/reap.c | 2 +-
+ fs/xfs/scrub/refcount.c | 12 +
+ fs/xfs/scrub/refcount_repair.c | 177 +-
+ fs/xfs/scrub/repair.c | 120 +-
+ fs/xfs/scrub/repair.h | 23 +-
+ fs/xfs/scrub/rmap.c | 26 +-
+ fs/xfs/scrub/rmap_repair.c | 1697 ++++++++++++++++++++
+ fs/xfs/scrub/rtsummary.c | 6 +-
+ fs/xfs/scrub/scrub.c | 37 +-
+ fs/xfs/scrub/scrub.h | 18 +-
+ fs/xfs/scrub/stats.c | 2 +
+ fs/xfs/scrub/symlink.c | 3 +-
+ fs/xfs/scrub/trace.c | 8 +-
+ fs/xfs/scrub/trace.h | 637 +++++++-
+ fs/xfs/scrub/xfarray.c | 234 ++-
+ fs/xfs/scrub/xfarray.h | 30 +-
+ fs/xfs/scrub/xfile.c | 345 ++--
+ fs/xfs/scrub/xfile.h | 62 +-
+ fs/xfs/xfs_acl.c | 4 +-
+ fs/xfs/xfs_attr_inactive.c | 4 +
+ fs/xfs/xfs_attr_item.c | 25 +-
+ fs/xfs/xfs_attr_list.c | 26 +-
+ fs/xfs/xfs_bmap_item.c | 119 +-
+ fs/xfs/xfs_bmap_item.h | 4 +
+ fs/xfs/xfs_bmap_util.c | 20 +-
+ fs/xfs/xfs_buf.c | 320 ++--
+ fs/xfs/xfs_buf.h | 21 +-
+ fs/xfs/xfs_buf_item.c | 8 +-
+ fs/xfs/xfs_buf_item_recover.c | 8 +-
+ fs/xfs/xfs_buf_mem.c | 270 ++++
+ fs/xfs/xfs_buf_mem.h | 34 +
+ fs/xfs/xfs_dir2_readdir.c | 8 +-
+ fs/xfs/xfs_discard.c | 19 +-
+ fs/xfs/xfs_dquot.c | 36 +-
+ fs/xfs/xfs_error.c | 8 +-
+ fs/xfs/xfs_extent_busy.c | 5 +-
+ fs/xfs/xfs_extfree_item.c | 8 +-
+ fs/xfs/xfs_file.c | 4 +-
+ fs/xfs/xfs_filestream.c | 6 +-
+ fs/xfs/xfs_fsmap.c | 4 +-
+ fs/xfs/xfs_health.c | 202 ++-
+ fs/xfs/xfs_hooks.c | 52 +
+ fs/xfs/xfs_hooks.h | 65 +
+ fs/xfs/xfs_icache.c | 14 +-
+ fs/xfs/xfs_icreate_item.c | 2 +-
+ fs/xfs/xfs_inode.c | 274 +++-
+ fs/xfs/xfs_inode.h | 37 +-
+ fs/xfs/xfs_inode_item.c | 6 +-
+ fs/xfs/xfs_inode_item_recover.c | 5 +-
+ fs/xfs/xfs_ioctl.c | 8 +-
+ fs/xfs/xfs_iomap.c | 19 +-
+ fs/xfs/xfs_iops.c | 9 +-
+ fs/xfs/xfs_itable.c | 12 +-
+ fs/xfs/xfs_iwalk.c | 41 +-
+ fs/xfs/xfs_linux.h | 17 +-
+ fs/xfs/xfs_log.c | 34 +-
+ fs/xfs/xfs_log_cil.c | 31 +-
+ fs/xfs/xfs_log_recover.c | 102 +-
+ fs/xfs/xfs_mount.c | 2 +-
+ fs/xfs/xfs_mount.h | 12 +-
+ fs/xfs/xfs_mru_cache.c | 17 +-
+ fs/xfs/xfs_qm.c | 59 +-
+ fs/xfs/xfs_qm.h | 16 +
+ fs/xfs/xfs_qm_bhv.c | 1 +
+ fs/xfs/xfs_quota.h | 46 +
+ fs/xfs/xfs_refcount_item.c | 12 +-
+ fs/xfs/xfs_reflink.c | 16 +-
+ fs/xfs/xfs_rmap_item.c | 11 +-
+ fs/xfs/xfs_rtalloc.c | 18 +-
+ fs/xfs/xfs_stats.c | 4 +-
+ fs/xfs/xfs_stats.h | 2 +
+ fs/xfs/xfs_super.c | 21 +-
+ fs/xfs/xfs_symlink.c | 158 +-
+ fs/xfs/xfs_symlink.h | 1 -
+ fs/xfs/xfs_sysfs.c | 4 -
+ fs/xfs/xfs_trace.c | 3 +
+ fs/xfs/xfs_trace.h | 607 +++++--
+ fs/xfs/xfs_trans.c | 2 +-
+ fs/xfs/xfs_trans.h | 1 +
+ fs/xfs/xfs_trans_ail.c | 7 +-
+ fs/xfs/xfs_trans_buf.c | 42 +
+ fs/xfs/xfs_trans_dquot.c | 171 +-
+ include/linux/rwbase_rt.h | 9 +-
+ include/linux/rwsem.h | 46 +-
+ include/linux/shmem_fs.h | 6 +-
+ include/linux/swap.h | 10 -
+ mm/filemap.c | 9 +
+ mm/internal.h | 4 +
+ mm/shmem.c | 42 +-
+ mm/workingset.c | 1 +
+ 185 files changed, 13261 insertions(+), 3582 deletions(-)
+ delete mode 100644 fs/xfs/kmem.c
+ delete mode 100644 fs/xfs/kmem.h
+ create mode 100644 fs/xfs/libxfs/xfs_btree_mem.c
+ create mode 100644 fs/xfs/libxfs/xfs_btree_mem.h
+ create mode 100644 fs/xfs/libxfs/xfs_symlink_remote.h
+ delete mode 100644 fs/xfs/mrlock.h
+ create mode 100644 fs/xfs/scrub/fscounters.h
+ create mode 100644 fs/xfs/scrub/fscounters_repair.c
+ create mode 100644 fs/xfs/scrub/iscan.c
+ create mode 100644 fs/xfs/scrub/iscan.h
+ create mode 100644 fs/xfs/scrub/nlinks.c
+ create mode 100644 fs/xfs/scrub/nlinks.h
+ create mode 100644 fs/xfs/scrub/nlinks_repair.c
+ create mode 100644 fs/xfs/scrub/quotacheck.c
+ create mode 100644 fs/xfs/scrub/quotacheck.h
+ create mode 100644 fs/xfs/scrub/quotacheck_repair.c
+ create mode 100644 fs/xfs/scrub/rcbag.c
+ create mode 100644 fs/xfs/scrub/rcbag.h
+ create mode 100644 fs/xfs/scrub/rcbag_btree.c
+ create mode 100644 fs/xfs/scrub/rcbag_btree.h
+ create mode 100644 fs/xfs/scrub/rmap_repair.c
+ create mode 100644 fs/xfs/xfs_buf_mem.c
+ create mode 100644 fs/xfs/xfs_buf_mem.h
+ create mode 100644 fs/xfs/xfs_hooks.c
+ create mode 100644 fs/xfs/xfs_hooks.h
+Merging zonefs/for-next (567e629fd296 zonefs: convert zonefs to use the new mount api)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git zonefs/for-next
+Auto-merging fs/zonefs/super.c
+Merge made by the 'ort' strategy.
+ fs/zonefs/super.c | 165 +++++++++++++++++++++++++++++++-----------------------
+ 1 file changed, 94 insertions(+), 71 deletions(-)
+Merging iomap/iomap-for-next (3ac974796e5d iomap: fix short copy in iomap_write_iter())
+$ git merge -m Merge branch 'iomap-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git iomap/iomap-for-next
+Already up to date.
+Merging djw-vfs/vfs-for-next (ce85a1e04645 xfs: stabilize fs summary counters for online fsck)
+$ git merge -m Merge branch 'vfs-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git djw-vfs/vfs-for-next
+Already up to date.
+Merging file-locks/locks-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
+$ git merge -m Merge branch 'locks-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git file-locks/locks-next
+Already up to date.
+Merging iversion/iversion-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
+$ git merge -m Merge branch 'iversion-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git iversion/iversion-next
+Already up to date.
+Merging vfs-brauner/vfs.all (872365adb67a Merge branch 'vfs.uuid' into vfs.all)
+$ git merge -m Merge branch 'vfs.all' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git vfs-brauner/vfs.all
+Auto-merging CREDITS
+Auto-merging MAINTAINERS
+Auto-merging drivers/block/zram/zram_drv.c
+Auto-merging drivers/md/bcache/bcache.h
+Auto-merging drivers/md/bcache/super.c
+Auto-merging drivers/md/dm.c
+Auto-merging drivers/md/md.c
+Auto-merging drivers/target/target_core_pscsi.c
+Auto-merging fs/Kconfig
+Auto-merging fs/bcachefs/super-io.c
+CONFLICT (content): Merge conflict in fs/bcachefs/super-io.c
+Auto-merging fs/btrfs/dev-replace.c
+Auto-merging fs/btrfs/ioctl.c
+Auto-merging fs/btrfs/volumes.c
+Auto-merging fs/btrfs/volumes.h
+Auto-merging fs/ext4/ext4.h
+Auto-merging fs/ext4/super.c
+Auto-merging fs/f2fs/f2fs.h
+Auto-merging fs/f2fs/super.c
+Auto-merging fs/fuse/file.c
+Auto-merging fs/nfsd/filecache.c
+Auto-merging fs/nfsd/nfs4callback.c
+Auto-merging fs/nfsd/nfs4layouts.c
+CONFLICT (content): Merge conflict in fs/nfsd/nfs4layouts.c
+Auto-merging fs/nfsd/nfs4state.c
+Auto-merging fs/ocfs2/super.c
+Auto-merging fs/reiserfs/reiserfs.h
+Auto-merging fs/smb/client/cifsfs.c
+Auto-merging fs/smb/client/cifssmb.c
+Auto-merging fs/smb/client/file.c
+CONFLICT (content): Merge conflict in fs/smb/client/file.c
+Auto-merging fs/smb/server/smb2pdu.c
+Auto-merging fs/smb/server/vfs.c
+Auto-merging fs/super.c
+Auto-merging fs/ubifs/super.c
+Auto-merging fs/xfs/xfs_buf.c
+CONFLICT (content): Merge conflict in fs/xfs/xfs_buf.c
+Auto-merging fs/xfs/xfs_buf.h
+Auto-merging fs/xfs/xfs_mount.c
+Auto-merging fs/xfs/xfs_super.c
+Auto-merging include/linux/dcache.h
+Auto-merging include/linux/fs.h
+Auto-merging include/linux/swap.h
+Auto-merging init/initramfs.c
+Auto-merging init/main.c
+CONFLICT (content): Merge conflict in init/main.c
+Auto-merging kernel/signal.c
+Auto-merging lib/maple_tree.c
+Auto-merging mm/filemap.c
+Auto-merging mm/shmem.c
+Auto-merging mm/swapfile.c
+Resolved 'fs/bcachefs/super-io.c' using previous resolution.
+Resolved 'fs/nfsd/nfs4layouts.c' using previous resolution.
+Resolved 'fs/smb/client/file.c' using previous resolution.
+Resolved 'fs/xfs/xfs_buf.c' using previous resolution.
+Resolved 'init/main.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 4b0bfb6df656] Merge branch 'vfs.all' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git
+$ git diff -M --stat --summary HEAD^..
+ CREDITS | 5 +
+ Documentation/filesystems/files.rst | 2 +-
+ Documentation/filesystems/index.rst | 1 -
+ Documentation/filesystems/locking.rst | 2 +-
+ Documentation/filesystems/ntfs.rst | 466 ---
+ Documentation/filesystems/vfs.rst | 16 +-
+ Documentation/userspace-api/ioctl/ioctl-number.rst | 3 +-
+ MAINTAINERS | 10 -
+ block/bdev.c | 252 +-
+ block/blk.h | 4 +
+ block/fops.c | 48 +-
+ block/genhd.c | 12 +-
+ block/ioctl.c | 9 +-
+ drivers/block/drbd/drbd_int.h | 4 +-
+ drivers/block/drbd/drbd_nl.c | 58 +-
+ drivers/block/pktcdvd.c | 68 +-
+ drivers/block/rnbd/rnbd-srv.c | 28 +-
+ drivers/block/rnbd/rnbd-srv.h | 2 +-
+ drivers/block/xen-blkback/blkback.c | 4 +-
+ drivers/block/xen-blkback/common.h | 4 +-
+ drivers/block/xen-blkback/xenbus.c | 37 +-
+ drivers/block/zram/zram_drv.c | 26 +-
+ drivers/block/zram/zram_drv.h | 2 +-
+ drivers/md/bcache/bcache.h | 4 +-
+ drivers/md/bcache/super.c | 74 +-
+ drivers/md/dm.c | 23 +-
+ drivers/md/md.c | 12 +-
+ drivers/md/md.h | 2 +-
+ drivers/mtd/devices/block2mtd.c | 46 +-
+ drivers/nvme/target/io-cmd-bdev.c | 16 +-
+ drivers/nvme/target/nvmet.h | 2 +-
+ drivers/s390/block/dasd.c | 10 +-
+ drivers/s390/block/dasd_genhd.c | 36 +-
+ drivers/s390/block/dasd_int.h | 2 +-
+ drivers/s390/block/dasd_ioctl.c | 2 +-
+ drivers/target/target_core_iblock.c | 18 +-
+ drivers/target/target_core_iblock.h | 2 +-
+ drivers/target/target_core_pscsi.c | 22 +-
+ drivers/target/target_core_pscsi.h | 2 +-
+ fs/9p/vfs_file.c | 40 +-
+ fs/Kconfig | 8 +-
+ fs/Makefile | 3 +-
+ fs/afs/dir.c | 4 +-
+ fs/afs/flock.c | 60 +-
+ fs/attr.c | 2 +-
+ fs/backing-file.c | 4 +-
+ fs/bcachefs/super-io.c | 20 +-
+ fs/bcachefs/super_types.h | 2 +-
+ fs/btrfs/dev-replace.c | 14 +-
+ fs/btrfs/ioctl.c | 16 +-
+ fs/btrfs/volumes.c | 92 +-
+ fs/btrfs/volumes.h | 4 +-
+ fs/buffer.c | 10 +-
+ fs/ceph/locks.c | 74 +-
+ fs/coda/inode.c | 149 +-
+ fs/cramfs/inode.c | 2 +-
+ fs/dlm/plock.c | 44 +-
+ fs/efs/super.c | 114 +-
+ fs/erofs/data.c | 6 +-
+ fs/erofs/internal.h | 2 +-
+ fs/erofs/super.c | 16 +-
+ fs/eventfd.c | 16 +-
+ fs/eventpoll.c | 16 +-
+ fs/exec.c | 1 -
+ fs/ext4/ext4.h | 2 +-
+ fs/ext4/fsmap.c | 8 +-
+ fs/ext4/super.c | 54 +-
+ fs/f2fs/f2fs.h | 2 +-
+ fs/f2fs/super.c | 14 +-
+ fs/fat/inode.c | 3 +
+ fs/fcntl.c | 8 +-
+ fs/fhandle.c | 2 +-
+ fs/file_table.c | 83 +-
+ fs/fs-writeback.c | 25 +
+ fs/fs_parser.c | 4 +-
+ fs/fuse/file.c | 14 +-
+ fs/gfs2/bmap.c | 2 +-
+ fs/gfs2/file.c | 16 +-
+ fs/gfs2/ops_fstype.c | 2 +-
+ fs/hfsplus/wrapper.c | 2 +-
+ fs/inode.c | 3 +-
+ fs/internal.h | 7 +
+ fs/ioctl.c | 33 +
+ fs/iomap/buffered-io.c | 604 ++--
+ fs/iomap/trace.h | 48 +-
+ fs/jfs/jfs_logmgr.c | 26 +-
+ fs/jfs/jfs_logmgr.h | 2 +-
+ fs/jfs/jfs_mount.c | 2 +-
+ fs/kernfs/mount.c | 4 +-
+ fs/libfs.c | 244 +-
+ fs/lockd/clnt4xdr.c | 14 +-
+ fs/lockd/clntlock.c | 2 +-
+ fs/lockd/clntproc.c | 65 +-
+ fs/lockd/clntxdr.c | 14 +-
+ fs/lockd/svc4proc.c | 10 +-
+ fs/lockd/svclock.c | 64 +-
+ fs/lockd/svcproc.c | 10 +-
+ fs/lockd/svcsubs.c | 24 +-
+ fs/lockd/xdr.c | 14 +-
+ fs/lockd/xdr4.c | 14 +-
+ fs/locks.c | 896 +++---
+ fs/mbcache.c | 5 +-
+ fs/mnt_idmapping.c | 2 +-
+ fs/nfs/blocklayout/blocklayout.h | 2 +-
+ fs/nfs/blocklayout/dev.c | 66 +-
+ fs/nfs/delegation.c | 4 +-
+ fs/nfs/file.c | 22 +-
+ fs/nfs/nfs3proc.c | 2 +-
+ fs/nfs/nfs4_fs.h | 2 +-
+ fs/nfs/nfs4file.c | 2 +-
+ fs/nfs/nfs4proc.c | 39 +-
+ fs/nfs/nfs4state.c | 22 +-
+ fs/nfs/nfs4trace.h | 4 +-
+ fs/nfs/nfs4xdr.c | 8 +-
+ fs/nfs/write.c | 8 +-
+ fs/nfsd/filecache.c | 4 +-
+ fs/nfsd/nfs4callback.c | 2 +-
+ fs/nfsd/nfs4layouts.c | 35 +-
+ fs/nfsd/nfs4state.c | 124 +-
+ fs/nsfs.c | 110 +-
+ fs/ntfs/Kconfig | 81 -
+ fs/ntfs/Makefile | 15 -
+ fs/ntfs/aops.c | 1744 -----------
+ fs/ntfs/aops.h | 88 -
+ fs/ntfs/attrib.c | 2624 ----------------
+ fs/ntfs/attrib.h | 102 -
+ fs/ntfs/bitmap.c | 179 --
+ fs/ntfs/bitmap.h | 104 -
+ fs/ntfs/collate.c | 110 -
+ fs/ntfs/collate.h | 36 -
+ fs/ntfs/compress.c | 950 ------
+ fs/ntfs/debug.c | 159 -
+ fs/ntfs/debug.h | 57 -
+ fs/ntfs/dir.c | 1540 ----------
+ fs/ntfs/dir.h | 34 -
+ fs/ntfs/endian.h | 79 -
+ fs/ntfs/file.c | 1997 ------------
+ fs/ntfs/index.c | 440 ---
+ fs/ntfs/index.h | 134 -
+ fs/ntfs/inode.c | 3102 -------------------
+ fs/ntfs/inode.h | 310 --
+ fs/ntfs/layout.h | 2421 ---------------
+ fs/ntfs/lcnalloc.c | 1000 ------
+ fs/ntfs/lcnalloc.h | 131 -
+ fs/ntfs/logfile.c | 849 ------
+ fs/ntfs/logfile.h | 295 --
+ fs/ntfs/malloc.h | 77 -
+ fs/ntfs/mft.c | 2907 ------------------
+ fs/ntfs/mft.h | 110 -
+ fs/ntfs/mst.c | 189 --
+ fs/ntfs/namei.c | 392 ---
+ fs/ntfs/ntfs.h | 150 -
+ fs/ntfs/quota.c | 103 -
+ fs/ntfs/quota.h | 21 -
+ fs/ntfs/runlist.c | 1893 ------------
+ fs/ntfs/runlist.h | 88 -
+ fs/ntfs/super.c | 3202 --------------------
+ fs/ntfs/sysctl.c | 58 -
+ fs/ntfs/sysctl.h | 27 -
+ fs/ntfs/time.h | 89 -
+ fs/ntfs/types.h | 55 -
+ fs/ntfs/unistr.c | 384 ---
+ fs/ntfs/upcase.c | 73 -
+ fs/ntfs/usnjrnl.c | 70 -
+ fs/ntfs/usnjrnl.h | 191 --
+ fs/ntfs/volume.h | 164 -
+ fs/ntfs3/namei.c | 2 +-
+ fs/ocfs2/cluster/heartbeat.c | 32 +-
+ fs/ocfs2/locks.c | 12 +-
+ fs/ocfs2/stack_user.c | 2 +-
+ fs/ocfs2/super.c | 4 +-
+ fs/open.c | 2 +-
+ fs/overlayfs/super.c | 52 +-
+ fs/overlayfs/util.c | 18 +-
+ fs/pidfs.c | 259 ++
+ fs/pipe.c | 81 +-
+ fs/posix_acl.c | 4 +-
+ fs/reiserfs/journal.c | 38 +-
+ fs/reiserfs/procfs.c | 2 +-
+ fs/reiserfs/reiserfs.h | 8 +-
+ fs/romfs/super.c | 2 +-
+ fs/select.c | 15 +-
+ fs/smb/client/cifsfs.c | 5 +-
+ fs/smb/client/cifssmb.c | 8 +-
+ fs/smb/client/file.c | 76 +-
+ fs/smb/client/smb2file.c | 2 +-
+ fs/smb/server/smb2pdu.c | 44 +-
+ fs/smb/server/vfs.c | 14 +-
+ fs/super.c | 18 +-
+ fs/sysv/itree.c | 10 +-
+ fs/ubifs/super.c | 2 +-
+ fs/xfs/xfs_aops.c | 9 +-
+ fs/xfs/xfs_buf.c | 10 +-
+ fs/xfs/xfs_buf.h | 4 +-
+ fs/xfs/xfs_mount.c | 4 +-
+ fs/xfs/xfs_super.c | 44 +-
+ fs/zonefs/file.c | 3 +-
+ include/asm-generic/barrier.h | 2 -
+ include/linux/backing-dev.h | 1 -
+ include/linux/blkdev.h | 13 +-
+ include/linux/dcache.h | 18 +-
+ include/linux/device-mapper.h | 2 +-
+ include/linux/file.h | 2 +
+ include/linux/filelock.h | 129 +-
+ include/linux/fs.h | 100 +-
+ include/linux/iomap.h | 19 +-
+ include/linux/lockd/lockd.h | 8 +-
+ include/linux/lockd/xdr.h | 2 +-
+ include/linux/maple_tree.h | 7 +
+ include/linux/ns_common.h | 2 +-
+ include/linux/pid.h | 10 +-
+ include/linux/pidfs.h | 8 +
+ include/linux/pktcdvd.h | 4 +-
+ include/linux/poll.h | 4 -
+ include/linux/proc_ns.h | 2 +-
+ include/linux/sched/signal.h | 2 -
+ include/linux/swap.h | 2 +-
+ include/trace/events/afs.h | 4 +-
+ include/trace/events/filelock.h | 102 +-
+ include/uapi/linux/fs.h | 30 +-
+ include/uapi/linux/magic.h | 1 +
+ include/uapi/linux/pidfd.h | 8 +-
+ init/do_mounts.c | 3 +
+ init/do_mounts.h | 9 +
+ init/initramfs.c | 8 +-
+ init/main.c | 2 +
+ kernel/exit.c | 31 +-
+ kernel/fork.c | 147 +-
+ kernel/nsproxy.c | 2 +-
+ kernel/pid.c | 53 +-
+ kernel/power/swap.c | 28 +-
+ kernel/signal.c | 110 +-
+ lib/iov_iter.c | 60 +-
+ lib/maple_tree.c | 93 +
+ lib/test_maple_tree.c | 44 +
+ mm/backing-dev.c | 25 -
+ mm/filemap.c | 9 -
+ mm/shmem.c | 8 +-
+ mm/swapfile.c | 22 +-
+ .../selftests/filesystems/overlayfs/dev_in_maps.c | 10 +-
+ .../move_mount_set_group_test.c | 4 +-
+ tools/testing/selftests/pidfd/pidfd_getfd_test.c | 31 +-
+ 242 files changed, 3704 insertions(+), 31946 deletions(-)
+ delete mode 100644 Documentation/filesystems/ntfs.rst
+ delete mode 100644 fs/ntfs/Kconfig
+ delete mode 100644 fs/ntfs/Makefile
+ delete mode 100644 fs/ntfs/aops.c
+ delete mode 100644 fs/ntfs/aops.h
+ delete mode 100644 fs/ntfs/attrib.c
+ delete mode 100644 fs/ntfs/attrib.h
+ delete mode 100644 fs/ntfs/bitmap.c
+ delete mode 100644 fs/ntfs/bitmap.h
+ delete mode 100644 fs/ntfs/collate.c
+ delete mode 100644 fs/ntfs/collate.h
+ delete mode 100644 fs/ntfs/compress.c
+ delete mode 100644 fs/ntfs/debug.c
+ delete mode 100644 fs/ntfs/debug.h
+ delete mode 100644 fs/ntfs/dir.c
+ delete mode 100644 fs/ntfs/dir.h
+ delete mode 100644 fs/ntfs/endian.h
+ delete mode 100644 fs/ntfs/file.c
+ delete mode 100644 fs/ntfs/index.c
+ delete mode 100644 fs/ntfs/index.h
+ delete mode 100644 fs/ntfs/inode.c
+ delete mode 100644 fs/ntfs/inode.h
+ delete mode 100644 fs/ntfs/layout.h
+ delete mode 100644 fs/ntfs/lcnalloc.c
+ delete mode 100644 fs/ntfs/lcnalloc.h
+ delete mode 100644 fs/ntfs/logfile.c
+ delete mode 100644 fs/ntfs/logfile.h
+ delete mode 100644 fs/ntfs/malloc.h
+ delete mode 100644 fs/ntfs/mft.c
+ delete mode 100644 fs/ntfs/mft.h
+ delete mode 100644 fs/ntfs/mst.c
+ delete mode 100644 fs/ntfs/namei.c
+ delete mode 100644 fs/ntfs/ntfs.h
+ delete mode 100644 fs/ntfs/quota.c
+ delete mode 100644 fs/ntfs/quota.h
+ delete mode 100644 fs/ntfs/runlist.c
+ delete mode 100644 fs/ntfs/runlist.h
+ delete mode 100644 fs/ntfs/super.c
+ delete mode 100644 fs/ntfs/sysctl.c
+ delete mode 100644 fs/ntfs/sysctl.h
+ delete mode 100644 fs/ntfs/time.h
+ delete mode 100644 fs/ntfs/types.h
+ delete mode 100644 fs/ntfs/unistr.c
+ delete mode 100644 fs/ntfs/upcase.c
+ delete mode 100644 fs/ntfs/usnjrnl.c
+ delete mode 100644 fs/ntfs/usnjrnl.h
+ delete mode 100644 fs/ntfs/volume.h
+ create mode 100644 fs/pidfs.c
+ create mode 100644 include/linux/pidfs.h
+$ git am -3 ../patches/0001-fixup-for-filelock-split-common-fields-into-struct-f.patch
+Applying: fixup for "filelock: split common fields into struct file_lock_core"
+$ git reset HEAD^
+Unstaged changes after reset:
+M fs/nfsd/nfs4state.c
+$ git add -A .
+$ git commit -v -a --amend
+[master 92a719460d68] Merge branch 'vfs.all' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git
+ Date: Wed Feb 28 09:26:28 2024 +1100
+Merging vfs/for-next (052d534373b7 Merge tag 'exfat-for-6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs/for-next
+Already up to date.
+Merging printk/for-next (e7081d5a9d97 Merge branch 'rework/console-flushing-fixes' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git printk/for-next
+Auto-merging kernel/panic.c
+Auto-merging kernel/printk/printk.c
+Merge made by the 'ort' strategy.
+ include/linux/printk.h | 2 +
+ kernel/panic.c | 8 +
+ kernel/printk/nbcon.c | 41 +----
+ kernel/printk/printk.c | 101 +++++++-----
+ kernel/printk/printk_ringbuffer.c | 337 ++++++++++++++++++++++++++++++++------
+ kernel/printk/printk_ringbuffer.h | 54 +++++-
+ lib/dump_stack.c | 16 +-
+ 7 files changed, 420 insertions(+), 139 deletions(-)
+Merging pci/next (5b52c9afa3dd Merge branch 'pci/misc')
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci/next
+Auto-merging MAINTAINERS
+Auto-merging drivers/pci/pci.c
+Auto-merging drivers/pci/pci.h
+Auto-merging drivers/pci/pcie/aspm.c
+Auto-merging include/linux/pci.h
+Auto-merging lib/Kconfig
+Auto-merging lib/Makefile
+Merge made by the 'ort' strategy.
+ .../ABI/testing/sysfs-bus-pci-devices-aer_stats | 18 +-
+ Documentation/driver-api/device-io.rst | 3 -
+ Documentation/driver-api/pci/pci.rst | 6 +
+ MAINTAINERS | 1 -
+ drivers/ntb/core.c | 8 +-
+ drivers/pci/Kconfig | 5 +
+ drivers/pci/Makefile | 7 +-
+ drivers/pci/controller/dwc/pci-imx6.c | 3 +-
+ drivers/pci/controller/dwc/pci-keystone.c | 12 +-
+ drivers/pci/controller/dwc/pci-layerscape-ep.c | 5 +-
+ drivers/pci/controller/dwc/pcie-keembay.c | 8 +-
+ drivers/pci/controller/dwc/pcie-rcar-gen4.c | 4 +-
+ drivers/pci/controller/dwc/pcie-tegra194.c | 10 +-
+ drivers/pci/controller/dwc/pcie-uniphier-ep.c | 15 +-
+ drivers/pci/controller/pcie-rcar-ep.c | 14 +-
+ drivers/pci/devres.c | 448 +++++++++++++++++++
+ drivers/pci/endpoint/functions/pci-epf-mhi.c | 21 +-
+ drivers/pci/endpoint/functions/pci-epf-ntb.c | 6 +-
+ drivers/pci/endpoint/functions/pci-epf-test.c | 21 +-
+ drivers/pci/endpoint/functions/pci-epf-vntb.c | 25 +-
+ drivers/pci/endpoint/pci-epc-core.c | 25 +-
+ drivers/pci/endpoint/pci-epf-core.c | 20 +-
+ lib/pci_iomap.c => drivers/pci/iomap.c | 5 +-
+ drivers/pci/irq.c | 204 +++++++++
+ drivers/pci/mmap.c | 29 ++
+ drivers/pci/p2pdma.c | 2 +-
+ drivers/pci/pci-driver.c | 11 +-
+ drivers/pci/pci-sysfs.c | 29 +-
+ drivers/pci/pci.c | 484 +--------------------
+ drivers/pci/pci.h | 50 ++-
+ drivers/pci/pcie/Makefile | 2 +-
+ drivers/pci/pcie/aspm.c | 235 ++++++++++
+ drivers/pci/pcie/dpc.c | 2 +-
+ drivers/pci/pcie/portdrv.h | 2 +-
+ drivers/pci/probe.c | 66 +--
+ drivers/pci/setup-irq.c | 64 ---
+ drivers/pci/switch/switchtec.c | 4 +-
+ include/linux/pci-epc.h | 39 +-
+ include/linux/pci-epf.h | 4 +-
+ include/linux/pci.h | 2 +-
+ lib/Kconfig | 3 -
+ lib/Makefile | 1 -
+ lib/devres.c | 208 +--------
+ 43 files changed, 1175 insertions(+), 956 deletions(-)
+ create mode 100644 drivers/pci/devres.c
+ rename lib/pci_iomap.c => drivers/pci/iomap.c (99%)
+ delete mode 100644 drivers/pci/setup-irq.c
+Merging pstore/for-next/pstore (98bc7e26e14f pstore/zone: Add a null pointer check to the psz_kmsg_read)
+$ git merge -m Merge branch 'for-next/pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git pstore/for-next/pstore
+Auto-merging arch/arm64/configs/defconfig
+Merge made by the 'ort' strategy.
+ arch/arm64/configs/defconfig | 1 +
+ drivers/firmware/efi/efi-pstore.c | 43 +++++++++++++++++++++++++++++++--------
+ fs/pstore/inode.c | 10 +++------
+ fs/pstore/ram.c | 1 +
+ fs/pstore/zone.c | 2 ++
+ 5 files changed, 42 insertions(+), 15 deletions(-)
+Merging hid/for-next (33d8d768a2ce Merge branch 'for-6.8/upstream-fixes' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git hid/for-next
+Merge made by the 'ort' strategy.
+ drivers/hid/amd-sfh-hid/amd_sfh_common.h | 16 +
+ drivers/hid/amd-sfh-hid/amd_sfh_pcie.c | 118 +++++-
+ drivers/hid/amd-sfh-hid/amd_sfh_pcie.h | 6 +-
+ drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_desc.c | 2 +-
+ drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.c | 4 +-
+ drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_interface.c | 10 +-
+ drivers/hid/hid-apple.c | 1 -
+ drivers/hid/hid-ids.h | 8 +
+ drivers/hid/hid-input.c | 2 +
+ drivers/hid/hid-lenovo.c | 57 ++-
+ drivers/hid/hid-lg3ff.c | 4 -
+ drivers/hid/hid-multitouch.c | 1 -
+ drivers/hid/hid-nintendo.c | 22 --
+ drivers/hid/hid-prodikeys.c | 117 ++----
+ drivers/hid/hid-samsung.c | 437 +++++++++++++++++++--
+ drivers/hid/intel-ish-hid/ipc/hw-ish.h | 1 +
+ drivers/hid/intel-ish-hid/ipc/pci-ish.c | 1 +
+ drivers/hid/wacom_wac.c | 8 +-
+ drivers/hid/wacom_wac.h | 1 -
+ include/linux/hid.h | 4 +-
+ 20 files changed, 623 insertions(+), 197 deletions(-)
+Merging i2c/i2c/for-next (d206a76d7d27 Linux 6.8-rc6)
+$ git merge -m Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/i2c/for-next
+Already up to date.
+Merging i2c-host/i2c/i2c-host (197ecadad842 i2c: designware: Implement generic polling mode code for Wangxun 10Gb NIC)
+$ git merge -m Merge branch 'i2c/i2c-host' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git i2c-host/i2c/i2c-host
+Auto-merging drivers/i2c/busses/i2c-i801.c
+Auto-merging drivers/i2c/busses/i2c-imx.c
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/i2c/atmel,at91sam-i2c.yaml | 4 +-
+ .../devicetree/bindings/i2c/i2c-imx-lpi2c.yaml | 1 +
+ .../devicetree/bindings/i2c/i2c-mux-pca954x.yaml | 30 ++
+ .../devicetree/bindings/i2c/renesas,rcar-i2c.yaml | 1 +
+ drivers/i2c/busses/i2c-designware-common.c | 2 +-
+ drivers/i2c/busses/i2c-designware-core.h | 23 +-
+ drivers/i2c/busses/i2c-designware-master.c | 424 +++++++++------------
+ drivers/i2c/busses/i2c-designware-pcidrv.c | 2 +-
+ drivers/i2c/busses/i2c-designware-platdrv.c | 2 +-
+ drivers/i2c/busses/i2c-hisi.c | 13 +-
+ drivers/i2c/busses/i2c-i801.c | 228 +++++------
+ drivers/i2c/busses/i2c-imx.c | 62 +--
+ drivers/i2c/busses/i2c-npcm7xx.c | 3 -
+ drivers/i2c/busses/i2c-sh_mobile.c | 27 +-
+ drivers/i2c/muxes/i2c-mux-pca954x.c | 43 ++-
+ 15 files changed, 432 insertions(+), 433 deletions(-)
+Merging i3c/i3c/next (8f06fb458539 i3c: Make i3c_bus_type const)
+$ git merge -m Merge branch 'i3c/next' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c/i3c/next
+Merge made by the 'ort' strategy.
+ Documentation/devicetree/bindings/i3c/aspeed,ast2600-i3c.yaml | 2 +-
+ Documentation/devicetree/bindings/i3c/cdns,i3c-master.yaml | 2 +-
+ Documentation/devicetree/bindings/i3c/i3c.yaml | 4 ++--
+ Documentation/devicetree/bindings/i3c/mipi-i3c-hci.yaml | 2 +-
+ Documentation/devicetree/bindings/i3c/silvaco,i3c-master.yaml | 2 +-
+ Documentation/devicetree/bindings/i3c/snps,dw-i3c-master.yaml | 2 +-
+ drivers/i3c/internals.h | 2 +-
+ drivers/i3c/master.c | 2 +-
+ drivers/i3c/master/dw-i3c-master.c | 4 +++-
+ 9 files changed, 12 insertions(+), 10 deletions(-)
+Merging hwmon-staging/hwmon-next (5b1d7a0f904b hwmon: (sis5595) drop unused DIV_TO_REG function)
+$ git merge -m Merge branch 'hwmon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-staging/hwmon-next
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ Documentation/ABI/testing/sysfs-class-hwmon | 27 +
+ .../devicetree/bindings/hwmon/adi,adm1177.yaml | 5 +-
+ .../devicetree/bindings/hwmon/adi,adm1275.yaml | 7 +-
+ .../devicetree/bindings/hwmon/adi,ltc2945.yaml | 5 +-
+ .../devicetree/bindings/hwmon/adi,ltc4282.yaml | 159 ++
+ .../bindings/hwmon/amphenol,chipcap2.yaml | 77 +
+ .../devicetree/bindings/hwmon/hwmon-common.yaml | 19 +
+ .../devicetree/bindings/hwmon/lltc,ltc4151.yaml | 5 +-
+ .../devicetree/bindings/hwmon/lltc,ltc4286.yaml | 9 +-
+ .../devicetree/bindings/hwmon/nuvoton,nct6775.yaml | 1 +
+ .../bindings/hwmon/pmbus/ti,lm25066.yaml | 17 +-
+ .../devicetree/bindings/hwmon/ti,ina2xx.yaml | 11 +-
+ .../devicetree/bindings/hwmon/ti,tmp513.yaml | 5 +-
+ .../devicetree/bindings/hwmon/ti,tps23861.yaml | 5 +-
+ .../bindings/regulator/infineon,ir38060.yaml | 45 +
+ .../devicetree/bindings/trivial-devices.yaml | 12 +-
+ .../devicetree/bindings/vendor-prefixes.yaml | 4 +
+ Documentation/hwmon/asus_rog_ryujin.rst | 47 +
+ Documentation/hwmon/chipcap2.rst | 73 +
+ Documentation/hwmon/emc2305.rst | 1 -
+ Documentation/hwmon/index.rst | 7 +
+ Documentation/hwmon/ltc4282.rst | 133 ++
+ Documentation/hwmon/max6620.rst | 2 +-
+ Documentation/hwmon/mpq8785.rst | 94 ++
+ Documentation/hwmon/nct6683.rst | 1 +
+ Documentation/hwmon/nzxt-kraken3.rst | 74 +
+ Documentation/hwmon/oxp-sensors.rst | 1 +
+ Documentation/hwmon/pt5161l.rst | 42 +
+ Documentation/hwmon/sht3x.rst | 11 +
+ Documentation/hwmon/surface_fan.rst | 25 +
+ MAINTAINERS | 167 +-
+ drivers/hwmon/Kconfig | 65 +
+ drivers/hwmon/Makefile | 6 +
+ drivers/hwmon/adm1177.c | 1 -
+ drivers/hwmon/adt7310.c | 2 +-
+ drivers/hwmon/adt7410.c | 4 +-
+ drivers/hwmon/asus_rog_ryujin.c | 609 +++++++
+ drivers/hwmon/axi-fan-control.c | 73 +-
+ drivers/hwmon/chipcap2.c | 822 +++++++++
+ drivers/hwmon/coretemp.c | 204 +--
+ drivers/hwmon/ds1621.c | 1 -
+ drivers/hwmon/ds620.c | 1 -
+ drivers/hwmon/emc1403.c | 2 +-
+ drivers/hwmon/emc2305.c | 5 -
+ drivers/hwmon/hwmon.c | 3 +
+ drivers/hwmon/ina209.c | 1 -
+ drivers/hwmon/ina238.c | 1 -
+ drivers/hwmon/ina3221.c | 2 +-
+ drivers/hwmon/jc42.c | 2 +-
+ drivers/hwmon/lm83.c | 2 +-
+ drivers/hwmon/ltc4282.c | 1782 ++++++++++++++++++++
+ drivers/hwmon/max127.c | 1 -
+ drivers/hwmon/max31760.c | 3 +-
+ drivers/hwmon/max31790.c | 1 -
+ drivers/hwmon/max31827.c | 1 -
+ drivers/hwmon/max6621.c | 1 -
+ drivers/hwmon/max6697.c | 1 -
+ drivers/hwmon/nct6683.c | 3 +
+ drivers/hwmon/nct7802.c | 2 +-
+ drivers/hwmon/nzxt-kraken3.c | 1008 +++++++++++
+ drivers/hwmon/occ/p8_i2c.c | 1 -
+ drivers/hwmon/oxp-sensors.c | 10 +
+ drivers/hwmon/pmbus/Kconfig | 9 +
+ drivers/hwmon/pmbus/Makefile | 1 +
+ drivers/hwmon/pmbus/ir36021.c | 1 -
+ drivers/hwmon/pmbus/ir38064.c | 2 +-
+ drivers/hwmon/pmbus/lm25066.c | 2 +-
+ drivers/hwmon/pmbus/mpq8785.c | 90 +
+ drivers/hwmon/pmbus/pmbus_core.c | 2 +-
+ drivers/hwmon/pmbus/tda38640.c | 2 +-
+ drivers/hwmon/powr1220.c | 1 -
+ drivers/hwmon/pt5161l.c | 667 ++++++++
+ drivers/hwmon/sbrmi.c | 1 -
+ drivers/hwmon/sbtsi_temp.c | 1 -
+ drivers/hwmon/sch5627.c | 2 +-
+ drivers/hwmon/sht3x.c | 66 +-
+ drivers/hwmon/sis5595.c | 8 +-
+ drivers/hwmon/surface_fan.c | 91 +
+ drivers/hwmon/tmp401.c | 2 +-
+ drivers/hwmon/w83773g.c | 1 -
+ include/linux/hwmon.h | 18 +-
+ 81 files changed, 6344 insertions(+), 334 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/hwmon/adi,ltc4282.yaml
+ create mode 100644 Documentation/devicetree/bindings/hwmon/amphenol,chipcap2.yaml
+ create mode 100644 Documentation/devicetree/bindings/hwmon/hwmon-common.yaml
+ create mode 100644 Documentation/devicetree/bindings/regulator/infineon,ir38060.yaml
+ create mode 100644 Documentation/hwmon/asus_rog_ryujin.rst
+ create mode 100644 Documentation/hwmon/chipcap2.rst
+ create mode 100644 Documentation/hwmon/ltc4282.rst
+ create mode 100644 Documentation/hwmon/mpq8785.rst
+ create mode 100644 Documentation/hwmon/nzxt-kraken3.rst
+ create mode 100644 Documentation/hwmon/pt5161l.rst
+ create mode 100644 Documentation/hwmon/surface_fan.rst
+ create mode 100644 drivers/hwmon/asus_rog_ryujin.c
+ create mode 100644 drivers/hwmon/chipcap2.c
+ create mode 100644 drivers/hwmon/ltc4282.c
+ create mode 100644 drivers/hwmon/nzxt-kraken3.c
+ create mode 100644 drivers/hwmon/pmbus/mpq8785.c
+ create mode 100644 drivers/hwmon/pt5161l.c
+ create mode 100644 drivers/hwmon/surface_fan.c
+Merging jc_docs/docs-next (32ed7930304c Merge branch 'docs-fixes' into docs-mw)
+$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Auto-merging Documentation/dev-tools/kasan.rst
+Auto-merging Documentation/process/changes.rst
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ Documentation/ABI/testing/sysfs-bus-vdpa | 10 +-
+ Documentation/Makefile | 1 +
+ Documentation/RCU/torture.rst | 2 +-
+ Documentation/admin-guide/README.rst | 63 +-
+ Documentation/admin-guide/index.rst | 1 +
+ Documentation/admin-guide/kernel-parameters.txt | 5 +
+ Documentation/admin-guide/tainted-kernels.rst | 4 +-
+ Documentation/dev-tools/checkpatch.rst | 4 +-
+ Documentation/dev-tools/kasan.rst | 21 +
+ Documentation/doc-guide/kernel-doc.rst | 45 +
+ Documentation/doc-guide/maintainer-profile.rst | 7 +
+ Documentation/doc-guide/sphinx.rst | 7 +-
+ Documentation/driver-api/index.rst | 209 +-
+ Documentation/fault-injection/index.rst | 2 +-
+ Documentation/filesystems/proc.rst | 4 +-
+ Documentation/index.rst | 52 +-
+ .../maintainer/maintainer-entry-profile.rst | 3 +
+ Documentation/networking/bridge.rst | 2 +-
+ Documentation/process/changes.rst | 4 +-
+ Documentation/process/coding-style.rst | 13 +-
+ .../process/embargoed-hardware-issues.rst | 2 +-
+ Documentation/process/howto.rst | 4 +-
+ Documentation/process/researcher-guidelines.rst | 2 +-
+ Documentation/sphinx/kerneldoc.py | 6 +-
+ Documentation/staging/rpmsg.rst | 2 +-
+ Documentation/subsystem-apis.rst | 2 +
+ Documentation/translations/it_IT/RCU/index.rst | 19 +
+ Documentation/translations/it_IT/RCU/torture.rst | 369 +++
+ .../translations/it_IT/core-api/index.rst | 12 +
+ .../translations/it_IT/i2c/i2c-protocol.rst | 99 +
+ Documentation/translations/it_IT/i2c/index.rst | 46 +
+ Documentation/translations/it_IT/i2c/summary.rst | 64 +
+ Documentation/translations/it_IT/index.rst | 2 +
+ Documentation/translations/it_IT/locking/index.rst | 20 +
+ .../translations/it_IT/locking/lockdep-design.rst | 678 ++++++
+ .../translations/it_IT/locking/lockstat.rst | 230 ++
+ .../translations/it_IT/locking/locktorture.rst | 181 ++
+ .../translations/it_IT/locking/locktypes.rst | 547 +++++
+ .../translations/it_IT/networking/netdev-FAQ.rst | 13 -
+ .../translations/it_IT/process/coding-style.rst | 6 +-
+ .../translations/it_IT/subsystem-apis.rst | 47 +
+ .../translations/sp_SP/process/coding-style.rst | 6 +-
+ .../sp_SP/process/embargoed-hardware-issues.rst | 2 +-
+ .../sp_SP/process/researcher-guidelines.rst | 2 +-
+ .../translations/zh_CN/process/coding-style.rst | 4 +-
+ .../zh_CN/process/embargoed-hardware-issues.rst | 2 +-
+ .../translations/zh_TW/process/coding-style.rst | 4 +-
+ .../zh_TW/process/embargoed-hardware-issues.rst | 2 +-
+ Documentation/userspace-api/index.rst | 47 +-
+ Documentation/userspace-api/perf_ring_buffer.rst | 830 +++++++
+ MAINTAINERS | 8 +-
+ README | 2 +-
+ drivers/gpu/drm/drm_gem_vram_helper.c | 44 +-
+ include/drm/drm_gem_vram_helper.h | 16 +-
+ scripts/kernel-doc | 2427 ++++++++++----------
+ scripts/sphinx-pre-install | 13 +-
+ 56 files changed, 4760 insertions(+), 1459 deletions(-)
+ create mode 100644 Documentation/translations/it_IT/RCU/index.rst
+ create mode 100644 Documentation/translations/it_IT/RCU/torture.rst
+ create mode 100644 Documentation/translations/it_IT/i2c/i2c-protocol.rst
+ create mode 100644 Documentation/translations/it_IT/i2c/index.rst
+ create mode 100644 Documentation/translations/it_IT/i2c/summary.rst
+ create mode 100644 Documentation/translations/it_IT/locking/index.rst
+ create mode 100644 Documentation/translations/it_IT/locking/lockdep-design.rst
+ create mode 100644 Documentation/translations/it_IT/locking/lockstat.rst
+ create mode 100644 Documentation/translations/it_IT/locking/locktorture.rst
+ create mode 100644 Documentation/translations/it_IT/locking/locktypes.rst
+ delete mode 100644 Documentation/translations/it_IT/networking/netdev-FAQ.rst
+ create mode 100644 Documentation/translations/it_IT/subsystem-apis.rst
+ create mode 100644 Documentation/userspace-api/perf_ring_buffer.rst
+Merging v4l-dvb/master (8c64f4cdf4e6 media: edia: dvbdev: fix a use-after-free)
+$ git merge -m Merge branch 'master' of git://linuxtv.org/media_tree.git v4l-dvb/master
+Auto-merging MAINTAINERS
+Auto-merging drivers/staging/media/atomisp/pci/atomisp_cmd.c
+CONFLICT (content): Merge conflict in drivers/staging/media/atomisp/pci/atomisp_cmd.c
+Auto-merging drivers/staging/media/atomisp/pci/atomisp_internal.h
+Auto-merging drivers/staging/media/atomisp/pci/atomisp_ioctl.c
+Auto-merging drivers/staging/media/atomisp/pci/atomisp_v4l2.c
+Resolved 'drivers/staging/media/atomisp/pci/atomisp_cmd.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master ebaea7c2e0c9] Merge branch 'master' of git://linuxtv.org/media_tree.git
+$ git diff -M --stat --summary HEAD^..
+ Documentation/admin-guide/media/vivid.rst | 2 +-
+ .../bindings/media/i2c/techwell,tw9900.yaml | 2 +-
+ .../bindings/media/st,stm32mp25-video-codec.yaml | 49 +
+ Documentation/driver-api/media/drivers/ccs/ccs.rst | 51 +-
+ Documentation/userspace-api/media/drivers/ccs.rst | 6 +-
+ .../userspace-api/media/dvb/legacy_dvb_apis.rst | 1 +
+ .../userspace-api/media/dvb/legacy_dvb_audio.rst | 1642 +++++++++++++
+ .../media/dvb/legacy_dvb_decoder_api.rst | 61 +
+ .../userspace-api/media/dvb/legacy_dvb_osd.rst | 883 +++++++
+ .../userspace-api/media/dvb/legacy_dvb_video.rst | 2430 ++++++++++++++++++++
+ .../userspace-api/media/mediactl/media-types.rst | 11 +-
+ .../media/v4l/vidioc-subdev-g-client-cap.rst | 15 +
+ MAINTAINERS | 1 +
+ arch/arm64/boot/dts/st/stm32mp251.dtsi | 12 +
+ arch/arm64/boot/dts/st/stm32mp255.dtsi | 17 +
+ drivers/media/cec/core/cec-adap.c | 14 -
+ drivers/media/cec/core/cec-core.c | 2 +-
+ drivers/media/common/v4l2-tpg/v4l2-tpg-core.c | 52 +-
+ drivers/media/dvb-core/dvb_frontend.c | 12 +-
+ drivers/media/dvb-core/dvbdev.c | 5 +
+ drivers/media/dvb-frontends/bcm3510.c | 3 +-
+ drivers/media/dvb-frontends/cx24110.c | 4 +-
+ drivers/media/dvb-frontends/dvb-pll.c | 6 +-
+ drivers/media/i2c/Kconfig | 2 +
+ drivers/media/i2c/adv7180.c | 4 +-
+ drivers/media/i2c/adv748x/adv748x.h | 1 -
+ drivers/media/i2c/alvium-csi2.c | 2 +-
+ drivers/media/i2c/ar0521.c | 6 +-
+ drivers/media/i2c/ccs/ccs-quirk.h | 8 +-
+ drivers/media/i2c/imx214.c | 2 +-
+ drivers/media/i2c/imx274.c | 2 +-
+ drivers/media/i2c/imx319.c | 53 +-
+ drivers/media/i2c/imx334.c | 41 +-
+ drivers/media/i2c/imx355.c | 53 +-
+ drivers/media/i2c/imx415.c | 672 ++++--
+ drivers/media/i2c/isl7998x.c | 2 +-
+ drivers/media/i2c/max2175.c | 2 +-
+ drivers/media/i2c/mt9v032.c | 2 +-
+ drivers/media/i2c/ov08x40.c | 1307 ++---------
+ drivers/media/i2c/st-vgxy61.c | 388 ++--
+ drivers/media/i2c/tc358743.c | 7 +-
+ drivers/media/i2c/tc358746.c | 4 +-
+ drivers/media/i2c/tvp5150.c | 2 +-
+ drivers/media/mc/mc-devnode.c | 3 +-
+ drivers/media/mc/mc-entity.c | 93 +-
+ drivers/media/pci/cx23885/cx23885-video.c | 8 +
+ drivers/media/pci/dt3155/dt3155.h | 1 -
+ drivers/media/pci/intel/ipu3/ipu3-cio2.c | 22 +-
+ drivers/media/platform/cadence/cdns-csi2rx.c | 19 +-
+ .../media/platform/mediatek/jpeg/mtk_jpeg_core.h | 1 -
+ .../media/platform/mediatek/mdp3/mdp_cfg_data.c | 729 +++++-
+ drivers/media/platform/mediatek/mdp3/mdp_reg_aal.h | 25 +
+ .../media/platform/mediatek/mdp3/mdp_reg_color.h | 31 +
+ drivers/media/platform/mediatek/mdp3/mdp_reg_fg.h | 23 +
+ drivers/media/platform/mediatek/mdp3/mdp_reg_hdr.h | 31 +
+ .../media/platform/mediatek/mdp3/mdp_reg_merge.h | 25 +
+ drivers/media/platform/mediatek/mdp3/mdp_reg_ovl.h | 25 +
+ drivers/media/platform/mediatek/mdp3/mdp_reg_pad.h | 21 +
+ .../media/platform/mediatek/mdp3/mdp_reg_rdma.h | 24 +
+ drivers/media/platform/mediatek/mdp3/mdp_reg_rsz.h | 2 +
+ .../media/platform/mediatek/mdp3/mdp_reg_tdshp.h | 34 +
+ .../media/platform/mediatek/mdp3/mdp_reg_wrot.h | 8 +
+ .../media/platform/mediatek/mdp3/mdp_sm_mt8195.h | 283 +++
+ drivers/media/platform/mediatek/mdp3/mtk-img-ipi.h | 4 +
+ .../media/platform/mediatek/mdp3/mtk-mdp3-cfg.h | 2 +
+ .../media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c | 438 +++-
+ .../media/platform/mediatek/mdp3/mtk-mdp3-cmdq.h | 1 +
+ .../media/platform/mediatek/mdp3/mtk-mdp3-comp.c | 895 ++++++-
+ .../media/platform/mediatek/mdp3/mtk-mdp3-comp.h | 93 +-
+ .../media/platform/mediatek/mdp3/mtk-mdp3-core.c | 144 +-
+ .../media/platform/mediatek/mdp3/mtk-mdp3-core.h | 50 +-
+ .../media/platform/mediatek/mdp3/mtk-mdp3-m2m.c | 15 +
+ .../media/platform/mediatek/mdp3/mtk-mdp3-regs.c | 18 +
+ .../media/platform/mediatek/mdp3/mtk-mdp3-regs.h | 1 +
+ .../media/platform/mediatek/mdp3/mtk-mdp3-vpu.c | 3 +-
+ .../mediatek/vcodec/decoder/mtk_vcodec_dec.h | 1 -
+ .../mediatek/vcodec/decoder/vdec/vdec_vp8_req_if.c | 1 -
+ .../vcodec/decoder/vdec/vdec_vp9_req_lat_if.c | 1 -
+ .../platform/mediatek/vcodec/decoder/vdec_vpu_if.h | 1 -
+ .../mediatek/vcodec/encoder/mtk_vcodec_enc.h | 1 -
+ .../platform/nxp/imx8-isi/imx8-isi-crossbar.c | 4 +-
+ drivers/media/platform/nxp/imx8-isi/imx8-isi-hw.c | 8 +-
+ drivers/media/platform/qcom/venus/core.h | 1 -
+ .../platform/samsung/exynos4-is/fimc-capture.c | 52 +-
+ .../media/platform/samsung/exynos4-is/fimc-core.c | 23 +-
+ .../media/platform/samsung/exynos4-is/fimc-core.h | 23 +-
+ .../platform/samsung/exynos4-is/fimc-isp-video.c | 2 +-
+ .../platform/samsung/exynos4-is/fimc-lite-reg.c | 13 +-
+ .../platform/samsung/exynos4-is/fimc-lite-reg.h | 12 +-
+ .../media/platform/samsung/exynos4-is/fimc-lite.c | 2 +-
+ .../media/platform/samsung/exynos4-is/fimc-lite.h | 3 -
+ .../media/platform/samsung/exynos4-is/fimc-m2m.c | 23 +-
+ .../media/platform/samsung/exynos4-is/fimc-reg.c | 38 +-
+ .../media/platform/samsung/exynos4-is/fimc-reg.h | 10 +-
+ drivers/media/platform/samsung/s5p-mfc/s5p_mfc.c | 76 +-
+ .../media/platform/samsung/s5p-mfc/s5p_mfc_cmd.c | 8 +-
+ .../media/platform/samsung/s5p-mfc/s5p_mfc_cmd.h | 2 +-
+ .../platform/samsung/s5p-mfc/s5p_mfc_cmd_v5.c | 6 +-
+ .../platform/samsung/s5p-mfc/s5p_mfc_cmd_v5.h | 2 +-
+ .../platform/samsung/s5p-mfc/s5p_mfc_cmd_v6.c | 8 +-
+ .../platform/samsung/s5p-mfc/s5p_mfc_cmd_v6.h | 2 +-
+ .../platform/samsung/s5p-mfc/s5p_mfc_common.h | 15 +-
+ .../media/platform/samsung/s5p-mfc/s5p_mfc_ctrl.c | 26 +-
+ .../media/platform/samsung/s5p-mfc/s5p_mfc_dec.c | 20 +-
+ .../media/platform/samsung/s5p-mfc/s5p_mfc_dec.h | 3 +-
+ .../media/platform/samsung/s5p-mfc/s5p_mfc_enc.c | 12 +-
+ .../media/platform/samsung/s5p-mfc/s5p_mfc_enc.h | 3 +-
+ .../media/platform/samsung/s5p-mfc/s5p_mfc_opr.c | 7 +-
+ .../platform/samsung/s5p-mfc/s5p_mfc_opr_v5.c | 28 +-
+ .../platform/samsung/s5p-mfc/s5p_mfc_opr_v5.h | 2 +-
+ .../platform/samsung/s5p-mfc/s5p_mfc_opr_v6.c | 36 +-
+ .../platform/samsung/s5p-mfc/s5p_mfc_opr_v6.h | 2 +-
+ .../media/platform/samsung/s5p-mfc/s5p_mfc_pm.c | 51 +-
+ .../media/platform/samsung/s5p-mfc/s5p_mfc_pm.h | 8 +-
+ .../media/platform/ti/j721e-csi2rx/j721e-csi2rx.c | 24 +
+ drivers/media/platform/verisilicon/Kconfig | 14 +-
+ drivers/media/platform/verisilicon/Makefile | 3 +
+ drivers/media/platform/verisilicon/hantro.h | 1 -
+ drivers/media/platform/verisilicon/hantro_drv.c | 4 +
+ .../platform/verisilicon/hantro_g1_h264_dec.c | 2 +-
+ drivers/media/platform/verisilicon/hantro_hw.h | 2 +
+ .../verisilicon/rockchip_vpu2_hw_h264_dec.c | 2 +-
+ .../platform/verisilicon/rockchip_vpu981_regs.h | 2 +-
+ .../media/platform/verisilicon/stm32mp25_vpu_hw.c | 186 ++
+ drivers/media/platform/xilinx/Kconfig | 4 +-
+ drivers/media/tuners/xc4000.c | 4 +-
+ drivers/media/usb/cx231xx/cx231xx-417.c | 2 +-
+ drivers/media/usb/dvb-usb/dvb-usb.h | 2 -
+ drivers/media/usb/em28xx/em28xx-cards.c | 4 +
+ drivers/media/v4l2-core/v4l2-cci.c | 4 +-
+ drivers/media/v4l2-core/v4l2-common.c | 47 +
+ drivers/media/v4l2-core/v4l2-ctrls-core.c | 18 +-
+ drivers/media/v4l2-core/v4l2-mc.c | 23 +-
+ drivers/media/v4l2-core/v4l2-mem2mem.c | 10 +-
+ drivers/staging/media/atomisp/TODO | 10 -
+ drivers/staging/media/atomisp/i2c/gc2235.h | 5 +-
+ drivers/staging/media/atomisp/pci/atomisp_cmd.c | 141 +-
+ .../media/atomisp/pci/atomisp_compat_css20.c | 2 +-
+ drivers/staging/media/atomisp/pci/atomisp_drvfs.c | 148 +-
+ drivers/staging/media/atomisp/pci/atomisp_drvfs.h | 5 +-
+ .../staging/media/atomisp/pci/atomisp_internal.h | 1 +
+ drivers/staging/media/atomisp/pci/atomisp_ioctl.c | 8 -
+ drivers/staging/media/atomisp/pci/atomisp_v4l2.c | 260 +--
+ .../pci/base/circbuf/interface/ia_css_circbuf.h | 2 +-
+ .../media/atomisp/pci/base/circbuf/src/circbuf.c | 6 +-
+ .../staging/media/atomisp/pci/ia_css_acc_types.h | 4 +-
+ drivers/staging/media/atomisp/pci/ia_css_control.h | 29 +-
+ .../staging/media/atomisp/pci/ia_css_firmware.h | 6 +-
+ drivers/staging/media/atomisp/pci/ia_css_irq.h | 6 +-
+ .../atomisp/pci/isp/kernels/hdr/ia_css_hdr_types.h | 4 +-
+ .../kernels/macc/macc_1.0/ia_css_macc_table.host.c | 4 +-
+ .../atomisp/pci/isp2400_input_system_global.h | 2 +-
+ .../atomisp/pci/isp2400_input_system_public.h | 2 +-
+ .../media/atomisp/pci/runtime/binary/src/binary.c | 2 +-
+ .../atomisp/pci/runtime/pipeline/src/pipeline.c | 2 +-
+ .../media/atomisp/pci/runtime/queue/src/queue.c | 22 +-
+ .../media/atomisp/pci/runtime/rmgr/src/rmgr_vbuf.c | 6 +-
+ drivers/staging/media/atomisp/pci/sh_css.c | 35 +-
+ drivers/staging/media/atomisp/pci/sh_css_defs.h | 2 +-
+ drivers/staging/media/atomisp/pci/sh_css_mipi.c | 4 +-
+ .../staging/media/ipu3/include/uapi/intel-ipu3.h | 3 -
+ drivers/staging/media/ipu3/ipu3-v4l2.c | 16 +-
+ drivers/staging/media/meson/vdec/vdec.h | 1 -
+ include/media/cec.h | 2 -
+ include/media/media-entity.h | 6 +-
+ include/media/v4l2-common.h | 32 +-
+ include/media/videobuf2-core.h | 2 +-
+ include/uapi/linux/videodev2.h | 32 +-
+ 168 files changed, 9716 insertions(+), 2903 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/media/st,stm32mp25-video-codec.yaml
+ create mode 100644 Documentation/userspace-api/media/dvb/legacy_dvb_audio.rst
+ create mode 100644 Documentation/userspace-api/media/dvb/legacy_dvb_decoder_api.rst
+ create mode 100644 Documentation/userspace-api/media/dvb/legacy_dvb_osd.rst
+ create mode 100644 Documentation/userspace-api/media/dvb/legacy_dvb_video.rst
+ create mode 100644 drivers/media/platform/mediatek/mdp3/mdp_reg_aal.h
+ create mode 100644 drivers/media/platform/mediatek/mdp3/mdp_reg_color.h
+ create mode 100644 drivers/media/platform/mediatek/mdp3/mdp_reg_fg.h
+ create mode 100644 drivers/media/platform/mediatek/mdp3/mdp_reg_hdr.h
+ create mode 100644 drivers/media/platform/mediatek/mdp3/mdp_reg_merge.h
+ create mode 100644 drivers/media/platform/mediatek/mdp3/mdp_reg_ovl.h
+ create mode 100644 drivers/media/platform/mediatek/mdp3/mdp_reg_pad.h
+ create mode 100644 drivers/media/platform/mediatek/mdp3/mdp_reg_tdshp.h
+ create mode 100644 drivers/media/platform/mediatek/mdp3/mdp_sm_mt8195.h
+ create mode 100644 drivers/media/platform/verisilicon/stm32mp25_vpu_hw.c
+Merging v4l-dvb-next/master (e0b8eb0f6d65 media: visl: Add codec specific variability on output frames)
+$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ Documentation/admin-guide/media/visl.rst | 12 +-
+ Documentation/driver-api/media/v4l2-subdev.rst | 2 +-
+ MAINTAINERS | 1 +
+ drivers/media/cec/platform/cros-ec/cros-ec-cec.c | 2 +
+ drivers/media/dvb-core/dvb_frontend.c | 13 +-
+ drivers/media/dvb-frontends/bcm3510_priv.h | 6 +-
+ drivers/media/dvb-frontends/cx24110.h | 8 +-
+ drivers/media/dvb-frontends/stv6110x_priv.h | 8 +-
+ drivers/media/dvb-frontends/tda8083.h | 8 +-
+ drivers/media/dvb-frontends/zl10036.c | 2 +-
+ drivers/media/dvb-frontends/zl10036.h | 2 +-
+ drivers/media/i2c/msp3400-driver.c | 20 +-
+ drivers/media/i2c/msp3400-driver.h | 2 +-
+ drivers/media/i2c/st-vgxy61.c | 2 +-
+ drivers/media/pci/bt8xx/bttv-gpio.c | 2 +-
+ drivers/media/pci/bt8xx/bttvp.h | 2 +-
+ drivers/media/pci/sta2x11/sta2x11_vip.c | 9 +-
+ drivers/media/platform/amphion/vdec.c | 4 +-
+ drivers/media/platform/marvell/Kconfig | 2 +
+ .../vcodec/decoder/mtk_vcodec_dec_stateless.c | 14 +-
+ drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c | 16 ++
+ drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.h | 1 +
+ drivers/media/platform/renesas/Kconfig | 16 ++
+ drivers/media/platform/renesas/Makefile | 1 +
+ .../platform/renesas/{rcar-vin => }/rcar-csi2.c | 0
+ drivers/media/platform/renesas/rcar-vin/Kconfig | 16 --
+ drivers/media/platform/renesas/rcar-vin/Makefile | 1 -
+ .../media/platform/renesas/rzg2l-cru/rzg2l-cru.h | 3 -
+ .../media/platform/renesas/rzg2l-cru/rzg2l-csi2.c | 37 ++-
+ .../media/platform/renesas/rzg2l-cru/rzg2l-ip.c | 18 +-
+ .../media/platform/renesas/rzg2l-cru/rzg2l-video.c | 83 +++---
+ drivers/media/platform/sunxi/sun8i-di/sun8i-di.c | 69 ++---
+ .../media/platform/ti/j721e-csi2rx/j721e-csi2rx.c | 5 +-
+ drivers/media/test-drivers/vidtv/vidtv_bridge.c | 26 +-
+ drivers/media/test-drivers/visl/visl-core.c | 15 +-
+ drivers/media/test-drivers/visl/visl-dec.c | 311 +++++++++++++--------
+ drivers/media/test-drivers/visl/visl.h | 1 +
+ drivers/media/tuners/tda18271-fe.c | 1 -
+ drivers/media/usb/go7007/go7007-usb.c | 4 +-
+ drivers/media/usb/pvrusb2/pvrusb2-context.c | 8 +-
+ drivers/media/usb/pvrusb2/pvrusb2-dvb.c | 12 +-
+ drivers/media/usb/pvrusb2/pvrusb2-v4l2.c | 11 +-
+ drivers/media/v4l2-core/v4l2-ctrls-api.c | 2 +-
+ drivers/media/v4l2-core/v4l2-ctrls-core.c | 5 +-
+ drivers/media/v4l2-core/v4l2-ioctl.c | 2 +-
+ drivers/staging/media/imx/imx-media-csc-scaler.c | 1 +
+ drivers/staging/media/imx/imx-media-fim.c | 2 +-
+ drivers/staging/media/starfive/camss/stf-capture.c | 8 +-
+ drivers/staging/media/sunxi/cedrus/cedrus_h265.c | 10 +-
+ include/media/videobuf2-core.h | 13 +-
+ 50 files changed, 444 insertions(+), 375 deletions(-)
+ rename drivers/media/platform/renesas/{rcar-vin => }/rcar-csi2.c (100%)
+Merging pm/linux-next (377070604cce Merge branch 'thermal-core' into linux-next)
+$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Auto-merging arch/arm/configs/imx_v6_v7_defconfig
+Auto-merging arch/x86/Kconfig
+Auto-merging drivers/acpi/Kconfig
+Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
+Auto-merging drivers/pci/pci.c
+Auto-merging include/linux/cpufreq.h
+Auto-merging kernel/power/swap.c
+Merge made by the 'ort' strategy.
+ Documentation/admin-guide/kernel-parameters.txt | 16 +
+ Documentation/admin-guide/pm/amd-pstate.rst | 59 ++-
+ Documentation/firmware-guide/acpi/index.rst | 1 -
+ .../firmware-guide/acpi/method-customizing.rst | 89 ----
+ Documentation/power/energy-model.rst | 183 +++++++-
+ Documentation/power/pci.rst | 2 +-
+ Documentation/power/runtime_pm.rst | 22 +-
+ arch/arm/configs/imx_v6_v7_defconfig | 1 -
+ arch/x86/Kconfig | 5 +-
+ drivers/accel/ivpu/ivpu_pm.c | 2 +-
+ drivers/acpi/Kconfig | 14 -
+ drivers/acpi/Makefile | 1 -
+ drivers/acpi/acpi_processor.c | 2 +-
+ drivers/acpi/acpi_video.c | 28 +-
+ drivers/acpi/acpi_watchdog.c | 2 +-
+ drivers/acpi/bus.c | 2 +-
+ drivers/acpi/cppc_acpi.c | 13 +
+ drivers/acpi/custom_method.c | 103 -----
+ drivers/acpi/ec.c | 112 +++--
+ drivers/acpi/internal.h | 1 +
+ drivers/acpi/mipi-disco-img.c | 71 +++
+ drivers/acpi/nfit/core.c | 5 +-
+ drivers/acpi/pci_slot.c | 2 +-
+ drivers/acpi/processor_driver.c | 6 +
+ drivers/acpi/processor_idle.c | 2 +
+ drivers/acpi/property.c | 3 +
+ drivers/acpi/resource.c | 28 ++
+ drivers/acpi/scan.c | 1 +
+ drivers/acpi/thermal.c | 59 +--
+ drivers/acpi/thermal_lib.c | 8 +-
+ drivers/acpi/utils.c | 2 +-
+ drivers/acpi/x86/s2idle.c | 37 +-
+ drivers/acpi/x86/utils.c | 38 +-
+ drivers/base/power/main.c | 269 +++++------
+ drivers/base/power/runtime.c | 36 +-
+ drivers/cpufreq/amd-pstate.c | 185 +++++++-
+ drivers/cpufreq/cpufreq.c | 4 +-
+ drivers/cpufreq/cpufreq_ondemand.c | 1 -
+ drivers/cpufreq/intel_pstate.c | 49 +-
+ drivers/cpuidle/driver.c | 3 +-
+ drivers/cpuidle/governors/haltpoll.c | 9 +-
+ drivers/gpu/drm/i915/intel_runtime_pm.c | 5 +-
+ drivers/gpu/drm/xe/xe_pm.c | 2 +-
+ drivers/media/i2c/ccs/ccs-core.c | 2 +-
+ drivers/media/i2c/ov64a40.c | 2 +-
+ drivers/media/i2c/thp7312.c | 2 +-
+ drivers/net/ipa/ipa_smp2p.c | 2 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 2 -
+ drivers/net/wireless/intel/iwlwifi/mvm/tt.c | 68 ++-
+ drivers/pci/pci.c | 2 +-
+ drivers/powercap/dtpm_cpu.c | 43 +-
+ drivers/powercap/dtpm_devfreq.c | 34 +-
+ drivers/powercap/intel_rapl_common.c | 36 +-
+ drivers/powercap/intel_rapl_msr.c | 8 +-
+ drivers/powercap/intel_rapl_tpmi.c | 15 +
+ drivers/thermal/Kconfig | 11 -
+ drivers/thermal/cpufreq_cooling.c | 45 +-
+ drivers/thermal/devfreq_cooling.c | 51 ++-
+ drivers/thermal/gov_bang_bang.c | 2 +-
+ drivers/thermal/gov_fair_share.c | 16 +-
+ drivers/thermal/gov_power_allocator.c | 2 +
+ drivers/thermal/imx_thermal.c | 1 +
+ drivers/thermal/intel/Kconfig | 2 -
+ .../intel/int340x_thermal/int340x_thermal_zone.c | 32 +-
+ .../intel/int340x_thermal/int340x_thermal_zone.h | 2 -
+ .../int340x_thermal/processor_thermal_device.c | 8 +-
+ .../int340x_thermal/processor_thermal_device_pci.c | 9 +-
+ .../intel/int340x_thermal/processor_thermal_rapl.c | 8 +-
+ drivers/thermal/intel/intel_pch_thermal.c | 26 +-
+ drivers/thermal/intel/intel_quark_dts_thermal.c | 14 +-
+ drivers/thermal/intel/intel_soc_dts_iosf.c | 40 +-
+ drivers/thermal/intel/intel_soc_dts_iosf.h | 1 -
+ drivers/thermal/intel/intel_tcc.c | 12 +-
+ drivers/thermal/intel/x86_pkg_temp_thermal.c | 45 +-
+ drivers/thermal/thermal_core.c | 56 +--
+ drivers/thermal/thermal_helpers.c | 10 +-
+ drivers/thermal/thermal_hwmon.c | 4 +-
+ drivers/thermal/thermal_of.c | 31 +-
+ drivers/thermal/thermal_sysfs.c | 19 +-
+ drivers/thermal/thermal_trip.c | 6 +-
+ include/acpi/acpi_bus.h | 24 +-
+ include/acpi/cppc_acpi.h | 5 +
+ include/linux/acpi.h | 1 +
+ include/linux/amd-pstate.h | 10 +
+ include/linux/cpufreq.h | 5 +-
+ include/linux/energy_model.h | 166 ++++---
+ include/linux/intel_rapl.h | 6 +
+ include/linux/intel_tcc.h | 2 +-
+ include/linux/pm.h | 30 +-
+ include/linux/pm_runtime.h | 30 +-
+ include/linux/suspend.h | 74 +---
+ include/linux/thermal.h | 22 +-
+ include/trace/events/rpm.h | 42 ++
+ kernel/power/Kconfig | 26 +-
+ kernel/power/energy_model.c | 493 +++++++++++++++++----
+ kernel/power/hibernate.c | 107 ++++-
+ kernel/power/main.c | 182 +++++---
+ kernel/power/power.h | 23 +-
+ kernel/power/snapshot.c | 25 +-
+ kernel/power/suspend.c | 8 +-
+ kernel/power/swap.c | 197 ++++----
+ kernel/power/user.c | 4 +-
+ sound/hda/hdac_device.c | 2 +-
+ .../x86_energy_perf_policy.c | 1 +
+ 104 files changed, 2386 insertions(+), 1251 deletions(-)
+ delete mode 100644 Documentation/firmware-guide/acpi/method-customizing.rst
+ delete mode 100644 drivers/acpi/custom_method.c
+Merging cpufreq-arm/cpufreq/arm/linux-next (3093fa33539b cpufreq: qcom-hw: add CONFIG_COMMON_CLK dependency)
+$ git merge -m Merge branch 'cpufreq/arm/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git cpufreq-arm/cpufreq/arm/linux-next
+Merge made by the 'ort' strategy.
+ Documentation/power/opp.rst | 2 +-
+ Documentation/translations/zh_CN/power/opp.rst | 2 +-
+ drivers/cpufreq/Kconfig.arm | 1 +
+ drivers/cpufreq/brcmstb-avs-cpufreq.c | 2 ++
+ drivers/cpufreq/cpufreq-dt-platdev.c | 1 +
+ drivers/cpufreq/imx6q-cpufreq.c | 43 +++++++++-----------------
+ drivers/cpufreq/mediatek-cpufreq-hw.c | 19 +++++++++++-
+ 7 files changed, 38 insertions(+), 32 deletions(-)
+Merging cpupower/cpupower (babb46746cc5 Fix cpupower-frequency-info.1 man page typo)
+$ git merge -m Merge branch 'cpupower' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git cpupower/cpupower
+Merge made by the 'ort' strategy.
+ tools/power/cpupower/man/cpupower-frequency-info.1 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging devfreq/devfreq-next (b401b621758e Linux 6.8-rc5)
+$ git merge -m Merge branch 'devfreq-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git devfreq/devfreq-next
+Already up to date.
+Merging pmdomain/next (713240877a26 pmdomain: renesas: Adjust the waiting time to cover the worst case)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git pmdomain/next
+Auto-merging drivers/media/platform/qcom/venus/core.h
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/power/qcom,rpmpd.yaml | 2 +
+ .../bindings/soc/imx/fsl,imx8mp-hdmi-blk-ctrl.yaml | 22 +--
+ drivers/base/power/common.c | 134 +++++++++++++++++
+ drivers/media/platform/qcom/venus/core.c | 12 +-
+ drivers/media/platform/qcom/venus/core.h | 7 +-
+ drivers/media/platform/qcom/venus/pm_helpers.c | 48 +++----
+ drivers/pmdomain/core.c | 149 +++++++++++--------
+ drivers/pmdomain/imx/imx8m-blk-ctrl.c | 9 +-
+ drivers/pmdomain/imx/imx8mp-blk-ctrl.c | 19 +--
+ drivers/pmdomain/imx/scu-pd.c | 2 +-
+ drivers/pmdomain/mediatek/mtk-scpsys.c | 4 +-
+ drivers/pmdomain/qcom/rpmpd.c | 96 ++++++++++++-
+ drivers/pmdomain/renesas/Kconfig | 4 +
+ drivers/pmdomain/renesas/Makefile | 1 +
+ drivers/pmdomain/renesas/r8a779a0-sysc.c | 12 --
+ drivers/pmdomain/renesas/r8a779f0-sysc.c | 12 --
+ drivers/pmdomain/renesas/r8a779g0-sysc.c | 12 --
+ drivers/pmdomain/renesas/r8a779h0-sysc.c | 54 +++++++
+ drivers/pmdomain/renesas/rcar-gen4-sysc.c | 3 +
+ drivers/pmdomain/renesas/rcar-gen4-sysc.h | 1 +
+ drivers/pmdomain/renesas/rcar-sysc.c | 4 +-
+ drivers/pmdomain/tegra/powergate-bpmp.c | 2 +-
+ drivers/pmdomain/ti/omap_prm.c | 2 +
+ drivers/pmdomain/ti/ti_sci_pm_domains.c | 2 +-
+ drivers/pmdomain/xilinx/zynqmp-pm-domains.c | 2 +-
+ drivers/remoteproc/imx_dsp_rproc.c | 82 ++---------
+ drivers/remoteproc/imx_rproc.c | 73 ++--------
+ drivers/remoteproc/qcom_q6v5_adsp.c | 160 ++++++++++-----------
+ include/dt-bindings/power/qcom-rpmpd.h | 7 +
+ include/linux/pm_domain.h | 60 ++++++--
+ 30 files changed, 591 insertions(+), 406 deletions(-)
+ create mode 100644 drivers/pmdomain/renesas/r8a779h0-sysc.c
+Merging opp/opp/linux-next (ace4b31b297d cpufreq: Move dev_pm_opp_{init|free}_cpufreq_table() to pm_opp.h)
+$ git merge -m Merge branch 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git opp/opp/linux-next
+Auto-merging include/linux/cpufreq.h
+Merge made by the 'ort' strategy.
+ include/linux/cpufreq.h | 20 --------------------
+ include/linux/pm_opp.h | 16 ++++++++++++++++
+ 2 files changed, 16 insertions(+), 20 deletions(-)
+Merging thermal/thermal/linux-next (9ac53d5532cc thermal/drivers/sun8i: Don't fail probe due to zone registration failure)
+$ git merge -m Merge branch 'thermal/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git thermal/thermal/linux-next
+Auto-merging drivers/thermal/thermal_of.c
+Merge made by the 'ort' strategy.
+ .../bindings/thermal/allwinner,sun8i-a83t-ths.yaml | 34 +++--
+ .../devicetree/bindings/thermal/qoriq-thermal.yaml | 3 +-
+ drivers/soc/sunxi/sunxi_sram.c | 22 ++++
+ drivers/thermal/Makefile | 2 +-
+ drivers/thermal/mediatek/auxadc_thermal.c | 3 +
+ drivers/thermal/mediatek/lvts_thermal.c | 4 +-
+ drivers/thermal/st/st_thermal.h | 18 +--
+ drivers/thermal/st/st_thermal_memmap.c | 2 +-
+ drivers/thermal/sun8i_thermal.c | 139 +++++++++++++++++----
+ drivers/thermal/thermal_of.c | 2 +-
+ 10 files changed, 181 insertions(+), 48 deletions(-)
+Merging dlm/next (5beebc1dda47 dlm: update format header reflect current format)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm/next
+Already up to date.
+Merging rdma/for-next (14b526f55ba5 RDMA/uverbs: Remove flexible arrays from struct *_filter)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma/for-next
+Auto-merging drivers/infiniband/hw/irdma/verbs.c
+Auto-merging drivers/infiniband/ulp/srpt/ib_srpt.c
+Merge made by the 'ort' strategy.
+ drivers/infiniband/core/device.c | 37 +--
+ drivers/infiniband/core/uverbs_cmd.c | 16 +-
+ drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 2 -
+ drivers/infiniband/hw/efa/efa.h | 1 +
+ drivers/infiniband/hw/efa/efa_main.c | 32 ++-
+ drivers/infiniband/hw/hfi1/tid_rdma.c | 25 +-
+ drivers/infiniband/hw/hns/hns_roce_cq.c | 11 +-
+ drivers/infiniband/hw/hns/hns_roce_device.h | 33 ++-
+ drivers/infiniband/hw/hns/hns_roce_hem.c | 95 ++-----
+ drivers/infiniband/hw/hns/hns_roce_hem.h | 56 +---
+ drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 127 ++++-----
+ drivers/infiniband/hw/hns/hns_roce_mr.c | 341 ++++++++++++++++++-------
+ drivers/infiniband/hw/irdma/verbs.c | 3 +-
+ drivers/infiniband/hw/mana/cq.c | 25 +-
+ drivers/infiniband/hw/mana/main.c | 40 +--
+ drivers/infiniband/hw/mana/mana_ib.h | 20 +-
+ drivers/infiniband/hw/mana/mr.c | 13 +-
+ drivers/infiniband/hw/mana/qp.c | 88 ++-----
+ drivers/infiniband/hw/mlx5/mlx5_ib.h | 1 -
+ drivers/infiniband/sw/rxe/rxe.c | 6 +-
+ drivers/infiniband/sw/rxe/rxe.h | 6 +-
+ drivers/infiniband/sw/rxe/rxe_comp.c | 4 +-
+ drivers/infiniband/sw/rxe/rxe_cq.c | 4 +-
+ drivers/infiniband/sw/rxe/rxe_loc.h | 2 +-
+ drivers/infiniband/sw/rxe/rxe_mr.c | 18 +-
+ drivers/infiniband/sw/rxe/rxe_mw.c | 2 +-
+ drivers/infiniband/sw/rxe/rxe_qp.c | 8 +-
+ drivers/infiniband/sw/rxe/rxe_resp.c | 12 +-
+ drivers/infiniband/sw/rxe/rxe_task.c | 4 +-
+ drivers/infiniband/sw/rxe/rxe_verbs.c | 218 ++++++++--------
+ drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 3 +-
+ drivers/infiniband/ulp/srpt/ib_srpt.c | 3 +-
+ include/rdma/ib_verbs.h | 19 +-
+ 33 files changed, 647 insertions(+), 628 deletions(-)
+Merging net-next/main (f8cbf6bde4c8 netlink: use kvmalloc() in netlink_alloc_large_skb())
+$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/main
+Auto-merging .mailmap
+Auto-merging Documentation/userspace-api/ioctl/ioctl-number.rst
+Auto-merging MAINTAINERS
+Auto-merging drivers/dpll/dpll_core.c
+Auto-merging drivers/net/ethernet/broadcom/tg3.c
+Auto-merging drivers/net/ethernet/intel/ice/ice_base.c
+Auto-merging drivers/net/ethernet/intel/ice/ice_dpll.c
+Auto-merging drivers/net/ethernet/intel/ice/ice_lib.c
+Auto-merging drivers/net/ethernet/intel/ice/ice_lib.h
+Auto-merging drivers/net/ethernet/intel/ice/ice_main.c
+Auto-merging drivers/net/ethernet/pensando/ionic/ionic_ethtool.c
+Auto-merging drivers/net/ethernet/pensando/ionic/ionic_lif.c
+Auto-merging drivers/net/ethernet/toshiba/ps3_gelic_net.c
+Auto-merging drivers/net/tun.c
+Auto-merging drivers/net/usb/lan78xx.c
+Auto-merging drivers/net/veth.c
+Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/d3.c
+Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
+Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
+CONFLICT (content): Merge conflict in drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
+Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/sta.c
+Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/sta.h
+Auto-merging fs/eventpoll.c
+Auto-merging include/linux/dpll.h
+Auto-merging include/linux/netdevice.h
+Auto-merging include/net/mctp.h
+Auto-merging kernel/bpf/verifier.c
+Auto-merging net/core/dev.c
+Auto-merging net/ipv4/ip_tunnel.c
+Auto-merging net/ipv6/addrconf.c
+Auto-merging net/ipv6/ip6_gre.c
+Auto-merging net/iucv/iucv.c
+Auto-merging net/mac80211/rate.c
+Auto-merging net/mctp/route.c
+Auto-merging net/mpls/mpls_gso.c
+Auto-merging net/mptcp/options.c
+Auto-merging net/mptcp/protocol.c
+CONFLICT (content): Merge conflict in net/mptcp/protocol.c
+Auto-merging net/mptcp/protocol.h
+Auto-merging net/netlink/af_netlink.c
+Auto-merging net/wireless/nl80211.c
+Auto-merging net/xfrm/xfrm_user.c
+Auto-merging tools/testing/selftests/net/mptcp/diag.sh
+Auto-merging tools/testing/selftests/net/mptcp/mptcp_join.sh
+Auto-merging tools/testing/selftests/net/mptcp/mptcp_lib.sh
+Resolved 'drivers/net/wireless/intel/iwlwifi/mvm/mvm.h' using previous resolution.
+Recorded preimage for 'net/mptcp/protocol.c'
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+Recorded resolution for 'net/mptcp/protocol.c'.
+[master 1322f1801e59] Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git
+$ git diff -M --stat --summary HEAD^..
+ .mailmap | 1 +
+ .../bpf/standardization/instruction-set.rst | 80 +-
+ Documentation/bpf/verifier.rst | 2 +-
+ Documentation/dev-tools/kselftest.rst | 12 +
+ Documentation/devicetree/bindings/leds/common.yaml | 12 +
+ .../devicetree/bindings/leds/leds-bcm63138.yaml | 4 -
+ .../devicetree/bindings/leds/leds-bcm6328.yaml | 4 -
+ .../devicetree/bindings/leds/leds-bcm6358.txt | 2 -
+ .../bindings/leds/leds-pwm-multicolor.yaml | 4 -
+ .../devicetree/bindings/leds/leds-pwm.yaml | 5 -
+ .../devicetree/bindings/net/can/tcan4x5x.txt | 3 +
+ .../devicetree/bindings/net/can/xilinx,can.yaml | 5 +
+ .../devicetree/bindings/net/cdns,macb.yaml | 5 +
+ .../devicetree/bindings/net/dsa/ar9331.txt | 147 -
+ .../devicetree/bindings/net/dsa/microchip,ksz.yaml | 1 +
+ .../devicetree/bindings/net/dsa/qca,ar9331.yaml | 161 ++
+ .../bindings/net/ethernet-phy-package.yaml | 52 +
+ Documentation/devicetree/bindings/net/fsl,fec.yaml | 3 +
+ .../devicetree/bindings/net/nfc/ti,trf7970a.yaml | 2 +-
+ .../devicetree/bindings/net/qca,qca808x.yaml | 54 +
+ .../devicetree/bindings/net/qcom,ethqos.yaml | 9 +-
+ .../devicetree/bindings/net/qcom,ipa.yaml | 2 +-
+ .../devicetree/bindings/net/qcom,ipq4019-mdio.yaml | 15 +
+ .../devicetree/bindings/net/qcom,qca807x.yaml | 184 ++
+ .../devicetree/bindings/net/snps,dwmac.yaml | 17 +-
+ .../bindings/net/starfive,jh7110-dwmac.yaml | 72 +-
+ .../devicetree/bindings/net/ti,cpsw-switch.yaml | 5 +-
+ .../devicetree/bindings/net/ti,dp83822.yaml | 34 +
+ .../bindings/net/ti,k3-am654-cpsw-nuss.yaml | 5 +-
+ .../devicetree/bindings/net/ti,k3-am654-cpts.yaml | 5 +-
+ Documentation/netlink/netlink-raw.yaml | 15 +-
+ Documentation/netlink/specs/dpll.yaml | 39 +
+ Documentation/netlink/specs/tc.yaml | 2135 +++++++++++++-
+ Documentation/networking/bonding.rst | 12 +
+ Documentation/networking/can.rst | 34 +-
+ .../device_drivers/ethernet/amazon/ena.rst | 6 +
+ .../networking/device_drivers/ethernet/index.rst | 1 +
+ .../ethernet/marvell/octeon_ep_vf.rst | 24 +
+ .../networking/device_drivers/wwan/t7xx.rst | 46 +
+ Documentation/networking/devlink/mlx5.rst | 9 +-
+ Documentation/networking/ip-sysctl.rst | 14 +-
+ Documentation/networking/l2tp.rst | 137 +-
+ Documentation/networking/netconsole.rst | 66 +
+ Documentation/networking/netdevices.rst | 4 +-
+ Documentation/networking/xfrm_device.rst | 4 +-
+ Documentation/userspace-api/ioctl/ioctl-number.rst | 1 +
+ .../userspace-api/netlink/netlink-raw.rst | 42 +
+ MAINTAINERS | 30 +-
+ arch/arm64/net/bpf_jit_comp.c | 5 +
+ arch/x86/net/bpf_jit_comp.c | 5 +
+ drivers/bcma/main.c | 2 +-
+ drivers/dpll/dpll_core.c | 5 +-
+ drivers/dpll/dpll_netlink.c | 9 +-
+ drivers/infiniband/ulp/ipoib/ipoib_main.c | 4 +-
+ drivers/media/rc/bpf-lirc.c | 2 +-
+ drivers/net/arcnet/arcnet.c | 1 +
+ drivers/net/bareudp.c | 13 +-
+ drivers/net/bonding/bond_3ad.c | 157 +-
+ drivers/net/bonding/bond_main.c | 56 +-
+ drivers/net/bonding/bond_netlink.c | 16 +
+ drivers/net/bonding/bond_options.c | 28 +-
+ drivers/net/can/Kconfig | 2 +
+ drivers/net/can/Makefile | 1 +
+ drivers/net/can/esd/Kconfig | 12 +
+ drivers/net/can/esd/Makefile | 7 +
+ drivers/net/can/esd/esd_402_pci-core.c | 514 ++++
+ drivers/net/can/esd/esdacc.c | 764 +++++
+ drivers/net/can/esd/esdacc.h | 356 +++
+ drivers/net/can/kvaser_pciefd.c | 55 +
+ drivers/net/can/m_can/m_can.c | 579 +++-
+ drivers/net/can/m_can/m_can.h | 35 +-
+ drivers/net/can/m_can/m_can_pci.c | 1 +
+ drivers/net/can/m_can/m_can_platform.c | 5 +-
+ drivers/net/can/m_can/tcan4x5x-core.c | 33 +-
+ drivers/net/can/softing/softing_fw.c | 2 +-
+ drivers/net/can/vxcan.c | 2 +-
+ drivers/net/can/xilinx_can.c | 169 +-
+ drivers/net/dsa/Kconfig | 2 +-
+ drivers/net/dsa/b53/b53_common.c | 42 +-
+ drivers/net/dsa/b53/b53_priv.h | 7 +-
+ drivers/net/dsa/bcm_sf2.c | 2 +-
+ drivers/net/dsa/microchip/ksz8795.c | 410 ++-
+ drivers/net/dsa/microchip/ksz8795_reg.h | 1 +
+ drivers/net/dsa/microchip/ksz9477_i2c.c | 4 +
+ drivers/net/dsa/microchip/ksz_common.c | 102 +-
+ drivers/net/dsa/microchip/ksz_common.h | 2 +
+ drivers/net/dsa/microchip/ksz_spi.c | 5 +
+ drivers/net/dsa/mt7530-mdio.c | 7 +-
+ drivers/net/dsa/mt7530.c | 321 +--
+ drivers/net/dsa/mt7530.h | 19 +-
+ drivers/net/dsa/mv88e6xxx/chip.c | 6 +-
+ drivers/net/dsa/qca/qca8k-8xxx.c | 19 +-
+ drivers/net/dsa/qca/qca8k-common.c | 4 +-
+ drivers/net/dsa/qca/qca8k.h | 4 +-
+ drivers/net/dsa/realtek/Kconfig | 20 +-
+ drivers/net/dsa/realtek/Makefile | 13 +-
+ drivers/net/dsa/realtek/realtek-mdio.c | 205 +-
+ drivers/net/dsa/realtek/realtek-mdio.h | 48 +
+ drivers/net/dsa/realtek/realtek-smi.c | 279 +-
+ drivers/net/dsa/realtek/realtek-smi.h | 48 +
+ drivers/net/dsa/realtek/realtek.h | 12 +-
+ drivers/net/dsa/realtek/rtl8365mb.c | 132 +-
+ drivers/net/dsa/realtek/rtl8366-core.c | 22 +-
+ drivers/net/dsa/realtek/rtl8366rb.c | 119 +-
+ drivers/net/dsa/realtek/rtl83xx.c | 303 ++
+ drivers/net/dsa/realtek/rtl83xx.h | 22 +
+ drivers/net/dummy.c | 11 +-
+ drivers/net/ethernet/Kconfig | 3 -
+ drivers/net/ethernet/adi/adin1110.c | 10 +-
+ drivers/net/ethernet/amazon/ena/ena_com.c | 323 +--
+ drivers/net/ethernet/amazon/ena/ena_com.h | 7 +-
+ drivers/net/ethernet/amazon/ena/ena_eth_com.c | 49 +-
+ drivers/net/ethernet/amazon/ena/ena_eth_com.h | 39 +-
+ drivers/net/ethernet/amazon/ena/ena_netdev.c | 181 +-
+ drivers/net/ethernet/amazon/ena/ena_regs_defs.h | 1 +
+ drivers/net/ethernet/amazon/ena/ena_xdp.c | 1 -
+ drivers/net/ethernet/amd/pds_core/adminq.c | 10 +-
+ drivers/net/ethernet/amd/pds_core/auxbus.c | 18 +-
+ drivers/net/ethernet/amd/pds_core/core.c | 95 +-
+ drivers/net/ethernet/amd/pds_core/core.h | 4 +-
+ drivers/net/ethernet/amd/pds_core/debugfs.c | 8 +-
+ drivers/net/ethernet/amd/pds_core/dev.c | 22 +-
+ drivers/net/ethernet/amd/pds_core/main.c | 47 +-
+ .../net/ethernet/aquantia/atlantic/aq_ethtool.c | 25 +-
+ drivers/net/ethernet/broadcom/asp2/bcmasp.h | 2 +-
+ .../net/ethernet/broadcom/asp2/bcmasp_ethtool.c | 12 +-
+ drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c | 5 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 9 +-
+ .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 50 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 14 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt.c | 856 ++++--
+ drivers/net/ethernet/broadcom/bnxt/bnxt.h | 74 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 466 ++-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.h | 6 +-
+ drivers/net/ethernet/broadcom/genet/bcmgenet.c | 16 +-
+ drivers/net/ethernet/broadcom/genet/bcmgenet.h | 2 +-
+ drivers/net/ethernet/broadcom/genet/bcmmii.c | 11 +-
+ drivers/net/ethernet/broadcom/tg3.c | 54 +-
+ drivers/net/ethernet/broadcom/tg3.h | 2 +-
+ drivers/net/ethernet/cisco/enic/enic_main.c | 2 +-
+ drivers/net/ethernet/ec_bhf.c | 1 +
+ drivers/net/ethernet/engleder/tsnep_main.c | 36 +-
+ drivers/net/ethernet/freescale/enetc/enetc.c | 4 +-
+ drivers/net/ethernet/freescale/fec.h | 2 +-
+ drivers/net/ethernet/freescale/fec_main.c | 66 +-
+ drivers/net/ethernet/freescale/gianfar.c | 4 +-
+ drivers/net/ethernet/google/gve/gve.h | 144 +-
+ drivers/net/ethernet/google/gve/gve_dqo.h | 18 +-
+ drivers/net/ethernet/google/gve/gve_main.c | 862 +++---
+ drivers/net/ethernet/google/gve/gve_rx.c | 135 +-
+ drivers/net/ethernet/google/gve/gve_rx_dqo.c | 91 +-
+ drivers/net/ethernet/google/gve/gve_tx.c | 128 +-
+ drivers/net/ethernet/google/gve/gve_tx_dqo.c | 108 +-
+ drivers/net/ethernet/google/gve/gve_utils.c | 31 +
+ drivers/net/ethernet/google/gve/gve_utils.h | 5 +
+ drivers/net/ethernet/i825xx/sun3_82586.c | 2 +-
+ drivers/net/ethernet/intel/Kconfig | 8 +
+ drivers/net/ethernet/intel/e1000e/ethtool.c | 16 +-
+ drivers/net/ethernet/intel/i40e/i40e.h | 93 +-
+ drivers/net/ethernet/intel/i40e/i40e_dcb_nl.c | 10 +-
+ drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 97 +-
+ drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 16 +-
+ drivers/net/ethernet/intel/i40e/i40e_main.c | 563 ++--
+ drivers/net/ethernet/intel/ice/ice.h | 5 +-
+ drivers/net/ethernet/intel/ice/ice_base.c | 134 +-
+ drivers/net/ethernet/intel/ice/ice_base.h | 10 +-
+ drivers/net/ethernet/intel/ice/ice_common.c | 37 +
+ drivers/net/ethernet/intel/ice/ice_common.h | 2 +
+ drivers/net/ethernet/intel/ice/ice_controlq.c | 2 +-
+ drivers/net/ethernet/intel/ice/ice_ddp.c | 4 +
+ drivers/net/ethernet/intel/ice/ice_debugfs.c | 13 +-
+ drivers/net/ethernet/intel/ice/ice_devids.h | 8 +
+ drivers/net/ethernet/intel/ice/ice_devlink.c | 68 +-
+ drivers/net/ethernet/intel/ice/ice_dpll.c | 2 +
+ drivers/net/ethernet/intel/ice/ice_ethtool.c | 3 +-
+ drivers/net/ethernet/intel/ice/ice_fwlog.c | 2 +
+ drivers/net/ethernet/intel/ice/ice_lib.c | 129 -
+ drivers/net/ethernet/intel/ice/ice_lib.h | 10 -
+ drivers/net/ethernet/intel/ice/ice_main.c | 207 +-
+ drivers/net/ethernet/intel/ice/ice_ptp.c | 233 +-
+ drivers/net/ethernet/intel/ice/ice_ptp.h | 34 +-
+ drivers/net/ethernet/intel/ice/ice_txrx_lib.c | 8 +-
+ drivers/net/ethernet/intel/ice/ice_type.h | 1 +
+ drivers/net/ethernet/intel/ice/ice_xsk.c | 22 +-
+ drivers/net/ethernet/intel/igb/igb_ethtool.c | 28 +-
+ drivers/net/ethernet/intel/igc/Makefile | 1 +
+ drivers/net/ethernet/intel/igc/igc.h | 9 +-
+ drivers/net/ethernet/intel/igc/igc_ethtool.c | 24 +-
+ drivers/net/ethernet/intel/igc/igc_leds.c | 280 ++
+ drivers/net/ethernet/intel/igc/igc_main.c | 27 +-
+ drivers/net/ethernet/intel/igc/igc_regs.h | 1 +
+ drivers/net/ethernet/intel/ixgbe/ixgbe.h | 16 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c | 72 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | 151 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 266 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_common.h | 112 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.c | 12 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.h | 10 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.c | 26 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.h | 24 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.c | 12 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.h | 29 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 38 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 4 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.c | 46 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.h | 10 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 212 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h | 52 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 8 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 186 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c | 66 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_x540.h | 18 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 300 +-
+ drivers/net/ethernet/marvell/Kconfig | 1 +
+ drivers/net/ethernet/marvell/Makefile | 1 +
+ drivers/net/ethernet/marvell/mvneta.c | 4 +-
+ drivers/net/ethernet/marvell/octeon_ep_vf/Kconfig | 19 +
+ drivers/net/ethernet/marvell/octeon_ep_vf/Makefile | 10 +
+ .../ethernet/marvell/octeon_ep_vf/octep_vf_cn9k.c | 489 ++++
+ .../ethernet/marvell/octeon_ep_vf/octep_vf_cnxk.c | 500 ++++
+ .../marvell/octeon_ep_vf/octep_vf_config.h | 160 ++
+ .../marvell/octeon_ep_vf/octep_vf_ethtool.c | 273 ++
+ .../ethernet/marvell/octeon_ep_vf/octep_vf_main.c | 1231 ++++++++
+ .../ethernet/marvell/octeon_ep_vf/octep_vf_main.h | 334 +++
+ .../ethernet/marvell/octeon_ep_vf/octep_vf_mbox.c | 430 +++
+ .../ethernet/marvell/octeon_ep_vf/octep_vf_mbox.h | 166 ++
+ .../marvell/octeon_ep_vf/octep_vf_regs_cn9k.h | 154 +
+ .../marvell/octeon_ep_vf/octep_vf_regs_cnxk.h | 162 ++
+ .../ethernet/marvell/octeon_ep_vf/octep_vf_rx.c | 510 ++++
+ .../ethernet/marvell/octeon_ep_vf/octep_vf_rx.h | 224 ++
+ .../ethernet/marvell/octeon_ep_vf/octep_vf_tx.c | 330 +++
+ .../ethernet/marvell/octeon_ep_vf/octep_vf_tx.h | 276 ++
+ drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 3 +
+ drivers/net/ethernet/marvell/octeontx2/af/npc.h | 15 +-
+ .../ethernet/marvell/octeontx2/af/npc_profile.h | 621 +++-
+ drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 14 +-
+ drivers/net/ethernet/marvell/octeontx2/af/rvu.h | 31 +-
+ .../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 188 +-
+ .../net/ethernet/marvell/octeontx2/af/rvu_npc.c | 8 +-
+ .../net/ethernet/marvell/octeontx2/af/rvu_reg.h | 3 +
+ .../net/ethernet/marvell/octeontx2/af/rvu_sdp.c | 14 +-
+ drivers/net/ethernet/mellanox/mlx4/cmd.c | 7 +-
+ drivers/net/ethernet/mellanox/mlx4/cq.c | 4 +-
+ drivers/net/ethernet/mellanox/mlx4/en_clock.c | 4 +-
+ drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 5 +-
+ drivers/net/ethernet/mellanox/mlx4/en_rx.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx4/en_tx.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx4/eq.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx4/fw_qos.h | 8 +-
+ drivers/net/ethernet/mellanox/mlx4/main.c | 4 +-
+ drivers/net/ethernet/mellanox/mlx4/mlx4_stats.h | 2 +-
+ drivers/net/ethernet/mellanox/mlx4/port.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/dev.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/dpll.c | 32 +-
+ .../net/ethernet/mellanox/mlx5/core/en/params.c | 24 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c | 5 +-
+ .../ethernet/mellanox/mlx5/core/en_accel/ipsec.c | 26 +-
+ .../ethernet/mellanox/mlx5/core/en_accel/ipsec.h | 1 -
+ .../mellanox/mlx5/core/en_accel/ipsec_rxtx.c | 25 +-
+ .../mellanox/mlx5/core/en_accel/ipsec_rxtx.h | 1 -
+ .../mellanox/mlx5/core/en_accel/ipsec_stats.c | 1 -
+ drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 7 +
+ drivers/net/ethernet/mellanox/mlx5/core/fw.c | 6 +-
+ drivers/net/ethernet/mellanox/mlx5/core/health.c | 45 +-
+ drivers/net/ethernet/mellanox/mlx5/core/main.c | 38 +-
+ .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 7 -
+ .../net/ethernet/mellanox/mlx5/core/sf/dev/dev.c | 9 +-
+ .../ethernet/mellanox/mlx5/core/sf/dev/driver.c | 21 +-
+ .../ethernet/mellanox/mlx5/core/steering/dr_dbg.c | 734 ++++-
+ .../ethernet/mellanox/mlx5/core/steering/dr_dbg.h | 20 +
+ .../mellanox/mlxsw/core_acl_flex_actions.c | 16 +-
+ .../ethernet/mellanox/mlxsw/core_acl_flex_keys.c | 9 +-
+ drivers/net/ethernet/mellanox/mlxsw/minimal.c | 1 -
+ drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 160 +-
+ drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 15 +-
+ drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c | 11 +-
+ .../ethernet/mellanox/mlxsw/spectrum_acl_tcam.c | 17 +-
+ .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 15 +-
+ .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 8 +-
+ drivers/net/ethernet/microchip/encx24j600-regmap.c | 5 +-
+ drivers/net/ethernet/microchip/lan743x_ethtool.c | 4 +-
+ drivers/net/ethernet/microchip/lan743x_main.c | 2 +-
+ drivers/net/ethernet/microchip/lan743x_ptp.c | 4 +-
+ .../microchip/lan966x/lan966x_vcap_debugfs.c | 2 +
+ drivers/net/ethernet/microsoft/mana/gdma_main.c | 86 +-
+ drivers/net/ethernet/mscc/ocelot.c | 1 +
+ drivers/net/ethernet/nvidia/forcedeth.c | 4 +-
+ drivers/net/ethernet/pensando/ionic/ionic_dev.h | 11 +
+ .../net/ethernet/pensando/ionic/ionic_ethtool.c | 5 +
+ drivers/net/ethernet/pensando/ionic/ionic_lif.c | 193 +-
+ drivers/net/ethernet/pensando/ionic/ionic_lif.h | 13 +
+ drivers/net/ethernet/pensando/ionic/ionic_stats.c | 18 +
+ drivers/net/ethernet/pensando/ionic/ionic_txrx.c | 460 ++-
+ drivers/net/ethernet/pensando/ionic/ionic_txrx.h | 1 +
+ .../net/ethernet/qlogic/netxen/netxen_nic_init.c | 2 -
+ drivers/net/ethernet/qlogic/qed/qed_rdma.c | 2 -
+ drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 32 +-
+ drivers/net/ethernet/qualcomm/emac/emac.c | 1 +
+ drivers/net/ethernet/qualcomm/qca_7k.c | 17 +-
+ drivers/net/ethernet/qualcomm/qca_7k.h | 16 +-
+ drivers/net/ethernet/qualcomm/qca_7k_common.c | 17 +-
+ drivers/net/ethernet/qualcomm/qca_7k_common.h | 29 +-
+ drivers/net/ethernet/qualcomm/qca_debug.c | 21 +-
+ drivers/net/ethernet/qualcomm/qca_debug.h | 15 +-
+ drivers/net/ethernet/qualcomm/qca_spi.c | 71 +-
+ drivers/net/ethernet/qualcomm/qca_spi.h | 22 +-
+ drivers/net/ethernet/qualcomm/qca_uart.c | 17 +-
+ drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c | 1 +
+ drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c | 2 +-
+ drivers/net/ethernet/realtek/r8169.h | 4 +
+ drivers/net/ethernet/realtek/r8169_leds.c | 145 +-
+ drivers/net/ethernet/realtek/r8169_main.c | 272 +-
+ drivers/net/ethernet/realtek/r8169_phy_config.c | 7 +
+ drivers/net/ethernet/renesas/Kconfig | 1 +
+ drivers/net/ethernet/renesas/ravb.h | 40 +-
+ drivers/net/ethernet/renesas/ravb_main.c | 993 ++++---
+ drivers/net/ethernet/rocker/rocker_main.c | 2 -
+ drivers/net/ethernet/samsung/sxgbe/sxgbe_common.h | 1 -
+ drivers/net/ethernet/samsung/sxgbe/sxgbe_ethtool.c | 6 +-
+ drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 1 -
+ drivers/net/ethernet/sfc/efx_common.c | 2 +-
+ drivers/net/ethernet/sfc/falcon/efx.c | 2 +-
+ drivers/net/ethernet/sfc/siena/efx_common.c | 2 +-
+ drivers/net/ethernet/smsc/smc91x.c | 1 +
+ drivers/net/ethernet/smsc/smsc911x.c | 1 +
+ drivers/net/ethernet/smsc/smsc9420.c | 1 +
+ drivers/net/ethernet/stmicro/stmmac/Kconfig | 6 +-
+ drivers/net/ethernet/stmicro/stmmac/common.h | 3 +
+ .../ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 32 +-
+ .../net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 1 +
+ .../net/ethernet/stmicro/stmmac/dwmac-starfive.c | 32 +-
+ drivers/net/ethernet/stmicro/stmmac/mmc.h | 4 -
+ drivers/net/ethernet/stmicro/stmmac/mmc_core.c | 3 -
+ drivers/net/ethernet/stmicro/stmmac/stmmac.h | 3 +
+ drivers/net/ethernet/stmicro/stmmac/stmmac_est.c | 6 +
+ .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 8 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 69 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac_pcs.h | 2 +
+ .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 8 +
+ drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | 87 +-
+ drivers/net/ethernet/ti/am65-cpsw-ethtool.c | 4 +-
+ drivers/net/ethernet/ti/cpsw-common.c | 1 +
+ drivers/net/ethernet/ti/cpsw_ethtool.c | 4 +-
+ drivers/net/ethernet/ti/cpsw_priv.h | 4 +-
+ drivers/net/ethernet/ti/icssg/icssg_ethtool.c | 4 +-
+ drivers/net/ethernet/ti/icssg/icssg_prueth.c | 4 -
+ drivers/net/ethernet/toshiba/ps3_gelic_net.c | 8 +-
+ drivers/net/ethernet/wangxun/libwx/wx_hw.c | 2 -
+ drivers/net/ethernet/wangxun/libwx/wx_lib.c | 20 +-
+ drivers/net/ethernet/wangxun/libwx/wx_type.h | 1 -
+ drivers/net/ethernet/wangxun/txgbe/Makefile | 1 +
+ drivers/net/ethernet/wangxun/txgbe/txgbe_irq.c | 269 ++
+ drivers/net/ethernet/wangxun/txgbe/txgbe_irq.h | 7 +
+ drivers/net/ethernet/wangxun/txgbe/txgbe_main.c | 140 +-
+ drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c | 59 +-
+ drivers/net/ethernet/wangxun/txgbe/txgbe_phy.h | 2 +
+ drivers/net/ethernet/wangxun/txgbe/txgbe_type.h | 17 +
+ drivers/net/ethernet/wiznet/w5300.c | 3 +-
+ drivers/net/ethernet/xilinx/xilinx_emaclite.c | 3 +-
+ drivers/net/ethernet/xircom/xirc2ps_cs.c | 4 +-
+ drivers/net/geneve.c | 26 +-
+ drivers/net/gtp.c | 20 +-
+ drivers/net/ipa/ipa_interrupt.c | 50 +-
+ drivers/net/ipa/ipa_interrupt.h | 8 -
+ drivers/net/ipa/ipa_modem.c | 96 +-
+ drivers/net/ipa/ipa_power.c | 104 -
+ drivers/net/ipa/ipa_power.h | 29 -
+ drivers/net/ipvlan/ipvlan_main.c | 2 +-
+ drivers/net/loopback.c | 1 +
+ drivers/net/macsec.c | 2 +-
+ drivers/net/macvlan.c | 2 +-
+ drivers/net/mdio/mdio-bcm-unimac.c | 93 +-
+ drivers/net/mdio/mdio-ipq4019.c | 109 +-
+ drivers/net/mdio/of_mdio.c | 79 +-
+ drivers/net/netconsole.c | 353 ++-
+ drivers/net/netdevsim/bus.c | 4 +-
+ drivers/net/netkit.c | 2 +-
+ drivers/net/pcs/pcs-lynx.c | 1 +
+ drivers/net/pcs/pcs-mtk-lynxi.c | 1 +
+ drivers/net/pcs/pcs-xpcs.c | 18 +-
+ drivers/net/phy/Kconfig | 8 +-
+ drivers/net/phy/Makefile | 2 +-
+ drivers/net/phy/adin1100.c | 55 +
+ drivers/net/phy/aquantia/aquantia_main.c | 103 +
+ drivers/net/phy/at803x.c | 2432 ----------------
+ drivers/net/phy/broadcom.c | 3 +-
+ drivers/net/phy/dp83822.c | 174 +-
+ drivers/net/phy/dp83867.c | 22 +
+ drivers/net/phy/marvell-88q2xxx.c | 644 ++++-
+ drivers/net/phy/marvell.c | 2 +-
+ drivers/net/phy/mdio_bus.c | 46 +-
+ drivers/net/phy/micrel.c | 71 +-
+ drivers/net/phy/mxl-gpy.c | 20 +-
+ drivers/net/phy/phy-c45.c | 123 +-
+ drivers/net/phy/phy.c | 11 +-
+ drivers/net/phy/phy_device.c | 178 +-
+ drivers/net/phy/phylink.c | 8 +-
+ drivers/net/phy/qcom/Kconfig | 30 +
+ drivers/net/phy/qcom/Makefile | 6 +
+ drivers/net/phy/qcom/at803x.c | 1106 ++++++++
+ drivers/net/phy/qcom/qca807x.c | 849 ++++++
+ drivers/net/phy/qcom/qca808x.c | 644 +++++
+ drivers/net/phy/qcom/qca83xx.c | 275 ++
+ drivers/net/phy/qcom/qcom-phy-lib.c | 676 +++++
+ drivers/net/phy/qcom/qcom.h | 243 ++
+ drivers/net/phy/realtek.c | 44 +-
+ drivers/net/phy/xilinx_gmii2rgmii.c | 2 +-
+ drivers/net/ppp/ppp_generic.c | 2 +-
+ drivers/net/team/team.c | 2 -
+ drivers/net/tun.c | 21 +-
+ drivers/net/usb/ax88179_178a.c | 20 +-
+ drivers/net/usb/hso.c | 2 +-
+ drivers/net/usb/lan78xx.c | 4 +-
+ drivers/net/usb/r8152.c | 28 +-
+ drivers/net/usb/usbnet.c | 4 +-
+ drivers/net/veth.c | 77 +-
+ drivers/net/vsockmon.c | 19 +-
+ drivers/net/vxlan/vxlan_core.c | 63 +-
+ drivers/net/wan/framer/framer-core.c | 9 +-
+ drivers/net/wireless/admtek/adm8211.c | 4 +
+ drivers/net/wireless/ath/ar5523/ar5523.c | 4 +
+ drivers/net/wireless/ath/ath10k/core.c | 4 +-
+ drivers/net/wireless/ath/ath10k/coredump.h | 8 +-
+ drivers/net/wireless/ath/ath10k/htt.c | 3 +-
+ drivers/net/wireless/ath/ath10k/htt.h | 12 +-
+ drivers/net/wireless/ath/ath10k/mac.c | 12 +-
+ drivers/net/wireless/ath/ath10k/pci.c | 10 +-
+ drivers/net/wireless/ath/ath10k/wmi-tlv.c | 11 +-
+ drivers/net/wireless/ath/ath10k/wmi-tlv.h | 4 +-
+ drivers/net/wireless/ath/ath10k/wmi.c | 26 +-
+ drivers/net/wireless/ath/ath10k/wmi.h | 62 +-
+ drivers/net/wireless/ath/ath11k/core.c | 100 +-
+ drivers/net/wireless/ath/ath11k/core.h | 42 +
+ drivers/net/wireless/ath/ath11k/dp.c | 20 +-
+ drivers/net/wireless/ath/ath11k/dp_tx.c | 6 +-
+ drivers/net/wireless/ath/ath11k/hal.c | 19 +-
+ drivers/net/wireless/ath/ath11k/hal.h | 3 +-
+ drivers/net/wireless/ath/ath11k/hal_rx.c | 4 +-
+ drivers/net/wireless/ath/ath11k/hw.c | 2 +-
+ drivers/net/wireless/ath/ath11k/hw.h | 1 +
+ drivers/net/wireless/ath/ath11k/mac.c | 1200 ++++++--
+ drivers/net/wireless/ath/ath11k/mac.h | 5 +-
+ drivers/net/wireless/ath/ath11k/mhi.c | 5 +-
+ drivers/net/wireless/ath/ath11k/pci.c | 62 +-
+ drivers/net/wireless/ath/ath11k/pci.h | 3 +-
+ drivers/net/wireless/ath/ath11k/pcic.c | 11 +
+ drivers/net/wireless/ath/ath11k/reg.c | 267 +-
+ drivers/net/wireless/ath/ath11k/reg.h | 11 +-
+ drivers/net/wireless/ath/ath11k/testmode.c | 2 +-
+ drivers/net/wireless/ath/ath11k/wmi.c | 300 +-
+ drivers/net/wireless/ath/ath11k/wmi.h | 151 +-
+ drivers/net/wireless/ath/ath12k/Makefile | 4 +-
+ drivers/net/wireless/ath/ath12k/core.c | 270 +-
+ drivers/net/wireless/ath/ath12k/core.h | 84 +-
+ drivers/net/wireless/ath/ath12k/dp.c | 25 +-
+ drivers/net/wireless/ath/ath12k/dp.h | 20 +-
+ drivers/net/wireless/ath/ath12k/dp_mon.c | 9 +-
+ drivers/net/wireless/ath/ath12k/dp_rx.c | 166 +-
+ drivers/net/wireless/ath/ath12k/dp_tx.c | 30 +-
+ drivers/net/wireless/ath/ath12k/fw.c | 171 ++
+ drivers/net/wireless/ath/ath12k/fw.h | 33 +
+ drivers/net/wireless/ath/ath12k/hal.c | 415 ++-
+ drivers/net/wireless/ath/ath12k/hal.h | 20 +-
+ drivers/net/wireless/ath/ath12k/hal_desc.h | 20 +-
+ drivers/net/wireless/ath/ath12k/hal_rx.c | 15 +-
+ drivers/net/wireless/ath/ath12k/hw.c | 33 +-
+ drivers/net/wireless/ath/ath12k/hw.h | 55 +-
+ drivers/net/wireless/ath/ath12k/mac.c | 1307 ++++++---
+ drivers/net/wireless/ath/ath12k/mac.h | 4 +-
+ drivers/net/wireless/ath/ath12k/mhi.c | 52 +-
+ drivers/net/wireless/ath/ath12k/p2p.c | 142 +
+ drivers/net/wireless/ath/ath12k/p2p.h | 23 +
+ drivers/net/wireless/ath/ath12k/pci.c | 94 +-
+ drivers/net/wireless/ath/ath12k/pci.h | 6 +-
+ drivers/net/wireless/ath/ath12k/qmi.c | 429 ++-
+ drivers/net/wireless/ath/ath12k/qmi.h | 35 +-
+ drivers/net/wireless/ath/ath12k/reg.c | 13 +-
+ drivers/net/wireless/ath/ath12k/rx_desc.h | 116 +-
+ drivers/net/wireless/ath/ath12k/trace.h | 29 +-
+ drivers/net/wireless/ath/ath12k/wmi.c | 327 ++-
+ drivers/net/wireless/ath/ath12k/wmi.h | 202 +-
+ drivers/net/wireless/ath/ath5k/mac80211-ops.c | 4 +
+ drivers/net/wireless/ath/ath6kl/cfg80211.c | 2 +-
+ drivers/net/wireless/ath/ath9k/ahb.c | 6 +-
+ drivers/net/wireless/ath/ath9k/antenna.c | 2 +-
+ drivers/net/wireless/ath/ath9k/ar9003_phy.h | 9 -
+ drivers/net/wireless/ath/ath9k/beacon.c | 4 +-
+ drivers/net/wireless/ath/ath9k/htc.h | 2 +-
+ drivers/net/wireless/ath/ath9k/htc_drv_beacon.c | 4 +-
+ drivers/net/wireless/ath/ath9k/htc_drv_init.c | 4 +
+ drivers/net/wireless/ath/ath9k/htc_drv_main.c | 4 +
+ drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 4 -
+ drivers/net/wireless/ath/ath9k/main.c | 4 +
+ drivers/net/wireless/ath/ath9k/reg_aic.h | 4 -
+ drivers/net/wireless/ath/ath9k/wmi.c | 10 +-
+ drivers/net/wireless/ath/ath9k/xmit.c | 3 +-
+ drivers/net/wireless/ath/carl9170/main.c | 4 +
+ drivers/net/wireless/ath/carl9170/tx.c | 2 +-
+ drivers/net/wireless/ath/wcn36xx/main.c | 4 +
+ drivers/net/wireless/atmel/at76c50x-usb.c | 4 +
+ drivers/net/wireless/broadcom/b43/b43.h | 16 +
+ drivers/net/wireless/broadcom/b43/dma.c | 4 +-
+ drivers/net/wireless/broadcom/b43/main.c | 20 +-
+ drivers/net/wireless/broadcom/b43/pio.c | 6 +-
+ drivers/net/wireless/broadcom/b43legacy/main.c | 4 +
+ .../broadcom/brcm80211/brcmfmac/bca/core.c | 30 +-
+ .../broadcom/brcm80211/brcmfmac/cfg80211.c | 66 +-
+ .../broadcom/brcm80211/brcmfmac/cfg80211.h | 2 +
+ .../wireless/broadcom/brcm80211/brcmfmac/common.c | 18 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/core.c | 12 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/core.h | 2 +-
+ .../broadcom/brcm80211/brcmfmac/cyw/core.c | 50 +-
+ .../net/wireless/broadcom/brcm80211/brcmfmac/dmi.c | 9 +
+ .../wireless/broadcom/brcm80211/brcmfmac/feature.c | 11 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/fweh.c | 154 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/fweh.h | 60 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/fwil.c | 116 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/fwil.h | 125 +-
+ .../broadcom/brcm80211/brcmfmac/fwil_types.h | 2 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/fwvid.c | 13 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/fwvid.h | 48 +-
+ .../broadcom/brcm80211/brcmfmac/wcc/core.c | 31 +-
+ .../net/wireless/broadcom/brcm80211/brcmsmac/led.c | 1 -
+ .../broadcom/brcm80211/brcmsmac/mac80211_if.c | 4 +
+ .../broadcom/brcm80211/brcmsmac/phy/phy_cmn.c | 6 +-
+ .../broadcom/brcm80211/brcmsmac/phy/phy_int.h | 2 +-
+ .../broadcom/brcm80211/brcmsmac/phy/phy_n.c | 11 +-
+ .../broadcom/brcm80211/brcmsmac/phy_shim.c | 5 +-
+ .../broadcom/brcm80211/brcmsmac/phy_shim.h | 2 +-
+ drivers/net/wireless/intel/iwlegacy/3945-mac.c | 4 +
+ drivers/net/wireless/intel/iwlegacy/4965-mac.c | 4 +
+ drivers/net/wireless/intel/iwlegacy/common.c | 4 +-
+ drivers/net/wireless/intel/iwlwifi/Kconfig | 9 +
+ drivers/net/wireless/intel/iwlwifi/Makefile | 3 +
+ drivers/net/wireless/intel/iwlwifi/cfg/ax210.c | 4 +-
+ drivers/net/wireless/intel/iwlwifi/cfg/bz.c | 9 +-
+ drivers/net/wireless/intel/iwlwifi/cfg/sc.c | 40 +-
+ drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c | 4 +
+ drivers/net/wireless/intel/iwlwifi/fw/acpi.c | 623 +---
+ drivers/net/wireless/intel/iwlwifi/fw/acpi.h | 220 +-
+ drivers/net/wireless/intel/iwlwifi/fw/api/coex.h | 14 +-
+ drivers/net/wireless/intel/iwlwifi/fw/api/d3.h | 2 +-
+ .../net/wireless/intel/iwlwifi/fw/api/datapath.h | 2 +-
+ .../net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h | 8 +-
+ drivers/net/wireless/intel/iwlwifi/fw/api/debug.h | 2 +-
+ .../net/wireless/intel/iwlwifi/fw/api/location.h | 1 +
+ .../net/wireless/intel/iwlwifi/fw/api/mac-cfg.h | 27 +-
+ drivers/net/wireless/intel/iwlwifi/fw/api/mac.h | 10 +-
+ .../net/wireless/intel/iwlwifi/fw/api/nvm-reg.h | 32 +-
+ .../net/wireless/intel/iwlwifi/fw/api/phy-ctxt.h | 17 +-
+ drivers/net/wireless/intel/iwlwifi/fw/api/power.h | 40 +-
+ drivers/net/wireless/intel/iwlwifi/fw/api/sta.h | 4 +-
+ drivers/net/wireless/intel/iwlwifi/fw/api/tx.h | 4 +
+ drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 27 +-
+ drivers/net/wireless/intel/iwlwifi/fw/dbg.h | 2 -
+ drivers/net/wireless/intel/iwlwifi/fw/error-dump.h | 23 +-
+ drivers/net/wireless/intel/iwlwifi/fw/file.h | 27 +-
+ drivers/net/wireless/intel/iwlwifi/fw/pnvm.c | 49 +-
+ drivers/net/wireless/intel/iwlwifi/fw/regulatory.c | 500 ++++
+ drivers/net/wireless/intel/iwlwifi/fw/regulatory.h | 199 ++
+ drivers/net/wireless/intel/iwlwifi/fw/runtime.h | 22 +-
+ drivers/net/wireless/intel/iwlwifi/fw/uefi.c | 427 ++-
+ drivers/net/wireless/intel/iwlwifi/fw/uefi.h | 210 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-config.h | 22 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c | 67 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 31 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-drv.h | 10 +-
+ .../net/wireless/intel/iwlwifi/iwl-eeprom-parse.c | 2 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-fh.h | 36 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 75 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h | 2 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-op-mode.h | 4 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-prph.h | 9 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 69 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/coex.c | 132 +
+ drivers/net/wireless/intel/iwlwifi/mvm/constants.h | 3 +
+ drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 138 +-
+ .../net/wireless/intel/iwlwifi/mvm/debugfs-vif.c | 55 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 10 +-
+ .../net/wireless/intel/iwlwifi/mvm/ftm-initiator.c | 9 +-
+ .../net/wireless/intel/iwlwifi/mvm/ftm-responder.c | 19 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 346 +--
+ drivers/net/wireless/intel/iwlwifi/mvm/link.c | 27 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 38 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 221 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/mld-key.c | 36 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/mld-mac.c | 11 +-
+ .../net/wireless/intel/iwlwifi/mvm/mld-mac80211.c | 162 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 84 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/nvm.c | 2 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 100 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c | 40 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/power.c | 29 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c | 16 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 2 +
+ drivers/net/wireless/intel/iwlwifi/mvm/rx.c | 30 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 51 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 8 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/sf.c | 5 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 34 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/sta.h | 3 +-
+ .../net/wireless/intel/iwlwifi/mvm/time-event.c | 192 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 79 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 2 +
+ .../wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c | 2 +-
+ .../net/wireless/intel/iwlwifi/pcie/ctxt-info.c | 4 +-
+ drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 49 +-
+ drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 11 +-
+ drivers/net/wireless/intel/iwlwifi/queue/tx.c | 16 +-
+ drivers/net/wireless/intel/iwlwifi/tests/Makefile | 7 +
+ drivers/net/wireless/intel/iwlwifi/tests/devinfo.c | 54 +
+ drivers/net/wireless/intel/iwlwifi/tests/module.c | 10 +
+ drivers/net/wireless/intersil/p54/main.c | 4 +
+ drivers/net/wireless/marvell/libertas/cmd.c | 13 +-
+ drivers/net/wireless/marvell/libertas_tf/main.c | 4 +
+ drivers/net/wireless/marvell/mwifiex/11h.c | 2 +-
+ drivers/net/wireless/marvell/mwifiex/11n.c | 12 +-
+ drivers/net/wireless/marvell/mwifiex/cfg80211.c | 2 +-
+ drivers/net/wireless/marvell/mwifiex/debugfs.c | 22 +-
+ drivers/net/wireless/marvell/mwifiex/fw.h | 2 +-
+ drivers/net/wireless/marvell/mwifiex/main.h | 2 -
+ drivers/net/wireless/marvell/mwifiex/scan.c | 14 +-
+ drivers/net/wireless/marvell/mwifiex/wmm.c | 2 +-
+ drivers/net/wireless/marvell/mwl8k.c | 4 +
+ drivers/net/wireless/mediatek/mt76/mac80211.c | 6 +-
+ drivers/net/wireless/mediatek/mt76/mt7603/main.c | 4 +
+ drivers/net/wireless/mediatek/mt76/mt7615/mcu.c | 2 +-
+ drivers/net/wireless/mediatek/mt76/mt76x0/pci.c | 4 +
+ drivers/net/wireless/mediatek/mt76/mt76x0/usb.c | 4 +
+ .../net/wireless/mediatek/mt76/mt76x2/pci_main.c | 4 +
+ .../net/wireless/mediatek/mt76/mt76x2/usb_main.c | 4 +
+ drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 6 +-
+ drivers/net/wireless/mediatek/mt76/mt792x_core.c | 7 +-
+ drivers/net/wireless/mediatek/mt76/mt7996/main.c | 4 +
+ drivers/net/wireless/mediatek/mt76/mt7996/mcu.c | 2 +-
+ drivers/net/wireless/mediatek/mt7601u/main.c | 4 +
+ drivers/net/wireless/microchip/wilc1000/cfg80211.c | 16 +-
+ drivers/net/wireless/microchip/wilc1000/hif.c | 110 +-
+ drivers/net/wireless/microchip/wilc1000/netdev.c | 95 +-
+ drivers/net/wireless/microchip/wilc1000/netdev.h | 6 +
+ drivers/net/wireless/microchip/wilc1000/spi.c | 81 +-
+ drivers/net/wireless/microchip/wilc1000/wlan.c | 42 +-
+ drivers/net/wireless/microchip/wilc1000/wlan.h | 11 +
+ drivers/net/wireless/purelifi/plfxlc/mac.c | 5 +-
+ drivers/net/wireless/quantenna/qtnfmac/event.c | 2 +-
+ drivers/net/wireless/ralink/rt2x00/rt2400pci.c | 4 +
+ drivers/net/wireless/ralink/rt2x00/rt2500pci.c | 4 +
+ drivers/net/wireless/ralink/rt2x00/rt2500usb.c | 4 +
+ drivers/net/wireless/ralink/rt2x00/rt2800pci.c | 4 +
+ drivers/net/wireless/ralink/rt2x00/rt2800soc.c | 4 +
+ drivers/net/wireless/ralink/rt2x00/rt2800usb.c | 4 +
+ drivers/net/wireless/ralink/rt2x00/rt2x00crypto.c | 5 +-
+ drivers/net/wireless/ralink/rt2x00/rt61pci.c | 4 +
+ drivers/net/wireless/ralink/rt2x00/rt73usb.c | 4 +
+ drivers/net/wireless/realtek/rtl818x/rtl8180/dev.c | 4 +
+ drivers/net/wireless/realtek/rtl818x/rtl8187/dev.c | 4 +
+ drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 28 +-
+ .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c | 3 +-
+ .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188f.c | 2 +
+ .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192c.c | 1 +
+ .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c | 1 +
+ .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192f.c | 33 +-
+ .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8710b.c | 1 +
+ .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723a.c | 1 +
+ .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c | 1 +
+ .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 596 +++-
+ .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h | 15 +
+ drivers/net/wireless/realtek/rtlwifi/core.c | 4 +
+ drivers/net/wireless/realtek/rtlwifi/efuse.c | 36 +-
+ drivers/net/wireless/realtek/rtlwifi/efuse.h | 4 +-
+ drivers/net/wireless/realtek/rtlwifi/pci.c | 12 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ce/trx.c | 4 -
+ .../net/wireless/realtek/rtlwifi/rtl8192cu/def.h | 2 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192cu/hw.c | 6 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192cu/mac.c | 3 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192cu/sw.c | 7 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192cu/trx.c | 109 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192cu/trx.h | 3 -
+ .../net/wireless/realtek/rtlwifi/rtl8192de/trx.c | 5 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723ae/trx.c | 6 +-
+ drivers/net/wireless/realtek/rtlwifi/usb.c | 195 +-
+ drivers/net/wireless/realtek/rtlwifi/usb.h | 2 +
+ drivers/net/wireless/realtek/rtlwifi/wifi.h | 42 +-
+ drivers/net/wireless/realtek/rtw88/debug.c | 44 +-
+ drivers/net/wireless/realtek/rtw88/mac80211.c | 4 +
+ drivers/net/wireless/realtek/rtw88/pci.c | 4 +
+ drivers/net/wireless/realtek/rtw88/reg.h | 3 +
+ drivers/net/wireless/realtek/rtw89/cam.c | 61 +
+ drivers/net/wireless/realtek/rtw89/cam.h | 109 +
+ drivers/net/wireless/realtek/rtw89/chan.c | 648 ++++-
+ drivers/net/wireless/realtek/rtw89/chan.h | 5 +
+ drivers/net/wireless/realtek/rtw89/coex.h | 1 +
+ drivers/net/wireless/realtek/rtw89/core.c | 382 ++-
+ drivers/net/wireless/realtek/rtw89/core.h | 263 +-
+ drivers/net/wireless/realtek/rtw89/efuse.h | 1 +
+ drivers/net/wireless/realtek/rtw89/efuse_be.c | 142 +
+ drivers/net/wireless/realtek/rtw89/fw.c | 2380 +++++++++++++++-
+ drivers/net/wireless/realtek/rtw89/fw.h | 1468 +++++++---
+ drivers/net/wireless/realtek/rtw89/mac.c | 292 +-
+ drivers/net/wireless/realtek/rtw89/mac.h | 59 +-
+ drivers/net/wireless/realtek/rtw89/mac80211.c | 19 +-
+ drivers/net/wireless/realtek/rtw89/mac_be.c | 197 +-
+ drivers/net/wireless/realtek/rtw89/pci.c | 136 +-
+ drivers/net/wireless/realtek/rtw89/pci.h | 7 +-
+ drivers/net/wireless/realtek/rtw89/pci_be.c | 5 +
+ drivers/net/wireless/realtek/rtw89/phy.c | 1105 +++++++-
+ drivers/net/wireless/realtek/rtw89/phy.h | 113 +
+ drivers/net/wireless/realtek/rtw89/phy_be.c | 331 +++
+ drivers/net/wireless/realtek/rtw89/ps.c | 10 +-
+ drivers/net/wireless/realtek/rtw89/reg.h | 488 +++-
+ drivers/net/wireless/realtek/rtw89/rtw8851b.c | 17 +-
+ .../net/wireless/realtek/rtw89/rtw8851b_table.c | 72 +-
+ drivers/net/wireless/realtek/rtw89/rtw8851be.c | 2 +
+ drivers/net/wireless/realtek/rtw89/rtw8852a.c | 13 +-
+ drivers/net/wireless/realtek/rtw89/rtw8852ae.c | 1 +
+ drivers/net/wireless/realtek/rtw89/rtw8852b.c | 17 +-
+ .../net/wireless/realtek/rtw89/rtw8852b_table.c | 142 +-
+ drivers/net/wireless/realtek/rtw89/rtw8852be.c | 1 +
+ drivers/net/wireless/realtek/rtw89/rtw8852c.c | 16 +-
+ drivers/net/wireless/realtek/rtw89/rtw8852ce.c | 1 +
+ drivers/net/wireless/realtek/rtw89/rtw8922a.c | 1660 ++++++++++-
+ drivers/net/wireless/realtek/rtw89/rtw8922a_rfk.c | 378 +++
+ drivers/net/wireless/realtek/rtw89/rtw8922a_rfk.h | 18 +
+ drivers/net/wireless/realtek/rtw89/rtw8922ae.c | 1 +
+ drivers/net/wireless/realtek/rtw89/wow.c | 2 +-
+ drivers/net/wireless/rsi/rsi_91x_mac80211.c | 8 +-
+ drivers/net/wireless/rsi/rsi_91x_usb.c | 12 +-
+ drivers/net/wireless/silabs/wfx/sta.c | 19 +-
+ drivers/net/wireless/st/cw1200/cw1200_sdio.c | 42 +-
+ drivers/net/wireless/st/cw1200/cw1200_spi.c | 79 +-
+ drivers/net/wireless/st/cw1200/main.c | 4 +
+ drivers/net/wireless/ti/wl1251/main.c | 4 +
+ drivers/net/wireless/ti/wlcore/event.c | 2 +-
+ drivers/net/wireless/ti/wlcore/main.c | 6 +-
+ drivers/net/wireless/ti/wlcore/sdio.c | 1 -
+ drivers/net/wireless/virtual/mac80211_hwsim.c | 147 +-
+ drivers/net/wireless/virtual/mac80211_hwsim.h | 5 +-
+ drivers/net/wireless/virtual/virt_wifi.c | 2 +-
+ drivers/net/wireless/zydas/zd1211rw/zd_def.h | 2 +-
+ drivers/net/wireless/zydas/zd1211rw/zd_mac.c | 4 +
+ drivers/net/wwan/t7xx/t7xx_hif_cldma.c | 47 +-
+ drivers/net/wwan/t7xx/t7xx_hif_cldma.h | 18 +-
+ drivers/net/wwan/t7xx/t7xx_modem_ops.c | 14 +-
+ drivers/net/wwan/t7xx/t7xx_modem_ops.h | 1 +
+ drivers/net/wwan/t7xx/t7xx_pci.c | 103 +-
+ drivers/net/wwan/t7xx/t7xx_pci.h | 14 +-
+ drivers/net/wwan/t7xx/t7xx_port.h | 4 +
+ drivers/net/wwan/t7xx/t7xx_port_proxy.c | 112 +-
+ drivers/net/wwan/t7xx/t7xx_port_proxy.h | 10 +
+ drivers/net/wwan/t7xx/t7xx_port_wwan.c | 115 +-
+ drivers/net/wwan/t7xx/t7xx_reg.h | 24 +-
+ drivers/net/wwan/t7xx/t7xx_state_monitor.c | 134 +-
+ drivers/net/wwan/t7xx/t7xx_state_monitor.h | 1 +
+ drivers/net/wwan/wwan_core.c | 6 +-
+ drivers/ptp/Kconfig | 12 +
+ drivers/ptp/Makefile | 1 +
+ drivers/ptp/ptp_clock.c | 16 +-
+ drivers/ptp/ptp_fc3.c | 1016 +++++++
+ drivers/ptp/ptp_fc3.h | 45 +
+ drivers/ptp/ptp_ocp.c | 311 +-
+ drivers/ptp/ptp_sysfs.c | 13 +-
+ drivers/ssb/main.c | 2 +-
+ drivers/staging/vt6655/device_main.c | 6 +-
+ drivers/staging/vt6656/main_usb.c | 6 +-
+ fs/eventpoll.c | 131 +-
+ include/linux/bitmap.h | 12 +
+ include/linux/bpf.h | 142 +-
+ include/linux/bpf_verifier.h | 3 +-
+ include/linux/btf.h | 13 +
+ include/linux/cpumask.h | 16 +
+ include/linux/dpll.h | 1 +
+ include/linux/ethtool.h | 17 +-
+ include/linux/filter.h | 3 +-
+ include/linux/framer/framer-provider.h | 15 +-
+ include/linux/ieee80211.h | 169 +-
+ include/linux/if_tun.h | 16 +-
+ include/linux/inet_diag.h | 1 +
+ include/linux/ipv6.h | 1 +
+ include/linux/lsm_hook_defs.h | 15 +-
+ include/linux/marvell_phy.h | 1 +
+ include/linux/mdio.h | 63 +
+ include/linux/mfd/idtRC38xxx_reg.h | 273 ++
+ include/linux/mlx5/mlx5_ifc.h | 9 +
+ include/linux/netdevice.h | 39 +-
+ include/linux/netfilter.h | 1 -
+ include/linux/netlink.h | 2 +
+ include/linux/phy.h | 45 +-
+ include/linux/phylink.h | 4 +-
+ include/linux/platform_data/brcmfmac.h | 2 +-
+ include/linux/platform_data/mdio-bcm-unimac.h | 3 +
+ include/linux/platform_data/microchip-ksz.h | 1 +
+ include/linux/platform_data/net-cw1200.h | 4 -
+ include/linux/ptp_clock_kernel.h | 3 +
+ include/linux/rtnetlink.h | 3 +
+ include/linux/security.h | 43 +-
+ include/linux/skbuff.h | 115 +-
+ include/linux/sock_diag.h | 10 +-
+ include/linux/stmmac.h | 1 +
+ include/linux/udp.h | 10 +
+ include/linux/units.h | 5 +-
+ include/linux/wwan.h | 2 +
+ include/net/act_api.h | 2 +
+ include/net/addrconf.h | 5 +-
+ include/net/af_unix.h | 22 +-
+ include/net/bond_3ad.h | 2 +
+ include/net/bond_options.h | 1 +
+ include/net/bonding.h | 23 +
+ include/net/busy_poll.h | 4 +
+ include/net/cfg80211.h | 102 +-
+ include/net/dsa.h | 4 +-
+ include/net/dst.h | 1 -
+ include/net/genetlink.h | 6 +-
+ include/net/if_inet6.h | 4 +-
+ include/net/ip6_fib.h | 52 +-
+ include/net/ip6_route.h | 3 +-
+ include/net/ip_fib.h | 1 +
+ include/net/ip_tunnels.h | 3 +-
+ include/net/mac80211.h | 127 +-
+ include/net/mctp.h | 6 +-
+ include/net/net_namespace.h | 5 +-
+ include/net/netfilter/nf_queue.h | 1 -
+ include/net/netfilter/nf_tables.h | 6 +
+ include/net/netlabel.h | 7 +-
+ include/net/netmem.h | 41 +
+ include/net/nexthop.h | 3 +-
+ include/net/page_pool/types.h | 13 +-
+ include/net/pkt_cls.h | 2 +
+ include/net/pkt_sched.h | 2 +
+ include/net/request_sock.h | 39 +
+ include/net/route.h | 7 +-
+ include/net/rtnetlink.h | 1 +
+ include/net/scm.h | 1 +
+ include/net/sctp/structs.h | 5 +-
+ include/net/sock.h | 137 +-
+ include/net/tcp.h | 45 +
+ include/net/xfrm.h | 14 +-
+ include/uapi/linux/bpf.h | 78 +-
+ include/uapi/linux/can.h | 9 +-
+ include/uapi/linux/can/isotp.h | 1 +
+ include/uapi/linux/can/raw.h | 16 +
+ include/uapi/linux/dpll.h | 30 +
+ include/uapi/linux/eventpoll.h | 13 +
+ include/uapi/linux/if_link.h | 1 +
+ include/uapi/linux/mctp.h | 32 +
+ include/uapi/linux/mdio.h | 4 +
+ include/uapi/linux/netfilter/nf_tables.h | 6 +-
+ include/uapi/linux/nl80211.h | 71 +-
+ include/uapi/linux/ptp_clock.h | 13 +-
+ include/uapi/linux/tc_act/tc_pedit.h | 2 +-
+ kernel/bpf/Makefile | 2 +-
+ kernel/bpf/arraymap.c | 2 +-
+ kernel/bpf/bpf_lsm.c | 15 +-
+ kernel/bpf/bpf_struct_ops.c | 447 +--
+ kernel/bpf/bpf_struct_ops_types.h | 12 -
+ kernel/bpf/btf.c | 276 +-
+ kernel/bpf/cgroup.c | 6 +-
+ kernel/bpf/core.c | 13 +-
+ kernel/bpf/helpers.c | 7 +-
+ kernel/bpf/inode.c | 276 +-
+ kernel/bpf/syscall.c | 234 +-
+ kernel/bpf/token.c | 278 ++
+ kernel/bpf/verifier.c | 148 +-
+ kernel/configs/debug.config | 6 +
+ kernel/trace/bpf_trace.c | 17 +-
+ lib/bitmap.c | 7 +
+ lib/test_blackhole_dev.c | 3 +-
+ net/8021q/vlan_dev.c | 30 +-
+ net/8021q/vlanproc.c | 46 +-
+ net/Kconfig | 1 +
+ net/Makefile | 2 +-
+ net/batman-adv/distributed-arp-table.c | 3 +-
+ net/batman-adv/main.c | 14 +-
+ net/batman-adv/main.h | 2 +-
+ net/batman-adv/netlink.c | 1 -
+ net/bpf/bpf_dummy_struct_ops.c | 22 +-
+ net/bridge/br.c | 15 +-
+ net/bridge/br_device.c | 11 +-
+ net/bridge/br_fdb.c | 5 +-
+ net/bridge/br_netlink.c | 3 +-
+ net/bridge/br_vlan.c | 4 +-
+ net/bridge/netfilter/Kconfig | 7 +
+ net/bridge/netfilter/Makefile | 2 +-
+ net/can/af_can.c | 2 +
+ net/can/bcm.c | 69 +-
+ net/can/isotp.c | 5 +-
+ net/can/raw.c | 104 +-
+ net/core/dev.c | 311 +-
+ net/core/dev.h | 4 +
+ net/core/dst.c | 6 +-
+ net/core/filter.c | 155 +-
+ net/core/link_watch.c | 13 +-
+ net/core/net-procfs.c | 48 +-
+ net/core/net-sysfs.c | 74 +-
+ net/core/net_namespace.c | 33 +-
+ net/core/page_pool.c | 55 +-
+ net/core/rtnetlink.c | 133 +-
+ net/core/scm.c | 5 +
+ net/core/skbuff.c | 139 +-
+ net/core/sock.c | 76 +-
+ net/core/sock_diag.c | 120 +-
+ net/core/xdp.c | 6 +-
+ net/dccp/ackvec.c | 8 +-
+ net/dccp/diag.c | 1 +
+ net/dsa/dsa.c | 7 +-
+ net/dsa/tag_sja1105.c | 4 +-
+ net/dsa/user.c | 20 +-
+ net/ethtool/common.c | 5 +
+ net/ethtool/common.h | 1 +
+ net/ethtool/eee.c | 75 +-
+ net/ethtool/ioctl.c | 74 +-
+ net/ethtool/netlink.c | 14 +-
+ net/hsr/hsr_device.c | 30 +-
+ net/ieee802154/6lowpan/core.c | 3 +-
+ net/ieee802154/socket.c | 1 +
+ net/ipv4/af_inet.c | 4 +-
+ net/ipv4/bpf_tcp_ca.c | 22 +-
+ net/ipv4/datagram.c | 2 +-
+ net/ipv4/fib_frontend.c | 50 +-
+ net/ipv4/fib_trie.c | 6 +-
+ net/ipv4/inet_connection_sock.c | 2 +-
+ net/ipv4/inet_diag.c | 101 +-
+ net/ipv4/inetpeer.c | 5 +-
+ net/ipv4/ip_gre.c | 24 +-
+ net/ipv4/ip_output.c | 2 +-
+ net/ipv4/ip_tunnel.c | 38 +-
+ net/ipv4/ip_vti.c | 8 +-
+ net/ipv4/ipip.c | 8 +-
+ net/ipv4/ipmr.c | 9 +-
+ net/ipv4/netfilter/Kconfig | 44 +-
+ net/ipv4/netfilter/Makefile | 2 +-
+ net/ipv4/nexthop.c | 38 +-
+ net/ipv4/raw_diag.c | 1 +
+ net/ipv4/route.c | 5 +-
+ net/ipv4/syncookies.c | 40 +-
+ net/ipv4/tcp_ao.c | 2 +-
+ net/ipv4/tcp_diag.c | 1 +
+ net/ipv4/tcp_input.c | 25 +-
+ net/ipv4/udp.c | 3 +-
+ net/ipv4/udp_diag.c | 2 +
+ net/ipv6/addrconf.c | 339 ++-
+ net/ipv6/af_inet6.c | 2 +-
+ net/ipv6/anycast.c | 61 +-
+ net/ipv6/ip6_fib.c | 92 +-
+ net/ipv6/ip6_gre.c | 14 +-
+ net/ipv6/ip6_tunnel.c | 15 +-
+ net/ipv6/ip6_vti.c | 13 +-
+ net/ipv6/ip6mr.c | 9 +-
+ net/ipv6/mcast.c | 1 -
+ net/ipv6/ndisc.c | 15 +-
+ net/ipv6/netfilter/Kconfig | 20 +-
+ net/ipv6/netfilter/Makefile | 2 +-
+ net/ipv6/route.c | 27 +-
+ net/ipv6/sit.c | 26 +-
+ net/ipv6/syncookies.c | 13 +-
+ net/iucv/af_iucv.c | 10 +-
+ net/iucv/iucv.c | 15 +-
+ net/kcm/kcmsock.c | 15 +-
+ net/l2tp/l2tp_eth.c | 2 +-
+ net/l2tp/l2tp_ip.c | 2 +-
+ net/mac80211/Makefile | 2 +-
+ net/mac80211/agg-tx.c | 2 +-
+ net/mac80211/cfg.c | 232 +-
+ net/mac80211/chan.c | 707 +++--
+ net/mac80211/debug.h | 18 +-
+ net/mac80211/driver-ops.h | 19 +
+ net/mac80211/ht.c | 6 +-
+ net/mac80211/ibss.c | 55 +-
+ net/mac80211/ieee80211_i.h | 184 +-
+ net/mac80211/iface.c | 30 +-
+ net/mac80211/key.c | 4 +
+ net/mac80211/link.c | 13 +-
+ net/mac80211/main.c | 231 +-
+ net/mac80211/mesh.c | 162 +-
+ net/mac80211/mesh.h | 3 +-
+ net/mac80211/mesh_pathtbl.c | 6 +-
+ net/mac80211/mesh_plink.c | 28 +-
+ net/mac80211/mlme.c | 2979 +++++++++++---------
+ net/mac80211/ocb.c | 5 +-
+ net/mac80211/offchannel.c | 21 +-
+ net/mac80211/parse.c | 926 ++++++
+ net/mac80211/rate.c | 12 +-
+ net/mac80211/rx.c | 53 +-
+ net/mac80211/scan.c | 42 +-
+ net/mac80211/spectmgmt.c | 337 ++-
+ net/mac80211/sta_info.c | 21 +-
+ net/mac80211/sta_info.h | 14 +-
+ net/mac80211/tdls.c | 67 +-
+ net/mac80211/tests/elems.c | 1 +
+ net/mac80211/trace.h | 119 +-
+ net/mac80211/trace_msg.h | 2 -
+ net/mac80211/tx.c | 60 +-
+ net/mac80211/util.c | 1803 ++++--------
+ net/mac80211/vht.c | 6 +-
+ net/mac80211/wpa.c | 33 +-
+ net/mctp/Kconfig | 1 +
+ net/mctp/af_mctp.c | 117 +-
+ net/mctp/route.c | 105 +-
+ net/mctp/test/route-test.c | 413 ++-
+ net/mctp/test/utils.c | 2 +
+ net/mpls/af_mpls.c | 4 +-
+ net/mpls/mpls_gso.c | 3 +
+ net/mptcp/mptcp_diag.c | 1 +
+ net/mptcp/options.c | 20 +-
+ net/mptcp/pm.c | 2 +-
+ net/mptcp/pm_netlink.c | 10 +-
+ net/mptcp/protocol.c | 52 +-
+ net/mptcp/protocol.h | 24 +-
+ net/mptcp/sockopt.c | 2 +-
+ net/mptcp/subflow.c | 10 +-
+ net/mptcp/token_test.c | 7 +-
+ net/netfilter/Kconfig | 12 +-
+ net/netfilter/ipvs/ip_vs_conn.c | 4 +-
+ net/netfilter/nf_bpf_link.c | 2 +-
+ net/netfilter/nf_conncount.c | 8 +-
+ net/netfilter/nf_conntrack_core.c | 2 +-
+ net/netfilter/nf_conntrack_expect.c | 4 +-
+ net/netfilter/nf_log.c | 9 +-
+ net/netfilter/nf_queue.c | 106 -
+ net/netfilter/nf_tables_api.c | 35 +-
+ net/netfilter/nfnetlink_queue.c | 142 +
+ net/netfilter/nft_osf.c | 11 +-
+ net/netfilter/nft_set_pipapo.c | 193 +-
+ net/netfilter/nft_set_pipapo.h | 37 +-
+ net/netfilter/nft_set_pipapo_avx2.c | 59 +-
+ net/netfilter/utils.c | 37 -
+ net/netfilter/x_tables.c | 3 +-
+ net/netlabel/netlabel_kapi.c | 8 +-
+ net/netlink/af_netlink.c | 64 +-
+ net/netlink/af_netlink.h | 5 +-
+ net/netlink/diag.c | 3 +-
+ net/netlink/genetlink.c | 30 +
+ net/nfc/hci/llc.c | 20 +-
+ net/packet/diag.c | 1 +
+ net/rds/connection.c | 4 +-
+ net/sched/Kconfig | 10 -
+ net/sched/act_api.c | 2 +-
+ net/sched/act_bpf.c | 1 +
+ net/sched/act_connmark.c | 1 +
+ net/sched/act_csum.c | 1 +
+ net/sched/act_ct.c | 1 +
+ net/sched/act_ctinfo.c | 1 +
+ net/sched/act_gact.c | 1 +
+ net/sched/act_gate.c | 1 +
+ net/sched/act_ife.c | 1 +
+ net/sched/act_mirred.c | 1 +
+ net/sched/act_mpls.c | 1 +
+ net/sched/act_nat.c | 1 +
+ net/sched/act_pedit.c | 3 +-
+ net/sched/act_police.c | 1 +
+ net/sched/act_sample.c | 1 +
+ net/sched/act_simple.c | 1 +
+ net/sched/act_skbedit.c | 1 +
+ net/sched/act_skbmod.c | 1 +
+ net/sched/act_tunnel_key.c | 1 +
+ net/sched/act_vlan.c | 1 +
+ net/sched/cls_api.c | 2 +-
+ net/sched/cls_basic.c | 1 +
+ net/sched/cls_bpf.c | 1 +
+ net/sched/cls_cgroup.c | 1 +
+ net/sched/cls_flow.c | 1 +
+ net/sched/cls_flower.c | 1 +
+ net/sched/cls_fw.c | 1 +
+ net/sched/cls_matchall.c | 1 +
+ net/sched/cls_route.c | 1 +
+ net/sched/cls_u32.c | 1 +
+ net/sched/sch_api.c | 4 +-
+ net/sched/sch_cake.c | 1 +
+ net/sched/sch_cbs.c | 1 +
+ net/sched/sch_choke.c | 1 +
+ net/sched/sch_codel.c | 33 +-
+ net/sched/sch_drr.c | 1 +
+ net/sched/sch_etf.c | 1 +
+ net/sched/sch_ets.c | 1 +
+ net/sched/sch_fq.c | 1 +
+ net/sched/sch_fq_codel.c | 1 +
+ net/sched/sch_gred.c | 1 +
+ net/sched/sch_hfsc.c | 1 +
+ net/sched/sch_hhf.c | 1 +
+ net/sched/sch_htb.c | 1 +
+ net/sched/sch_ingress.c | 3 +-
+ net/sched/sch_mqprio.c | 1 +
+ net/sched/sch_multiq.c | 1 +
+ net/sched/sch_netem.c | 1 +
+ net/sched/sch_pie.c | 1 +
+ net/sched/sch_plug.c | 1 +
+ net/sched/sch_prio.c | 1 +
+ net/sched/sch_qfq.c | 1 +
+ net/sched/sch_red.c | 1 +
+ net/sched/sch_sfb.c | 1 +
+ net/sched/sch_sfq.c | 1 +
+ net/sched/sch_skbprio.c | 1 +
+ net/sched/sch_taprio.c | 73 +-
+ net/sched/sch_tbf.c | 1 +
+ net/sctp/diag.c | 1 +
+ net/sctp/protocol.c | 10 +-
+ net/smc/af_smc.c | 22 +-
+ net/smc/smc.h | 4 +-
+ net/smc/smc_clc.c | 6 +-
+ net/smc/smc_clc.h | 2 +-
+ net/smc/smc_core.c | 4 +-
+ net/smc/smc_diag.c | 1 +
+ net/smc/smc_ism.h | 10 +-
+ net/tipc/Kconfig | 7 +-
+ net/tipc/Makefile | 4 +-
+ net/tipc/bearer.c | 15 +-
+ net/tipc/diag.c | 1 +
+ net/tipc/node.c | 2 -
+ net/tipc/socket.c | 1 -
+ net/unix/Kconfig | 5 -
+ net/unix/Makefile | 2 -
+ net/unix/af_unix.c | 73 +-
+ net/unix/diag.c | 1 +
+ net/unix/garbage.c | 200 +-
+ net/unix/scm.c | 159 --
+ net/unix/scm.h | 10 -
+ net/vmw_vsock/diag.c | 1 +
+ net/wireless/chan.c | 397 +--
+ net/wireless/core.h | 52 +-
+ net/wireless/mlme.c | 146 +-
+ net/wireless/nl80211.c | 389 ++-
+ net/wireless/reg.c | 17 +-
+ net/wireless/scan.c | 775 ++---
+ net/wireless/sme.c | 3 +-
+ net/wireless/tests/Makefile | 2 +-
+ net/wireless/tests/chan.c | 228 ++
+ net/wireless/tests/scan.c | 277 +-
+ net/wireless/trace.h | 52 +-
+ net/wireless/util.c | 76 +
+ net/xdp/xsk_diag.c | 1 +
+ net/xfrm/xfrm_interface_core.c | 16 +-
+ net/xfrm/xfrm_proc.c | 1 +
+ net/xfrm/xfrm_state.c | 17 +-
+ net/xfrm/xfrm_user.c | 2 +-
+ rust/kernel/net/phy.rs | 24 +-
+ security/security.c | 101 +-
+ security/selinux/hooks.c | 47 +-
+ tools/bpf/bpftool/link.c | 96 +-
+ tools/bpf/bpftool/prog.c | 2 +-
+ tools/include/uapi/linux/bpf.h | 79 +-
+ tools/include/uapi/linux/if_link.h | 1 +
+ tools/lib/bpf/Build | 2 +-
+ tools/lib/bpf/bpf.c | 42 +-
+ tools/lib/bpf/bpf.h | 38 +-
+ tools/lib/bpf/bpf_core_read.h | 2 +-
+ tools/lib/bpf/btf.c | 10 +-
+ tools/lib/bpf/elf.c | 2 -
+ tools/lib/bpf/features.c | 503 ++++
+ tools/lib/bpf/libbpf.c | 604 +---
+ tools/lib/bpf/libbpf.h | 21 +-
+ tools/lib/bpf/libbpf.map | 1 +
+ tools/lib/bpf/libbpf_internal.h | 50 +-
+ tools/lib/bpf/libbpf_probes.c | 12 +-
+ tools/lib/bpf/str_error.h | 3 +
+ tools/net/ynl/Makefile.deps | 2 +
+ tools/net/ynl/cli.py | 22 +-
+ tools/net/ynl/generated/Makefile | 5 +-
+ tools/net/ynl/lib/nlspec.py | 9 +-
+ tools/net/ynl/lib/ynl.py | 252 +-
+ tools/net/ynl/samples/.gitignore | 1 +
+ tools/net/ynl/samples/ovs.c | 60 +
+ tools/net/ynl/ynl-gen-rst.py | 9 +-
+ tools/testing/kunit/configs/all_tests.config | 6 +
+ tools/testing/selftests/Makefile | 7 +-
+ tools/testing/selftests/bpf/README.rst | 32 +-
+ tools/testing/selftests/bpf/bpf_experimental.h | 21 +-
+ tools/testing/selftests/bpf/bpf_kfuncs.h | 10 +
+ .../selftests/bpf/bpf_testmod/bpf_testmod.c | 75 +
+ .../selftests/bpf/bpf_testmod/bpf_testmod.h | 5 +
+ tools/testing/selftests/bpf/config | 1 +
+ .../selftests/bpf/prog_tests/bpf_verif_scale.c | 2 +-
+ .../testing/selftests/bpf/prog_tests/ctx_rewrite.c | 44 -
+ .../selftests/bpf/prog_tests/fill_link_info.c | 114 +-
+ .../selftests/bpf/prog_tests/kptr_xchg_inline.c | 51 +
+ .../selftests/bpf/prog_tests/libbpf_probes.c | 4 +
+ .../testing/selftests/bpf/prog_tests/libbpf_str.c | 6 +
+ .../testing/selftests/bpf/prog_tests/reg_bounds.c | 2 +-
+ .../testing/selftests/bpf/prog_tests/tc_redirect.c | 90 +-
+ .../bpf/prog_tests/tcp_custom_syncookie.c | 150 +
+ .../bpf/prog_tests/test_struct_ops_module.c | 75 +
+ tools/testing/selftests/bpf/prog_tests/token.c | 1052 +++++++
+ tools/testing/selftests/bpf/prog_tests/xdpwall.c | 2 +-
+ tools/testing/selftests/bpf/progs/bpf_misc.h | 2 +-
+ .../testing/selftests/bpf/progs/bpf_tracing_net.h | 16 +
+ tools/testing/selftests/bpf/progs/iters.c | 4 +-
+ .../testing/selftests/bpf/progs/kptr_xchg_inline.c | 48 +
+ tools/testing/selftests/bpf/progs/priv_map.c | 13 +
+ tools/testing/selftests/bpf/progs/priv_prog.c | 13 +
+ .../selftests/bpf/progs/struct_ops_module.c | 30 +
+ .../selftests/bpf/progs/test_core_reloc_type_id.c | 2 +-
+ .../selftests/bpf/progs/test_fill_link_info.c | 6 +
+ .../testing/selftests/bpf/progs/test_map_in_map.c | 26 +
+ tools/testing/selftests/bpf/progs/test_siphash.h | 64 +
+ .../bpf/progs/test_tcp_custom_syncookie.c | 572 ++++
+ .../bpf/progs/test_tcp_custom_syncookie.h | 140 +
+ .../testing/selftests/bpf/progs/test_tcpbpf_kern.c | 2 +-
+ .../testing/selftests/bpf/progs/test_xdp_dynptr.c | 10 +-
+ tools/testing/selftests/bpf/progs/token_lsm.c | 32 +
+ .../bpf/progs/verifier_direct_packet_access.c | 2 +-
+ .../testing/selftests/bpf/progs/verifier_loops1.c | 24 +
+ .../selftests/bpf/progs/verifier_spill_fill.c | 229 +-
+ tools/testing/selftests/bpf/test_loader.c | 4 +-
+ tools/testing/selftests/bpf/test_maps.c | 6 +-
+ tools/testing/selftests/bpf/test_progs.c | 18 -
+ tools/testing/selftests/bpf/test_sock_addr.c | 3 +-
+ tools/testing/selftests/bpf/test_verifier.c | 60 +-
+ tools/testing/selftests/bpf/testing_helpers.c | 92 +-
+ tools/testing/selftests/bpf/testing_helpers.h | 8 +
+ .../selftests/bpf/verifier/bpf_loop_inline.c | 6 +
+ tools/testing/selftests/bpf/verifier/precise.c | 6 +-
+ .../testing/selftests/drivers/net/bonding/Makefile | 7 +-
+ .../drivers/net/bonding/bond-break-lacpdu-tx.sh | 19 +-
+ .../drivers/net/bonding/bond-eth-type-change.sh | 2 +-
+ .../drivers/net/bonding/bond-lladdr-target.sh | 21 +-
+ .../selftests/drivers/net/bonding/bond_options.sh | 38 +-
+ .../drivers/net/bonding/bond_topo_2d1c.sh | 8 +-
+ .../drivers/net/bonding/dev_addr_lists.sh | 2 +-
+ .../selftests/drivers/net/bonding/lag_lib.sh | 7 +-
+ .../drivers/net/bonding/mode-1-recovery-updelay.sh | 2 +-
+ .../drivers/net/bonding/mode-2-recovery-updelay.sh | 2 +-
+ .../drivers/net/bonding/net_forwarding_lib.sh | 1 -
+ tools/testing/selftests/drivers/net/dsa/Makefile | 18 +-
+ .../drivers/net/dsa/bridge_locked_port.sh | 2 +-
+ .../selftests/drivers/net/dsa/bridge_mdb.sh | 2 +-
+ .../selftests/drivers/net/dsa/bridge_mld.sh | 2 +-
+ .../selftests/drivers/net/dsa/bridge_vlan_aware.sh | 2 +-
+ .../selftests/drivers/net/dsa/bridge_vlan_mcast.sh | 2 +-
+ .../drivers/net/dsa/bridge_vlan_unaware.sh | 2 +-
+ tools/testing/selftests/drivers/net/dsa/lib.sh | 1 -
+ .../selftests/drivers/net/dsa/local_termination.sh | 2 +-
+ .../selftests/drivers/net/dsa/no_forwarding.sh | 2 +-
+ .../drivers/net/dsa/run_net_forwarding_test.sh | 9 +
+ .../selftests/drivers/net/dsa/tc_actions.sh | 2 +-
+ .../testing/selftests/drivers/net/dsa/tc_common.sh | 1 -
+ .../drivers/net/dsa/test_bridge_fdb_stress.sh | 2 +-
+ .../selftests/drivers/net/netdevsim/Makefile | 17 +
+ .../selftests/drivers/net/netdevsim/devlink.sh | 2 +-
+ .../drivers/net/netdevsim/udp_tunnel_nic.sh | 40 +-
+ tools/testing/selftests/drivers/net/team/Makefile | 7 +-
+ .../selftests/drivers/net/team/dev_addr_lists.sh | 4 +-
+ .../testing/selftests/drivers/net/team/lag_lib.sh | 1 -
+ .../drivers/net/team/net_forwarding_lib.sh | 1 -
+ tools/testing/selftests/lib.mk | 19 +
+ tools/testing/selftests/net/Makefile | 2 +
+ tools/testing/selftests/net/fcnal-test.sh | 34 +-
+ tools/testing/selftests/net/fib_tests.sh | 151 +-
+ tools/testing/selftests/net/forwarding/Makefile | 3 +
+ tools/testing/selftests/net/forwarding/config | 35 +
+ tools/testing/selftests/net/forwarding/lib.sh | 32 +-
+ .../selftests/net/forwarding/mirror_gre_lib.sh | 2 +-
+ .../net/forwarding/mirror_gre_topo_lib.sh | 2 +-
+ tools/testing/selftests/net/fq_band_pktlimit.sh | 14 +-
+ tools/testing/selftests/net/mptcp/diag.sh | 2 +-
+ tools/testing/selftests/net/mptcp/mptcp_join.sh | 22 +-
+ tools/testing/selftests/net/mptcp/mptcp_lib.sh | 21 +
+ tools/testing/selftests/net/mptcp/pm_netlink.sh | 1 -
+ tools/testing/selftests/net/mptcp/simult_flows.sh | 6 +
+ .../selftests/net/openvswitch/openvswitch.sh | 62 +
+ tools/testing/selftests/net/so_txtime.c | 7 +-
+ tools/testing/selftests/net/txtimestamp.c | 3 +-
+ tools/testing/selftests/net/txtimestamp.sh | 12 +-
+ tools/testing/selftests/net/udpgso.c | 134 +-
+ tools/testing/selftests/net/udpgso.sh | 49 +-
+ tools/testing/selftests/tc-testing/config | 1 +
+ .../tc-testing/tc-tests/actions/mirred.json | 396 +++
+ .../selftests/tc-testing/tc-tests/qdiscs/fq.json | 2 +-
+ .../tc-testing/tc-tests/qdiscs/taprio.json | 2 +
+ tools/testing/selftests/tc-testing/tdc.py | 2 +-
+ tools/testing/selftests/tc-testing/tdc.sh | 3 +-
+ tools/testing/vsock/util.c | 17 +-
+ tools/testing/vsock/util.h | 4 +
+ tools/testing/vsock/vsock_diag_test.c | 23 +-
+ tools/testing/vsock/vsock_test.c | 102 +-
+ tools/testing/vsock/vsock_test_zerocopy.c | 12 +-
+ tools/testing/vsock/vsock_uring_test.c | 17 +-
+ 1274 files changed, 66774 insertions(+), 22900 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/net/dsa/ar9331.txt
+ create mode 100644 Documentation/devicetree/bindings/net/dsa/qca,ar9331.yaml
+ create mode 100644 Documentation/devicetree/bindings/net/ethernet-phy-package.yaml
+ create mode 100644 Documentation/devicetree/bindings/net/qca,qca808x.yaml
+ create mode 100644 Documentation/devicetree/bindings/net/qcom,qca807x.yaml
+ create mode 100644 Documentation/networking/device_drivers/ethernet/marvell/octeon_ep_vf.rst
+ create mode 100644 drivers/net/can/esd/Kconfig
+ create mode 100644 drivers/net/can/esd/Makefile
+ create mode 100644 drivers/net/can/esd/esd_402_pci-core.c
+ create mode 100644 drivers/net/can/esd/esdacc.c
+ create mode 100644 drivers/net/can/esd/esdacc.h
+ create mode 100644 drivers/net/dsa/realtek/realtek-mdio.h
+ create mode 100644 drivers/net/dsa/realtek/realtek-smi.h
+ create mode 100644 drivers/net/dsa/realtek/rtl83xx.c
+ create mode 100644 drivers/net/dsa/realtek/rtl83xx.h
+ create mode 100644 drivers/net/ethernet/intel/igc/igc_leds.c
+ create mode 100644 drivers/net/ethernet/marvell/octeon_ep_vf/Kconfig
+ create mode 100644 drivers/net/ethernet/marvell/octeon_ep_vf/Makefile
+ create mode 100644 drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_cn9k.c
+ create mode 100644 drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_cnxk.c
+ create mode 100644 drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_config.h
+ create mode 100644 drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_ethtool.c
+ create mode 100644 drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_main.c
+ create mode 100644 drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_main.h
+ create mode 100644 drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_mbox.c
+ create mode 100644 drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_mbox.h
+ create mode 100644 drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_regs_cn9k.h
+ create mode 100644 drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_regs_cnxk.h
+ create mode 100644 drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_rx.c
+ create mode 100644 drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_rx.h
+ create mode 100644 drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_tx.c
+ create mode 100644 drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_tx.h
+ create mode 100644 drivers/net/ethernet/wangxun/txgbe/txgbe_irq.c
+ create mode 100644 drivers/net/ethernet/wangxun/txgbe/txgbe_irq.h
+ delete mode 100644 drivers/net/phy/at803x.c
+ create mode 100644 drivers/net/phy/qcom/Kconfig
+ create mode 100644 drivers/net/phy/qcom/Makefile
+ create mode 100644 drivers/net/phy/qcom/at803x.c
+ create mode 100644 drivers/net/phy/qcom/qca807x.c
+ create mode 100644 drivers/net/phy/qcom/qca808x.c
+ create mode 100644 drivers/net/phy/qcom/qca83xx.c
+ create mode 100644 drivers/net/phy/qcom/qcom-phy-lib.c
+ create mode 100644 drivers/net/phy/qcom/qcom.h
+ create mode 100644 drivers/net/wireless/ath/ath12k/fw.c
+ create mode 100644 drivers/net/wireless/ath/ath12k/fw.h
+ create mode 100644 drivers/net/wireless/ath/ath12k/p2p.c
+ create mode 100644 drivers/net/wireless/ath/ath12k/p2p.h
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/regulatory.c
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/regulatory.h
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/tests/Makefile
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/tests/devinfo.c
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/tests/module.c
+ create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8922a_rfk.c
+ create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8922a_rfk.h
+ create mode 100644 drivers/ptp/ptp_fc3.c
+ create mode 100644 drivers/ptp/ptp_fc3.h
+ create mode 100644 include/linux/mfd/idtRC38xxx_reg.h
+ create mode 100644 include/net/netmem.h
+ delete mode 100644 kernel/bpf/bpf_struct_ops_types.h
+ create mode 100644 kernel/bpf/token.c
+ create mode 100644 net/mac80211/parse.c
+ delete mode 100644 net/unix/scm.c
+ delete mode 100644 net/unix/scm.h
+ create mode 100644 net/wireless/tests/chan.c
+ create mode 100644 tools/lib/bpf/features.c
+ create mode 100644 tools/net/ynl/samples/ovs.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/kptr_xchg_inline.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/tcp_custom_syncookie.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/test_struct_ops_module.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/token.c
+ create mode 100644 tools/testing/selftests/bpf/progs/kptr_xchg_inline.c
+ create mode 100644 tools/testing/selftests/bpf/progs/priv_map.c
+ create mode 100644 tools/testing/selftests/bpf/progs/priv_prog.c
+ create mode 100644 tools/testing/selftests/bpf/progs/struct_ops_module.c
+ create mode 100644 tools/testing/selftests/bpf/progs/test_siphash.h
+ create mode 100644 tools/testing/selftests/bpf/progs/test_tcp_custom_syncookie.c
+ create mode 100644 tools/testing/selftests/bpf/progs/test_tcp_custom_syncookie.h
+ create mode 100644 tools/testing/selftests/bpf/progs/token_lsm.c
+ delete mode 120000 tools/testing/selftests/drivers/net/bonding/net_forwarding_lib.sh
+ delete mode 120000 tools/testing/selftests/drivers/net/dsa/lib.sh
+ create mode 100755 tools/testing/selftests/drivers/net/dsa/run_net_forwarding_test.sh
+ delete mode 120000 tools/testing/selftests/drivers/net/dsa/tc_common.sh
+ create mode 100644 tools/testing/selftests/drivers/net/netdevsim/Makefile
+ delete mode 120000 tools/testing/selftests/drivers/net/team/lag_lib.sh
+ delete mode 120000 tools/testing/selftests/drivers/net/team/net_forwarding_lib.sh
+Merging bpf-next/for-next (e59997d90525 Merge branch 'bpf-arm64-support-exceptions')
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git bpf-next/for-next
+Auto-merging drivers/hid/bpf/hid_bpf_dispatch.c
+Auto-merging init/Kconfig
+Auto-merging kernel/bpf/helpers.c
+Auto-merging kernel/bpf/verifier.c
+Auto-merging net/core/xdp.c
+Auto-merging net/xdp/xsk.c
+Auto-merging scripts/bpf_doc.py
+Merge made by the 'ort' strategy.
+ Documentation/bpf/kfuncs.rst | 8 +-
+ .../bpf/standardization/instruction-set.rst | 155 +++++-----
+ Documentation/networking/af_xdp.rst | 31 +-
+ arch/arm64/kernel/stacktrace.c | 26 ++
+ arch/arm64/net/bpf_jit_comp.c | 85 ++++--
+ arch/riscv/net/bpf_jit.h | 134 +++++++++
+ arch/riscv/net/bpf_jit_comp64.c | 215 +++++---------
+ drivers/hid/bpf/hid_bpf_dispatch.c | 8 +-
+ fs/verity/measure.c | 4 +-
+ include/linux/bpf-cgroup.h | 3 +-
+ include/linux/bpf.h | 35 ++-
+ include/linux/bpf_local_storage.h | 30 +-
+ include/linux/bpf_verifier.h | 10 +
+ include/linux/btf.h | 23 +-
+ include/linux/btf_ids.h | 21 +-
+ include/linux/filter.h | 21 +-
+ include/uapi/linux/bpf.h | 6 +-
+ init/Kconfig | 5 -
+ kernel/bpf/Kconfig | 1 +
+ kernel/bpf/bpf_local_storage.c | 52 +---
+ kernel/bpf/bpf_lsm.c | 6 +-
+ kernel/bpf/bpf_struct_ops.c | 227 +++++++++++++--
+ kernel/bpf/btf.c | 275 ++++++++++++-----
+ kernel/bpf/cgroup.c | 3 -
+ kernel/bpf/cpumask.c | 4 +-
+ kernel/bpf/helpers.c | 16 +-
+ kernel/bpf/log.c | 62 +++-
+ kernel/bpf/map_iter.c | 4 +-
+ kernel/bpf/token.c | 16 +-
+ kernel/bpf/verifier.c | 236 ++++++++++-----
+ kernel/cgroup/rstat.c | 4 +-
+ kernel/events/core.c | 6 +-
+ kernel/trace/bpf_trace.c | 8 +-
+ net/bpf/test_run.c | 8 +-
+ net/core/filter.c | 20 +-
+ net/core/xdp.c | 4 +-
+ net/ipv4/bpf_tcp_ca.c | 4 +-
+ net/ipv4/fou_bpf.c | 4 +-
+ net/ipv4/tcp_bbr.c | 4 +-
+ net/ipv4/tcp_cubic.c | 4 +-
+ net/ipv4/tcp_dctcp.c | 4 +-
+ net/netfilter/nf_conntrack_bpf.c | 4 +-
+ net/netfilter/nf_nat_bpf.c | 4 +-
+ net/xdp/xsk.c | 5 +-
+ net/xfrm/xfrm_interface_bpf.c | 4 +-
+ net/xfrm/xfrm_state_bpf.c | 4 +-
+ scripts/bpf_doc.py | 2 +-
+ tools/bpf/bpftool/gen.c | 9 +-
+ tools/bpf/resolve_btfids/main.c | 70 ++++-
+ tools/include/linux/btf_ids.h | 9 +
+ tools/include/uapi/linux/bpf.h | 6 +-
+ tools/lib/bpf/bpf.h | 41 ++-
+ tools/lib/bpf/bpf_core_read.h | 58 +++-
+ tools/lib/bpf/bpf_helpers.h | 2 +
+ tools/lib/bpf/btf.c | 33 ++-
+ tools/lib/bpf/features.c | 58 ++++
+ tools/lib/bpf/libbpf.c | 99 ++-----
+ tools/lib/bpf/libbpf.map | 5 +-
+ tools/lib/bpf/libbpf_internal.h | 16 +
+ tools/lib/bpf/linker.c | 2 +-
+ tools/lib/bpf/netlink.c | 4 +-
+ tools/testing/selftests/bpf/DENYLIST.aarch64 | 1 -
+ tools/testing/selftests/bpf/Makefile | 49 +++-
+ tools/testing/selftests/bpf/bench.c | 12 +-
+ tools/testing/selftests/bpf/bpf_kfuncs.h | 20 +-
+ .../testing/selftests/bpf/bpf_test_no_cfi/Makefile | 19 ++
+ .../bpf/bpf_test_no_cfi/bpf_test_no_cfi.c | 84 ++++++
+ .../selftests/bpf/bpf_testmod/bpf_testmod.c | 25 +-
+ .../selftests/bpf/bpf_testmod/bpf_testmod.h | 6 +-
+ tools/testing/selftests/bpf/prog_tests/cpumask.c | 6 +-
+ .../selftests/bpf/prog_tests/decap_sanity.c | 2 +-
+ .../testing/selftests/bpf/prog_tests/fib_lookup.c | 2 +-
+ .../selftests/bpf/prog_tests/ip_check_defrag.c | 4 +-
+ .../selftests/bpf/prog_tests/kptr_xchg_inline.c | 3 +-
+ tools/testing/selftests/bpf/prog_tests/log_fixup.c | 4 +-
+ .../testing/selftests/bpf/prog_tests/lwt_helpers.h | 2 -
+ .../selftests/bpf/prog_tests/lwt_redirect.c | 4 +-
+ .../testing/selftests/bpf/prog_tests/lwt_reroute.c | 3 +-
+ tools/testing/selftests/bpf/prog_tests/mptcp.c | 2 +-
+ .../selftests/bpf/prog_tests/rcu_read_lock.c | 6 +
+ .../selftests/bpf/prog_tests/sock_destroy.c | 2 +-
+ .../selftests/bpf/prog_tests/sock_iter_batch.c | 4 +-
+ tools/testing/selftests/bpf/prog_tests/spin_lock.c | 2 +
+ .../selftests/bpf/prog_tests/task_local_storage.c | 6 -
+ .../bpf/prog_tests/test_struct_ops_maybe_null.c | 46 +++
+ .../bpf/prog_tests/test_struct_ops_no_cfi.c | 35 +++
+ .../testing/selftests/bpf/prog_tests/test_tunnel.c | 18 +-
+ .../selftests/bpf/prog_tests/tracing_failure.c | 37 +++
+ tools/testing/selftests/bpf/prog_tests/verifier.c | 2 +
+ .../selftests/bpf/progs/async_stack_depth.c | 4 +-
+ tools/testing/selftests/bpf/progs/bpf_compiler.h | 33 +++
+ .../selftests/bpf/progs/cgrp_ls_recursion.c | 26 --
+ .../selftests/bpf/progs/connect_unix_prog.c | 3 +-
+ tools/testing/selftests/bpf/progs/cpumask_common.h | 55 ++--
+ .../selftests/bpf/progs/getpeername_unix_prog.c | 3 +-
+ .../selftests/bpf/progs/getsockname_unix_prog.c | 3 +-
+ tools/testing/selftests/bpf/progs/iters.c | 5 +-
+ tools/testing/selftests/bpf/progs/loop4.c | 4 +-
+ tools/testing/selftests/bpf/progs/profiler.inc.h | 17 +-
+ tools/testing/selftests/bpf/progs/pyperf.h | 7 +-
+ tools/testing/selftests/bpf/progs/rcu_read_lock.c | 120 ++++++++
+ .../selftests/bpf/progs/recvmsg_unix_prog.c | 3 +-
+ .../selftests/bpf/progs/sendmsg_unix_prog.c | 3 +-
+ .../selftests/bpf/progs/sk_storage_omem_uncharge.c | 4 +-
+ .../testing/selftests/bpf/progs/sock_iter_batch.c | 4 +-
+ tools/testing/selftests/bpf/progs/strobemeta.h | 18 +-
+ .../selftests/bpf/progs/struct_ops_maybe_null.c | 29 ++
+ .../bpf/progs/struct_ops_maybe_null_fail.c | 24 ++
+ .../selftests/bpf/progs/struct_ops_module.c | 3 +-
+ .../selftests/bpf/progs/task_ls_recursion.c | 17 --
+ .../selftests/bpf/progs/test_cls_redirect.c | 7 +-
+ .../selftests/bpf/progs/test_cls_redirect_dynptr.c | 2 +
+ .../selftests/bpf/progs/test_global_func1.c | 8 +-
+ .../bpf/progs/test_global_func_ctx_args.c | 19 ++
+ .../selftests/bpf/progs/test_lwt_seg6local.c | 6 +-
+ .../selftests/bpf/progs/test_ptr_untrusted.c | 6 +-
+ tools/testing/selftests/bpf/progs/test_seg6_loop.c | 4 +-
+ tools/testing/selftests/bpf/progs/test_skb_ctx.c | 4 +-
+ tools/testing/selftests/bpf/progs/test_spin_lock.c | 65 +++++
+ .../selftests/bpf/progs/test_spin_lock_fail.c | 44 +++
+ .../selftests/bpf/progs/test_sysctl_loop1.c | 6 +-
+ .../selftests/bpf/progs/test_sysctl_loop2.c | 6 +-
+ .../testing/selftests/bpf/progs/test_sysctl_prog.c | 6 +-
+ tools/testing/selftests/bpf/progs/test_tc_tunnel.c | 5 +-
+ .../bpf/progs/test_tcp_custom_syncookie.c | 81 ++++--
+ tools/testing/selftests/bpf/progs/test_xdp.c | 3 +-
+ tools/testing/selftests/bpf/progs/test_xdp_loop.c | 3 +-
+ .../selftests/bpf/progs/test_xdp_noinline.c | 5 +-
+ .../testing/selftests/bpf/progs/tracing_failure.c | 20 ++
+ tools/testing/selftests/bpf/progs/type_cast.c | 13 +-
+ .../selftests/bpf/progs/verifier_global_ptr_args.c | 182 ++++++++++++
+ .../selftests/bpf/progs/verifier_global_subprogs.c | 29 ++
+ .../selftests/bpf/progs/verifier_spill_fill.c | 324 ++++++++++++++++++++-
+ .../selftests/bpf/progs/verifier_spin_lock.c | 2 +-
+ .../selftests/bpf/progs/xdp_synproxy_kern.c | 6 +-
+ tools/testing/selftests/bpf/progs/xdping_kern.c | 3 +-
+ tools/testing/selftests/bpf/test_progs.h | 7 +-
+ tools/testing/selftests/bpf/testing_helpers.c | 4 +-
+ tools/testing/selftests/bpf/testing_helpers.h | 2 +
+ tools/testing/selftests/bpf/trace_helpers.c | 2 +-
+ 140 files changed, 2963 insertions(+), 929 deletions(-)
+ create mode 100644 tools/testing/selftests/bpf/bpf_test_no_cfi/Makefile
+ create mode 100644 tools/testing/selftests/bpf/bpf_test_no_cfi/bpf_test_no_cfi.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/test_struct_ops_maybe_null.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/test_struct_ops_no_cfi.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/tracing_failure.c
+ create mode 100644 tools/testing/selftests/bpf/progs/bpf_compiler.h
+ create mode 100644 tools/testing/selftests/bpf/progs/struct_ops_maybe_null.c
+ create mode 100644 tools/testing/selftests/bpf/progs/struct_ops_maybe_null_fail.c
+ create mode 100644 tools/testing/selftests/bpf/progs/tracing_failure.c
+ create mode 100644 tools/testing/selftests/bpf/progs/verifier_global_ptr_args.c
+Merging ipsec-next/master (aceb147b20a2 xfrm: Do not allocate stats in the driver)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git ipsec-next/master
+Auto-merging net/ipv6/xfrm6_tunnel.c
+Auto-merging net/xfrm/xfrm_interface_core.c
+Auto-merging net/xfrm/xfrm_policy.c
+Merge made by the 'ort' strategy.
+ net/ipv6/xfrm6_tunnel.c | 5 +-
+ net/xfrm/xfrm_interface_core.c | 10 +--
+ net/xfrm/xfrm_policy.c | 147 +++++++++++++++++++++++++++++++++++++++--
+ 3 files changed, 144 insertions(+), 18 deletions(-)
+Merging mlx5-next/mlx5-next (d727d27db536 RDMA/mlx5: Expose register c0 for RDMA device)
+$ git merge -m Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git mlx5-next/mlx5-next
+Already up to date.
+Merging netfilter-next/main (a4634aa71fee bonding: rate-limit bonding driver inspect messages)
+$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next.git netfilter-next/main
+Already up to date.
+Merging ipvs-next/main (26f4dac11775 netfilter: x_tables: Use unsafe_memcpy() for 0-sized destination)
+$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git ipvs-next/main
+Already up to date.
+Merging bluetooth/master (715b938b3a0f Bluetooth: hci_sync: Use QoS to determine which PHY to scan)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master
+Merge made by the 'ort' strategy.
+ drivers/bluetooth/btbcm.c | 12 +-
+ drivers/bluetooth/btintel.c | 116 +++-
+ drivers/bluetooth/btnxpuart.c | 24 +-
+ drivers/bluetooth/btqca.c | 2 +-
+ drivers/bluetooth/btrtl.c | 14 +
+ drivers/bluetooth/btusb.c | 8 +
+ drivers/bluetooth/hci_bcm4377.c | 3 +-
+ drivers/bluetooth/hci_qca.c | 28 +-
+ include/net/bluetooth/hci.h | 11 +-
+ include/net/bluetooth/hci_core.h | 36 +-
+ include/net/bluetooth/hci_sync.h | 22 +-
+ include/net/bluetooth/l2cap.h | 44 +-
+ net/bluetooth/6lowpan.c | 4 +-
+ net/bluetooth/Kconfig | 8 -
+ net/bluetooth/Makefile | 1 -
+ net/bluetooth/a2mp.c | 1054 ------------------------------------
+ net/bluetooth/a2mp.h | 154 ------
+ net/bluetooth/amp.c | 590 ---------------------
+ net/bluetooth/amp.h | 60 ---
+ net/bluetooth/bnep/core.c | 2 +-
+ net/bluetooth/hci_conn.c | 198 ++-----
+ net/bluetooth/hci_core.c | 135 +++--
+ net/bluetooth/hci_event.c | 228 ++------
+ net/bluetooth/hci_request.c | 2 +-
+ net/bluetooth/hci_sock.c | 4 +-
+ net/bluetooth/hci_sync.c | 430 +++++++++++++--
+ net/bluetooth/iso.c | 91 +++-
+ net/bluetooth/l2cap_core.c | 1087 +-------------------------------------
+ net/bluetooth/l2cap_sock.c | 21 +-
+ net/bluetooth/mgmt.c | 116 +---
+ net/bluetooth/rfcomm/core.c | 2 +-
+ net/bluetooth/sco.c | 3 +-
+ 32 files changed, 941 insertions(+), 3569 deletions(-)
+ delete mode 100644 net/bluetooth/a2mp.c
+ delete mode 100644 net/bluetooth/a2mp.h
+ delete mode 100644 net/bluetooth/amp.c
+ delete mode 100644 net/bluetooth/amp.h
+Merging wireless-next/for-next (734940143fbd Merge tag 'mt76-for-kvalo-2024-02-22' of https://github.com/nbd168/wireless)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git wireless-next/for-next
+Merge made by the 'ort' strategy.
+ .../bindings/net/wireless/mediatek,mt76.yaml | 33 +++-
+ .../broadcom/brcm80211/brcmfmac/cfg80211.c | 9 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/fweh.c | 2 +-
+ drivers/net/wireless/mediatek/mt76/Makefile | 2 +-
+ drivers/net/wireless/mediatek/mt76/agg-rx.c | 2 +-
+ drivers/net/wireless/mediatek/mt76/dma.c | 106 +---------
+ drivers/net/wireless/mediatek/mt76/dma.h | 9 +-
+ drivers/net/wireless/mediatek/mt76/mac80211.c | 26 +--
+ drivers/net/wireless/mediatek/mt76/mmio.c | 107 -----------
+ drivers/net/wireless/mediatek/mt76/mt76.h | 61 ++++--
+ drivers/net/wireless/mediatek/mt76/mt76_connac.h | 5 +
+ .../net/wireless/mediatek/mt76/mt76_connac2_mac.h | 5 +
+ .../net/wireless/mediatek/mt76/mt76_connac_mac.c | 7 +-
+ .../net/wireless/mediatek/mt76/mt76_connac_mcu.c | 7 +-
+ .../net/wireless/mediatek/mt76/mt76_connac_mcu.h | 4 +
+ .../net/wireless/mediatek/mt76/mt76x02_usb_core.c | 2 +-
+ drivers/net/wireless/mediatek/mt76/mt76x2/usb.c | 1 +
+ drivers/net/wireless/mediatek/mt76/mt7915/dma.c | 2 +-
+ drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 9 +-
+ drivers/net/wireless/mediatek/mt76/mt7915/main.c | 2 +-
+ drivers/net/wireless/mediatek/mt76/mt7915/mmio.c | 55 +++++-
+ drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h | 1 +
+ drivers/net/wireless/mediatek/mt76/mt7915/soc.c | 3 +-
+ drivers/net/wireless/mediatek/mt76/mt7921/init.c | 6 +
+ drivers/net/wireless/mediatek/mt76/mt7921/main.c | 13 ++
+ drivers/net/wireless/mediatek/mt76/mt7921/mcu.c | 4 +-
+ drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h | 1 +
+ drivers/net/wireless/mediatek/mt76/mt7921/pci.c | 13 ++
+ drivers/net/wireless/mediatek/mt76/mt7921/sdio.c | 2 +
+ drivers/net/wireless/mediatek/mt76/mt7925/init.c | 56 ++++++
+ drivers/net/wireless/mediatek/mt76/mt7925/main.c | 26 ++-
+ drivers/net/wireless/mediatek/mt76/mt7925/mcu.c | 212 +++++++++++++-------
+ drivers/net/wireless/mediatek/mt76/mt7925/mcu.h | 94 +++++++--
+ drivers/net/wireless/mediatek/mt76/mt7925/mt7925.h | 1 +
+ drivers/net/wireless/mediatek/mt76/mt7925/pci.c | 3 +
+ drivers/net/wireless/mediatek/mt76/mt792x.h | 2 +
+ .../net/wireless/mediatek/mt76/mt792x_acpi_sar.c | 38 ++--
+ drivers/net/wireless/mediatek/mt76/mt792x_core.c | 1 +
+ drivers/net/wireless/mediatek/mt76/mt792x_dma.c | 15 +-
+ drivers/net/wireless/mediatek/mt76/mt792x_regs.h | 8 +
+ drivers/net/wireless/mediatek/mt76/mt792x_usb.c | 72 ++++---
+ drivers/net/wireless/mediatek/mt76/mt7996/dma.c | 5 +-
+ drivers/net/wireless/mediatek/mt76/mt7996/init.c | 12 +-
+ drivers/net/wireless/mediatek/mt76/mt7996/mac.c | 81 ++++++--
+ drivers/net/wireless/mediatek/mt76/mt7996/main.c | 7 +-
+ drivers/net/wireless/mediatek/mt76/mt7996/mcu.c | 32 ++--
+ drivers/net/wireless/mediatek/mt76/mt7996/mcu.h | 4 +-
+ drivers/net/wireless/mediatek/mt76/mt7996/mmio.c | 74 ++++---
+ drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h | 6 +-
+ drivers/net/wireless/mediatek/mt76/usb.c | 52 ++---
+ drivers/net/wireless/mediatek/mt76/wed.c | 213 +++++++++++++++++++++
+ drivers/net/wireless/realtek/rtw89/core.c | 10 +-
+ drivers/net/wireless/realtek/rtw89/fw.c | 4 +-
+ drivers/net/wireless/realtek/rtw89/pci.c | 50 ++++-
+ drivers/net/wireless/realtek/rtw89/pci.h | 30 +++
+ drivers/net/wireless/realtek/rtw89/pci_be.c | 52 +++++
+ 56 files changed, 1111 insertions(+), 548 deletions(-)
+ create mode 100644 drivers/net/wireless/mediatek/mt76/wed.c
+Merging wpan-next/master (42683294cc0a ieee802154: ca8210: Drop spurious WQ_UNBOUND from alloc_ordered_workqueue() call)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git wpan-next/master
+Merge made by the 'ort' strategy.
+ drivers/net/ieee802154/at86rf230.c | 2 +-
+ drivers/net/ieee802154/ca8210.c | 10 ++--------
+ drivers/net/ieee802154/mcr20a.c | 4 ++--
+ drivers/net/ieee802154/mrf24j40.c | 4 ++--
+ 4 files changed, 7 insertions(+), 13 deletions(-)
+Merging wpan-staging/staging (42683294cc0a ieee802154: ca8210: Drop spurious WQ_UNBOUND from alloc_ordered_workqueue() call)
+$ git merge -m Merge branch 'staging' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git wpan-staging/staging
+Already up to date.
+Merging mtd/mtd/next (77bf03252839 mtd: Remove support for Carillo Ranch driver)
+$ git merge -m Merge branch 'mtd/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/mtd/next
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/mtd/davinci-nand.txt | 2 +-
+ .../devicetree/bindings/mtd/flctl-nand.txt | 2 +-
+ .../devicetree/bindings/mtd/fsl-upm-nand.txt | 2 +-
+ .../devicetree/bindings/mtd/gpio-control-nand.txt | 2 +-
+ .../devicetree/bindings/mtd/gpmi-nand.yaml | 2 +-
+ .../devicetree/bindings/mtd/hisi504-nand.txt | 2 +-
+ Documentation/devicetree/bindings/mtd/mtd.yaml | 2 +
+ .../bindings/mtd/nvidia-tegra20-nand.txt | 2 +-
+ .../devicetree/bindings/mtd/orion-nand.txt | 2 +-
+ .../devicetree/bindings/mtd/samsung-s3c2410.txt | 2 +-
+ drivers/mtd/chips/cfi_cmdset_0002.c | 4 +-
+ drivers/mtd/maps/Kconfig | 7 -
+ drivers/mtd/maps/Makefile | 1 -
+ drivers/mtd/maps/intel_vr_nor.c | 265 ---------------------
+ drivers/mtd/maps/physmap-core.c | 2 +-
+ drivers/mtd/ssfdc.c | 7 +-
+ include/linux/mtd/flashchip.h | 1 +
+ include/linux/mtd/lpc32xx_mlc.h | 2 +-
+ include/linux/mtd/lpc32xx_slc.h | 2 +-
+ include/linux/mtd/mtd.h | 2 +-
+ 20 files changed, 22 insertions(+), 291 deletions(-)
+ delete mode 100644 drivers/mtd/maps/intel_vr_nor.c
+Merging nand/nand/next (65a7f244b156 mtd: rawnand: hynix: remove @nand_technology kernel-doc description)
+$ git merge -m Merge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next
+Auto-merging arch/arm64/boot/dts/broadcom/bcmbca/bcm4908-asus-gt-ac5300.dts
+Auto-merging arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/mtd/atmel-nand.txt | 1 +
+ .../devicetree/bindings/mtd/brcm,brcmnand.yaml | 44 ++++++-
+ .../bindings/mtd/st,stm32-fmc2-nand.yaml | 25 +++-
+ arch/arm/boot/dts/broadcom/bcm47622.dtsi | 14 +++
+ arch/arm/boot/dts/broadcom/bcm63138.dtsi | 7 +-
+ arch/arm/boot/dts/broadcom/bcm63148.dtsi | 14 +++
+ arch/arm/boot/dts/broadcom/bcm63178.dtsi | 14 +++
+ arch/arm/boot/dts/broadcom/bcm6756.dtsi | 14 +++
+ arch/arm/boot/dts/broadcom/bcm6846.dtsi | 14 +++
+ arch/arm/boot/dts/broadcom/bcm6855.dtsi | 14 +++
+ arch/arm/boot/dts/broadcom/bcm6878.dtsi | 14 +++
+ arch/arm/boot/dts/broadcom/bcm947622.dts | 10 ++
+ arch/arm/boot/dts/broadcom/bcm963138.dts | 10 ++
+ arch/arm/boot/dts/broadcom/bcm963138dvt.dts | 14 +--
+ arch/arm/boot/dts/broadcom/bcm963148.dts | 10 ++
+ arch/arm/boot/dts/broadcom/bcm963178.dts | 10 ++
+ arch/arm/boot/dts/broadcom/bcm96756.dts | 10 ++
+ arch/arm/boot/dts/broadcom/bcm96846.dts | 10 ++
+ arch/arm/boot/dts/broadcom/bcm96855.dts | 10 ++
+ arch/arm/boot/dts/broadcom/bcm96878.dts | 10 ++
+ .../dts/broadcom/bcmbca/bcm4906-netgear-r8000p.dts | 5 +
+ .../bcmbca/bcm4906-tplink-archer-c2300-v1.dts | 5 +
+ .../dts/broadcom/bcmbca/bcm4908-asus-gt-ac5300.dts | 6 +-
+ arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi | 4 +-
+ arch/arm64/boot/dts/broadcom/bcmbca/bcm4912.dtsi | 14 +++
+ arch/arm64/boot/dts/broadcom/bcmbca/bcm63146.dtsi | 14 +++
+ arch/arm64/boot/dts/broadcom/bcmbca/bcm63158.dtsi | 14 +++
+ arch/arm64/boot/dts/broadcom/bcmbca/bcm6813.dtsi | 14 +++
+ arch/arm64/boot/dts/broadcom/bcmbca/bcm6856.dtsi | 14 +++
+ arch/arm64/boot/dts/broadcom/bcmbca/bcm6858.dtsi | 14 +++
+ arch/arm64/boot/dts/broadcom/bcmbca/bcm94908.dts | 10 ++
+ arch/arm64/boot/dts/broadcom/bcmbca/bcm94912.dts | 10 ++
+ arch/arm64/boot/dts/broadcom/bcmbca/bcm963146.dts | 10 ++
+ arch/arm64/boot/dts/broadcom/bcmbca/bcm963158.dts | 10 ++
+ arch/arm64/boot/dts/broadcom/bcmbca/bcm96813.dts | 10 ++
+ arch/arm64/boot/dts/broadcom/bcmbca/bcm96856.dts | 10 ++
+ arch/arm64/boot/dts/broadcom/bcmbca/bcm96858.dts | 10 ++
+ drivers/mtd/nand/raw/brcmnand/Makefile | 2 +-
+ drivers/mtd/nand/raw/brcmnand/bcm63138_nand.c | 99 ----------------
+ drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c | 126 +++++++++++++++++++++
+ drivers/mtd/nand/raw/brcmnand/brcmnand.c | 65 +++++++----
+ drivers/mtd/nand/raw/brcmnand/brcmnand.h | 2 +
+ drivers/mtd/nand/raw/fsl_elbc_nand.c | 3 +-
+ drivers/mtd/nand/raw/lpc32xx_mlc.c | 5 +-
+ drivers/mtd/nand/raw/meson_nand.c | 2 +-
+ drivers/mtd/nand/raw/mtk_nand.c | 2 +-
+ drivers/mtd/nand/raw/nand_bbt.c | 1 -
+ drivers/mtd/nand/raw/nand_hynix.c | 1 -
+ drivers/mtd/nand/raw/stm32_fmc2_nand.c | 83 +++++++++++---
+ drivers/mtd/nand/spi/esmt.c | 9 +-
+ drivers/mtd/nand/spi/winbond.c | 12 ++
+ include/linux/mtd/spinand.h | 2 +-
+ 52 files changed, 693 insertions(+), 164 deletions(-)
+ delete mode 100644 drivers/mtd/nand/raw/brcmnand/bcm63138_nand.c
+ create mode 100644 drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c
+Merging spi-nor/spi-nor/next (6a9eda34418f mtd: spi-nor: core: set mtd->eraseregions for non-uniform erase map)
+$ git merge -m Merge branch 'spi-nor/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git spi-nor/spi-nor/next
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/mtd/jedec,spi-nor.yaml | 3 +
+ drivers/mtd/spi-nor/core.c | 187 ++++++++++-----------
+ drivers/mtd/spi-nor/core.h | 30 +---
+ drivers/mtd/spi-nor/debugfs.c | 26 ++-
+ drivers/mtd/spi-nor/sfdp.c | 47 ++----
+ 5 files changed, 128 insertions(+), 165 deletions(-)
+Merging crypto/master (a24e3b583ea2 crypto: rockchip - fix to check return value)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git crypto/master
+Auto-merging MAINTAINERS
+Auto-merging crypto/Kconfig
+Auto-merging drivers/crypto/virtio/virtio_crypto_akcipher_algs.c
+Merge made by the 'ort' strategy.
+ Documentation/ABI/testing/debugfs-driver-qat | 26 ++
+ Documentation/ABI/testing/debugfs-hisi-hpre | 22 ++
+ Documentation/ABI/testing/debugfs-hisi-sec | 22 ++
+ Documentation/ABI/testing/debugfs-hisi-zip | 22 ++
+ Documentation/ABI/testing/sysfs-driver-qat | 20 ++
+ .../bindings/crypto/qcom,inline-crypto-engine.yaml | 1 +
+ .../devicetree/bindings/crypto/qcom-qce.yaml | 1 +
+ MAINTAINERS | 18 +-
+ arch/arm/crypto/sha256_glue.c | 13 +-
+ arch/arm/crypto/sha512-glue.c | 12 +-
+ arch/arm64/crypto/Kconfig | 1 +
+ arch/arm64/crypto/aes-ce-ccm-core.S | 265 ++++++++-------------
+ arch/arm64/crypto/aes-ce-ccm-glue.c | 154 ++++++++----
+ arch/arm64/crypto/aes-glue.c | 1 +
+ arch/powerpc/crypto/Kconfig | 20 ++
+ arch/powerpc/crypto/Makefile | 20 +-
+ {drivers/crypto/vmx => arch/powerpc/crypto}/aes.c | 0
+ .../crypto/vmx => arch/powerpc/crypto}/aes_cbc.c | 0
+ .../crypto/vmx => arch/powerpc/crypto}/aes_ctr.c | 0
+ .../crypto/vmx => arch/powerpc/crypto}/aes_xts.c | 0
+ .../crypto/vmx => arch/powerpc/crypto}/aesp8-ppc.h | 0
+ .../vmx => arch/powerpc/crypto}/aesp8-ppc.pl | 0
+ .../crypto/vmx => arch/powerpc/crypto}/ghash.c | 0
+ .../vmx => arch/powerpc/crypto}/ghashp8-ppc.pl | 0
+ {drivers/crypto/vmx => arch/powerpc/crypto}/vmx.c | 0
+ crypto/Kconfig | 5 +-
+ crypto/ahash.c | 21 +-
+ crypto/asymmetric_keys/verify_pefile.c | 4 +-
+ crypto/pcbc.c | 4 +-
+ crypto/rsa.c | 36 ++-
+ crypto/testmgr.c | 8 -
+ drivers/crypto/Kconfig | 14 +-
+ drivers/crypto/Makefile | 2 +-
+ drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c | 2 +-
+ drivers/crypto/ccp/platform-access.c | 11 +-
+ drivers/crypto/ccp/psp-dev.c | 11 +-
+ drivers/crypto/hisilicon/debugfs.c | 58 +++++
+ drivers/crypto/hisilicon/hpre/hpre_main.c | 2 +-
+ drivers/crypto/hisilicon/qm.c | 184 +++++++++-----
+ drivers/crypto/hisilicon/sec2/sec_crypto.c | 33 +--
+ drivers/crypto/hisilicon/sec2/sec_main.c | 7 +-
+ drivers/crypto/hisilicon/zip/zip_main.c | 2 +-
+ drivers/crypto/intel/iaa/iaa_crypto.h | 25 --
+ drivers/crypto/intel/iaa/iaa_crypto_comp_fixed.c | 1 -
+ drivers/crypto/intel/iaa/iaa_crypto_main.c | 108 +--------
+ drivers/crypto/intel/iaa/iaa_crypto_stats.c | 2 -
+ drivers/crypto/intel/qat/Kconfig | 14 ++
+ .../crypto/intel/qat/qat_420xx/adf_420xx_hw_data.c | 64 ++---
+ .../crypto/intel/qat/qat_4xxx/adf_4xxx_hw_data.c | 64 ++---
+ drivers/crypto/intel/qat/qat_common/Makefile | 2 +
+ .../intel/qat/qat_common/adf_accel_devices.h | 3 +
+ drivers/crypto/intel/qat/qat_common/adf_aer.c | 138 ++++++++++-
+ .../crypto/intel/qat/qat_common/adf_cfg_strings.h | 1 +
+ drivers/crypto/intel/qat/qat_common/adf_clock.c | 3 +
+ .../crypto/intel/qat/qat_common/adf_cnv_dbgfs.c | 1 -
+ .../crypto/intel/qat/qat_common/adf_common_drv.h | 10 +
+ drivers/crypto/intel/qat/qat_common/adf_dev_mgr.c | 4 +-
+ .../crypto/intel/qat/qat_common/adf_gen4_hw_data.c | 59 +++++
+ .../crypto/intel/qat/qat_common/adf_gen4_hw_data.h | 1 +
+ drivers/crypto/intel/qat/qat_common/adf_gen4_ras.c | 6 +-
+ .../crypto/intel/qat/qat_common/adf_heartbeat.c | 20 +-
+ .../crypto/intel/qat/qat_common/adf_heartbeat.h | 21 ++
+ .../intel/qat/qat_common/adf_heartbeat_dbgfs.c | 53 +++++
+ .../intel/qat/qat_common/adf_heartbeat_inject.c | 76 ++++++
+ .../crypto/intel/qat/qat_common/adf_hw_arbiter.c | 25 ++
+ drivers/crypto/intel/qat/qat_common/adf_init.c | 12 +
+ drivers/crypto/intel/qat/qat_common/adf_isr.c | 11 +-
+ drivers/crypto/intel/qat/qat_common/adf_pfvf_msg.h | 7 +-
+ .../crypto/intel/qat/qat_common/adf_pfvf_pf_msg.c | 64 ++++-
+ .../crypto/intel/qat/qat_common/adf_pfvf_pf_msg.h | 21 ++
+ .../intel/qat/qat_common/adf_pfvf_pf_proto.c | 8 +
+ .../intel/qat/qat_common/adf_pfvf_vf_proto.c | 6 +
+ drivers/crypto/intel/qat/qat_common/adf_rl.c | 20 +-
+ drivers/crypto/intel/qat/qat_common/adf_sriov.c | 38 ++-
+ drivers/crypto/intel/qat/qat_common/adf_sysfs.c | 37 +++
+ drivers/crypto/intel/qat/qat_common/adf_vf_isr.c | 2 -
+ .../crypto/intel/qat/qat_common/qat_comp_algs.c | 9 -
+ drivers/crypto/intel/qat/qat_common/qat_crypto.c | 4 +-
+ drivers/crypto/rockchip/rk3288_crypto.c | 5 +
+ .../crypto/virtio/virtio_crypto_akcipher_algs.c | 12 +-
+ drivers/crypto/virtio/virtio_crypto_core.c | 2 -
+ drivers/crypto/vmx/.gitignore | 3 -
+ drivers/crypto/vmx/Kconfig | 14 --
+ drivers/crypto/vmx/Makefile | 23 --
+ drivers/crypto/vmx/ppc-xlate.pl | 231 ------------------
+ drivers/crypto/xilinx/zynqmp-aes-gcm.c | 3 +
+ include/crypto/internal/hash.h | 2 -
+ include/crypto/public_key.h | 1 +
+ include/linux/hisi_acc_qm.h | 10 +-
+ tools/crypto/ccp/test_dbc.py | 8 +-
+ 90 files changed, 1345 insertions(+), 931 deletions(-)
+ rename {drivers/crypto/vmx => arch/powerpc/crypto}/aes.c (100%)
+ rename {drivers/crypto/vmx => arch/powerpc/crypto}/aes_cbc.c (100%)
+ rename {drivers/crypto/vmx => arch/powerpc/crypto}/aes_ctr.c (100%)
+ rename {drivers/crypto/vmx => arch/powerpc/crypto}/aes_xts.c (100%)
+ rename {drivers/crypto/vmx => arch/powerpc/crypto}/aesp8-ppc.h (100%)
+ rename {drivers/crypto/vmx => arch/powerpc/crypto}/aesp8-ppc.pl (100%)
+ rename {drivers/crypto/vmx => arch/powerpc/crypto}/ghash.c (100%)
+ rename {drivers/crypto/vmx => arch/powerpc/crypto}/ghashp8-ppc.pl (100%)
+ rename {drivers/crypto/vmx => arch/powerpc/crypto}/vmx.c (100%)
+ create mode 100644 drivers/crypto/intel/qat/qat_common/adf_heartbeat_inject.c
+ delete mode 100644 drivers/crypto/vmx/.gitignore
+ delete mode 100644 drivers/crypto/vmx/Kconfig
+ delete mode 100644 drivers/crypto/vmx/Makefile
+ delete mode 100644 drivers/crypto/vmx/ppc-xlate.pl
+Merging drm/drm-next (f112b68f273f Merge v6.8-rc6 into drm-next)
+$ git merge -m Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git drm/drm-next
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml
+Auto-merging MAINTAINERS
+Auto-merging drivers/accel/ivpu/ivpu_pm.c
+Auto-merging drivers/gpu/drm/Kconfig
+Auto-merging drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c
+Auto-merging drivers/gpu/drm/drm_gem_vram_helper.c
+Auto-merging drivers/gpu/drm/xe/xe_pm.c
+Merge made by the 'ort' strategy.
+ .../display/bridge/fsl,imx8mp-hdmi-tx.yaml | 102 +
+ .../bindings/display/bridge/ti,sn65dsi86.yaml | 2 +-
+ .../bindings/display/imx/fsl,imx8mp-hdmi-pvi.yaml | 84 +
+ .../display/panel/boe,th101mb31ig002-28a.yaml | 58 +
+ .../bindings/display/panel/himax,hx83112a.yaml | 74 +
+ .../display/panel/leadtek,ltk500hd1829.yaml | 4 +-
+ .../bindings/display/panel/novatek,nt35510.yaml | 4 +-
+ .../bindings/display/panel/novatek,nt36672e.yaml | 66 +
+ .../bindings/display/panel/panel-lvds.yaml | 4 +
+ .../bindings/display/panel/panel-simple.yaml | 4 +
+ .../display/panel/rocktech,jh057n00900.yaml | 3 +
+ .../bindings/display/panel/visionox,rm69299.yaml | 3 +-
+ .../bindings/display/renesas,rzg2l-du.yaml | 126 +
+ .../display/rockchip/rockchip,dw-hdmi.yaml | 33 +-
+ .../bindings/display/solomon,ssd1307fb.yaml | 20 +-
+ .../bindings/display/solomon,ssd132x.yaml | 12 +-
+ .../bindings/display/solomon,ssd133x.yaml | 45 +
+ .../bindings/display/ti/ti,am65x-dss.yaml | 7 +-
+ .../devicetree/bindings/vendor-prefixes.yaml | 2 +
+ Documentation/gpu/amdgpu/dgpu-asic-info-table.csv | 2 +
+ Documentation/gpu/amdgpu/display/dcn-blocks.rst | 78 +
+ .../gpu/amdgpu/display/display-contributing.rst | 168 +
+ .../gpu/amdgpu/display/display-manager.rst | 3 -
+ Documentation/gpu/amdgpu/display/index.rst | 78 +-
+ Documentation/gpu/drm-internals.rst | 12 -
+ Documentation/gpu/drm-usage-stats.rst | 2 +-
+ Documentation/gpu/introduction.rst | 2 +
+ Documentation/gpu/rfc/index.rst | 4 -
+ Documentation/gpu/rfc/xe.rst | 234 -
+ Documentation/gpu/todo.rst | 23 +
+ MAINTAINERS | 14 +-
+ arch/powerpc/platforms/ps3/Kconfig | 1 +
+ drivers/accel/drm_accel.c | 2 +-
+ .../accel/habanalabs/common/command_submission.c | 3 +-
+ drivers/accel/habanalabs/common/debugfs.c | 18 +-
+ drivers/accel/habanalabs/common/device.c | 55 +-
+ drivers/accel/habanalabs/common/firmware_if.c | 25 +-
+ drivers/accel/habanalabs/common/habanalabs.h | 43 +-
+ drivers/accel/habanalabs/common/hw_queue.c | 17 +
+ drivers/accel/habanalabs/common/hwmon.c | 29 +-
+ drivers/accel/habanalabs/common/mmu/Makefile | 2 +-
+ drivers/accel/habanalabs/common/mmu/mmu.c | 223 +-
+ drivers/accel/habanalabs/common/mmu/mmu_v1.c | 354 +-
+ drivers/accel/habanalabs/common/mmu/mmu_v2.c | 338 +
+ drivers/accel/habanalabs/common/mmu/mmu_v2_hr.c | 24 +-
+ drivers/accel/habanalabs/common/security.c | 33 +-
+ drivers/accel/habanalabs/common/security.h | 3 +-
+ drivers/accel/habanalabs/gaudi/gaudi.c | 9 +-
+ drivers/accel/habanalabs/gaudi2/gaudi2.c | 308 +-
+ drivers/accel/habanalabs/gaudi2/gaudi2P.h | 15 +-
+ drivers/accel/habanalabs/goya/goya.c | 12 +-
+ drivers/accel/habanalabs/goya/goya_coresight.c | 3 +-
+ .../habanalabs/include/hw_ip/mmu/mmu_general.h | 2 +
+ drivers/accel/ivpu/ivpu_debugfs.c | 32 +-
+ drivers/accel/ivpu/ivpu_drv.c | 12 +-
+ drivers/accel/ivpu/ivpu_drv.h | 7 +-
+ drivers/accel/ivpu/ivpu_fw.c | 49 +-
+ drivers/accel/ivpu/ivpu_fw_log.c | 6 +-
+ drivers/accel/ivpu/ivpu_gem.c | 70 +-
+ drivers/accel/ivpu/ivpu_gem.h | 6 +-
+ drivers/accel/ivpu/ivpu_hw_37xx.c | 10 +-
+ drivers/accel/ivpu/ivpu_hw_40xx.c | 10 +-
+ drivers/accel/ivpu/ivpu_ipc.c | 12 +-
+ drivers/accel/ivpu/ivpu_job.c | 22 +-
+ drivers/accel/ivpu/ivpu_pm.c | 10 +-
+ drivers/accel/ivpu/vpu_boot_api.h | 46 +-
+ drivers/accel/ivpu/vpu_jsm_api.h | 32 +-
+ drivers/accel/qaic/mhi_controller.c | 4 +-
+ drivers/accel/qaic/qaic.h | 3 +-
+ drivers/accel/qaic/qaic_data.c | 59 +-
+ drivers/accel/qaic/qaic_drv.c | 144 +-
+ drivers/char/agp/agp.h | 1 -
+ drivers/dma-buf/dma-fence.c | 8 +-
+ drivers/dma-buf/dma-resv.c | 4 +-
+ drivers/firmware/Kconfig | 1 +
+ drivers/firmware/sysfb.c | 51 +-
+ drivers/firmware/sysfb_simplefb.c | 5 +-
+ drivers/gpu/drm/Kconfig | 19 +-
+ drivers/gpu/drm/amd/amdgpu/Makefile | 17 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu.h | 17 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_aca.c | 879 +++
+ drivers/gpu/drm/amd/amdgpu/amdgpu_aca.h | 202 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 5 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 12 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 39 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 24 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 44 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 39 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 4 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 17 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c | 4 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 35 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 7 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 55 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 4 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 7 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c | 46 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h | 36 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 17 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mca.c | 33 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mca.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 8 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 17 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 6 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 251 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 14 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 689 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 60 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 3 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_seq64.c | 66 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_seq64.h | 9 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 11 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 7 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 155 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 10 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_umr.h | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_umsch_mm.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 42 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 83 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 7 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 69 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 29 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 81 +-
+ drivers/gpu/drm/amd/amdgpu/athub_v4_1_0.c | 122 +
+ drivers/gpu/drm/amd/amdgpu/athub_v4_1_0.h | 30 +
+ drivers/gpu/drm/amd/amdgpu/atom.c | 41 +-
+ drivers/gpu/drm/amd/amdgpu/atom.h | 2 +-
+ drivers/gpu/drm/amd/amdgpu/atombios_crtc.c | 28 +-
+ drivers/gpu/drm/amd/amdgpu/atombios_dp.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/atombios_encoders.c | 16 +-
+ drivers/gpu/drm/amd/amdgpu/atombios_i2c.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/clearstate_gfx9.h | 27 +-
+ drivers/gpu/drm/amd/amdgpu/clearstate_si.h | 24 +-
+ drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 2 +
+ drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 2 +
+ drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 22 +-
+ drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 22 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 16 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v11_0_3.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v9_4.c | 5 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 92 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 9 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 10 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 5 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 5 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 5 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 12 +-
+ drivers/gpu/drm/amd/amdgpu/hdp_v7_0.c | 142 +
+ drivers/gpu/drm/amd/amdgpu/hdp_v7_0.h | 31 +
+ drivers/gpu/drm/amd/amdgpu/ih_v7_0.c | 767 ++
+ drivers/gpu/drm/amd/amdgpu/ih_v7_0.h | 28 +
+ drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 10 +-
+ drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c | 16 +-
+ drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.h | 15 +
+ drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_5.c | 302 +-
+ drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c | 570 ++
+ drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.h | 29 +
+ drivers/gpu/drm/amd/amdgpu/lsdma_v7_0.c | 121 +
+ drivers/gpu/drm/amd/amdgpu/lsdma_v7_0.h | 31 +
+ drivers/gpu/drm/amd/amdgpu/mmhub_v1_8.c | 87 +
+ drivers/gpu/drm/amd/amdgpu/mmhub_v3_3.c | 1 +
+ drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c | 29 +-
+ drivers/gpu/drm/amd/amdgpu/mxgpu_nv.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/nbio_v7_11.c | 9 +-
+ drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 104 +-
+ drivers/gpu/drm/amd/amdgpu/psp_v14_0.c | 672 ++
+ drivers/gpu/drm/amd/amdgpu/psp_v14_0.h | 32 +
+ drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 15 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c | 72 +
+ drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 1 +
+ drivers/gpu/drm/amd/amdgpu/soc21.c | 2 +
+ drivers/gpu/drm/amd/amdgpu/ta_ras_if.h | 36 +
+ drivers/gpu/drm/amd/amdgpu/umc_v12_0.c | 252 +-
+ drivers/gpu/drm/amd/amdgpu/umc_v12_0.h | 3 +
+ drivers/gpu/drm/amd/amdgpu/umc_v6_0.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c | 1339 ++++
+ drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.h | 37 +
+ drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h | 2 +-
+ .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx10.asm | 17 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 93 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_crat.h | 1 +
+ drivers/gpu/drm/amd/amdkfd/kfd_debug.c | 4 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_events.c | 6 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 29 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_int_process_v10.c | 7 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c | 7 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 7 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.h | 25 +
+ drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 10 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 3 +
+ drivers/gpu/drm/amd/display/TODO | 110 -
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 170 +-
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 1 +
+ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 72 +-
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 55 +-
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_replay.c | 119 +-
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_replay.h | 4 +-
+ drivers/gpu/drm/amd/display/dc/basics/conversion.c | 34 +
+ drivers/gpu/drm/amd/display/dc/basics/conversion.h | 4 +
+ .../gpu/drm/amd/display/dc/bios/command_table.c | 2 +-
+ .../gpu/drm/amd/display/dc/bios/command_table2.c | 2 +-
+ drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 1 -
+ .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 2 -
+ .../dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.c | 4 -
+ .../drm/amd/display/dc/clk_mgr/dcn301/dcn301_smu.c | 4 -
+ .../drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.c | 4 -
+ .../drm/amd/display/dc/clk_mgr/dcn314/dcn314_smu.c | 6 -
+ .../drm/amd/display/dc/clk_mgr/dcn315/dcn315_smu.c | 4 -
+ .../drm/amd/display/dc/clk_mgr/dcn316/dcn316_smu.c | 4 -
+ .../amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c | 42 +-
+ .../dc/clk_mgr/dcn32/dcn32_clk_mgr_smu_msg.h | 3 +-
+ .../amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c | 39 +-
+ .../drm/amd/display/dc/clk_mgr/dcn35/dcn35_smu.c | 27 +-
+ drivers/gpu/drm/amd/display/dc/core/dc.c | 71 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 17 -
+ drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 18 +
+ drivers/gpu/drm/amd/display/dc/core/dc_surface.c | 2 +
+ drivers/gpu/drm/amd/display/dc/dc.h | 23 +-
+ drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 114 +-
+ drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 3 +-
+ drivers/gpu/drm/amd/display/dc/dce/dce_audio.c | 299 +-
+ drivers/gpu/drm/amd/display/dc/dce/dce_audio.h | 3 +-
+ .../gpu/drm/amd/display/dc/dce/dmub_hw_lock_mgr.c | 4 +
+ drivers/gpu/drm/amd/display/dc/dce/dmub_replay.c | 4 +-
+ .../gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.c | 20 +
+ .../gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.h | 4 +-
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c | 3 +-
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.h | 3 +
+ .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_cm.c | 70 +-
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_opp.c | 7 +
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dpp.c | 31 +-
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dpp.h | 3 +
+ .../gpu/drm/amd/display/dc/dcn20/dcn20_dpp_cm.c | 55 +
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_mpc.c | 24 +-
+ drivers/gpu/drm/amd/display/dc/dcn201/dcn201_dpp.c | 1 +
+ drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.c | 38 +-
+ drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.h | 2 +
+ .../gpu/drm/amd/display/dc/dcn30/dcn30_dpp_cm.c | 54 +
+ drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.c | 106 +-
+ drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.h | 4 +
+ drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dpp.c | 1 +
+ drivers/gpu/drm/amd/display/dc/dm_cp_psp.h | 3 +
+ .../amd/display/dc/dml/dcn30/display_mode_vba_30.c | 16 +-
+ .../gpu/drm/amd/display/dc/dml/dcn303/dcn303_fpu.c | 11 +
+ .../gpu/drm/amd/display/dc/dml/dcn35/dcn35_fpu.c | 12 +-
+ .../amd/display/dc/dml2/dml2_dc_resource_mgmt.c | 41 +-
+ drivers/gpu/drm/amd/display/dc/dml2/dml2_utils.c | 2 +-
+ drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 5 +
+ .../drm/amd/display/dc/hwss/dce110/dce110_hwseq.c | 56 +-
+ .../drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c | 97 +-
+ .../drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c | 109 +-
+ .../drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.h | 2 +
+ .../drm/amd/display/dc/hwss/dcn30/dcn30_hwseq.c | 167 +-
+ .../drm/amd/display/dc/hwss/dcn30/dcn30_hwseq.h | 6 +-
+ .../gpu/drm/amd/display/dc/hwss/dcn30/dcn30_init.c | 2 +-
+ .../drm/amd/display/dc/hwss/dcn31/dcn31_hwseq.c | 20 +-
+ .../drm/amd/display/dc/hwss/dcn31/dcn31_hwseq.h | 4 +
+ .../gpu/drm/amd/display/dc/hwss/dcn31/dcn31_init.c | 2 +-
+ .../drm/amd/display/dc/hwss/dcn314/dcn314_init.c | 2 +-
+ .../gpu/drm/amd/display/dc/hwss/dcn32/dcn32_init.c | 2 +-
+ .../drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c | 21 +-
+ .../drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.h | 3 +
+ .../gpu/drm/amd/display/dc/hwss/dcn35/dcn35_init.c | 2 +-
+ .../drm/amd/display/dc/hwss/dcn351/dcn351_init.c | 2 +-
+ drivers/gpu/drm/amd/display/dc/hwss/hw_sequencer.h | 2 +
+ .../drm/amd/display/dc/hwss/hw_sequencer_private.h | 2 -
+ drivers/gpu/drm/amd/display/dc/inc/hw/audio.h | 3 +-
+ .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 6 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 6 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h | 39 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 15 +-
+ drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 253 +-
+ drivers/gpu/drm/amd/display/dc/inc/hw/opp.h | 16 +
+ .../drm/amd/display/dc/inc/hw/timing_generator.h | 2 -
+ .../amd/display/dc/link/accessories/link_dp_cts.c | 27 +-
+ .../drm/amd/display/dc/link/hwss/link_hwss_dio.h | 10 +
+ .../link/hwss/link_hwss_dio_fixed_vs_pe_retimer.c | 16 +-
+ .../hwss/link_hwss_hpo_fixed_vs_pe_retimer_dp.c | 51 +-
+ .../gpu/drm/amd/display/dc/link/link_detection.c | 18 +
+ drivers/gpu/drm/amd/display/dc/link/link_dpms.c | 58 +
+ .../gpu/drm/amd/display/dc/link/link_validation.c | 2 -
+ .../amd/display/dc/link/protocols/link_dp_phy.c | 6 +-
+ .../display/dc/link/protocols/link_dp_training.c | 5 +-
+ .../link_dp_training_fixed_vs_pe_retimer.c | 372 +-
+ .../link_dp_training_fixed_vs_pe_retimer.h | 5 -
+ .../dc/link/protocols/link_edp_panel_control.c | 5 +-
+ .../amd/display/dc/resource/dcn30/dcn30_resource.c | 11 +
+ .../amd/display/dc/resource/dcn31/dcn31_resource.c | 2 -
+ .../display/dc/resource/dcn321/dcn321_resource.c | 1 +
+ .../amd/display/dc/resource/dcn35/dcn35_resource.c | 7 +-
+ drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 22 +-
+ drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 145 +-
+ drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.c | 3 +-
+ drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.h | 3 +-
+ drivers/gpu/drm/amd/display/dmub/src/dmub_dcn30.c | 3 +-
+ drivers/gpu/drm/amd/display/dmub/src/dmub_dcn30.h | 3 +-
+ drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c | 3 +-
+ drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.h | 3 +-
+ drivers/gpu/drm/amd/display/dmub/src/dmub_dcn32.c | 5 +-
+ drivers/gpu/drm/amd/display/dmub/src/dmub_dcn32.h | 3 +-
+ drivers/gpu/drm/amd/display/dmub/src/dmub_dcn35.c | 12 +-
+ drivers/gpu/drm/amd/display/dmub/src/dmub_dcn35.h | 8 +-
+ drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 134 +-
+ drivers/gpu/drm/amd/display/include/audio_types.h | 15 +
+ .../drm/amd/display/include/link_service_types.h | 9 +
+ drivers/gpu/drm/amd/include/amd_shared.h | 2 +
+ drivers/gpu/drm/amd/include/arct_ip_offset.h | 6 +-
+ .../include/asic_reg/athub/athub_4_1_0_offset.h | 287 +
+ .../include/asic_reg/athub/athub_4_1_0_sh_mask.h | 1348 ++++
+ .../amd/include/asic_reg/dcn/dcn_3_1_6_offset.h | 4 +
+ .../amd/include/asic_reg/dcn/dcn_3_1_6_sh_mask.h | 10 +
+ .../amd/include/asic_reg/dcn/dcn_3_5_0_offset.h | 24 +
+ .../amd/include/asic_reg/dcn/dcn_3_5_0_sh_mask.h | 65 +
+ .../amd/include/asic_reg/hdp/hdp_7_0_0_offset.h | 219 +
+ .../amd/include/asic_reg/hdp/hdp_7_0_0_sh_mask.h | 735 ++
+ .../include/asic_reg/lsdma/lsdma_7_0_0_offset.h | 388 +
+ .../include/asic_reg/lsdma/lsdma_7_0_0_sh_mask.h | 1411 ++++
+ .../drm/amd/include/asic_reg/mp/mp_14_0_2_offset.h | 468 ++
+ .../amd/include/asic_reg/mp/mp_14_0_2_sh_mask.h | 692 ++
+ .../amd/include/asic_reg/nbio/nbio_7_11_0_offset.h | 2 +
+ .../amd/include/asic_reg/oss/osssys_7_0_0_offset.h | 279 +
+ .../include/asic_reg/oss/osssys_7_0_0_sh_mask.h | 1029 +++
+ .../amd/include/asic_reg/vcn/vcn_5_0_0_offset.h | 1672 +++++
+ .../amd/include/asic_reg/vcn/vcn_5_0_0_sh_mask.h | 7627 ++++++++++++++++++++
+ drivers/gpu/drm/amd/include/atom-bits.h | 2 +-
+ drivers/gpu/drm/amd/include/beige_goby_ip_offset.h | 6 +-
+ drivers/gpu/drm/amd/include/cgs_common.h | 23 +-
+ .../gpu/drm/amd/include/cyan_skillfish_ip_offset.h | 6 +-
+ .../drm/amd/include/dimgrey_cavefish_ip_offset.h | 6 +-
+ drivers/gpu/drm/amd/include/dm_pp_interface.h | 9 +-
+ drivers/gpu/drm/amd/include/kgd_pp_interface.h | 6 +-
+ drivers/gpu/drm/amd/include/navi12_ip_offset.h | 6 +-
+ drivers/gpu/drm/amd/include/navi14_ip_offset.h | 6 +-
+ drivers/gpu/drm/amd/include/pptable.h | 6 +-
+ drivers/gpu/drm/amd/include/renoir_ip_offset.h | 6 +-
+ .../gpu/drm/amd/include/sienna_cichlid_ip_offset.h | 6 +-
+ drivers/gpu/drm/amd/include/v10_structs.h | 3 +-
+ drivers/gpu/drm/amd/include/vangogh_ip_offset.h | 6 +-
+ drivers/gpu/drm/amd/include/vega10_ip_offset.h | 6 +-
+ drivers/gpu/drm/amd/include/vega20_ip_offset.h | 78 +-
+ drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 15 +
+ drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 1 +
+ .../gpu/drm/amd/pm/powerplay/hwmgr/ppatomctrl.c | 42 +-
+ .../gpu/drm/amd/pm/powerplay/hwmgr/ppatomfwctrl.c | 4 +-
+ drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 40 +-
+ drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 6 +
+ .../amd/pm/swsmu/inc/pmfw_if/smu_v13_0_6_ppsmc.h | 3 +-
+ drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h | 3 +-
+ drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 16 +-
+ drivers/gpu/drm/amd/pm/swsmu/smu12/smu_v12_0.c | 2 +-
+ drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 18 +-
+ .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 306 +-
+ drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c | 2 +-
+ drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 9 +-
+ drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 10 +
+ drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 69 +-
+ drivers/gpu/drm/bridge/analogix/anx7625.c | 30 +-
+ .../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 28 +-
+ drivers/gpu/drm/bridge/chrontel-ch7033.c | 12 +-
+ drivers/gpu/drm/bridge/display-connector.c | 8 +-
+ drivers/gpu/drm/bridge/imx/Kconfig | 18 +
+ drivers/gpu/drm/bridge/imx/Makefile | 2 +
+ drivers/gpu/drm/bridge/imx/imx8mp-hdmi-pvi.c | 207 +
+ drivers/gpu/drm/bridge/imx/imx8mp-hdmi-tx.c | 154 +
+ drivers/gpu/drm/bridge/ite-it6505.c | 21 +-
+ drivers/gpu/drm/bridge/ite-it66121.c | 16 +-
+ drivers/gpu/drm/bridge/lontium-lt8912b.c | 20 +-
+ drivers/gpu/drm/bridge/lontium-lt9611.c | 9 +-
+ drivers/gpu/drm/bridge/lontium-lt9611uxc.c | 19 +-
+ .../drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 18 +-
+ drivers/gpu/drm/bridge/nxp-ptn3460.c | 22 +-
+ drivers/gpu/drm/bridge/samsung-dsim.c | 18 +-
+ drivers/gpu/drm/bridge/sii902x.c | 38 +-
+ drivers/gpu/drm/bridge/simple-bridge.c | 17 +-
+ drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 45 +-
+ drivers/gpu/drm/bridge/tc358767.c | 193 +-
+ drivers/gpu/drm/bridge/ti-sn65dsi86.c | 8 +-
+ drivers/gpu/drm/bridge/ti-tfp410.c | 18 +-
+ drivers/gpu/drm/ci/build.sh | 1 +
+ drivers/gpu/drm/ci/gitlab-ci.yml | 14 +-
+ drivers/gpu/drm/ci/test.yml | 31 +-
+ drivers/gpu/drm/ci/testlist.txt | 1937 +++--
+ drivers/gpu/drm/ci/xfails/msm-apq8016-fails.txt | 3 +-
+ drivers/gpu/drm/ci/xfails/msm-apq8096-fails.txt | 2 -
+ drivers/gpu/drm/ci/xfails/msm-sc7180-fails.txt | 30 -
+ drivers/gpu/drm/ci/xfails/msm-sc7180-flakes.txt | 17 -
+ drivers/gpu/drm/ci/xfails/msm-sc7180-skips.txt | 7 -
+ .../xfails/msm-sc7180-trogdor-kingoftown-fails.txt | 18 +
+ .../xfails/msm-sc7180-trogdor-kingoftown-skips.txt | 2 +
+ .../msm-sc7180-trogdor-lazor-limozeen-fails.txt | 18 +
+ .../msm-sc7180-trogdor-lazor-limozeen-skips.txt | 2 +
+ drivers/gpu/drm/ci/xfails/msm-sdm845-fails.txt | 5 +-
+ drivers/gpu/drm/ci/xfails/msm-sdm845-flakes.txt | 28 +-
+ drivers/gpu/drm/ci/xfails/msm-sdm845-skips.txt | 7 +-
+ drivers/gpu/drm/display/drm_dp_aux_bus.c | 2 +-
+ drivers/gpu/drm/display/drm_dp_helper.c | 17 +-
+ drivers/gpu/drm/display/drm_dp_mst_topology.c | 23 +-
+ drivers/gpu/drm/drm_bridge.c | 17 +-
+ drivers/gpu/drm/drm_bridge_connector.c | 16 +-
+ drivers/gpu/drm/drm_crtc.c | 8 +-
+ drivers/gpu/drm/drm_debugfs.c | 4 -
+ drivers/gpu/drm/drm_edid.c | 25 +-
+ drivers/gpu/drm/drm_exec.c | 2 +-
+ drivers/gpu/drm/drm_file.c | 2 +-
+ drivers/gpu/drm/drm_gem_vram_helper.c | 2 -
+ drivers/gpu/drm/drm_ioc32.c | 4 +-
+ drivers/gpu/drm/drm_managed.c | 39 +
+ drivers/gpu/drm/drm_mipi_dsi.c | 2 +-
+ drivers/gpu/drm/drm_mode_config.c | 2 +-
+ drivers/gpu/drm/drm_modes.c | 22 +
+ drivers/gpu/drm/drm_modeset_lock.c | 2 +-
+ drivers/gpu/drm/drm_panel_orientation_quirks.c | 12 +
+ drivers/gpu/drm/drm_print.c | 29 +-
+ drivers/gpu/drm/drm_probe_helper.c | 36 -
+ drivers/gpu/drm/drm_syncobj.c | 7 +-
+ drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 1 -
+ drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c | 1 +
+ drivers/gpu/drm/i915/display/i9xx_plane.c | 30 +
+ drivers/gpu/drm/i915/display/i9xx_plane.h | 7 +
+ drivers/gpu/drm/i915/display/intel_atomic_plane.c | 6 +-
+ drivers/gpu/drm/i915/display/intel_backlight.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_bios.c | 36 +-
+ drivers/gpu/drm/i915/display/intel_bios.h | 5 +-
+ drivers/gpu/drm/i915/display/intel_cdclk.c | 361 +-
+ drivers/gpu/drm/i915/display/intel_crt.c | 5 +
+ drivers/gpu/drm/i915/display/intel_crtc.c | 128 +-
+ .../gpu/drm/i915/display/intel_crtc_state_dump.c | 5 +-
+ drivers/gpu/drm/i915/display/intel_cursor.c | 63 +-
+ drivers/gpu/drm/i915/display/intel_cx0_phy.c | 231 +-
+ drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h | 63 +-
+ drivers/gpu/drm/i915/display/intel_ddi.c | 67 +-
+ drivers/gpu/drm/i915/display/intel_display.c | 105 +-
+ drivers/gpu/drm/i915/display/intel_display_core.h | 18 +-
+ .../gpu/drm/i915/display/intel_display_debugfs.c | 26 +-
+ .../i915/display/intel_display_debugfs_params.c | 1 +
+ .../gpu/drm/i915/display/intel_display_device.c | 2 +-
+ .../gpu/drm/i915/display/intel_display_driver.c | 168 +-
+ .../gpu/drm/i915/display/intel_display_driver.h | 6 +
+ drivers/gpu/drm/i915/display/intel_display_irq.c | 10 +-
+ drivers/gpu/drm/i915/display/intel_display_types.h | 38 +-
+ drivers/gpu/drm/i915/display/intel_dmc.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_dp.c | 192 +-
+ drivers/gpu/drm/i915/display/intel_dp.h | 10 +-
+ drivers/gpu/drm/i915/display/intel_dp_aux.c | 29 +-
+ drivers/gpu/drm/i915/display/intel_dp_mst.c | 4 +
+ drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 83 +-
+ drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 18 +-
+ drivers/gpu/drm/i915/display/intel_dsb.c | 4 +
+ drivers/gpu/drm/i915/display/intel_dvo.c | 5 +
+ drivers/gpu/drm/i915/display/intel_fbc.c | 13 +-
+ drivers/gpu/drm/i915/display/intel_fbdev_fb.c | 5 +-
+ drivers/gpu/drm/i915/display/intel_global_state.c | 137 +-
+ drivers/gpu/drm/i915/display/intel_global_state.h | 9 +-
+ drivers/gpu/drm/i915/display/intel_gmbus.c | 5 +-
+ drivers/gpu/drm/i915/display/intel_hdcp.c | 78 +-
+ drivers/gpu/drm/i915/display/intel_hdcp_gsc.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_hdcp_regs.h | 28 +-
+ drivers/gpu/drm/i915/display/intel_hdmi.c | 16 +-
+ drivers/gpu/drm/i915/display/intel_hotplug.c | 165 +-
+ drivers/gpu/drm/i915/display/intel_hotplug.h | 4 +
+ drivers/gpu/drm/i915/display/intel_hotplug_irq.c | 6 +-
+ drivers/gpu/drm/i915/display/intel_opregion.c | 176 +-
+ drivers/gpu/drm/i915/display/intel_opregion.h | 47 +-
+ drivers/gpu/drm/i915/display/intel_panel.c | 4 +
+ drivers/gpu/drm/i915/display/intel_plane_initial.c | 255 +-
+ drivers/gpu/drm/i915/display/intel_plane_initial.h | 4 +-
+ drivers/gpu/drm/i915/display/intel_pps.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_psr.c | 202 +-
+ drivers/gpu/drm/i915/display/intel_psr.h | 6 -
+ drivers/gpu/drm/i915/display/intel_psr_regs.h | 63 +
+ drivers/gpu/drm/i915/display/intel_sdvo.c | 6 +
+ drivers/gpu/drm/i915/display/intel_tc.c | 40 +-
+ drivers/gpu/drm/i915/display/intel_tc.h | 2 +-
+ drivers/gpu/drm/i915/display/intel_tv.c | 7 +-
+ drivers/gpu/drm/i915/display/intel_vblank.c | 130 +
+ drivers/gpu/drm/i915/display/intel_vblank.h | 12 +
+ drivers/gpu/drm/i915/display/skl_universal_plane.c | 28 +
+ drivers/gpu/drm/i915/display/skl_universal_plane.h | 2 +
+ drivers/gpu/drm/i915/display/skl_watermark.c | 54 +-
+ drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 8 -
+ drivers/gpu/drm/i915/gem/i915_gem_pm.c | 10 +
+ drivers/gpu/drm/i915/gem/i915_gem_region.c | 2 +-
+ drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 25 +-
+ drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 50 +-
+ drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 42 -
+ drivers/gpu/drm/i915/gem/i915_gem_userptr.h | 14 -
+ drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 18 +-
+ drivers/gpu/drm/i915/gt/gen8_engine_cs.c | 4 +-
+ drivers/gpu/drm/i915/gt/intel_engine_cs.c | 3 +-
+ drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c | 6 +-
+ drivers/gpu/drm/i915/gt/intel_ggtt.c | 10 +-
+ drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c | 18 +-
+ drivers/gpu/drm/i915/gt/intel_gtt.c | 3 +-
+ drivers/gpu/drm/i915/gt/intel_mocs.c | 2 +-
+ drivers/gpu/drm/i915/gt/intel_rc6.c | 2 +-
+ drivers/gpu/drm/i915/gt/intel_region_lmem.c | 14 +-
+ drivers/gpu/drm/i915/gt/intel_reset.c | 3 +-
+ drivers/gpu/drm/i915/gt/intel_workarounds.c | 30 +-
+ drivers/gpu/drm/i915/gt/selftest_context.c | 3 +-
+ .../gpu/drm/i915/gt/selftest_engine_heartbeat.c | 10 +-
+ drivers/gpu/drm/i915/gt/selftest_rc6.c | 4 +-
+ drivers/gpu/drm/i915/gt/selftest_tlb.c | 4 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 21 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c | 10 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 126 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc_submission.h | 2 +
+ drivers/gpu/drm/i915/gt/uc/intel_huc.c | 64 +-
+ drivers/gpu/drm/i915/gt/uc/intel_uc.c | 4 +-
+ drivers/gpu/drm/i915/gvt/kvmgt.c | 2 +-
+ drivers/gpu/drm/i915/i915_debugfs.c | 2 +-
+ drivers/gpu/drm/i915/i915_driver.c | 28 +-
+ drivers/gpu/drm/i915/i915_drm_client.c | 2 +-
+ drivers/gpu/drm/i915/i915_drv.h | 8 -
+ drivers/gpu/drm/i915/i915_gem.c | 5 -
+ drivers/gpu/drm/i915/i915_gpu_error.c | 2 +-
+ drivers/gpu/drm/i915/i915_perf.c | 2 +-
+ drivers/gpu/drm/i915/i915_query.c | 35 +-
+ drivers/gpu/drm/i915/i915_reg.h | 18 +-
+ drivers/gpu/drm/i915/i915_syncmap.c | 19 +-
+ drivers/gpu/drm/i915/i915_utils.c | 17 +
+ drivers/gpu/drm/i915/i915_utils.h | 2 +
+ drivers/gpu/drm/i915/intel_memory_region.c | 33 +-
+ drivers/gpu/drm/i915/intel_memory_region.h | 3 +-
+ drivers/gpu/drm/i915/intel_region_ttm.c | 8 +-
+ drivers/gpu/drm/i915/intel_uncore.c | 5 +-
+ drivers/gpu/drm/i915/selftests/i915_active.c | 8 +-
+ .../gpu/drm/i915/selftests/intel_memory_region.c | 4 +-
+ drivers/gpu/drm/i915/soc/intel_pch.c | 16 +-
+ drivers/gpu/drm/i915/soc/intel_pch.h | 6 +-
+ drivers/gpu/drm/imx/dcss/dcss-blkctl.c | 13 +-
+ drivers/gpu/drm/imx/dcss/dcss-ctxld.c | 14 +-
+ drivers/gpu/drm/imx/dcss/dcss-dev.c | 19 +-
+ drivers/gpu/drm/imx/dcss/dcss-dev.h | 1 -
+ drivers/gpu/drm/imx/dcss/dcss-dpr.c | 21 +-
+ drivers/gpu/drm/imx/dcss/dcss-drv.c | 12 +-
+ drivers/gpu/drm/imx/dcss/dcss-dtg.c | 26 +-
+ drivers/gpu/drm/imx/dcss/dcss-scaler.c | 21 +-
+ drivers/gpu/drm/imx/dcss/dcss-ss.c | 12 +-
+ drivers/gpu/drm/imx/ipuv3/imx-ldb.c | 2 +-
+ drivers/gpu/drm/ingenic/Kconfig | 1 -
+ drivers/gpu/drm/lima/lima_ctx.c | 2 +-
+ drivers/gpu/drm/lima/lima_ctx.h | 1 -
+ drivers/gpu/drm/lima/lima_gem.c | 23 +-
+ drivers/gpu/drm/lima/lima_gp.c | 39 +-
+ drivers/gpu/drm/lima/lima_l2_cache.c | 6 +-
+ drivers/gpu/drm/lima/lima_mmu.c | 18 +-
+ drivers/gpu/drm/lima/lima_pmu.c | 3 +-
+ drivers/gpu/drm/lima/lima_pp.c | 37 +-
+ drivers/gpu/drm/lima/lima_sched.c | 38 +-
+ drivers/gpu/drm/lima/lima_sched.h | 3 +-
+ drivers/gpu/drm/loongson/lsdc_drv.c | 2 +-
+ drivers/gpu/drm/loongson/lsdc_ttm.c | 2 -
+ drivers/gpu/drm/mcde/Kconfig | 1 -
+ drivers/gpu/drm/mediatek/mtk_dp.c | 31 +-
+ drivers/gpu/drm/mediatek/mtk_hdmi.c | 26 +-
+ drivers/gpu/drm/meson/meson_drv.c | 6 +-
+ drivers/gpu/drm/meson/meson_encoder_cvbs.c | 24 +-
+ drivers/gpu/drm/meson/meson_encoder_cvbs.h | 2 +-
+ drivers/gpu/drm/meson/meson_encoder_dsi.c | 23 +-
+ drivers/gpu/drm/meson/meson_encoder_dsi.h | 2 +-
+ drivers/gpu/drm/meson/meson_encoder_hdmi.c | 35 +-
+ drivers/gpu/drm/meson/meson_encoder_hdmi.h | 2 +-
+ drivers/gpu/drm/mgag200/mgag200_drv.c | 9 +-
+ drivers/gpu/drm/mgag200/mgag200_mode.c | 14 +-
+ drivers/gpu/drm/msm/dp/dp_display.c | 1 +
+ drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 33 +-
+ drivers/gpu/drm/nouveau/dispnv04/crtc.c | 4 +-
+ drivers/gpu/drm/nouveau/dispnv50/head.c | 1 +
+ drivers/gpu/drm/nouveau/nouveau_bo.c | 59 +-
+ drivers/gpu/drm/nouveau/nouveau_bo.h | 1 -
+ drivers/gpu/drm/nouveau/nouveau_connector.h | 2 +-
+ drivers/gpu/drm/nouveau/nouveau_ioc32.c | 4 +-
+ drivers/gpu/drm/nouveau/nouveau_svm.c | 10 +-
+ drivers/gpu/drm/nouveau/nvif/outp.c | 3 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c | 2 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/acr/lsfw.c | 3 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c | 136 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/volt/gk20a.c | 4 +-
+ drivers/gpu/drm/omapdrm/dss/hdmi4.c | 22 +-
+ drivers/gpu/drm/omapdrm/dss/hdmi5.c | 12 +-
+ drivers/gpu/drm/panel/Kconfig | 233 +-
+ drivers/gpu/drm/panel/Makefile | 3 +
+ drivers/gpu/drm/panel/panel-boe-himax8279d.c | 18 +-
+ .../gpu/drm/panel/panel-boe-th101mb31ig002-28a.c | 322 +
+ drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c | 2 +
+ drivers/gpu/drm/panel/panel-edp.c | 116 +-
+ drivers/gpu/drm/panel/panel-himax-hx83112a.c | 372 +
+ drivers/gpu/drm/panel/panel-leadtek-ltk050h3146w.c | 23 +-
+ drivers/gpu/drm/panel/panel-leadtek-ltk500hd1829.c | 265 +-
+ drivers/gpu/drm/panel/panel-novatek-nt35510.c | 424 +-
+ drivers/gpu/drm/panel/panel-novatek-nt36523.c | 8 +-
+ drivers/gpu/drm/panel/panel-novatek-nt36672e.c | 643 ++
+ drivers/gpu/drm/panel/panel-simple.c | 81 +-
+ drivers/gpu/drm/panel/panel-sitronix-st7703.c | 104 +
+ drivers/gpu/drm/panel/panel-visionox-r66451.c | 1 +
+ drivers/gpu/drm/panel/panel-visionox-vtdr6130.c | 1 +
+ drivers/gpu/drm/pl111/Kconfig | 1 -
+ drivers/gpu/drm/qxl/qxl_object.c | 2 -
+ drivers/gpu/drm/qxl/qxl_ttm.c | 2 -
+ drivers/gpu/drm/radeon/atom-bits.h | 2 +-
+ drivers/gpu/drm/radeon/atom.c | 47 +-
+ drivers/gpu/drm/radeon/atom.h | 4 +-
+ drivers/gpu/drm/radeon/atombios_crtc.c | 28 +-
+ drivers/gpu/drm/radeon/atombios_dp.c | 4 +-
+ drivers/gpu/drm/radeon/atombios_encoders.c | 38 +-
+ drivers/gpu/drm/radeon/atombios_i2c.c | 2 +-
+ drivers/gpu/drm/radeon/btc_dpm.c | 90 +-
+ drivers/gpu/drm/radeon/ci_dpm.c | 31 +-
+ drivers/gpu/drm/radeon/ci_dpm.h | 6 +-
+ drivers/gpu/drm/radeon/clearstate_cayman.h | 9 +-
+ drivers/gpu/drm/radeon/clearstate_ci.h | 3 +-
+ drivers/gpu/drm/radeon/evergreen.c | 20 +-
+ drivers/gpu/drm/radeon/evergreen_cs.c | 4 +-
+ drivers/gpu/drm/radeon/evergreen_reg.h | 10 +-
+ drivers/gpu/drm/radeon/evergreen_smc.h | 9 +-
+ drivers/gpu/drm/radeon/kv_dpm.c | 9 +-
+ drivers/gpu/drm/radeon/kv_smc.c | 2 +-
+ drivers/gpu/drm/radeon/ni.c | 33 +-
+ drivers/gpu/drm/radeon/ni_dpm.c | 3 -
+ drivers/gpu/drm/radeon/ni_dpm.h | 12 +-
+ drivers/gpu/drm/radeon/nislands_smc.h | 51 +-
+ drivers/gpu/drm/radeon/r100.c | 2 +-
+ drivers/gpu/drm/radeon/r300_reg.h | 2 +-
+ drivers/gpu/drm/radeon/r600.c | 3 +-
+ drivers/gpu/drm/radeon/r600_dpm.c | 6 +-
+ drivers/gpu/drm/radeon/r600_dpm.h | 3 +-
+ drivers/gpu/drm/radeon/radeon.h | 6 +-
+ drivers/gpu/drm/radeon/radeon_asic.c | 8 +-
+ drivers/gpu/drm/radeon/radeon_atombios.c | 44 +-
+ drivers/gpu/drm/radeon/radeon_atpx_handler.c | 12 +-
+ drivers/gpu/drm/radeon/radeon_audio.c | 11 +-
+ drivers/gpu/drm/radeon/radeon_audio.h | 6 +-
+ drivers/gpu/drm/radeon/radeon_mode.h | 9 +-
+ drivers/gpu/drm/radeon/radeon_object.c | 2 -
+ drivers/gpu/drm/radeon/radeon_pm.c | 4 +-
+ drivers/gpu/drm/radeon/radeon_ttm.c | 8 +-
+ drivers/gpu/drm/radeon/radeon_uvd.c | 1 -
+ drivers/gpu/drm/radeon/rs400.c | 4 +-
+ drivers/gpu/drm/radeon/rs600.c | 3 +-
+ drivers/gpu/drm/radeon/rv515.c | 3 +-
+ drivers/gpu/drm/radeon/rv6xx_dpm.h | 3 +-
+ drivers/gpu/drm/radeon/rv770_dpm.c | 4 +-
+ drivers/gpu/drm/radeon/rv770_smc.h | 27 +-
+ drivers/gpu/drm/radeon/si.c | 63 +-
+ drivers/gpu/drm/radeon/si_dpm.c | 132 +-
+ drivers/gpu/drm/radeon/si_dpm.h | 21 +-
+ drivers/gpu/drm/radeon/smu7.h | 6 +-
+ drivers/gpu/drm/radeon/smu7_discrete.h | 51 +-
+ drivers/gpu/drm/radeon/smu7_fusion.h | 42 +-
+ drivers/gpu/drm/radeon/sumo_dpm.c | 18 +-
+ drivers/gpu/drm/radeon/trinity_dpm.c | 22 +-
+ drivers/gpu/drm/radeon/trinity_dpm.h | 3 +-
+ drivers/gpu/drm/radeon/uvd_v1_0.c | 2 +-
+ drivers/gpu/drm/renesas/Kconfig | 1 +
+ drivers/gpu/drm/renesas/Makefile | 1 +
+ drivers/gpu/drm/renesas/rz-du/Kconfig | 12 +
+ drivers/gpu/drm/renesas/rz-du/Makefile | 8 +
+ drivers/gpu/drm/renesas/rz-du/rzg2l_du_crtc.c | 422 ++
+ drivers/gpu/drm/renesas/rz-du/rzg2l_du_crtc.h | 89 +
+ drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.c | 175 +
+ drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.h | 78 +
+ drivers/gpu/drm/renesas/rz-du/rzg2l_du_encoder.c | 72 +
+ drivers/gpu/drm/renesas/rz-du/rzg2l_du_encoder.h | 32 +
+ drivers/gpu/drm/renesas/rz-du/rzg2l_du_kms.c | 371 +
+ drivers/gpu/drm/renesas/rz-du/rzg2l_du_kms.h | 43 +
+ drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c | 349 +
+ drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h | 82 +
+ drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 3 +
+ drivers/gpu/drm/rockchip/inno_hdmi.c | 575 +-
+ drivers/gpu/drm/rockchip/inno_hdmi.h | 5 -
+ drivers/gpu/drm/rockchip/rockchip_lvds.c | 3 +-
+ drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 13 +-
+ drivers/gpu/drm/rockchip/rockchip_vop_reg.h | 3 +
+ drivers/gpu/drm/scheduler/sched_main.c | 11 +-
+ drivers/gpu/drm/solomon/ssd130x-spi.c | 7 +
+ drivers/gpu/drm/solomon/ssd130x.c | 370 +
+ drivers/gpu/drm/solomon/ssd130x.h | 5 +-
+ drivers/gpu/drm/tegra/dpaux.c | 14 +-
+ drivers/gpu/drm/tegra/drm.h | 2 +-
+ drivers/gpu/drm/tegra/dsi.c | 59 +-
+ drivers/gpu/drm/tegra/hdmi.c | 21 +-
+ drivers/gpu/drm/tegra/output.c | 17 +-
+ drivers/gpu/drm/tegra/rgb.c | 18 +-
+ drivers/gpu/drm/tegra/sor.c | 1 +
+ drivers/gpu/drm/tests/drm_managed_test.c | 79 +-
+ drivers/gpu/drm/tests/drm_mm_test.c | 2 +-
+ drivers/gpu/drm/tilcdc/tilcdc_drv.c | 19 +-
+ drivers/gpu/drm/ttm/tests/Makefile | 3 +
+ drivers/gpu/drm/ttm/tests/ttm_bo_test.c | 622 ++
+ drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.c | 48 +-
+ drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.h | 3 +
+ drivers/gpu/drm/ttm/tests/ttm_pool_test.c | 3 +-
+ drivers/gpu/drm/ttm/tests/ttm_resource_test.c | 335 +
+ drivers/gpu/drm/ttm/tests/ttm_tt_test.c | 295 +
+ drivers/gpu/drm/ttm/ttm_bo.c | 30 +-
+ drivers/gpu/drm/ttm/ttm_bo_util.c | 13 +-
+ drivers/gpu/drm/ttm/ttm_resource.c | 76 +-
+ drivers/gpu/drm/ttm/ttm_tt.c | 15 +
+ drivers/gpu/drm/tve200/Kconfig | 1 -
+ drivers/gpu/drm/v3d/v3d_debugfs.c | 15 +
+ drivers/gpu/drm/vc4/vc4_hdmi.c | 1 +
+ drivers/gpu/drm/vc4/vc4_plane.c | 10 +-
+ drivers/gpu/drm/virtio/virtgpu_submit.c | 6 +-
+ drivers/gpu/drm/vkms/Kconfig | 15 +
+ drivers/gpu/drm/vkms/vkms_composer.c | 14 +-
+ drivers/gpu/drm/vmwgfx/ttm_object.c | 6 +-
+ drivers/gpu/drm/vmwgfx/ttm_object.h | 3 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 35 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 1 -
+ drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 20 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 5 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 300 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 6 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 5 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 5 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 21 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 18 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 32 -
+ drivers/gpu/drm/xe/.kunitconfig | 5 +
+ drivers/gpu/drm/xe/Kconfig | 2 +-
+ drivers/gpu/drm/xe/Makefile | 40 +-
+ drivers/gpu/drm/xe/abi/gsc_proxy_commands_abi.h | 44 +
+ drivers/gpu/drm/xe/abi/guc_actions_sriov_abi.h | 174 +
+ drivers/gpu/drm/xe/abi/guc_communication_ctb_abi.h | 3 +-
+ drivers/gpu/drm/xe/abi/guc_messages_abi.h | 2 +
+ drivers/gpu/drm/xe/abi/guc_relay_actions_abi.h | 79 +
+ .../gpu/drm/xe/abi/guc_relay_communication_abi.h | 118 +
+ drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h | 10 +-
+ .../drm/xe/compat-i915-headers/i915_gem_stolen.h | 3 +
+ drivers/gpu/drm/xe/{ => display}/xe_display.c | 0
+ drivers/gpu/drm/xe/{ => display}/xe_display.h | 0
+ drivers/gpu/drm/xe/display/xe_plane_initial.c | 67 +-
+ drivers/gpu/drm/xe/instructions/xe_mi_commands.h | 3 +
+ drivers/gpu/drm/xe/regs/xe_engine_regs.h | 6 +
+ drivers/gpu/drm/xe/regs/xe_gt_regs.h | 27 +-
+ drivers/gpu/drm/xe/regs/xe_lrc_layout.h | 9 +
+ drivers/gpu/drm/xe/regs/xe_pcode_regs.h | 21 +
+ drivers/gpu/drm/xe/tests/Makefile | 7 +-
+ drivers/gpu/drm/xe/tests/xe_guc_db_mgr_test.c | 201 +
+ drivers/gpu/drm/xe/tests/xe_guc_relay_test.c | 522 ++
+ drivers/gpu/drm/xe/tests/xe_kunit_helpers.c | 90 +
+ drivers/gpu/drm/xe/tests/xe_kunit_helpers.h | 17 +
+ drivers/gpu/drm/xe/tests/xe_mocs.c | 36 +
+ drivers/gpu/drm/xe/tests/xe_mocs_test.c | 1 +
+ drivers/gpu/drm/xe/tests/xe_mocs_test.h | 1 +
+ drivers/gpu/drm/xe/tests/xe_pci.c | 3 +
+ drivers/gpu/drm/xe/tests/xe_pci_test.c | 5 -
+ drivers/gpu/drm/xe/tests/xe_pci_test.h | 2 +
+ drivers/gpu/drm/xe/tests/xe_rtp_test.c | 10 +-
+ drivers/gpu/drm/xe/tests/xe_test_mod.c | 10 +
+ drivers/gpu/drm/xe/tests/xe_wa_test.c | 16 +-
+ drivers/gpu/drm/xe/xe_bo.c | 134 +-
+ drivers/gpu/drm/xe/xe_bo.h | 7 +-
+ drivers/gpu/drm/xe/xe_bo_types.h | 3 +
+ drivers/gpu/drm/xe/xe_debugfs.c | 1 +
+ drivers/gpu/drm/xe/xe_devcoredump.c | 55 +-
+ drivers/gpu/drm/xe/xe_devcoredump.h | 6 +-
+ drivers/gpu/drm/xe/xe_devcoredump_types.h | 13 +-
+ drivers/gpu/drm/xe/xe_device.c | 75 +-
+ drivers/gpu/drm/xe/xe_device.h | 10 +
+ drivers/gpu/drm/xe/xe_device_types.h | 166 +-
+ drivers/gpu/drm/xe/xe_drm_client.c | 14 +-
+ drivers/gpu/drm/xe/xe_exec.c | 42 +-
+ drivers/gpu/drm/xe/xe_exec_queue.c | 133 +-
+ drivers/gpu/drm/xe/xe_exec_queue.h | 3 +-
+ drivers/gpu/drm/xe/xe_exec_queue_types.h | 55 +-
+ drivers/gpu/drm/xe/xe_execlist.c | 8 -
+ drivers/gpu/drm/xe/xe_ggtt.c | 81 +-
+ drivers/gpu/drm/xe/xe_ggtt.h | 3 +
+ drivers/gpu/drm/xe/xe_gsc.c | 71 +-
+ drivers/gpu/drm/xe/xe_gsc.h | 1 +
+ drivers/gpu/drm/xe/xe_gsc_proxy.c | 537 ++
+ drivers/gpu/drm/xe/xe_gsc_proxy.h | 20 +
+ drivers/gpu/drm/xe/xe_gsc_submit.c | 20 +
+ drivers/gpu/drm/xe/xe_gsc_submit.h | 1 +
+ drivers/gpu/drm/xe/xe_gsc_types.h | 33 +
+ drivers/gpu/drm/xe/xe_gt.c | 89 +-
+ drivers/gpu/drm/xe/xe_gt.h | 2 +
+ drivers/gpu/drm/xe/xe_gt_mcr.c | 17 +
+ drivers/gpu/drm/xe/xe_gt_pagefault.c | 38 +-
+ drivers/gpu/drm/xe/xe_gt_printk.h | 44 +
+ drivers/gpu/drm/xe/xe_gt_sriov_printk.h | 34 +
+ drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c | 13 +-
+ drivers/gpu/drm/xe/xe_gt_topology.c | 4 +-
+ drivers/gpu/drm/xe/xe_gt_types.h | 122 +-
+ drivers/gpu/drm/xe/xe_guc.c | 115 +-
+ drivers/gpu/drm/xe/xe_guc.h | 1 +
+ drivers/gpu/drm/xe/xe_guc_ads.c | 2 +-
+ drivers/gpu/drm/xe/xe_guc_ct.c | 255 +-
+ drivers/gpu/drm/xe/xe_guc_ct.h | 12 +-
+ drivers/gpu/drm/xe/xe_guc_ct_types.h | 22 +-
+ drivers/gpu/drm/xe/xe_guc_db_mgr.c | 266 +
+ drivers/gpu/drm/xe/xe_guc_db_mgr.h | 22 +
+ drivers/gpu/drm/xe/xe_guc_fwif.h | 1 +
+ drivers/gpu/drm/xe/xe_guc_hwconfig.c | 2 +-
+ drivers/gpu/drm/xe/xe_guc_hxg_helpers.h | 108 +
+ drivers/gpu/drm/xe/xe_guc_log.c | 2 +-
+ drivers/gpu/drm/xe/xe_guc_pc.c | 19 +-
+ drivers/gpu/drm/xe/xe_guc_pc.h | 1 -
+ drivers/gpu/drm/xe/xe_guc_relay.c | 941 +++
+ drivers/gpu/drm/xe/xe_guc_relay.h | 37 +
+ drivers/gpu/drm/xe/xe_guc_relay_types.h | 36 +
+ drivers/gpu/drm/xe/xe_guc_submit.c | 88 +-
+ drivers/gpu/drm/xe/xe_guc_submit.h | 4 +-
+ drivers/gpu/drm/xe/xe_guc_submit_types.h | 18 +-
+ drivers/gpu/drm/xe/xe_guc_types.h | 47 +-
+ drivers/gpu/drm/xe/xe_heci_gsc.c | 2 +-
+ drivers/gpu/drm/xe/xe_huc.c | 19 +
+ drivers/gpu/drm/xe/xe_huc.h | 1 +
+ drivers/gpu/drm/xe/xe_hw_engine.c | 144 +-
+ drivers/gpu/drm/xe/xe_hw_engine_class_sysfs.c | 38 +-
+ drivers/gpu/drm/xe/xe_hw_engine_types.h | 82 +-
+ drivers/gpu/drm/xe/xe_hwmon.c | 32 +-
+ drivers/gpu/drm/xe/xe_irq.c | 136 +-
+ drivers/gpu/drm/xe/xe_lrc.c | 38 +
+ drivers/gpu/drm/xe/xe_lrc_types.h | 6 +-
+ drivers/gpu/drm/xe/xe_memirq.c | 430 ++
+ drivers/gpu/drm/xe/xe_memirq.h | 26 +
+ drivers/gpu/drm/xe/xe_memirq_types.h | 37 +
+ drivers/gpu/drm/xe/xe_migrate.c | 25 +-
+ drivers/gpu/drm/xe/xe_mmio.c | 9 +-
+ drivers/gpu/drm/xe/xe_mocs.c | 27 +-
+ drivers/gpu/drm/xe/xe_pat.c | 5 +
+ drivers/gpu/drm/xe/xe_pci.c | 10 +-
+ drivers/gpu/drm/xe/xe_pcode_api.h | 7 +
+ drivers/gpu/drm/xe/xe_pm.c | 38 +-
+ drivers/gpu/drm/xe/xe_pm.h | 1 +
+ drivers/gpu/drm/xe/xe_pt.c | 5 +-
+ drivers/gpu/drm/xe/xe_query.c | 50 +-
+ drivers/gpu/drm/xe/xe_reg_sr.c | 2 +-
+ drivers/gpu/drm/xe/xe_reg_whitelist.c | 8 +
+ drivers/gpu/drm/xe/xe_ring_ops.c | 60 +-
+ drivers/gpu/drm/xe/xe_sched_job.c | 38 +
+ drivers/gpu/drm/xe/xe_sched_job.h | 5 +
+ drivers/gpu/drm/xe/xe_sched_job_types.h | 11 +-
+ drivers/gpu/drm/xe/xe_sriov.c | 32 +
+ drivers/gpu/drm/xe/xe_sriov.h | 1 +
+ drivers/gpu/drm/xe/xe_sriov_types.h | 12 +
+ drivers/gpu/drm/xe/xe_tile_sysfs.c | 3 +
+ drivers/gpu/drm/xe/xe_trace.h | 55 +-
+ drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c | 8 +-
+ drivers/gpu/drm/xe/xe_tuning.c | 9 +-
+ drivers/gpu/drm/xe/xe_uc.c | 33 +-
+ drivers/gpu/drm/xe/xe_uc.h | 1 +
+ drivers/gpu/drm/xe/xe_uc_fw.c | 60 +-
+ drivers/gpu/drm/xe/xe_uc_fw_types.h | 9 +-
+ drivers/gpu/drm/xe/xe_vm.c | 202 +-
+ drivers/gpu/drm/xe/xe_vm.h | 7 +-
+ drivers/gpu/drm/xe/xe_vm_types.h | 8 +
+ drivers/gpu/drm/xe/xe_vram_freq.c | 128 +
+ drivers/gpu/drm/xe/xe_vram_freq.h | 13 +
+ drivers/gpu/drm/xe/xe_wa.c | 191 +-
+ drivers/gpu/drm/xe/xe_wa_oob.rules | 12 +-
+ drivers/gpu/drm/xe/xe_wait_user_fence.c | 2 +-
+ drivers/gpu/drm/xe/xe_wopcm_types.h | 4 +-
+ drivers/gpu/drm/xlnx/zynqmp_disp.c | 2 +-
+ drivers/gpu/drm/xlnx/zynqmp_dp.c | 22 +-
+ drivers/gpu/host1x/bus.c | 2 +-
+ drivers/gpu/host1x/bus.h | 2 +-
+ drivers/gpu/host1x/cdma.c | 3 +-
+ drivers/staging/sm750fb/Kconfig | 1 -
+ drivers/video/Kconfig | 9 +-
+ drivers/video/Makefile | 7 +-
+ drivers/video/cmdline.c | 2 +
+ drivers/video/fbdev/Kconfig | 35 -
+ drivers/video/fbdev/core/Kconfig | 2 +-
+ drivers/video/fbdev/core/fbmem.c | 2 -
+ drivers/video/fbdev/efifb.c | 225 +-
+ drivers/video/fbdev/geode/Kconfig | 3 -
+ drivers/video/fbdev/simplefb.c | 2 +-
+ drivers/video/fbdev/vesafb.c | 78 +-
+ drivers/video/screen_info_generic.c | 146 +
+ drivers/video/screen_info_pci.c | 136 +
+ include/drm/display/drm_dp.h | 1 +
+ include/drm/display/drm_dp_helper.h | 3 +-
+ include/drm/drm_atomic.h | 70 +-
+ include/drm/drm_bridge.h | 27 +-
+ include/drm/drm_edid.h | 46 +-
+ include/drm/drm_exec.h | 4 +-
+ include/drm/drm_fixed.h | 2 +-
+ include/drm/drm_gem.h | 13 +
+ include/drm/drm_gpuvm.h | 2 +-
+ include/drm/drm_managed.h | 4 +
+ include/drm/drm_modes.h | 2 +
+ include/drm/drm_print.h | 223 +-
+ include/drm/drm_probe_helper.h | 1 -
+ include/drm/drm_rect.h | 4 +-
+ include/drm/i915_pciids.h | 3 +
+ include/drm/ttm/ttm_placement.h | 10 +-
+ include/drm/ttm/ttm_resource.h | 8 +-
+ include/drm/ttm/ttm_tt.h | 9 +-
+ include/linux/fb.h | 7 -
+ include/linux/iosys-map.h | 2 +-
+ include/linux/screen_info.h | 126 +
+ include/linux/sysfb.h | 6 +-
+ include/sound/hdmi-codec.h | 1 -
+ include/uapi/drm/amdgpu_drm.h | 2 +
+ include/uapi/drm/i915_drm.h | 12 +
+ include/uapi/drm/nouveau_drm.h | 56 +-
+ include/uapi/drm/qaic_accel.h | 13 +-
+ include/uapi/drm/vmwgfx_drm.h | 6 +-
+ include/uapi/drm/xe_drm.h | 33 +-
+ include/uapi/linux/kfd_ioctl.h | 3 +-
+ include/uapi/linux/virtio_gpu.h | 2 +
+ include/video/cmdline.h | 8 +-
+ 922 files changed, 48670 insertions(+), 9455 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/display/bridge/fsl,imx8mp-hdmi-tx.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/imx/fsl,imx8mp-hdmi-pvi.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/panel/boe,th101mb31ig002-28a.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/panel/himax,hx83112a.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/panel/novatek,nt36672e.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/renesas,rzg2l-du.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/solomon,ssd133x.yaml
+ create mode 100644 Documentation/gpu/amdgpu/display/dcn-blocks.rst
+ create mode 100644 Documentation/gpu/amdgpu/display/display-contributing.rst
+ delete mode 100644 Documentation/gpu/rfc/xe.rst
+ create mode 100644 drivers/accel/habanalabs/common/mmu/mmu_v2.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_aca.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_aca.h
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/athub_v4_1_0.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/athub_v4_1_0.h
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/hdp_v7_0.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/hdp_v7_0.h
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/ih_v7_0.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/ih_v7_0.h
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.h
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/lsdma_v7_0.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/lsdma_v7_0.h
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/psp_v14_0.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/psp_v14_0.h
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.h
+ delete mode 100644 drivers/gpu/drm/amd/display/TODO
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/athub/athub_4_1_0_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/athub/athub_4_1_0_sh_mask.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/hdp/hdp_7_0_0_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/hdp/hdp_7_0_0_sh_mask.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/lsdma/lsdma_7_0_0_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/lsdma/lsdma_7_0_0_sh_mask.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_14_0_2_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_14_0_2_sh_mask.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/oss/osssys_7_0_0_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/oss/osssys_7_0_0_sh_mask.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_5_0_0_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_5_0_0_sh_mask.h
+ create mode 100644 drivers/gpu/drm/bridge/imx/imx8mp-hdmi-pvi.c
+ create mode 100644 drivers/gpu/drm/bridge/imx/imx8mp-hdmi-tx.c
+ delete mode 100644 drivers/gpu/drm/ci/xfails/msm-sc7180-fails.txt
+ delete mode 100644 drivers/gpu/drm/ci/xfails/msm-sc7180-flakes.txt
+ delete mode 100644 drivers/gpu/drm/ci/xfails/msm-sc7180-skips.txt
+ create mode 100644 drivers/gpu/drm/ci/xfails/msm-sc7180-trogdor-kingoftown-fails.txt
+ create mode 100644 drivers/gpu/drm/ci/xfails/msm-sc7180-trogdor-kingoftown-skips.txt
+ create mode 100644 drivers/gpu/drm/ci/xfails/msm-sc7180-trogdor-lazor-limozeen-fails.txt
+ create mode 100644 drivers/gpu/drm/ci/xfails/msm-sc7180-trogdor-lazor-limozeen-skips.txt
+ delete mode 100644 drivers/gpu/drm/i915/gem/i915_gem_userptr.h
+ create mode 100644 drivers/gpu/drm/panel/panel-boe-th101mb31ig002-28a.c
+ create mode 100644 drivers/gpu/drm/panel/panel-himax-hx83112a.c
+ create mode 100644 drivers/gpu/drm/panel/panel-novatek-nt36672e.c
+ create mode 100644 drivers/gpu/drm/renesas/rz-du/Kconfig
+ create mode 100644 drivers/gpu/drm/renesas/rz-du/Makefile
+ create mode 100644 drivers/gpu/drm/renesas/rz-du/rzg2l_du_crtc.c
+ create mode 100644 drivers/gpu/drm/renesas/rz-du/rzg2l_du_crtc.h
+ create mode 100644 drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.c
+ create mode 100644 drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.h
+ create mode 100644 drivers/gpu/drm/renesas/rz-du/rzg2l_du_encoder.c
+ create mode 100644 drivers/gpu/drm/renesas/rz-du/rzg2l_du_encoder.h
+ create mode 100644 drivers/gpu/drm/renesas/rz-du/rzg2l_du_kms.c
+ create mode 100644 drivers/gpu/drm/renesas/rz-du/rzg2l_du_kms.h
+ create mode 100644 drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c
+ create mode 100644 drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h
+ create mode 100644 drivers/gpu/drm/ttm/tests/ttm_bo_test.c
+ create mode 100644 drivers/gpu/drm/ttm/tests/ttm_resource_test.c
+ create mode 100644 drivers/gpu/drm/ttm/tests/ttm_tt_test.c
+ create mode 100644 drivers/gpu/drm/vkms/Kconfig
+ create mode 100644 drivers/gpu/drm/xe/abi/gsc_proxy_commands_abi.h
+ create mode 100644 drivers/gpu/drm/xe/abi/guc_actions_sriov_abi.h
+ create mode 100644 drivers/gpu/drm/xe/abi/guc_relay_actions_abi.h
+ create mode 100644 drivers/gpu/drm/xe/abi/guc_relay_communication_abi.h
+ rename drivers/gpu/drm/xe/{ => display}/xe_display.c (100%)
+ rename drivers/gpu/drm/xe/{ => display}/xe_display.h (100%)
+ create mode 100644 drivers/gpu/drm/xe/regs/xe_pcode_regs.h
+ create mode 100644 drivers/gpu/drm/xe/tests/xe_guc_db_mgr_test.c
+ create mode 100644 drivers/gpu/drm/xe/tests/xe_guc_relay_test.c
+ create mode 100644 drivers/gpu/drm/xe/tests/xe_kunit_helpers.c
+ create mode 100644 drivers/gpu/drm/xe/tests/xe_kunit_helpers.h
+ create mode 100644 drivers/gpu/drm/xe/tests/xe_test_mod.c
+ create mode 100644 drivers/gpu/drm/xe/xe_gsc_proxy.c
+ create mode 100644 drivers/gpu/drm/xe/xe_gsc_proxy.h
+ create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_printk.h
+ create mode 100644 drivers/gpu/drm/xe/xe_guc_db_mgr.c
+ create mode 100644 drivers/gpu/drm/xe/xe_guc_db_mgr.h
+ create mode 100644 drivers/gpu/drm/xe/xe_guc_hxg_helpers.h
+ create mode 100644 drivers/gpu/drm/xe/xe_guc_relay.c
+ create mode 100644 drivers/gpu/drm/xe/xe_guc_relay.h
+ create mode 100644 drivers/gpu/drm/xe/xe_guc_relay_types.h
+ create mode 100644 drivers/gpu/drm/xe/xe_memirq.c
+ create mode 100644 drivers/gpu/drm/xe/xe_memirq.h
+ create mode 100644 drivers/gpu/drm/xe/xe_memirq_types.h
+ create mode 100644 drivers/gpu/drm/xe/xe_vram_freq.c
+ create mode 100644 drivers/gpu/drm/xe/xe_vram_freq.h
+ create mode 100644 drivers/video/screen_info_generic.c
+ create mode 100644 drivers/video/screen_info_pci.c
+$ git am -3 ../patches/drm_i915-fix-applying-placement-flag.patch
+Applying: drm/i915: fix applying placement flag
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/gpu/drm/i915/gem/i915_gem_ttm.c
+$ git add -A .
+$ git commit -v -a --amend
+[master 8d3acfc16163] Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git
+ Date: Wed Feb 28 10:50:43 2024 +1100
+Merging drm-exynos/for-linux-next (40d47c5fb4f2 Merge tag 'amd-drm-next-6.9-2024-02-19' of https://gitlab.freedesktop.org/agd5f/linux into drm-next)
+$ git merge -m Merge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git drm-exynos/for-linux-next
+Already up to date.
+Merging drm-misc/for-linux-next (9fa2679b7fe1 firmware/sysfb: fix an error code in sysfb_init())
+$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc drm-misc/for-linux-next
+Merge made by the 'ort' strategy.
+ drivers/firmware/sysfb.c | 4 +++-
+ drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c | 4 ++--
+ 2 files changed, 5 insertions(+), 3 deletions(-)
+Merging amdgpu/drm-next (1cb96a8a59c6 Revert "drm/amd/pm: resolve reboot exception for si oland")
+$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
+Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c
+Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c
+Merge made by the 'ort' strategy.
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 5 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 17 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 7 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 8 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 2 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.c | 8 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h | 3 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 33 ++++
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 6 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ring_mux.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 2 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 5 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/atom.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/cik.c | 41 ++---
+ drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 5 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 17 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 5 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 5 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 7 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 2 +
+ drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 8 +-
+ drivers/gpu/drm/amd/amdgpu/imu_v11_0.c | 1 +
+ drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_5.c | 177 ++++++++++++++-------
+ drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 15 +-
+ drivers/gpu/drm/amd/amdgpu/nbio_v7_9.c | 63 --------
+ drivers/gpu/drm/amd/amdgpu/si.c | 41 ++---
+ drivers/gpu/drm/amd/amdgpu/soc15.c | 49 +++---
+ drivers/gpu/drm/amd/amdgpu/soc21.c | 35 ++++
+ drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c | 3 +
+ drivers/gpu/drm/amd/amdgpu/vega20_ih.c | 38 ++---
+ drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 1 +
+ drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 1 +
+ drivers/gpu/drm/amd/amdkfd/kfd_device.c | 7 +
+ .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 4 +
+ drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c | 8 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h | 2 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 10 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 5 +-
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 18 +--
+ drivers/gpu/drm/amd/display/dc/basics/dce_calcs.c | 2 -
+ drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 2 -
+ .../amd/display/dc/clk_mgr/dce100/dce_clk_mgr.c | 2 +-
+ .../drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr.c | 2 -
+ .../amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr_clk.c | 79 ---------
+ .../dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.c | 11 +-
+ .../drm/amd/display/dc/clk_mgr/dcn301/dcn301_smu.c | 6 +-
+ .../amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c | 4 +-
+ drivers/gpu/drm/amd/display/dc/core/dc.c | 146 +++++++----------
+ drivers/gpu/drm/amd/display/dc/dc.h | 2 +-
+ .../amd/display/dc/dcn32/dcn32_dio_link_encoder.c | 85 +++++++---
+ .../amd/display/dc/dcn32/dcn32_dio_link_encoder.h | 5 +
+ .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 1 -
+ drivers/gpu/drm/amd/display/dc/dml2/dml2_wrapper.c | 5 +
+ drivers/gpu/drm/amd/display/dc/hdcp/hdcp_msg.c | 2 -
+ drivers/gpu/drm/amd/display/dc/inc/core_types.h | 31 ++--
+ .../amd/display/dc/irq/dcn20/irq_service_dcn20.c | 2 -
+ .../amd/display/dc/irq/dcn21/irq_service_dcn21.c | 2 -
+ .../drm/amd/display/dc/link/protocols/link_dpcd.c | 2 +-
+ .../amd/display/dc/resource/dcn20/dcn20_resource.c | 2 -
+ .../amd/display/dc/resource/dcn32/dcn32_resource.c | 1 +
+ .../display/dc/resource/dcn321/dcn321_resource.c | 2 +-
+ drivers/gpu/drm/amd/display/dmub/src/dmub_dcn35.c | 8 +-
+ drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 9 +-
+ .../gpu/drm/amd/display/modules/inc/mod_stats.h | 4 +-
+ .../amd/include/asic_reg/nbio/nbio_7_9_0_sh_mask.h | 8 -
+ drivers/gpu/drm/amd/include/atomfirmware.h | 32 ++++
+ drivers/gpu/drm/amd/pm/amdgpu_pm.c | 3 +-
+ drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c | 29 ++++
+ drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 9 +-
+ drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 9 +-
+ .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 9 +-
+ .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 9 +-
+ .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 4 +-
+ .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 9 +-
+ drivers/gpu/drm/radeon/cik.c | 40 ++---
+ drivers/gpu/drm/radeon/si.c | 40 ++---
+ 83 files changed, 688 insertions(+), 621 deletions(-)
+ delete mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr_clk.c
+Merging drm-intel/for-linux-next (e60cff453b82 drm/i915/dp: Enable DP tunnel BW allocation mode)
+ 287c0de8b294 ("drm/i915/hdcp: Move to direct reads for HDCP")
+ 429ccbd1c39b ("drm/i915/hdcp: Remove additional timing for reading mst hdcp message")
+ 909fff3e46c0 ("drm/i915/hdcp: Extract hdcp structure from correct connector")
+$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel drm-intel/for-linux-next
+Auto-merging drivers/gpu/drm/display/drm_dp_helper.c
+Auto-merging drivers/gpu/drm/i915/Kconfig
+Auto-merging drivers/gpu/drm/i915/display/intel_display.c
+Auto-merging drivers/gpu/drm/i915/display/intel_display_driver.c
+Auto-merging drivers/gpu/drm/i915/display/intel_dp.c
+Auto-merging drivers/gpu/drm/i915/display/intel_dp_hdcp.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dp_hdcp.c
+Auto-merging drivers/gpu/drm/i915/display/intel_sdvo.c
+Auto-merging drivers/gpu/drm/i915/gvt/interrupt.c
+Auto-merging include/drm/display/drm_dp_helper.h
+Recorded preimage for 'drivers/gpu/drm/i915/display/intel_dp_hdcp.c'
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+Recorded resolution for 'drivers/gpu/drm/i915/display/intel_dp_hdcp.c'.
+[master 91c9a7521b4c] Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel
+$ git diff -M --stat --summary HEAD^..
+ drivers/gpu/drm/display/Kconfig | 21 +
+ drivers/gpu/drm/display/Makefile | 2 +
+ drivers/gpu/drm/display/drm_dp_helper.c | 30 +
+ drivers/gpu/drm/display/drm_dp_tunnel.c | 1949 ++++++++++++++++++++
+ drivers/gpu/drm/i915/Kconfig | 14 +
+ drivers/gpu/drm/i915/Kconfig.debug | 1 +
+ drivers/gpu/drm/i915/Makefile | 3 +
+ drivers/gpu/drm/i915/display/dvo_ch7017.c | 2 +-
+ drivers/gpu/drm/i915/display/dvo_ch7xxx.c | 2 +-
+ drivers/gpu/drm/i915/display/dvo_ivch.c | 2 +-
+ drivers/gpu/drm/i915/display/dvo_ns2501.c | 6 +-
+ drivers/gpu/drm/i915/display/dvo_sil164.c | 2 +-
+ drivers/gpu/drm/i915/display/dvo_tfp410.c | 2 +-
+ drivers/gpu/drm/i915/display/i9xx_wm.c | 81 +-
+ drivers/gpu/drm/i915/display/intel_atomic.c | 10 +
+ drivers/gpu/drm/i915/display/intel_bios.c | 73 +-
+ drivers/gpu/drm/i915/display/intel_bios.h | 3 +-
+ drivers/gpu/drm/i915/display/intel_cdclk.c | 61 +-
+ drivers/gpu/drm/i915/display/intel_color.c | 11 +-
+ drivers/gpu/drm/i915/display/intel_crt.c | 3 +
+ drivers/gpu/drm/i915/display/intel_cx0_phy.c | 32 +-
+ drivers/gpu/drm/i915/display/intel_ddi.c | 3 +-
+ drivers/gpu/drm/i915/display/intel_display.c | 132 +-
+ drivers/gpu/drm/i915/display/intel_display_core.h | 1 +
+ .../gpu/drm/i915/display/intel_display_debugfs.c | 68 +-
+ .../gpu/drm/i915/display/intel_display_driver.c | 20 +-
+ drivers/gpu/drm/i915/display/intel_display_types.h | 24 +-
+ drivers/gpu/drm/i915/display/intel_dp.c | 297 ++-
+ drivers/gpu/drm/i915/display/intel_dp.h | 13 +-
+ drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 106 +-
+ .../gpu/drm/i915/display/intel_dp_link_training.c | 33 +-
+ .../gpu/drm/i915/display/intel_dp_link_training.h | 1 +
+ drivers/gpu/drm/i915/display/intel_dp_mst.c | 22 +-
+ drivers/gpu/drm/i915/display/intel_dp_tunnel.c | 811 ++++++++
+ drivers/gpu/drm/i915/display/intel_dp_tunnel.h | 133 ++
+ drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 103 +-
+ drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 3 +
+ drivers/gpu/drm/i915/display/intel_drrs.c | 6 +
+ drivers/gpu/drm/i915/display/intel_dsb.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_dsi.h | 4 -
+ drivers/gpu/drm/i915/display/intel_dvo.c | 5 +
+ drivers/gpu/drm/i915/display/intel_dvo_dev.h | 25 -
+ drivers/gpu/drm/i915/display/intel_fb.c | 7 +-
+ drivers/gpu/drm/i915/display/intel_global_state.h | 4 +-
+ drivers/gpu/drm/i915/display/intel_hdcp.c | 226 ++-
+ drivers/gpu/drm/i915/display/intel_hdcp.h | 7 +-
+ drivers/gpu/drm/i915/display/intel_hdmi.c | 6 +-
+ drivers/gpu/drm/i915/display/intel_link_bw.c | 27 +-
+ drivers/gpu/drm/i915/display/intel_link_bw.h | 2 +-
+ drivers/gpu/drm/i915/display/intel_opregion.c | 6 +-
+ drivers/gpu/drm/i915/display/intel_sdvo.c | 224 ++-
+ drivers/gpu/drm/i915/display/skl_universal_plane.c | 5 +
+ drivers/gpu/drm/i915/display/skl_watermark.c | 54 +-
+ drivers/gpu/drm/i915/display/skl_watermark.h | 4 +-
+ drivers/gpu/drm/i915/display/skl_watermark_regs.h | 4 +
+ drivers/gpu/drm/i915/gt/uc/intel_guc.h | 2 -
+ drivers/gpu/drm/i915/gvt/fb_decoder.h | 11 -
+ drivers/gpu/drm/i915/gvt/gtt.h | 3 -
+ drivers/gpu/drm/i915/gvt/gvt.h | 5 -
+ drivers/gpu/drm/i915/gvt/interrupt.c | 1 -
+ drivers/gpu/drm/i915/gvt/interrupt.h | 2 -
+ drivers/gpu/drm/i915/gvt/mmio.h | 2 -
+ drivers/gpu/drm/i915/gvt/scheduler.h | 2 -
+ drivers/gpu/drm/i915/i915_drm_client.h | 2 -
+ drivers/gpu/drm/i915/i915_perf_types.h | 1 -
+ drivers/gpu/drm/i915/i915_request.c | 1 -
+ drivers/gpu/drm/i915/i915_vma_types.h | 1 -
+ drivers/gpu/drm/i915/intel_memory_region.h | 2 -
+ include/drm/display/drm_dp.h | 61 +
+ include/drm/display/drm_dp_helper.h | 1 +
+ include/drm/display/drm_dp_tunnel.h | 248 +++
+ include/drm/i915_pciids.h | 4 +-
+ 72 files changed, 4405 insertions(+), 642 deletions(-)
+ create mode 100644 drivers/gpu/drm/display/drm_dp_tunnel.c
+ create mode 100644 drivers/gpu/drm/i915/display/intel_dp_tunnel.c
+ create mode 100644 drivers/gpu/drm/i915/display/intel_dp_tunnel.h
+ create mode 100644 include/drm/display/drm_dp_tunnel.h
+Merging drm-tegra/for-next (2429b3c529da drm/tegra: Avoid potential 32-bit integer overflow)
+$ git merge -m Merge branch 'for-next' of https://gitlab.freedesktop.org/drm/tegra.git drm-tegra/for-next
+Already up to date.
+Merging drm-msm/msm-next (18397519cb62 drm/msm/adreno: Add A702 support)
+$ git merge -m Merge branch 'msm-next' of https://gitlab.freedesktop.org/drm/msm.git drm-msm/msm-next
+Merge made by the 'ort' strategy.
+ .../bindings/display/msm/dsi-controller-main.yaml | 2 +
+ .../devicetree/bindings/display/msm/gmu.yaml | 1 +
+ .../devicetree/bindings/display/msm/gpu.yaml | 6 +-
+ .../devicetree/bindings/display/msm/qcom,mdss.yaml | 1 +
+ .../bindings/display/msm/qcom,sm8650-dpu.yaml | 4 +-
+ .../bindings/display/msm/qcom,sm8650-mdss.yaml | 4 +
+ .../bindings/display/msm/qcom,x1e80100-mdss.yaml | 251 +
+ .../devicetree/bindings/iommu/arm,smmu.yaml | 17 +-
+ drivers/gpu/drm/msm/Makefile | 2 -
+ drivers/gpu/drm/msm/adreno/a2xx.xml.h | 71 +-
+ drivers/gpu/drm/msm/adreno/a3xx.xml.h | 129 +-
+ drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 13 +-
+ drivers/gpu/drm/msm/adreno/a4xx.xml.h | 180 +-
+ drivers/gpu/drm/msm/adreno/a5xx.xml.h | 664 +--
+ drivers/gpu/drm/msm/adreno/a6xx.xml.h | 5261 ++++++++++++++++----
+ drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 8 +-
+ drivers/gpu/drm/msm/adreno/a6xx_gmu.xml.h | 177 +-
+ drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 220 +-
+ drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 727 ++-
+ drivers/gpu/drm/msm/adreno/a6xx_gpu_state.h | 311 +-
+ drivers/gpu/drm/msm/adreno/adreno_common.xml.h | 258 +-
+ drivers/gpu/drm/msm/adreno/adreno_device.c | 69 +-
+ .../gpu/drm/msm/adreno/adreno_gen7_0_0_snapshot.h | 928 ++++
+ .../gpu/drm/msm/adreno/adreno_gen7_2_0_snapshot.h | 753 +++
+ drivers/gpu/drm/msm/adreno/adreno_gpu.h | 31 +-
+ drivers/gpu/drm/msm/adreno/adreno_pm4.xml.h | 571 ++-
+ .../gpu/drm/msm/disp/dpu1/catalog/dpu_3_2_sdm660.h | 291 ++
+ .../gpu/drm/msm/disp/dpu1/catalog/dpu_3_3_sdm630.h | 225 +
+ .../drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h | 449 ++
+ drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 107 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h | 7 +
+ drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h | 15 +-
+ .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 93 +-
+ .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 58 +-
+ .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c | 88 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 4 +
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 3 +
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c | 15 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.h | 1 +
+ drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 127 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 1 -
+ drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 154 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h | 74 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c | 61 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.h | 3 +-
+ drivers/gpu/drm/msm/disp/mdp5/mdp5_cmd_encoder.c | 42 -
+ drivers/gpu/drm/msm/disp/mdp5/mdp5_encoder.c | 42 -
+ drivers/gpu/drm/msm/disp/mdp5/mdp5_irq.c | 2 -
+ drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 71 +-
+ drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.h | 10 -
+ drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.c | 12 +-
+ drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.h | 4 +-
+ drivers/gpu/drm/msm/dp/dp_aux.c | 9 +-
+ drivers/gpu/drm/msm/dp/dp_aux.h | 2 +
+ drivers/gpu/drm/msm/dp/dp_catalog.c | 158 +-
+ drivers/gpu/drm/msm/dp/dp_catalog.h | 6 +-
+ drivers/gpu/drm/msm/dp/dp_ctrl.c | 358 +-
+ drivers/gpu/drm/msm/dp/dp_ctrl.h | 17 +-
+ drivers/gpu/drm/msm/dp/dp_debug.c | 3 +-
+ drivers/gpu/drm/msm/dp/dp_display.c | 102 +-
+ drivers/gpu/drm/msm/dp/dp_display.h | 3 +-
+ drivers/gpu/drm/msm/dp/dp_link.h | 23 -
+ drivers/gpu/drm/msm/dp/dp_panel.c | 66 +
+ drivers/gpu/drm/msm/dp/dp_parser.c | 327 --
+ drivers/gpu/drm/msm/dp/dp_parser.h | 155 -
+ drivers/gpu/drm/msm/dp/dp_power.c | 183 -
+ drivers/gpu/drm/msm/dp/dp_power.h | 95 -
+ drivers/gpu/drm/msm/dsi/dsi.c | 10 +-
+ drivers/gpu/drm/msm/dsi/dsi.h | 22 +-
+ drivers/gpu/drm/msm/dsi/dsi_host.c | 51 +-
+ drivers/gpu/drm/msm/dsi/dsi_manager.c | 65 +-
+ drivers/gpu/drm/msm/msm_drv.c | 33 +
+ drivers/gpu/drm/msm/msm_drv.h | 4 +
+ drivers/gpu/drm/msm/msm_io_utils.c | 13 +
+ drivers/gpu/drm/msm/msm_kms.h | 4 -
+ drivers/gpu/drm/msm/msm_mdss.c | 64 +
+ 76 files changed, 10933 insertions(+), 3458 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,x1e80100-mdss.yaml
+ create mode 100644 drivers/gpu/drm/msm/adreno/adreno_gen7_0_0_snapshot.h
+ create mode 100644 drivers/gpu/drm/msm/adreno/adreno_gen7_2_0_snapshot.h
+ create mode 100644 drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_2_sdm660.h
+ create mode 100644 drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_3_sdm630.h
+ create mode 100644 drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h
+ delete mode 100644 drivers/gpu/drm/msm/dp/dp_parser.c
+ delete mode 100644 drivers/gpu/drm/msm/dp/dp_parser.h
+ delete mode 100644 drivers/gpu/drm/msm/dp/dp_power.c
+ delete mode 100644 drivers/gpu/drm/msm/dp/dp_power.h
+Merging drm-msm-lumag/msm-next-lumag (e3b1f369db5a drm/msm/dpu: Add X1E80100 support)
+$ git merge -m Merge branch 'msm-next-lumag' of https://gitlab.freedesktop.org/lumag/msm.git drm-msm-lumag/msm-next-lumag
+Already up to date.
+Merging drm-xe/drm-xe-next (e275d61c5f3f drm/xe/guc: Handle timing out of signaled jobs gracefully)
+$ git merge -m Merge branch 'drm-xe-next' of https://gitlab.freedesktop.org/drm/xe/kernel drm-xe/drm-xe-next
+Auto-merging drivers/gpu/drm/xe/xe_pm.c
+Merge made by the 'ort' strategy.
+ drivers/gpu/drm/xe/regs/xe_guc_regs.h | 7 ++
+ drivers/gpu/drm/xe/tests/xe_bo.c | 8 +-
+ drivers/gpu/drm/xe/tests/xe_migrate.c | 7 +-
+ drivers/gpu/drm/xe/tests/xe_mocs.c | 19 ++--
+ drivers/gpu/drm/xe/xe_debugfs.c | 10 +-
+ drivers/gpu/drm/xe/xe_device.c | 50 ++++++++-
+ drivers/gpu/drm/xe/xe_device_sysfs.c | 4 +
+ drivers/gpu/drm/xe/xe_dma_buf.c | 5 +-
+ drivers/gpu/drm/xe/xe_exec_queue.c | 94 +----------------
+ drivers/gpu/drm/xe/xe_exec_queue_types.h | 10 --
+ drivers/gpu/drm/xe/xe_execlist.c | 2 +-
+ drivers/gpu/drm/xe/xe_ggtt.c | 37 ++-----
+ drivers/gpu/drm/xe/xe_gsc.c | 5 +-
+ drivers/gpu/drm/xe/xe_gt.c | 15 +--
+ drivers/gpu/drm/xe/xe_gt_debugfs.c | 53 +++++++++-
+ drivers/gpu/drm/xe/xe_gt_freq.c | 38 ++++++-
+ drivers/gpu/drm/xe/xe_gt_idle.c | 23 ++++-
+ drivers/gpu/drm/xe/xe_gt_throttle_sysfs.c | 3 +
+ drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c | 53 +++++++++-
+ drivers/gpu/drm/xe/xe_gt_tlb_invalidation.h | 2 +-
+ drivers/gpu/drm/xe/xe_guc_debugfs.c | 9 +-
+ drivers/gpu/drm/xe/xe_guc_pc.c | 64 ++----------
+ drivers/gpu/drm/xe/xe_guc_submit.c | 30 +++---
+ drivers/gpu/drm/xe/xe_huc_debugfs.c | 5 +-
+ drivers/gpu/drm/xe/xe_hw_engine_class_sysfs.c | 58 ++++++++++-
+ drivers/gpu/drm/xe/xe_hw_engine_class_sysfs.h | 7 ++
+ drivers/gpu/drm/xe/xe_hwmon.c | 25 ++---
+ drivers/gpu/drm/xe/xe_lrc.c | 10 +-
+ drivers/gpu/drm/xe/xe_pat.c | 10 --
+ drivers/gpu/drm/xe/xe_pm.c | 140 ++++++++++++++++++++++++--
+ drivers/gpu/drm/xe/xe_pm.h | 2 +
+ drivers/gpu/drm/xe/xe_query.c | 42 ++++++--
+ drivers/gpu/drm/xe/xe_tile_sysfs.c | 1 +
+ drivers/gpu/drm/xe/xe_ttm_sys_mgr.c | 5 +-
+ drivers/gpu/drm/xe/xe_vm.c | 42 ++++----
+ drivers/gpu/drm/xe/xe_vm_types.h | 4 -
+ include/uapi/drm/xe_drm.h | 20 +---
+ 37 files changed, 569 insertions(+), 350 deletions(-)
+Merging etnaviv/etnaviv/next (c9959996a8fc drm/etnaviv: add sensitive state for PE_RT_ADDR_4_PIPE(3, 0|1) address)
+$ git merge -m Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux etnaviv/etnaviv/next
+Auto-merging drivers/gpu/drm/etnaviv/etnaviv_drv.c
+Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gpu.c
+Merge made by the 'ort' strategy.
+ drivers/gpu/drm/etnaviv/etnaviv_cmd_parser.c | 1 +
+ drivers/gpu/drm/etnaviv/etnaviv_drv.c | 93 ++++++++++++++++++----------
+ drivers/gpu/drm/etnaviv/etnaviv_gem.c | 12 ++--
+ drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 33 +++++++++-
+ drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 12 ++++
+ drivers/gpu/drm/etnaviv/etnaviv_hwdb.c | 34 ++++++++++
+ drivers/gpu/drm/etnaviv/etnaviv_mmu.c | 4 +-
+ drivers/gpu/drm/etnaviv/etnaviv_perfmon.c | 4 +-
+ include/uapi/drm/etnaviv_drm.h | 5 ++
+ 9 files changed, 154 insertions(+), 44 deletions(-)
+Merging fbdev/for-next (72fee6b0a3a4 fbdev: Restrict FB_SH_MOBILE_LCDC to SuperH)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next
+Auto-merging drivers/video/fbdev/Kconfig
+Merge made by the 'ort' strategy.
+ drivers/video/fbdev/Kconfig | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging regmap/for-next (62861ddcb27e Merge remote-tracking branch 'regmap/for-6.9' into regmap-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap/for-next
+Merge made by the 'ort' strategy.
+ drivers/base/regmap/internal.h | 1 +
+ drivers/base/regmap/regcache-flat.c | 2 +-
+ drivers/base/regmap/regcache.c | 4 ++-
+ drivers/base/regmap/regmap-kunit.c | 66 +++++++++++++++++++++++++++++++++++++
+ drivers/base/regmap/regmap.c | 10 +++---
+ include/linux/regmap.h | 5 +++
+ 6 files changed, 82 insertions(+), 6 deletions(-)
+Merging sound/for-next (a55bc334d3df ALSA: pcm_oss: ump: Use automatic cleanup of kfree())
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next
+Auto-merging MAINTAINERS
+Auto-merging sound/core/pcm_native.c
+Auto-merging sound/pci/hda/patch_realtek.c
+Merge made by the 'ort' strategy.
+ .../sound/kernel-api/writing-an-alsa-driver.rst | 6 +-
+ MAINTAINERS | 7 +
+ include/sound/ak4531_codec.h | 3 +
+ include/sound/emux_synth.h | 2 +-
+ include/sound/sb.h | 3 +
+ include/uapi/linux/virtio_snd.h | 154 +++++++
+ sound/aoa/fabrics/layout.c | 7 +-
+ sound/aoa/soundbus/core.c | 2 +-
+ sound/arm/aaci.c | 10 +-
+ sound/arm/pxa2xx-ac97.c | 7 +-
+ sound/core/Kconfig | 17 +
+ sound/core/Makefile | 2 +
+ sound/core/compress_offload.c | 36 +-
+ sound/core/control.c | 23 +-
+ sound/core/control_compat.c | 69 ++-
+ sound/core/oss/mixer_oss.c | 59 +--
+ sound/core/oss/pcm_oss.c | 33 +-
+ sound/core/pcm.c | 10 +-
+ sound/core/pcm_compat.c | 29 +-
+ sound/core/pcm_native.c | 119 ++---
+ sound/core/seq/Kconfig | 1 -
+ sound/core/seq/oss/seq_oss_device.h | 2 +-
+ sound/core/seq/oss/seq_oss_init.c | 19 +-
+ sound/core/seq/oss/seq_oss_midi.c | 11 +-
+ sound/core/seq/seq_compat.c | 12 +-
+ sound/core/seq/seq_midi.c | 22 +-
+ sound/core/seq/seq_prioq.c | 197 ++++-----
+ sound/core/seq/seq_ump_client.c | 33 +-
+ sound/core/seq/seq_virmidi.c | 31 +-
+ sound/core/seq_device.c | 2 +-
+ sound/core/sound_kunit.c | 311 ++++++++++++++
+ sound/core/timer.c | 13 +-
+ sound/core/vmaster.c | 19 +-
+ sound/drivers/aloop.c | 9 +-
+ sound/drivers/dummy.c | 9 +-
+ sound/drivers/pcsp/pcsp.c | 9 +-
+ sound/firewire/Kconfig | 2 +
+ sound/firewire/amdtp-stream.c | 12 +-
+ sound/firewire/amdtp-stream.h | 4 +
+ sound/firewire/motu/motu-protocol-v3.c | 9 +
+ sound/firewire/motu/motu.c | 2 +
+ sound/firewire/motu/motu.h | 1 +
+ sound/firewire/oxfw/oxfw-stream.c | 100 +++--
+ sound/firewire/oxfw/oxfw.c | 10 +-
+ sound/firewire/oxfw/oxfw.h | 7 +-
+ sound/hda/hdac_stream.c | 2 +-
+ sound/hda/intel-sdw-acpi.c | 7 +
+ sound/pci/ali5451/ali5451.c | 32 +-
+ sound/pci/als300.c | 9 +-
+ sound/pci/als4000.c | 9 +-
+ sound/pci/atiixp.c | 12 +-
+ sound/pci/atiixp_modem.c | 11 +-
+ sound/pci/aw2/aw2-saa7146.h | 5 +-
+ sound/pci/azt3328.c | 11 +-
+ sound/pci/cmipci.c | 11 +-
+ sound/pci/cs4281.c | 13 +-
+ sound/pci/ctxfi/ctamixer.c | 10 +-
+ sound/pci/ctxfi/ctamixer.h | 8 +-
+ sound/pci/ctxfi/ctatc.c | 23 +-
+ sound/pci/ctxfi/ctdaio.c | 5 +-
+ sound/pci/ctxfi/ctdaio.h | 4 +-
+ sound/pci/ctxfi/ctsrc.c | 10 +-
+ sound/pci/ctxfi/ctsrc.h | 8 +-
+ sound/pci/echoaudio/echoaudio.c | 21 +-
+ sound/pci/echoaudio/echoaudio.h | 2 -
+ sound/pci/echoaudio/echoaudio_3g.c | 1 -
+ sound/pci/ens1370.c | 9 +-
+ sound/pci/es1938.c | 11 +-
+ sound/pci/es1968.c | 17 +-
+ sound/pci/fm801.c | 11 +-
+ sound/pci/hda/Kconfig | 4 +
+ sound/pci/hda/Makefile | 2 +
+ sound/pci/hda/cs35l41_hda_property.c | 90 +++-
+ sound/pci/hda/hda_beep.c | 1 -
+ sound/pci/hda/hda_beep.h | 1 -
+ sound/pci/hda/hda_component.c | 169 ++++++++
+ sound/pci/hda/hda_component.h | 59 +++
+ sound/pci/hda/hda_controller.c | 14 +-
+ sound/pci/hda/patch_realtek.c | 270 ++++--------
+ sound/pci/intel8x0.c | 9 +-
+ sound/pci/intel8x0m.c | 9 +-
+ sound/pci/maestro3.c | 29 +-
+ sound/pci/nm256/nm256.c | 9 +-
+ sound/pci/riptide/riptide.c | 11 +-
+ sound/pci/rme96.c | 30 +-
+ sound/pci/sis7019.c | 13 +-
+ sound/pci/via82xx.c | 15 +-
+ sound/pci/via82xx_modem.c | 9 +-
+ sound/soc/pxa/pxa2xx-ac97.c | 6 +-
+ sound/spi/at73c213.c | 11 +-
+ sound/synth/emux/emux.c | 4 +-
+ sound/virtio/Makefile | 1 +
+ sound/virtio/virtio_card.c | 21 +
+ sound/virtio/virtio_card.h | 22 +
+ sound/virtio/virtio_kctl.c | 477 +++++++++++++++++++++
+ 95 files changed, 1946 insertions(+), 1047 deletions(-)
+ create mode 100644 sound/core/sound_kunit.c
+ create mode 100644 sound/pci/hda/hda_component.c
+ create mode 100644 sound/virtio/virtio_kctl.c
+Merging ieee1394/for-next (41ebb53b1bff firewire: core: fix build failure due to the caller of fw_csr_string())
+$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git ieee1394/for-next
+Merge made by the 'ort' strategy.
+ drivers/firewire/core-device.c | 18 +++++-------------
+ 1 file changed, 5 insertions(+), 13 deletions(-)
+Merging sound-asoc/for-next (adcb38c12e9d Merge remote-tracking branch 'asoc/for-6.9' into asoc-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next
+Auto-merging sound/pci/hda/Kconfig
+Merge made by the 'ort' strategy.
+ .../ABI/testing/sysfs-bus-pci-devices-avs | 8 +
+ .../bindings/sound/atmel,asoc-wm8904.yaml | 84 +
+ .../bindings/sound/atmel,sam9x5-wm8731-audio.yaml | 76 +
+ .../bindings/sound/atmel,sama5d2-classd.yaml | 7 +-
+ .../bindings/sound/atmel-sam9x5-wm8731-audio.txt | 35 -
+ .../devicetree/bindings/sound/atmel-wm8904.txt | 55 -
+ .../bindings/sound/audio-graph-port.yaml | 2 +-
+ .../devicetree/bindings/sound/cirrus,cs35l45.yaml | 3 +
+ .../devicetree/bindings/sound/fsl,asrc.txt | 80 -
+ .../devicetree/bindings/sound/fsl,easrc.yaml | 4 +-
+ .../devicetree/bindings/sound/fsl,imx-asrc.yaml | 162 +
+ .../devicetree/bindings/sound/fsl,micfil.yaml | 14 +-
+ .../devicetree/bindings/sound/fsl,sai.yaml | 6 +
+ .../bindings/sound/infineon,peb2466.yaml | 2 +-
+ .../bindings/sound/microchip,sama7g5-i2smcc.yaml | 11 +-
+ .../devicetree/bindings/sound/qcom,sm8250.yaml | 2 +-
+ .../devicetree/bindings/sound/qcom,wcd938x.yaml | 81 +-
+ .../bindings/sound/qcom,wcd939x-sdw.yaml | 69 +
+ .../devicetree/bindings/sound/qcom,wcd939x.yaml | 96 +
+ .../bindings/sound/qcom,wcd93xx-common.yaml | 95 +
+ .../devicetree/bindings/sound/qcom,wsa8840.yaml | 11 +-
+ .../devicetree/bindings/sound/samsung,tm2.yaml | 7 +-
+ drivers/soundwire/Makefile | 2 +-
+ drivers/soundwire/amd_init.c | 235 ++
+ drivers/soundwire/amd_init.h | 13 +
+ drivers/soundwire/amd_manager.c | 47 +-
+ drivers/soundwire/amd_manager.h | 16 +-
+ drivers/soundwire/dmi-quirks.c | 8 +
+ include/linux/soundwire/sdw_amd.h | 83 +-
+ include/linux/spi/spi.h | 2 -
+ include/sound/cs-amp-lib.h | 52 +
+ include/sound/cs35l56.h | 10 +
+ include/sound/cs42l42.h | 5 +-
+ include/sound/hda-mlink.h | 2 +-
+ include/sound/hda_register.h | 2 +
+ include/sound/soc.h | 4 +-
+ include/sound/sof/dai-amd.h | 7 +
+ include/sound/sof/dai.h | 2 +
+ include/sound/tas2781.h | 1 -
+ include/uapi/sound/intel/avs/tokens.h | 9 +
+ include/uapi/sound/sof/tokens.h | 4 +
+ sound/pci/hda/Kconfig | 2 +
+ sound/pci/hda/cs35l56_hda.c | 39 +-
+ sound/pci/hda/tas2781_hda_i2c.c | 12 -
+ sound/soc/amd/Kconfig | 17 +
+ sound/soc/amd/Makefile | 2 +-
+ sound/soc/amd/acp/Kconfig | 7 +
+ sound/soc/amd/acp/Makefile | 2 +
+ sound/soc/amd/acp/acp-mach-common.c | 6 +-
+ sound/soc/amd/acp/acp-sof-mach.c | 26 +-
+ sound/soc/amd/acp/amd-sdw-acpi.c | 62 +
+ sound/soc/amd/ps/Makefile | 2 +-
+ sound/soc/amd/ps/acp63.h | 91 +-
+ sound/soc/amd/ps/pci-ps.c | 569 +--
+ sound/soc/amd/ps/ps-mach.c | 2 +-
+ sound/soc/amd/ps/ps-pdm-dma.c | 2 +-
+ sound/soc/amd/ps/ps-sdw-dma.c | 2 +-
+ sound/soc/atmel/mikroe-proto.c | 8 +-
+ sound/soc/codecs/Kconfig | 42 +-
+ sound/soc/codecs/Makefile | 11 +
+ sound/soc/codecs/cs-amp-lib.c | 263 ++
+ sound/soc/codecs/cs35l56-sdw.c | 20 +
+ sound/soc/codecs/cs35l56-shared.c | 84 +
+ sound/soc/codecs/cs35l56.c | 44 +-
+ sound/soc/codecs/cs42l42.c | 1 -
+ sound/soc/codecs/cs42l43-jack.c | 27 +-
+ sound/soc/codecs/cs42l43-sdw.c | 1 +
+ sound/soc/codecs/cs42l43.c | 82 +-
+ sound/soc/codecs/cs42l43.h | 25 +-
+ sound/soc/codecs/da7213.c | 12 +-
+ sound/soc/codecs/es8326.c | 92 +-
+ sound/soc/codecs/es8326.h | 5 +-
+ sound/soc/codecs/framer-codec.c | 413 +++
+ sound/soc/codecs/lpass-macro-common.h | 7 +
+ sound/soc/codecs/lpass-tx-macro.c | 693 +++-
+ sound/soc/codecs/lpass-va-macro.c | 57 +
+ sound/soc/codecs/max98363.c | 2 +-
+ sound/soc/codecs/max98373-sdw.c | 2 +-
+ sound/soc/codecs/nau8540.c | 112 +-
+ sound/soc/codecs/nau8540.h | 13 +-
+ sound/soc/codecs/nau8825.c | 12 +-
+ sound/soc/codecs/rt1017-sdca-sdw.c | 2 +-
+ sound/soc/codecs/rt274.c | 2 +-
+ sound/soc/codecs/rt286.c | 2 +-
+ sound/soc/codecs/rt298.c | 2 +-
+ sound/soc/codecs/rt5514-spi.c | 2 +-
+ sound/soc/codecs/rt5514.c | 9 +-
+ sound/soc/codecs/rt5616.c | 9 +-
+ sound/soc/codecs/rt5640.c | 9 +-
+ sound/soc/codecs/rt5645.c | 2 +-
+ sound/soc/codecs/rt5651.c | 2 +-
+ sound/soc/codecs/rt5659.c | 2 +-
+ sound/soc/codecs/rt5660.c | 9 +-
+ sound/soc/codecs/rt5663.c | 2 +-
+ sound/soc/codecs/rt5665.c | 2 +-
+ sound/soc/codecs/rt5668.c | 2 +-
+ sound/soc/codecs/rt5682-i2c.c | 2 +-
+ sound/soc/codecs/rt5682s.c | 2 +-
+ sound/soc/codecs/rt712-sdca-dmic.c | 2 +-
+ sound/soc/codecs/rt712-sdca-sdw.c | 2 +-
+ sound/soc/codecs/rt722-sdca-sdw.c | 2 +-
+ sound/soc/codecs/tas2781-comlib.c | 1 -
+ sound/soc/codecs/tas2781-fmwlib.c | 2 +-
+ sound/soc/codecs/wcd-clsh-v2.h | 1 +
+ sound/soc/codecs/wcd-mbhc-v2.c | 95 +-
+ sound/soc/codecs/wcd-mbhc-v2.h | 3 +
+ sound/soc/codecs/wcd939x-sdw.c | 1551 ++++++++
+ sound/soc/codecs/wcd939x.c | 3686 ++++++++++++++++++++
+ sound/soc/codecs/wcd939x.h | 989 ++++++
+ sound/soc/codecs/wm_adsp.c | 27 +-
+ sound/soc/codecs/wm_adsp.h | 2 +
+ sound/soc/codecs/wsa884x.c | 53 +-
+ sound/soc/fsl/eukrea-tlv320.c | 8 +-
+ sound/soc/fsl/fsl_sai.c | 13 +
+ sound/soc/fsl/p1022_rdk.c | 33 +-
+ sound/soc/intel/avs/Makefile | 5 +-
+ sound/soc/intel/avs/apl.c | 58 +-
+ sound/soc/intel/avs/avs.h | 70 +-
+ sound/soc/intel/avs/board_selection.c | 85 +
+ sound/soc/intel/avs/cnl.c | 61 +
+ sound/soc/intel/avs/core.c | 161 +-
+ sound/soc/intel/avs/icl.c | 197 ++
+ sound/soc/intel/avs/ipc.c | 66 +-
+ sound/soc/intel/avs/loader.c | 2 +-
+ sound/soc/intel/avs/messages.c | 1 +
+ sound/soc/intel/avs/messages.h | 38 +-
+ sound/soc/intel/avs/path.c | 33 +
+ sound/soc/intel/avs/pcm.c | 77 +-
+ sound/soc/intel/avs/registers.h | 21 +-
+ sound/soc/intel/avs/skl.c | 61 +-
+ sound/soc/intel/avs/sysfs.c | 35 +
+ sound/soc/intel/avs/tgl.c | 54 +
+ sound/soc/intel/avs/topology.c | 164 +-
+ sound/soc/intel/avs/topology.h | 13 +
+ sound/soc/intel/boards/Kconfig | 1 +
+ sound/soc/intel/boards/sof_board_helpers.c | 249 +-
+ sound/soc/intel/boards/sof_board_helpers.h | 29 +
+ sound/soc/intel/boards/sof_cs42l42.c | 232 +-
+ sound/soc/intel/boards/sof_rt5682.c | 151 +-
+ sound/soc/intel/boards/sof_sdw.c | 106 +-
+ sound/soc/intel/boards/sof_sdw_common.h | 82 +-
+ sound/soc/intel/boards/sof_sdw_cs42l42.c | 35 +-
+ sound/soc/intel/boards/sof_sdw_cs42l43.c | 25 +-
+ sound/soc/intel/boards/sof_sdw_cs_amp.c | 3 +-
+ sound/soc/intel/boards/sof_sdw_maxim.c | 4 +-
+ sound/soc/intel/boards/sof_sdw_rt5682.c | 35 +-
+ sound/soc/intel/boards/sof_sdw_rt700.c | 35 +-
+ sound/soc/intel/boards/sof_sdw_rt711.c | 19 +-
+ sound/soc/intel/boards/sof_sdw_rt712_sdca.c | 39 +-
+ sound/soc/intel/boards/sof_sdw_rt715.c | 12 +-
+ sound/soc/intel/boards/sof_sdw_rt715_sdca.c | 12 +-
+ sound/soc/intel/boards/sof_sdw_rt_amp.c | 53 +-
+ .../soc/intel/boards/sof_sdw_rt_sdca_jack_common.c | 19 +-
+ sound/soc/intel/boards/sof_ssp_common.h | 8 +
+ sound/soc/intel/common/soc-acpi-intel-adl-match.c | 12 +-
+ sound/soc/intel/common/soc-acpi-intel-jsl-match.c | 10 +-
+ sound/soc/intel/common/soc-acpi-intel-lnl-match.c | 102 +
+ sound/soc/intel/common/soc-acpi-intel-mtl-match.c | 61 +-
+ sound/soc/intel/common/soc-acpi-intel-rpl-match.c | 4 +-
+ sound/soc/intel/common/soc-acpi-intel-tgl-match.c | 6 +-
+ sound/soc/meson/aiu.c | 19 +-
+ sound/soc/meson/aiu.h | 1 -
+ sound/soc/meson/axg-fifo.c | 25 +-
+ sound/soc/meson/axg-fifo.h | 14 +-
+ sound/soc/meson/axg-frddr.c | 13 +-
+ sound/soc/meson/axg-spdifin.c | 6 +-
+ sound/soc/meson/axg-tdm-interface.c | 31 +-
+ sound/soc/meson/axg-toddr.c | 30 +-
+ sound/soc/meson/t9015.c | 20 +-
+ sound/soc/pxa/Kconfig | 3 -
+ sound/soc/qcom/common.c | 2 +-
+ sound/soc/sh/rz-ssi.c | 2 +-
+ sound/soc/soc-core.c | 11 +-
+ sound/soc/sof/amd/Kconfig | 18 +
+ sound/soc/sof/amd/acp-common.c | 65 +-
+ sound/soc/sof/amd/acp-dsp-offset.h | 10 +
+ sound/soc/sof/amd/acp-loader.c | 34 +-
+ sound/soc/sof/amd/acp.c | 232 +-
+ sound/soc/sof/amd/acp.h | 26 +-
+ sound/soc/sof/amd/pci-acp63.c | 7 +
+ sound/soc/sof/core.c | 10 +
+ sound/soc/sof/debug.c | 8 +-
+ sound/soc/sof/fw-file-profile.c | 18 +-
+ sound/soc/sof/imx/imx8.c | 16 +
+ sound/soc/sof/imx/imx8m.c | 10 +
+ sound/soc/sof/imx/imx8ulp.c | 10 +
+ sound/soc/sof/intel/hda-common-ops.c | 1 +
+ sound/soc/sof/intel/hda-dai-ops.c | 51 +-
+ sound/soc/sof/intel/hda-dai.c | 17 +-
+ sound/soc/sof/intel/hda-dsp.c | 5 +
+ sound/soc/sof/intel/hda-stream.c | 9 +
+ sound/soc/sof/intel/hda.c | 80 +-
+ sound/soc/sof/intel/hda.h | 5 +
+ sound/soc/sof/intel/lnl.c | 24 +-
+ sound/soc/sof/ipc3-loader.c | 2 +
+ sound/soc/sof/ipc3-pcm.c | 25 +
+ sound/soc/sof/ipc3-topology.c | 40 +
+ sound/soc/sof/ipc4-pcm.c | 19 +-
+ sound/soc/sof/ipc4-priv.h | 4 +
+ sound/soc/sof/ipc4-topology.c | 28 +-
+ sound/soc/sof/ops.h | 9 +
+ sound/soc/sof/sof-audio.c | 8 +-
+ sound/soc/sof/sof-audio.h | 2 +
+ sound/soc/sof/sof-priv.h | 10 +
+ sound/soc/sof/topology.c | 30 +-
+ sound/soc/ti/j721e-evm.c | 4 +-
+ sound/soc/ti/omap-hdmi.c | 10 +-
+ 207 files changed, 12245 insertions(+), 2142 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-bus-pci-devices-avs
+ create mode 100644 Documentation/devicetree/bindings/sound/atmel,asoc-wm8904.yaml
+ create mode 100644 Documentation/devicetree/bindings/sound/atmel,sam9x5-wm8731-audio.yaml
+ delete mode 100644 Documentation/devicetree/bindings/sound/atmel-sam9x5-wm8731-audio.txt
+ delete mode 100644 Documentation/devicetree/bindings/sound/atmel-wm8904.txt
+ delete mode 100644 Documentation/devicetree/bindings/sound/fsl,asrc.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/fsl,imx-asrc.yaml
+ create mode 100644 Documentation/devicetree/bindings/sound/qcom,wcd939x-sdw.yaml
+ create mode 100644 Documentation/devicetree/bindings/sound/qcom,wcd939x.yaml
+ create mode 100644 Documentation/devicetree/bindings/sound/qcom,wcd93xx-common.yaml
+ create mode 100644 drivers/soundwire/amd_init.c
+ create mode 100644 drivers/soundwire/amd_init.h
+ create mode 100644 include/sound/cs-amp-lib.h
+ create mode 100644 sound/soc/amd/acp/amd-sdw-acpi.c
+ create mode 100644 sound/soc/codecs/cs-amp-lib.c
+ create mode 100644 sound/soc/codecs/framer-codec.c
+ create mode 100644 sound/soc/codecs/wcd939x-sdw.c
+ create mode 100644 sound/soc/codecs/wcd939x.c
+ create mode 100644 sound/soc/codecs/wcd939x.h
+ create mode 100644 sound/soc/intel/avs/cnl.c
+ create mode 100644 sound/soc/intel/avs/icl.c
+ create mode 100644 sound/soc/intel/avs/sysfs.c
+ create mode 100644 sound/soc/intel/avs/tgl.c
+Merging modules/modules-next (d1909c022173 module: Don't ignore errors from set_memory_XX())
+$ git merge -m Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules/modules-next
+Auto-merging arch/powerpc/include/asm/mmu.h
+Auto-merging init/main.c
+Auto-merging kernel/module/main.c
+Merge made by the 'ort' strategy.
+ arch/powerpc/include/asm/mmu.h | 9 +-----
+ include/linux/init.h | 4 ---
+ init/main.c | 21 +++++---------
+ kernel/module/internal.h | 6 ++--
+ kernel/module/main.c | 20 +++++++++++---
+ kernel/module/strict_rwx.c | 63 +++++++++++++++++++++++++++---------------
+ lib/test_kmod.c | 6 +++-
+ 7 files changed, 73 insertions(+), 56 deletions(-)
+Merging input/next (d03f030115fe Input: gameport - make gameport_bus const)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next
+Merge made by the 'ort' strategy.
+ .../bindings/input/touchscreen/goodix,gt9916.yaml | 95 +++
+ .../bindings/input/touchscreen/goodix.yaml | 5 +-
+ .../bindings/input/touchscreen/melfas,mms114.yaml | 6 +-
+ .../bindings/input/touchscreen/silead,gsl1680.yaml | 2 +-
+ drivers/input/gameport/gameport.c | 4 +-
+ drivers/input/input-leds.c | 8 +-
+ drivers/input/input.c | 14 +-
+ drivers/input/keyboard/bcm-keypad.c | 2 +-
+ drivers/input/keyboard/matrix_keypad.c | 170 ++---
+ drivers/input/misc/88pm80x_onkey.c | 14 +-
+ drivers/input/mouse/Kconfig | 12 -
+ drivers/input/mouse/Makefile | 1 -
+ drivers/input/mouse/navpoint.c | 350 ----------
+ drivers/input/rmi4/rmi_driver.c | 6 +-
+ drivers/input/touchscreen/Kconfig | 31 +
+ drivers/input/touchscreen/Makefile | 3 +
+ drivers/input/touchscreen/goodix_berlin.h | 24 +
+ drivers/input/touchscreen/goodix_berlin_core.c | 755 +++++++++++++++++++++
+ drivers/input/touchscreen/goodix_berlin_i2c.c | 75 ++
+ drivers/input/touchscreen/goodix_berlin_spi.c | 178 +++++
+ include/linux/input/navpoint.h | 8 -
+ 21 files changed, 1246 insertions(+), 517 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/input/touchscreen/goodix,gt9916.yaml
+ delete mode 100644 drivers/input/mouse/navpoint.c
+ create mode 100644 drivers/input/touchscreen/goodix_berlin.h
+ create mode 100644 drivers/input/touchscreen/goodix_berlin_core.c
+ create mode 100644 drivers/input/touchscreen/goodix_berlin_i2c.c
+ create mode 100644 drivers/input/touchscreen/goodix_berlin_spi.c
+ delete mode 100644 include/linux/input/navpoint.h
+Merging block/for-next (eea16a07dfe4 Merge branch 'for-6.9/block' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next
+Auto-merging block/bdev.c
+Auto-merging block/blk-iocost.c
+Auto-merging block/blk-wbt.c
+Auto-merging block/blk.h
+CONFLICT (content): Merge conflict in block/blk.h
+Auto-merging block/genhd.c
+Auto-merging drivers/block/pktcdvd.c
+Auto-merging drivers/block/sunvdc.c
+Auto-merging drivers/block/virtio_blk.c
+Auto-merging drivers/block/zram/zram_drv.c
+Auto-merging drivers/md/bcache/super.c
+Auto-merging drivers/md/dm.c
+Auto-merging drivers/md/md.c
+Auto-merging drivers/md/raid5.c
+Auto-merging drivers/mtd/ubi/block.c
+Auto-merging drivers/nvdimm/pmem.c
+Auto-merging drivers/nvme/host/core.c
+Auto-merging drivers/nvme/host/nvme.h
+Auto-merging drivers/s390/block/dasd.c
+Auto-merging drivers/s390/block/dasd_genhd.c
+Auto-merging drivers/s390/block/dasd_int.h
+Auto-merging drivers/s390/block/dasd_ioctl.c
+Auto-merging drivers/s390/block/dcssblk.c
+Auto-merging drivers/ufs/core/ufshcd.c
+Auto-merging fs/btrfs/zoned.c
+Auto-merging fs/f2fs/segment.c
+Auto-merging fs/internal.h
+Auto-merging fs/open.c
+Auto-merging fs/zonefs/super.c
+Auto-merging include/linux/blkdev.h
+Auto-merging include/linux/sched.h
+CONFLICT (content): Merge conflict in include/linux/sched.h
+Auto-merging io_uring/net.c
+Auto-merging kernel/sched/core.c
+Resolved 'block/blk.h' using previous resolution.
+Resolved 'include/linux/sched.h' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master c581f90d3ce8] Merge branch 'for-next' of git://git.kernel.dk/linux-block.git
+$ git diff -M --stat --summary HEAD^..
+ arch/m68k/emu/nfblock.c | 10 +-
+ arch/um/drivers/ubd_kern.c | 135 +++-----
+ arch/xtensa/platforms/iss/simdisk.c | 8 +-
+ block/bdev.c | 2 +-
+ block/bfq-cgroup.c | 14 +-
+ block/bfq-iosched.c | 28 +-
+ block/bio-integrity.c | 1 +
+ block/bio.c | 38 +--
+ block/blk-cgroup.c | 2 +-
+ block/blk-cgroup.h | 1 +
+ block/blk-core.c | 33 +-
+ block/blk-flush.c | 2 +-
+ block/blk-integrity.c | 1 +
+ block/blk-iocost.c | 8 +-
+ block/blk-iolatency.c | 6 +-
+ block/blk-lib.c | 70 +++--
+ block/blk-mq.c | 172 +++++-----
+ block/blk-settings.c | 282 ++++++++++++++---
+ block/blk-sysfs.c | 59 ++--
+ block/blk-throttle.c | 10 +-
+ block/blk-wbt.c | 6 +-
+ block/blk-zoned.c | 20 +-
+ block/blk.h | 85 ++++-
+ block/bsg-lib.c | 2 +-
+ block/genhd.c | 12 +-
+ block/holder.c | 12 +-
+ block/t10-pi.c | 72 +++--
+ drivers/block/amiflop.c | 2 +-
+ drivers/block/aoe/aoeblk.c | 15 +-
+ drivers/block/ataflop.c | 2 +-
+ drivers/block/brd.c | 26 +-
+ drivers/block/drbd/drbd_main.c | 6 +-
+ drivers/block/drbd/drbd_state.c | 24 +-
+ drivers/block/drbd/drbd_state_change.h | 8 +-
+ drivers/block/floppy.c | 17 +-
+ drivers/block/loop.c | 75 ++---
+ drivers/block/mtip32xx/mtip32xx.c | 13 +-
+ drivers/block/n64cart.c | 12 +-
+ drivers/block/nbd.c | 19 +-
+ drivers/block/null_blk/main.c | 551 +++++++++------------------------
+ drivers/block/null_blk/null_blk.h | 24 +-
+ drivers/block/null_blk/trace.h | 5 +-
+ drivers/block/null_blk/zoned.c | 25 +-
+ drivers/block/pktcdvd.c | 30 +-
+ drivers/block/ps3disk.c | 17 +-
+ drivers/block/ps3vram.c | 6 +-
+ drivers/block/rbd.c | 31 +-
+ drivers/block/rnbd/rnbd-clt.c | 64 ++--
+ drivers/block/sunvdc.c | 18 +-
+ drivers/block/swim.c | 2 +-
+ drivers/block/swim3.c | 2 +-
+ drivers/block/ublk_drv.c | 90 +++---
+ drivers/block/virtio_blk.c | 443 +++++++++++++-------------
+ drivers/block/xen-blkfront.c | 53 ++--
+ drivers/block/z2ram.c | 2 +-
+ drivers/block/zram/zram_drv.c | 51 ++-
+ drivers/cdrom/gdrom.c | 14 +-
+ drivers/md/bcache/super.c | 48 +--
+ drivers/md/dm-zoned-metadata.c | 5 +-
+ drivers/md/dm.c | 4 +-
+ drivers/md/md-linear.h | 17 -
+ drivers/md/md-multipath.h | 32 --
+ drivers/md/md.c | 55 ++--
+ drivers/md/raid5.c | 6 +-
+ drivers/memstick/core/ms_block.c | 14 +-
+ drivers/memstick/core/mspro_block.c | 15 +-
+ drivers/mmc/core/queue.c | 105 ++++---
+ drivers/mtd/mtd_blkdevs.c | 12 +-
+ drivers/mtd/ubi/block.c | 6 +-
+ drivers/nvdimm/btt.c | 14 +-
+ drivers/nvdimm/pmem.c | 14 +-
+ drivers/nvme/host/apple.c | 2 +-
+ drivers/nvme/host/core.c | 16 +-
+ drivers/nvme/host/multipath.c | 6 +-
+ drivers/nvme/host/nvme.h | 1 +
+ drivers/nvme/target/zns.c | 5 +-
+ drivers/s390/block/dasd.c | 106 +++----
+ drivers/s390/block/dasd_3990_erp.c | 80 ++---
+ drivers/s390/block/dasd_alias.c | 8 -
+ drivers/s390/block/dasd_devmap.c | 34 +-
+ drivers/s390/block/dasd_diag.c | 4 -
+ drivers/s390/block/dasd_eckd.c | 157 ++++------
+ drivers/s390/block/dasd_eer.c | 7 -
+ drivers/s390/block/dasd_erp.c | 9 +-
+ drivers/s390/block/dasd_fba.c | 55 ++--
+ drivers/s390/block/dasd_genhd.c | 7 +-
+ drivers/s390/block/dasd_int.h | 29 --
+ drivers/s390/block/dasd_ioctl.c | 6 -
+ drivers/s390/block/dasd_proc.c | 5 -
+ drivers/s390/block/dcssblk.c | 10 +-
+ drivers/s390/block/scm_blk.c | 17 +-
+ drivers/scsi/scsi_scan.c | 2 +-
+ drivers/ufs/core/ufshcd.c | 2 +-
+ fs/btrfs/zoned.c | 35 ++-
+ fs/f2fs/segment.c | 15 +-
+ fs/internal.h | 1 +
+ fs/open.c | 65 ++--
+ fs/zonefs/super.c | 2 +-
+ include/linux/blk-integrity.h | 1 +
+ include/linux/blk-mq.h | 10 +-
+ include/linux/blk_types.h | 42 ---
+ include/linux/blkdev.h | 66 +++-
+ include/linux/io_uring_types.h | 133 +++++---
+ include/linux/sched.h | 2 +-
+ include/linux/sched/topology.h | 6 +
+ include/trace/events/io_uring.h | 30 +-
+ include/uapi/linux/io_uring.h | 13 +
+ io_uring/Makefile | 3 +-
+ io_uring/cancel.c | 3 +-
+ io_uring/cancel.h | 10 +
+ io_uring/filetable.h | 2 +-
+ io_uring/io_uring.c | 229 +++++++-------
+ io_uring/io_uring.h | 77 ++++-
+ io_uring/kbuf.c | 26 +-
+ io_uring/kbuf.h | 41 ++-
+ io_uring/napi.c | 332 ++++++++++++++++++++
+ io_uring/napi.h | 104 +++++++
+ io_uring/net.c | 302 ++++++++++--------
+ io_uring/opdef.c | 10 +
+ io_uring/poll.c | 14 +-
+ io_uring/register.c | 13 +
+ io_uring/rsrc.h | 2 -
+ io_uring/rw.c | 9 +-
+ io_uring/sqpoll.c | 42 ++-
+ io_uring/truncate.c | 48 +++
+ io_uring/truncate.h | 4 +
+ io_uring/uring_cmd.c | 1 +
+ io_uring/xattr.c | 2 +-
+ kernel/sched/core.c | 17 +-
+ 129 files changed, 2947 insertions(+), 2418 deletions(-)
+ delete mode 100644 drivers/md/md-linear.h
+ delete mode 100644 drivers/md/md-multipath.h
+ create mode 100644 io_uring/napi.c
+ create mode 100644 io_uring/napi.h
+ create mode 100644 io_uring/truncate.c
+ create mode 100644 io_uring/truncate.h
+Merging device-mapper/for-next (6006301c6a83 Merge branch 'dm-6.8' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git device-mapper/for-next
+Auto-merging MAINTAINERS
+Auto-merging drivers/md/Kconfig
+Auto-merging drivers/md/dm.c
+Auto-merging init/Kconfig
+Auto-merging init/main.c
+Merge made by the 'ort' strategy.
+ Documentation/admin-guide/device-mapper/index.rst | 2 +
+ .../admin-guide/device-mapper/vdo-design.rst | 633 +++
+ Documentation/admin-guide/device-mapper/vdo.rst | 388 ++
+ Documentation/core-api/workqueue.rst | 43 +-
+ MAINTAINERS | 8 +
+ drivers/md/Kconfig | 2 +
+ drivers/md/Makefile | 1 +
+ drivers/md/dm-bio-prison-v1.c | 2 +-
+ drivers/md/dm-bufio.c | 74 +-
+ drivers/md/dm-cache-policy-smq.c | 2 +-
+ drivers/md/dm-crypt.c | 8 +-
+ drivers/md/dm-dust.c | 2 +-
+ drivers/md/dm-ebs-target.c | 2 +-
+ drivers/md/dm-flakey.c | 2 +-
+ drivers/md/dm-integrity.c | 12 +-
+ drivers/md/dm-io.c | 23 +-
+ drivers/md/dm-ioctl.c | 2 +-
+ drivers/md/dm-kcopyd.c | 4 +-
+ drivers/md/dm-log-userspace-base.c | 2 +-
+ drivers/md/dm-log.c | 6 +-
+ drivers/md/dm-mpath.c | 2 +-
+ drivers/md/dm-ps-round-robin.c | 2 +-
+ drivers/md/dm-raid.c | 4 +-
+ drivers/md/dm-raid1.c | 6 +-
+ drivers/md/dm-region-hash.c | 2 +-
+ drivers/md/dm-snap-persistent.c | 4 +-
+ drivers/md/dm-thin.c | 22 +-
+ drivers/md/dm-vdo/Kconfig | 17 +
+ drivers/md/dm-vdo/Makefile | 55 +
+ drivers/md/dm-vdo/action-manager.c | 388 ++
+ drivers/md/dm-vdo/action-manager.h | 110 +
+ drivers/md/dm-vdo/admin-state.c | 506 ++
+ drivers/md/dm-vdo/admin-state.h | 178 +
+ drivers/md/dm-vdo/block-map.c | 3320 +++++++++++++
+ drivers/md/dm-vdo/block-map.h | 394 ++
+ drivers/md/dm-vdo/completion.c | 140 +
+ drivers/md/dm-vdo/completion.h | 152 +
+ drivers/md/dm-vdo/constants.h | 96 +
+ drivers/md/dm-vdo/cpu.h | 59 +
+ drivers/md/dm-vdo/data-vio.c | 2065 ++++++++
+ drivers/md/dm-vdo/data-vio.h | 669 +++
+ drivers/md/dm-vdo/dedupe.c | 3007 ++++++++++++
+ drivers/md/dm-vdo/dedupe.h | 120 +
+ drivers/md/dm-vdo/dm-vdo-target.c | 2924 +++++++++++
+ drivers/md/dm-vdo/dump.c | 278 ++
+ drivers/md/dm-vdo/dump.h | 17 +
+ drivers/md/dm-vdo/encodings.c | 1485 ++++++
+ drivers/md/dm-vdo/encodings.h | 1299 +++++
+ drivers/md/dm-vdo/errors.c | 313 ++
+ drivers/md/dm-vdo/errors.h | 80 +
+ drivers/md/dm-vdo/flush.c | 560 +++
+ drivers/md/dm-vdo/flush.h | 44 +
+ drivers/md/dm-vdo/funnel-queue.c | 171 +
+ drivers/md/dm-vdo/funnel-queue.h | 110 +
+ drivers/md/dm-vdo/funnel-workqueue.c | 638 +++
+ drivers/md/dm-vdo/funnel-workqueue.h | 51 +
+ drivers/md/dm-vdo/indexer/chapter-index.c | 292 ++
+ drivers/md/dm-vdo/indexer/chapter-index.h | 61 +
+ drivers/md/dm-vdo/indexer/config.c | 378 ++
+ drivers/md/dm-vdo/indexer/config.h | 124 +
+ drivers/md/dm-vdo/indexer/delta-index.c | 1988 ++++++++
+ drivers/md/dm-vdo/indexer/delta-index.h | 278 ++
+ drivers/md/dm-vdo/indexer/funnel-requestqueue.c | 279 ++
+ drivers/md/dm-vdo/indexer/funnel-requestqueue.h | 31 +
+ drivers/md/dm-vdo/indexer/geometry.c | 201 +
+ drivers/md/dm-vdo/indexer/geometry.h | 140 +
+ drivers/md/dm-vdo/indexer/hash-utils.h | 66 +
+ drivers/md/dm-vdo/indexer/index-layout.c | 1769 +++++++
+ drivers/md/dm-vdo/indexer/index-layout.h | 43 +
+ drivers/md/dm-vdo/indexer/index-page-map.c | 175 +
+ drivers/md/dm-vdo/indexer/index-page-map.h | 50 +
+ drivers/md/dm-vdo/indexer/index-session.c | 728 +++
+ drivers/md/dm-vdo/indexer/index-session.h | 85 +
+ drivers/md/dm-vdo/indexer/index.c | 1397 ++++++
+ drivers/md/dm-vdo/indexer/index.h | 83 +
+ drivers/md/dm-vdo/indexer/indexer.h | 353 ++
+ drivers/md/dm-vdo/indexer/io-factory.c | 415 ++
+ drivers/md/dm-vdo/indexer/io-factory.h | 64 +
+ drivers/md/dm-vdo/indexer/murmurhash3.c | 175 +
+ drivers/md/dm-vdo/indexer/murmurhash3.h | 15 +
+ drivers/md/dm-vdo/indexer/open-chapter.c | 428 ++
+ drivers/md/dm-vdo/indexer/open-chapter.h | 79 +
+ drivers/md/dm-vdo/indexer/radix-sort.c | 332 ++
+ drivers/md/dm-vdo/indexer/radix-sort.h | 26 +
+ drivers/md/dm-vdo/indexer/sparse-cache.c | 626 +++
+ drivers/md/dm-vdo/indexer/sparse-cache.h | 46 +
+ drivers/md/dm-vdo/indexer/volume-index.c | 1281 +++++
+ drivers/md/dm-vdo/indexer/volume-index.h | 193 +
+ drivers/md/dm-vdo/indexer/volume.c | 1695 +++++++
+ drivers/md/dm-vdo/indexer/volume.h | 173 +
+ drivers/md/dm-vdo/int-map.c | 709 +++
+ drivers/md/dm-vdo/int-map.h | 39 +
+ drivers/md/dm-vdo/io-submitter.c | 477 ++
+ drivers/md/dm-vdo/io-submitter.h | 47 +
+ drivers/md/dm-vdo/logger.c | 239 +
+ drivers/md/dm-vdo/logger.h | 101 +
+ drivers/md/dm-vdo/logical-zone.c | 375 ++
+ drivers/md/dm-vdo/logical-zone.h | 89 +
+ drivers/md/dm-vdo/memory-alloc.c | 438 ++
+ drivers/md/dm-vdo/memory-alloc.h | 162 +
+ drivers/md/dm-vdo/message-stats.c | 772 +++
+ drivers/md/dm-vdo/message-stats.h | 13 +
+ drivers/md/dm-vdo/numeric.h | 78 +
+ drivers/md/dm-vdo/packer.c | 784 +++
+ drivers/md/dm-vdo/packer.h | 122 +
+ drivers/md/dm-vdo/permassert.c | 26 +
+ drivers/md/dm-vdo/permassert.h | 49 +
+ drivers/md/dm-vdo/physical-zone.c | 646 +++
+ drivers/md/dm-vdo/physical-zone.h | 115 +
+ drivers/md/dm-vdo/priority-table.c | 226 +
+ drivers/md/dm-vdo/priority-table.h | 47 +
+ drivers/md/dm-vdo/recovery-journal.c | 1764 +++++++
+ drivers/md/dm-vdo/recovery-journal.h | 316 ++
+ drivers/md/dm-vdo/repair.c | 1756 +++++++
+ drivers/md/dm-vdo/repair.h | 14 +
+ drivers/md/dm-vdo/slab-depot.c | 5095 ++++++++++++++++++++
+ drivers/md/dm-vdo/slab-depot.h | 601 +++
+ drivers/md/dm-vdo/statistics.h | 278 ++
+ drivers/md/dm-vdo/status-codes.c | 123 +
+ drivers/md/dm-vdo/status-codes.h | 110 +
+ drivers/md/dm-vdo/string-utils.c | 22 +
+ drivers/md/dm-vdo/string-utils.h | 23 +
+ drivers/md/dm-vdo/thread-device.c | 34 +
+ drivers/md/dm-vdo/thread-device.h | 20 +
+ drivers/md/dm-vdo/thread-registry.c | 93 +
+ drivers/md/dm-vdo/thread-registry.h | 32 +
+ drivers/md/dm-vdo/thread-utils.c | 136 +
+ drivers/md/dm-vdo/thread-utils.h | 21 +
+ drivers/md/dm-vdo/time-utils.h | 28 +
+ drivers/md/dm-vdo/types.h | 393 ++
+ drivers/md/dm-vdo/vdo.c | 1732 +++++++
+ drivers/md/dm-vdo/vdo.h | 366 ++
+ drivers/md/dm-vdo/vio.c | 501 ++
+ drivers/md/dm-vdo/vio.h | 199 +
+ drivers/md/dm-vdo/wait-queue.c | 205 +
+ drivers/md/dm-vdo/wait-queue.h | 138 +
+ drivers/md/dm-verity-fec.c | 21 +-
+ drivers/md/dm-verity-target.c | 87 +-
+ drivers/md/dm-verity.h | 5 +-
+ drivers/md/dm-writecache.c | 10 +-
+ drivers/md/dm.c | 2 +-
+ drivers/md/persistent-data/dm-block-manager.c | 2 +-
+ include/linux/async.h | 1 +
+ include/linux/dm-bufio.h | 7 +
+ include/linux/dm-io.h | 3 +-
+ include/linux/workqueue.h | 137 +-
+ init/Kconfig | 2 +-
+ init/main.c | 1 +
+ kernel/async.c | 17 +-
+ kernel/softirq.c | 3 +
+ kernel/workqueue.c | 1742 +++++--
+ rust/kernel/workqueue.rs | 6 +-
+ tools/workqueue/wq_dump.py | 104 +-
+ 153 files changed, 55657 insertions(+), 622 deletions(-)
+ create mode 100644 Documentation/admin-guide/device-mapper/vdo-design.rst
+ create mode 100644 Documentation/admin-guide/device-mapper/vdo.rst
+ create mode 100644 drivers/md/dm-vdo/Kconfig
+ create mode 100644 drivers/md/dm-vdo/Makefile
+ create mode 100644 drivers/md/dm-vdo/action-manager.c
+ create mode 100644 drivers/md/dm-vdo/action-manager.h
+ create mode 100644 drivers/md/dm-vdo/admin-state.c
+ create mode 100644 drivers/md/dm-vdo/admin-state.h
+ create mode 100644 drivers/md/dm-vdo/block-map.c
+ create mode 100644 drivers/md/dm-vdo/block-map.h
+ create mode 100644 drivers/md/dm-vdo/completion.c
+ create mode 100644 drivers/md/dm-vdo/completion.h
+ create mode 100644 drivers/md/dm-vdo/constants.h
+ create mode 100644 drivers/md/dm-vdo/cpu.h
+ create mode 100644 drivers/md/dm-vdo/data-vio.c
+ create mode 100644 drivers/md/dm-vdo/data-vio.h
+ create mode 100644 drivers/md/dm-vdo/dedupe.c
+ create mode 100644 drivers/md/dm-vdo/dedupe.h
+ create mode 100644 drivers/md/dm-vdo/dm-vdo-target.c
+ create mode 100644 drivers/md/dm-vdo/dump.c
+ create mode 100644 drivers/md/dm-vdo/dump.h
+ create mode 100644 drivers/md/dm-vdo/encodings.c
+ create mode 100644 drivers/md/dm-vdo/encodings.h
+ create mode 100644 drivers/md/dm-vdo/errors.c
+ create mode 100644 drivers/md/dm-vdo/errors.h
+ create mode 100644 drivers/md/dm-vdo/flush.c
+ create mode 100644 drivers/md/dm-vdo/flush.h
+ create mode 100644 drivers/md/dm-vdo/funnel-queue.c
+ create mode 100644 drivers/md/dm-vdo/funnel-queue.h
+ create mode 100644 drivers/md/dm-vdo/funnel-workqueue.c
+ create mode 100644 drivers/md/dm-vdo/funnel-workqueue.h
+ create mode 100644 drivers/md/dm-vdo/indexer/chapter-index.c
+ create mode 100644 drivers/md/dm-vdo/indexer/chapter-index.h
+ create mode 100644 drivers/md/dm-vdo/indexer/config.c
+ create mode 100644 drivers/md/dm-vdo/indexer/config.h
+ create mode 100644 drivers/md/dm-vdo/indexer/delta-index.c
+ create mode 100644 drivers/md/dm-vdo/indexer/delta-index.h
+ create mode 100644 drivers/md/dm-vdo/indexer/funnel-requestqueue.c
+ create mode 100644 drivers/md/dm-vdo/indexer/funnel-requestqueue.h
+ create mode 100644 drivers/md/dm-vdo/indexer/geometry.c
+ create mode 100644 drivers/md/dm-vdo/indexer/geometry.h
+ create mode 100644 drivers/md/dm-vdo/indexer/hash-utils.h
+ create mode 100644 drivers/md/dm-vdo/indexer/index-layout.c
+ create mode 100644 drivers/md/dm-vdo/indexer/index-layout.h
+ create mode 100644 drivers/md/dm-vdo/indexer/index-page-map.c
+ create mode 100644 drivers/md/dm-vdo/indexer/index-page-map.h
+ create mode 100644 drivers/md/dm-vdo/indexer/index-session.c
+ create mode 100644 drivers/md/dm-vdo/indexer/index-session.h
+ create mode 100644 drivers/md/dm-vdo/indexer/index.c
+ create mode 100644 drivers/md/dm-vdo/indexer/index.h
+ create mode 100644 drivers/md/dm-vdo/indexer/indexer.h
+ create mode 100644 drivers/md/dm-vdo/indexer/io-factory.c
+ create mode 100644 drivers/md/dm-vdo/indexer/io-factory.h
+ create mode 100644 drivers/md/dm-vdo/indexer/murmurhash3.c
+ create mode 100644 drivers/md/dm-vdo/indexer/murmurhash3.h
+ create mode 100644 drivers/md/dm-vdo/indexer/open-chapter.c
+ create mode 100644 drivers/md/dm-vdo/indexer/open-chapter.h
+ create mode 100644 drivers/md/dm-vdo/indexer/radix-sort.c
+ create mode 100644 drivers/md/dm-vdo/indexer/radix-sort.h
+ create mode 100644 drivers/md/dm-vdo/indexer/sparse-cache.c
+ create mode 100644 drivers/md/dm-vdo/indexer/sparse-cache.h
+ create mode 100644 drivers/md/dm-vdo/indexer/volume-index.c
+ create mode 100644 drivers/md/dm-vdo/indexer/volume-index.h
+ create mode 100644 drivers/md/dm-vdo/indexer/volume.c
+ create mode 100644 drivers/md/dm-vdo/indexer/volume.h
+ create mode 100644 drivers/md/dm-vdo/int-map.c
+ create mode 100644 drivers/md/dm-vdo/int-map.h
+ create mode 100644 drivers/md/dm-vdo/io-submitter.c
+ create mode 100644 drivers/md/dm-vdo/io-submitter.h
+ create mode 100644 drivers/md/dm-vdo/logger.c
+ create mode 100644 drivers/md/dm-vdo/logger.h
+ create mode 100644 drivers/md/dm-vdo/logical-zone.c
+ create mode 100644 drivers/md/dm-vdo/logical-zone.h
+ create mode 100644 drivers/md/dm-vdo/memory-alloc.c
+ create mode 100644 drivers/md/dm-vdo/memory-alloc.h
+ create mode 100644 drivers/md/dm-vdo/message-stats.c
+ create mode 100644 drivers/md/dm-vdo/message-stats.h
+ create mode 100644 drivers/md/dm-vdo/numeric.h
+ create mode 100644 drivers/md/dm-vdo/packer.c
+ create mode 100644 drivers/md/dm-vdo/packer.h
+ create mode 100644 drivers/md/dm-vdo/permassert.c
+ create mode 100644 drivers/md/dm-vdo/permassert.h
+ create mode 100644 drivers/md/dm-vdo/physical-zone.c
+ create mode 100644 drivers/md/dm-vdo/physical-zone.h
+ create mode 100644 drivers/md/dm-vdo/priority-table.c
+ create mode 100644 drivers/md/dm-vdo/priority-table.h
+ create mode 100644 drivers/md/dm-vdo/recovery-journal.c
+ create mode 100644 drivers/md/dm-vdo/recovery-journal.h
+ create mode 100644 drivers/md/dm-vdo/repair.c
+ create mode 100644 drivers/md/dm-vdo/repair.h
+ create mode 100644 drivers/md/dm-vdo/slab-depot.c
+ create mode 100644 drivers/md/dm-vdo/slab-depot.h
+ create mode 100644 drivers/md/dm-vdo/statistics.h
+ create mode 100644 drivers/md/dm-vdo/status-codes.c
+ create mode 100644 drivers/md/dm-vdo/status-codes.h
+ create mode 100644 drivers/md/dm-vdo/string-utils.c
+ create mode 100644 drivers/md/dm-vdo/string-utils.h
+ create mode 100644 drivers/md/dm-vdo/thread-device.c
+ create mode 100644 drivers/md/dm-vdo/thread-device.h
+ create mode 100644 drivers/md/dm-vdo/thread-registry.c
+ create mode 100644 drivers/md/dm-vdo/thread-registry.h
+ create mode 100644 drivers/md/dm-vdo/thread-utils.c
+ create mode 100644 drivers/md/dm-vdo/thread-utils.h
+ create mode 100644 drivers/md/dm-vdo/time-utils.h
+ create mode 100644 drivers/md/dm-vdo/types.h
+ create mode 100644 drivers/md/dm-vdo/vdo.c
+ create mode 100644 drivers/md/dm-vdo/vdo.h
+ create mode 100644 drivers/md/dm-vdo/vio.c
+ create mode 100644 drivers/md/dm-vdo/vio.h
+ create mode 100644 drivers/md/dm-vdo/wait-queue.c
+ create mode 100644 drivers/md/dm-vdo/wait-queue.h
+Merging libata/for-next (c1bc6ed01c16 Merge remote-tracking branch 'libata/for-6.9' into HEAD)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux libata/for-next
+Merge made by the 'ort' strategy.
+ Documentation/devicetree/bindings/ata/ahci-mtk.txt | 51 ---
+ .../devicetree/bindings/ata/atmel-at91_cf.txt | 19 -
+ .../devicetree/bindings/ata/mediatek,mtk-ahci.yaml | 98 +++++
+ drivers/ata/Kconfig | 5 +-
+ drivers/ata/ahci.c | 438 ++++++++++-----------
+ drivers/ata/ahci.h | 10 +-
+ drivers/ata/libahci.c | 21 +-
+ drivers/ata/pata_parport/pata_parport.c | 2 +-
+ 8 files changed, 331 insertions(+), 313 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/ata/ahci-mtk.txt
+ delete mode 100644 Documentation/devicetree/bindings/ata/atmel-at91_cf.txt
+ create mode 100644 Documentation/devicetree/bindings/ata/mediatek,mtk-ahci.yaml
+Merging pcmcia/pcmcia-next (1bec7691b327 pcmcia: ds: make pcmcia_bus_type const)
+$ git merge -m Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git pcmcia/pcmcia-next
+Merge made by the 'ort' strategy.
+ drivers/pcmcia/cs_internal.h | 2 +-
+ drivers/pcmcia/ds.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+Merging mmc/next (25e69172db8a mmc: davinci_mmc: Drop dangling variable)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next
+Auto-merging MAINTAINERS
+Auto-merging drivers/mmc/core/queue.c
+CONFLICT (content): Merge conflict in drivers/mmc/core/queue.c
+Resolved 'drivers/mmc/core/queue.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 135788074a6e] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/mmc/fsl-imx-esdhc.yaml | 6 +-
+ .../devicetree/bindings/mmc/renesas,sdhi.yaml | 1 +
+ MAINTAINERS | 4 +-
+ drivers/memstick/core/memstick.c | 2 +-
+ drivers/mmc/core/block.c | 14 +--
+ drivers/mmc/core/bus.c | 2 +-
+ drivers/mmc/core/host.c | 5 +-
+ drivers/mmc/core/queue.c | 3 -
+ drivers/mmc/core/sdio_bus.c | 2 +-
+ drivers/mmc/host/davinci_mmc.c | 59 ++++++------
+ drivers/mmc/host/moxart-mmc.c | 90 +++++++++---------
+ drivers/mmc/host/mvsdio.c | 71 ++++++++++----
+ drivers/mmc/host/mxcmmc.c | 53 +++++++----
+ drivers/mmc/host/omap.c | 53 +++++------
+ drivers/mmc/host/renesas_sdhi.h | 3 +-
+ drivers/mmc/host/sdhci-esdhc-mcf.c | 12 ++-
+ drivers/mmc/host/sh_mmcif.c | 102 +++++++++++++--------
+ drivers/mmc/host/wbsd.c | 2 -
+ 18 files changed, 272 insertions(+), 212 deletions(-)
+Merging mfd/for-mfd-next (ec0131916367 dt-bindings: mfd: Convert atmel-flexcom to json-schema)
+$ git merge -m Merge branch 'for-mfd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd/for-mfd-next
+Auto-merging MAINTAINERS
+Auto-merging drivers/spi/spi-cs42l43.c
+Auto-merging drivers/watchdog/Kconfig
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/input/da9062-onkey.txt | 47 ----
+ .../bindings/input/dlg,da9062-onkey.yaml | 38 ++++
+ .../devicetree/bindings/mfd/atmel,hlcdc.yaml | 99 ++++++++
+ .../bindings/mfd/atmel,sama5d2-flexcom.yaml | 99 ++++++++
+ .../devicetree/bindings/mfd/atmel-flexcom.txt | 64 ------
+ .../devicetree/bindings/mfd/atmel-hlcdc.txt | 56 -----
+ Documentation/devicetree/bindings/mfd/da9062.txt | 124 ----------
+ .../devicetree/bindings/mfd/dlg,da9063.yaml | 250 ++++++++++++++++++---
+ .../devicetree/bindings/mfd/google,cros-ec.yaml | 7 +
+ Documentation/devicetree/bindings/mfd/iqs62x.yaml | 2 +-
+ .../devicetree/bindings/mfd/qcom,tcsr.yaml | 2 +
+ Documentation/devicetree/bindings/mfd/syscon.yaml | 2 +
+ Documentation/devicetree/bindings/mfd/ti,twl.yaml | 2 +
+ .../devicetree/bindings/thermal/da9062-thermal.txt | 36 ---
+ .../bindings/thermal/dlg,da9062-thermal.yaml | 35 +++
+ MAINTAINERS | 12 +-
+ drivers/mfd/Kconfig | 1 +
+ drivers/mfd/ac100.c | 2 +-
+ drivers/mfd/altera-sysmgr.c | 4 +-
+ drivers/mfd/as3711.c | 2 +-
+ drivers/mfd/as3722.c | 2 +-
+ drivers/mfd/axp20x.c | 4 +-
+ drivers/mfd/bcm590xx.c | 4 +-
+ drivers/mfd/bd9571mwv.c | 4 +-
+ drivers/mfd/cros_ec_dev.c | 18 ++
+ drivers/mfd/cs42l43-i2c.c | 15 +-
+ drivers/mfd/cs42l43-sdw.c | 15 +-
+ drivers/mfd/cs42l43.c | 52 +++--
+ drivers/mfd/cs42l43.h | 10 +-
+ drivers/mfd/da9052-core.c | 2 +-
+ drivers/mfd/da9055-core.c | 2 +-
+ drivers/mfd/da9062-core.c | 4 +-
+ drivers/mfd/da9063-i2c.c | 2 +-
+ drivers/mfd/da9150-core.c | 2 +-
+ drivers/mfd/intel-lpss-pci.c | 28 ++-
+ drivers/mfd/intel-lpss.c | 9 +-
+ drivers/mfd/intel-lpss.h | 14 +-
+ drivers/mfd/kempld-core.c | 37 ---
+ drivers/mfd/khadas-mcu.c | 2 +-
+ drivers/mfd/lochnagar-i2c.c | 4 +-
+ drivers/mfd/lpc_ich.c | 3 +-
+ drivers/mfd/mc13xxx-core.c | 22 +-
+ drivers/mfd/mcp-core.c | 2 +-
+ drivers/mfd/mfd-core.c | 2 +-
+ drivers/mfd/omap-usb-host.c | 2 +-
+ drivers/mfd/rave-sp.c | 2 +-
+ drivers/mfd/rc5t583.c | 2 +-
+ drivers/mfd/rk8xx-core.c | 2 +-
+ drivers/mfd/rk8xx-spi.c | 2 +-
+ drivers/mfd/rn5t618.c | 2 +-
+ drivers/mfd/rohm-bd71828.c | 4 +-
+ drivers/mfd/rohm-bd718x7.c | 2 +-
+ drivers/mfd/rohm-bd9576.c | 2 +-
+ drivers/mfd/rsmu_i2c.c | 2 +-
+ drivers/mfd/si476x-prop.c | 2 +-
+ drivers/mfd/stmfx.c | 2 +-
+ drivers/mfd/stpmic1.c | 2 +-
+ drivers/mfd/syscon.c | 4 +-
+ drivers/mfd/twl-core.c | 28 +++
+ drivers/mfd/twl4030-power.c | 3 +
+ drivers/mfd/wm5102-tables.c | 2 +-
+ drivers/mfd/wm5110-tables.c | 2 +-
+ drivers/mfd/wm831x-auxadc.c | 43 ++--
+ drivers/mfd/wm8350-regmap.c | 2 +-
+ drivers/mfd/wm8400-core.c | 2 +-
+ drivers/mfd/wm97xx-core.c | 6 +-
+ drivers/spi/spi-cs42l43.c | 2 +
+ drivers/watchdog/Kconfig | 11 +
+ drivers/watchdog/Makefile | 1 +
+ drivers/watchdog/cros_ec_wdt.c | 204 +++++++++++++++++
+ include/linux/mfd/cs42l43.h | 19 +-
+ include/linux/mfd/sun4i-gpadc.h | 4 +-
+ include/linux/mfd/syscon.h | 25 +--
+ include/linux/mfd/twl.h | 1 +
+ include/linux/platform_data/cros_ec_commands.h | 78 +++----
+ 75 files changed, 1007 insertions(+), 601 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/input/da9062-onkey.txt
+ create mode 100644 Documentation/devicetree/bindings/input/dlg,da9062-onkey.yaml
+ create mode 100644 Documentation/devicetree/bindings/mfd/atmel,hlcdc.yaml
+ create mode 100644 Documentation/devicetree/bindings/mfd/atmel,sama5d2-flexcom.yaml
+ delete mode 100644 Documentation/devicetree/bindings/mfd/atmel-flexcom.txt
+ delete mode 100644 Documentation/devicetree/bindings/mfd/atmel-hlcdc.txt
+ delete mode 100644 Documentation/devicetree/bindings/mfd/da9062.txt
+ delete mode 100644 Documentation/devicetree/bindings/thermal/da9062-thermal.txt
+ create mode 100644 Documentation/devicetree/bindings/thermal/dlg,da9062-thermal.yaml
+ create mode 100644 drivers/watchdog/cros_ec_wdt.c
+Merging backlight/for-backlight-next (3c40590fafd4 backlight: lm3630a: Use backlight_get_brightness helper in update_status)
+$ git merge -m Merge branch 'for-backlight-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight/for-backlight-next
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ .../bindings/leds/backlight/kinetic,ktd2801.yaml | 46 ++++++++
+ .../bindings/leds/backlight/qcom-wled.yaml | 4 +-
+ MAINTAINERS | 6 +
+ drivers/video/backlight/Kconfig | 7 ++
+ drivers/video/backlight/Makefile | 1 +
+ drivers/video/backlight/hx8357.c | 67 ++++++-----
+ drivers/video/backlight/ktd2801-backlight.c | 128 +++++++++++++++++++++
+ drivers/video/backlight/ktz8866.c | 6 +-
+ drivers/video/backlight/lm3630a_bl.c | 29 +++--
+ drivers/video/backlight/mp3309c.c | 93 ++++++---------
+ 10 files changed, 277 insertions(+), 110 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/leds/backlight/kinetic,ktd2801.yaml
+ create mode 100644 drivers/video/backlight/ktd2801-backlight.c
+$ git reset --hard HEAD^
+HEAD is now at c1825d0efefd Merge branch 'for-mfd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git
+Merging next-20240223 version of backlight
+$ git merge -m next-20240223/backlight 770c0f4975fd7b4bb68ca7cf150d3b1c9c864a99
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ .../bindings/leds/backlight/kinetic,ktd2801.yaml | 46 ++++++++
+ .../bindings/leds/backlight/qcom-wled.yaml | 4 +-
+ MAINTAINERS | 13 +++
+ drivers/leds/Kconfig | 4 +
+ drivers/leds/Makefile | 3 +
+ drivers/leds/flash/Kconfig | 2 +-
+ drivers/leds/flash/leds-ktd2692.c | 116 +++++--------------
+ drivers/leds/leds-expresswire.c | 68 +++++++++++
+ drivers/video/backlight/Kconfig | 7 ++
+ drivers/video/backlight/Makefile | 1 +
+ drivers/video/backlight/hx8357.c | 67 ++++++-----
+ drivers/video/backlight/ktd2801-backlight.c | 128 +++++++++++++++++++++
+ drivers/video/backlight/ktz8866.c | 6 +-
+ drivers/video/backlight/mp3309c.c | 4 +-
+ include/linux/leds-expresswire.h | 36 ++++++
+ 15 files changed, 374 insertions(+), 131 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/leds/backlight/kinetic,ktd2801.yaml
+ create mode 100644 drivers/leds/leds-expresswire.c
+ create mode 100644 drivers/video/backlight/ktd2801-backlight.c
+ create mode 100644 include/linux/leds-expresswire.h
+Merging battery/for-next (8fbb11162504 power: supply: bq27xxx: Report charge full state correctly)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery/for-next
+Auto-merging drivers/power/supply/bq27xxx_battery_i2c.c
+Merge made by the 'ort' strategy.
+ drivers/power/reset/as3722-poweroff.c | 30 +++---
+ drivers/power/reset/atc260x-poweroff.c | 55 ++++-------
+ drivers/power/reset/axxia-reset.c | 16 ++-
+ drivers/power/reset/brcm-kona-reset.c | 11 +--
+ drivers/power/reset/gemini-poweroff.c | 16 +--
+ drivers/power/reset/msm-poweroff.c | 21 ++--
+ drivers/power/reset/mt6323-poweroff.c | 26 ++---
+ drivers/power/reset/regulator-poweroff.c | 36 +++----
+ drivers/power/reset/restart-poweroff.c | 25 ++---
+ drivers/power/reset/rmobile-reset.c | 38 +++----
+ drivers/power/reset/syscon-poweroff.c | 66 ++++++-------
+ drivers/power/reset/tps65086-restart.c | 58 ++---------
+ drivers/power/reset/xgene-reboot.c | 25 ++---
+ drivers/power/supply/axp20x_usb_power.c | 147 +++++++++++++++++++++++++---
+ drivers/power/supply/axp288_fuel_gauge.c | 18 +++-
+ drivers/power/supply/bq27xxx_battery.c | 56 +++++++----
+ drivers/power/supply/bq27xxx_battery_i2c.c | 46 ++++-----
+ drivers/power/supply/da9030_battery.c | 6 +-
+ drivers/power/supply/da9052-battery.c | 4 +-
+ drivers/power/supply/da9150-charger.c | 72 ++++----------
+ drivers/power/supply/ds2760_battery.c | 4 +-
+ drivers/power/supply/goldfish_battery.c | 24 ++---
+ drivers/power/supply/lp8727_charger.c | 35 ++-----
+ drivers/power/supply/lp8788-charger.c | 21 ++--
+ drivers/power/supply/max14577_charger.c | 8 +-
+ drivers/power/supply/max77693_charger.c | 10 +-
+ drivers/power/supply/max8925_power.c | 37 ++-----
+ drivers/power/supply/pcf50633-charger.c | 23 ++---
+ drivers/power/supply/power_supply.h | 4 +-
+ drivers/power/supply/power_supply_core.c | 8 +-
+ drivers/power/supply/power_supply_sysfs.c | 11 +--
+ drivers/power/supply/rt5033_battery.c | 14 +--
+ drivers/power/supply/rx51_battery.c | 57 +++--------
+ drivers/power/supply/tps65090-charger.c | 18 ++--
+ drivers/power/supply/twl4030_madc_battery.c | 59 +++--------
+ drivers/power/supply/wm831x_backup.c | 13 +--
+ drivers/power/supply/wm831x_power.c | 24 ++---
+ drivers/power/supply/wm8350_power.c | 30 ++----
+ include/linux/power/bq27xxx_battery.h | 1 -
+ 39 files changed, 486 insertions(+), 687 deletions(-)
+Merging regulator/for-next (b915fdf06b41 Merge remote-tracking branch 'regulator/for-6.9' into regulator-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next
+Merge made by the 'ort' strategy.
+ .../bindings/regulator/gpio-regulator.yaml | 4 +-
+ .../bindings/regulator/mcp16502-regulator.txt | 144 ------------
+ .../bindings/regulator/microchip,mcp16502.yaml | 180 +++++++++++++++
+ .../regulator/qcom,usb-vbus-regulator.yaml | 10 +-
+ .../devicetree/bindings/regulator/ti,tps65132.yaml | 84 +++++++
+ .../bindings/regulator/tps65132-regulator.txt | 46 ----
+ drivers/regulator/core.c | 1 -
+ drivers/regulator/da9055-regulator.c | 48 ++--
+ drivers/regulator/fixed-helper.c | 4 +-
+ drivers/regulator/lp873x-regulator.c | 3 +-
+ drivers/regulator/lp87565-regulator.c | 3 +-
+ drivers/regulator/lp8788-buck.c | 64 +++---
+ drivers/regulator/max8973-regulator.c | 36 +--
+ drivers/regulator/max8997-regulator.c | 85 ++-----
+ drivers/regulator/max8998.c | 144 +++++-------
+ drivers/regulator/mp8859.c | 252 ++++++++++++++++++++-
+ drivers/regulator/pwm-regulator.c | 40 ++--
+ drivers/regulator/qcom_smd-regulator.c | 19 +-
+ drivers/regulator/userspace-consumer.c | 1 +
+ include/linux/mfd/da9055/pdata.h | 13 --
+ include/linux/mfd/lp8788.h | 9 +-
+ include/linux/mfd/max8997.h | 1 -
+ include/linux/mfd/max8998.h | 6 -
+ include/linux/regulator/max8973-regulator.h | 6 -
+ 24 files changed, 700 insertions(+), 503 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/regulator/mcp16502-regulator.txt
+ create mode 100644 Documentation/devicetree/bindings/regulator/microchip,mcp16502.yaml
+ create mode 100644 Documentation/devicetree/bindings/regulator/ti,tps65132.yaml
+ delete mode 100644 Documentation/devicetree/bindings/regulator/tps65132-regulator.txt
+Merging security/next (8f49397828ee Automated merge of 'dev' into 'next')
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git security/next
+Auto-merging fs/attr.c
+Auto-merging fs/file_table.c
+Auto-merging fs/namei.c
+Auto-merging fs/nfsd/vfs.c
+Auto-merging fs/open.c
+Auto-merging fs/posix_acl.c
+Auto-merging include/linux/lsm_hook_defs.h
+Auto-merging include/linux/security.h
+Auto-merging security/security.c
+CONFLICT (content): Merge conflict in security/security.c
+Auto-merging security/selinux/hooks.c
+Resolved 'security/security.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master f996a1cab1c3] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git
+$ git diff -M --stat --summary HEAD^..
+ fs/attr.c | 5 +-
+ fs/file_table.c | 3 +-
+ fs/namei.c | 12 +-
+ fs/nfsd/vfs.c | 3 +-
+ fs/open.c | 1 -
+ fs/posix_acl.c | 5 +-
+ fs/xattr.c | 9 +-
+ include/linux/evm.h | 117 +--
+ include/linux/ima.h | 142 ----
+ include/linux/integrity.h | 27 -
+ include/linux/lsm_hook_defs.h | 20 +-
+ include/linux/security.h | 59 ++
+ include/uapi/linux/lsm.h | 2 +
+ kernel/cred.c | 4 +-
+ security/apparmor/lsm.c | 2 +-
+ security/integrity/Makefile | 1 +
+ security/integrity/digsig_asymmetric.c | 23 -
+ security/integrity/evm/Kconfig | 1 +
+ security/integrity/evm/evm.h | 19 +
+ security/integrity/evm/evm_crypto.c | 4 +-
+ security/integrity/evm/evm_main.c | 195 ++++-
+ security/integrity/iint.c | 197 +-----
+ security/integrity/ima/Kconfig | 1 +
+ security/integrity/ima/Makefile | 2 +-
+ security/integrity/ima/ima.h | 148 +++-
+ security/integrity/ima/ima_api.c | 23 +-
+ security/integrity/ima/ima_appraise.c | 66 +-
+ security/integrity/ima/ima_iint.c | 142 ++++
+ security/integrity/ima/ima_init.c | 2 +-
+ security/integrity/ima/ima_main.c | 148 +++-
+ security/integrity/ima/ima_policy.c | 2 +-
+ security/integrity/integrity.h | 80 +--
+ security/keys/key.c | 10 +-
+ security/security.c | 781 ++++++++++-----------
+ security/selinux/hooks.c | 5 +-
+ security/smack/smack_lsm.c | 4 +-
+ .../testing/selftests/lsm/lsm_list_modules_test.c | 6 +
+ 37 files changed, 1128 insertions(+), 1143 deletions(-)
+ create mode 100644 security/integrity/ima/ima_iint.c
+Merging apparmor/apparmor-next (8ead196be219 apparmor: Fix memory leak in unpack_profile())
+$ git merge -m Merge branch 'apparmor-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor apparmor/apparmor-next
+Already up to date.
+Merging integrity/next-integrity (85445b964290 integrity: eliminate unnecessary "Problem loading X.509 certificate" msg)
+$ git merge -m Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity/next-integrity
+Merge made by the 'ort' strategy.
+ security/integrity/digsig.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+Merging selinux/next (a1fc79343abb selinux: fix style issues in security/selinux/ss/symtab.c)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next
+Auto-merging security/selinux/hooks.c
+Merge made by the 'ort' strategy.
+ security/selinux/hooks.c | 28 +--
+ security/selinux/ss/avtab.c | 105 +++++-----
+ security/selinux/ss/avtab.h | 74 +++----
+ security/selinux/ss/conditional.c | 68 ++++---
+ security/selinux/ss/conditional.h | 23 ++-
+ security/selinux/ss/constraint.h | 61 +++---
+ security/selinux/ss/context.c | 2 +-
+ security/selinux/ss/context.h | 41 ++--
+ security/selinux/ss/ebitmap.c | 56 +++---
+ security/selinux/ss/ebitmap.h | 42 ++--
+ security/selinux/ss/hashtab.c | 23 ++-
+ security/selinux/ss/hashtab.h | 35 ++--
+ security/selinux/ss/mls.c | 83 ++++----
+ security/selinux/ss/mls.h | 58 ++----
+ security/selinux/ss/mls_types.h | 32 +--
+ security/selinux/ss/policydb.c | 405 ++++++++++++++++++++------------------
+ security/selinux/ss/policydb.h | 192 +++++++++---------
+ security/selinux/ss/services.h | 3 +-
+ security/selinux/ss/sidtab.c | 69 ++++---
+ security/selinux/ss/sidtab.h | 36 ++--
+ security/selinux/ss/symtab.c | 4 +-
+ security/selinux/ss/symtab.h | 9 +-
+ 22 files changed, 721 insertions(+), 728 deletions(-)
+Merging smack/next (69b6d71052b5 Smack: use init_task_smack() in smack_cred_transfer())
+$ git merge -m Merge branch 'next' of git://github.com/cschaufler/smack-next smack/next
+Auto-merging security/smack/smack_lsm.c
+Merge made by the 'ort' strategy.
+ fs/ramfs/inode.c | 32 ++++++++++++-
+ security/smack/smack_lsm.c | 112 ++++++++++++++++++++++++---------------------
+ 2 files changed, 92 insertions(+), 52 deletions(-)
+Merging tomoyo/master (0bb80ecc33a8 Linux 6.6-rc1)
+$ git merge -m Merge branch 'master' of https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git tomoyo/master
+Already up to date.
+Merging tpmdd/next (27eaacc62ade tpm: tis_i2c: Add compatible string nuvoton,npct75x)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tpmdd/next
+Auto-merging drivers/char/tpm/tpm_tis.c
+Auto-merging drivers/char/tpm/tpm_tis_core.c
+Merge made by the 'ort' strategy.
+ Documentation/devicetree/bindings/tpm/tcg,tpm_tis-spi.yaml | 1 +
+ drivers/char/tpm/tpm_ftpm_tee.c | 6 +++---
+ drivers/char/tpm/tpm_tis.c | 1 +
+ drivers/char/tpm/tpm_tis_core.c | 3 +--
+ drivers/char/tpm/tpm_tis_i2c.c | 2 ++
+ drivers/char/tpm/tpm_tis_spi_main.c | 1 +
+ 6 files changed, 9 insertions(+), 5 deletions(-)
+Merging watchdog/master (41bccc98fb79 Linux 6.8-rc2)
+$ git merge -m Merge branch 'master' of git://www.linux-watchdog.org/linux-watchdog-next.git watchdog/master
+Already up to date.
+Merging iommu/next (43400fa1ca4c Merge branches 'iommu/fixes', 'arm/mediatek', 'arm/renesas', 'x86/amd' and 'core' into next)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git iommu/next
+Auto-merging MAINTAINERS
+Auto-merging drivers/iommu/Kconfig
+Auto-merging drivers/iommu/intel/Kconfig
+Merge made by the 'ort' strategy.
+ MAINTAINERS | 1 -
+ drivers/iommu/Kconfig | 4 +
+ drivers/iommu/Makefile | 3 +-
+ drivers/iommu/amd/amd_iommu.h | 41 +-
+ drivers/iommu/amd/amd_iommu_types.h | 34 +-
+ drivers/iommu/amd/init.c | 12 +-
+ drivers/iommu/amd/io_pgtable_v2.c | 21 +-
+ drivers/iommu/amd/iommu.c | 636 +++++++++++-------------
+ drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c | 14 +-
+ drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 103 ++--
+ drivers/iommu/intel/Kconfig | 1 +
+ drivers/iommu/intel/iommu.c | 28 +-
+ drivers/iommu/intel/iommu.h | 4 +-
+ drivers/iommu/intel/svm.c | 41 +-
+ drivers/iommu/io-pgfault.c | 467 +++++++++--------
+ drivers/iommu/iommu-sva.c | 71 ++-
+ drivers/iommu/iommu-sva.h | 71 ---
+ drivers/iommu/iommu.c | 252 +---------
+ drivers/iommu/iova.c | 143 +++---
+ drivers/iommu/ipmmu-vmsa.c | 15 +-
+ drivers/iommu/mtk_iommu.c | 2 +-
+ drivers/iommu/mtk_iommu_v1.c | 4 +-
+ include/linux/iommu.h | 286 ++++++++---
+ include/uapi/linux/iommu.h | 161 ------
+ 24 files changed, 1044 insertions(+), 1371 deletions(-)
+ delete mode 100644 drivers/iommu/iommu-sva.h
+ delete mode 100644 include/uapi/linux/iommu.h
+Merging audit/next (aa13b709084a audit: use KMEM_CACHE() instead of kmem_cache_create())
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git audit/next
+Merge made by the 'ort' strategy.
+ kernel/audit.c | 4 +---
+ kernel/auditfilter.c | 2 +-
+ 2 files changed, 2 insertions(+), 4 deletions(-)
+Merging devicetree/for-next (1447c13051c7 dt-bindings: lcdif: Do not require power-domains for i.MX6ULL)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next
+Auto-merging Documentation/devicetree/bindings/Makefile
+Auto-merging Documentation/devicetree/bindings/trivial-devices.yaml
+CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/trivial-devices.yaml
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml
+Auto-merging MAINTAINERS
+Auto-merging drivers/of/base.c
+Auto-merging drivers/of/property.c
+Resolved 'Documentation/devicetree/bindings/trivial-devices.yaml' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 835e612f3bc1] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git
+$ git diff -M --stat --summary HEAD^..
+ Documentation/devicetree/bindings/Makefile | 3 -
+ .../atmel/atmel,hlcdc-display-controller.yaml | 63 +++
+ .../devicetree/bindings/display/atmel/hlcdc-dc.txt | 75 ----
+ .../devicetree/bindings/display/fsl,lcdif.yaml | 8 +-
+ .../bindings/display/panel/visionox,r66451.yaml | 2 +-
+ .../devicetree/bindings/fpga/fpga-region.txt | 479 ---------------------
+ .../devicetree/bindings/fpga/fpga-region.yaml | 358 +++++++++++++++
+ .../devicetree/bindings/gpio/mrvl-gpio.yaml | 2 +-
+ .../devicetree/bindings/i2c/i2c-demux-pinctrl.yaml | 3 +-
+ Documentation/devicetree/bindings/i2c/i2c-pxa.yaml | 2 +-
+ .../mediatek,mt6577-sysirq.yaml | 85 ++++
+ .../interrupt-controller/mediatek,sysirq.txt | 44 --
+ .../interrupt-controller/renesas,rzg2l-irqc.yaml | 44 +-
+ .../devicetree/bindings/misc/qcom,fastrpc.yaml | 2 +
+ .../devicetree/bindings/misc/xlnx,sd-fec.txt | 58 ---
+ .../devicetree/bindings/misc/xlnx,sd-fec.yaml | 140 ++++++
+ .../devicetree/bindings/mux/mux-controller.yaml | 2 +-
+ .../devicetree/bindings/net/can/fsl,flexcan.yaml | 3 +
+ .../devicetree/bindings/rtc/sa1100-rtc.yaml | 2 +-
+ .../devicetree/bindings/submitting-patches.rst | 23 +-
+ .../devicetree/bindings/timer/mrvl,mmp-timer.yaml | 2 +-
+ .../devicetree/bindings/trivial-devices.yaml | 79 ++--
+ .../devicetree/bindings/usb/cypress,hx3.yaml | 2 +-
+ .../devicetree/bindings/vendor-prefixes.yaml | 27 ++
+ .../devicetree/bindings/writing-schema.rst | 30 +-
+ Documentation/misc-devices/xilinx_sdfec.rst | 2 +-
+ MAINTAINERS | 8 +-
+ drivers/of/base.c | 4 +-
+ drivers/of/property.c | 12 +-
+ include/dt-bindings/power/amlogic,c3-pwrc.h | 2 +-
+ include/linux/of_graph.h | 4 +-
+ 31 files changed, 824 insertions(+), 746 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/display/atmel/atmel,hlcdc-display-controller.yaml
+ delete mode 100644 Documentation/devicetree/bindings/display/atmel/hlcdc-dc.txt
+ delete mode 100644 Documentation/devicetree/bindings/fpga/fpga-region.txt
+ create mode 100644 Documentation/devicetree/bindings/fpga/fpga-region.yaml
+ create mode 100644 Documentation/devicetree/bindings/interrupt-controller/mediatek,mt6577-sysirq.yaml
+ delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/mediatek,sysirq.txt
+ delete mode 100644 Documentation/devicetree/bindings/misc/xlnx,sd-fec.txt
+ create mode 100644 Documentation/devicetree/bindings/misc/xlnx,sd-fec.yaml
+Merging dt-krzk/for-next (8c82b4eef297 ARM: dts: sti: minor whitespace cleanup around '=')
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk/for-next
+Merge made by the 'ort' strategy.
+ arch/arm/boot/dts/marvell/dove-cubox.dts | 4 ++--
+ arch/arm/boot/dts/marvell/mmp2-brownstone.dts | 2 +-
+ arch/arm/boot/dts/st/stih407-pinctrl.dtsi | 8 ++++----
+ arch/arm/boot/dts/ti/davinci/da850.dtsi | 4 ++--
+ 4 files changed, 9 insertions(+), 9 deletions(-)
+Merging mailbox/for-next (cd795fb0c352 mailbox: mtk-cmdq: Add CMDQ driver support for mt8188)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jassibrar/mailbox.git mailbox/for-next
+Already up to date.
+Merging spi/for-next (65e97e8afcd4 Merge remote-tracking branch 'spi/for-6.9' into spi-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next
+Auto-merging drivers/char/tpm/tpm_tis_spi_main.c
+Auto-merging drivers/net/ieee802154/ca8210.c
+Auto-merging drivers/spi/spi-cs42l43.c
+Auto-merging include/linux/spi/spi.h
+Auto-merging include/media/v4l2-common.h
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/spi/samsung,spi.yaml | 2 +
+ .../devicetree/bindings/spi/spi-fsl-lpspi.yaml | 1 +
+ .../devicetree/bindings/spi/spi-nxp-fspi.yaml | 18 +-
+ Documentation/driver-api/driver-model/devres.rst | 2 +-
+ Documentation/spi/spi-summary.rst | 114 ++---
+ drivers/char/tpm/tpm_tis_spi_main.c | 4 +-
+ drivers/fpga/ice40-spi.c | 4 +-
+ drivers/iio/adc/ad_sigma_delta.c | 14 +-
+ drivers/input/joystick/psxpad-spi.c | 4 +-
+ drivers/input/rmi4/rmi_spi.c | 2 +-
+ drivers/media/pci/mgb4/mgb4_core.c | 14 +-
+ drivers/media/pci/netup_unidvb/netup_unidvb_spi.c | 48 +-
+ drivers/media/usb/msi2500/msi2500.c | 38 +-
+ drivers/media/v4l2-core/v4l2-spi.c | 4 +-
+ drivers/misc/gehc-achc.c | 8 +-
+ drivers/mmc/host/mmc_spi.c | 6 +-
+ drivers/mtd/devices/mtd_dataflash.c | 2 +-
+ drivers/net/ethernet/micrel/ks8851_spi.c | 4 +-
+ drivers/net/ethernet/vertexcom/mse102x.c | 2 +-
+ drivers/net/ieee802154/ca8210.c | 2 +-
+ drivers/net/wireless/marvell/libertas/if_spi.c | 2 +-
+ drivers/platform/chrome/cros_ec_spi.c | 8 +-
+ drivers/spi/Kconfig | 2 +-
+ drivers/spi/spi-ath79.c | 4 +-
+ drivers/spi/spi-au1550.c | 2 +-
+ drivers/spi/spi-axi-spi-engine.c | 125 ++---
+ drivers/spi/spi-bcm2835.c | 27 +-
+ drivers/spi/spi-bitbang.c | 64 +--
+ drivers/spi/spi-butterfly.c | 6 +-
+ drivers/spi/spi-cadence-quadspi.c | 21 +-
+ drivers/spi/spi-cavium.c | 6 +-
+ drivers/spi/spi-cavium.h | 2 +-
+ drivers/spi/spi-cs42l43.c | 22 +-
+ drivers/spi/spi-davinci.c | 6 +-
+ drivers/spi/spi-dw-dma.c | 2 +-
+ drivers/spi/spi-fsl-dspi.c | 15 +-
+ drivers/spi/spi-fsl-lib.c | 14 +-
+ drivers/spi/spi-geni-qcom.c | 2 +-
+ drivers/spi/spi-gpio.c | 2 +-
+ drivers/spi/spi-intel.c | 34 +-
+ drivers/spi/spi-lm70llp.c | 6 +-
+ drivers/spi/spi-loopback-test.c | 4 +-
+ drivers/spi/spi-mem.c | 49 +-
+ drivers/spi/spi-mt65xx.c | 5 +
+ drivers/spi/spi-nxp-fspi.c | 2 +-
+ drivers/spi/spi-oc-tiny.c | 6 +-
+ drivers/spi/spi-omap-uwire.c | 4 +-
+ drivers/spi/spi-pci1xxxx.c | 514 +++++++++++++++++++--
+ drivers/spi/spi-ppc4xx.c | 14 +-
+ drivers/spi/spi-rockchip.c | 13 +-
+ drivers/spi/spi-s3c64xx.c | 191 +++++---
+ drivers/spi/spi-sh-sci.c | 10 +-
+ drivers/spi/spi-slave-mt27xx.c | 2 +-
+ drivers/spi/spi-stm32.c | 30 +-
+ drivers/spi/spi-xilinx.c | 4 +-
+ drivers/spi/spi-xtensa-xtfpga.c | 2 +-
+ drivers/spi/spi.c | 347 +++++++++-----
+ drivers/spi/spidev.c | 2 +-
+ drivers/staging/fbtft/fbtft-core.c | 4 +-
+ drivers/staging/greybus/spilib.c | 66 +--
+ drivers/usb/gadget/udc/max3420_udc.c | 2 +-
+ drivers/video/fbdev/mmp/hw/mmp_spi.c | 26 +-
+ include/linux/amba/pl022.h | 4 +-
+ include/linux/spi/pxa2xx_spi.h | 3 +-
+ include/linux/spi/spi.h | 52 +--
+ include/linux/spi/spi_bitbang.h | 2 +-
+ include/linux/spi/spi_gpio.h | 4 +-
+ include/media/v4l2-common.h | 6 +-
+ 68 files changed, 1362 insertions(+), 671 deletions(-)
+Merging tip/master (e453cb32af61 Merge branch into tip/master: 'x86/tdx')
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Auto-merging MAINTAINERS
+Auto-merging arch/arm64/boot/dts/amlogic/amlogic-t7.dtsi
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/x86/Makefile
+Auto-merging arch/x86/entry/vdso/Makefile
+Auto-merging arch/x86/include/asm/pgtable.h
+Auto-merging arch/x86/kernel/Makefile
+Auto-merging arch/x86/kernel/alternative.c
+Auto-merging arch/x86/kernel/cpu/mshyperv.c
+Auto-merging arch/x86/kernel/kexec-bzimage64.c
+Auto-merging arch/x86/kernel/kvm.c
+Auto-merging arch/x86/kernel/setup.c
+Auto-merging arch/x86/kernel/smp.c
+Auto-merging arch/x86/kvm/svm/sev.c
+Auto-merging arch/x86/mm/dump_pagetables.c
+Auto-merging arch/x86/mm/tlb.c
+Auto-merging arch/x86/net/bpf_jit_comp.c
+Auto-merging arch/x86/xen/enlighten_hvm.c
+Auto-merging drivers/hwmon/coretemp.c
+Auto-merging drivers/iommu/amd/amd_iommu.h
+Auto-merging drivers/iommu/amd/init.c
+Auto-merging drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
+Auto-merging drivers/perf/arm_smmuv3_pmu.c
+Auto-merging drivers/powercap/intel_rapl_common.c
+Auto-merging drivers/thermal/intel/x86_pkg_temp_thermal.c
+Auto-merging include/linux/bitmap.h
+Auto-merging include/linux/compiler.h
+Auto-merging include/linux/smp.h
+Auto-merging init/main.c
+Auto-merging kernel/sched/core.c
+Auto-merging kernel/sched/fair.c
+Auto-merging kernel/workqueue.c
+CONFLICT (content): Merge conflict in kernel/workqueue.c
+Auto-merging net/sched/sch_api.c
+Auto-merging scripts/Makefile.lib
+Auto-merging scripts/generate_rust_target.rs
+Auto-merging tools/objtool/check.c
+Resolved 'kernel/workqueue.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master f9ad77051d5d] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git
+$ git diff -M --stat --summary HEAD^..
+ Documentation/admin-guide/hw-vuln/spectre.rst | 8 +-
+ Documentation/admin-guide/kdump/kdump.rst | 7 +-
+ Documentation/admin-guide/kernel-parameters.txt | 30 +-
+ Documentation/arch/x86/amd-memory-encryption.rst | 16 +-
+ Documentation/arch/x86/boot.rst | 3 +-
+ Documentation/arch/x86/pti.rst | 6 +-
+ Documentation/arch/x86/topology.rst | 24 +-
+ Documentation/arch/x86/x86_64/fred.rst | 96 ++
+ Documentation/arch/x86/x86_64/index.rst | 1 +
+ .../amlogic,meson-gpio-intc.yaml | 1 +
+ .../interrupt-controller/starfive,jh8100-intc.yaml | 61 +
+ Documentation/process/maintainer-tip.rst | 34 +-
+ Documentation/virt/coco/sev-guest.rst | 52 +
+ MAINTAINERS | 17 +
+ arch/arm/include/asm/elf.h | 1 -
+ arch/arm/include/asm/vdso_datapage.h | 26 -
+ arch/arm/kernel/asm-offsets.c | 4 +-
+ arch/arm/kernel/vdso.c | 4 -
+ arch/arm64/boot/dts/amlogic/amlogic-t7.dtsi | 10 +
+ arch/arm64/kernel/vdso.c | 5 +-
+ arch/csky/include/asm/vdso.h | 5 -
+ arch/csky/kernel/vdso.c | 14 +-
+ arch/loongarch/kernel/vdso.c | 6 +-
+ arch/mips/include/asm/vdso.h | 5 -
+ arch/mips/kernel/vdso.c | 2 +-
+ arch/riscv/kernel/vdso.c | 10 +-
+ arch/s390/include/asm/vdso/data.h | 1 -
+ arch/s390/kernel/vdso.c | 5 +-
+ arch/x86/Kbuild | 2 +
+ arch/x86/Kconfig | 76 +-
+ arch/x86/Makefile | 14 +-
+ arch/x86/boot/compressed/acpi.c | 2 +
+ arch/x86/boot/compressed/cmdline.c | 2 +
+ arch/x86/boot/compressed/efi.c | 2 +
+ arch/x86/boot/compressed/efi.h | 9 -
+ arch/x86/boot/compressed/ident_map_64.c | 6 +-
+ arch/x86/boot/compressed/misc.c | 44 +-
+ arch/x86/boot/compressed/misc.h | 3 +
+ arch/x86/boot/compressed/pgtable_64.c | 1 +
+ arch/x86/boot/compressed/sev.c | 5 +
+ arch/x86/coco/core.c | 7 +-
+ arch/x86/configs/i386_defconfig | 2 +-
+ arch/x86/entry/Makefile | 5 +-
+ arch/x86/entry/calling.h | 115 +-
+ arch/x86/entry/entry.S | 4 +
+ arch/x86/entry/entry_32.S | 6 +-
+ arch/x86/entry/entry_64.S | 29 +-
+ arch/x86/entry/entry_64_fred.S | 131 ++
+ arch/x86/entry/entry_fred.c | 294 ++++
+ arch/x86/entry/thunk_32.S | 34 +-
+ arch/x86/entry/thunk_64.S | 33 -
+ arch/x86/entry/vdso/Makefile | 57 +-
+ arch/x86/entry/vdso/vma.c | 57 +-
+ arch/x86/entry/vsyscall/vsyscall_64.c | 2 +-
+ arch/x86/events/amd/core.c | 2 +-
+ arch/x86/events/intel/cstate.c | 2 +-
+ arch/x86/events/intel/uncore.c | 2 +-
+ arch/x86/events/intel/uncore_nhmex.c | 4 +-
+ arch/x86/events/intel/uncore_snb.c | 8 +-
+ arch/x86/events/intel/uncore_snbep.c | 18 +-
+ arch/x86/events/rapl.c | 2 +-
+ arch/x86/hyperv/hv_vtl.c | 5 +-
+ arch/x86/include/asm/apic.h | 22 +-
+ arch/x86/include/asm/asm-prototypes.h | 1 +
+ arch/x86/include/asm/asm.h | 14 +
+ arch/x86/include/asm/barrier.h | 2 +-
+ arch/x86/include/asm/coco.h | 8 +-
+ arch/x86/include/asm/cpu.h | 10 +-
+ arch/x86/include/asm/cpufeatures.h | 3 +
+ arch/x86/include/asm/cpuid.h | 36 +
+ arch/x86/include/asm/current.h | 9 +-
+ arch/x86/include/asm/desc.h | 2 -
+ arch/x86/include/asm/disabled-features.h | 26 +-
+ arch/x86/include/asm/efi.h | 14 +-
+ arch/x86/include/asm/elf.h | 1 -
+ arch/x86/include/asm/extable_fixup_types.h | 4 +-
+ arch/x86/include/asm/fpu/sched.h | 10 +-
+ arch/x86/include/asm/fred.h | 97 ++
+ arch/x86/include/asm/hw_irq.h | 2 -
+ arch/x86/include/asm/ia32.h | 4 +-
+ arch/x86/include/asm/idtentry.h | 88 +-
+ arch/x86/include/asm/io.h | 2 +-
+ arch/x86/include/asm/io_apic.h | 1 -
+ arch/x86/include/asm/iommu.h | 1 +
+ arch/x86/include/asm/kexec.h | 1 -
+ arch/x86/include/asm/kvm-x86-ops.h | 1 +
+ arch/x86/include/asm/kvm_host.h | 1 +
+ arch/x86/include/asm/kvmclock.h | 2 -
+ arch/x86/include/asm/linkage.h | 16 +-
+ arch/x86/include/asm/mem_encrypt.h | 16 +-
+ arch/x86/include/asm/mpspec.h | 66 +-
+ arch/x86/include/asm/msr-index.h | 24 +-
+ arch/x86/include/asm/msr.h | 18 +
+ arch/x86/include/asm/nospec-branch.h | 57 +-
+ arch/x86/include/asm/page.h | 6 +-
+ arch/x86/include/asm/pci.h | 13 -
+ arch/x86/include/asm/percpu.h | 191 ++-
+ arch/x86/include/asm/perf_event_p4.h | 4 +-
+ arch/x86/include/asm/pgalloc.h | 2 +-
+ arch/x86/include/asm/pgtable-3level.h | 2 +-
+ arch/x86/include/asm/pgtable.h | 18 +-
+ arch/x86/include/asm/pgtable_64.h | 3 +-
+ arch/x86/include/asm/preempt.h | 2 +-
+ arch/x86/include/asm/processor-flags.h | 2 +-
+ arch/x86/include/asm/processor.h | 12 +-
+ arch/x86/include/asm/prom.h | 4 +-
+ arch/x86/include/asm/pti.h | 2 +-
+ arch/x86/include/asm/ptrace.h | 104 +-
+ arch/x86/include/asm/resctrl.h | 90 +
+ arch/x86/include/asm/setup.h | 2 +-
+ arch/x86/include/asm/setup_data.h | 32 +
+ arch/x86/include/asm/sev.h | 41 +-
+ arch/x86/include/asm/smp.h | 6 -
+ arch/x86/include/asm/special_insns.h | 9 +-
+ arch/x86/include/asm/static_call.h | 2 +-
+ arch/x86/include/asm/switch_to.h | 8 +-
+ arch/x86/include/asm/text-patching.h | 2 +
+ arch/x86/include/asm/thread_info.h | 12 +-
+ arch/x86/include/asm/topology.h | 90 +-
+ arch/x86/include/asm/trap_pf.h | 20 +-
+ arch/x86/include/asm/trapnr.h | 12 +
+ arch/x86/include/asm/uaccess_64.h | 11 +-
+ arch/x86/include/asm/vmx.h | 17 +-
+ arch/x86/include/asm/x86_init.h | 12 +-
+ arch/x86/include/uapi/asm/bootparam.h | 72 +-
+ arch/x86/include/uapi/asm/processor-flags.h | 7 +
+ arch/x86/include/uapi/asm/setup_data.h | 83 +
+ arch/x86/kernel/Makefile | 1 +
+ arch/x86/kernel/acpi/boot.c | 59 +-
+ arch/x86/kernel/acpi/wakeup_64.S | 24 +-
+ arch/x86/kernel/alternative.c | 23 +-
+ arch/x86/kernel/amd_nb.c | 4 +-
+ arch/x86/kernel/apic/apic.c | 207 +--
+ arch/x86/kernel/apic/apic_common.c | 15 -
+ arch/x86/kernel/apic/apic_flat_64.c | 16 -
+ arch/x86/kernel/apic/apic_noop.c | 5 -
+ arch/x86/kernel/apic/apic_numachip.c | 19 -
+ arch/x86/kernel/apic/bigsmp_32.c | 20 -
+ arch/x86/kernel/apic/io_apic.c | 94 +-
+ arch/x86/kernel/apic/local.h | 5 -
+ arch/x86/kernel/apic/probe_32.c | 9 -
+ arch/x86/kernel/apic/x2apic_cluster.c | 4 -
+ arch/x86/kernel/apic/x2apic_phys.c | 12 -
+ arch/x86/kernel/apic/x2apic_uv_x.c | 69 +-
+ arch/x86/kernel/apm_32.c | 29 -
+ arch/x86/kernel/asm-offsets.c | 2 +-
+ arch/x86/kernel/callthunks.c | 32 +-
+ arch/x86/kernel/cpu/Makefile | 15 +-
+ arch/x86/kernel/cpu/acrn.c | 4 +-
+ arch/x86/kernel/cpu/amd.c | 183 +-
+ arch/x86/kernel/cpu/bugs.c | 48 +-
+ arch/x86/kernel/cpu/cacheinfo.c | 15 +-
+ arch/x86/kernel/cpu/centaur.c | 4 -
+ arch/x86/kernel/cpu/common.c | 181 +-
+ arch/x86/kernel/cpu/cpu.h | 13 +-
+ arch/x86/kernel/cpu/cpuid-deps.c | 2 +
+ arch/x86/kernel/cpu/debugfs.c | 47 +-
+ arch/x86/kernel/cpu/hygon.c | 129 --
+ arch/x86/kernel/cpu/intel.c | 197 +--
+ arch/x86/kernel/cpu/mce/amd.c | 4 +-
+ arch/x86/kernel/cpu/mce/core.c | 28 +-
+ arch/x86/kernel/cpu/mce/inject.c | 8 +-
+ arch/x86/kernel/cpu/microcode/intel.c | 2 +-
+ arch/x86/kernel/cpu/mshyperv.c | 15 +-
+ arch/x86/kernel/cpu/mtrr/generic.c | 3 +
+ arch/x86/kernel/cpu/resctrl/core.c | 111 +-
+ arch/x86/kernel/cpu/resctrl/ctrlmondata.c | 48 +-
+ arch/x86/kernel/cpu/resctrl/internal.h | 75 +-
+ arch/x86/kernel/cpu/resctrl/monitor.c | 501 ++++--
+ arch/x86/kernel/cpu/resctrl/pseudo_lock.c | 15 +-
+ arch/x86/kernel/cpu/resctrl/rdtgroup.c | 388 +++--
+ arch/x86/kernel/cpu/topology.c | 578 +++++--
+ arch/x86/kernel/cpu/topology.h | 67 +
+ arch/x86/kernel/cpu/topology_amd.c | 183 ++
+ arch/x86/kernel/cpu/topology_common.c | 218 +++
+ arch/x86/kernel/cpu/topology_ext.c | 130 ++
+ arch/x86/kernel/cpu/zhaoxin.c | 4 -
+ arch/x86/kernel/crash.c | 4 +
+ arch/x86/kernel/devicetree.c | 4 +-
+ arch/x86/kernel/dumpstack.c | 2 +-
+ arch/x86/kernel/espfix_64.c | 8 +
+ arch/x86/kernel/fred.c | 59 +
+ arch/x86/kernel/ftrace.c | 3 +-
+ arch/x86/kernel/head64.c | 128 +-
+ arch/x86/kernel/head_32.S | 4 +-
+ arch/x86/kernel/head_64.S | 46 +-
+ arch/x86/kernel/hpet.c | 2 +-
+ arch/x86/kernel/idt.c | 4 +-
+ arch/x86/kernel/irqinit.c | 7 +-
+ arch/x86/kernel/jailhouse.c | 30 +-
+ arch/x86/kernel/kexec-bzimage64.c | 5 +-
+ arch/x86/kernel/kprobes/opt.c | 2 +-
+ arch/x86/kernel/kvm.c | 2 +-
+ arch/x86/kernel/kvmclock.c | 4 +-
+ arch/x86/kernel/ldt.c | 8 +-
+ arch/x86/kernel/mpparse.c | 31 +-
+ arch/x86/kernel/nmi.c | 50 +-
+ arch/x86/kernel/process.c | 7 +-
+ arch/x86/kernel/process_32.c | 7 +-
+ arch/x86/kernel/process_64.c | 74 +-
+ arch/x86/kernel/setup.c | 27 +-
+ arch/x86/kernel/sev-shared.c | 116 +-
+ arch/x86/kernel/sev.c | 19 +-
+ arch/x86/kernel/smp.c | 10 +-
+ arch/x86/kernel/smpboot.c | 233 +--
+ arch/x86/kernel/static_call.c | 2 +-
+ arch/x86/kernel/sys_x86_64.c | 7 -
+ arch/x86/kernel/traps.c | 78 +-
+ arch/x86/kernel/tsc.c | 34 +-
+ arch/x86/kernel/vmlinux.lds.S | 11 +-
+ arch/x86/kernel/vsmp_64.c | 13 -
+ arch/x86/kernel/x86_init.c | 5 +-
+ arch/x86/kvm/lapic.c | 5 +-
+ arch/x86/kvm/mmu/mmu.c | 2 +-
+ arch/x86/kvm/mmu/mmu_internal.h | 2 +-
+ arch/x86/kvm/svm/nested.c | 2 +-
+ arch/x86/kvm/svm/sev.c | 37 +-
+ arch/x86/kvm/svm/svm.c | 19 +-
+ arch/x86/kvm/svm/svm.h | 1 +
+ arch/x86/kvm/svm/vmenter.S | 4 +-
+ arch/x86/kvm/vmx/vmx.c | 14 +-
+ arch/x86/lib/Makefile | 2 +-
+ arch/x86/lib/cmpxchg16b_emu.S | 12 +-
+ arch/x86/lib/cmpxchg8b_emu.S | 30 +-
+ arch/x86/lib/insn-eval.c | 6 +-
+ arch/x86/lib/insn.c | 58 +-
+ arch/x86/lib/retpoline.S | 41 +-
+ arch/x86/lib/x86-opcode-map.txt | 4 +-
+ arch/x86/mm/Makefile | 2 +-
+ arch/x86/mm/amdtopology.c | 34 +-
+ arch/x86/mm/debug_pagetables.c | 4 +-
+ arch/x86/mm/dump_pagetables.c | 4 +-
+ arch/x86/mm/extable.c | 78 +
+ arch/x86/mm/fault.c | 37 +-
+ arch/x86/mm/mem_encrypt.c | 56 +-
+ arch/x86/mm/mem_encrypt_identity.c | 40 +-
+ arch/x86/mm/pat/memtype.c | 9 +-
+ arch/x86/mm/pat/set_memory.c | 21 +-
+ arch/x86/mm/pgtable.c | 4 +-
+ arch/x86/mm/tlb.c | 10 +-
+ arch/x86/net/bpf_jit_comp.c | 4 +-
+ arch/x86/net/bpf_jit_comp32.c | 2 +-
+ arch/x86/platform/ce4100/ce4100.c | 14 +-
+ arch/x86/platform/efi/efi.c | 5 +
+ arch/x86/platform/intel-mid/intel-mid.c | 5 +-
+ arch/x86/platform/pvh/enlighten.c | 1 +
+ arch/x86/purgatory/Makefile | 2 +-
+ arch/x86/realmode/rm/trampoline_64.S | 33 +-
+ arch/x86/virt/svm/Makefile | 3 +
+ arch/x86/virt/svm/sev.c | 560 ++++++
+ arch/x86/xen/apic.c | 27 +-
+ arch/x86/xen/enlighten_hvm.c | 2 +-
+ arch/x86/xen/enlighten_pv.c | 3 +
+ arch/x86/xen/enlighten_pvh.c | 1 +
+ arch/x86/xen/smp.c | 2 -
+ arch/x86/xen/smp.h | 2 +
+ arch/x86/xen/smp_pv.c | 65 +-
+ arch/x86/xen/vga.c | 1 -
+ arch/x86/xen/xen-asm.S | 10 +-
+ drivers/base/platform-msi.c | 119 +-
+ drivers/clocksource/arm_arch_timer.c | 6 +-
+ drivers/crypto/ccp/Kconfig | 2 +-
+ drivers/crypto/ccp/sev-dev.c | 1156 ++++++++++++-
+ drivers/crypto/ccp/sev-dev.h | 5 +
+ drivers/dma/mv_xor_v2.c | 8 +-
+ drivers/dma/qcom/hidma.c | 6 +-
+ drivers/edac/amd64_edac.c | 4 +-
+ drivers/edac/mce_amd.c | 4 +-
+ drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 2 +-
+ drivers/hwmon/coretemp.c | 2 +-
+ drivers/hwmon/fam15h_power.c | 2 +-
+ drivers/iommu/amd/amd_iommu.h | 1 -
+ drivers/iommu/amd/init.c | 129 +-
+ drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 5 +-
+ drivers/irqchip/Kconfig | 11 +
+ drivers/irqchip/Makefile | 1 +
+ drivers/irqchip/irq-bcm6345-l1.c | 2 +-
+ drivers/irqchip/irq-bcm7038-l1.c | 2 +-
+ drivers/irqchip/irq-gic-v3-its.c | 4 +-
+ drivers/irqchip/irq-gic-v3.c | 57 +-
+ drivers/irqchip/irq-gic.c | 27 +-
+ drivers/irqchip/irq-imx-intmux.c | 4 +
+ drivers/irqchip/irq-loongson-eiointc.c | 22 +-
+ drivers/irqchip/irq-meson-gpio.c | 5 +
+ drivers/irqchip/irq-riscv-intc.c | 104 +-
+ drivers/irqchip/irq-sifive-plic.c | 279 +--
+ drivers/irqchip/irq-starfive-jh8100-intc.c | 207 +++
+ drivers/irqchip/irq-vic.c | 3 +-
+ drivers/mailbox/bcm-flexrm-mailbox.c | 8 +-
+ drivers/perf/arm_smmuv3_pmu.c | 4 +-
+ .../x86/intel/uncore-frequency/uncore-frequency.c | 2 +-
+ drivers/powercap/intel_rapl_common.c | 2 +-
+ drivers/ptp/ptp_kvm_common.c | 10 +-
+ drivers/ptp/ptp_kvm_x86.c | 4 +-
+ drivers/thermal/intel/intel_hfi.c | 2 +-
+ drivers/thermal/intel/intel_powerclamp.c | 2 +-
+ drivers/thermal/intel/x86_pkg_temp_thermal.c | 2 +-
+ drivers/ufs/host/ufs-qcom.c | 8 +-
+ drivers/xen/events/events_base.c | 2 +-
+ include/linux/amd-iommu.h | 6 +-
+ include/linux/atomic/atomic-arch-fallback.h | 46 +-
+ include/linux/atomic/atomic-instrumented.h | 68 +-
+ include/linux/atomic/atomic-long.h | 24 +-
+ include/linux/bitmap.h | 3 +
+ include/linux/clocksource.h | 14 +-
+ include/linux/clocksource_ids.h | 3 +
+ include/linux/compiler-gcc.h | 2 +-
+ include/linux/compiler.h | 2 +-
+ include/linux/cpu.h | 2 +-
+ include/linux/cpuhotplug.h | 2 +
+ include/linux/hrtimer.h | 119 +-
+ include/linux/hrtimer_defs.h | 104 ++
+ include/linux/indirect_call_wrapper.h | 2 +-
+ include/linux/irq.h | 2 +-
+ include/linux/irqdomain.h | 17 +
+ include/linux/irqdomain_defs.h | 2 +
+ include/linux/irqhandler.h | 2 +-
+ include/linux/jiffies.h | 15 +-
+ include/linux/module.h | 2 +-
+ include/linux/msi.h | 24 +-
+ include/linux/objtool.h | 2 +-
+ include/linux/psp-sev.h | 321 +++-
+ include/linux/pti.h | 2 +-
+ include/linux/ptp_kvm.h | 4 +-
+ include/linux/resctrl.h | 48 +-
+ include/linux/smp.h | 2 +
+ include/linux/soc/andes/irq.h | 18 +
+ include/linux/tick.h | 25 +-
+ include/linux/timekeeping.h | 10 +-
+ include/linux/timer.h | 16 +-
+ include/net/netfilter/nf_tables_core.h | 2 +-
+ include/net/tc_wrapper.h | 2 +-
+ include/trace/events/timer_migration.h | 298 ++++
+ include/uapi/linux/psp-sev.h | 59 +
+ include/vdso/datapage.h | 14 +
+ include/vdso/helpers.h | 8 +-
+ init/main.c | 1 -
+ kernel/cpu.c | 26 +-
+ kernel/irq/irq_sim.c | 28 +-
+ kernel/irq/irqdesc.c | 112 +-
+ kernel/irq/irqdomain.c | 28 +-
+ kernel/irq/manage.c | 109 +-
+ kernel/irq/matrix.c | 28 +-
+ kernel/irq/msi.c | 192 ++-
+ kernel/sched/core.c | 4 +-
+ kernel/sched/fair.c | 2 -
+ kernel/sched/idle.c | 1 -
+ kernel/time/Makefile | 3 +
+ kernel/time/clockevents.c | 2 +-
+ kernel/time/clocksource-wdtest.c | 13 +-
+ kernel/time/clocksource.c | 12 +-
+ kernel/time/hrtimer.c | 25 +-
+ kernel/time/tick-common.c | 35 +-
+ kernel/time/tick-internal.h | 16 +
+ kernel/time/tick-sched.c | 361 ++--
+ kernel/time/tick-sched.h | 40 +-
+ kernel/time/time_test.c | 2 +-
+ kernel/time/timekeeping.c | 33 +-
+ kernel/time/timer.c | 591 +++++--
+ kernel/time/timer_list.c | 10 +-
+ kernel/time/timer_migration.c | 1787 ++++++++++++++++++++
+ kernel/time/timer_migration.h | 140 ++
+ kernel/trace/ring_buffer.c | 2 +-
+ kernel/workqueue.c | 2 +-
+ net/netfilter/Makefile | 2 +-
+ net/netfilter/nf_tables_core.c | 6 +-
+ net/netfilter/nft_ct.c | 4 +-
+ net/netfilter/nft_lookup.c | 2 +-
+ net/sched/sch_api.c | 2 +-
+ scripts/Makefile.lib | 8 +-
+ scripts/Makefile.vmlinux_o | 2 +-
+ scripts/atomic/kerneldoc/add_unless | 1 +
+ scripts/atomic/kerneldoc/cmpxchg | 1 +
+ scripts/atomic/kerneldoc/dec_if_positive | 1 +
+ scripts/atomic/kerneldoc/dec_unless_positive | 1 +
+ scripts/atomic/kerneldoc/inc_not_zero | 1 +
+ scripts/atomic/kerneldoc/inc_unless_negative | 1 +
+ scripts/atomic/kerneldoc/try_cmpxchg | 3 +-
+ scripts/generate_rust_target.rs | 2 +-
+ scripts/mod/modpost.c | 2 +-
+ tools/arch/x86/include/asm/cpufeatures.h | 3 +
+ tools/arch/x86/include/asm/disabled-features.h | 18 +-
+ tools/arch/x86/include/asm/msr-index.h | 13 +-
+ tools/arch/x86/lib/insn.c | 58 +-
+ tools/arch/x86/lib/x86-opcode-map.txt | 4 +-
+ tools/objtool/arch/x86/decode.c | 19 +-
+ tools/objtool/arch/x86/special.c | 2 +-
+ tools/objtool/check.c | 4 +-
+ tools/testing/selftests/rcutorture/bin/torture.sh | 2 +-
+ 389 files changed, 12030 insertions(+), 4336 deletions(-)
+ create mode 100644 Documentation/arch/x86/x86_64/fred.rst
+ create mode 100644 Documentation/devicetree/bindings/interrupt-controller/starfive,jh8100-intc.yaml
+ delete mode 100644 arch/arm/include/asm/vdso_datapage.h
+ create mode 100644 arch/x86/entry/entry_64_fred.S
+ create mode 100644 arch/x86/entry/entry_fred.c
+ create mode 100644 arch/x86/include/asm/fred.h
+ create mode 100644 arch/x86/include/asm/setup_data.h
+ create mode 100644 arch/x86/include/uapi/asm/setup_data.h
+ create mode 100644 arch/x86/kernel/cpu/topology.h
+ create mode 100644 arch/x86/kernel/cpu/topology_amd.c
+ create mode 100644 arch/x86/kernel/cpu/topology_common.c
+ create mode 100644 arch/x86/kernel/cpu/topology_ext.c
+ create mode 100644 arch/x86/kernel/fred.c
+ create mode 100644 arch/x86/virt/svm/Makefile
+ create mode 100644 arch/x86/virt/svm/sev.c
+ create mode 100644 drivers/irqchip/irq-starfive-jh8100-intc.c
+ create mode 100644 include/linux/soc/andes/irq.h
+ create mode 100644 include/trace/events/timer_migration.h
+ create mode 100644 kernel/time/timer_migration.c
+ create mode 100644 kernel/time/timer_migration.h
+Merging clockevents/timers/drivers/next (c819dbd07832 dt-bindings: timer: Add support for cadence TTC PWM)
+$ git merge -m Merge branch 'timers/drivers/next' of git://git.linaro.org/people/daniel.lezcano/linux.git clockevents/timers/drivers/next
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/timer/cdns,ttc.yaml | 22 +++-
+ .../bindings/timer/nxp,sysctr-timer.yaml | 4 +-
+ .../bindings/timer/ralink,cevt-systick.yaml | 38 +++++++
+ .../devicetree/bindings/timer/renesas,ostm.yaml | 2 +-
+ .../devicetree/bindings/timer/renesas,tmu.yaml | 18 ++-
+ .../bindings/timer/samsung,exynos4210-mct.yaml | 2 +
+ drivers/clocksource/arm_global_timer.c | 35 +++---
+ drivers/clocksource/timer-imx-gpt.c | 3 +-
+ drivers/clocksource/timer-imx-sysctr.c | 121 +++++++++++++++------
+ drivers/clocksource/timer-stm32.c | 4 +-
+ drivers/clocksource/timer-ti-32k.c | 2 +-
+ 11 files changed, 190 insertions(+), 61 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/timer/ralink,cevt-systick.yaml
+Merging edac/edac-for-next (3513ecaa685c Merge ras/edac-amd-atl into for-next)
+$ git merge -m Merge branch 'edac-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac/edac-for-next
+Auto-merging Documentation/admin-guide/index.rst
+Auto-merging Documentation/index.rst
+CONFLICT (content): Merge conflict in Documentation/index.rst
+Auto-merging MAINTAINERS
+Auto-merging drivers/edac/amd64_edac.c
+Resolved 'Documentation/index.rst' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 2205598ffb76] Merge branch 'edac-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git
+$ git diff -M --stat --summary HEAD^..
+ .../admin-guide/RAS/address-translation.rst | 24 +
+ .../ras.rst => admin-guide/RAS/error-decoding.rst} | 11 +-
+ Documentation/admin-guide/RAS/index.rst | 7 +
+ .../admin-guide/{ras.rst => RAS/main.rst} | 10 +-
+ Documentation/admin-guide/index.rst | 2 +-
+ Documentation/index.rst | 1 -
+ MAINTAINERS | 15 +-
+ drivers/edac/Kconfig | 1 +
+ drivers/edac/amd64_edac.c | 286 +-------
+ drivers/edac/i10nm_base.c | 1 +
+ drivers/edac/igen6_edac.c | 2 +
+ drivers/edac/synopsys_edac.c | 4 +-
+ drivers/edac/versal_edac.c | 193 ++++-
+ drivers/ras/Kconfig | 13 +
+ drivers/ras/Makefile | 3 +
+ drivers/ras/amd/atl/Kconfig | 21 +
+ drivers/ras/amd/atl/Makefile | 18 +
+ drivers/ras/amd/atl/access.c | 133 ++++
+ drivers/ras/amd/atl/core.c | 225 ++++++
+ drivers/ras/amd/atl/dehash.c | 500 +++++++++++++
+ drivers/ras/amd/atl/denormalize.c | 718 ++++++++++++++++++
+ drivers/ras/amd/atl/internal.h | 306 ++++++++
+ drivers/ras/amd/atl/map.c | 682 +++++++++++++++++
+ drivers/ras/amd/atl/reg_fields.h | 606 +++++++++++++++
+ drivers/ras/amd/atl/system.c | 288 ++++++++
+ drivers/ras/amd/atl/umc.c | 341 +++++++++
+ drivers/ras/amd/fmpm.c | 812 +++++++++++++++++++++
+ drivers/ras/ras.c | 31 +
+ include/linux/ras.h | 18 +
+ 29 files changed, 4945 insertions(+), 327 deletions(-)
+ create mode 100644 Documentation/admin-guide/RAS/address-translation.rst
+ rename Documentation/{RAS/ras.rst => admin-guide/RAS/error-decoding.rst} (73%)
+ create mode 100644 Documentation/admin-guide/RAS/index.rst
+ rename Documentation/admin-guide/{ras.rst => RAS/main.rst} (99%)
+ create mode 100644 drivers/ras/amd/atl/Kconfig
+ create mode 100644 drivers/ras/amd/atl/Makefile
+ create mode 100644 drivers/ras/amd/atl/access.c
+ create mode 100644 drivers/ras/amd/atl/core.c
+ create mode 100644 drivers/ras/amd/atl/dehash.c
+ create mode 100644 drivers/ras/amd/atl/denormalize.c
+ create mode 100644 drivers/ras/amd/atl/internal.h
+ create mode 100644 drivers/ras/amd/atl/map.c
+ create mode 100644 drivers/ras/amd/atl/reg_fields.h
+ create mode 100644 drivers/ras/amd/atl/system.c
+ create mode 100644 drivers/ras/amd/atl/umc.c
+ create mode 100644 drivers/ras/amd/fmpm.c
+$ git am -3 ../patches/0001-fix-up-for-RAS-Introduce-AMD-Address-Translation-Lib.patch
+Applying: fix up for "RAS: Introduce AMD Address Translation Library"
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/ras/amd/atl/umc.c
+$ git add -A .
+$ git commit -v -a --amend
+[master d9521d7e8e44] Merge branch 'edac-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git
+ Date: Wed Feb 28 11:56:45 2024 +1100
+Merging ftrace/for-next (a641f0533adb tracing: Decrement the snapshot if the snapshot trigger fails to register)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git ftrace/for-next
+Auto-merging fs/nfsd/trace.h
+Auto-merging kernel/trace/ring_buffer.c
+Merge made by the 'ort' strategy.
+ Documentation/trace/index.rst | 1 +
+ Documentation/trace/ring-buffer-map.rst | 106 +++
+ Documentation/trace/user_events.rst | 27 +-
+ drivers/gpu/drm/i915/display/intel_display_trace.h | 6 +-
+ fs/nfsd/trace.h | 2 +-
+ fs/tracefs/event_inode.c | 70 +-
+ fs/tracefs/internal.h | 2 -
+ include/linux/ring_buffer.h | 7 +
+ include/linux/trace_events.h | 3 +
+ include/trace/events/sunrpc.h | 12 +-
+ include/trace/stages/stage2_data_offsets.h | 4 +-
+ include/trace/stages/stage5_get_offsets.h | 15 +-
+ include/trace/stages/stage6_event_callback.h | 12 +-
+ include/uapi/linux/trace_mmap.h | 48 ++
+ include/uapi/linux/user_events.h | 6 +-
+ kernel/trace/ring_buffer.c | 385 ++++++++++-
+ kernel/trace/trace.c | 747 ++++++---------------
+ kernel/trace/trace.h | 19 +-
+ kernel/trace/trace_events_trigger.c | 63 +-
+ kernel/trace/trace_events_user.c | 209 ++++--
+ kernel/trace/trace_sched_switch.c | 515 ++++++++++++++
+ tools/testing/selftests/ring-buffer/Makefile | 8 +
+ tools/testing/selftests/ring-buffer/config | 2 +
+ tools/testing/selftests/ring-buffer/map_test.c | 273 ++++++++
+ tools/testing/selftests/user_events/abi_test.c | 134 ++++
+ 25 files changed, 2024 insertions(+), 652 deletions(-)
+ create mode 100644 Documentation/trace/ring-buffer-map.rst
+ create mode 100644 include/uapi/linux/trace_mmap.h
+ create mode 100644 tools/testing/selftests/ring-buffer/Makefile
+ create mode 100644 tools/testing/selftests/ring-buffer/config
+ create mode 100644 tools/testing/selftests/ring-buffer/map_test.c
+Merging rcu/rcu/next (10395f8cfef8 tracing: Select new NEED_TASKS_RCU Kconfig option)
+ 020eee167cca ("x86/nmi: Fix "in NMI handler" check")
+$ git merge -m Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git rcu/rcu/next
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+CONFLICT (content): Merge conflict in Documentation/admin-guide/kernel-parameters.txt
+Auto-merging arch/Kconfig
+Auto-merging arch/x86/kernel/nmi.c
+Auto-merging arch/x86/kernel/tsc.c
+Auto-merging include/linux/sched.h
+Auto-merging kernel/bpf/Kconfig
+Auto-merging kernel/fork.c
+Auto-merging kernel/trace/ftrace.c
+Auto-merging tools/testing/selftests/rcutorture/bin/torture.sh
+Resolved 'Documentation/admin-guide/kernel-parameters.txt' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master d44078cb3188] Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
+$ git diff -M --stat --summary HEAD^..
+ Documentation/RCU/checklist.rst | 32 +-
+ Documentation/RCU/rcu_dereference.rst | 5 +-
+ Documentation/RCU/whatisRCU.rst | 25 +-
+ Documentation/admin-guide/kernel-parameters.rst | 1 +
+ Documentation/admin-guide/kernel-parameters.txt | 503 +++++++++--------
+ Documentation/atomic_t.txt | 4 +-
+ Documentation/litmus-tests/README | 45 ++
+ .../atomic/cmpxchg-fail-ordered-1.litmus | 34 ++
+ .../atomic/cmpxchg-fail-ordered-2.litmus | 30 ++
+ .../atomic/cmpxchg-fail-unordered-1.litmus | 33 ++
+ .../atomic/cmpxchg-fail-unordered-2.litmus | 30 ++
+ arch/Kconfig | 4 +-
+ arch/x86/kernel/tsc.c | 2 +-
+ fs/proc/bootconfig.c | 12 +-
+ include/linux/rcu_sync.h | 1 -
+ include/linux/rcupdate.h | 6 +-
+ include/linux/sched.h | 2 +
+ include/linux/srcutiny.h | 2 +
+ include/trace/events/rcu.h | 27 +
+ init/init_task.c | 1 +
+ kernel/bpf/Kconfig | 2 +-
+ kernel/context_tracking.c | 4 +
+ kernel/fork.c | 1 +
+ kernel/rcu/Kconfig | 21 +-
+ kernel/rcu/rcu.h | 19 +-
+ kernel/rcu/rcuscale.c | 6 +-
+ kernel/rcu/rcutorture.c | 17 +-
+ kernel/rcu/srcutiny.c | 31 +-
+ kernel/rcu/srcutree.c | 24 +-
+ kernel/rcu/sync.c | 16 -
+ kernel/rcu/tasks.h | 135 +++--
+ kernel/rcu/tiny.c | 1 +
+ kernel/rcu/tree.c | 600 ++++++++++++++++++---
+ kernel/rcu/tree.h | 40 +-
+ kernel/rcu/tree_exp.h | 85 +--
+ kernel/rcu/tree_nocb.h | 69 +--
+ kernel/rcu/tree_plugin.h | 52 +-
+ kernel/trace/Kconfig | 4 +-
+ kernel/trace/ftrace.c | 13 +-
+ tools/testing/selftests/rcutorture/bin/torture.sh | 4 +-
+ .../selftests/rcutorture/configs/rcu/TREE09 | 5 +-
+ 41 files changed, 1351 insertions(+), 597 deletions(-)
+ create mode 100644 Documentation/litmus-tests/atomic/cmpxchg-fail-ordered-1.litmus
+ create mode 100644 Documentation/litmus-tests/atomic/cmpxchg-fail-ordered-2.litmus
+ create mode 100644 Documentation/litmus-tests/atomic/cmpxchg-fail-unordered-1.litmus
+ create mode 100644 Documentation/litmus-tests/atomic/cmpxchg-fail-unordered-2.litmus
+Merging kvm/next (0cbca1bf44a0 x86: irq: unconditionally define KVM interrupt vectors)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next
+Auto-merging arch/arm64/Kconfig
+Auto-merging arch/arm64/kvm/Kconfig
+Auto-merging arch/loongarch/Kconfig
+CONFLICT (content): Merge conflict in arch/loongarch/Kconfig
+Auto-merging arch/mips/Kconfig
+Auto-merging arch/s390/Kconfig
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/x86/include/asm/idtentry.h
+Auto-merging arch/x86/kernel/idt.c
+Auto-merging arch/x86/kvm/Kconfig
+Resolved 'arch/loongarch/Kconfig' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 289681013836] Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git
+$ git diff -M --stat --summary HEAD^..
+ arch/arm64/Kconfig | 1 -
+ arch/arm64/include/uapi/asm/kvm.h | 15 +-
+ arch/arm64/kvm/Kconfig | 3 +-
+ arch/loongarch/Kconfig | 1 -
+ arch/loongarch/include/uapi/asm/kvm.h | 2 -
+ arch/loongarch/kvm/Kconfig | 2 +-
+ arch/mips/Kconfig | 18 +-
+ arch/mips/include/uapi/asm/kvm.h | 2 -
+ arch/mips/kvm/Kconfig | 3 +-
+ arch/powerpc/include/uapi/asm/kvm.h | 45 +-
+ arch/powerpc/kvm/Kconfig | 1 -
+ arch/riscv/include/uapi/asm/kvm.h | 1 -
+ arch/riscv/kvm/Kconfig | 1 +
+ arch/s390/Kconfig | 1 -
+ arch/s390/include/uapi/asm/kvm.h | 315 +++++++++++++-
+ arch/s390/kvm/Kconfig | 1 -
+ arch/x86/Kconfig | 1 -
+ arch/x86/include/asm/hardirq.h | 2 +-
+ arch/x86/include/asm/idtentry.h | 2 +-
+ arch/x86/include/asm/irq.h | 2 +-
+ arch/x86/include/asm/irq_vectors.h | 2 -
+ arch/x86/include/uapi/asm/kvm.h | 278 ++++++++++++-
+ arch/x86/include/uapi/asm/kvm_para.h | 2 +-
+ arch/x86/kernel/idt.c | 2 +-
+ arch/x86/kernel/irq.c | 4 +-
+ arch/x86/kvm/Kconfig | 4 +-
+ drivers/vfio/vfio.h | 2 +-
+ drivers/vfio/vfio_main.c | 4 +-
+ include/linux/bits.h | 8 +-
+ include/uapi/asm-generic/bitsperlong.h | 4 +
+ include/uapi/linux/bits.h | 15 +
+ include/uapi/linux/kvm.h | 689 +------------------------------
+ scripts/gdb/linux/constants.py.in | 6 +-
+ scripts/gdb/linux/interrupts.py | 2 +-
+ tools/arch/x86/include/asm/irq_vectors.h | 2 +-
+ virt/kvm/Kconfig | 7 +-
+ virt/kvm/kvm_main.c | 2 +-
+ 37 files changed, 699 insertions(+), 753 deletions(-)
+ create mode 100644 include/uapi/linux/bits.h
+Merging kvm-arm/next (8b177908c5fe Merge branch kvm-arm64/vm-configuration into kvmarm/next)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm/next
+Auto-merging arch/arm64/include/asm/cpufeature.h
+Auto-merging arch/arm64/include/asm/kvm_emulate.h
+Auto-merging arch/arm64/include/asm/memory.h
+Auto-merging arch/arm64/kernel/cpufeature.c
+CONFLICT (content): Merge conflict in arch/arm64/kernel/cpufeature.c
+Auto-merging arch/arm64/kernel/head.S
+Auto-merging arch/arm64/kvm/Kconfig
+Auto-merging arch/arm64/kvm/guest.c
+Auto-merging arch/arm64/kvm/hyp/pgtable.c
+Auto-merging arch/arm64/kvm/mmu.c
+Auto-merging arch/arm64/kvm/vgic/vgic-its.c
+Auto-merging arch/arm64/tools/cpucaps
+Auto-merging arch/arm64/tools/sysreg
+Auto-merging include/linux/mm.h
+Auto-merging tools/testing/selftests/kvm/aarch64/arch_timer.c
+Auto-merging tools/testing/selftests/kvm/aarch64/hypercalls.c
+Auto-merging tools/testing/selftests/kvm/aarch64/page_fault_test.c
+Auto-merging tools/testing/selftests/kvm/aarch64/vpmu_counter_access.c
+Auto-merging virt/kvm/kvm_main.c
+Resolved 'arch/arm64/kernel/cpufeature.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 9c1a57c10852] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git
+$ git diff -M --stat --summary HEAD^..
+ arch/arm64/include/asm/cpu.h | 1 +
+ arch/arm64/include/asm/cpufeature.h | 1 +
+ arch/arm64/include/asm/kvm_arm.h | 4 +-
+ arch/arm64/include/asm/kvm_emulate.h | 3 +-
+ arch/arm64/include/asm/kvm_host.h | 99 +++++++-
+ arch/arm64/include/asm/kvm_hyp.h | 2 +-
+ arch/arm64/include/asm/kvm_mmu.h | 46 ++--
+ arch/arm64/include/asm/kvm_nested.h | 1 -
+ arch/arm64/include/asm/kvm_pgtable.h | 2 +
+ arch/arm64/include/asm/memory.h | 2 +
+ arch/arm64/include/asm/sysreg.h | 5 +-
+ arch/arm64/kernel/cpufeature.c | 105 +++++++-
+ arch/arm64/kernel/cpuinfo.c | 1 +
+ arch/arm64/kernel/head.S | 23 +-
+ arch/arm64/kvm/Kconfig | 12 +-
+ arch/arm64/kvm/arch_timer.c | 2 +-
+ arch/arm64/kvm/arm.c | 14 +-
+ arch/arm64/kvm/check-res-bits.h | 125 ++++++++++
+ arch/arm64/kvm/debug.c | 3 +-
+ arch/arm64/kvm/emulate-nested.c | 231 ++++++++++++-----
+ arch/arm64/kvm/fpsimd.c | 2 +-
+ arch/arm64/kvm/guest.c | 7 +-
+ arch/arm64/kvm/hyp/aarch32.c | 4 +-
+ arch/arm64/kvm/hyp/include/hyp/switch.h | 130 +++++-----
+ arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h | 24 +-
+ arch/arm64/kvm/hyp/nvhe/host.S | 2 +-
+ arch/arm64/kvm/hyp/nvhe/mm.c | 4 +-
+ arch/arm64/kvm/hyp/pgtable.c | 24 +-
+ arch/arm64/kvm/hyp/vhe/sysreg-sr.c | 2 +-
+ arch/arm64/kvm/inject_fault.c | 2 +-
+ arch/arm64/kvm/mmu.c | 16 +-
+ arch/arm64/kvm/nested.c | 274 ++++++++++++++++++++-
+ arch/arm64/kvm/pmu-emul.c | 15 +-
+ arch/arm64/kvm/sys_regs.c | 268 ++++++++++++++++----
+ arch/arm64/kvm/sys_regs.h | 2 +
+ arch/arm64/kvm/vgic/vgic-debug.c | 2 +-
+ arch/arm64/kvm/vgic/vgic-init.c | 10 +-
+ arch/arm64/kvm/vgic/vgic-its.c | 65 +++--
+ arch/arm64/kvm/vgic/vgic-v3.c | 3 +-
+ arch/arm64/kvm/vgic/vgic.c | 62 ++---
+ arch/arm64/kvm/vgic/vgic.h | 17 +-
+ arch/arm64/tools/cpucaps | 1 +
+ arch/arm64/tools/sysreg | 45 +++-
+ arch/powerpc/kvm/powerpc.c | 3 +-
+ arch/x86/kvm/debugfs.c | 3 +-
+ drivers/vfio/pci/vfio_pci_core.c | 19 +-
+ include/kvm/arm_pmu.h | 11 -
+ include/kvm/arm_vgic.h | 9 +-
+ include/linux/kvm_host.h | 2 +-
+ include/linux/mm.h | 14 ++
+ tools/testing/selftests/kvm/aarch64/arch_timer.c | 4 +-
+ .../selftests/kvm/aarch64/debug-exceptions.c | 2 +-
+ tools/testing/selftests/kvm/aarch64/hypercalls.c | 4 +-
+ .../selftests/kvm/aarch64/page_fault_test.c | 2 +-
+ tools/testing/selftests/kvm/aarch64/set_id_regs.c | 18 +-
+ .../selftests/kvm/aarch64/vpmu_counter_access.c | 12 +-
+ virt/kvm/kvm_main.c | 8 +-
+ 57 files changed, 1406 insertions(+), 368 deletions(-)
+ create mode 100644 arch/arm64/kvm/check-res-bits.h
+$ git am -3 ../patches/0001-fix-up-for-arm64-sysreg-Add-register-fields-for-ID_A.patch
+Applying: fix up for "arm64/sysreg: Add register fields for ID_AA64DFR1_EL1"
+$ git reset HEAD^
+Unstaged changes after reset:
+M arch/arm64/kvm/check-res-bits.h
+$ git add -A .
+$ git commit -v -a --amend
+[master 745934d4ded5] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git
+ Date: Wed Feb 28 12:15:14 2024 +1100
+Merging kvms390/next (00de073e2420 KVM: s390: selftest: memop: Fix undefined behavior)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390/next
+Auto-merging arch/s390/kvm/interrupt.c
+Auto-merging arch/s390/kvm/kvm-s390.c
+Auto-merging tools/testing/selftests/kvm/s390x/memop.c
+Merge made by the 'ort' strategy.
+ arch/s390/kvm/interrupt.c | 4 ++--
+ arch/s390/kvm/kvm-s390.c | 2 +-
+ tools/testing/selftests/kvm/s390x/memop.c | 2 ++
+ 3 files changed, 5 insertions(+), 3 deletions(-)
+Merging kvm-ppc/topic/ppc-kvm (41bccc98fb79 Linux 6.8-rc2)
+$ git merge -m Merge branch 'topic/ppc-kvm' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git kvm-ppc/topic/ppc-kvm
+Already up to date.
+Merging kvm-riscv/riscv_kvm_next (f072b272aa27 RISC-V: KVM: Use correct restricted types)
+$ git merge -m Merge branch 'riscv_kvm_next' of https://github.com/kvm-riscv/linux.git kvm-riscv/riscv_kvm_next
+Already up to date.
+Merging kvm-x86/next (f3ac6b5aec49 Merge branch 'xen')
+$ git merge -m Merge branch 'next' of https://github.com/kvm-x86/linux.git kvm-x86/next
+Auto-merging arch/s390/kvm/gaccess.c
+Auto-merging arch/s390/kvm/kvm-s390.c
+Auto-merging arch/x86/include/asm/kvm-x86-ops.h
+Auto-merging arch/x86/include/asm/kvm_host.h
+Auto-merging arch/x86/kernel/kvm.c
+Auto-merging arch/x86/kvm/Kconfig
+Auto-merging arch/x86/kvm/lapic.c
+Auto-merging arch/x86/kvm/mmu/mmu.c
+Auto-merging arch/x86/kvm/svm/sev.c
+CONFLICT (content): Merge conflict in arch/x86/kvm/svm/sev.c
+Auto-merging arch/x86/kvm/svm/svm.c
+Auto-merging arch/x86/kvm/vmx/vmx.c
+Auto-merging include/linux/kvm_host.h
+Auto-merging tools/testing/selftests/kvm/Makefile
+Auto-merging virt/kvm/kvm_main.c
+Resolved 'arch/x86/kvm/svm/sev.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 6e9a1d8a2493] Merge branch 'next' of https://github.com/kvm-x86/linux.git
+$ git diff -M --stat --summary HEAD^..
+ Documentation/virt/kvm/api.rst | 56 +-
+ Documentation/virt/kvm/x86/msr.rst | 19 +-
+ arch/s390/kvm/diag.c | 2 +-
+ arch/s390/kvm/gaccess.c | 14 +-
+ arch/s390/kvm/kvm-s390.c | 4 +-
+ arch/s390/kvm/priv.c | 4 +-
+ arch/s390/kvm/sigp.c | 2 +-
+ arch/x86/include/asm/kvm-x86-ops.h | 1 -
+ arch/x86/include/asm/kvm-x86-pmu-ops.h | 4 +-
+ arch/x86/include/asm/kvm_host.h | 28 +-
+ arch/x86/include/asm/svm.h | 8 +-
+ arch/x86/include/asm/vmxfeatures.h | 1 +
+ arch/x86/include/uapi/asm/kvm.h | 9 +-
+ arch/x86/include/uapi/asm/kvm_para.h | 1 -
+ arch/x86/kernel/cpu/feat_ctl.c | 2 +
+ arch/x86/kernel/kvm.c | 11 +-
+ arch/x86/kvm/Kconfig | 7 +-
+ arch/x86/kvm/emulate.c | 47 +-
+ arch/x86/kvm/kvm_emulate.h | 4 +-
+ arch/x86/kvm/lapic.c | 27 +-
+ arch/x86/kvm/mmu/mmu.c | 79 ++-
+ arch/x86/kvm/mmu/page_track.c | 68 ++-
+ arch/x86/kvm/mmu/tdp_mmu.c | 124 +++--
+ arch/x86/kvm/mmu/tdp_mmu.h | 2 +-
+ arch/x86/kvm/pmu.c | 163 ++++--
+ arch/x86/kvm/pmu.h | 57 +-
+ arch/x86/kvm/smm.c | 15 +-
+ arch/x86/kvm/svm/pmu.c | 22 +-
+ arch/x86/kvm/svm/sev.c | 58 +-
+ arch/x86/kvm/svm/svm.c | 25 +-
+ arch/x86/kvm/trace.h | 19 +-
+ arch/x86/kvm/vmx/nested.c | 4 +-
+ arch/x86/kvm/vmx/pmu_intel.c | 222 +++-----
+ arch/x86/kvm/vmx/vmx.c | 157 +++---
+ arch/x86/kvm/vmx/vmx.h | 2 -
+ arch/x86/kvm/x86.c | 179 +++---
+ arch/x86/kvm/x86.h | 6 -
+ arch/x86/kvm/xen.c | 173 ++++--
+ include/linux/kvm_host.h | 84 ++-
+ include/linux/kvm_types.h | 8 -
+ tools/testing/selftests/kvm/Makefile | 4 +
+ .../selftests/kvm/include/aarch64/kvm_util_arch.h | 7 +
+ .../selftests/kvm/include/kvm_test_harness.h | 36 ++
+ .../testing/selftests/kvm/include/kvm_util_base.h | 65 ++-
+ .../selftests/kvm/include/riscv/kvm_util_arch.h | 7 +
+ .../selftests/kvm/include/s390x/kvm_util_arch.h | 7 +
+ tools/testing/selftests/kvm/include/sparsebit.h | 56 +-
+ .../selftests/kvm/include/x86_64/kvm_util_arch.h | 23 +
+ tools/testing/selftests/kvm/include/x86_64/pmu.h | 97 ++++
+ .../selftests/kvm/include/x86_64/processor.h | 156 ++++--
+ tools/testing/selftests/kvm/include/x86_64/sev.h | 107 ++++
+ .../testing/selftests/kvm/lib/aarch64/processor.c | 23 +-
+ tools/testing/selftests/kvm/lib/kvm_util.c | 129 ++++-
+ tools/testing/selftests/kvm/lib/riscv/processor.c | 9 +-
+ tools/testing/selftests/kvm/lib/s390x/processor.c | 13 +-
+ tools/testing/selftests/kvm/lib/sparsebit.c | 48 +-
+ tools/testing/selftests/kvm/lib/ucall_common.c | 3 +-
+ tools/testing/selftests/kvm/lib/x86_64/pmu.c | 31 ++
+ tools/testing/selftests/kvm/lib/x86_64/processor.c | 60 +-
+ tools/testing/selftests/kvm/lib/x86_64/sev.c | 114 ++++
+ .../testing/selftests/kvm/set_memory_region_test.c | 12 +-
+ .../selftests/kvm/x86_64/fix_hypercall_test.c | 27 +-
+ .../selftests/kvm/x86_64/pmu_counters_test.c | 620 +++++++++++++++++++++
+ .../selftests/kvm/x86_64/pmu_event_filter_test.c | 143 ++---
+ .../selftests/kvm/x86_64/sev_migrate_tests.c | 60 +-
+ .../testing/selftests/kvm/x86_64/sev_smoke_test.c | 88 +++
+ .../kvm/x86_64/smaller_maxphyaddr_emulation_test.c | 2 +-
+ .../testing/selftests/kvm/x86_64/sync_regs_test.c | 127 +++--
+ .../selftests/kvm/x86_64/userspace_msr_exit_test.c | 78 +--
+ .../selftests/kvm/x86_64/vmx_pmu_caps_test.c | 54 +-
+ .../testing/selftests/kvm/x86_64/xen_shinfo_test.c | 59 +-
+ virt/kvm/async_pf.c | 73 ++-
+ virt/kvm/kvm_main.c | 35 +-
+ virt/kvm/pfncache.c | 230 ++++----
+ 74 files changed, 3104 insertions(+), 1217 deletions(-)
+ create mode 100644 tools/testing/selftests/kvm/include/aarch64/kvm_util_arch.h
+ create mode 100644 tools/testing/selftests/kvm/include/kvm_test_harness.h
+ create mode 100644 tools/testing/selftests/kvm/include/riscv/kvm_util_arch.h
+ create mode 100644 tools/testing/selftests/kvm/include/s390x/kvm_util_arch.h
+ create mode 100644 tools/testing/selftests/kvm/include/x86_64/kvm_util_arch.h
+ create mode 100644 tools/testing/selftests/kvm/include/x86_64/pmu.h
+ create mode 100644 tools/testing/selftests/kvm/include/x86_64/sev.h
+ create mode 100644 tools/testing/selftests/kvm/lib/x86_64/pmu.c
+ create mode 100644 tools/testing/selftests/kvm/lib/x86_64/sev.c
+ create mode 100644 tools/testing/selftests/kvm/x86_64/pmu_counters_test.c
+ create mode 100644 tools/testing/selftests/kvm/x86_64/sev_smoke_test.c
+Merging xen-tip/linux-next (fa765c4b4aed xen/events: close evtchn after mapping cleanup)
+$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next
+Already up to date.
+Merging percpu/for-next (2d9ad81ef935 Merge branch 'for-6.8-fixes' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git percpu/for-next
+Merge made by the 'ort' strategy.
+Merging workqueues/for-next (a0b5824d0a11 Merge branch 'for-6.9' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Auto-merging include/linux/usb/hcd.h
+Auto-merging kernel/workqueue.c
+Merge made by the 'ort' strategy.
+ Documentation/admin-guide/kernel-parameters.txt | 9 +++++++++
+ drivers/usb/core/hcd.c | 23 ++++++++++++-----------
+ include/linux/usb/hcd.h | 2 +-
+ include/linux/workqueue.h | 3 +++
+ kernel/backtracetest.c | 18 +++++++-----------
+ kernel/workqueue.c | 14 +++++++++++---
+ 6 files changed, 43 insertions(+), 26 deletions(-)
+Merging drivers-x86/for-next (dcea652564a4 Revert "platform/x86: asus-wmi: Support WMI event queue")
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86/for-next
+Auto-merging drivers/platform/x86/thinkpad_acpi.c
+Merge made by the 'ort' strategy.
+ .../admin-guide/laptops/thinkpad-acpi.rst | 7 +-
+ Documentation/wmi/acpi-interface.rst | 5 +-
+ drivers/platform/mellanox/mlxbf-bootctl.c | 14 +-
+ drivers/platform/mellanox/mlxbf-pmc.c | 210 ++++----
+ .../platform/surface/surface_aggregator_registry.c | 7 +
+ drivers/platform/x86/Kconfig | 6 -
+ drivers/platform/x86/amd/Kconfig | 2 +-
+ drivers/platform/x86/amd/hsmp.c | 584 ++++++++++++++++-----
+ drivers/platform/x86/asus-wmi.c | 72 +--
+ drivers/platform/x86/dell/Kconfig | 3 -
+ drivers/platform/x86/dell/dell-laptop.c | 2 -
+ drivers/platform/x86/dell/dell-wmi-privacy.c | 1 -
+ drivers/platform/x86/fujitsu-laptop.c | 117 +++++
+ drivers/platform/x86/hp/hp-wmi.c | 71 ++-
+ drivers/platform/x86/huawei-wmi.c | 1 -
+ drivers/platform/x86/ibm_rtl.c | 2 +-
+ drivers/platform/x86/ideapad-laptop.c | 2 +
+ drivers/platform/x86/intel/ifs/load.c | 2 +-
+ drivers/platform/x86/intel/ifs/runtest.c | 101 ++--
+ drivers/platform/x86/silicom-platform.c | 7 +-
+ drivers/platform/x86/thinkpad_acpi.c | 246 ++++++---
+ drivers/platform/x86/wmi.c | 156 +++---
+ include/linux/wmi.h | 2 +-
+ include/trace/events/intel_ifs.h | 12 +-
+ 24 files changed, 1111 insertions(+), 521 deletions(-)
+Merging chrome-platform/for-next (6613476e225e Linux 6.8-rc1)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform/for-next
+Already up to date.
+Merging chrome-platform-firmware/for-firmware-next (8a0a62941a04 firmware: coreboot: Replace tag with id table in driver struct)
+$ git merge -m Merge branch 'for-firmware-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform-firmware/for-firmware-next
+Merge made by the 'ort' strategy.
+ drivers/firmware/google/cbmem.c | 8 +++++++-
+ drivers/firmware/google/coreboot_table.c | 22 ++++++++++++++++++++--
+ drivers/firmware/google/coreboot_table.h | 3 ++-
+ drivers/firmware/google/framebuffer-coreboot.c | 8 +++++++-
+ drivers/firmware/google/memconsole-coreboot.c | 8 +++++++-
+ drivers/firmware/google/vpd.c | 8 +++++++-
+ include/linux/mod_devicetable.h | 10 ++++++++++
+ scripts/mod/devicetable-offsets.c | 3 +++
+ scripts/mod/file2alias.c | 10 ++++++++++
+ 9 files changed, 73 insertions(+), 7 deletions(-)
+Merging hsi/for-next (3693760295e8 HSI: ssi_protocol: fix struct members kernel-doc warnings)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git hsi/for-next
+Merge made by the 'ort' strategy.
+ drivers/hsi/clients/ssi_protocol.c | 3 ++-
+ drivers/hsi/hsi_core.c | 2 +-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+Merging leds-lj/for-leds-next (3e7b2b9309cd leds: sgm3140: Add missing timer cleanup and flash gpio control)
+$ git merge -m Merge branch 'for-leds-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/leds.git leds-lj/for-leds-next
+Auto-merging MAINTAINERS
+Auto-merging drivers/leds/Kconfig
+Auto-merging drivers/leds/flash/Kconfig
+CONFLICT (content): Merge conflict in drivers/leds/flash/Kconfig
+Resolved 'drivers/leds/flash/Kconfig' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master eb4ffa495f26] Merge branch 'for-leds-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/leds.git
+$ git diff -M --stat --summary HEAD^..
+ .../ABI/testing/sysfs-class-led-trigger-netdev | 12 +
+ .../ABI/testing/sysfs-class-led-trigger-tty | 14 +-
+ .../devicetree/bindings/leds/leds-qcom-lpg.yaml | 82 ++++-
+ drivers/Makefile | 2 +-
+ drivers/leds/Kconfig | 10 +-
+ drivers/leds/flash/Kconfig | 5 +-
+ drivers/leds/flash/leds-sgm3140.c | 3 +
+ drivers/leds/led-class.c | 6 +
+ drivers/leds/led-triggers.c | 38 ++-
+ drivers/leds/leds-aw200xx.c | 2 +-
+ drivers/leds/leds-aw2013.c | 1 +
+ drivers/leds/leds-pca963x.c | 28 ++
+ drivers/leds/leds-spi-byte.c | 11 +-
+ drivers/leds/leds.h | 1 -
+ drivers/leds/rgb/Kconfig | 1 +
+ drivers/leds/rgb/leds-group-multicolor.c | 8 +-
+ drivers/leds/rgb/leds-qcom-lpg.c | 364 +++++++++++++++++++--
+ drivers/leds/trigger/ledtrig-audio.c | 2 +
+ drivers/leds/trigger/ledtrig-default-on.c | 1 +
+ drivers/leds/trigger/ledtrig-netdev.c | 102 +++++-
+ drivers/leds/trigger/ledtrig-panic.c | 23 +-
+ drivers/staging/greybus/Kconfig | 2 +-
+ drivers/staging/greybus/light.c | 21 --
+ include/dt-bindings/leds/common.h | 3 +
+ include/linux/led-class-flash.h | 24 --
+ include/linux/led-class-multicolor.h | 29 --
+ include/linux/leds.h | 19 --
+ 27 files changed, 631 insertions(+), 183 deletions(-)
+Merging ipmi/for-next (296455ade1fd Merge tag 'char-misc-6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc)
+$ git merge -m Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git ipmi/for-next
+Already up to date.
+Merging driver-core/driver-core-next (01aacda0b10e Merge tag 'sysfs_hidden_attribute_groups-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core into driver-core-next)
+$ git merge -m Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core/driver-core-next
+Auto-merging drivers/base/cpu.c
+Auto-merging include/linux/cpu.h
+Auto-merging kernel/ksysfs.c
+Auto-merging kernel/workqueue.c
+Merge made by the 'ort' strategy.
+ drivers/base/component.c | 4 +--
+ drivers/base/cpu.c | 2 +-
+ fs/kernfs/dir.c | 31 ++++++++++++++--------
+ fs/kernfs/file.c | 8 +++---
+ fs/kernfs/kernfs-internal.h | 2 ++
+ fs/sysfs/group.c | 45 +++++++++++++++++++++++++-------
+ include/linux/cpu.h | 2 +-
+ include/linux/kernfs.h | 10 ++++---
+ include/linux/kobject.h | 2 +-
+ include/linux/sysfs.h | 63 ++++++++++++++++++++++++++++++++++++---------
+ kernel/ksysfs.c | 2 +-
+ kernel/workqueue.c | 2 +-
+ lib/kobject_uevent.c | 24 ++++++++---------
+ 13 files changed, 138 insertions(+), 59 deletions(-)
+Merging usb/usb-next (a560a5672826 Merge v6.8-rc6 into usb-next)
+$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next
+Auto-merging Documentation/devicetree/bindings/regulator/qcom,usb-vbus-regulator.yaml
+CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/regulator/qcom,usb-vbus-regulator.yaml
+Auto-merging Documentation/devicetree/bindings/soc/qcom/qcom,pmic-glink.yaml
+Auto-merging arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts
+Auto-merging arch/arm64/boot/dts/qcom/sc7280.dtsi
+Auto-merging drivers/usb/core/hcd.c
+Auto-merging tools/testing/selftests/Makefile
+Resolved 'Documentation/devicetree/bindings/regulator/qcom,usb-vbus-regulator.yaml' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master a4108ebb3e19] Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/testing/configfs-usb-gadget-ffs | 12 +-
+ Documentation/ABI/testing/sysfs-class-usb_role | 6 +
+ .../regulator/qcom,usb-vbus-regulator.yaml | 1 +
+ .../bindings/soc/qcom/qcom,pmic-glink.yaml | 1 +
+ .../devicetree/bindings/sound/qcom,q6usb.yaml | 55 +
+ .../devicetree/bindings/usb/ci-hdrc-usb2.yaml | 2 +-
+ .../devicetree/bindings/usb/fcs,fsa4480.yaml | 12 +-
+ .../devicetree/bindings/usb/generic-ehci.yaml | 1 +
+ .../devicetree/bindings/usb/gpio-sbu-mux.yaml | 12 +-
+ .../devicetree/bindings/usb/ite,it5205.yaml | 72 ++
+ .../devicetree/bindings/usb/mediatek,mtu3.yaml | 5 +-
+ .../devicetree/bindings/usb/microchip,usb5744.yaml | 2 -
+ .../devicetree/bindings/usb/nxp,ptn36502.yaml | 12 +-
+ .../devicetree/bindings/usb/onnn,nb7vpq904m.yaml | 13 +-
+ .../devicetree/bindings/usb/qcom,pmic-typec.yaml | 32 +-
+ .../bindings/usb/qcom,wcd939x-usbss.yaml | 12 +-
+ .../devicetree/bindings/usb/ti,am62-usb.yaml | 8 +-
+ .../devicetree/bindings/usb/usb-nop-xceiv.yaml | 11 +-
+ .../devicetree/bindings/usb/usb-switch.yaml | 67 +
+ Documentation/devicetree/bindings/usb/usb.yaml | 2 +
+ Documentation/usb/functionfs.rst | 36 +
+ Documentation/usb/gadget-testing.rst | 8 +
+ drivers/phy/Kconfig | 1 +
+ drivers/phy/Makefile | 1 +
+ drivers/phy/phy-core.c | 47 +
+ drivers/phy/realtek/Kconfig | 32 +
+ drivers/phy/realtek/Makefile | 3 +
+ drivers/phy/realtek/phy-rtk-usb2.c | 1312 ++++++++++++++++++++
+ drivers/phy/realtek/phy-rtk-usb3.c | 748 +++++++++++
+ drivers/platform/chrome/cros_ec_typec.c | 19 +
+ drivers/usb/core/Kconfig | 27 +
+ drivers/usb/core/driver.c | 8 +-
+ drivers/usb/core/endpoint.c | 2 +-
+ drivers/usb/core/hcd.c | 20 +-
+ drivers/usb/core/hub.c | 29 +
+ drivers/usb/core/message.c | 2 +-
+ drivers/usb/core/phy.c | 120 ++
+ drivers/usb/core/phy.h | 3 +
+ drivers/usb/core/port.c | 2 +-
+ drivers/usb/core/sysfs.c | 22 +-
+ drivers/usb/core/usb.c | 2 +-
+ drivers/usb/core/usb.h | 8 +-
+ drivers/usb/dwc3/core.h | 1 +
+ drivers/usb/dwc3/dwc3-of-simple.c | 3 +-
+ drivers/usb/dwc3/ep0.c | 1 +
+ drivers/usb/dwc3/gadget.c | 91 +-
+ drivers/usb/dwc3/gadget.h | 1 +
+ drivers/usb/dwc3/host.c | 50 +
+ drivers/usb/gadget/Kconfig | 1 +
+ drivers/usb/gadget/function/f_fs.c | 533 +++++++-
+ drivers/usb/gadget/function/u_ether.c | 2 +-
+ drivers/usb/gadget/function/uvc_video.c | 123 +-
+ drivers/usb/gadget/udc/core.c | 7 +-
+ drivers/usb/host/ehci-orion.c | 18 +-
+ drivers/usb/host/xhci-caps.h | 85 ++
+ drivers/usb/host/xhci-mem.c | 2 +-
+ drivers/usb/host/xhci-port.h | 176 +++
+ drivers/usb/host/xhci-ring.c | 200 +--
+ drivers/usb/host/xhci.c | 28 +-
+ drivers/usb/host/xhci.h | 265 +---
+ drivers/usb/image/mdc800.c | 1 -
+ drivers/usb/mtu3/mtu3_host.c | 30 +
+ drivers/usb/phy/phy-generic.c | 55 +-
+ drivers/usb/phy/phy.c | 2 +-
+ drivers/usb/roles/class.c | 43 +-
+ drivers/usb/storage/freecom.c | 1 -
+ drivers/usb/storage/sddr55.c | 4 +-
+ drivers/usb/typec/altmodes/displayport.c | 162 ++-
+ drivers/usb/typec/bus.c | 102 ++
+ drivers/usb/typec/class.c | 59 +
+ drivers/usb/typec/class.h | 1 +
+ drivers/usb/typec/mux/Kconfig | 10 +
+ drivers/usb/typec/mux/Makefile | 1 +
+ drivers/usb/typec/mux/it5205.c | 294 +++++
+ drivers/usb/typec/pd.c | 30 +-
+ drivers/usb/typec/tcpm/fusb302.c | 2 +-
+ drivers/usb/typec/tcpm/qcom/Makefile | 3 +-
+ drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c | 256 +---
+ drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.h | 27 +
+ .../usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.c | 159 ++-
+ .../usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.h | 94 +-
+ .../typec/tcpm/qcom/qcom_pmic_typec_pdphy_stub.c | 80 ++
+ drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_port.c | 290 ++++-
+ drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_port.h | 172 +--
+ drivers/usb/typec/tcpm/tcpci.c | 26 +-
+ drivers/usb/typec/tcpm/tcpci_maxim.h | 1 +
+ drivers/usb/typec/tcpm/tcpci_maxim_core.c | 38 +-
+ drivers/usb/typec/tcpm/tcpm.c | 1028 ++++++++++++---
+ drivers/usb/typec/tcpm/wcove.c | 2 +-
+ drivers/usb/typec/ucsi/ucsi.c | 49 +-
+ drivers/usb/typec/ucsi/ucsi.h | 67 +-
+ drivers/usb/typec/ucsi/ucsi_ccg.c | 92 +-
+ drivers/usb/typec/ucsi/ucsi_glink.c | 1 +
+ include/linux/phy/phy.h | 21 +
+ include/linux/usb/audio-v2.h | 4 +-
+ include/linux/usb/gadget.h | 2 +
+ include/linux/usb/pd.h | 1 +
+ include/linux/usb/pd_vdo.h | 8 +-
+ include/linux/usb/tcpci.h | 13 +
+ include/linux/usb/tcpm.h | 16 +-
+ include/linux/usb/typec.h | 7 +
+ include/linux/usb/typec_altmode.h | 30 +
+ include/uapi/linux/usb/ch9.h | 2 +
+ include/uapi/linux/usb/functionfs.h | 41 +
+ tools/testing/selftests/Makefile | 1 +
+ tools/testing/selftests/devices/Makefile | 4 +
+ .../devices/boards/Dell Inc.,XPS 13 9300.yaml | 40 +
+ .../selftests/devices/boards/google,spherion.yaml | 50 +
+ tools/testing/selftests/devices/ksft.py | 90 ++
+ .../selftests/devices/test_discoverable_devices.py | 318 +++++
+ 110 files changed, 6871 insertions(+), 1336 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6usb.yaml
+ create mode 100644 Documentation/devicetree/bindings/usb/ite,it5205.yaml
+ create mode 100644 Documentation/devicetree/bindings/usb/usb-switch.yaml
+ create mode 100644 drivers/phy/realtek/Kconfig
+ create mode 100644 drivers/phy/realtek/Makefile
+ create mode 100644 drivers/phy/realtek/phy-rtk-usb2.c
+ create mode 100644 drivers/phy/realtek/phy-rtk-usb3.c
+ create mode 100644 drivers/usb/host/xhci-caps.h
+ create mode 100644 drivers/usb/host/xhci-port.h
+ create mode 100644 drivers/usb/typec/mux/it5205.c
+ create mode 100644 drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.h
+ create mode 100644 drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy_stub.c
+ create mode 100644 tools/testing/selftests/devices/Makefile
+ create mode 100644 tools/testing/selftests/devices/boards/Dell Inc.,XPS 13 9300.yaml
+ create mode 100644 tools/testing/selftests/devices/boards/google,spherion.yaml
+ create mode 100644 tools/testing/selftests/devices/ksft.py
+ create mode 100755 tools/testing/selftests/devices/test_discoverable_devices.py
+Merging thunderbolt/next (b8a730836c6b thunderbolt: Constify the struct device_type usage)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt/next
+Auto-merging drivers/thunderbolt/switch.c
+Auto-merging drivers/thunderbolt/tb_regs.h
+Auto-merging drivers/thunderbolt/usb4.c
+Merge made by the 'ort' strategy.
+ drivers/thunderbolt/Makefile | 1 +
+ drivers/thunderbolt/ctl.c | 19 +-
+ drivers/thunderbolt/ctl.h | 4 +-
+ drivers/thunderbolt/domain.c | 19 +-
+ drivers/thunderbolt/icm.c | 2 +-
+ drivers/thunderbolt/lc.c | 45 ++
+ drivers/thunderbolt/nhi.c | 11 +-
+ drivers/thunderbolt/nvm.c | 4 +-
+ drivers/thunderbolt/path.c | 13 +
+ drivers/thunderbolt/quirks.c | 14 +
+ drivers/thunderbolt/retimer.c | 2 +-
+ drivers/thunderbolt/switch.c | 140 ++++++-
+ drivers/thunderbolt/tb.c | 904 +++++++++++++++++++++++++---------------
+ drivers/thunderbolt/tb.h | 29 +-
+ drivers/thunderbolt/tb_regs.h | 6 +
+ drivers/thunderbolt/trace.h | 188 +++++++++
+ drivers/thunderbolt/tunnel.c | 96 ++---
+ drivers/thunderbolt/tunnel.h | 6 +
+ drivers/thunderbolt/usb4.c | 43 +-
+ drivers/thunderbolt/usb4_port.c | 2 +-
+ drivers/thunderbolt/xdomain.c | 16 +-
+ include/linux/thunderbolt.h | 4 +-
+ 22 files changed, 1120 insertions(+), 448 deletions(-)
+ create mode 100644 drivers/thunderbolt/trace.h
+Merging usb-serial/usb-next (54be6c6c5ae8 Linux 6.8-rc3)
+$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial/usb-next
+Already up to date.
+Merging tty/tty-next (13a44ba0dca8 Merge 6.8-rc6 into tty-next)
+$ git merge -m Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next
+Auto-merging drivers/bluetooth/btnxpuart.c
+Auto-merging drivers/mfd/rave-sp.c
+Auto-merging drivers/net/ethernet/qualcomm/qca_uart.c
+Auto-merging drivers/video/fbdev/core/fbcon.c
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/serial/cdns,uart.yaml | 1 +
+ .../devicetree/bindings/serial/fsl-lpuart.yaml | 1 +
+ .../devicetree/bindings/serial/renesas,hscif.yaml | 1 +
+ .../devicetree/bindings/serial/samsung_uart.yaml | 2 +
+ Documentation/driver-api/tty/console.rst | 45 +
+ Documentation/driver-api/tty/index.rst | 1 +
+ arch/m68k/amiga/config.c | 2 +-
+ arch/m68k/hp300/config.c | 6 +-
+ drivers/bluetooth/btmtkuart.c | 4 +-
+ drivers/bluetooth/btnxpuart.c | 4 +-
+ drivers/bluetooth/hci_serdev.c | 4 +-
+ drivers/gnss/serial.c | 2 +-
+ drivers/gnss/sirf.c | 2 +-
+ drivers/greybus/gb-beagleplay.c | 6 +-
+ drivers/iio/chemical/pms7003.c | 4 +-
+ drivers/iio/chemical/scd30_serial.c | 4 +-
+ drivers/iio/chemical/sps30_serial.c | 4 +-
+ drivers/iio/imu/bno055/bno055_ser_core.c | 4 +-
+ drivers/input/keyboard/amikbd.c | 6 +-
+ drivers/mfd/rave-sp.c | 4 +-
+ drivers/net/ethernet/qualcomm/qca_uart.c | 2 +-
+ drivers/nfc/pn533/uart.c | 4 +-
+ drivers/nfc/s3fwrn5/uart.c | 4 +-
+ drivers/platform/chrome/cros_ec_uart.c | 4 +-
+ drivers/platform/surface/aggregator/core.c | 4 +-
+ drivers/tty/Kconfig | 7 +-
+ drivers/tty/amiserial.c | 6 +-
+ drivers/tty/goldfish.c | 5 +-
+ drivers/tty/hvc/hvc_iucv.c | 6 +-
+ drivers/tty/serdev/core.c | 2 +-
+ drivers/tty/serdev/serdev-ttyport.c | 10 +-
+ drivers/tty/serial/8250/8250_bcm7271.c | 17 +-
+ drivers/tty/serial/8250/8250_of.c | 44 +-
+ drivers/tty/serial/8250/8250_pci1xxxx.c | 160 +-
+ drivers/tty/serial/8250/8250_port.c | 31 +-
+ drivers/tty/serial/fsl_linflexuart.c | 1 -
+ drivers/tty/serial/jsm/jsm_cls.c | 1 -
+ drivers/tty/serial/lpc32xx_hs.c | 2 -
+ drivers/tty/serial/max310x.c | 327 ++---
+ drivers/tty/serial/pmac_zilog.c | 9 +-
+ drivers/tty/serial/qcom_geni_serial.c | 27 +-
+ drivers/tty/serial/samsung_tty.c | 259 ++--
+ drivers/tty/serial/serial_base_bus.c | 2 +-
+ drivers/tty/serial/serial_txx9.c | 3 +-
+ drivers/tty/serial/stm32-usart.c | 223 +--
+ drivers/tty/serial/stm32-usart.h | 38 +-
+ drivers/tty/serial/xilinx_uartps.c | 236 ++-
+ drivers/tty/tty_buffer.c | 1 +
+ drivers/tty/vt/Makefile | 4 +-
+ drivers/tty/vt/selection.c | 43 +-
+ drivers/tty/vt/vt.c | 1531 +++++++++++---------
+ drivers/tty/vt/vt_ioctl.c | 6 +-
+ drivers/video/console/dummycon.c | 38 +-
+ drivers/video/console/mdacon.c | 43 +-
+ drivers/video/console/newport_con.c | 69 +-
+ drivers/video/console/sticon.c | 79 +-
+ drivers/video/console/vgacon.c | 152 +-
+ drivers/video/fbdev/core/bitblit.c | 13 +-
+ drivers/video/fbdev/core/fbcon.c | 123 +-
+ drivers/video/fbdev/core/fbcon.h | 4 +-
+ drivers/video/fbdev/core/fbcon_ccw.c | 13 +-
+ drivers/video/fbdev/core/fbcon_cw.c | 13 +-
+ drivers/video/fbdev/core/fbcon_ud.c | 13 +-
+ drivers/video/fbdev/core/tileblit.c | 4 +-
+ drivers/video/fbdev/tgafb.c | 2 +-
+ include/linux/console.h | 126 +-
+ include/linux/console_struct.h | 1 -
+ include/linux/selection.h | 48 +-
+ include/linux/serdev.h | 8 +-
+ include/linux/serial_8250.h | 6 +
+ include/linux/soc/qcom/geni-se.h | 1 +
+ include/linux/tty.h | 1 -
+ include/linux/vt_kern.h | 12 +-
+ include/uapi/linux/fb.h | 8 +-
+ include/uapi/linux/vesa.h | 18 +
+ lib/Kconfig.kgdb | 2 +-
+ sound/drivers/serial-generic.c | 4 +-
+ 77 files changed, 2252 insertions(+), 1675 deletions(-)
+ create mode 100644 Documentation/driver-api/tty/console.rst
+ create mode 100644 include/uapi/linux/vesa.h
+Merging char-misc/char-misc-next (d4551c189d6e Merge tag 'iio-for-6.9a' of http://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into char-misc-next)
+$ git merge -m Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc/char-misc-next
+Auto-merging MAINTAINERS
+Auto-merging drivers/iio/accel/adxl367.c
+Auto-merging drivers/iio/adc/ad_sigma_delta.c
+Auto-merging drivers/of/property.c
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/iio/adc/adi,ad9467.yaml | 4 +
+ .../devicetree/bindings/iio/adc/adi,axi-adc.yaml | 8 +-
+ .../bindings/iio/adc/richtek,rtq6056.yaml | 9 +-
+ .../devicetree/bindings/iio/adc/ti,ads1298.yaml | 80 +++
+ .../bindings/iio/afe/voltage-divider.yaml | 11 +
+ .../bindings/iio/frequency/adi,admfm2000.yaml | 127 ++++
+ .../bindings/iio/humidity/ti,hdc3020.yaml | 3 +
+ .../devicetree/bindings/iio/imu/st,lsm6dsx.yaml | 4 +-
+ .../devicetree/bindings/iio/light/ams,as73211.yaml | 7 +-
+ .../bindings/iio/pressure/honeywell,hsc030pa.yaml | 3 +
+ .../iio/pressure/honeywell,mprls0025pa.yaml | 98 ++-
+ MAINTAINERS | 22 +-
+ drivers/comedi/drivers/das08.c | 1 -
+ drivers/iio/Kconfig | 9 +
+ drivers/iio/Makefile | 1 +
+ drivers/iio/accel/Kconfig | 8 +-
+ drivers/iio/accel/Makefile | 1 +
+ drivers/iio/accel/adxl367.c | 297 ++++----
+ drivers/iio/accel/bmc150-accel-i2c.c | 15 +-
+ drivers/iio/accel/bmc150-accel-spi.c | 3 +-
+ drivers/iio/accel/bmi088-accel-i2c.c | 70 ++
+ drivers/iio/accel/da280.c | 66 +-
+ drivers/iio/accel/kxcjk-1013.c | 33 +-
+ drivers/iio/accel/mma9551.c | 4 +-
+ drivers/iio/accel/mma9553.c | 4 +-
+ drivers/iio/accel/mxc4005.c | 5 +-
+ drivers/iio/accel/mxc6255.c | 4 +-
+ drivers/iio/accel/st_accel_i2c.c | 5 +-
+ drivers/iio/accel/stk8ba50.c | 4 +-
+ drivers/iio/adc/Kconfig | 15 +-
+ drivers/iio/adc/Makefile | 1 +
+ drivers/iio/adc/ad4130.c | 131 ++--
+ drivers/iio/adc/ad7091r-base.c | 25 +-
+ drivers/iio/adc/ad9467.c | 267 ++++---
+ drivers/iio/adc/ad_sigma_delta.c | 7 +-
+ drivers/iio/adc/adi-axi-adc.c | 407 +++--------
+ drivers/iio/adc/max1363.c | 161 ++---
+ drivers/iio/adc/rtq6056.c | 275 +++++++-
+ drivers/iio/adc/ti-adc108s102.c | 4 +-
+ drivers/iio/adc/ti-ads1015.c | 2 +-
+ drivers/iio/adc/ti-ads1298.c | 769 +++++++++++++++++++++
+ drivers/iio/buffer/industrialio-buffer-dmaengine.c | 11 +-
+ .../iio/common/inv_sensors/inv_sensors_timestamp.c | 2 +-
+ drivers/iio/dummy/iio_dummy_evgen.c | 2 -
+ drivers/iio/dummy/iio_simple_dummy.c | 193 +++---
+ drivers/iio/frequency/Kconfig | 10 +
+ drivers/iio/frequency/Makefile | 1 +
+ drivers/iio/frequency/admfm2000.c | 282 ++++++++
+ drivers/iio/gyro/bmg160_i2c.c | 4 +-
+ drivers/iio/health/afe4403.c | 65 +-
+ drivers/iio/health/afe4404.c | 65 +-
+ drivers/iio/humidity/hdc3020.c | 451 ++++++++----
+ drivers/iio/humidity/hts221_i2c.c | 4 +-
+ drivers/iio/imu/adis16475.c | 8 +-
+ drivers/iio/imu/adis16480.c | 9 +-
+ drivers/iio/imu/bmi160/bmi160_i2c.c | 9 +
+ drivers/iio/imu/bmi323/bmi323_core.c | 78 +--
+ drivers/iio/imu/bmi323/bmi323_i2c.c | 21 +
+ drivers/iio/imu/fxos8700_i2c.c | 3 +-
+ drivers/iio/imu/fxos8700_spi.c | 3 +-
+ drivers/iio/imu/kmx61.c | 2 +-
+ drivers/iio/imu/st_lsm6dsx/Kconfig | 31 +-
+ drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 2 +
+ drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 28 +-
+ drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 33 +-
+ drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c | 5 +
+ drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c | 5 +
+ drivers/iio/imu/st_lsm9ds0/st_lsm9ds0.h | 5 +-
+ drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_core.c | 21 +-
+ drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_i2c.c | 6 +-
+ drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_spi.c | 4 +-
+ drivers/iio/industrialio-backend.c | 418 +++++++++++
+ drivers/iio/industrialio-core.c | 6 +-
+ drivers/iio/industrialio-gts-helper.c | 15 +-
+ drivers/iio/light/Kconfig | 5 +-
+ drivers/iio/light/as73211.c | 142 +++-
+ drivers/iio/light/hid-sensor-als.c | 122 +++-
+ drivers/iio/light/jsa1212.c | 4 +-
+ drivers/iio/light/ltr501.c | 3 +-
+ drivers/iio/light/max44000.c | 6 +-
+ drivers/iio/light/rpr0521.c | 4 +-
+ drivers/iio/light/stk3310.c | 4 +-
+ drivers/iio/light/us5182d.c | 4 +-
+ drivers/iio/light/vcnl4000.c | 36 +-
+ drivers/iio/magnetometer/bmc150_magn_i2c.c | 3 +-
+ drivers/iio/magnetometer/bmc150_magn_spi.c | 3 +-
+ drivers/iio/magnetometer/mmc35240.c | 4 +-
+ drivers/iio/potentiometer/max5487.c | 4 +-
+ drivers/iio/pressure/Kconfig | 16 +-
+ drivers/iio/pressure/Makefile | 2 +
+ drivers/iio/pressure/hp206c.c | 6 +-
+ drivers/iio/pressure/hsc030pa.c | 49 +-
+ drivers/iio/pressure/hsc030pa.h | 7 +
+ drivers/iio/pressure/hsc030pa_i2c.c | 9 +-
+ drivers/iio/pressure/hsc030pa_spi.c | 7 +-
+ drivers/iio/pressure/mprls0025pa.c | 313 ++++-----
+ drivers/iio/pressure/mprls0025pa.h | 102 +++
+ drivers/iio/pressure/mprls0025pa_i2c.c | 100 +++
+ drivers/iio/pressure/mprls0025pa_spi.c | 92 +++
+ drivers/iio/pressure/st_pressure_i2c.c | 5 +-
+ drivers/iio/proximity/sx9310.c | 114 ++-
+ drivers/iio/proximity/sx9324.c | 178 +++--
+ drivers/iio/proximity/sx9360.c | 115 ++-
+ drivers/iio/test/Kconfig | 14 +
+ drivers/iio/test/Makefile | 1 +
+ drivers/iio/test/iio-test-gts.c | 513 ++++++++++++++
+ drivers/misc/eeprom/idt_89hpesx.c | 6 +-
+ drivers/misc/hpilo.c | 8 +-
+ drivers/misc/mei/gsc-me.c | 5 +
+ drivers/misc/mei/hdcp/Kconfig | 2 +-
+ drivers/misc/mei/hdcp/mei_hdcp.c | 14 +-
+ drivers/misc/mei/pxp/Kconfig | 2 +-
+ drivers/misc/mei/pxp/mei_pxp.c | 14 +-
+ drivers/of/property.c | 2 +
+ include/linux/hid-sensor-ids.h | 4 +
+ include/linux/iio/adc/adi-axi-adc.h | 68 --
+ include/linux/iio/backend.h | 72 ++
+ include/linux/iio/buffer-dmaengine.h | 3 +
+ include/linux/iio/iio.h | 30 +-
+ tools/iio/iio_utils.c | 2 +-
+ 120 files changed, 5089 insertions(+), 1902 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/iio/adc/ti,ads1298.yaml
+ create mode 100644 Documentation/devicetree/bindings/iio/frequency/adi,admfm2000.yaml
+ create mode 100644 drivers/iio/accel/bmi088-accel-i2c.c
+ create mode 100644 drivers/iio/adc/ti-ads1298.c
+ create mode 100644 drivers/iio/frequency/admfm2000.c
+ create mode 100644 drivers/iio/industrialio-backend.c
+ create mode 100644 drivers/iio/pressure/mprls0025pa.h
+ create mode 100644 drivers/iio/pressure/mprls0025pa_i2c.c
+ create mode 100644 drivers/iio/pressure/mprls0025pa_spi.c
+ create mode 100644 drivers/iio/test/iio-test-gts.c
+ delete mode 100644 include/linux/iio/adc/adi-axi-adc.h
+ create mode 100644 include/linux/iio/backend.h
+Merging accel/habanalabs-next (576d7cc5a9e2 accel: constify the struct device_type usage)
+$ git merge -m Merge branch 'habanalabs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux.git accel/habanalabs-next
+Already up to date.
+Merging coresight/next (a4f3057d19ff coresight-tpda: Change qcom,dsb-element-size to qcom,dsb-elem-bits)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git coresight/next
+Merge made by the 'ort' strategy.
+ .../ABI/testing/sysfs-bus-coresight-devices-tpdm | 87 ++++
+ .../bindings/arm/qcom,coresight-tpdm.yaml | 40 +-
+ drivers/hwtracing/coresight/Makefile | 20 +
+ drivers/hwtracing/coresight/coresight-cfg-afdo.c | 1 +
+ drivers/hwtracing/coresight/coresight-core.c | 496 ++-------------------
+ drivers/hwtracing/coresight/coresight-cti-core.c | 2 +-
+ drivers/hwtracing/coresight/coresight-etb10.c | 31 +-
+ drivers/hwtracing/coresight/coresight-etm-perf.c | 2 +-
+ drivers/hwtracing/coresight/coresight-etm.h | 2 -
+ drivers/hwtracing/coresight/coresight-etm3x-core.c | 27 +-
+ .../hwtracing/coresight/coresight-etm3x-sysfs.c | 4 +-
+ drivers/hwtracing/coresight/coresight-etm4x-core.c | 38 +-
+ drivers/hwtracing/coresight/coresight-etm4x.h | 1 -
+ drivers/hwtracing/coresight/coresight-funnel.c | 4 +-
+ drivers/hwtracing/coresight/coresight-priv.h | 9 +-
+ drivers/hwtracing/coresight/coresight-replicator.c | 2 +-
+ drivers/hwtracing/coresight/coresight-stm.c | 32 +-
+ drivers/hwtracing/coresight/coresight-sysfs.c | 391 ++++++++++++++++
+ drivers/hwtracing/coresight/coresight-tmc-core.c | 4 +-
+ drivers/hwtracing/coresight/coresight-tmc-etf.c | 46 +-
+ drivers/hwtracing/coresight/coresight-tmc-etr.c | 33 +-
+ drivers/hwtracing/coresight/coresight-tmc.h | 2 -
+ drivers/hwtracing/coresight/coresight-tpda.c | 151 ++++---
+ drivers/hwtracing/coresight/coresight-tpda.h | 6 +
+ drivers/hwtracing/coresight/coresight-tpdm.c | 459 +++++++++++++++++--
+ drivers/hwtracing/coresight/coresight-tpdm.h | 114 +++++
+ drivers/hwtracing/coresight/coresight-tpiu.c | 16 +-
+ drivers/hwtracing/coresight/ultrasoc-smb.c | 24 +-
+ drivers/hwtracing/coresight/ultrasoc-smb.h | 2 -
+ drivers/hwtracing/ptt/hisi_ptt.c | 6 +-
+ include/linux/coresight.h | 148 +++---
+ 31 files changed, 1387 insertions(+), 813 deletions(-)
+Merging fastrpc/for-next (5169a077f22a misc: fastrpc: Pass proper arguments to scm call)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/fastrpc.git fastrpc/for-next
+Auto-merging drivers/misc/fastrpc.c
+Merge made by the 'ort' strategy.
+ drivers/misc/fastrpc.c | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+Merging fpga/for-next (ff49b00e9621 fpga: dfl: make dfl_bus_type const)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga/for-next
+Merge made by the 'ort' strategy.
+ Documentation/driver-api/fpga/fpga-mgr.rst | 34 ++++++-----
+ drivers/fpga/dfl.c | 2 +-
+ drivers/fpga/fpga-mgr.c | 93 +++++++++++++++++++-----------
+ include/linux/fpga/fpga-mgr.h | 29 ++++++++--
+ 4 files changed, 104 insertions(+), 54 deletions(-)
+Merging icc/icc-next (6025a81ae63e Merge branch 'icc-cleanup' into icc-next)
+$ git merge -m Merge branch 'icc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git icc/icc-next
+Auto-merging drivers/interconnect/qcom/sm8550.c
+Auto-merging drivers/interconnect/qcom/x1e80100.c
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/interconnect/qcom,rpm.yaml | 3 +
+ .../bindings/interconnect/qcom,rpmh.yaml | 2 +-
+ drivers/interconnect/core.c | 4 +-
+ drivers/interconnect/qcom/Kconfig | 9 +
+ drivers/interconnect/qcom/Makefile | 2 +
+ drivers/interconnect/qcom/icc-common.c | 3 +-
+ drivers/interconnect/qcom/icc-common.h | 3 +-
+ drivers/interconnect/qcom/msm8909.c | 1329 ++++++++++++++++++++
+ drivers/interconnect/qcom/sa8775p.c | 56 +-
+ drivers/interconnect/qcom/sm6115.c | 12 +-
+ drivers/interconnect/qcom/sm8250.c | 2 +-
+ drivers/interconnect/qcom/sm8550.c | 574 ---------
+ drivers/interconnect/qcom/sm8550.h | 284 ++---
+ drivers/interconnect/qcom/x1e80100.c | 327 +----
+ drivers/interconnect/samsung/exynos.c | 2 +-
+ drivers/memory/tegra/mc.c | 2 +-
+ drivers/memory/tegra/tegra124-emc.c | 2 +-
+ drivers/memory/tegra/tegra124.c | 2 +-
+ drivers/memory/tegra/tegra186-emc.c | 2 +-
+ drivers/memory/tegra/tegra20-emc.c | 2 +-
+ drivers/memory/tegra/tegra20.c | 2 +-
+ drivers/memory/tegra/tegra30-emc.c | 2 +-
+ drivers/memory/tegra/tegra30.c | 2 +-
+ include/dt-bindings/interconnect/qcom,msm8909.h | 93 ++
+ .../dt-bindings/interconnect/qcom,x1e80100-rpmh.h | 24 -
+ include/linux/interconnect-provider.h | 11 +-
+ include/soc/tegra/mc.h | 7 +-
+ 27 files changed, 1625 insertions(+), 1138 deletions(-)
+ create mode 100644 drivers/interconnect/qcom/msm8909.c
+ create mode 100644 include/dt-bindings/interconnect/qcom,msm8909.h
+Merging iio/togreg (205bbf0d2dd2 dt-bindings: iio: adc: imx93: drop the 4th interrupt)
+$ git merge -m Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ .../ABI/testing/sysfs-bus-iio-adc-pac1934 | 9 +
+ Documentation/devicetree/bindings/iio/adc/adc.yaml | 1 -
+ .../bindings/iio/adc/microchip,pac1934.yaml | 120 ++
+ .../devicetree/bindings/iio/adc/nxp,imx93-adc.yaml | 4 +-
+ .../bindings/iio/adc/qcom,spmi-vadc.yaml | 1 -
+ .../bindings/iio/amplifiers/adi,hmc425a.yaml | 47 +-
+ .../bindings/iio/humidity/ti,hdc2010.yaml | 3 +
+ .../bindings/iio/light/vishay,veml6075.yaml | 1 +
+ .../iio/magnetometer/voltafield,af8133j.yaml | 60 +
+ .../bindings/iio/temperature/ti,tmp117.yaml | 8 +
+ .../devicetree/bindings/vendor-prefixes.yaml | 2 +
+ Documentation/iio/adis16475.rst | 406 +++++
+ Documentation/iio/iio_devbuf.rst | 152 ++
+ Documentation/iio/index.rst | 9 +-
+ MAINTAINERS | 13 +
+ drivers/base/property.c | 14 -
+ drivers/iio/accel/adxl372_spi.c | 2 +-
+ drivers/iio/accel/bma180.c | 2 +-
+ drivers/iio/accel/fxls8962af-core.c | 10 +-
+ drivers/iio/accel/kxcjk-1013.c | 87 +-
+ drivers/iio/accel/kxsd9-spi.c | 2 +-
+ drivers/iio/accel/mma8452.c | 6 +-
+ drivers/iio/adc/Kconfig | 11 +
+ drivers/iio/adc/Makefile | 1 +
+ drivers/iio/adc/ad7124.c | 55 +-
+ drivers/iio/adc/ad7192.c | 38 +-
+ drivers/iio/adc/ad7292.c | 13 +-
+ drivers/iio/adc/fsl-imx25-gcq.c | 140 +-
+ drivers/iio/adc/hx711.c | 5 +-
+ drivers/iio/adc/max11410.c | 27 +-
+ drivers/iio/adc/mcp320x.c | 31 +-
+ drivers/iio/adc/pac1934.c | 1636 ++++++++++++++++++++
+ drivers/iio/adc/qcom-pm8xxx-xoadc.c | 1 -
+ drivers/iio/adc/rockchip_saradc.c | 17 +-
+ drivers/iio/adc/ti-ads1298.c | 4 +-
+ drivers/iio/adc/ti-ads8688.c | 2 +-
+ drivers/iio/addac/ad74413r.c | 10 +-
+ drivers/iio/amplifiers/hmc425a.c | 274 +++-
+ drivers/iio/dac/ltc2688.c | 28 +-
+ drivers/iio/dac/mcp4821.c | 2 +-
+ drivers/iio/light/al3010.c | 2 +-
+ drivers/iio/light/al3320a.c | 1 -
+ drivers/iio/light/vl6180.c | 1 -
+ drivers/iio/magnetometer/Kconfig | 12 +
+ drivers/iio/magnetometer/Makefile | 1 +
+ drivers/iio/magnetometer/af8133j.c | 528 +++++++
+ drivers/iio/proximity/isl29501.c | 3 +-
+ drivers/iio/temperature/ltc2983.c | 165 +-
+ drivers/iio/temperature/tmp117.c | 9 +
+ include/linux/property.h | 22 +-
+ 50 files changed, 3572 insertions(+), 426 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-adc-pac1934
+ create mode 100644 Documentation/devicetree/bindings/iio/adc/microchip,pac1934.yaml
+ create mode 100644 Documentation/devicetree/bindings/iio/magnetometer/voltafield,af8133j.yaml
+ create mode 100644 Documentation/iio/adis16475.rst
+ create mode 100644 Documentation/iio/iio_devbuf.rst
+ create mode 100644 drivers/iio/adc/pac1934.c
+ create mode 100644 drivers/iio/magnetometer/af8133j.c
+Merging phy-next/next (00ca8a15dafa phy: constify of_phandle_args in xlate)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next
+Auto-merging MAINTAINERS
+Auto-merging drivers/phy/microchip/lan966x_serdes.c
+Auto-merging drivers/phy/phy-core.c
+Auto-merging drivers/phy/qualcomm/phy-qcom-qmp-usb.c
+CONFLICT (content): Merge conflict in drivers/phy/qualcomm/phy-qcom-qmp-usb.c
+Auto-merging drivers/phy/renesas/phy-rcar-gen3-usb2.c
+Auto-merging include/linux/phy/phy.h
+Resolved 'drivers/phy/qualcomm/phy-qcom-qmp-usb.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 9d13931ea46b] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git
+$ git diff -M --stat --summary HEAD^..
+ .../bindings/phy/mediatek,mt8365-csi-rx.yaml | 79 ++
+ .../bindings/phy/phy-cadence-torrent.yaml | 11 +-
+ .../bindings/phy/qcom,msm8998-qmp-usb3-phy.yaml | 184 ++++
+ .../bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml | 6 +
+ .../bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml | 48 +-
+ .../phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml | 22 -
+ .../bindings/phy/rockchip,rk3588-hdptx-phy.yaml | 91 ++
+ MAINTAINERS | 7 +
+ drivers/phy/allwinner/phy-sun4i-usb.c | 2 +-
+ drivers/phy/amlogic/phy-meson-g12a-usb3-pcie.c | 2 +-
+ drivers/phy/broadcom/phy-bcm-sr-pcie.c | 2 +-
+ drivers/phy/broadcom/phy-bcm-sr-usb.c | 2 +-
+ drivers/phy/broadcom/phy-bcm63xx-usbh.c | 2 +-
+ drivers/phy/broadcom/phy-brcm-usb.c | 2 +-
+ drivers/phy/cadence/phy-cadence-torrent.c | 720 +++++++++++-
+ drivers/phy/freescale/phy-fsl-imx8qm-lvds-phy.c | 2 +-
+ drivers/phy/freescale/phy-fsl-lynx-28g.c | 2 +-
+ drivers/phy/hisilicon/phy-histb-combphy.c | 2 +-
+ drivers/phy/intel/phy-intel-lgm-combo.c | 2 +-
+ drivers/phy/lantiq/phy-lantiq-vrx200-pcie.c | 2 +-
+ drivers/phy/marvell/phy-armada375-usb2.c | 2 +-
+ drivers/phy/marvell/phy-armada38x-comphy.c | 9 +-
+ drivers/phy/marvell/phy-berlin-sata.c | 2 +-
+ drivers/phy/marvell/phy-mvebu-a3700-comphy.c | 2 +-
+ drivers/phy/marvell/phy-mvebu-cp110-comphy.c | 2 +-
+ drivers/phy/mediatek/Kconfig | 12 +
+ drivers/phy/mediatek/Makefile | 2 +
+ drivers/phy/mediatek/phy-mtk-mipi-csi-0-5-rx-reg.h | 62 ++
+ drivers/phy/mediatek/phy-mtk-mipi-csi-0-5.c | 294 +++++
+ drivers/phy/mediatek/phy-mtk-tphy.c | 2 +-
+ drivers/phy/mediatek/phy-mtk-xsphy.c | 2 +-
+ drivers/phy/microchip/lan966x_serdes.c | 2 +-
+ drivers/phy/microchip/sparx5_serdes.c | 2 +-
+ drivers/phy/mscc/phy-ocelot-serdes.c | 2 +-
+ drivers/phy/phy-core.c | 8 +-
+ drivers/phy/phy-xgene.c | 2 +-
+ drivers/phy/qualcomm/Makefile | 2 +-
+ drivers/phy/qualcomm/phy-qcom-edp.c | 3 +-
+ drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 111 +-
+ drivers/phy/qualcomm/phy-qcom-qmp-common.h | 59 +
+ drivers/phy/qualcomm/phy-qcom-qmp-dp-com-v3.h | 18 +
+ drivers/phy/qualcomm/phy-qcom-qmp-dp-phy-v3.h | 21 +
+ drivers/phy/qualcomm/phy-qcom-qmp-dp-phy-v4.h | 19 +
+ drivers/phy/qualcomm/phy-qcom-qmp-dp-phy-v5.h | 13 +
+ drivers/phy/qualcomm/phy-qcom-qmp-dp-phy-v6.h | 13 +
+ drivers/phy/qualcomm/phy-qcom-qmp-dp-phy.h | 62 ++
+ drivers/phy/qualcomm/phy-qcom-qmp-pcie-msm8996.c | 70 +-
+ drivers/phy/qualcomm/phy-qcom-qmp-pcie.c | 288 +++--
+ drivers/phy/qualcomm/phy-qcom-qmp-pcs-pcie-v6.h | 2 +
+ drivers/phy/qualcomm/phy-qcom-qmp-pcs-pcie-v6_20.h | 2 +
+ drivers/phy/qualcomm/phy-qcom-qmp-pcs-sgmii.h | 20 +
+ drivers/phy/qualcomm/phy-qcom-qmp-pcs-ufs-v6.h | 2 +
+ drivers/phy/qualcomm/phy-qcom-qmp-pcs-v6_20.h | 1 +
+ drivers/phy/qualcomm/phy-qcom-qmp-qserdes-com-v6.h | 2 +
+ .../qualcomm/phy-qcom-qmp-qserdes-txrx-ufs-v6.h | 8 +
+ .../phy/qualcomm/phy-qcom-qmp-qserdes-txrx-v6_20.h | 2 +
+ drivers/phy/qualcomm/phy-qcom-qmp-ufs.c | 305 +++---
+ drivers/phy/qualcomm/phy-qcom-qmp-usb-legacy.c | 76 +-
+ drivers/phy/qualcomm/phy-qcom-qmp-usb.c | 422 +------
+ drivers/phy/qualcomm/phy-qcom-qmp-usbc.c | 1149 ++++++++++++++++++++
+ drivers/phy/qualcomm/phy-qcom-qmp.h | 101 +-
+ drivers/phy/qualcomm/phy-qcom-sgmii-eth.c | 417 +++----
+ drivers/phy/ralink/phy-mt7621-pci.c | 2 +-
+ drivers/phy/renesas/phy-rcar-gen2.c | 2 +-
+ drivers/phy/renesas/phy-rcar-gen3-usb2.c | 2 +-
+ drivers/phy/renesas/r8a779f0-ether-serdes.c | 2 +-
+ drivers/phy/rockchip/Kconfig | 8 +
+ drivers/phy/rockchip/Makefile | 1 +
+ drivers/phy/rockchip/phy-rockchip-naneng-combphy.c | 2 +-
+ drivers/phy/rockchip/phy-rockchip-pcie.c | 2 +-
+ drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c | 1028 +++++++++++++++++
+ drivers/phy/samsung/phy-exynos-mipi-video.c | 2 +-
+ drivers/phy/samsung/phy-exynos5-usbdrd.c | 2 +-
+ drivers/phy/samsung/phy-samsung-usb2.c | 2 +-
+ drivers/phy/socionext/phy-uniphier-usb2.c | 2 +-
+ drivers/phy/st/phy-miphy28lp.c | 2 +-
+ drivers/phy/st/phy-spear1310-miphy.c | 2 +-
+ drivers/phy/st/phy-spear1340-miphy.c | 2 +-
+ drivers/phy/st/phy-stm32-usbphyc.c | 2 +-
+ drivers/phy/tegra/xusb.c | 2 +-
+ drivers/phy/ti/phy-am654-serdes.c | 2 +-
+ drivers/phy/ti/phy-da8xx-usb.c | 2 +-
+ drivers/phy/ti/phy-gmii-sel.c | 26 +-
+ drivers/phy/ti/phy-tusb1210.c | 57 +-
+ drivers/phy/xilinx/phy-zynqmp.c | 2 +-
+ drivers/pinctrl/tegra/pinctrl-tegra-xusb.c | 2 +-
+ include/linux/phy/phy.h | 14 +-
+ 87 files changed, 4636 insertions(+), 1321 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/phy/mediatek,mt8365-csi-rx.yaml
+ create mode 100644 Documentation/devicetree/bindings/phy/qcom,msm8998-qmp-usb3-phy.yaml
+ create mode 100644 Documentation/devicetree/bindings/phy/rockchip,rk3588-hdptx-phy.yaml
+ create mode 100644 drivers/phy/mediatek/phy-mtk-mipi-csi-0-5-rx-reg.h
+ create mode 100644 drivers/phy/mediatek/phy-mtk-mipi-csi-0-5.c
+ create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-common.h
+ create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-dp-com-v3.h
+ create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-dp-phy-v3.h
+ create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-dp-phy-v4.h
+ create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-dp-phy-v5.h
+ create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-dp-phy-v6.h
+ create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-dp-phy.h
+ create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-pcs-sgmii.h
+ create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-usbc.c
+ create mode 100644 drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c
+Merging soundwire/next (81a7d0c4d059 soundwire: bus_type: make sdw_bus_type const)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next
+Merge made by the 'ort' strategy.
+ Documentation/driver-api/soundwire/stream.rst | 4 ++--
+ drivers/soundwire/bus_type.c | 2 +-
+ drivers/soundwire/intel_auxdevice.c | 2 --
+ include/linux/soundwire/sdw_type.h | 2 +-
+ 4 files changed, 4 insertions(+), 6 deletions(-)
+Merging extcon/extcon-next (16c6e3aff8d7 extcon: intel-mrfld: Don't shadow error from devm_extcon_dev_allocate())
+$ git merge -m Merge branch 'extcon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon/extcon-next
+Merge made by the 'ort' strategy.
+ drivers/extcon/Kconfig | 3 ++-
+ drivers/extcon/extcon-intel-mrfld.c | 20 +++++++-------------
+ 2 files changed, 9 insertions(+), 14 deletions(-)
+Merging gnss/gnss-next (54be6c6c5ae8 Linux 6.8-rc3)
+$ git merge -m Merge branch 'gnss-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss/gnss-next
+Already up to date.
+Merging vfio/next (701ab935859f vfio/nvgrace-gpu: Add vfio pci variant module for grace hopper)
+$ git merge -m Merge branch 'next' of git://github.com/awilliam/linux-vfio.git vfio/next
+Auto-merging MAINTAINERS
+CONFLICT (content): Merge conflict in MAINTAINERS
+Auto-merging drivers/vfio/pci/vfio_pci_core.c
+Auto-merging include/linux/mlx5/mlx5_ifc.h
+Resolved 'MAINTAINERS' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 165676481ad3] Merge branch 'next' of git://github.com/awilliam/linux-vfio.git
+$ git diff -M --stat --summary HEAD^..
+ MAINTAINERS | 16 +-
+ drivers/vfio/mdev/mdev_driver.c | 2 +-
+ drivers/vfio/mdev/mdev_private.h | 2 +-
+ drivers/vfio/pci/Kconfig | 2 +
+ drivers/vfio/pci/Makefile | 2 +
+ drivers/vfio/pci/mlx5/cmd.c | 74 ++-
+ drivers/vfio/pci/mlx5/cmd.h | 5 +-
+ drivers/vfio/pci/mlx5/main.c | 39 +-
+ drivers/vfio/pci/nvgrace-gpu/Kconfig | 10 +
+ drivers/vfio/pci/nvgrace-gpu/Makefile | 3 +
+ drivers/vfio/pci/nvgrace-gpu/main.c | 879 ++++++++++++++++++++++++++++++++++
+ drivers/vfio/pci/vfio_pci_config.c | 42 ++
+ drivers/vfio/pci/vfio_pci_core.c | 1 +
+ drivers/vfio/pci/vfio_pci_rdwr.c | 16 +-
+ drivers/vfio/pci/virtio/main.c | 72 +--
+ include/linux/mlx5/mlx5_ifc.h | 5 +
+ include/linux/vfio_pci_core.h | 10 +-
+ 17 files changed, 1106 insertions(+), 74 deletions(-)
+ create mode 100644 drivers/vfio/pci/nvgrace-gpu/Kconfig
+ create mode 100644 drivers/vfio/pci/nvgrace-gpu/Makefile
+ create mode 100644 drivers/vfio/pci/nvgrace-gpu/main.c
+Merging w1/for-next (d97d263132a6 w1: w1-gpio: Convert to platform remove callback returning void)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git w1/for-next
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/serial/serial.yaml | 2 +-
+ Documentation/devicetree/bindings/w1/w1-uart.yaml | 59 +++
+ Documentation/w1/masters/index.rst | 1 +
+ Documentation/w1/masters/w1-uart.rst | 54 +++
+ drivers/w1/masters/Kconfig | 10 +
+ drivers/w1/masters/Makefile | 1 +
+ drivers/w1/masters/mxc_w1.c | 6 +-
+ drivers/w1/masters/omap_hdq.c | 6 +-
+ drivers/w1/masters/sgi_w1.c | 6 +-
+ drivers/w1/masters/w1-gpio.c | 6 +-
+ drivers/w1/masters/w1-uart.c | 415 +++++++++++++++++++++
+ drivers/w1/w1.c | 2 +-
+ 12 files changed, 550 insertions(+), 18 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/w1/w1-uart.yaml
+ create mode 100644 Documentation/w1/masters/w1-uart.rst
+ create mode 100644 drivers/w1/masters/w1-uart.c
+Merging spmi/spmi-next (b85ea95d0864 Linux 6.7-rc1)
+$ git merge -m Merge branch 'spmi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git spmi/spmi-next
+Already up to date.
+Merging staging/staging-next (455c5e12a3b7 staging: gdm724x: constantify the struct device_type usage)
+$ git merge -m Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next
+Merge made by the 'ort' strategy.
+ drivers/staging/Kconfig | 4 -
+ drivers/staging/Makefile | 2 -
+ drivers/staging/axis-fifo/axis-fifo.c | 7 +-
+ drivers/staging/board/Kconfig | 12 -
+ drivers/staging/board/Makefile | 4 -
+ drivers/staging/board/TODO | 2 -
+ drivers/staging/board/armadillo800eva.c | 88 -
+ drivers/staging/board/board.c | 204 --
+ drivers/staging/board/board.h | 46 -
+ drivers/staging/board/kzm9d.c | 26 -
+ drivers/staging/emxx_udc/Kconfig | 11 -
+ drivers/staging/emxx_udc/Makefile | 2 -
+ drivers/staging/emxx_udc/TODO | 6 -
+ drivers/staging/emxx_udc/emxx_udc.c | 3223 --------------------
+ drivers/staging/emxx_udc/emxx_udc.h | 554 ----
+ drivers/staging/fieldbus/anybuss/arcx-anybus.c | 6 +-
+ drivers/staging/fieldbus/anybuss/host.c | 2 +-
+ drivers/staging/fieldbus/dev_core.c | 6 +-
+ drivers/staging/gdm724x/gdm_lte.c | 2 +-
+ drivers/staging/greybus/audio_manager.c | 8 +-
+ drivers/staging/greybus/authentication.c | 6 +-
+ drivers/staging/greybus/fw-download.c | 7 +-
+ drivers/staging/greybus/fw-management.c | 20 +-
+ drivers/staging/greybus/gbphy.c | 8 +-
+ drivers/staging/greybus/loopback.c | 6 +-
+ drivers/staging/greybus/raw.c | 6 +-
+ drivers/staging/greybus/vibrator.c | 6 +-
+ drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 17 +-
+ drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 1 -
+ drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 54 +-
+ drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 6 +-
+ drivers/staging/rtl8192e/rtl8192e/rtl_ps.c | 4 +-
+ drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 4 +-
+ drivers/staging/rtl8192e/rtl819x_BAProc.c | 2 +-
+ drivers/staging/rtl8192e/rtl819x_HT.h | 6 +-
+ drivers/staging/rtl8192e/rtl819x_HTProc.c | 36 +-
+ drivers/staging/rtl8192e/rtl819x_Qos.h | 2 +-
+ drivers/staging/rtl8192e/rtl819x_TSProc.c | 6 +-
+ drivers/staging/rtl8192e/rtllib.h | 44 +-
+ drivers/staging/rtl8192e/rtllib_rx.c | 13 +-
+ drivers/staging/rtl8192e/rtllib_softmac.c | 182 +-
+ drivers/staging/rtl8192e/rtllib_softmac_wx.c | 4 +-
+ drivers/staging/rtl8192e/rtllib_tx.c | 18 +-
+ drivers/staging/rtl8192e/rtllib_wx.c | 2 +-
+ drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 4 +-
+ drivers/staging/rtl8723bs/core/rtw_sta_mgt.c | 3 +-
+ drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 3 +-
+ .../vc04_services/interface/vchiq_arm/vchiq_bus.c | 2 +-
+ .../vc04_services/interface/vchiq_arm/vchiq_bus.h | 2 +-
+ drivers/staging/vme_user/vme.c | 2 +-
+ drivers/staging/vme_user/vme.h | 2 +-
+ drivers/staging/vt6655/card.c | 74 +-
+ drivers/staging/vt6655/rxtx.h | 1 -
+ 53 files changed, 282 insertions(+), 4486 deletions(-)
+ delete mode 100644 drivers/staging/board/Kconfig
+ delete mode 100644 drivers/staging/board/Makefile
+ delete mode 100644 drivers/staging/board/TODO
+ delete mode 100644 drivers/staging/board/armadillo800eva.c
+ delete mode 100644 drivers/staging/board/board.c
+ delete mode 100644 drivers/staging/board/board.h
+ delete mode 100644 drivers/staging/board/kzm9d.c
+ delete mode 100644 drivers/staging/emxx_udc/Kconfig
+ delete mode 100644 drivers/staging/emxx_udc/Makefile
+ delete mode 100644 drivers/staging/emxx_udc/TODO
+ delete mode 100644 drivers/staging/emxx_udc/emxx_udc.c
+ delete mode 100644 drivers/staging/emxx_udc/emxx_udc.h
+Merging counter-next/counter-next (3bb282ef1149 counter: constify the struct device_type usage)
+$ git merge -m Merge branch 'counter-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-next/counter-next
+Auto-merging drivers/counter/counter-core.c
+Merge made by the 'ort' strategy.
+ drivers/counter/counter-core.c | 4 ++--
+ include/linux/counter.h | 1 -
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+Merging mux/for-next (44c026a73be8 Linux 6.4-rc3)
+$ git merge -m Merge branch 'for-next' of https://gitlab.com/peda-linux/mux.git mux/for-next
+Already up to date.
+Merging dmaengine/next (716141d366f4 dmaengine: of: constify of_phandle_args in of_dma_find_controller())
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next
+Auto-merging MAINTAINERS
+Auto-merging drivers/dma/fsl-edma-common.c
+Auto-merging drivers/dma/fsl-edma-common.h
+Auto-merging drivers/dma/fsl-edma-main.c
+Auto-merging drivers/dma/idxd/cdev.c
+Auto-merging drivers/dma/idxd/idxd.h
+Merge made by the 'ort' strategy.
+ .../bindings/dma/allwinner,sun50i-a64-dma.yaml | 12 +-
+ .../devicetree/bindings/dma/fsl,edma.yaml | 2 +
+ .../devicetree/bindings/dma/marvell,mmp-dma.yaml | 72 +++++
+ .../bindings/dma/mediatek,mt7622-hsdma.yaml | 63 +++++
+ Documentation/devicetree/bindings/dma/mmp-dma.txt | 81 ------
+ .../devicetree/bindings/dma/mtk-hsdma.txt | 33 ---
+ .../devicetree/bindings/dma/renesas,rcar-dmac.yaml | 1 +
+ MAINTAINERS | 4 +-
+ drivers/dma/Kconfig | 14 +-
+ drivers/dma/amba-pl08x.c | 2 +-
+ drivers/dma/bestcomm/sram.c | 5 -
+ drivers/dma/fsl-edma-common.c | 101 ++++---
+ drivers/dma/fsl-edma-common.h | 159 ++++++++++-
+ drivers/dma/fsl-edma-main.c | 19 +-
+ drivers/dma/idxd/bus.c | 2 +-
+ drivers/dma/idxd/cdev.c | 4 +-
+ drivers/dma/idxd/idxd.h | 14 +-
+ drivers/dma/idxd/sysfs.c | 10 +-
+ drivers/dma/mcf-edma-main.c | 2 +-
+ drivers/dma/of-dma.c | 2 +-
+ drivers/dma/pl330.c | 1 +
+ drivers/dma/ti/k3-psil-j721s2.c | 73 +++++
+ drivers/dma/ti/k3-udma-glue.c | 314 +++++++++++++++------
+ drivers/dma/xilinx/xilinx_dma.c | 6 +
+ include/linux/dma/k3-udma-glue.h | 10 +
+ 25 files changed, 705 insertions(+), 301 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/dma/marvell,mmp-dma.yaml
+ create mode 100644 Documentation/devicetree/bindings/dma/mediatek,mt7622-hsdma.yaml
+ delete mode 100644 Documentation/devicetree/bindings/dma/mmp-dma.txt
+ delete mode 100644 Documentation/devicetree/bindings/dma/mtk-hsdma.txt
+Merging cgroup/for-next (8d4c171f451d docs: cgroup-v1: add missing code-block tags)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git cgroup/for-next
+Merge made by the 'ort' strategy.
+ Documentation/admin-guide/cgroup-v1/hugetlb.rst | 20 ++++++++++++--------
+ 1 file changed, 12 insertions(+), 8 deletions(-)
+Merging scsi/for-next (7b020ab8a009 Merge branch 'fixes' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi/for-next
+Auto-merging drivers/scsi/scsi_scan.c
+Auto-merging drivers/ufs/core/ufshcd.c
+Auto-merging drivers/ufs/host/ufs-qcom.c
+Merge made by the 'ort' strategy.
+ drivers/message/fusion/mptfc.c | 4 +-
+ drivers/scsi/3w-9xxx.c | 44 +--
+ drivers/scsi/3w-sas.c | 36 +--
+ drivers/scsi/3w-xxxx.c | 44 +--
+ drivers/scsi/53c700.c | 2 +-
+ drivers/scsi/Kconfig | 9 +
+ drivers/scsi/aacraid/aachba.c | 6 +-
+ drivers/scsi/ch.c | 27 +-
+ drivers/scsi/csiostor/csio_defs.h | 18 +-
+ drivers/scsi/csiostor/csio_lnode.c | 8 +-
+ drivers/scsi/csiostor/csio_lnode.h | 13 -
+ drivers/scsi/device_handler/scsi_dh_hp_sw.c | 49 ++-
+ drivers/scsi/device_handler/scsi_dh_rdac.c | 84 +++---
+ drivers/scsi/fcoe/fcoe_sysfs.c | 4 +-
+ drivers/scsi/fnic/fnic_attrs.c | 7 +-
+ drivers/scsi/fnic/fnic_scsi.c | 4 +-
+ drivers/scsi/hisi_sas/hisi_sas_main.c | 26 +-
+ drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 8 +-
+ drivers/scsi/ibmvscsi/ibmvfc.c | 22 +-
+ drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 24 +-
+ drivers/scsi/isci/init.c | 2 +-
+ drivers/scsi/lpfc/lpfc.h | 94 +++---
+ drivers/scsi/lpfc/lpfc_attr.c | 107 +++----
+ drivers/scsi/lpfc/lpfc_bsg.c | 8 +-
+ drivers/scsi/lpfc/lpfc_ct.c | 154 ++++------
+ drivers/scsi/lpfc/lpfc_debugfs.c | 14 +-
+ drivers/scsi/lpfc/lpfc_els.c | 446 ++++++++++++----------------
+ drivers/scsi/lpfc/lpfc_hbadisc.c | 350 +++++++++-------------
+ drivers/scsi/lpfc/lpfc_hw4.h | 4 +-
+ drivers/scsi/lpfc/lpfc_init.c | 137 +++++----
+ drivers/scsi/lpfc/lpfc_mbox.c | 10 +-
+ drivers/scsi/lpfc/lpfc_nportdisc.c | 91 +++---
+ drivers/scsi/lpfc/lpfc_nvme.c | 20 +-
+ drivers/scsi/lpfc/lpfc_nvmet.c | 14 +-
+ drivers/scsi/lpfc/lpfc_scsi.c | 10 +-
+ drivers/scsi/lpfc/lpfc_sli.c | 56 ++--
+ drivers/scsi/lpfc/lpfc_version.h | 6 +-
+ drivers/scsi/lpfc/lpfc_vport.c | 69 ++---
+ drivers/scsi/megaraid.c | 2 +-
+ drivers/scsi/mpi3mr/mpi3mr_os.c | 12 +-
+ drivers/scsi/mpt3sas/mpt3sas_base.c | 113 ++++---
+ drivers/scsi/mpt3sas/mpt3sas_base.h | 8 +-
+ drivers/scsi/mpt3sas/mpt3sas_ctl.c | 54 ++++
+ drivers/scsi/mpt3sas/mpt3sas_ctl.h | 10 +
+ drivers/scsi/mpt3sas/mpt3sas_scsih.c | 1 +
+ drivers/scsi/pm8001/pm8001_ctl.c | 6 +-
+ drivers/scsi/qla1280.c | 1 -
+ drivers/scsi/scsi_debug.c | 4 +-
+ drivers/scsi/scsi_devinfo.c | 6 +-
+ drivers/scsi/scsi_lib.c | 124 +++++++-
+ drivers/scsi/scsi_lib_test.c | 330 ++++++++++++++++++++
+ drivers/scsi/scsi_priv.h | 2 +-
+ drivers/scsi/scsi_scan.c | 105 ++++---
+ drivers/scsi/scsi_sysfs.c | 2 +-
+ drivers/scsi/scsi_transport_iscsi.c | 4 +-
+ drivers/scsi/scsi_transport_spi.c | 35 +--
+ drivers/scsi/sd.c | 220 +++++++++-----
+ drivers/scsi/ses.c | 66 ++--
+ drivers/scsi/sr.c | 38 +--
+ drivers/target/loopback/tcm_loop.c | 2 +-
+ drivers/ufs/core/ufs-mcq.c | 12 +-
+ drivers/ufs/core/ufs-sysfs.c | 49 +++
+ drivers/ufs/core/ufshcd.c | 90 ++++--
+ drivers/ufs/host/ufs-mediatek.c | 90 ++++--
+ drivers/ufs/host/ufs-mediatek.h | 7 +-
+ drivers/ufs/host/ufs-qcom.c | 28 +-
+ include/scsi/scsi_device.h | 48 +++
+ include/scsi/scsi_host.h | 6 +-
+ include/ufs/ufshcd.h | 7 +
+ include/ufs/ufshci.h | 3 +
+ 70 files changed, 2137 insertions(+), 1379 deletions(-)
+ create mode 100644 drivers/scsi/scsi_lib_test.c
+Merging scsi-mkp/for-next (b914227e4215 Merge patch series "Pass data lifetime information to SCSI disk devices")
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-mkp/for-next
+Auto-merging block/bio.c
+Auto-merging block/blk-mq.c
+Auto-merging block/fops.c
+Auto-merging drivers/scsi/Kconfig
+Auto-merging drivers/scsi/scsi.c
+Auto-merging drivers/scsi/scsi_scan.c
+Auto-merging drivers/scsi/sd.c
+Auto-merging fs/buffer.c
+Auto-merging fs/f2fs/f2fs.h
+Auto-merging fs/fcntl.c
+Auto-merging fs/inode.c
+Auto-merging fs/iomap/buffered-io.c
+CONFLICT (content): Merge conflict in fs/iomap/buffered-io.c
+Auto-merging include/linux/blk-mq.h
+Auto-merging include/linux/blk_types.h
+Auto-merging include/linux/fs.h
+CONFLICT (content): Merge conflict in include/linux/fs.h
+Auto-merging include/scsi/scsi_device.h
+Resolved 'fs/iomap/buffered-io.c' using previous resolution.
+Resolved 'include/linux/fs.h' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 2e4a468bc7d8] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git
+$ git diff -M --stat --summary HEAD^..
+ block/bio.c | 2 +
+ block/blk-crypto-fallback.c | 1 +
+ block/blk-merge.c | 8 +
+ block/blk-mq.c | 2 +
+ block/bounce.c | 1 +
+ block/fops.c | 3 +
+ drivers/scsi/Kconfig | 5 +
+ drivers/scsi/Makefile | 2 +
+ drivers/scsi/bfa/bfa.h | 30 +++-
+ drivers/scsi/bfa/bfa_core.c | 4 +-
+ drivers/scsi/bfa/bfa_cs.h | 21 +--
+ drivers/scsi/bfa/bfa_fcpim.c | 51 -------
+ drivers/scsi/bfa/bfa_fcpim.h | 66 ++++++++-
+ drivers/scsi/bfa/bfa_fcs.h | 312 ++++++++++++++++++++++++++-------------
+ drivers/scsi/bfa/bfa_fcs_fcpim.c | 23 ++-
+ drivers/scsi/bfa/bfa_fcs_lport.c | 112 +++-----------
+ drivers/scsi/bfa/bfa_fcs_rport.c | 34 +++--
+ drivers/scsi/bfa/bfa_ioc.c | 85 +++++------
+ drivers/scsi/bfa/bfa_ioc.h | 84 ++++++++---
+ drivers/scsi/bfa/bfa_svc.c | 72 +++------
+ drivers/scsi/bfa/bfa_svc.h | 115 ++++++++++++---
+ drivers/scsi/bfa/bfad_bsg.c | 11 +-
+ drivers/scsi/bfa/bfad_drv.h | 31 ++--
+ drivers/scsi/hosts.c | 2 +-
+ drivers/scsi/libfc/fc_encode.h | 14 +-
+ drivers/scsi/lpfc/lpfc_ct.c | 4 +-
+ drivers/scsi/scsi.c | 2 +
+ drivers/scsi/scsi_debug.c | 293 +++++++++++++++++++++++++++---------
+ drivers/scsi/scsi_proto_test.c | 56 +++++++
+ drivers/scsi/scsi_scan.c | 2 +-
+ drivers/scsi/scsi_sysfs.c | 14 +-
+ drivers/scsi/sd.c | 111 +++++++++++++-
+ drivers/scsi/sd.h | 3 +
+ fs/buffer.c | 12 +-
+ fs/direct-io.c | 2 +
+ fs/f2fs/f2fs.h | 1 +
+ fs/fcntl.c | 64 +++++---
+ fs/inode.c | 1 +
+ fs/iomap/buffered-io.c | 1 +
+ fs/iomap/direct-io.c | 1 +
+ fs/mpage.c | 1 +
+ include/linux/blk-mq.h | 2 +
+ include/linux/blk_types.h | 2 +
+ include/linux/fs.h | 16 +-
+ include/linux/rw_hint.h | 24 +++
+ include/scsi/scsi_device.h | 1 +
+ include/scsi/scsi_proto.h | 78 ++++++++++
+ 47 files changed, 1207 insertions(+), 575 deletions(-)
+ create mode 100644 drivers/scsi/scsi_proto_test.c
+ create mode 100644 include/linux/rw_hint.h
+Merging vhost/linux-next (fd0b29af02bb Documentation: Add reconnect process for VDUSE)
+$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next
+Merge made by the 'ort' strategy.
+ Documentation/userspace-api/vduse.rst | 33 ++++++
+ drivers/vdpa/alibaba/eni_vdpa.c | 8 ++
+ drivers/vdpa/ifcvf/ifcvf_base.c | 11 +-
+ drivers/vdpa/ifcvf/ifcvf_base.h | 2 +
+ drivers/vdpa/ifcvf/ifcvf_main.c | 15 +++
+ drivers/vdpa/mlx5/net/mlx5_vnet.c | 13 ++-
+ drivers/vdpa/pds/aux_drv.c | 2 +-
+ drivers/vdpa/pds/vdpa_dev.c | 20 +++-
+ drivers/vdpa/pds/vdpa_dev.h | 1 +
+ drivers/vdpa/vdpa.c | 214 +++++++++++++++++++++++++++++++++-
+ drivers/vdpa/vdpa_sim/vdpa_sim.c | 15 ++-
+ drivers/vdpa/vdpa_user/iova_domain.c | 27 ++++-
+ drivers/vdpa/vdpa_user/iova_domain.h | 8 ++
+ drivers/vdpa/vdpa_user/vduse_dev.c | 159 +++++++++++++++++++++++++
+ drivers/vdpa/virtio_pci/vp_vdpa.c | 8 ++
+ drivers/vhost/net.c | 3 +
+ drivers/vhost/vdpa.c | 14 +++
+ drivers/virtio/virtio.c | 6 +-
+ drivers/virtio/virtio_vdpa.c | 5 +-
+ include/linux/vdpa.h | 6 +
+ include/uapi/linux/vdpa.h | 17 +++
+ include/uapi/linux/vduse.h | 5 +
+ include/uapi/linux/vhost.h | 7 ++
+ include/uapi/linux/virtio_pci.h | 10 +-
+ 24 files changed, 582 insertions(+), 27 deletions(-)
+Merging rpmsg/for-next (929654e8f1ad Merge branches 'rpmsg-next' and 'rproc-next' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next
+Auto-merging drivers/remoteproc/imx_dsp_rproc.c
+CONFLICT (content): Merge conflict in drivers/remoteproc/imx_dsp_rproc.c
+Auto-merging drivers/remoteproc/imx_rproc.c
+Resolved 'drivers/remoteproc/imx_dsp_rproc.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master cde83272dc96] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git
+$ git diff -M --stat --summary HEAD^..
+ .../bindings/remoteproc/qcom,sm8550-pas.yaml | 45 +++++-
+ drivers/remoteproc/imx_dsp_rproc.c | 11 +-
+ drivers/remoteproc/imx_rproc.c | 16 +--
+ drivers/remoteproc/qcom_q6v5_pas.c | 150 +++++++++++++++-----
+ drivers/remoteproc/remoteproc_core.c | 29 +++-
+ drivers/remoteproc/remoteproc_virtio.c | 6 +-
+ drivers/remoteproc/st_remoteproc.c | 15 +-
+ drivers/remoteproc/stm32_rproc.c | 10 +-
+ drivers/remoteproc/ti_k3_dsp_remoteproc.c | 156 +++++++--------------
+ drivers/rpmsg/rpmsg_char.c | 12 +-
+ drivers/rpmsg/rpmsg_core.c | 2 +-
+ drivers/rpmsg/rpmsg_ctrl.c | 12 +-
+ 12 files changed, 271 insertions(+), 193 deletions(-)
+Merging gpio/for-next (0bb80ecc33a8 Linux 6.6-rc1)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git gpio/for-next
+Already up to date.
+Merging gpio-brgl/gpio/for-next (0d776cfd5e5b gpiolib: Pass consumer device through to core in devm_fwnode_gpiod_get_index())
+$ git merge -m Merge branch 'gpio/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl/gpio/for-next
+Auto-merging Documentation/userspace-api/index.rst
+CONFLICT (content): Merge conflict in Documentation/userspace-api/index.rst
+Auto-merging MAINTAINERS
+Auto-merging drivers/gpio/gpiolib.c
+Auto-merging include/linux/gpio/driver.h
+Resolved 'Documentation/userspace-api/index.rst' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master fcdc7659d09a] Merge branch 'gpio/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/obsolete/sysfs-gpio | 4 +-
+ Documentation/ABI/testing/gpio-cdev | 9 +-
+ Documentation/admin-guide/gpio/gpio-mockup.rst | 8 +
+ Documentation/admin-guide/gpio/index.rst | 6 +-
+ Documentation/admin-guide/gpio/obsolete.rst | 13 +
+ .../devicetree/bindings/gpio/gpio-mvebu.yaml | 2 +-
+ .../devicetree/bindings/gpio/gpio-pca9570.yaml | 3 +
+ .../bindings/gpio/renesas,rcar-gpio.yaml | 1 +
+ Documentation/driver-api/gpio/consumer.rst | 10 +-
+ Documentation/userspace-api/gpio/chardev.rst | 116 +++
+ Documentation/userspace-api/gpio/chardev_v1.rst | 131 +++
+ Documentation/userspace-api/gpio/error-codes.rst | 79 ++
+ .../userspace-api/gpio/gpio-get-chipinfo-ioctl.rst | 41 +
+ .../gpio/gpio-get-lineevent-ioctl.rst | 84 ++
+ .../gpio/gpio-get-linehandle-ioctl.rst | 125 +++
+ .../userspace-api/gpio/gpio-get-lineinfo-ioctl.rst | 54 ++
+ .../gpio/gpio-get-lineinfo-unwatch-ioctl.rst | 49 ++
+ .../gpio/gpio-get-lineinfo-watch-ioctl.rst | 74 ++
+ .../gpio/gpio-handle-get-line-values-ioctl.rst | 56 ++
+ .../gpio/gpio-handle-set-config-ioctl.rst | 63 ++
+ .../gpio/gpio-handle-set-line-values-ioctl.rst | 48 +
+ .../gpio/gpio-lineevent-data-read.rst | 84 ++
+ .../gpio/gpio-lineinfo-changed-read.rst | 87 ++
+ .../userspace-api/gpio/gpio-v2-get-line-ioctl.rst | 152 ++++
+ .../gpio/gpio-v2-get-lineinfo-ioctl.rst | 50 ++
+ .../gpio/gpio-v2-get-lineinfo-watch-ioctl.rst | 67 ++
+ .../userspace-api/gpio/gpio-v2-line-event-read.rst | 83 ++
+ .../gpio/gpio-v2-line-get-values-ioctl.rst | 51 ++
+ .../gpio/gpio-v2-line-set-config-ioctl.rst | 58 ++
+ .../gpio/gpio-v2-line-set-values-ioctl.rst | 47 +
+ .../gpio/gpio-v2-lineinfo-changed-read.rst | 81 ++
+ Documentation/userspace-api/gpio/index.rst | 18 +
+ Documentation/userspace-api/gpio/obsolete.rst | 11 +
+ .../{admin-guide => userspace-api}/gpio/sysfs.rst | 31 +-
+ Documentation/userspace-api/index.rst | 1 +
+ MAINTAINERS | 1 +
+ drivers/gpio/Kconfig | 15 +-
+ drivers/gpio/Makefile | 1 +
+ drivers/gpio/gpio-cros-ec.c | 209 +++++
+ drivers/gpio/gpio-eic-sprd.c | 10 +-
+ drivers/gpio/gpio-sim.c | 49 +-
+ drivers/gpio/gpiolib-acpi.c | 2 +-
+ drivers/gpio/gpiolib-cdev.c | 96 +-
+ drivers/gpio/gpiolib-devres.c | 2 +-
+ drivers/gpio/gpiolib-legacy.c | 12 +
+ drivers/gpio/gpiolib-of.c | 15 +-
+ drivers/gpio/gpiolib-sysfs.c | 152 ++--
+ drivers/gpio/gpiolib.c | 961 +++++++++++----------
+ drivers/gpio/gpiolib.h | 95 +-
+ include/linux/gpio/driver.h | 42 +-
+ include/uapi/linux/gpio.h | 63 +-
+ 51 files changed, 2820 insertions(+), 702 deletions(-)
+ create mode 100644 Documentation/admin-guide/gpio/obsolete.rst
+ create mode 100644 Documentation/userspace-api/gpio/chardev.rst
+ create mode 100644 Documentation/userspace-api/gpio/chardev_v1.rst
+ create mode 100644 Documentation/userspace-api/gpio/error-codes.rst
+ create mode 100644 Documentation/userspace-api/gpio/gpio-get-chipinfo-ioctl.rst
+ create mode 100644 Documentation/userspace-api/gpio/gpio-get-lineevent-ioctl.rst
+ create mode 100644 Documentation/userspace-api/gpio/gpio-get-linehandle-ioctl.rst
+ create mode 100644 Documentation/userspace-api/gpio/gpio-get-lineinfo-ioctl.rst
+ create mode 100644 Documentation/userspace-api/gpio/gpio-get-lineinfo-unwatch-ioctl.rst
+ create mode 100644 Documentation/userspace-api/gpio/gpio-get-lineinfo-watch-ioctl.rst
+ create mode 100644 Documentation/userspace-api/gpio/gpio-handle-get-line-values-ioctl.rst
+ create mode 100644 Documentation/userspace-api/gpio/gpio-handle-set-config-ioctl.rst
+ create mode 100644 Documentation/userspace-api/gpio/gpio-handle-set-line-values-ioctl.rst
+ create mode 100644 Documentation/userspace-api/gpio/gpio-lineevent-data-read.rst
+ create mode 100644 Documentation/userspace-api/gpio/gpio-lineinfo-changed-read.rst
+ create mode 100644 Documentation/userspace-api/gpio/gpio-v2-get-line-ioctl.rst
+ create mode 100644 Documentation/userspace-api/gpio/gpio-v2-get-lineinfo-ioctl.rst
+ create mode 100644 Documentation/userspace-api/gpio/gpio-v2-get-lineinfo-watch-ioctl.rst
+ create mode 100644 Documentation/userspace-api/gpio/gpio-v2-line-event-read.rst
+ create mode 100644 Documentation/userspace-api/gpio/gpio-v2-line-get-values-ioctl.rst
+ create mode 100644 Documentation/userspace-api/gpio/gpio-v2-line-set-config-ioctl.rst
+ create mode 100644 Documentation/userspace-api/gpio/gpio-v2-line-set-values-ioctl.rst
+ create mode 100644 Documentation/userspace-api/gpio/gpio-v2-lineinfo-changed-read.rst
+ create mode 100644 Documentation/userspace-api/gpio/index.rst
+ create mode 100644 Documentation/userspace-api/gpio/obsolete.rst
+ rename Documentation/{admin-guide => userspace-api}/gpio/sysfs.rst (87%)
+ create mode 100644 drivers/gpio/gpio-cros-ec.c
+Merging gpio-intel/for-next (6613476e225e Linux 6.8-rc1)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel/for-next
+Already up to date.
+Merging pinctrl/for-next (d2db5cd3721e Merge branch 'devel' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next
+Merge made by the 'ort' strategy.
+ .../bindings/pinctrl/amlogic,meson-pinctrl-a1.yaml | 2 +-
+ .../pinctrl/amlogic,meson-pinctrl-g12a-aobus.yaml | 2 +-
+ .../amlogic,meson-pinctrl-g12a-periphs.yaml | 2 +-
+ .../pinctrl/amlogic,meson8-pinctrl-aobus.yaml | 2 +-
+ .../pinctrl/amlogic,meson8-pinctrl-cbus.yaml | 2 +-
+ .../devicetree/bindings/pinctrl/cirrus,madera.yaml | 3 +-
+ .../bindings/pinctrl/cypress,cy8c95x0.yaml | 24 +-
+ .../bindings/pinctrl/nuvoton,npcm845-pinctrl.yaml | 2 -
+ .../bindings/pinctrl/nuvoton,wpcm450-pinctrl.yaml | 3 +-
+ .../pinctrl/nvidia,tegra234-pinmux-aon.yaml | 7 +-
+ .../pinctrl/nvidia,tegra234-pinmux-common.yaml | 82 +-
+ .../bindings/pinctrl/nvidia,tegra234-pinmux.yaml | 7 +-
+ .../devicetree/bindings/pinctrl/pincfg-node.yaml | 2 +-
+ .../devicetree/bindings/pinctrl/renesas,pfc.yaml | 1 +
+ ...nx,zynq-pinctrl.yaml => xlnx,pinctrl-zynq.yaml} | 6 +-
+ arch/riscv/boot/dts/renesas/r9a07g043f.dtsi | 4 +
+ drivers/pinctrl/cirrus/pinctrl-cs42l43.c | 18 +-
+ drivers/pinctrl/mediatek/pinctrl-mt7981.c | 24 +-
+ drivers/pinctrl/mediatek/pinctrl-mt7986.c | 2 +-
+ drivers/pinctrl/mediatek/pinctrl-mt8186.c | 1 -
+ drivers/pinctrl/mediatek/pinctrl-mt8192.c | 1 -
+ drivers/pinctrl/nuvoton/pinctrl-wpcm450.c | 2 +-
+ drivers/pinctrl/pinctrl-mcp23s08.c | 15 +-
+ drivers/pinctrl/pinctrl-st.c | 3 +-
+ drivers/pinctrl/pinctrl-zynqmp.c | 8 +-
+ drivers/pinctrl/qcom/Kconfig | 2 +-
+ drivers/pinctrl/renesas/Kconfig | 7 +
+ drivers/pinctrl/renesas/Makefile | 1 +
+ drivers/pinctrl/renesas/core.c | 14 +-
+ drivers/pinctrl/renesas/pfc-r8a779g0.c | 14 +
+ drivers/pinctrl/renesas/pfc-r8a779h0.c | 3967 ++++++++++++++++++++
+ drivers/pinctrl/renesas/pinctrl-rzg2l.c | 792 +++-
+ drivers/pinctrl/renesas/sh_pfc.h | 1 +
+ drivers/pinctrl/stm32/pinctrl-stm32mp257.c | 2 +-
+ 34 files changed, 4846 insertions(+), 179 deletions(-)
+ rename Documentation/devicetree/bindings/pinctrl/{xlnx,zynq-pinctrl.yaml => xlnx,pinctrl-zynq.yaml} (98%)
+ create mode 100644 drivers/pinctrl/renesas/pfc-r8a779h0.c
+Merging pinctrl-intel/for-next (6613476e225e Linux 6.8-rc1)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel/for-next
+Already up to date.
+Merging pinctrl-renesas/renesas-pinctrl (a6f06b909fee pinctrl: renesas: Allow the compiler to optimize away sh_pfc_pm)
+$ git merge -m Merge branch 'renesas-pinctrl' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git pinctrl-renesas/renesas-pinctrl
+Already up to date.
+Merging pinctrl-samsung/for-next (6613476e225e Linux 6.8-rc1)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung/for-next
+Already up to date.
+Merging pwm/pwm/for-next (9e3440d2d57b pwm: dwc: simplify error handling)
+$ git merge -m Merge branch 'pwm/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git pwm/pwm/for-next
+Auto-merging Documentation/driver-api/driver-model/devres.rst
+Auto-merging drivers/gpu/drm/bridge/ti-sn65dsi86.c
+Auto-merging drivers/leds/rgb/leds-qcom-lpg.c
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/pwm/atmel,hlcdc-pwm.yaml | 35 +
+ .../devicetree/bindings/pwm/atmel-hlcdc-pwm.txt | 29 -
+ .../devicetree/bindings/pwm/marvell,pxa-pwm.yaml | 51 ++
+ .../bindings/pwm/mediatek,mt2712-pwm.yaml | 1 +
+ Documentation/devicetree/bindings/pwm/pxa-pwm.txt | 30 -
+ Documentation/driver-api/driver-model/devres.rst | 1 +
+ Documentation/driver-api/pwm.rst | 11 +-
+ drivers/gpio/gpio-mvebu.c | 18 +-
+ drivers/gpu/drm/bridge/ti-sn65dsi86.c | 32 +-
+ drivers/leds/rgb/leds-qcom-lpg.c | 16 +-
+ drivers/pinctrl/intel/pinctrl-intel.c | 6 +-
+ drivers/pwm/core.c | 724 +++++++++++----------
+ drivers/pwm/pwm-ab8500.c | 36 +-
+ drivers/pwm/pwm-apple.c | 18 +-
+ drivers/pwm/pwm-atmel-hlcdc.c | 42 +-
+ drivers/pwm/pwm-atmel-tcb.c | 32 +-
+ drivers/pwm/pwm-atmel.c | 47 +-
+ drivers/pwm/pwm-bcm-iproc.c | 19 +-
+ drivers/pwm/pwm-bcm-kona.c | 23 +-
+ drivers/pwm/pwm-bcm2835.c | 22 +-
+ drivers/pwm/pwm-berlin.c | 29 +-
+ drivers/pwm/pwm-brcmstb.c | 17 +-
+ drivers/pwm/pwm-clk.c | 27 +-
+ drivers/pwm/pwm-clps711x.c | 28 +-
+ drivers/pwm/pwm-crc.c | 22 +-
+ drivers/pwm/pwm-cros-ec.c | 59 +-
+ drivers/pwm/pwm-dwc-core.c | 26 +-
+ drivers/pwm/pwm-dwc.c | 77 ++-
+ drivers/pwm/pwm-dwc.h | 14 +-
+ drivers/pwm/pwm-ep93xx.c | 21 +-
+ drivers/pwm/pwm-fsl-ftm.c | 49 +-
+ drivers/pwm/pwm-hibvt.c | 70 +-
+ drivers/pwm/pwm-img.c | 60 +-
+ drivers/pwm/pwm-imx-tpm.c | 34 +-
+ drivers/pwm/pwm-imx1.c | 20 +-
+ drivers/pwm/pwm-imx27.c | 35 +-
+ drivers/pwm/pwm-intel-lgm.c | 17 +-
+ drivers/pwm/pwm-iqs620a.c | 30 +-
+ drivers/pwm/pwm-jz4740.c | 36 +-
+ drivers/pwm/pwm-keembay.c | 17 +-
+ drivers/pwm/pwm-lp3943.c | 17 +-
+ drivers/pwm/pwm-lpc18xx-sct.c | 34 +-
+ drivers/pwm/pwm-lpc32xx.c | 21 +-
+ drivers/pwm/pwm-lpss-pci.c | 10 +-
+ drivers/pwm/pwm-lpss-platform.c | 10 +-
+ drivers/pwm/pwm-lpss.c | 38 +-
+ drivers/pwm/pwm-lpss.h | 1 -
+ drivers/pwm/pwm-mediatek.c | 38 +-
+ drivers/pwm/pwm-meson.c | 57 +-
+ drivers/pwm/pwm-microchip-core.c | 17 +-
+ drivers/pwm/pwm-mtk-disp.c | 25 +-
+ drivers/pwm/pwm-mxs.c | 32 +-
+ drivers/pwm/pwm-ntxec.c | 14 +-
+ drivers/pwm/pwm-omap-dmtimer.c | 47 +-
+ drivers/pwm/pwm-pca9685.c | 161 ++---
+ drivers/pwm/pwm-pxa.c | 25 +-
+ drivers/pwm/pwm-raspberrypi-poe.c | 20 +-
+ drivers/pwm/pwm-rcar.c | 27 +-
+ drivers/pwm/pwm-renesas-tpu.c | 20 +-
+ drivers/pwm/pwm-rockchip.c | 24 +-
+ drivers/pwm/pwm-rz-mtu3.c | 60 +-
+ drivers/pwm/pwm-samsung.c | 94 +--
+ drivers/pwm/pwm-sifive.c | 30 +-
+ drivers/pwm/pwm-sl28cpld.c | 13 +-
+ drivers/pwm/pwm-spear.c | 18 +-
+ drivers/pwm/pwm-sprd.c | 58 +-
+ drivers/pwm/pwm-sti.c | 70 +-
+ drivers/pwm/pwm-stm32-lp.c | 31 +-
+ drivers/pwm/pwm-stm32.c | 56 +-
+ drivers/pwm/pwm-stmpe.c | 58 +-
+ drivers/pwm/pwm-sun4i.c | 100 +--
+ drivers/pwm/pwm-sunplus.c | 17 +-
+ drivers/pwm/pwm-tegra.c | 50 +-
+ drivers/pwm/pwm-tiecap.c | 55 +-
+ drivers/pwm/pwm-tiehrpwm.c | 72 +-
+ drivers/pwm/pwm-twl-led.c | 55 +-
+ drivers/pwm/pwm-twl.c | 50 +-
+ drivers/pwm/pwm-visconti.c | 17 +-
+ drivers/pwm/pwm-vt8500.c | 43 +-
+ drivers/pwm/pwm-xilinx.c | 34 +-
+ drivers/pwm/sysfs.c | 4 +-
+ drivers/staging/greybus/pwm.c | 133 ++--
+ include/linux/platform_data/x86/pwm-lpss.h | 4 +-
+ include/linux/pwm.h | 49 +-
+ 84 files changed, 1898 insertions(+), 1792 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/pwm/atmel,hlcdc-pwm.yaml
+ delete mode 100644 Documentation/devicetree/bindings/pwm/atmel-hlcdc-pwm.txt
+ create mode 100644 Documentation/devicetree/bindings/pwm/marvell,pxa-pwm.yaml
+ delete mode 100644 Documentation/devicetree/bindings/pwm/pxa-pwm.txt
+Merging ktest/for-next (7dc8e24f0e09 ktest: Restore stty setting at first in dodie)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git ktest/for-next
+Already up to date.
+Merging kselftest/next (539cd3f4da3f selftests: lib.mk: Do not process TEST_GEN_MODS_DIR)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next
+Auto-merging Documentation/dev-tools/kselftest.rst
+Auto-merging MAINTAINERS
+Auto-merging arch/s390/configs/debug_defconfig
+Auto-merging arch/s390/configs/defconfig
+Auto-merging lib/Kconfig.debug
+Auto-merging lib/Makefile
+Auto-merging tools/testing/selftests/Makefile
+Auto-merging tools/testing/selftests/dt/test_unprobed_devices.sh
+Auto-merging tools/testing/selftests/lib.mk
+Auto-merging tools/testing/selftests/livepatch/functions.sh
+Merge made by the 'ort' strategy.
+ Documentation/dev-tools/kselftest.rst | 4 +
+ MAINTAINERS | 2 +-
+ arch/s390/configs/debug_defconfig | 1 -
+ arch/s390/configs/defconfig | 1 -
+ lib/Kconfig.debug | 22 --
+ lib/Makefile | 2 -
+ lib/livepatch/Makefile | 14 -
+ tools/testing/selftests/Makefile | 2 +
+ tools/testing/selftests/dt/Makefile | 2 +-
+ .../testing/selftests/dt/test_unprobed_devices.sh | 6 +-
+ tools/testing/selftests/ftrace/ftracetest | 2 +-
+ .../ftrace/test.d/00basic/test_ownership.tc | 2 +-
+ .../selftests/ftrace/test.d/ftrace/func_hotplug.tc | 42 ++
+ .../ftrace/test.d/trigger/trigger-hist-mod.tc | 2 +-
+ .../selftests/futex/functional/futex_requeue_pi.c | 13 +-
+ .../selftests/{dt => kselftest}/ktap_helpers.sh | 47 ++-
+ tools/testing/selftests/lib.mk | 23 +-
+ tools/testing/selftests/livepatch/.gitignore | 1 +
+ tools/testing/selftests/livepatch/Makefile | 5 +-
+ tools/testing/selftests/livepatch/README | 25 +-
+ tools/testing/selftests/livepatch/config | 1 -
+ tools/testing/selftests/livepatch/functions.sh | 47 ++-
+ .../testing/selftests/livepatch/test-callbacks.sh | 50 +--
+ tools/testing/selftests/livepatch/test-ftrace.sh | 6 +-
+ .../testing/selftests/livepatch/test-livepatch.sh | 10 +-
+ .../selftests/livepatch/test-shadow-vars.sh | 2 +-
+ tools/testing/selftests/livepatch/test-state.sh | 18 +-
+ tools/testing/selftests/livepatch/test-syscall.sh | 53 +++
+ tools/testing/selftests/livepatch/test-sysfs.sh | 6 +-
+ .../selftests/livepatch/test_klp-call_getpid.c | 44 +++
+ .../selftests/livepatch/test_modules/Makefile | 26 ++
+ .../test_modules}/test_klp_atomic_replace.c | 0
+ .../test_modules}/test_klp_callbacks_busy.c | 0
+ .../test_modules}/test_klp_callbacks_demo.c | 0
+ .../test_modules}/test_klp_callbacks_demo2.c | 0
+ .../test_modules}/test_klp_callbacks_mod.c | 0
+ .../livepatch/test_modules}/test_klp_livepatch.c | 0
+ .../livepatch/test_modules}/test_klp_shadow_vars.c | 0
+ .../livepatch/test_modules}/test_klp_state.c | 0
+ .../livepatch/test_modules}/test_klp_state2.c | 0
+ .../livepatch/test_modules}/test_klp_state3.c | 0
+ .../livepatch/test_modules/test_klp_syscall.c | 116 ++++++
+ tools/testing/selftests/mqueue/setting | 1 +
+ tools/testing/selftests/power_supply/Makefile | 4 +
+ tools/testing/selftests/power_supply/helpers.sh | 178 +++++++++
+ .../power_supply/test_power_supply_properties.sh | 114 ++++++
+ tools/testing/selftests/resctrl/cache.c | 289 ++++----------
+ tools/testing/selftests/resctrl/cat_test.c | 429 +++++++++++++++------
+ tools/testing/selftests/resctrl/cmt_test.c | 80 +++-
+ tools/testing/selftests/resctrl/fill_buf.c | 136 +++----
+ tools/testing/selftests/resctrl/mba_test.c | 30 +-
+ tools/testing/selftests/resctrl/mbm_test.c | 34 +-
+ tools/testing/selftests/resctrl/resctrl.h | 145 +++++--
+ tools/testing/selftests/resctrl/resctrl_tests.c | 223 +++++------
+ tools/testing/selftests/resctrl/resctrl_val.c | 138 ++++---
+ tools/testing/selftests/resctrl/resctrlfs.c | 405 +++++++++++++------
+ tools/testing/selftests/sched/cs_prctl_test.c | 2 +-
+ .../selftests/thermal/intel/power_floor/.gitignore | 1 +
+ .../thermal/intel/workload_hint/.gitignore | 1 +
+ tools/testing/selftests/uevent/.gitignore | 1 +
+ 60 files changed, 1909 insertions(+), 899 deletions(-)
+ delete mode 100644 lib/livepatch/Makefile
+ create mode 100644 tools/testing/selftests/ftrace/test.d/ftrace/func_hotplug.tc
+ rename tools/testing/selftests/{dt => kselftest}/ktap_helpers.sh (66%)
+ create mode 100644 tools/testing/selftests/livepatch/.gitignore
+ create mode 100755 tools/testing/selftests/livepatch/test-syscall.sh
+ create mode 100644 tools/testing/selftests/livepatch/test_klp-call_getpid.c
+ create mode 100644 tools/testing/selftests/livepatch/test_modules/Makefile
+ rename {lib/livepatch => tools/testing/selftests/livepatch/test_modules}/test_klp_atomic_replace.c (100%)
+ rename {lib/livepatch => tools/testing/selftests/livepatch/test_modules}/test_klp_callbacks_busy.c (100%)
+ rename {lib/livepatch => tools/testing/selftests/livepatch/test_modules}/test_klp_callbacks_demo.c (100%)
+ rename {lib/livepatch => tools/testing/selftests/livepatch/test_modules}/test_klp_callbacks_demo2.c (100%)
+ rename {lib/livepatch => tools/testing/selftests/livepatch/test_modules}/test_klp_callbacks_mod.c (100%)
+ rename {lib/livepatch => tools/testing/selftests/livepatch/test_modules}/test_klp_livepatch.c (100%)
+ rename {lib/livepatch => tools/testing/selftests/livepatch/test_modules}/test_klp_shadow_vars.c (100%)
+ rename {lib/livepatch => tools/testing/selftests/livepatch/test_modules}/test_klp_state.c (100%)
+ rename {lib/livepatch => tools/testing/selftests/livepatch/test_modules}/test_klp_state2.c (100%)
+ rename {lib/livepatch => tools/testing/selftests/livepatch/test_modules}/test_klp_state3.c (100%)
+ create mode 100644 tools/testing/selftests/livepatch/test_modules/test_klp_syscall.c
+ create mode 100644 tools/testing/selftests/mqueue/setting
+ create mode 100644 tools/testing/selftests/power_supply/Makefile
+ create mode 100644 tools/testing/selftests/power_supply/helpers.sh
+ create mode 100755 tools/testing/selftests/power_supply/test_power_supply_properties.sh
+ create mode 100644 tools/testing/selftests/thermal/intel/power_floor/.gitignore
+ create mode 100644 tools/testing/selftests/thermal/intel/workload_hint/.gitignore
+ create mode 100644 tools/testing/selftests/uevent/.gitignore
+Merging kunit/test (6613476e225e Linux 6.8-rc1)
+$ git merge -m Merge branch 'test' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit/test
+Already up to date.
+Merging kunit-next/kunit (e00c5a9fa617 kunit: Annotate _MSG assertion variants with gnu printf specifiers)
+ 133e267ef4a2 ("time: test: Fix incorrect format specifier")
+$ git merge -m Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-next/kunit
+Auto-merging drivers/gpu/drm/xe/tests/xe_migrate.c
+Merge made by the 'ort' strategy.
+ drivers/gpu/drm/xe/tests/xe_migrate.c | 8 ++++----
+ drivers/rtc/lib_test.c | 2 +-
+ include/kunit/test.h | 12 ++++++------
+ lib/cmdline_kunit.c | 2 +-
+ lib/kunit/device.c | 6 +++++-
+ lib/kunit/executor.c | 6 +++---
+ lib/kunit/executor_test.c | 2 +-
+ lib/memcpy_kunit.c | 4 ++--
+ net/core/gso_test.c | 2 +-
+ tools/testing/kunit/kunit_kernel.py | 1 +
+ 10 files changed, 25 insertions(+), 20 deletions(-)
+$ git reset --hard HEAD^
+HEAD is now at fad922b9c589 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git
+Merging next-20240227 version of kunit-next
+$ git merge -m next-20240227/kunit-next 717083f6645014268637224f1fdcfecc46b45ca9
+Merge made by the 'ort' strategy.
+ lib/kunit/device.c | 2 +-
+ lib/kunit/executor.c | 6 +++---
+ tools/testing/kunit/kunit_kernel.py | 1 +
+ 3 files changed, 5 insertions(+), 4 deletions(-)
+Merging livepatching/for-next (602bf1830798 Merge branch 'for-6.7' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching livepatching/for-next
+Merge made by the 'ort' strategy.
+Merging rtc/rtc-next (6613476e225e Linux 6.8-rc1)
+$ git merge -m Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next
+Already up to date.
+Merging nvdimm/libnvdimm-for-next (bc22374c96d9 device-dax: make dax_bus_type const)
+$ git merge -m Merge branch 'libnvdimm-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm/libnvdimm-for-next
+Auto-merging drivers/dax/bus.c
+Merge made by the 'ort' strategy.
+ drivers/dax/bus.c | 2 +-
+ drivers/nvdimm/Kconfig | 2 +-
+ drivers/nvdimm/bus.c | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+Merging at24/at24/for-next (6613476e225e Linux 6.8-rc1)
+$ git merge -m Merge branch 'at24/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git at24/at24/for-next
+Already up to date.
+Merging ntb/ntb-next (9341b37ec17a ntb_perf: Fix printk format)
+$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next
+Merge made by the 'ort' strategy.
+ drivers/ntb/hw/intel/ntb_hw_gen1.c | 2 +-
+ drivers/ntb/test/ntb_perf.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+Merging seccomp/for-next/seccomp (56af94aace8a samples: user-trap: fix strict-aliasing warning)
+$ git merge -m Merge branch 'for-next/seccomp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git seccomp/for-next/seccomp
+Auto-merging tools/testing/selftests/seccomp/seccomp_benchmark.c
+Merge made by the 'ort' strategy.
+ samples/seccomp/user-trap.c | 8 +++--
+ .../testing/selftests/seccomp/seccomp_benchmark.c | 38 ++++++++++++++++++--
+ tools/testing/selftests/seccomp/seccomp_bpf.c | 41 ++++++++++++++++------
+ 3 files changed, 73 insertions(+), 14 deletions(-)
+Merging fsi/next (c5eeb63edac9 fsi: Fix panic on scom file read)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git fsi/next
+Merge made by the 'ort' strategy.
+ drivers/fsi/fsi-sbefifo.c | 9 ++++++++-
+ drivers/fsi/i2cr-scom.c | 11 ++++++++++-
+ 2 files changed, 18 insertions(+), 2 deletions(-)
+Merging slimbus/for-next (6e8ba95e17ee slimbus: core: Remove usage of the deprecated ida_simple_xx() API)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git slimbus/for-next
+Merge made by the 'ort' strategy.
+ drivers/slimbus/core.c | 6 +++---
+ drivers/slimbus/qcom-ngd-ctrl.c | 8 ++++----
+ include/linux/slimbus.h | 2 +-
+ 3 files changed, 8 insertions(+), 8 deletions(-)
+Merging nvmem/for-next (6b475e23544a nvmem: meson-efuse: fix function pointer type mismatch)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git nvmem/for-next
+Auto-merging MAINTAINERS
+Auto-merging drivers/nvmem/core.c
+Merge made by the 'ort' strategy.
+ .../bindings/nvmem/layouts/fixed-cell.yaml | 22 +--
+ .../devicetree/bindings/nvmem/nvmem-provider.yaml | 18 ++
+ .../bindings/nvmem/xlnx,zynqmp-nvmem.txt | 46 -----
+ .../bindings/nvmem/xlnx,zynqmp-nvmem.yaml | 42 ++++
+ MAINTAINERS | 8 +
+ drivers/firmware/xilinx/zynqmp.c | 25 +++
+ drivers/nvmem/core.c | 5 +
+ drivers/nvmem/layouts.c | 2 +-
+ drivers/nvmem/meson-efuse.c | 25 +--
+ drivers/nvmem/mtk-efuse.c | 20 +-
+ drivers/nvmem/zynqmp_nvmem.c | 213 ++++++++++++++++++---
+ include/linux/firmware/xlnx-zynqmp.h | 8 +
+ 12 files changed, 322 insertions(+), 112 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/nvmem/nvmem-provider.yaml
+ delete mode 100644 Documentation/devicetree/bindings/nvmem/xlnx,zynqmp-nvmem.txt
+ create mode 100644 Documentation/devicetree/bindings/nvmem/xlnx,zynqmp-nvmem.yaml
+Merging xarray/main (2a15de80dd0f idr: fix param name in idr_alloc_cyclic() doc)
+$ git merge -m Merge branch 'main' of git://git.infradead.org/users/willy/xarray.git xarray/main
+Already up to date.
+Merging hyperv/hyperv-next (ce9ecca0238b Linux 6.6-rc2)
+$ git merge -m Merge branch 'hyperv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv/hyperv-next
+Already up to date.
+Merging auxdisplay/for-next (a9bcd02fa422 auxdisplay: Add driver for MAX695x 7-segment LED controllers)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git auxdisplay/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ .../bindings/auxdisplay/arm,versatile-lcd.yaml | 4 +-
+ .../bindings/auxdisplay/hit,hd44780.yaml | 62 +++---
+ .../bindings/auxdisplay/holtek,ht16k33.yaml | 50 ++---
+ .../bindings/auxdisplay/img,ascii-lcd.yaml | 4 +-
+ .../bindings/auxdisplay/maxim,max6959.yaml | 44 +++++
+ MAINTAINERS | 8 +-
+ drivers/auxdisplay/Kconfig | 14 ++
+ drivers/auxdisplay/Makefile | 1 +
+ drivers/auxdisplay/ht16k33.c | 174 +++++++----------
+ drivers/auxdisplay/img-ascii-lcd.c | 38 ++--
+ drivers/auxdisplay/line-display.c | 166 ++++++++++++++--
+ drivers/auxdisplay/line-display.h | 53 ++++-
+ drivers/auxdisplay/max6959.c | 194 ++++++++++++++++++
+ drivers/auxdisplay/panel.c | 216 +++++++++------------
+ 14 files changed, 702 insertions(+), 326 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/auxdisplay/maxim,max6959.yaml
+ create mode 100644 drivers/auxdisplay/max6959.c
+Merging kgdb/kgdb/for-next (4f41d30cd6dc kdb: Fix a potential buffer overflow in kdb_local())
+$ git merge -m Merge branch 'kgdb/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git kgdb/kgdb/for-next
+Already up to date.
+Merging hmm/hmm (6613476e225e Linux 6.8-rc1)
+$ git merge -m Merge branch 'hmm' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git hmm/hmm
+Already up to date.
+Merging cfi/cfi/next (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'cfi/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git cfi/cfi/next
+Already up to date.
+Merging mhi/mhi-next (2ec11b5d6d90 bus: mhi: host: pci_generic: constify modem_telit_fn980_hw_v1_config)
+$ git merge -m Merge branch 'mhi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git mhi/mhi-next
+Merge made by the 'ort' strategy.
+ drivers/bus/mhi/common.h | 38 ++---
+ drivers/bus/mhi/ep/main.c | 7 +-
+ drivers/bus/mhi/host/boot.c | 11 +-
+ drivers/bus/mhi/host/init.c | 91 ++++++------
+ drivers/bus/mhi/host/internal.h | 56 ++++++--
+ drivers/bus/mhi/host/main.c | 19 ++-
+ drivers/bus/mhi/host/pci_generic.c | 2 +-
+ drivers/bus/mhi/host/pm.c | 27 +++-
+ drivers/bus/mhi/host/trace.h | 282 +++++++++++++++++++++++++++++++++++++
+ include/linux/mhi.h | 19 ---
+ 10 files changed, 427 insertions(+), 125 deletions(-)
+ create mode 100644 drivers/bus/mhi/host/trace.h
+Merging memblock/for-next (2159bd4e9057 memblock: Return NUMA_NO_NODE instead of -1 to improve code readability)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock/for-next
+Already up to date.
+Merging cxl/next (73bf93edeeea cxl/core: use sysfs_emit() for attr's _show())
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl/next
+Already up to date.
+Merging zstd/zstd-next (3f832dfb8a8e zstd: fix g_debuglevel export warning)
+$ git merge -m Merge branch 'zstd-next' of https://github.com/terrelln/linux.git zstd/zstd-next
+Merge made by the 'ort' strategy.
+ include/linux/zstd.h | 2 +-
+ include/linux/zstd_errors.h | 23 +-
+ include/linux/zstd_lib.h | 697 ++++++++--
+ lib/zstd/Makefile | 2 +-
+ lib/zstd/common/allocations.h | 56 +
+ lib/zstd/common/bits.h | 149 ++
+ lib/zstd/common/bitstream.h | 53 +-
+ lib/zstd/common/compiler.h | 14 +-
+ lib/zstd/common/cpu.h | 3 +-
+ lib/zstd/common/debug.c | 5 +-
+ lib/zstd/common/debug.h | 3 +-
+ lib/zstd/common/entropy_common.c | 42 +-
+ lib/zstd/common/error_private.c | 12 +-
+ lib/zstd/common/error_private.h | 3 +-
+ lib/zstd/common/fse.h | 89 +-
+ lib/zstd/common/fse_decompress.c | 94 +-
+ lib/zstd/common/huf.h | 234 +---
+ lib/zstd/common/mem.h | 2 +-
+ lib/zstd/common/portability_macros.h | 26 +-
+ lib/zstd/common/zstd_common.c | 38 +-
+ lib/zstd/common/zstd_deps.h | 16 +-
+ lib/zstd/common/zstd_internal.h | 99 +-
+ lib/zstd/compress/clevels.h | 3 +-
+ lib/zstd/compress/fse_compress.c | 59 +-
+ lib/zstd/compress/hist.c | 3 +-
+ lib/zstd/compress/hist.h | 3 +-
+ lib/zstd/compress/huf_compress.c | 372 +++--
+ lib/zstd/compress/zstd_compress.c | 1758 +++++++++++++++++-------
+ lib/zstd/compress/zstd_compress_internal.h | 333 +++--
+ lib/zstd/compress/zstd_compress_literals.c | 155 ++-
+ lib/zstd/compress/zstd_compress_literals.h | 25 +-
+ lib/zstd/compress/zstd_compress_sequences.c | 7 +-
+ lib/zstd/compress/zstd_compress_sequences.h | 3 +-
+ lib/zstd/compress/zstd_compress_superblock.c | 47 +-
+ lib/zstd/compress/zstd_compress_superblock.h | 3 +-
+ lib/zstd/compress/zstd_cwksp.h | 149 +-
+ lib/zstd/compress/zstd_double_fast.c | 129 +-
+ lib/zstd/compress/zstd_double_fast.h | 6 +-
+ lib/zstd/compress/zstd_fast.c | 578 ++++++--
+ lib/zstd/compress/zstd_fast.h | 6 +-
+ lib/zstd/compress/zstd_lazy.c | 518 +++----
+ lib/zstd/compress/zstd_lazy.h | 7 +-
+ lib/zstd/compress/zstd_ldm.c | 11 +-
+ lib/zstd/compress/zstd_ldm.h | 3 +-
+ lib/zstd/compress/zstd_ldm_geartab.h | 3 +-
+ lib/zstd/compress/zstd_opt.c | 187 +--
+ lib/zstd/compress/zstd_opt.h | 3 +-
+ lib/zstd/decompress/huf_decompress.c | 772 +++++++----
+ lib/zstd/decompress/zstd_ddict.c | 9 +-
+ lib/zstd/decompress/zstd_ddict.h | 3 +-
+ lib/zstd/decompress/zstd_decompress.c | 259 +++-
+ lib/zstd/decompress/zstd_decompress_block.c | 283 ++--
+ lib/zstd/decompress/zstd_decompress_block.h | 8 +-
+ lib/zstd/decompress/zstd_decompress_internal.h | 7 +-
+ lib/zstd/decompress_sources.h | 2 +-
+ lib/zstd/zstd_common_module.c | 5 +-
+ lib/zstd/zstd_compress_module.c | 2 +-
+ lib/zstd/zstd_decompress_module.c | 4 +-
+ 58 files changed, 4791 insertions(+), 2596 deletions(-)
+ create mode 100644 lib/zstd/common/allocations.h
+ create mode 100644 lib/zstd/common/bits.h
+Merging efi/next (841c35169323 Linux 6.8-rc4)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next
+Already up to date.
+Merging unicode/for-next (101c3fad29d7 libfs: Drop generic_set_encrypted_ci_d_ops)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git unicode/for-next
+Auto-merging fs/ext4/super.c
+Auto-merging fs/f2fs/namei.c
+Auto-merging fs/f2fs/super.c
+Auto-merging fs/libfs.c
+Auto-merging fs/ubifs/dir.c
+Auto-merging fs/ubifs/super.c
+Auto-merging include/linux/fs.h
+Merge made by the 'ort' strategy.
+ fs/crypto/hooks.c | 15 +++----
+ fs/ext4/namei.c | 1 -
+ fs/ext4/super.c | 1 +
+ fs/f2fs/namei.c | 1 -
+ fs/f2fs/super.c | 1 +
+ fs/libfs.c | 102 +++++++++++++++++++-----------------------------
+ fs/overlayfs/params.c | 14 +++++--
+ fs/ubifs/dir.c | 1 -
+ fs/ubifs/super.c | 1 +
+ include/linux/fs.h | 11 +++++-
+ include/linux/fscrypt.h | 66 +++++++++++++++++++++++++++----
+ 11 files changed, 128 insertions(+), 86 deletions(-)
+Merging slab/slab/for-next (e3757988c829 Merge branch 'slab/for-6.9/slab-flag-cleanups' into slab/for-next)
+$ git merge -m Merge branch 'slab/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab/slab/for-next
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Auto-merging mm/kasan/generic.c
+Auto-merging mm/slab_common.c
+Merge made by the 'ort' strategy.
+ Documentation/admin-guide/kernel-parameters.txt | 79 +++++++++-----------
+ Documentation/mm/slub.rst | 60 +++++++--------
+ drivers/misc/lkdtm/heap.c | 2 +-
+ include/linux/kasan.h | 6 --
+ include/linux/slab.h | 97 ++++++++++++++++++-------
+ mm/Kconfig.debug | 6 +-
+ mm/kasan/generic.c | 22 ++----
+ mm/slab.h | 10 +--
+ mm/slab_common.c | 21 +++---
+ mm/slub.c | 92 ++++++++++++-----------
+ 10 files changed, 202 insertions(+), 193 deletions(-)
+Merging random/master (1f719a2f3fa6 Merge tag 'net-6.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git random/master
+Already up to date.
+Merging landlock/next (bdbf17bc7d65 landlock: Document IOCTL support)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git landlock/next
+Auto-merging tools/testing/kunit/configs/all_tests.config
+Merge made by the 'ort' strategy.
+ Documentation/userspace-api/landlock.rst | 178 ++++++++-
+ include/uapi/linux/landlock.h | 55 ++-
+ samples/landlock/sandboxer.c | 13 +-
+ security/landlock/.kunitconfig | 4 +
+ security/landlock/Kconfig | 15 +
+ security/landlock/common.h | 2 +
+ security/landlock/fs.c | 465 +++++++++++++++++++++-
+ security/landlock/fs.h | 3 +
+ security/landlock/limits.h | 11 +-
+ security/landlock/ruleset.h | 2 +-
+ security/landlock/syscalls.c | 37 +-
+ tools/testing/kunit/configs/all_tests.config | 1 +
+ tools/testing/selftests/landlock/base_test.c | 2 +-
+ tools/testing/selftests/landlock/common.h | 39 +-
+ tools/testing/selftests/landlock/fs_test.c | 561 ++++++++++++++++++++++++++-
+ 15 files changed, 1297 insertions(+), 91 deletions(-)
+ create mode 100644 security/landlock/.kunitconfig
+Merging rust/rust-next (e944171070b6 rust: add `container_of!` macro)
+$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next
+Auto-merging Documentation/process/changes.rst
+CONFLICT (content): Merge conflict in Documentation/process/changes.rst
+Auto-merging rust/kernel/workqueue.rs
+Auto-merging scripts/min-tool-version.sh
+Resolved 'Documentation/process/changes.rst' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master d51c997ef706] Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git
+$ git diff -M --stat --summary HEAD^..
+ Documentation/process/changes.rst | 2 +-
+ Documentation/rust/general-information.rst | 24 ----
+ Documentation/rust/index.rst | 1 +
+ Documentation/rust/testing.rst | 135 ++++++++++++++++++++
+ rust/alloc/alloc.rs | 9 +-
+ rust/alloc/boxed.rs | 20 +--
+ rust/alloc/lib.rs | 7 +-
+ rust/alloc/raw_vec.rs | 19 ++-
+ rust/alloc/vec/mod.rs | 16 ++-
+ rust/bindings/bindings_helper.h | 5 +-
+ rust/kernel/allocator.rs | 2 +-
+ rust/kernel/error.rs | 10 +-
+ rust/kernel/init.rs | 22 ++--
+ rust/kernel/ioctl.rs | 6 +-
+ rust/kernel/lib.rs | 37 +++++-
+ rust/kernel/str.rs | 193 +++++++++++++++++++++++++++--
+ rust/kernel/sync.rs | 5 +-
+ rust/kernel/sync/arc.rs | 30 +++--
+ rust/kernel/sync/condvar.rs | 110 ++++++++++++----
+ rust/kernel/sync/lock.rs | 19 ++-
+ rust/kernel/sync/lock/mutex.rs | 3 +-
+ rust/kernel/sync/lock/spinlock.rs | 5 +-
+ rust/kernel/sync/locked_by.rs | 7 +-
+ rust/kernel/task.rs | 24 +++-
+ rust/kernel/time.rs | 20 +++
+ rust/kernel/types.rs | 22 ++++
+ rust/kernel/workqueue.rs | 78 ++++++------
+ rust/macros/module.rs | 7 +-
+ scripts/min-tool-version.sh | 2 +-
+ 29 files changed, 658 insertions(+), 182 deletions(-)
+ create mode 100644 Documentation/rust/testing.rst
+ create mode 100644 rust/kernel/time.rs
+Merging sysctl/sysctl-next (4f1136a55dc8 scripts: check-sysctl-docs: handle per-namespace sysctls)
+$ git merge -m Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl.git sysctl/sysctl-next
+Auto-merging MAINTAINERS
+Auto-merging ipc/ipc_sysctl.c
+Merge made by the 'ort' strategy.
+ MAINTAINERS | 2 +-
+ ipc/ipc_sysctl.c | 3 +--
+ scripts/check-sysctl-docs | 65 +++++++++++++++++++++++------------------------
+ 3 files changed, 34 insertions(+), 36 deletions(-)
+Merging execve/for-next/execve (d3f0d7bbaefd exec: Delete unnecessary statements in remove_arg_zero())
+$ git merge -m Merge branch 'for-next/execve' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git execve/for-next/execve
+Auto-merging fs/exec.c
+Merge made by the 'ort' strategy.
+ fs/binfmt_elf_fdpic.c | 2 +-
+ fs/exec.c | 1 -
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+Merging bitmap/bitmap-for-next (fd8ed16c2419 bitmap: Step down as a reviewer)
+$ git merge -m Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git bitmap/bitmap-for-next
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ MAINTAINERS | 1 -
+ include/linux/find.h | 8 ++++----
+ 2 files changed, 4 insertions(+), 5 deletions(-)
+Merging hte/for-next (b85ea95d0864 Linux 6.7-rc1)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git hte/for-next
+Already up to date.
+Merging kspp/for-next/kspp (c427b1a5e0f8 sparc: vdso: Disable UBSAN instrumentation)
+ 2867ef32ce00 ("x86/vdso: Move vDSO to mmap region")
+$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git kspp/for-next/kspp
+Auto-merging MAINTAINERS
+Auto-merging arch/arm/Kconfig
+Auto-merging arch/arm64/Kconfig
+Auto-merging arch/mips/Kconfig
+Auto-merging arch/parisc/Kconfig
+Auto-merging arch/powerpc/Kconfig
+Auto-merging arch/riscv/Kconfig
+Auto-merging arch/s390/Kconfig
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/x86/boot/compressed/misc.c
+Auto-merging arch/x86/kvm/mmu/mmu.c
+Auto-merging fs/namei.c
+Auto-merging include/linux/compiler_types.h
+Auto-merging include/linux/string.h
+Auto-merging kernel/printk/printk.c
+Auto-merging lib/Kconfig.debug
+Auto-merging lib/Makefile
+Auto-merging scripts/Makefile.lib
+CONFLICT (content): Merge conflict in scripts/Makefile.lib
+Auto-merging tools/objtool/noreturns.h
+Resolved 'scripts/Makefile.lib' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master ac2526fddb27] Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git
+$ git diff -M --stat --summary HEAD^..
+ Documentation/dev-tools/ubsan.rst | 28 +-
+ MAINTAINERS | 22 +-
+ arch/arm/Kconfig | 2 +-
+ arch/arm/boot/compressed/misc.c | 2 +-
+ arch/arm/boot/compressed/misc.h | 2 +-
+ arch/arm/include/asm/word-at-a-time.h | 3 +-
+ arch/arm64/Kconfig | 2 +-
+ arch/arm64/include/asm/word-at-a-time.h | 3 +-
+ arch/mips/Kconfig | 2 +-
+ arch/parisc/Kconfig | 2 +-
+ arch/powerpc/Kconfig | 2 +-
+ arch/powerpc/include/asm/word-at-a-time.h | 4 +-
+ arch/riscv/Kconfig | 2 +-
+ arch/riscv/include/asm/word-at-a-time.h | 3 +-
+ arch/s390/Kconfig | 2 +-
+ arch/s390/include/asm/word-at-a-time.h | 3 +-
+ arch/sh/include/asm/word-at-a-time.h | 2 +
+ arch/sparc/vdso/Makefile | 1 +
+ arch/um/drivers/net_kern.c | 2 +-
+ arch/um/drivers/vector_kern.c | 2 +-
+ arch/um/drivers/vector_user.c | 4 +-
+ arch/um/include/shared/user.h | 3 +-
+ arch/um/os-Linux/drivers/ethertap_user.c | 2 +-
+ arch/um/os-Linux/drivers/tuntap_user.c | 2 +-
+ arch/um/os-Linux/umid.c | 6 +-
+ arch/x86/Kconfig | 2 +-
+ arch/x86/boot/compressed/misc.c | 2 +-
+ arch/x86/include/asm/word-at-a-time.h | 3 +-
+ arch/x86/kvm/mmu/mmu.c | 1 +
+ drivers/misc/lkdtm/bugs.c | 3 +-
+ drivers/misc/lkdtm/core.c | 22 +-
+ drivers/misc/vmw_vmci/vmci_datagram.c | 7 +-
+ fs/namei.c | 2 +-
+ include/asm-generic/word-at-a-time.h | 3 +-
+ include/linux/compiler_types.h | 9 +-
+ include/linux/fortify-string.h | 122 +++--
+ include/linux/kernel.h | 44 +-
+ include/linux/overflow.h | 101 ++++-
+ include/linux/refcount.h | 9 +-
+ include/linux/string.h | 86 +++-
+ include/linux/string_choices.h | 11 +
+ include/linux/wordpart.h | 42 ++
+ kernel/configs/hardening.config | 7 +-
+ kernel/printk/printk.c | 11 -
+ lib/Kconfig.debug | 2 +-
+ lib/Kconfig.ubsan | 28 +-
+ lib/Makefile | 3 +
+ lib/fortify_kunit.c | 662 +++++++++++++++++++++++++++-
+ lib/overflow_kunit.c | 67 ++-
+ lib/string.c | 25 +-
+ lib/string_helpers.c | 60 +--
+ lib/test_ubsan.c | 41 +-
+ lib/ubsan.c | 68 +++
+ lib/ubsan.h | 4 +
+ scripts/Makefile.lib | 5 +-
+ scripts/Makefile.ubsan | 5 +-
+ scripts/coccinelle/api/string_choices.cocci | 41 ++
+ scripts/coccinelle/misc/struct_size.cocci | 74 ++++
+ scripts/leaking_addresses.pl | 90 +++-
+ tools/objtool/noreturns.h | 2 +-
+ 60 files changed, 1492 insertions(+), 280 deletions(-)
+ create mode 100644 include/linux/wordpart.h
+ create mode 100644 scripts/coccinelle/api/string_choices.cocci
+ create mode 100644 scripts/coccinelle/misc/struct_size.cocci
+Merging kspp-gustavo/for-next/kspp (6613476e225e Linux 6.8-rc1)
+$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git kspp-gustavo/for-next/kspp
+Already up to date.
+Merging nolibc/nolibc (6613476e225e Linux 6.8-rc1)
+$ git merge -m Merge branch 'nolibc' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git nolibc/nolibc
+Already up to date.
+Merging tsm/tsm-next (f4738f56d1dc virt: tdx-guest: Add Quote generation support using TSM_REPORTS)
+$ git merge -m Merge branch 'tsm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/linux tsm/tsm-next
+Already up to date.
+Merging iommufd/for-next (6613476e225e Linux 6.8-rc1)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd/for-next
+Already up to date.
+Merging header_cleanup/header_cleanup (5f4c01f1e3c7 spinlock: Fix failing build for PREEMPT_RT)
+$ git merge -m Merge branch 'header_cleanup' of https://evilpiepirate.org/git/bcachefs.git header_cleanup/header_cleanup
+Already up to date.
+$ git am -3 ../patches/0001-Revert-HID-amd_sfh-Extend-MP2-register-access-to-SFH.patch
+Applying: Revert "HID: amd_sfh: Extend MP2 register access to SFH"
diff --git a/localversion-next b/localversion-next
new file mode 100644
index 000000000000..4b70eaa6f527
--- /dev/null
+++ b/localversion-next
@@ -0,0 +1 @@
+-next-20240228
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-08 18:52:48 +0000