From e94bd4ec45ac156616da285a0bf03056cd7430fc Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 17 Mar 2025 23:58:07 +1100
Subject: [PATCH] Add linux-next specific files for 20250317
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
Next/SHA1s | 390 ++
Next/Trees | 392 ++
Next/merge.log | 16489 ++++++++++++++++++++++++++++++++++++++++++++
localversion-next | 1 +
4 files changed, 17272 insertions(+)
create mode 100644 Next/SHA1s
create mode 100644 Next/Trees
create mode 100644 Next/merge.log
create mode 100644 localversion-next
diff --git a/Next/SHA1s b/Next/SHA1s
new file mode 100644
index 0000000000000..9eb5bb01295fa
--- /dev/null
+++ b/Next/SHA1s
@@ -0,0 +1,390 @@
+Name SHA1
+---- ----
+origin d1275e99d1c4f2e70452558b8da9d0d7bdcc9e16
+fixes fac04efc5c793dccbd07e2d59af9f90b7fc0dca4
+ext4-fixes 4bbf9020becbfd8fc2c3da790855b7042fad455b
+vfs-brauner-fixes 986a6f5eacb900ea0f6036ef724b26e76be40f65
+fscrypt-current 2014c95afecee3e76ca4a56956a936e23283f05b
+fsverity-current 2014c95afecee3e76ca4a56956a936e23283f05b
+btrfs-fixes e83be4ca3b944785fec8c6fe1996aa069bba00d5
+vfs-fixes bdb43af4fdb39f844ede401bdb1258f67a580a27
+erofs-fixes 6422cde1b0d5a31b206b263417c1c2b3c80fe82c
+nfsd-fixes 4990d098433db18c854e75fb0f90d941eb7d479e
+v9fs-fixes 2014c95afecee3e76ca4a56956a936e23283f05b
+overlayfs-fixes 228a1157fb9fec47eb135b51c0202b574e079ebf
+bcachefs 3d84872adbda877e7133e9b7a4b77acf885331b7
+fscrypt 13dc8eb90067f3aae45269214978e552400d5e28
+btrfs 95a5bce4d0c9fdc40604784b57846755704c88bd
+ceph 3981be13ec1baf811bfb93ed6a98bafc85cdeab1
+cifs 7c064a69d12c03d84ee0c4fa955e84525bd6760f
+configfs 84147f4e84c4f4822006161c5ad43612ac906407
+ecryptfs fba133a3411847db49297c965218400c49571ebd
+dlm a3672304abf2a847ac0c54c84842c64c5bfba279
+erofs f81398b33aeaf7dcf8df893fefffcbf846cdaeac
+exfat e4b343c1706f6b27b4f585723bf51462212ad40d
+exportfs adc218676eef25575469234709c2d87185ca223a
+ext3 82b6a8dd857d66722e3bd9edf273d932e947a9d6
+ext4 9e28059d56649a7212d5b3f8751ec021154ba3dd
+f2fs c60b556bfe0a97b7b2b6a144a97790cad103e084
+fsverity a19bcde49998aac0a4ff99e9a84339adecffbfcb
+fuse bea8ae66d5e6706dc876e2caa755611117d69952
+gfs2 951d701ef1bbce4c5f88466f5e829fb3d5735856
+jfs a8dfb2168906944ea61acfc87846b816eeab882d
+ksmbd 5e8ad31dad3854bfb010cf8f38343af4effca471
+nfs 7eb172143d5508b4da468ed59ee857c6e5e01da6
+nfs-anna 9084ed79ddaaaa1ec01cd304af9fb532c26252db
+nfsd 26a80762153ba0dc98258b5e6d2e9741178c5114
+ntfs3 8b12017c1b9582db8c5833cf08d610e8f810f4b3
+orangefs 96319dacaf15f666bcba7275953d780e23fe9e75
+overlayfs c8b359dddb418c60df1a69beea01d1b3322bfe83
+ubifs 69146a8c893f734cefaac0af6f917f894f29077e
+v9fs 44ca5412b274dfa2d7f96b42b37f968909ba1bd0
+v9fs-ericvh 2014c95afecee3e76ca4a56956a936e23283f05b
+xfs a408302665669afb52ea08845432a5dd8978aa81
+zonefs c4b3c1332f55c48785e6661cebeb7269a92a45fd
+vfs-brauner ac0200d71bca6c20fcad4037a4a71c52e894a943
+vfs 2e72b1e0aac24a12f3bf3eec620efaca7ab7d4de
+mm-hotfixes 34c830abb21572083b6e521476200e50f207dd10
+fs-current 822b79b954ef36b9b910abc49eea9ce677c5b98a
+kbuild-current 80e54e84911a923c40d7bee33a34c1b4be148d7a
+arc-current 78d4f34e2115b517bcbfe7ec0d018bbbb6f9b0b8
+arm-current 0c66c6f4e21cb22220cbd8821c5c73fc157d20dc
+arm64-fixes f7edb07ad7c66eab3dce57384f33b9799d579133
+arm-soc-fixes 45d5fe1c53baaed1fb3043f45d1e15ebb4bbe86a
+davinci-current 2014c95afecee3e76ca4a56956a936e23283f05b
+drivers-memory-fixes 304e6c02b76f019016cd492d2d544e07c5753d30
+sophgo-fixes 2014c95afecee3e76ca4a56956a936e23283f05b
+m68k-current bb2e0fb1e6aa9f737d6e0cbcf6494c51180e6d6d
+powerpc-fixes eff2eb592efd73f00590d578c3d6021f604df62c
+s390-fixes b4a1dec11793936ffe1a9fb811724532ff3b1174
+net 4003c9e78778e93188a09d6043a74f7154449d43
+bpf 6ccf6adb05d0fe3dbb1a77ab90bf054da8a2198d
+ipsec 0aae2867aa6067f73d066bc98385e23c8454a1d7
+netfilter 2409fa66e29a2c09f26ad320735fbdfbb74420da
+ipvs 1438f5d07b9a7afb15e1d0e26df04a6fd4e56a3c
+wireless 8ae227f8a7749eec92fc381dfbe213429c852278
+ath 3640dbc1f75ce15d128ea4af44226960d894f3fd
+wpan 8ce4f287524c74a118b0af1eebd4b24a8efca57a
+rdma-fixes 556f93b90c1872ad85e216e613c0b33803e621cb
+sound-current de69d56daac6d9b98fa384184078751db1288144
+sound-asoc-fixes de74ec718e0788e1998eb7289ad07970e27cae27
+regmap-fixes 32ffed055dcee17f6705f545b069e44a66067808
+regulator-fixes 2c7a50bec4958f1d1c84d19cde518d0e96a676fd
+spi-fixes 91cf42c63f2d8a9c1bcdfe923218e079b32e1a69
+pci-current 2014c95afecee3e76ca4a56956a936e23283f05b
+driver-core.current 80e54e84911a923c40d7bee33a34c1b4be148d7a
+tty.current 0ad2507d5d93f39619fc42372c347d6006b64319
+usb.current f2865c6300d75a9f187dd7918d248e010970fd44
+usb-serial-fixes 18e0885bd2ca738407036434418a26a58394a60e
+phy 7eb172143d5508b4da468ed59ee857c6e5e01da6
+staging.current 2014c95afecee3e76ca4a56956a936e23283f05b
+iio-fixes 2156789f74ea408ece91c627e3cf5951c82d47ea
+counter-current c0c9c73434666dc99ee156b25e7e722150bee001
+char-misc.current 2dc25093218f5d42391549de6fe45e1aa9325676
+soundwire-fixes 2014c95afecee3e76ca4a56956a936e23283f05b
+thunderbolt-fixes 502843396ec2a3eb4f58a2e4618a4a85fc5e0f46
+input-current fd10709e28d2fa9015667aee56d92099fc97aa0d
+crypto-current 9d4f8e54cef2c42e23ef258833dbd06a1eaff89b
+vfio-fixes 09dfc8a5f2ce897005a94bf66cca4f91e4e03700
+kselftest-fixes a64dcfb451e254085a7daee5fe51bf22959d52d3
+dmaengine-fixes 7eb172143d5508b4da468ed59ee857c6e5e01da6
+backlight-fixes 1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0
+mtd-fixes 1dbf60277e9b6181d2366a94c974728106cdd551
+mfd-fixes 68f860426d500cfb697b505799244c7dfff604b1
+v4l-dvb-fixes 2014c95afecee3e76ca4a56956a936e23283f05b
+reset-fixes 0e2268f88bb27ef14ac3de1bc4df29ff12bb28cb
+mips-fixes 6d48ad04075729519f6baaa1dc9e5a3a39d05f53
+at91-fixes 2014c95afecee3e76ca4a56956a936e23283f05b
+omap-fixes c2a5f8c4f28ffea8c93d10e509c5a6e61172cdca
+kvm-fixes ea9bd29a9c0d757b3384ae3e633e6bbaddf00725
+kvms390-fixes d8dfda5af0be6e48178b6f4b46c6af30b06335b2
+hwmon-fixes 10fce7ebe888fa8c97eee7e317a47e7603e5e78d
+nvdimm-fixes 265e98f72bac6c41a4492d3e30a8e5fd22fe0779
+cxl-fixes 2014c95afecee3e76ca4a56956a936e23283f05b
+dma-mapping-fixes 8324993f60305e50f27b98358b01b9837e10d159
+drivers-x86-fixes 03fc0a2dc9f8c292fad8a1bcfb6d1f0dec1824be
+samsung-krzk-fixes 53517a70873c7a91675f7244768aad5006cc45de
+pinctrl-samsung-fixes 2014c95afecee3e76ca4a56956a936e23283f05b
+devicetree-fixes 75f1f311d883dfaffb98be3c1da208d6ed5d4df9
+dt-krzk-fixes 2014c95afecee3e76ca4a56956a936e23283f05b
+scsi-fixes f27a95845b01e86d67c8b014b4f41bd3327daa63
+drm-fixes d1d77326f585ccf1fb388e1bcc18a630e044577f
+drm-intel-fixes a8045e46c508b70fe4b30cc020fd0a2b0709b2e5
+mmc-fixes e51a349d2dcf1df8422dabb90b2f691dc7df6f92
+rtc-fixes 2014c95afecee3e76ca4a56956a936e23283f05b
+gnss-fixes 0ad2507d5d93f39619fc42372c347d6006b64319
+hyperv-fixes 73fe9073c0cc28056cb9de0c8a516dac070f1d1f
+risc-v-fixes 245aece3750d3692ae7a44516c1096936bded7ab
+riscv-dt-fixes 1b133129ad6b28186214259af3bd5fc651a85509
+riscv-soc-fixes 2014c95afecee3e76ca4a56956a936e23283f05b
+fpga-fixes 1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0
+spdx 2014c95afecee3e76ca4a56956a936e23283f05b
+gpio-brgl-fixes dcb73cbaaeb39c9fd00bf2e019f911725945e2fe
+gpio-intel-fixes 2014c95afecee3e76ca4a56956a936e23283f05b
+pinctrl-intel-fixes 2014c95afecee3e76ca4a56956a936e23283f05b
+auxdisplay-fixes 2014c95afecee3e76ca4a56956a936e23283f05b
+kunit-fixes a64dcfb451e254085a7daee5fe51bf22959d52d3
+memblock-fixes 180bbad698641873120a48857bb3b9f3166bf684
+renesas-fixes 379c590113ce46f605439d4887996c60ab8820cc
+perf-current 42367eca7604e16e170bd6bd94ef61ffdd335f4a
+efi-fixes cb16dfed0093217a68c0faa9394fa5823927e04c
+battery-fixes 98380110bd48fbfd6a798ee11fffff893d36062c
+iommufd-fixes 2ca704f55e22b7b00cc7025953091af3c82fa5c0
+rust-fixes a1eb95d6b5f4cf5cc7b081e85e374d1dd98a213b
+w1-fixes 2014c95afecee3e76ca4a56956a936e23283f05b
+pmdomain-fixes ef17b519088ee0c167cf507820609732ec8bad1a
+i2c-host-fixes 2b22459792fcb4def9f0936d64575ac11a95a58d
+sparc-fixes 6613476e225e090cc9aad49be7fa504e290dd33d
+clk-fixes 54493279312f9e6edf64173681cb18d1df4297c1
+pwrseq-fixes 2014c95afecee3e76ca4a56956a936e23283f05b
+thead-dt-fixes 40384c840ea1944d7c5a392e8975ed088ecf0b37
+ftrace-fixes 2fa6a01345b538faa7b0fae8f723bb6977312428
+ring-buffer-fixes 97937834ae876f29565415ab15f1284666dc6be3
+trace-fixes a1a7eb89ca0b89dc1c326eeee2596f263291aca3
+tracefs-fixes 8b55572e51805184353ee7d587c720a51818fb82
+spacemit-fixes 2014c95afecee3e76ca4a56956a936e23283f05b
+tip-fixes 5ee2723f963d8ac9b9f48f7eb123abf48e866b02
+slab-fixes dfd3df31c9db752234d7d2e09bef2aeabb643ce4
+drm-msm-fixes 73f69c6be2a9f22c31c775ec03c6c286bfe12cfa
+uml-fixes 96178631c3f53398044ed437010f7632ad764bf8
+drm-misc-fixes c3e4a25602f8b941b154f52a4da13ae77b4664c4
+linus ffd294d346d185b70e28b1a28abe367bbfe53c04
+mm-stable 80e54e84911a923c40d7bee33a34c1b4be148d7a
+mm-nonmm-stable 80e54e84911a923c40d7bee33a34c1b4be148d7a
+mm f8a756a99e5273f2abb77f1c5791740707ffa284
+kbuild e3de46f775ec29a17f671523798c28222a4ce818
+clang-format c147f663b6a5813b9860f3917cc473fb2c462d8d
+perf 02ba09c8ab9406f30c5c63b7cfd4b300c3c2c32c
+compiler-attributes 98f7e32f20d28ec452afb208f9cffc08448a2652
+dma-mapping 2014c95afecee3e76ca4a56956a936e23283f05b
+asm-generic 9d48cc07d0d7f72d4d44c75f5f7d3471d60f2213
+alpha 1523226edda566057bdd3264ceb56631ddf5f6f7
+arm f520fab580c9179bacc432f3a3bf1eada73fdfcc
+arm64 b60cf0c4d94f0ffd51fd30997c0b21a2dbb9c71d
+arm-perf 7f35b429802a8065aa61e2a3f567089649f4d98e
+arm-soc 69e7831ba231cdf8db6d2119f118e8ec9fa2ee8f
+amlogic 73e4ffb27bb8a093d557bb2dac1a271474cca99c
+asahi-soc 00a97a7f66d2d7500e28a2f6da5fd57fa058abad
+aspeed bf8f48263c0efd8c24c7c046fa54a5490de31e6b
+at91 a8aab30697c583c86c8c178c65334ddb5881cb64
+broadcom bdac656f1bb5de45801b1cea650e91ceef6c4112
+davinci 58abc69e479cf5b36c4fc4287a11c9d92d2ce4b8
+drivers-memory 90a0fbaac4a588a1116a191521c3c837c25582ee
+imx-mxs 90453dc4dee29b96b9162895f45776bc25526e07
+mediatek a8a297e8bb3dd304cac77f7c435a4983d885a657
+mvebu ed9c2b28ebef3333f25cefdc2ef37ee1f05cad95
+omap 065f3bd4f22b0cf01f9a5f62b45f2bc8fdb8c045
+qcom e1b3b837e020597984a800205b1f3f601adf7672
+renesas 3ade232c98a8d65233c4df091ca49cea28d8885a
+reset c361baf67200a79c878d72cc879b1217c52cec96
+rockchip 7131dad5dba8338f2b97eac77df0315897fff7ab
+samsung-krzk f0dbe0d40d08199109cb689849877694a8b91033
+scmi dbbf6170bba6a2b7f69c0e411c62864f2c45d5cc
+sophgo f047a9285f9f3fd5c0d5ae53af350b8b619e470a
+spacemit 5b90a3d6092d9292d3c4fe4eef8969282e070ae3
+stm32 65954899a157832f68536b488194cf698248a26e
+sunxi 96b0934c028372f5ac924d889d238776ca3578ed
+tee a7562ff028797d64dbfdff141f1cb724c245b305
+tegra 4e16110559c3c6801085d759f077af328d5e7e9e
+thead-dt c95c1362e5bcd90c45987828bbef02236d181ffd
+ti 15b2ed044c7806d58d415dbc02a03fb81aacb64f
+xilinx d6ccf528cb3cc796c4c251785b830fc86a7d1548
+clk 82f69876ef45ad66c0b114b786c7c6ac0f6a4580
+clk-imx 06a61b5cb6a8638fa8823cd09b17233b29696fa2
+clk-renesas e1a098330ef0555ad216e549a018d99aee7752c1
+csky 2b48804336be69272d43939ff0dc3b0c0a703395
+loongarch 6bdbb73dc8d99fbb77f5db79dbb6f108708090b4
+m68k 3c4e4ec957b6243cce92fb7d450a71a93ce181c5
+m68knommu 184815cc99d14eca77bb7449dae103619536e616
+microblaze 920354d7818bb533a469479640fafab6e87d0cd8
+mips a547dc46e3930ab4aa219d27cb7b720198884cf2
+openrisc ea1413e5b53a8dd4fa7675edb23cdf828bbdce1e
+parisc-hd e822b8f01b40eb193cf7ebb059ac7c560a562d6f
+powerpc 861efb8a48ee8b73ae4e8817509cd4e82fd52bc4
+risc-v 2014c95afecee3e76ca4a56956a936e23283f05b
+riscv-dt 38818f7c9c179351334b1faffc4d40bd28cc9c72
+riscv-soc 2014c95afecee3e76ca4a56956a936e23283f05b
+s390 745a0de1a0b2d2937bf2b4fb6b57f8ebbba7edd8
+sh 2014c95afecee3e76ca4a56956a936e23283f05b
+sparc 2cec2c4dc90cbf5194c1acef08c1e74f0437af95
+uml 2d2b61ae38bd91217ea7cc5bc700a2b9e75b3937
+xtensa dbef257ab7fabc845fe359cbe74b08d3b590550e
+fs-next 2ba7f9e7fdd5d30f7171f3026bfa76494f26d184
+printk b6e2174ef49bb3e0fccb4e2548bc9384d0bd9105
+pci df90ab163b755e94fe1604cbb758248e65b3a139
+pstore 5674609535bafa834ab014d90d9bbe8e89223a0b
+hid 160957abbf9911cd32bf68c688672542e0725237
+i2c 7a098757ac569b43d266bab98ba718d9ae4c3ef6
+i2c-host 42c1c13f4b705c02afac72525b90066b61c51f02
+i3c 2a785307e41b5c621228e3a7ec3949af546a3e69
+dmi 4d1b28a8119c615f1e932520f9ee1f80bdda5204
+hwmon-staging dbcfcb239b3b452ef8782842c36fb17dd1b9092f
+jc_docs 2d38f5fe1a208d544d3771d2c67087a251094ba0
+v4l-dvb f2151613e040973c868d28c8b00885dfab69eb75
+v4l-dvb-next b36c41c51e9d763393634359b90f02414ef470a3
+pm ca47140abd6f3c129e8d938fbcbdfa9b77f7a86b
+cpufreq-arm be4ae8c19492cd6d5de61ccb34ffb3f5ede5eec8
+cpupower fffadbdd6b5acdb6390d6d0bc3ad6d3da5d2bd53
+devfreq f3253b23535fda2436b2d5a3172260a75ca64091
+pmdomain dc9a897dbb03dfd46c3bd2ce69e42e378bd12ca0
+opp 2014c95afecee3e76ca4a56956a936e23283f05b
+thermal ecb642900deb8e53378f43a7a369173e638517ff
+rdma 0a924decd4a3a27c557a6d3c29add61d45ab592a
+net-next bfc6c67ec2d64d0ca4e5cc3e1ac84298a10b8d62
+bpf-next 722ce03eaed973ab89ff938043ceabeb7d1d30b7
+ipsec-next 2e460eefbd4469420349bdcb81b331a46211717a
+mlx5-next f550694e88b7b13b647777f889e03e544d9db60c
+netfilter-next 71ca3561c268a07888ba9ce089ab8c3f54710cd4
+ipvs-next 4e41231249f4083a095085ff86e317e29313c2c3
+bluetooth 5c301fb00b844235bf518f3336a314827cb18ea2
+wireless-next 54be64fdf3ba6dbad2f5c48e466e1db43ad74bca
+ath-next 0e28ee106c46c95eb322833c17c33e3c231ccd0d
+wpan-next a5d4d993fac4925410991eac3b427ea6b86e4872
+wpan-staging a5d4d993fac4925410991eac3b427ea6b86e4872
+mtd 2a6a44555f0727070643fdde7ffac6571e41327a
+nand ddc210cf8b8a8be68051ad958bf3e2cef6b681c2
+spi-nor 93020292fea71d62dc9749745d8ba1b44268a2fc
+crypto d2d072a313c1817a0d72d7b8301eaf29ce7f83fc
+drm d115a38f3c07b40d65e16d7251c1e5c4e995453a
+drm-exynos 81a50378559bfbb76a26f574f13a58a441d43b77
+drm-misc 914ee6e730e134410b77edc453b629767e84c32c
+amdgpu eb6cdfb807d038d9b9986b5c87188f28a4071eae
+drm-intel d115a38f3c07b40d65e16d7251c1e5c4e995453a
+drm-msm 83ee6d2ec52f1378f3473ee8657d559bebdbda44
+drm-msm-lumag 83ee6d2ec52f1378f3473ee8657d559bebdbda44
+drm-nova b28786b190d1ae2df5e6a5181ad78c6f226ea3e1
+drm-xe 278469ff569e1082d56b4a7af26fbaecef9fbf3b
+etnaviv 6bde14ba5f7ef59e103ac317df6cc5ac4291ff4a
+fbdev 95c7757266fa181178f27f7395c129d1080a75b0
+regmap 14b33926f5768e86494749def9f6d48f29239791
+sound c2820405ba55a38932aa2177f026b70064296663
+ieee1394 2014c95afecee3e76ca4a56956a936e23283f05b
+sound-asoc d9a06936ee9e64952e161849059f6cf096b33e4a
+modules 085c5e37427d22381efa6e8a660dd810e8ef36ef
+input 4d395cb071a343196ca524d3694790f06978fe91
+block 8fb5da8b1939d66abd4ee2b2d4b388dfab7e51d0
+device-mapper 45fc728515c14f53f6205789de5bfd72a95af3b8
+libata 725ad0283033ee52c9bc73b5ea53fb7f6d496197
+pcmcia 0630e3bc0e91b57288921df2927859b23184ca45
+mmc 4139badab0d8fc83d3c1c0993eb6bdea7bab9745
+mfd be23147462296c0d8ac03af12e99b61626109b59
+backlight d1ebaf003a065d5d337b8fa3d69f9b90d7bb759d
+battery aae075a93f7705e29c599d101abc7e467125d871
+regulator 557b4c79dfeb6963bffc369825ab982da4221d71
+security 65b796acea1e5efc13eb29fdb4638fd26deabc17
+apparmor 3e45553acb14692519db853e4b5be35b45e46ad0
+integrity 672a4c654a08c2b3022be0f239563c0fa5539bff
+selinux 8af43b61c17e9a18b06fd6ab26370543f21eb4e4
+smack a158a937d864d0034fea14913c1f09c6d5f574b8
+tomoyo 09fbf3d502050282bf47ab3babe1d4ed54dd1fd8
+tpmdd 4576ad38bb9b7a060b71d5d0231e9741b8248fbd
+watchdog 48a136639ec233614a61653e19f559977d5da2b5
+iommu f5a5f66e279132adb5a9870f605356604625b873
+audit 2014c95afecee3e76ca4a56956a936e23283f05b
+devicetree 590f5d6752f7d951d3549b259c1436940131703b
+dt-krzk 854a080f0b73ff966a813ec2dc53891831daa28d
+mailbox d44ee3bd382daad9cb5bbe2073b6b22cae4686e7
+spi 7c51d2d7f82a08a3f230f835aa4bcedd2b026051
+tip 16c52ca7545527a06e662ba6818900c4e91a4e0b
+clockevents 96bf4b89a6ab22426ad83ef76e66c72a5a8daca0
+edac af1a78613133542583c9a9875c824678a3c3a145
+ftrace 440358f4f179e4a45c4f7b13a1d463bcd4540dc8
+rcu 467c890f2d1ad6de9fd1dbd196fdc8f3ee63190a
+paulmck 87d07e135725dd8976a5ddbc7dfa968198d9ae91
+kvm ea9bd29a9c0d757b3384ae3e633e6bbaddf00725
+kvm-arm b33c5fbb042c276f719a7cce242b421e04330acf
+kvms390 32239066776a27287837a193b37c6e55259e5c10
+kvm-ppc fac04efc5c793dccbd07e2d59af9f90b7fc0dca4
+kvm-riscv ee4e778c5802444f17beff010762a3263d2ff2bc
+kvm-x86 c9ea48bb6ee6b28bbc956c1e8af98044618fed5e
+xen-tip 421d62f47b7a61794f04ddd9ec2e4fa2e209da90
+percpu 87d6aab2389e5ce0197d8257d5f8ee965a67c4cd
+workqueues 1e5f94eb8ef7b8d2fb3bcc63e72e1457eaa5c753
+sched-ext d780271744822e3b8daf08416514d0296f235b98
+drivers-x86 01db3d1ff43aeedeaf11c8bc9d09493ec00c8f4a
+chrome-platform 9fc83373f0ffb8834da48b1446a5c2fef9525bb1
+chrome-platform-firmware 2014c95afecee3e76ca4a56956a936e23283f05b
+hsi e3f88665a78045fe35c7669d2926b8d97b892c11
+leds-lj 7a3350495d9ae8ae5b178d603449d18fa7150560
+ipmi d082ecbc71e9e0bf49883ee4afd435a77a5101b6
+driver-core e01968420a99ab34f607ad35111b9158caabc3db
+usb 3a85c10115407588fad696d6c121d54cd5ba5d72
+thunderbolt 72cef52b353cc693d71ad37d80237d975f9951d9
+usb-serial 6a7713ec5337d3a535a1e35a7a7a71020436770e
+tty d2fa8e52cf9193babd1a9179dc2459868965a40c
+char-misc 64612eb92d0e6f86ead2d141bb2107c41d7a062e
+accel f03eee5fc922158654405318a02db9982c0ddf07
+coresight 5442d22da7dbff3ba8c6720fc6f23ea4934d402d
+fastrpc 2014c95afecee3e76ca4a56956a936e23283f05b
+fpga e19890a0088b5884cb9e6a6f5717dc56cc45fc31
+icc 4cc004716977beab6242bca385326c84db127256
+iio 8dbeb413806f9f810d97d25284f585b201aa3bdc
+phy-next f13bff25161b8a0a9d716764ebe57334d496c6d9
+soundwire 08ae0d61c3d79bb5d52ae30ad4fc12442e966a23
+extcon 7041ed0dde8319991b59003c414f0bda5192b041
+gnss 0ad2507d5d93f39619fc42372c347d6006b64319
+vfio 384a530111c682d4a6c4c9ec305254c323a1379a
+w1 33c145297840dddf0dc23d5822159c26aba920d3
+spmi 092c496734314f48b18118f6382ca1844e2f5d45
+staging 20a351c36afc7d72956b57bdefbc79858f18923d
+counter-next ba27a0247b7187af36cb0b1fe7f7a68067ccb555
+siox db418d5f1ca5b7bafc8eaa9393ea18a7901bb0ed
+mux 59b723cd2adbac2a34fc8e12c74ae26ae45bf230
+dmaengine 6565439894570a07b00dba0b739729fe6b56fba4
+cgroup 6ebc743512cce731901e629cd6530ab6bc3e59e2
+scsi 6888bc9da22408efdc62c14976c35f06c13936af
+scsi-mkp e402ee093f748b3614aa549beef71d071617cddd
+vhost 9d8960672d63db4b3b04542f5622748b345c637a
+rpmsg 340bec0b725cff894ae5eb7ac98b79e22c9760f6
+gpio-brgl 2eb5dc9a4b0d193b27289281faa05aadab978b41
+gpio-intel e646f0dae7b0f099b36d12d9cb5ca733b8273f10
+pinctrl fde88c7bdbd6394ac6388ca060648c0d3e3a94ae
+pinctrl-intel 0ee2261d08aa21a7327f145cbf1bfb6ac2205c7d
+pinctrl-renesas abcdeb4e299a11ecb5a3ea0cce00e68e8f540375
+pinctrl-samsung 701d0e910955627734917c3587258aa7e73068bb
+pwm 6df320abbb40654085d7258de33d78481e93ac8d
+ktest f3a30016e4b557495d49df7851f18ad97b6d5a23
+kselftest 82ef781f24ac26f4aa71f02d7624c439ab8389a7
+kunit a64dcfb451e254085a7daee5fe51bf22959d52d3
+kunit-next 2e0cf2b32f72b20b0db5cc665cd8465d0f257278
+livepatching 8bd10336f1afde85bb5ea5e1c132fdba1091bc78
+rtc 8a9b1751b26cf04dabd903e32d0cc9c765fb3116
+nvdimm 2318fa87f808362994dee2773a7d3307c1cebabd
+at24 f25f405d250fdc7e2e67be8d1732cbbc7cd782d0
+ntb c620f56c70eb1b3dbabf7c21a02df83a61ff36fb
+seccomp 8f19331384e6ca816f5bea20ab45c4b72a5cd05f
+slimbus 2014c95afecee3e76ca4a56956a936e23283f05b
+nvmem accd056fc20b7d5a4e6b0004d307c2b13dd9f7c7
+xarray 6684aba0780da9f505c202f27e68ee6d18c0aa66
+hyperv 30258063030127d262a77d073539890302a750d6
+auxdisplay 67200d70e45982f5120c43b3724f1b6e4a8a01e4
+kgdb 6beaa75cd24d660e7913c60aff702ec809ff9b28
+hmm d05c69b64a3a1cbf83afa45a35af87d11eee13cc
+cfi 2014c95afecee3e76ca4a56956a936e23283f05b
+mhi 0686a818d77a431fc3ba2fab4b46bbb04e8c9380
+memblock 98b7beba1ee6fb4ee755812e6c06cfc9084e7430
+cxl 74d9c59658e4d3b06f163da0c5ed7647656705c1
+zstd 7eb172143d5508b4da468ed59ee857c6e5e01da6
+efi 0dc1754e16b4c14ae42f6cf59f319331d885f0f6
+unicode 6b56a63d286f6f57066c4b5648d8fbec9510beae
+slab 541702a666400da90185ebae54761d67d14b16d9
+random 93354d866ac44d0f9d65b2e4adb5cc9a1c1912c9
+landlock d9dfd31d6c22a6337d25de00b08cee47d7b1cabb
+rust ab2ebb7bc9d9af2f50b0ad54deb65e1d0b01bc70
+rust-alloc 80e54e84911a923c40d7bee33a34c1b4be148d7a
+rust-hrtimer 15a3c03ca02b6caec995de178904ab8c637d584c
+rust-pin-init 7eb172143d5508b4da468ed59ee857c6e5e01da6
+sysctl 29fa7d7934216e0a93102a930ef28e2a6ae852b1
+execve 8d68cabeb1ff1cea57caae79a76a5606b11dbb4a
+bitmap e3f42c436d7e0cb432935fe3ae275dd8d9b60f71
+hte 9e4259716f60c96c069a38e826884ad783dc4eb4
+kspp 78ab93c78fb31c5dfe207318aa2b7bd4e41f8dba
+nolibc a64dcfb451e254085a7daee5fe51bf22959d52d3
+iommufd a05df03a88bc1088be8e9d958f208d6484691e43
+turbostat 447c98c1ca4a4b0d43be99f76c558c09956484f3
+pwrseq 2014c95afecee3e76ca4a56956a936e23283f05b
+capabilities-next 4ae89b1fe7c2e37a8f2ea39765e4c40c9d42a101
+ipe aefadf03b3e319fe5c406a6e41a9eecd90ac423c
+kcsan 9d89551994a430b50c4fffcb1e617a057fa76e20
+crc 981b39dc6da6dd11ec40824a224c1e0a7557b5ca
+kthread d8b4bf4ea04dd96fe43f6010c614149aba4c9b91
diff --git a/Next/Trees b/Next/Trees
new file mode 100644
index 0000000000000..cdc4803c3fbf7
--- /dev/null
+++ b/Next/Trees
@@ -0,0 +1,392 @@
+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
+ext4-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#fixes
+vfs-brauner-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git#vfs.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
+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
+erofs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#fixes
+nfsd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#nfsd-fixes
+v9fs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#fixes/next
+overlayfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git#ovl-fixes
+bcachefs git git://evilpiepirate.org/bcachefs.git#for-next
+fscrypt git git://git.kernel.org/pub/scm/fs/fscrypt/linux.git#for-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
+dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.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
+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
+mm-hotfixes git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-hotfixes-unstable
+fs-current git linux-next
+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
+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
+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
+ath git git://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git#for-current
+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
+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 git://linuxtv.org/media-ci/media-pending.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/khilman/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
+dma-mapping-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux.git#dma-mapping-fixes
+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 https://gitlab.freedesktop.org/drm/kernel.git#drm-fixes
+drm-intel-fixes git https://gitlab.freedesktop.org/drm/i915/kernel#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
+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
+kunit-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit-fixes
+memblock-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#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
+battery-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.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
+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
+i2c-host-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git#i2c/i2c-host-fixes
+sparc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git#for-linus
+clk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-fixes
+pwrseq-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#pwrseq/for-current
+thead-dt-fixes git https://github.com/pdp7/linux.git#thead-dt-fixes
+ftrace-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#ftrace/fixes
+ring-buffer-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#ring-buffer/fixes
+trace-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#trace/fixes
+tracefs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#tracefs/fixes
+spacemit-fixes git https://github.com/spacemit-com/linux#fixes
+tip-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#tip/urgent
+slab-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git#slab/for-next-fixes
+drm-msm-fixes git https://gitlab.freedesktop.org/drm/msm.git#msm-fixes
+uml-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git#fixes
+drm-misc-fixes git https://gitlab.freedesktop.org/drm/misc/kernel.git#for-linux-next-fixes
+linus git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#for-next
+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.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux.git#dma-mapping-for-next
+asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master
+alpha git git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha.git#alpha-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/khilman/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
+spacemit git https://github.com/spacemit-com/linux#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
+thead-dt git https://github.com/pdp7/linux.git#thead-dt-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
+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
+sparc git git://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.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
+fs-next git linux-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
+dmi git git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git#dmi-for-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-ci/media-pending.git#next
+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
+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
+ath-next git git://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.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 https://gitlab.freedesktop.org/drm/kernel.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 https://gitlab.freedesktop.org/drm/misc/kernel.git#for-linux-next
+amdgpu git https://gitlab.freedesktop.org/agd5f/linux#drm-next
+drm-intel git https://gitlab.freedesktop.org/drm/i915/kernel#for-linux-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-nova git https://gitlab.freedesktop.org/drm/nova.git#nova-next
+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/modules/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 git://git.code.sf.net/p/tomoyo/tomoyo.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/iommu/linux.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 https://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/rcu/linux.git#next
+paulmck git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#non-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
+sched-ext git git://git.kernel.org/pub/scm/linux/kernel/git/tj/sched_ext.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
+siox git git://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git#siox/for-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-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
+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
+rust-alloc git https://github.com/Rust-for-Linux/linux.git#alloc-next
+rust-hrtimer git https://github.com/Rust-for-Linux/linux.git#hrtimer-next
+rust-pin-init git https://github.com/Rust-for-Linux/linux.git#pin-init-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
+nolibc git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#nolibc
+iommufd git git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git#for-next
+turbostat git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git#next
+pwrseq git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#pwrseq/for-next
+capabilities-next git git://git.kernel.org/pub/scm/linux/kernel/git/sergeh/linux.git#caps-next
+ipe git https://git.kernel.org/pub/scm/linux/kernel/git/wufan/ipe.git#next
+kcsan git git://git.kernel.org/pub/scm/linux/kernel/git/melver/linux.git#next
+crc git git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git#crc-next
+kthread git git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks.git#for-next
diff --git a/Next/merge.log b/Next/merge.log
new file mode 100644
index 0000000000000..c1838ae94106d
--- /dev/null
+++ b/Next/merge.log
@@ -0,0 +1,16489 @@
+$ date -R
+Mon, 17 Mar 2025 08:52:29 +1100
+$ git checkout master
+Already on 'master'
+$ git reset --hard stable
+Updating files: 53% (5409/10203)
Updating files: 54% (5510/10203)
Updating files: 55% (5612/10203)
Updating files: 56% (5714/10203)
Updating files: 57% (5816/10203)
Updating files: 58% (5918/10203)
Updating files: 59% (6020/10203)
Updating files: 60% (6122/10203)
Updating files: 61% (6224/10203)
Updating files: 62% (6326/10203)
Updating files: 63% (6428/10203)
Updating files: 64% (6530/10203)
Updating files: 65% (6632/10203)
Updating files: 66% (6734/10203)
Updating files: 67% (6837/10203)
Updating files: 68% (6939/10203)
Updating files: 69% (7041/10203)
Updating files: 70% (7143/10203)
Updating files: 71% (7245/10203)
Updating files: 72% (7347/10203)
Updating files: 73% (7449/10203)
Updating files: 74% (7551/10203)
Updating files: 75% (7653/10203)
Updating files: 76% (7755/10203)
Updating files: 77% (7857/10203)
Updating files: 78% (7959/10203)
Updating files: 79% (8061/10203)
Updating files: 80% (8163/10203)
Updating files: 81% (8265/10203)
Updating files: 82% (8367/10203)
Updating files: 83% (8469/10203)
Updating files: 84% (8571/10203)
Updating files: 85% (8673/10203)
Updating files: 86% (8775/10203)
Updating files: 87% (8877/10203)
Updating files: 88% (8979/10203)
Updating files: 88% (9079/10203)
Updating files: 89% (9081/10203)
Updating files: 90% (9183/10203)
Updating files: 91% (9285/10203)
Updating files: 92% (9387/10203)
Updating files: 93% (9489/10203)
Updating files: 94% (9591/10203)
Updating files: 95% (9693/10203)
Updating files: 96% (9795/10203)
Updating files: 97% (9897/10203)
Updating files: 98% (9999/10203)
Updating files: 99% (10101/10203)
Updating files: 100% (10203/10203)
Updating files: 100% (10203/10203), done.
+HEAD is now at 4003c9e78778 Merge tag 'net-6.14-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
+Merging origin/master (d1275e99d1c4 Merge tag 'media/v6.14-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master
+Updating 4003c9e78778..d1275e99d1c4
+Fast-forward (no commit created; -m option ignored)
+ .mailmap | 1 +
+ .../input/touchscreen/imagis,ist3038c.yaml | 1 +
+ Documentation/rust/quick-start.rst | 2 +-
+ Documentation/rust/testing.rst | 2 +-
+ MAINTAINERS | 3 +-
+ arch/arm64/include/asm/tlbflush.h | 22 ++--
+ arch/arm64/mm/mmu.c | 5 +-
+ arch/x86/kernel/cpu/vmware.c | 4 +
+ drivers/block/null_blk/main.c | 4 +-
+ drivers/block/virtio_blk.c | 5 +-
+ drivers/clk/qcom/dispcc-sm8750.c | 2 -
+ drivers/clk/samsung/clk-gs101.c | 8 --
+ drivers/clk/samsung/clk-pll.c | 7 +-
+ drivers/gpio/gpiolib-cdev.c | 15 +--
+ drivers/gpio/gpiolib.c | 35 +++----
+ drivers/gpio/gpiolib.h | 5 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 11 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c | 5 +-
+ drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 2 +-
+ .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 8 +-
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 17 +++-
+ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 1 +
+ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 64 ++++++++----
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 7 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 7 +-
+ .../amd/display/dc/dce60/dce60_timing_generator.c | 1 +
+ drivers/gpu/drm/display/drm_dp_mst_topology.c | 40 +++++---
+ drivers/gpu/drm/drm_atomic_uapi.c | 4 +
+ drivers/gpu/drm/drm_connector.c | 4 +
+ drivers/gpu/drm/drm_panic_qr.rs | 16 +--
+ drivers/gpu/drm/gma500/mid_bios.c | 5 +
+ drivers/gpu/drm/i915/display/intel_display.c | 5 +-
+ drivers/gpu/drm/i915/gem/i915_gem_mman.c | 5 +-
+ drivers/gpu/drm/xe/xe_guc_pc.c | 53 +++++++---
+ drivers/gpu/drm/xe/xe_guc_submit.c | 2 +-
+ drivers/gpu/drm/xe/xe_hmm.c | 6 +-
+ drivers/gpu/drm/xe/xe_pm.c | 13 ++-
+ drivers/gpu/drm/xe/xe_vm.c | 3 -
+ drivers/i2c/busses/i2c-ali1535.c | 12 ++-
+ drivers/i2c/busses/i2c-ali15x3.c | 12 ++-
+ drivers/i2c/busses/i2c-omap.c | 26 ++---
+ drivers/i2c/busses/i2c-sis630.c | 12 ++-
+ drivers/input/joystick/xpad.c | 39 ++++++--
+ drivers/input/misc/iqs7222.c | 50 ++++------
+ drivers/input/serio/i8042-acpipnpio.h | 111 ++++++++++-----------
+ drivers/input/touchscreen/ads7846.c | 2 +-
+ drivers/input/touchscreen/goodix_berlin_core.c | 26 ++---
+ drivers/input/touchscreen/imagis.c | 9 ++
+ drivers/input/touchscreen/wdt87xx_i2c.c | 2 +
+ drivers/leds/leds-st1202.c | 21 ++--
+ drivers/md/dm-flakey.c | 2 +-
+ drivers/media/dvb-frontends/rtl2832_sdr.c | 2 +-
+ drivers/nvme/host/apple.c | 3 +-
+ drivers/nvme/host/core.c | 12 +--
+ drivers/nvme/host/pci.c | 18 +++-
+ drivers/nvme/target/pci-epf.c | 28 +++---
+ .../platform/surface/surface_aggregator_registry.c | 5 +-
+ drivers/platform/x86/amd/pmf/spc.c | 2 +
+ drivers/platform/x86/amd/pmf/tee-if.c | 36 +++++--
+ drivers/thunderbolt/tunnel.c | 11 +-
+ drivers/thunderbolt/tunnel.h | 2 +
+ drivers/usb/serial/ftdi_sio.c | 14 +++
+ drivers/usb/serial/ftdi_sio_ids.h | 13 +++
+ drivers/usb/serial/option.c | 48 ++++++---
+ drivers/usb/typec/tcpm/tcpm.c | 8 +-
+ fs/bcachefs/btree_io.c | 2 +-
+ fs/bcachefs/btree_update.h | 8 ++
+ fs/bcachefs/btree_write_buffer.c | 21 +++-
+ fs/bcachefs/extents.c | 2 +-
+ fs/bcachefs/inode.c | 1 +
+ fs/bcachefs/io_read.c | 19 ++--
+ fs/bcachefs/super.c | 11 +-
+ fs/bcachefs/util.c | 24 +++--
+ fs/bcachefs/util.h | 2 +-
+ fs/ext4/file.c | 3 -
+ fs/smb/client/connect.c | 16 ++-
+ fs/smb/client/fs_context.c | 18 ++--
+ fs/smb/server/connection.c | 20 ++++
+ fs/smb/server/connection.h | 2 +
+ fs/smb/server/ksmbd_work.c | 3 -
+ fs/smb/server/ksmbd_work.h | 1 -
+ fs/smb/server/oplock.c | 43 ++++----
+ fs/smb/server/oplock.h | 1 -
+ fs/smb/server/server.c | 14 +--
+ fs/xfs/libxfs/xfs_alloc.c | 8 +-
+ fs/xfs/xfs_file.c | 13 ---
+ include/linux/blk-mq.h | 16 ++-
+ include/linux/cleanup.h | 2 +-
+ include/linux/fsnotify.h | 21 ++++
+ include/linux/mm.h | 1 -
+ include/sound/soc.h | 5 +-
+ init/Kconfig | 2 +-
+ kernel/locking/rtmutex_common.h | 4 +-
+ kernel/locking/semaphore.c | 13 ++-
+ kernel/sched/cputime.c | 8 +-
+ kernel/sched/sched.h | 4 +-
+ kernel/trace/trace_events_hist.c | 24 +++--
+ mm/filemap.c | 86 ----------------
+ mm/memory.c | 19 ----
+ mm/nommu.c | 7 --
+ mm/readahead.c | 14 ---
+ mm/util.c | 3 +
+ rust/kernel/alloc/allocator_test.rs | 18 ++++
+ rust/kernel/error.rs | 2 +-
+ rust/kernel/init.rs | 23 ++---
+ rust/kernel/init/macros.rs | 6 +-
+ rust/kernel/lib.rs | 2 +-
+ rust/kernel/sync.rs | 16 +--
+ rust/kernel/sync/locked_by.rs | 2 +-
+ rust/kernel/task.rs | 2 +-
+ rust/kernel/workqueue.rs | 6 +-
+ scripts/generate_rust_analyzer.py | 71 +++++++------
+ scripts/rustdoc_test_gen.rs | 4 +-
+ sound/pci/hda/patch_realtek.c | 21 ++++
+ sound/soc/amd/yc/acp6x-mach.c | 7 ++
+ sound/soc/codecs/cs42l43-jack.c | 13 ++-
+ sound/soc/codecs/cs42l43.c | 17 +++-
+ sound/soc/codecs/cs42l43.h | 3 +
+ sound/soc/codecs/rt1320-sdw.c | 3 +
+ sound/soc/codecs/rt722-sdca-sdw.c | 4 +
+ sound/soc/codecs/wm0010.c | 13 ++-
+ sound/soc/codecs/wsa884x.c | 4 +-
+ sound/soc/intel/boards/sof_sdw.c | 2 +-
+ sound/soc/soc-ops.c | 15 ++-
+ sound/soc/tegra/tegra210_adx.c | 4 +-
+ 125 files changed, 977 insertions(+), 668 deletions(-)
+Merging fixes/fixes (fac04efc5c79 Linux 6.13-rc2)
+$ 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 ext4-fixes/fixes (4bbf9020becb Linux 6.13-rc4)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4-fixes/fixes
+Already up to date.
+Merging vfs-brauner-fixes/vfs.fixes (986a6f5eacb9 vboxsf: Add __nonstring annotations for unterminated strings)
+$ git merge -m Merge branch 'vfs.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git vfs-brauner-fixes/vfs.fixes
+Already up to date.
+Merging fscrypt-current/for-current (2014c95afece Linux 6.14-rc1)
+$ 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 (2014c95afece Linux 6.14-rc1)
+$ 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 btrfs-fixes/next-fixes (e83be4ca3b94 Merge branch 'misc-6.14' 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.
+Merging vfs-fixes/fixes (bdb43af4fdb3 qibfs: fix _another_ 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.
+ arch/powerpc/platforms/cell/spufs/gang.c | 1 +
+ arch/powerpc/platforms/cell/spufs/inode.c | 63 ++++++++++++++++++++++++++-----
+ arch/powerpc/platforms/cell/spufs/spufs.h | 2 +
+ drivers/infiniband/hw/qib/qib_fs.c | 1 +
+ 4 files changed, 57 insertions(+), 10 deletions(-)
+Merging erofs-fixes/fixes (6422cde1b0d5 erofs: use buffered I/O for file-backed mounts by default)
+$ 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 nfsd-fixes/nfsd-fixes (4990d098433d NFSD: Fix CB_GETATTR status fix)
+$ 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 v9fs-fixes/fixes/next (2014c95afece Linux 6.14-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 overlayfs-fixes/ovl-fixes (228a1157fb9f Merge tag '6.13-rc-part1-SMB3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6)
+$ 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 bcachefs/for-next (3d84872adbda bcachefs: use sha256() instead of crypto_shash API)
+$ git merge -m Merge branch 'for-next' of git://evilpiepirate.org/bcachefs.git bcachefs/for-next
+Merge made by the 'ort' strategy.
+ .../filesystems/bcachefs/SubmittingPatches.rst | 43 +-
+ Documentation/filesystems/bcachefs/casefolding.rst | 90 +++
+ Documentation/filesystems/bcachefs/index.rst | 20 +-
+ block/blk-core.c | 19 +-
+ fs/bcachefs/Kconfig | 2 +-
+ fs/bcachefs/Makefile | 1 +
+ fs/bcachefs/alloc_background.c | 161 +++--
+ fs/bcachefs/alloc_background.h | 2 +-
+ fs/bcachefs/alloc_foreground.c | 25 +-
+ fs/bcachefs/alloc_foreground.h | 17 +
+ fs/bcachefs/alloc_types.h | 2 +
+ fs/bcachefs/backpointers.c | 140 ++--
+ fs/bcachefs/backpointers.h | 26 +-
+ fs/bcachefs/bcachefs.h | 17 +-
+ fs/bcachefs/bcachefs_format.h | 16 +-
+ fs/bcachefs/bcachefs_ioctl.h | 29 +-
+ fs/bcachefs/btree_cache.c | 1 +
+ fs/bcachefs/btree_gc.c | 18 +-
+ fs/bcachefs/btree_io.c | 245 ++++++-
+ fs/bcachefs/btree_io.h | 4 +
+ fs/bcachefs/btree_iter.c | 14 -
+ fs/bcachefs/btree_node_scan.c | 29 +-
+ fs/bcachefs/btree_trans_commit.c | 91 +--
+ fs/bcachefs/btree_types.h | 13 +
+ fs/bcachefs/btree_update.c | 3 +-
+ fs/bcachefs/btree_update_interior.c | 146 ++--
+ fs/bcachefs/btree_update_interior.h | 7 +
+ fs/bcachefs/buckets.c | 14 +-
+ fs/bcachefs/buckets.h | 31 +-
+ fs/bcachefs/buckets_types.h | 27 +
+ fs/bcachefs/chardev.c | 38 +-
+ fs/bcachefs/checksum.c | 23 +-
+ fs/bcachefs/checksum.h | 2 +
+ fs/bcachefs/compress.c | 8 +-
+ fs/bcachefs/data_update.c | 235 +++++--
+ fs/bcachefs/data_update.h | 17 +-
+ fs/bcachefs/debug.c | 34 +-
+ fs/bcachefs/dirent.c | 223 +++++-
+ fs/bcachefs/dirent.h | 15 +-
+ fs/bcachefs/dirent_format.h | 20 +-
+ fs/bcachefs/ec.c | 466 +++++--------
+ fs/bcachefs/ec.h | 44 +-
+ fs/bcachefs/ec_types.h | 12 +-
+ fs/bcachefs/errcode.h | 32 +-
+ fs/bcachefs/error.c | 94 ++-
+ fs/bcachefs/error.h | 55 +-
+ fs/bcachefs/extents.c | 211 ++++--
+ fs/bcachefs/extents.h | 24 +-
+ fs/bcachefs/extents_format.h | 24 +-
+ fs/bcachefs/extents_types.h | 11 +-
+ fs/bcachefs/eytzinger.c | 136 ++--
+ fs/bcachefs/eytzinger.h | 93 +--
+ fs/bcachefs/fs-common.c | 30 +-
+ fs/bcachefs/fs-io-buffered.c | 38 +-
+ fs/bcachefs/fs-io-direct.c | 20 +-
+ fs/bcachefs/fs-ioctl.c | 28 +-
+ fs/bcachefs/fs-ioctl.h | 20 +-
+ fs/bcachefs/fs.c | 102 +--
+ fs/bcachefs/inode.c | 13 -
+ fs/bcachefs/inode_format.h | 3 +-
+ fs/bcachefs/io_misc.c | 3 +-
+ fs/bcachefs/io_read.c | 762 +++++++++++----------
+ fs/bcachefs/io_read.h | 94 ++-
+ fs/bcachefs/io_write.c | 235 ++++---
+ fs/bcachefs/io_write.h | 43 +-
+ fs/bcachefs/io_write_types.h | 2 +-
+ fs/bcachefs/journal.c | 127 +++-
+ fs/bcachefs/journal.h | 38 +-
+ fs/bcachefs/journal_io.c | 97 ++-
+ fs/bcachefs/journal_seq_blacklist.c | 7 +-
+ fs/bcachefs/journal_types.h | 20 +-
+ fs/bcachefs/lru.c | 100 ++-
+ fs/bcachefs/lru.h | 22 +-
+ fs/bcachefs/lru_format.h | 6 +-
+ fs/bcachefs/migrate.c | 26 +-
+ fs/bcachefs/move.c | 472 +++++++------
+ fs/bcachefs/move_types.h | 18 +-
+ fs/bcachefs/movinggc.c | 15 +-
+ fs/bcachefs/opts.h | 12 +-
+ fs/bcachefs/progress.c | 63 ++
+ fs/bcachefs/progress.h | 29 +
+ fs/bcachefs/rebalance.c | 46 +-
+ fs/bcachefs/recovery.c | 2 +-
+ fs/bcachefs/recovery_passes_types.h | 2 +-
+ fs/bcachefs/reflink.c | 23 +-
+ fs/bcachefs/sb-counters.c | 90 ++-
+ fs/bcachefs/sb-counters.h | 4 +
+ fs/bcachefs/sb-counters_format.h | 31 +-
+ fs/bcachefs/sb-downgrade.c | 8 +-
+ fs/bcachefs/sb-errors_format.h | 5 +-
+ fs/bcachefs/sb-members.h | 16 +-
+ fs/bcachefs/snapshot.c | 7 +-
+ fs/bcachefs/snapshot.h | 1 +
+ fs/bcachefs/str_hash.c | 2 +-
+ fs/bcachefs/str_hash.h | 12 +-
+ fs/bcachefs/super-io.c | 48 +-
+ fs/bcachefs/super-io.h | 8 +-
+ fs/bcachefs/super.c | 126 +++-
+ fs/bcachefs/super.h | 2 +
+ fs/bcachefs/super_types.h | 8 +-
+ fs/bcachefs/sysfs.c | 15 +-
+ fs/bcachefs/trace.h | 105 ++-
+ fs/bcachefs/util.c | 231 +++++--
+ fs/bcachefs/util.h | 12 +
+ 104 files changed, 4076 insertions(+), 2243 deletions(-)
+ create mode 100644 Documentation/filesystems/bcachefs/casefolding.rst
+ create mode 100644 fs/bcachefs/progress.c
+ create mode 100644 fs/bcachefs/progress.h
+Merging fscrypt/for-next (13dc8eb90067 fscrypt: mention init_on_free instead of page poisoning)
+$ 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 | 8 ++------
+ fs/crypto/Kconfig | 20 ++++++++------------
+ 2 files changed, 10 insertions(+), 18 deletions(-)
+Merging btrfs/for-next (95a5bce4d0c9 Merge branch 'for-next-next-v6.14-20250314' into for-next-20250314)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next
+Merge made by the 'ort' strategy.
+ fs/btrfs/Kconfig | 1 +
+ fs/btrfs/accessors.h | 1 +
+ fs/btrfs/acl.h | 2 +
+ fs/btrfs/async-thread.c | 11 +-
+ fs/btrfs/backref.c | 4 +-
+ fs/btrfs/bio.c | 38 +--
+ fs/btrfs/block-group.c | 155 ++++++----
+ fs/btrfs/btrfs_inode.h | 17 +-
+ fs/btrfs/compression.c | 33 +-
+ fs/btrfs/compression.h | 26 +-
+ fs/btrfs/ctree.c | 18 +-
+ fs/btrfs/ctree.h | 2 +-
+ fs/btrfs/defrag.c | 80 +++--
+ fs/btrfs/defrag.h | 4 +-
+ fs/btrfs/delayed-inode.c | 99 +++---
+ fs/btrfs/delayed-inode.h | 2 +-
+ fs/btrfs/delayed-ref.h | 2 +
+ fs/btrfs/dev-replace.c | 33 +-
+ fs/btrfs/dir-item.c | 24 +-
+ fs/btrfs/dir-item.h | 1 +
+ fs/btrfs/direct-io.c | 20 +-
+ fs/btrfs/direct-io.h | 2 +
+ fs/btrfs/discard.c | 38 ++-
+ fs/btrfs/discard.h | 1 +
+ fs/btrfs/disk-io.c | 109 ++++---
+ fs/btrfs/export.c | 51 ++--
+ fs/btrfs/extent-io-tree.c | 8 +-
+ fs/btrfs/extent-tree.c | 222 ++++++++++----
+ fs/btrfs/extent-tree.h | 6 +-
+ fs/btrfs/extent_io.c | 604 ++++++++++++++++++++-----------------
+ fs/btrfs/extent_io.h | 19 +-
+ fs/btrfs/file-item.c | 30 +-
+ fs/btrfs/file-item.h | 2 +
+ fs/btrfs/file.c | 34 +--
+ fs/btrfs/file.h | 2 +
+ fs/btrfs/free-space-cache.c | 89 +++---
+ fs/btrfs/free-space-cache.h | 8 +-
+ fs/btrfs/free-space-tree.c | 45 ++-
+ fs/btrfs/fs.c | 1 -
+ fs/btrfs/fs.h | 26 +-
+ fs/btrfs/inode-item.c | 6 +-
+ fs/btrfs/inode.c | 613 +++++++++++++++++++++-----------------
+ fs/btrfs/ioctl.c | 279 ++++++++++-------
+ fs/btrfs/ioctl.h | 4 +-
+ fs/btrfs/locking.c | 1 -
+ fs/btrfs/ordered-data.c | 23 +-
+ fs/btrfs/ordered-data.h | 9 +-
+ fs/btrfs/print-tree.h | 2 +
+ fs/btrfs/props.c | 66 ++--
+ fs/btrfs/props.h | 8 +-
+ fs/btrfs/qgroup.c | 2 +-
+ fs/btrfs/qgroup.h | 3 +
+ fs/btrfs/raid-stripe-tree.h | 1 +
+ fs/btrfs/reflink.c | 102 +++----
+ fs/btrfs/relocation.c | 34 ++-
+ fs/btrfs/scrub.c | 146 +++------
+ fs/btrfs/send.c | 544 ++++++++++++++++-----------------
+ fs/btrfs/send.h | 4 +-
+ fs/btrfs/space-info.c | 2 +-
+ fs/btrfs/subpage.c | 224 ++++++++------
+ fs/btrfs/subpage.h | 56 +++-
+ fs/btrfs/super.c | 6 +-
+ fs/btrfs/sysfs.c | 14 +-
+ fs/btrfs/sysfs.h | 1 +
+ fs/btrfs/tests/extent-io-tests.c | 6 +-
+ fs/btrfs/tests/extent-map-tests.c | 1 +
+ fs/btrfs/transaction.c | 39 ++-
+ fs/btrfs/tree-log.c | 267 ++++++++---------
+ fs/btrfs/verity.c | 4 +-
+ fs/btrfs/volumes.c | 26 +-
+ fs/btrfs/volumes.h | 5 +
+ fs/btrfs/xattr.h | 2 +
+ fs/btrfs/zlib.c | 83 ++++--
+ fs/btrfs/zoned.c | 3 +
+ fs/btrfs/zstd.c | 66 ++--
+ include/uapi/linux/btrfs.h | 69 ++++-
+ 76 files changed, 2550 insertions(+), 2041 deletions(-)
+Merging ceph/master (3981be13ec1b ceph: exchange hardcoded value on NAME_MAX)
+$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master
+Already up to date.
+Merging cifs/for-next (7c064a69d12c smb: client: Fix netns refcount imbalance causing leaks and use-after-free)
+$ git merge -m Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git cifs/for-next
+Merge made by the 'ort' strategy.
+ fs/smb/client/connect.c | 17 +++++++++--------
+ fs/smb/client/sess.c | 7 +++++++
+ 2 files changed, 16 insertions(+), 8 deletions(-)
+Merging configfs/for-next (84147f4e84c4 configfs: improve item creation performance)
+$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/configfs.git configfs/for-next
+Already up to date.
+Merging ecryptfs/next (fba133a34118 ecryptfs: Remove unused declartion ecryptfs_fill_zeros())
+$ 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/ecryptfs_kernel.h
+Merge made by the 'ort' strategy.
+ fs/ecryptfs/crypto.c | 2 +-
+ fs/ecryptfs/ecryptfs_kernel.h | 1 -
+ fs/ecryptfs/keystore.c | 4 ++--
+ 3 files changed, 3 insertions(+), 4 deletions(-)
+Merging dlm/next (a3672304abf2 dlm: fix error if active rsb is not hashed)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm/next
+Merge made by the 'ort' strategy.
+ fs/dlm/config.h | 2 +-
+ fs/dlm/lock.c | 2 ++
+ fs/dlm/lockspace.c | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+Merging erofs/dev (f81398b33aea erofs: enable 48-bit layout support)
+$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs/dev
+Merge made by the 'ort' strategy.
+ fs/erofs/Kconfig | 14 +-
+ fs/erofs/compress.h | 2 +-
+ fs/erofs/data.c | 148 +++++++++-----------
+ fs/erofs/decompressor.c | 95 +++++--------
+ fs/erofs/decompressor_deflate.c | 8 +-
+ fs/erofs/decompressor_lzma.c | 8 +-
+ fs/erofs/decompressor_zstd.c | 8 +-
+ fs/erofs/dir.c | 9 +-
+ fs/erofs/erofs_fs.h | 191 ++++++++++++--------------
+ fs/erofs/fileio.c | 2 +-
+ fs/erofs/fscache.c | 2 +-
+ fs/erofs/inode.c | 129 +++++++++---------
+ fs/erofs/internal.h | 47 +++----
+ fs/erofs/namei.c | 2 +-
+ fs/erofs/super.c | 79 +++++------
+ fs/erofs/sysfs.c | 2 +
+ fs/erofs/xattr.c | 12 +-
+ fs/erofs/zdata.c | 102 +++++++-------
+ fs/erofs/zmap.c | 290 ++++++++++++++++++++++++++--------------
+ include/trace/events/erofs.h | 2 +-
+ 20 files changed, 577 insertions(+), 575 deletions(-)
+Merging exfat/dev (e4b343c1706f exfat: remove count used cluster from exfat_statfs())
+$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev
+Merge made by the 'ort' strategy.
+ fs/exfat/balloc.c | 14 --------------
+ fs/exfat/exfat_fs.h | 2 --
+ fs/exfat/fatent.c | 29 +++++++++++++++++++++++++++++
+ fs/exfat/super.c | 10 ----------
+ 4 files changed, 29 insertions(+), 26 deletions(-)
+Merging exportfs/exportfs-next (adc218676eef Linux 6.12)
+$ git merge -m Merge branch 'exportfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux exportfs/exportfs-next
+Already up to date.
+Merging ext3/for_next (82b6a8dd857d Merge reverts for HSM page fault events.)
+$ git merge -m Merge branch 'for_next' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git ext3/for_next
+Merge made by the 'ort' strategy.
+ fs/ext2/ext2.h | 1 +
+ fs/ext2/super.c | 589 +++++++++++++++++++++++++++++++-------------------------
+ fs/isofs/dir.c | 3 +-
+ fs/udf/inode.c | 1 +
+ 4 files changed, 334 insertions(+), 260 deletions(-)
+Merging ext4/dev (9e28059d5664 ext4: introduce linear search for dentries)
+$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev
+Auto-merging include/linux/fs.h
+Merge made by the 'ort' strategy.
+ Documentation/filesystems/journalling.rst | 4 +-
+ fs/ext4/ext4.h | 4 +
+ fs/ext4/ext4_jbd2.h | 84 -----
+ fs/ext4/extents.c | 533 +++++++++++-------------------
+ fs/ext4/inode.c | 205 ++++++------
+ fs/ext4/namei.c | 14 +-
+ fs/ext4/super.c | 15 -
+ fs/jbd2/recovery.c | 58 +++-
+ fs/jbd2/revoke.c | 8 +-
+ fs/jbd2/transaction.c | 1 -
+ include/linux/fs.h | 10 +-
+ include/linux/jbd2.h | 8 +-
+ 12 files changed, 390 insertions(+), 554 deletions(-)
+Merging f2fs/dev (c60b556bfe0a f2fs: fix to avoid atomicity corruption of atomic file)
+$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev
+Auto-merging mm/filemap.c
+Merge made by the 'ort' strategy.
+ Documentation/ABI/testing/sysfs-fs-f2fs | 18 ++
+ Documentation/filesystems/f2fs.rst | 3 +
+ fs/f2fs/checkpoint.c | 71 ++---
+ fs/f2fs/compress.c | 1 +
+ fs/f2fs/data.c | 182 ++++++-------
+ fs/f2fs/debug.c | 3 +
+ fs/f2fs/dir.c | 2 +-
+ fs/f2fs/f2fs.h | 157 ++++++++---
+ fs/f2fs/file.c | 126 +++++++--
+ fs/f2fs/gc.c | 42 +--
+ fs/f2fs/inline.c | 22 +-
+ fs/f2fs/inode.c | 33 ++-
+ fs/f2fs/namei.c | 8 +
+ fs/f2fs/node.c | 450 +++++++++++++++-----------------
+ fs/f2fs/node.h | 13 +-
+ fs/f2fs/segment.c | 51 ++--
+ fs/f2fs/segment.h | 9 +-
+ fs/f2fs/shrinker.c | 92 ++++++-
+ fs/f2fs/super.c | 191 +++++++++-----
+ fs/f2fs/sysfs.c | 139 ++++++++--
+ fs/f2fs/xattr.c | 8 +-
+ include/linux/pagemap.h | 9 -
+ include/uapi/linux/f2fs.h | 7 +
+ mm/filemap.c | 2 +-
+ mm/folio-compat.c | 14 -
+ 25 files changed, 1050 insertions(+), 603 deletions(-)
+Merging fsverity/for-next (a19bcde49998 Revert "fsverity: relax build time dependency on CRYPTO_SHA256")
+$ 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.
+ Documentation/filesystems/fsverity.rst | 16 +++++++++++-----
+ fs/verity/Kconfig | 8 ++------
+ 2 files changed, 13 insertions(+), 11 deletions(-)
+Merging fuse/for-next (bea8ae66d5e6 fuse: Increase FUSE_NAME_MAX to PATH_MAX)
+$ 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/dev.c
+Auto-merging fs/fuse/dir.c
+Merge made by the 'ort' strategy.
+ Documentation/admin-guide/sysctl/fs.rst | 25 +++++++
+ fs/fuse/dev.c | 128 ++++++++++++++++++++++++++++----
+ fs/fuse/dev_uring.c | 27 +++++++
+ fs/fuse/dev_uring_i.h | 12 +--
+ fs/fuse/dir.c | 11 ++-
+ fs/fuse/fuse_dev_i.h | 3 +
+ fs/fuse/fuse_i.h | 44 ++++++++++-
+ fs/fuse/inode.c | 51 ++++++++++++-
+ fs/fuse/sysctl.c | 24 ++++++
+ include/uapi/linux/fuse.h | 12 ++-
+ 10 files changed, 310 insertions(+), 27 deletions(-)
+Merging gfs2/for-next (951d701ef1bb gfs2: Fix a NULL vs IS_ERR() bug in gfs2_find_jhead())
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next
+Auto-merging fs/gfs2/glock.c
+Merge made by the 'ort' strategy.
+ fs/gfs2/glock.c | 124 +++++++++++++++++++++++---------------------
+ fs/gfs2/incore.h | 4 +-
+ fs/gfs2/lops.c | 78 ++++++++++++++--------------
+ fs/gfs2/meta_io.c | 15 +++---
+ fs/gfs2/super.c | 24 +++------
+ fs/gfs2/trace_gfs2.h | 10 +++-
+ fs/gfs2/trans.c | 4 +-
+ include/linux/buffer_head.h | 1 -
+ 8 files changed, 132 insertions(+), 128 deletions(-)
+Merging jfs/jfs-next (a8dfb2168906 jfs: add index corruption check to DT_GETPAGE())
+$ git merge -m Merge branch 'jfs-next' of git://github.com/kleikamp/linux-shaggy.git jfs/jfs-next
+Merge made by the 'ort' strategy.
+ fs/jfs/inode.c | 2 +-
+ fs/jfs/jfs_dmap.c | 39 ++++++++++++---------------------------
+ fs/jfs/jfs_dtree.c | 3 ++-
+ fs/jfs/jfs_extent.c | 10 ++++++++++
+ fs/jfs/jfs_imap.c | 17 +++++++++++++----
+ fs/jfs/super.c | 6 +++---
+ fs/jfs/xattr.c | 13 +++++++++----
+ 7 files changed, 50 insertions(+), 40 deletions(-)
+Merging ksmbd/ksmbd-for-next (5e8ad31dad38 ksmbd: Use str_read_write() and str_true_false() helpers)
+$ 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/client/cifsacl.c | 17 ++++++++++++++++-
+ fs/smb/server/Kconfig | 2 +-
+ fs/smb/server/transport_rdma.c | 5 +++--
+ 3 files changed, 20 insertions(+), 4 deletions(-)
+Merging nfs/linux-next (7eb172143d55 Linux 6.14-rc5)
+$ 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 (9084ed79ddaa lsm,nfs: fix memory leak of lsm_context)
+$ 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 (26a80762153b NFSD: Add a Kconfig setting to enable delegated timestamps)
+$ git merge -m Merge branch 'nfsd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/nfsd-next
+Merge made by the 'ort' strategy.
+ Documentation/filesystems/nfs/reexport.rst | 10 +-
+ Documentation/netlink/specs/lockd.yaml | 45 +++++++++
+ fs/lockd/Makefile | 2 +-
+ fs/lockd/netlink.c | 44 +++++++++
+ fs/lockd/netlink.h | 19 ++++
+ fs/lockd/netns.h | 3 +
+ fs/lockd/svc.c | 123 ++++++++++++++++++++++--
+ fs/nfs/export.c | 3 +-
+ fs/nfs_common/nfsacl.c | 8 +-
+ fs/nfsd/Kconfig | 12 ++-
+ fs/nfsd/filecache.c | 122 +++++++++++++-----------
+ fs/nfsd/filecache.h | 7 ++
+ fs/nfsd/nfs4callback.c | 146 ++++++++++++++++-------------
+ fs/nfsd/nfs4layouts.c | 7 +-
+ fs/nfsd/nfs4proc.c | 2 +-
+ fs/nfsd/nfs4state.c | 114 ++++++++++++++--------
+ fs/nfsd/nfsctl.c | 53 ++++++-----
+ fs/nfsd/state.h | 20 ++--
+ fs/nfsd/stats.c | 4 +-
+ fs/nfsd/stats.h | 2 +-
+ fs/nfsd/trace.h | 24 ++++-
+ fs/nfsd/vfs.c | 106 +++++++++++++++------
+ include/linux/exportfs.h | 14 ++-
+ include/linux/posix_acl.h | 11 ++-
+ include/uapi/linux/lockd_netlink.h | 29 ++++++
+ net/sunrpc/auth_gss/gss_krb5_crypto.c | 144 ----------------------------
+ net/sunrpc/auth_gss/gss_krb5_internal.h | 7 --
+ net/sunrpc/cache.c | 6 +-
+ net/sunrpc/xprtrdma/svc_rdma_transport.c | 3 +-
+ 29 files changed, 685 insertions(+), 405 deletions(-)
+ create mode 100644 Documentation/netlink/specs/lockd.yaml
+ create mode 100644 fs/lockd/netlink.c
+ create mode 100644 fs/lockd/netlink.h
+ create mode 100644 include/uapi/linux/lockd_netlink.h
+Merging ntfs3/master (8b12017c1b95 fs/ntfs3: Remove unused ntfs_flush_inodes)
+$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master
+Merge made by the 'ort' strategy.
+ fs/ntfs3/attrib.c | 3 +-
+ fs/ntfs3/file.c | 42 +++++++++++++++++++-------
+ fs/ntfs3/frecord.c | 63 +++-----------------------------------
+ fs/ntfs3/fsntfs.c | 28 -----------------
+ fs/ntfs3/index.c | 4 +--
+ fs/ntfs3/inode.c | 40 ------------------------
+ fs/ntfs3/ntfs.h | 2 +-
+ fs/ntfs3/ntfs_fs.h | 6 ----
+ fs/ntfs3/super.c | 89 ++++++++++++++++++++++++++++++++++--------------------
+ 9 files changed, 96 insertions(+), 181 deletions(-)
+Merging orangefs/for-next (96319dacaf15 orangefs: Constify struct kobj_type)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux orangefs/for-next
+Already up to date.
+Merging overlayfs/overlayfs-next (c8b359dddb41 ovl: Filter invalid inodes with missing lookup function)
+$ 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 (69146a8c893f ubi: ubi_get_ec_info: Fix compiling error 'cast specifies array type')
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs/next
+Already up to date.
+Merging v9fs/9p-next (44ca5412b274 9p/net: return error on bogus (longer than requested) replies)
+$ git merge -m Merge branch '9p-next' of git://github.com/martinetd/linux v9fs/9p-next
+Merge made by the 'ort' strategy.
+ fs/9p/vfs_inode_dotl.c | 2 +-
+ net/9p/client.c | 42 +++++++++++++++++++-------------
+ net/9p/trans_fd.c | 65 ++++++++++++++++++++++----------------------------
+ 3 files changed, 55 insertions(+), 54 deletions(-)
+Merging v9fs-ericvh/ericvh/for-next (2014c95afece Linux 6.14-rc1)
+$ 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
+Already up to date.
+Merging xfs/for-next (a40830266566 Merge branch 'xfs-6.15-merge' into 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 fs/ext4/inode.c
+Auto-merging fs/iomap/direct-io.c
+Auto-merging fs/xfs/xfs_file.c
+Merge made by the 'ort' strategy.
+ Documentation/filesystems/iomap/design.rst | 9 +
+ Documentation/filesystems/iomap/operations.rst | 33 +-
+ fs/dax.c | 111 ++-
+ fs/ext4/inode.c | 2 +-
+ fs/gfs2/bmap.c | 3 +-
+ fs/iomap/Makefile | 1 +
+ fs/iomap/buffered-io.c | 345 +++----
+ fs/iomap/direct-io.c | 176 ++--
+ fs/iomap/fiemap.c | 21 +-
+ fs/iomap/internal.h | 10 +
+ fs/iomap/ioend.c | 216 +++++
+ fs/iomap/iter.c | 97 +-
+ fs/iomap/seek.c | 16 +-
+ fs/iomap/swapfile.c | 7 +-
+ fs/iomap/trace.h | 10 +-
+ fs/xfs/Makefile | 7 +-
+ fs/xfs/libxfs/xfs_bmap.c | 316 +------
+ fs/xfs/libxfs/xfs_bmap.h | 7 +-
+ fs/xfs/libxfs/xfs_format.h | 20 +-
+ fs/xfs/libxfs/xfs_fs.h | 14 +-
+ fs/xfs/libxfs/xfs_group.h | 31 +-
+ fs/xfs/libxfs/xfs_ialloc.c | 4 +-
+ fs/xfs/libxfs/xfs_inode_buf.c | 23 +-
+ fs/xfs/libxfs/xfs_inode_util.c | 1 +
+ fs/xfs/libxfs/xfs_log_format.h | 7 +-
+ fs/xfs/libxfs/xfs_metafile.c | 175 ++--
+ fs/xfs/libxfs/xfs_metafile.h | 6 +-
+ fs/xfs/libxfs/xfs_ondisk.h | 6 +-
+ fs/xfs/libxfs/xfs_rtbitmap.c | 11 +
+ fs/xfs/libxfs/xfs_rtgroup.c | 39 +-
+ fs/xfs/libxfs/xfs_rtgroup.h | 50 +-
+ fs/xfs/libxfs/xfs_rtrmap_btree.c | 19 +
+ fs/xfs/libxfs/xfs_rtrmap_btree.h | 2 +
+ fs/xfs/libxfs/xfs_sb.c | 81 +-
+ fs/xfs/libxfs/xfs_types.h | 28 +
+ fs/xfs/libxfs/xfs_zones.c | 186 ++++
+ fs/xfs/libxfs/xfs_zones.h | 35 +
+ fs/xfs/scrub/agheader.c | 2 +
+ fs/xfs/scrub/bmap.c | 4 +-
+ fs/xfs/scrub/fscounters.c | 22 +-
+ fs/xfs/scrub/fscounters_repair.c | 12 +-
+ fs/xfs/scrub/inode.c | 7 +
+ fs/xfs/scrub/inode_repair.c | 7 +-
+ fs/xfs/scrub/newbt.c | 2 +-
+ fs/xfs/scrub/reap.c | 9 +-
+ fs/xfs/scrub/repair.c | 37 +-
+ fs/xfs/scrub/rtbitmap.c | 11 +-
+ fs/xfs/scrub/rtrefcount_repair.c | 34 +-
+ fs/xfs/scrub/rtrmap_repair.c | 29 +-
+ fs/xfs/scrub/scrub.c | 2 +
+ fs/xfs/xfs_aops.c | 194 +++-
+ fs/xfs/xfs_aops.h | 3 +-
+ fs/xfs/xfs_bmap_util.c | 32 +-
+ fs/xfs/xfs_bmap_util.h | 12 +-
+ fs/xfs/xfs_buf.c | 381 +++-----
+ fs/xfs/xfs_buf.h | 25 +-
+ fs/xfs/xfs_buf_item.c | 114 ---
+ fs/xfs/xfs_buf_item_recover.c | 8 +-
+ fs/xfs/xfs_buf_mem.c | 43 +-
+ fs/xfs/xfs_buf_mem.h | 6 +-
+ fs/xfs/xfs_discard.c | 3 +-
+ fs/xfs/xfs_extent_busy.c | 2 +-
+ fs/xfs/xfs_extfree_item.c | 35 +-
+ fs/xfs/xfs_file.c | 351 ++++++-
+ fs/xfs/xfs_fsmap.c | 86 +-
+ fs/xfs/xfs_fsops.c | 50 +-
+ fs/xfs/xfs_fsops.h | 3 +-
+ fs/xfs/xfs_icache.c | 6 +-
+ fs/xfs/xfs_inode.c | 6 +-
+ fs/xfs/xfs_inode.h | 28 +-
+ fs/xfs/xfs_inode_item.c | 1 +
+ fs/xfs/xfs_inode_item_recover.c | 1 +
+ fs/xfs/xfs_ioctl.c | 12 +-
+ fs/xfs/xfs_iomap.c | 528 ++++++++++-
+ fs/xfs/xfs_iomap.h | 7 +-
+ fs/xfs/xfs_iops.c | 31 +-
+ fs/xfs/xfs_log.c | 4 +
+ fs/xfs/xfs_message.c | 4 +
+ fs/xfs/xfs_message.h | 1 +
+ fs/xfs/xfs_mount.c | 212 +++--
+ fs/xfs/xfs_mount.h | 131 ++-
+ fs/xfs/xfs_qm.c | 3 +-
+ fs/xfs/xfs_reflink.c | 18 +-
+ fs/xfs/xfs_rtalloc.c | 240 +++--
+ fs/xfs/xfs_rtalloc.h | 5 -
+ fs/xfs/xfs_super.c | 165 +++-
+ fs/xfs/xfs_sysfs.c | 75 +-
+ fs/xfs/xfs_sysfs.h | 5 +-
+ fs/xfs/xfs_trace.c | 2 +
+ fs/xfs/xfs_trace.h | 218 ++++-
+ fs/xfs/xfs_zone_alloc.c | 1211 ++++++++++++++++++++++++
+ fs/xfs/xfs_zone_alloc.h | 70 ++
+ fs/xfs/xfs_zone_gc.c | 1165 +++++++++++++++++++++++
+ fs/xfs/xfs_zone_info.c | 105 ++
+ fs/xfs/xfs_zone_priv.h | 119 +++
+ fs/xfs/xfs_zone_space_resv.c | 263 +++++
+ fs/zonefs/file.c | 2 +-
+ include/linux/iomap.h | 118 ++-
+ 98 files changed, 6584 insertions(+), 1823 deletions(-)
+ create mode 100644 fs/iomap/internal.h
+ create mode 100644 fs/iomap/ioend.c
+ create mode 100644 fs/xfs/libxfs/xfs_zones.c
+ create mode 100644 fs/xfs/libxfs/xfs_zones.h
+ create mode 100644 fs/xfs/xfs_zone_alloc.c
+ create mode 100644 fs/xfs/xfs_zone_alloc.h
+ create mode 100644 fs/xfs/xfs_zone_gc.c
+ create mode 100644 fs/xfs/xfs_zone_info.c
+ create mode 100644 fs/xfs/xfs_zone_priv.h
+ create mode 100644 fs/xfs/xfs_zone_space_resv.c
+Merging zonefs/for-next (c4b3c1332f55 zonefs: add support for FS_IOC_GETFSSYSFSPATH)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git zonefs/for-next
+Already up to date.
+Merging vfs-brauner/vfs.all (ac0200d71bca Merge branch 'vfs-6.15.orangefs' 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 MAINTAINERS
+Auto-merging fs/9p/vfs_inode_dotl.c
+Auto-merging fs/bcachefs/fs-ioctl.c
+Auto-merging fs/bcachefs/fs.c
+Auto-merging fs/btrfs/inode.c
+Auto-merging fs/coredump.c
+Auto-merging fs/ext4/namei.c
+Auto-merging fs/f2fs/data.c
+Auto-merging fs/f2fs/namei.c
+Auto-merging fs/fuse/dir.c
+Auto-merging fs/nfsd/vfs.c
+Auto-merging fs/xfs/xfs_iops.c
+Auto-merging fs/xfs/xfs_super.c
+Auto-merging include/linux/fs.h
+Auto-merging include/linux/fsnotify.h
+Auto-merging include/linux/mm.h
+Auto-merging include/linux/pagemap.h
+Auto-merging init/Kconfig
+Auto-merging lib/Kconfig.debug
+Auto-merging mm/shmem.c
+Merge made by the 'ort' strategy.
+ Documentation/admin-guide/sysctl/vm.rst | 2 +-
+ Documentation/filesystems/index.rst | 1 -
+ Documentation/filesystems/locking.rst | 2 +-
+ Documentation/filesystems/overlayfs.rst | 24 +-
+ Documentation/filesystems/porting.rst | 48 +
+ Documentation/filesystems/sysv-fs.rst | 264 ----
+ Documentation/filesystems/vfs.rst | 23 +-
+ MAINTAINERS | 6 -
+ arch/alpha/kernel/syscalls/syscall.tbl | 1 +
+ arch/arm/tools/syscall.tbl | 1 +
+ arch/arm64/kernel/elfcore.c | 3 +-
+ arch/arm64/tools/syscall_32.tbl | 1 +
+ arch/loongarch/configs/loongson3_defconfig | 1 -
+ arch/m68k/configs/amiga_defconfig | 1 -
+ arch/m68k/configs/apollo_defconfig | 1 -
+ arch/m68k/configs/atari_defconfig | 1 -
+ arch/m68k/configs/bvme6000_defconfig | 1 -
+ arch/m68k/configs/hp300_defconfig | 1 -
+ arch/m68k/configs/mac_defconfig | 1 -
+ arch/m68k/configs/multi_defconfig | 1 -
+ arch/m68k/configs/mvme147_defconfig | 1 -
+ arch/m68k/configs/mvme16x_defconfig | 1 -
+ arch/m68k/configs/q40_defconfig | 1 -
+ arch/m68k/configs/sun3_defconfig | 1 -
+ arch/m68k/configs/sun3x_defconfig | 1 -
+ arch/m68k/kernel/syscalls/syscall.tbl | 1 +
+ arch/microblaze/kernel/syscalls/syscall.tbl | 1 +
+ arch/mips/configs/malta_defconfig | 1 -
+ arch/mips/configs/malta_kvm_defconfig | 1 -
+ arch/mips/configs/maltaup_xpa_defconfig | 1 -
+ arch/mips/configs/rm200_defconfig | 1 -
+ arch/mips/kernel/syscalls/syscall_n32.tbl | 1 +
+ arch/mips/kernel/syscalls/syscall_n64.tbl | 1 +
+ arch/mips/kernel/syscalls/syscall_o32.tbl | 1 +
+ arch/parisc/configs/generic-64bit_defconfig | 1 -
+ arch/parisc/kernel/syscalls/syscall.tbl | 1 +
+ arch/powerpc/configs/fsl-emb-nonhw.config | 1 -
+ arch/powerpc/configs/ppc6xx_defconfig | 1 -
+ arch/powerpc/kernel/syscalls/syscall.tbl | 1 +
+ arch/powerpc/platforms/pseries/papr-vpd.c | 7 +-
+ arch/s390/kernel/syscalls/syscall.tbl | 1 +
+ arch/sh/kernel/syscalls/syscall.tbl | 1 +
+ arch/sparc/kernel/syscalls/syscall.tbl | 1 +
+ arch/x86/entry/syscalls/syscall_32.tbl | 1 +
+ arch/x86/entry/syscalls/syscall_64.tbl | 1 +
+ arch/xtensa/kernel/syscalls/syscall.tbl | 1 +
+ block/bdev.c | 13 +-
+ drivers/base/devtmpfs.c | 153 ++-
+ drivers/vfio/group.c | 16 +-
+ fs/9p/vfs_inode.c | 7 +-
+ fs/9p/vfs_inode_dotl.c | 8 +-
+ fs/Kconfig | 1 -
+ fs/Makefile | 1 -
+ fs/affs/affs.h | 2 +-
+ fs/affs/namei.c | 8 +-
+ fs/afs/addr_list.c | 50 +
+ fs/afs/cell.c | 441 +++----
+ fs/afs/cmservice.c | 82 +-
+ fs/afs/dir.c | 17 +-
+ fs/afs/dynroot.c | 540 ++++-----
+ fs/afs/fs_probe.c | 32 +-
+ fs/afs/fsclient.c | 4 +-
+ fs/afs/internal.h | 98 +-
+ fs/afs/main.c | 16 +-
+ fs/afs/mntpt.c | 5 +-
+ fs/afs/proc.c | 15 +-
+ fs/afs/rxrpc.c | 8 +-
+ fs/afs/server.c | 621 ++++------
+ fs/afs/server_list.c | 6 +-
+ fs/afs/super.c | 25 +-
+ fs/afs/vl_alias.c | 7 +-
+ fs/afs/vl_rotate.c | 2 +-
+ fs/afs/volume.c | 15 +-
+ fs/autofs/autofs_i.h | 2 +
+ fs/autofs/dev-ioctl.c | 3 -
+ fs/autofs/root.c | 14 +-
+ fs/bad_inode.c | 6 +-
+ fs/bcachefs/fs-ioctl.c | 4 -
+ fs/bcachefs/fs.c | 8 +-
+ fs/btrfs/inode.c | 8 +-
+ fs/buffer.c | 58 +-
+ fs/cachefiles/namei.c | 16 +-
+ fs/cachefiles/ondemand.c | 7 +-
+ fs/ceph/addr.c | 1275 ++++++++++++--------
+ fs/ceph/dir.c | 45 +-
+ fs/ceph/inode.c | 31 +-
+ fs/ceph/mds_client.c | 2 +
+ fs/ceph/mds_client.h | 3 +
+ fs/ceph/super.c | 11 +
+ fs/ceph/super.h | 2 +-
+ fs/coda/dir.c | 14 +-
+ fs/configfs/dir.c | 6 +-
+ fs/coredump.c | 38 +-
+ fs/crypto/crypto.c | 22 +-
+ fs/dcache.c | 46 -
+ fs/devpts/inode.c | 247 ++--
+ fs/drop_caches.c | 2 +-
+ fs/ecryptfs/inode.c | 20 +-
+ fs/ecryptfs/super.c | 1 -
+ fs/eventfd.c | 5 +-
+ fs/eventpoll.c | 95 +-
+ fs/exfat/namei.c | 8 +-
+ fs/exportfs/expfs.c | 2 -
+ fs/ext2/namei.c | 9 +-
+ fs/ext4/namei.c | 10 +-
+ fs/ext4/page-io.c | 2 +-
+ fs/f2fs/data.c | 2 +-
+ fs/f2fs/namei.c | 14 +-
+ fs/fat/namei_msdos.c | 8 +-
+ fs/fat/namei_vfat.c | 8 +-
+ fs/file.c | 82 +-
+ fs/file_table.c | 74 +-
+ fs/fsopen.c | 2 +-
+ fs/fuse/dir.c | 50 +-
+ fs/gfs2/inode.c | 9 +-
+ fs/hfs/dir.c | 10 +-
+ fs/hfsplus/dir.c | 6 +-
+ fs/hostfs/hostfs_kern.c | 16 +-
+ fs/hpfs/namei.c | 10 +-
+ fs/hugetlbfs/inode.c | 6 +-
+ fs/init.c | 7 +-
+ fs/inode.c | 84 +-
+ fs/internal.h | 11 +-
+ fs/ioctl.c | 10 +-
+ fs/jffs2/dir.c | 18 +-
+ fs/jfs/namei.c | 8 +-
+ fs/kernfs/dir.c | 12 +-
+ fs/libfs.c | 4 +-
+ fs/minix/namei.c | 8 +-
+ fs/mnt_idmapping.c | 51 +
+ fs/mount.h | 37 +
+ fs/mpage.c | 49 +-
+ fs/namei.c | 149 +--
+ fs/namespace.c | 849 ++++++++++---
+ fs/nfs/dir.c | 20 +-
+ fs/nfs/internal.h | 4 +-
+ fs/nfs/nfs3proc.c | 29 +-
+ fs/nfs/nfs4proc.c | 47 +-
+ fs/nfs/proc.c | 12 +-
+ fs/nfsd/nfs4recover.c | 7 +-
+ fs/nfsd/vfs.c | 34 +-
+ fs/nilfs2/namei.c | 8 +-
+ fs/notify/fanotify/fanotify.c | 38 +-
+ fs/notify/fanotify/fanotify.h | 18 +
+ fs/notify/fanotify/fanotify_user.c | 89 +-
+ fs/notify/fdinfo.c | 5 +
+ fs/notify/fsnotify.c | 47 +-
+ fs/notify/fsnotify.h | 11 +
+ fs/notify/mark.c | 14 +-
+ fs/nsfs.c | 32 +-
+ fs/ntfs3/namei.c | 8 +-
+ fs/ocfs2/dlmfs/dlmfs.c | 10 +-
+ fs/ocfs2/namei.c | 10 +-
+ fs/omfs/dir.c | 6 +-
+ fs/open.c | 35 +-
+ fs/orangefs/file.c | 4 +-
+ fs/orangefs/inode.c | 149 +--
+ fs/orangefs/namei.c | 8 +-
+ fs/orangefs/orangefs-debug.h | 43 -
+ fs/orangefs/orangefs-debugfs.c | 43 +
+ fs/overlayfs/dir.c | 46 +-
+ fs/overlayfs/overlayfs.h | 15 +-
+ fs/overlayfs/params.c | 25 +
+ fs/overlayfs/super.c | 23 +-
+ fs/pidfs.c | 234 +++-
+ fs/pipe.c | 189 +--
+ fs/pnode.c | 14 +-
+ fs/pnode.h | 2 +-
+ fs/pstore/inode.c | 109 +-
+ fs/ramfs/inode.c | 6 +-
+ fs/read_write.c | 13 +-
+ fs/signalfd.c | 7 +-
+ fs/smb/client/cifsfs.h | 4 +-
+ fs/smb/client/file.c | 2 +-
+ fs/smb/client/inode.c | 10 +-
+ fs/smb/server/vfs.c | 58 +-
+ fs/splice.c | 40 +-
+ fs/super.c | 57 +-
+ fs/sysv/Kconfig | 38 -
+ fs/sysv/Makefile | 9 -
+ fs/sysv/balloc.c | 240 ----
+ fs/sysv/dir.c | 378 ------
+ fs/sysv/file.c | 59 -
+ fs/sysv/ialloc.c | 235 ----
+ fs/sysv/inode.c | 354 ------
+ fs/sysv/itree.c | 511 --------
+ fs/sysv/namei.c | 280 -----
+ fs/sysv/super.c | 595 ---------
+ fs/sysv/sysv.h | 245 ----
+ fs/timerfd.c | 6 +-
+ fs/tracefs/inode.c | 10 +-
+ fs/ubifs/dir.c | 10 +-
+ fs/udf/namei.c | 12 +-
+ fs/ufs/namei.c | 8 +-
+ fs/vboxsf/dir.c | 8 +-
+ fs/xfs/scrub/orphanage.c | 9 +-
+ fs/xfs/xfs_iops.c | 4 +-
+ fs/xfs/xfs_super.c | 3 +-
+ include/linux/blkdev.h | 8 +-
+ include/linux/dcache.h | 39 +-
+ include/linux/eventpoll.h | 4 +
+ include/linux/fanotify.h | 12 +-
+ include/linux/file_ref.h | 34 +
+ include/linux/fs.h | 62 +-
+ include/linux/fs_context.h | 2 -
+ include/linux/fscrypt.h | 12 +-
+ include/linux/fsnotify.h | 20 +
+ include/linux/fsnotify_backend.h | 42 +
+ include/linux/kstrtox.h | 1 +
+ include/linux/mm.h | 2 +-
+ include/linux/mnt_idmapping.h | 5 +
+ include/linux/namei.h | 45 +-
+ include/linux/nfs_xdr.h | 2 +-
+ include/linux/pagemap.h | 48 +-
+ include/linux/pid.h | 7 +-
+ include/linux/pidfs.h | 1 +
+ include/linux/pipe_fs_i.h | 2 +-
+ include/linux/syscalls.h | 8 +-
+ include/linux/sysv_fs.h | 214 ----
+ include/linux/uidgid.h | 6 +
+ include/linux/vfsdebug.h | 45 +
+ include/linux/wait.h | 3 +
+ include/net/af_rxrpc.h | 2 +
+ include/trace/events/afs.h | 83 +-
+ include/uapi/asm-generic/unistd.h | 4 +-
+ include/uapi/linux/fanotify.h | 10 +
+ include/uapi/linux/mount.h | 10 +-
+ include/uapi/linux/pidfd.h | 27 +-
+ init/.kunitconfig | 3 +
+ init/Kconfig | 7 +
+ init/Makefile | 1 +
+ init/initramfs.c | 66 +-
+ init/initramfs_internal.h | 8 +
+ init/initramfs_test.c | 407 +++++++
+ kernel/audit_watch.c | 12 +-
+ kernel/auditsc.c | 12 +-
+ kernel/bpf/inode.c | 8 +-
+ kernel/exit.c | 58 +-
+ kernel/fork.c | 22 +-
+ kernel/kcmp.c | 2 +-
+ kernel/pid.c | 106 +-
+ kernel/signal.c | 117 +-
+ kernel/sys.c | 14 +-
+ kernel/user_namespace.c | 26 +-
+ kernel/watch_queue.c | 16 +-
+ lib/Kconfig.debug | 9 +
+ lib/vsprintf.c | 7 +
+ mm/gup.c | 6 +-
+ mm/shmem.c | 8 +-
+ net/rxrpc/ar-internal.h | 1 +
+ net/rxrpc/peer_object.c | 30 +-
+ samples/vfs/samples-vfs.h | 14 +-
+ samples/vfs/test-list-all-mounts.c | 35 +-
+ scripts/syscall.tbl | 1 +
+ security/apparmor/apparmorfs.c | 8 +-
+ security/landlock/fs.c | 2 +-
+ security/selinux/hooks.c | 3 +
+ security/selinux/include/classmap.h | 2 +-
+ tools/testing/selftests/Makefile | 1 +
+ .../selftests/filesystems/mount-notify/.gitignore | 2 +
+ .../selftests/filesystems/mount-notify/Makefile | 6 +
+ .../filesystems/mount-notify/mount-notify_test.c | 516 ++++++++
+ .../selftests/filesystems/nsfs/iterate_mntns.c | 14 +
+ .../selftests/filesystems/overlayfs/Makefile | 11 +-
+ .../filesystems/overlayfs/set_layers_via_fds.c | 503 ++++++++
+ .../selftests/filesystems/overlayfs/wrappers.h | 17 +
+ .../selftests/filesystems/statmount/statmount.h | 2 +-
+ tools/testing/selftests/filesystems/utils.c | 501 ++++++++
+ tools/testing/selftests/filesystems/utils.h | 45 +
+ tools/testing/selftests/mm/guard-pages.c | 16 +-
+ .../selftests/mount_setattr/mount_setattr_test.c | 652 ++++++++++
+ tools/testing/selftests/pidfd/.gitignore | 2 +
+ tools/testing/selftests/pidfd/Makefile | 4 +-
+ tools/testing/selftests/pidfd/pidfd.h | 109 ++
+ tools/testing/selftests/pidfd/pidfd_exec_helper.c | 12 +
+ tools/testing/selftests/pidfd/pidfd_fdinfo_test.c | 1 +
+ tools/testing/selftests/pidfd/pidfd_info_test.c | 497 ++++++++
+ tools/testing/selftests/pidfd/pidfd_open_test.c | 30 +-
+ tools/testing/selftests/pidfd/pidfd_setns_test.c | 45 -
+ tools/testing/selftests/pidfd/pidfd_test.c | 80 +-
+ virt/kvm/kvm_main.c | 11 +-
+ 281 files changed, 8549 insertions(+), 7123 deletions(-)
+ delete mode 100644 Documentation/filesystems/sysv-fs.rst
+ delete mode 100644 fs/sysv/Kconfig
+ delete mode 100644 fs/sysv/Makefile
+ delete mode 100644 fs/sysv/balloc.c
+ delete mode 100644 fs/sysv/dir.c
+ delete mode 100644 fs/sysv/file.c
+ delete mode 100644 fs/sysv/ialloc.c
+ delete mode 100644 fs/sysv/inode.c
+ delete mode 100644 fs/sysv/itree.c
+ delete mode 100644 fs/sysv/namei.c
+ delete mode 100644 fs/sysv/super.c
+ delete mode 100644 fs/sysv/sysv.h
+ delete mode 100644 include/linux/sysv_fs.h
+ create mode 100644 include/linux/vfsdebug.h
+ create mode 100644 init/.kunitconfig
+ create mode 100644 init/initramfs_internal.h
+ create mode 100644 init/initramfs_test.c
+ create mode 100644 tools/testing/selftests/filesystems/mount-notify/.gitignore
+ create mode 100644 tools/testing/selftests/filesystems/mount-notify/Makefile
+ create mode 100644 tools/testing/selftests/filesystems/mount-notify/mount-notify_test.c
+ create mode 100644 tools/testing/selftests/filesystems/utils.c
+ create mode 100644 tools/testing/selftests/filesystems/utils.h
+ create mode 100644 tools/testing/selftests/pidfd/pidfd_exec_helper.c
+ create mode 100644 tools/testing/selftests/pidfd/pidfd_info_test.c
+Merging vfs/for-next (2e72b1e0aac2 Merge branch 'work.d_revalidate' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs/for-next
+Merge made by the 'ort' strategy.
+Merging mm-hotfixes/mm-hotfixes-unstable (34c830abb215 mm: page_isolation: avoid calling folio_hstate() without hugetlb_lock)
+$ 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 include/linux/mm.h
+Auto-merging mm/filemap.c
+Merge made by the 'ort' strategy.
+ arch/x86/mm/init_64.c | 17 +++++++++--
+ fs/proc/generic.c | 10 +++++-
+ fs/proc/inode.c | 6 ++--
+ fs/proc/internal.h | 14 +++++++++
+ fs/squashfs/cache.c | 2 +-
+ fs/userfaultfd.c | 51 +++++++++++++++----------------
+ include/linux/damon.h | 5 +++
+ include/linux/mm.h | 8 ++++-
+ include/linux/page-flags.h | 37 ++++++++++++++++++++++
+ include/linux/page_ref.h | 2 +-
+ include/linux/proc_fs.h | 7 +++--
+ include/linux/swap_cgroup.h | 4 +--
+ lib/iov_iter.c | 8 +++--
+ mm/damon/core.c | 7 ++++-
+ mm/damon/paddr.c | 3 ++
+ mm/filemap.c | 40 ++++++++++++++++--------
+ mm/huge_memory.c | 2 +-
+ mm/hugetlb.c | 8 +++--
+ mm/memcontrol.c | 13 ++++++--
+ mm/migrate.c | 10 +++---
+ mm/page_alloc.c | 27 +++++++++++++---
+ mm/page_isolation.c | 9 +++++-
+ mm/swap_cgroup.c | 7 +++--
+ mm/vma.c | 3 +-
+ tools/testing/selftests/mm/run_vmtests.sh | 4 ++-
+ 25 files changed, 228 insertions(+), 76 deletions(-)
+Merging fs-current (822b79b954ef Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git)
+$ git merge -m Merge branch 'fs-current' of linux-next fs-current
+Merge made by the 'ort' strategy.
+ arch/powerpc/platforms/cell/spufs/gang.c | 1 +
+ arch/powerpc/platforms/cell/spufs/inode.c | 63 ++++++++++++++++++++++++++-----
+ arch/powerpc/platforms/cell/spufs/spufs.h | 2 +
+ drivers/infiniband/hw/qib/qib_fs.c | 1 +
+ 4 files changed, 57 insertions(+), 10 deletions(-)
+Merging kbuild-current/fixes (80e54e84911a Linux 6.14-rc6)
+$ 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 (78d4f34e2115 Linux 6.13-rc3)
+$ 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 (0c66c6f4e21c ARM: 9359/1: flush: check if the folio is reserved for no-mapping addresses)
+$ 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 (f7edb07ad7c6 Fix mmu notifiers for range-based invalidates)
+$ 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 (45d5fe1c53ba ARM: davinci: da850: fix selecting ARCH_DAVINCI_DA8XX)
+$ 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
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ MAINTAINERS | 3 +++
+ arch/arm/boot/dts/broadcom/bcm2711-rpi.dtsi | 5 -----
+ arch/arm/boot/dts/broadcom/bcm2711.dtsi | 12 +++++-----
+ .../boot/dts/broadcom/bcm4709-asus-rt-ac3200.dts | 12 +++++-----
+ .../boot/dts/broadcom/bcm47094-asus-rt-ac5300.dts | 8 +++----
+ arch/arm/boot/dts/nxp/imx/imx6qdl-apalis.dtsi | 10 ++++-----
+ arch/arm/mach-davinci/Kconfig | 1 +
+ arch/arm/mach-omap1/Kconfig | 1 +
+ arch/arm/mach-shmobile/headsmp.S | 1 +
+ arch/arm64/boot/dts/broadcom/bcm2712.dtsi | 2 +-
+ .../boot/dts/freescale/imx8mm-verdin-dahlia.dtsi | 6 ++---
+ .../arm64/boot/dts/freescale/imx8mp-tqma8mpql.dtsi | 16 ++++---------
+ .../boot/dts/freescale/imx8mp-verdin-dahlia.dtsi | 6 ++---
+ arch/arm64/boot/dts/qcom/sdm845.dtsi | 1 -
+ .../boot/dts/rockchip/px30-ringneck-haikou.dts | 12 ++++++++++
+ .../arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dtsi | 2 +-
+ arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi | 14 ++++++++++++
+ arch/arm64/boot/dts/rockchip/rk3566-lubancat-1.dts | 1 -
+ arch/arm64/boot/dts/rockchip/rk3588-jaguar.dts | 1 -
+ arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts | 3 +--
+ arch/arm64/boot/dts/rockchip/rk3588-tiger.dtsi | 1 -
+ arch/riscv/boot/dts/starfive/jh7110-pinfunc.h | 2 +-
+ drivers/firmware/imx/imx-scu.c | 1 +
+ drivers/firmware/qcom/qcom_qseecom_uefisecapp.c | 18 +++++++--------
+ drivers/firmware/qcom/qcom_scm.c | 4 ++--
+ drivers/memory/omap-gpmc.c | 20 -----------------
+ drivers/reset/reset-microchip-sparx5.c | 19 +++++++++++-----
+ drivers/soc/hisilicon/kunpeng_hccs.c | 4 ++--
+ drivers/soc/imx/soc-imx8m.c | 26 ++++++++++++++++++++--
+ drivers/soc/qcom/pdr_interface.c | 8 +------
+ drivers/soc/qcom/pmic_glink.c | 2 +-
+ 31 files changed, 121 insertions(+), 101 deletions(-)
+Merging davinci-current/davinci/for-current (2014c95afece Linux 6.14-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 (304e6c02b76f memory: omap-gpmc: drop no compatible check)
+ 304e6c02b76f ("memory: omap-gpmc: drop no compatible check")
+$ 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
+Merge made by the 'ort' strategy.
+Merging sophgo-fixes/fixes (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'fixes' of https://github.com/sophgo/linux.git sophgo-fixes/fixes
+Already up to date.
+Merging m68k-current/for-linus (bb2e0fb1e6aa m68k: libgcc: Fix lvalue abuse in umul_ppmm())
+$ 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
+Already up to date.
+Merging powerpc-fixes/fixes (eff2eb592efd cxl: Fix cross-reference in documentation and add deprecation warning)
+$ 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 (b4a1dec11793 s390/ftrace: Fix return address recovery of traced function)
+$ 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 net/main (4003c9e78778 Merge tag 'net-6.14-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
+$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/main
+Already up to date.
+Merging bpf/master (6ccf6adb05d0 xsk: Fix __xsk_generic_xmit() error code when cq is full)
+$ 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.
+ net/xdp/xsk.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+Merging ipsec/master (0aae2867aa60 xfrm_output: Force software GSO only in tunnel mode)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master
+Merge made by the 'ort' strategy.
+ net/xfrm/xfrm_output.c | 43 ++++++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 42 insertions(+), 1 deletion(-)
+Merging netfilter/main (2409fa66e29a Merge tag 'nf-25-03-13' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf)
+$ 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 (1438f5d07b9a rtnetlink: fix netns leak with rtnl_setlink())
+$ 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 (8ae227f8a774 wifi: mac80211: fix MPDU length parsing for EHT 5/6 GHz)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/for-next
+Already up to date.
+Merging ath/for-current (3640dbc1f75c wifi: iwlwifi: Fix A-MSDU TSO preparation)
+$ git merge -m Merge branch 'for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git ath/for-current
+Already up to date.
+Merging wpan/master (8ce4f287524c net: libwx: fix firmware mailbox abnormal return)
+$ 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 (556f93b90c18 RDMA/mlx5: Handle errors returned from mlx5r_ib_rate())
+$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma-fixes/for-rc
+Merge made by the 'ort' strategy.
+ drivers/infiniband/hw/bnxt_re/bnxt_re.h | 6 ------
+ drivers/infiniband/hw/bnxt_re/main.c | 3 +--
+ drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 10 +---------
+ drivers/infiniband/hw/bnxt_re/qplib_rcfw.h | 6 +++---
+ drivers/infiniband/hw/bnxt_re/qplib_res.c | 9 +++++++++
+ drivers/infiniband/hw/bnxt_re/qplib_res.h | 12 ++++++++++++
+ drivers/infiniband/hw/bnxt_re/qplib_sp.c | 3 +++
+ drivers/infiniband/hw/bnxt_re/roce_hsi.h | 3 ++-
+ drivers/infiniband/hw/mlx5/ah.c | 14 +++++++++-----
+ drivers/infiniband/sw/rxe/rxe.c | 25 ++++++-------------------
+ 10 files changed, 46 insertions(+), 45 deletions(-)
+Merging sound-current/for-linus (de69d56daac6 Merge tag 'asoc-fix-v6.14-rc6' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
+$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus
+Already up to date.
+Merging sound-asoc-fixes/for-linus (de74ec718e07 ASoC: simple-card-utils: Don't use __free(device_node) at graph_util_parse_dai())
+$ 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.
+ sound/soc/generic/simple-card-utils.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+Merging regmap-fixes/for-linus (32ffed055dce regmap-irq: Add missing kfree())
+$ 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 (2c7a50bec495 regulator: check that dummy regulator has been probed before using it)
+$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus
+Merge made by the 'ort' strategy.
+ drivers/regulator/core.c | 88 +++++++++++++++++++++++++++++------------------
+ drivers/regulator/dummy.c | 2 +-
+ 2 files changed, 55 insertions(+), 35 deletions(-)
+Merging spi-fixes/for-linus (91cf42c63f2d spi: microchip-core: prevent RX overflows when transmit size > FIFO size)
+$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi-fixes/for-linus
+Already up to date.
+Merging pci-current/for-linus (2014c95afece Linux 6.14-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 (80e54e84911a Linux 6.14-rc6)
+$ 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 (0ad2507d5d93 Linux 6.14-rc3)
+$ 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 (f2865c6300d7 usb: typec: tcpm: fix state transition for SNK_WAIT_CAPABILITIES state in run_state_machine())
+$ 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 (18e0885bd2ca USB: serial: ftdi_sio: add support for Altera USB Blaster 3)
+$ 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 (7eb172143d55 Linux 6.14-rc5)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy/fixes
+Already up to date.
+Merging staging.current/staging-linus (2014c95afece Linux 6.14-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 (2156789f74ea iio: adc: rockchip: Fix clock initialization sequence)
+$ 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 | 10 +++-------
+ drivers/iio/adc/rockchip_saradc.c | 17 ++++++++---------
+ drivers/iio/imu/bmi270/bmi270_core.c | 6 ++----
+ drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 6 ++++++
+ 4 files changed, 19 insertions(+), 20 deletions(-)
+Merging counter-current/counter-current (c0c9c7343466 counter: microchip-tcb-capture: Fix undefined counter channel state on probe)
+$ 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/microchip-tcb-capture.c | 19 +++++++++++++++++++
+ drivers/counter/stm32-lptimer-cnt.c | 24 +++++++++++++++---------
+ 2 files changed, 34 insertions(+), 9 deletions(-)
+Merging char-misc.current/char-misc-linus (2dc25093218f Merge tag 'counter-fixes-for-6.14' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/wbg/counter into char-misc-linus)
+$ 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.
+Merging soundwire-fixes/fixes (2014c95afece Linux 6.14-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 (502843396ec2 thunderbolt: Prevent use-after-free in resume from hibernate)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt-fixes/fixes
+Already up to date.
+Merging input-current/for-linus (fd10709e28d2 MAINTAINERS: Remove myself from the goodix touchscreen maintainers)
+$ 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 (9d4f8e54cef2 rhashtable: Fix rhashtable_try_insert test)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git crypto-current/master
+Already up to date.
+Merging vfio-fixes/for-linus (09dfc8a5f2ce vfio/pci: Fallback huge faults for unaligned pfn)
+$ 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 (a64dcfb451e2 Linux 6.14-rc2)
+$ 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 dmaengine-fixes/fixes (7eb172143d55 Linux 6.14-rc5)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine-fixes/fixes
+Already up to date.
+Merging backlight-fixes/for-backlight-fixes (1613e604df0c Linux 6.10-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 (1dbf60277e9b Merge tag 'spi-nor/fixes-for-6.14-rc4' of https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux into mtd/fixes)
+$ 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 (68f860426d50 mfd: axp20x: AXP717: Fix missing IRQ status registers range)
+$ 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 (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'fixes' of git://linuxtv.org/media-ci/media-pending.git v4l-dvb-fixes/fixes
+Already up to date.
+Merging reset-fixes/reset/fixes (0e2268f88bb2 reset: mchp: sparx5: Fix for lan966x)
+$ 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 (6d48ad040757 MIPS: Ignore relocs against __ex_table for relocatable kernel)
+$ 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 (2014c95afece Linux 6.14-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 (c2a5f8c4f28f ARM: OMAP1: select CONFIG_GENERIC_IRQ_CHIP)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap.git omap-fixes/fixes
+Merge made by the 'ort' strategy.
+Merging kvm-fixes/master (ea9bd29a9c0d Merge tag 'kvm-x86-fixes-6.14-rcN.2' of https://github.com/kvm-x86/linux into HEAD)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm-fixes/master
+Already up to date.
+Merging kvms390-fixes/master (d8dfda5af0be KVM: s390: pv: fix race when making a page secure)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390-fixes/master
+Merge made by the 'ort' strategy.
+ arch/s390/include/asm/gmap.h | 1 -
+ arch/s390/include/asm/uv.h | 2 +-
+ arch/s390/kernel/uv.c | 136 ++++++++++++++++++++++++++++++++++++++++---
+ arch/s390/kvm/gmap.c | 103 ++------------------------------
+ arch/s390/kvm/kvm-s390.c | 25 ++++----
+ arch/s390/mm/gmap.c | 28 ---------
+ 6 files changed, 151 insertions(+), 144 deletions(-)
+Merging hwmon-fixes/hwmon (10fce7ebe888 hwmon: fix a NULL vs IS_ERR_OR_NULL() check in xgene_hwmon_probe())
+$ 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 (265e98f72bac acpi: nfit: vmalloc-out-of-bounds Read in acpi_nfit_ctl)
+$ 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 (2014c95afece Linux 6.14-rc1)
+$ 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 dma-mapping-fixes/dma-mapping-fixes (8324993f6030 dma-mapping: fix missing clear bdr in check_ram_in_range_map())
+$ git merge -m Merge branch 'dma-mapping-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux.git dma-mapping-fixes/dma-mapping-fixes
+Merge made by the 'ort' strategy.
+ kernel/dma/direct.c | 28 ++++++++++++++++++----------
+ 1 file changed, 18 insertions(+), 10 deletions(-)
+Merging drivers-x86-fixes/fixes (03fc0a2dc9f8 MAINTAINERS: Update Ike Panhc's email address)
+$ 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 (53517a70873c clk: samsung: update PLL locktime for PLL142XX used on FSD platform)
+$ 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 (2014c95afece Linux 6.14-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 (75f1f311d883 Revert "of: reserved-memory: Fix using wrong number of cells to get property 'alignment'")
+$ 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 (2014c95afece Linux 6.14-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 (f27a95845b01 scsi: ufs: core: bsg: Fix crash when arpmb command fails)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-fixes/fixes
+Already up to date.
+Merging drm-fixes/drm-fixes (d1d77326f585 Merge tag 'drm-xe-fixes-2025-03-13' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-fixes)
+$ git merge -m Merge branch 'drm-fixes' of https://gitlab.freedesktop.org/drm/kernel.git drm-fixes/drm-fixes
+Already up to date.
+Merging drm-intel-fixes/for-linux-next-fixes (a8045e46c508 drm/i915: Increase I915_PARAM_MMAP_GTT_VERSION version to indicate support for partial mmaps)
+$ git merge -m Merge branch 'for-linux-next-fixes' of https://gitlab.freedesktop.org/drm/i915/kernel drm-intel-fixes/for-linux-next-fixes
+Already up to date.
+Merging mmc-fixes/fixes (e51a349d2dcf mmc: atmel-mci: Add missing clk_disable_unprepare())
+$ 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/host/atmel-mci.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+Merging rtc-fixes/rtc-fixes (2014c95afece Linux 6.14-rc1)
+$ 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 (0ad2507d5d93 Linux 6.14-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 (73fe9073c0cc Drivers: hv: vmbus: Don't release fb_mmio resource in vmbus_free_mmio())
+$ git merge -m Merge branch 'hyperv-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes
+Already up to date.
+Merging risc-v-fixes/fixes (245aece3750d MAINTAINERS: Add myself as a riscv reviewer)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v-fixes/fixes
+Already up to date.
+Merging riscv-dt-fixes/riscv-dt-fixes (1b133129ad6b riscv: dts: starfive: Fix a typo in StarFive JH7110 pin function definitions)
+$ 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 (2014c95afece Linux 6.14-rc1)
+$ 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 (1613e604df0c Linux 6.10-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 (2014c95afece Linux 6.14-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 (dcb73cbaaeb3 gpio: cdev: use raw notifier for line state events)
+$ 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 (2014c95afece Linux 6.14-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 (2014c95afece Linux 6.14-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 (2014c95afece Linux 6.14-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 kunit-fixes/kunit-fixes (a64dcfb451e2 Linux 6.14-rc2)
+$ 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 memblock-fixes/fixes (180bbad69864 arch_numa: Restore nid checks before registering a memblock with a node)
+$ 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 renesas-fixes/fixes (379c590113ce ARM: shmobile: smp: Enforce shmobile_smp_* alignment)
+$ 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 (42367eca7604 tools: Remove redundant quiet setup)
+$ 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 (cb16dfed0093 efi/libstub: Avoid physical address 0x0 when doing random allocation)
+$ 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/libstub/randomalloc.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+Merging battery-fixes/fixes (98380110bd48 power: supply: axp20x_battery: Fix fault handling for AXP717)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery-fixes/fixes
+Already up to date.
+Merging iommufd-fixes/for-rc (2ca704f55e22 iommu/arm-smmu-v3: Improve uAPI comment for IOMMU_HW_INFO_TYPE_ARM_SMMUV3)
+$ 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 (a1eb95d6b5f4 scripts: generate_rust_analyzer: add uapi crate)
+$ 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 w1-fixes/fixes (2014c95afece Linux 6.14-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 (ef17b519088e pmdomain: amlogic: fix T7 ISP secpower)
+$ 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/amlogic/meson-secure-pwrc.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging i2c-host-fixes/i2c/i2c-host-fixes (2b22459792fc i2c: sis630: Fix an error handling path in sis630_probe())
+$ 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
+Already up to date.
+Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1)
+$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git sparc-fixes/for-linus
+Already up to date.
+Merging clk-fixes/clk-fixes (54493279312f Merge tag 'samsung-clk-fixes-6.14' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into clk-fixes)
+$ git merge -m Merge branch 'clk-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk-fixes/clk-fixes
+Already up to date.
+Merging pwrseq-fixes/pwrseq/for-current (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'pwrseq/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git pwrseq-fixes/pwrseq/for-current
+Already up to date.
+Merging thead-dt-fixes/thead-dt-fixes (40384c840ea1 Linux 6.13-rc1)
+$ git merge -m Merge branch 'thead-dt-fixes' of https://github.com/pdp7/linux.git thead-dt-fixes/thead-dt-fixes
+Already up to date.
+Merging ftrace-fixes/ftrace/fixes (2fa6a01345b5 tracing: Fix memory leak when reading set_event file)
+$ git merge -m Merge branch 'ftrace/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git ftrace-fixes/ftrace/fixes
+Already up to date.
+Merging ring-buffer-fixes/ring-buffer/fixes (97937834ae87 ring-buffer: Update pages_touched to reflect persistent buffer content)
+$ git merge -m Merge branch 'ring-buffer/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git ring-buffer-fixes/ring-buffer/fixes
+Already up to date.
+Merging trace-fixes/trace/fixes (a1a7eb89ca0b ftrace: Avoid potential division by zero in function_stat_show())
+$ git merge -m Merge branch 'trace/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git trace-fixes/trace/fixes
+Already up to date.
+Merging tracefs-fixes/tracefs/fixes (8b55572e5180 tracing/selftests: Add tracefs mount options test)
+$ git merge -m Merge branch 'tracefs/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git tracefs-fixes/tracefs/fixes
+Already up to date.
+Merging spacemit-fixes/fixes (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'fixes' of https://github.com/spacemit-com/linux spacemit-fixes/fixes
+Already up to date.
+Merging tip-fixes/tip/urgent (5ee2723f963d Merge branch into tip/master: 'sched/urgent')
+$ git merge -m Merge branch 'tip/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip-fixes/tip/urgent
+Merge made by the 'ort' strategy.
+ kernel/sched/core.c | 21 +++------------------
+ 1 file changed, 3 insertions(+), 18 deletions(-)
+Merging slab-fixes/slab/for-next-fixes (dfd3df31c9db mm/slab/kvfree_rcu: Switch to WQ_MEM_RECLAIM wq)
+$ git merge -m Merge branch 'slab/for-next-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab-fixes/slab/for-next-fixes
+Already up to date.
+Merging drm-msm-fixes/msm-fixes (73f69c6be2a9 drm/msm/dsi/phy: Do not overwite PHY_CMN_CLK_CFG1 when choosing bitclk source)
+$ git merge -m Merge branch 'msm-fixes' of https://gitlab.freedesktop.org/drm/msm.git drm-msm-fixes/msm-fixes
+Already up to date.
+Merging uml-fixes/fixes (96178631c3f5 um: convert irq_lock to raw spinlock)
+$ 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 drm-misc-fixes/for-linux-next-fixes (c3e4a25602f8 drm/v3d: Set job pointer to NULL when the job's fence has an error)
+$ git merge -m Merge branch 'for-linux-next-fixes' of https://gitlab.freedesktop.org/drm/misc/kernel.git drm-misc-fixes/for-linux-next-fixes
+Merge made by the 'ort' strategy.
+ drivers/gpu/drm/scheduler/sched_entity.c | 11 +++++++++--
+ drivers/gpu/drm/v3d/v3d_sched.c | 23 ++++++++++++++++++++---
+ 2 files changed, 29 insertions(+), 5 deletions(-)
+Merging linus/for-next (ffd294d346d1 Linux 6.13)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git linus/for-next
+Already up to date.
+Merging mm-stable/mm-stable (80e54e84911a Linux 6.14-rc6)
+$ git merge -m Merge branch 'mm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-stable/mm-stable
+Already up to date.
+Merging mm-nonmm-stable/mm-nonmm-stable (80e54e84911a Linux 6.14-rc6)
+$ 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
+Already up to date.
+Merging mm/mm-everything (f8a756a99e52 foo)
+$ git merge -m Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm/mm-everything
+Auto-merging .mailmap
+Auto-merging MAINTAINERS
+Auto-merging arch/arm64/include/asm/tlbflush.h
+Auto-merging drivers/infiniband/hw/bnxt_re/qplib_rcfw.c
+Auto-merging drivers/nvme/host/core.c
+Auto-merging drivers/regulator/core.c
+Auto-merging fs/bcachefs/util.h
+Auto-merging include/linux/mm.h
+Auto-merging init/Kconfig
+Auto-merging mm/filemap.c
+Auto-merging mm/memory.c
+Auto-merging mm/nommu.c
+Merge made by the 'ort' strategy.
+ .mailmap | 4 +-
+ CREDITS | 3 +
+ Documentation/ABI/testing/sysfs-block-zram | 8 -
+ Documentation/ABI/testing/sysfs-kernel-mm-cma | 13 +
+ Documentation/ABI/testing/sysfs-kernel-mm-damon | 60 +
+ Documentation/ABI/testing/sysfs-kernel-reboot | 8 +
+ Documentation/RCU/whatisRCU.rst | 10 +
+ Documentation/admin-guide/blockdev/zram.rst | 36 +-
+ Documentation/admin-guide/cgroup-v1/memory.rst | 4 +
+ Documentation/admin-guide/cgroup-v2.rst | 34 +-
+ Documentation/admin-guide/kernel-parameters.txt | 36 +-
+ Documentation/admin-guide/mm/cma_debugfs.rst | 10 +-
+ Documentation/admin-guide/mm/damon/usage.rst | 85 +-
+ Documentation/admin-guide/mm/hugetlbpage.rst | 10 +
+ Documentation/admin-guide/mm/pagemap.rst | 21 +-
+ Documentation/admin-guide/mm/zswap.rst | 10 +-
+ Documentation/admin-guide/sysctl/vm.rst | 26 +
+ Documentation/arch/arm64/ptdump.rst | 2 -
+ Documentation/core-api/refcount-vs-atomic.rst | 37 +-
+ Documentation/core-api/xarray.rst | 14 +-
+ Documentation/dev-tools/kunit/usage.rst | 30 +-
+ .../devicetree/bindings/thermal/thermal-zones.yaml | 5 +-
+ Documentation/driver-api/thermal/sysfs-api.rst | 25 +-
+ Documentation/filesystems/dax.rst | 1 -
+ Documentation/filesystems/proc.rst | 47 +-
+ Documentation/mm/balance.rst | 2 +-
+ Documentation/mm/damon/design.rst | 119 +-
+ .../damon/monitoring_intervals_tuning_example.rst | 8 +-
+ Documentation/mm/hmm.rst | 2 +-
+ Documentation/mm/index.rst | 1 -
+ Documentation/mm/process_addrs.rst | 44 +-
+ Documentation/mm/transhuge.rst | 39 +-
+ Documentation/mm/z3fold.rst | 28 -
+ Documentation/mm/zsmalloc.rst | 5 +-
+ Documentation/translations/zh_CN/mm/hmm.rst | 2 +-
+ Documentation/translations/zh_CN/mm/index.rst | 1 -
+ Documentation/translations/zh_CN/mm/z3fold.rst | 31 -
+ Documentation/userspace-api/mseal.rst | 20 +
+ MAINTAINERS | 23 +-
+ arch/Kconfig | 4 +
+ arch/alpha/mm/init.c | 8 -
+ arch/arc/mm/init.c | 25 +-
+ arch/arc/mm/ioremap.c | 6 +-
+ arch/arm/include/asm/pgtable.h | 5 +-
+ arch/arm/include/asm/vdso.h | 2 +
+ arch/arm/include/asm/vdso/gettimeofday.h | 7 +-
+ arch/arm/include/asm/vdso/vsyscall.h | 12 +-
+ arch/arm/kernel/asm-offsets.c | 4 -
+ arch/arm/kernel/vdso.c | 34 +-
+ arch/arm/mm/Kconfig | 1 +
+ arch/arm/mm/init.c | 43 +-
+ arch/arm/vdso/Makefile | 2 +-
+ arch/arm/vdso/vdso.lds.S | 4 +-
+ arch/arm64/Kconfig | 4 +-
+ arch/arm64/include/asm/asm-bug.h | 27 +-
+ arch/arm64/include/asm/bug.h | 8 +-
+ arch/arm64/include/asm/io.h | 6 +-
+ arch/arm64/include/asm/ptdump.h | 4 +-
+ arch/arm64/include/asm/tlbflush.h | 23 +-
+ arch/arm64/include/asm/vdso.h | 2 +-
+ arch/arm64/include/asm/vdso/compat_gettimeofday.h | 36 +-
+ arch/arm64/include/asm/vdso/getrandom.h | 12 -
+ arch/arm64/include/asm/vdso/gettimeofday.h | 16 +-
+ arch/arm64/include/asm/vdso/vsyscall.h | 25 +-
+ arch/arm64/kernel/acpi.c | 2 +-
+ arch/arm64/kernel/vdso.c | 99 +-
+ arch/arm64/kernel/vdso/Makefile | 2 +-
+ arch/arm64/kernel/vdso/vdso.lds.S | 7 +-
+ arch/arm64/kernel/vdso32/Makefile | 2 +-
+ arch/arm64/kernel/vdso32/vdso.lds.S | 7 +-
+ arch/arm64/kvm/Kconfig | 4 +-
+ arch/arm64/mm/Makefile | 2 +-
+ arch/arm64/mm/contpte.c | 2 +-
+ arch/arm64/mm/init.c | 18 +-
+ arch/arm64/mm/ioremap.c | 3 +-
+ arch/csky/include/asm/io.h | 2 +-
+ arch/csky/include/asm/pgalloc.h | 7 +-
+ arch/csky/kernel/setup.c | 43 +
+ arch/csky/kernel/vdso/Makefile | 2 +-
+ arch/csky/mm/init.c | 67 -
+ arch/hexagon/include/asm/pgalloc.h | 7 +-
+ arch/hexagon/mm/init.c | 32 +-
+ arch/loongarch/Kconfig | 2 +
+ arch/loongarch/configs/loongson3_defconfig | 3 +-
+ arch/loongarch/include/asm/bug.h | 42 +-
+ arch/loongarch/include/asm/io.h | 10 +-
+ arch/loongarch/include/asm/pgalloc.h | 7 +-
+ arch/loongarch/include/asm/vdso.h | 1 -
+ arch/loongarch/include/asm/vdso/arch_data.h | 25 +
+ arch/loongarch/include/asm/vdso/getrandom.h | 5 -
+ arch/loongarch/include/asm/vdso/gettimeofday.h | 14 +-
+ arch/loongarch/include/asm/vdso/vdso.h | 38 +-
+ arch/loongarch/include/asm/vdso/vsyscall.h | 17 -
+ arch/loongarch/kernel/asm-offsets.c | 2 +-
+ arch/loongarch/kernel/numa.c | 6 -
+ arch/loongarch/kernel/setup.c | 5 +-
+ arch/loongarch/kernel/vdso.c | 92 +-
+ arch/loongarch/mm/init.c | 8 -
+ arch/loongarch/vdso/Makefile | 2 +-
+ arch/loongarch/vdso/vdso.lds.S | 8 +-
+ arch/loongarch/vdso/vgetcpu.c | 12 +-
+ arch/m68k/include/asm/sun3_pgalloc.h | 7 +-
+ arch/m68k/mm/init.c | 2 -
+ arch/microblaze/mm/init.c | 25 -
+ arch/mips/Kconfig | 1 +
+ arch/mips/include/asm/io.h | 8 +-
+ arch/mips/include/asm/mmzone.h | 2 -
+ arch/mips/include/asm/pgalloc.h | 7 +-
+ arch/mips/include/asm/vdso/gettimeofday.h | 9 +-
+ arch/mips/include/asm/vdso/vdso.h | 19 +-
+ arch/mips/include/asm/vdso/vsyscall.h | 14 +-
+ arch/mips/kernel/vdso.c | 47 +-
+ arch/mips/loongson64/numa.c | 7 -
+ arch/mips/mm/init.c | 51 +-
+ arch/mips/mm/ioremap.c | 4 +-
+ arch/mips/mm/ioremap64.c | 4 +-
+ arch/mips/sgi-ip27/ip27-memory.c | 9 -
+ arch/mips/vdso/Makefile | 2 +-
+ arch/mips/vdso/vdso.lds.S | 5 +-
+ arch/nios2/include/asm/pgalloc.h | 7 +-
+ arch/nios2/kernel/setup.c | 3 +-
+ arch/nios2/mm/init.c | 16 +-
+ arch/openrisc/include/asm/pgalloc.h | 7 +-
+ arch/openrisc/mm/init.c | 6 -
+ arch/parisc/include/asm/bug.h | 29 +-
+ arch/parisc/include/asm/io.h | 2 +-
+ arch/parisc/include/asm/vdso.h | 2 -
+ arch/parisc/kernel/vdso32/Makefile | 2 +-
+ arch/parisc/kernel/vdso64/Makefile | 2 +-
+ arch/parisc/mm/init.c | 4 -
+ arch/parisc/mm/ioremap.c | 4 +-
+ arch/powerpc/Kconfig | 7 +-
+ arch/powerpc/configs/mpc885_ads_defconfig | 2 +-
+ arch/powerpc/include/asm/book3s/64/hugetlb.h | 6 +
+ arch/powerpc/include/asm/bug.h | 37 +-
+ arch/powerpc/include/asm/crash_reserve.h | 8 +
+ arch/powerpc/include/asm/io.h | 2 +-
+ arch/powerpc/include/asm/kexec.h | 10 +-
+ arch/powerpc/include/asm/vdso.h | 1 +
+ arch/powerpc/include/asm/vdso/arch_data.h | 37 +
+ arch/powerpc/include/asm/vdso/getrandom.h | 11 +-
+ arch/powerpc/include/asm/vdso/gettimeofday.h | 29 +-
+ arch/powerpc/include/asm/vdso/vsyscall.h | 13 -
+ arch/powerpc/include/asm/vdso_datapage.h | 44 +-
+ arch/powerpc/kernel/asm-offsets.c | 1 -
+ arch/powerpc/kernel/prom.c | 2 +-
+ arch/powerpc/kernel/setup-common.c | 2 -
+ arch/powerpc/kernel/time.c | 2 +-
+ arch/powerpc/kernel/vdso.c | 115 +-
+ arch/powerpc/kernel/vdso/Makefile | 2 +-
+ arch/powerpc/kernel/vdso/cacheflush.S | 2 +-
+ arch/powerpc/kernel/vdso/datapage.S | 4 +-
+ arch/powerpc/kernel/vdso/gettimeofday.S | 4 +-
+ arch/powerpc/kernel/vdso/vdso32.lds.S | 4 +-
+ arch/powerpc/kernel/vdso/vdso64.lds.S | 4 +-
+ arch/powerpc/kernel/vdso/vgettimeofday.c | 14 +-
+ arch/powerpc/kexec/core.c | 100 +-
+ arch/powerpc/kexec/file_load_64.c | 259 +---
+ arch/powerpc/mm/Makefile | 2 +-
+ arch/powerpc/mm/hugetlbpage.c | 1 +
+ arch/powerpc/mm/init_64.c | 4 +
+ arch/powerpc/mm/ioremap.c | 4 +-
+ arch/powerpc/mm/mem.c | 20 +-
+ arch/powerpc/platforms/ps3/spu.c | 4 +-
+ arch/riscv/Kconfig | 5 +-
+ arch/riscv/include/asm/bug.h | 38 +-
+ arch/riscv/include/asm/io.h | 2 +-
+ arch/riscv/include/asm/pgalloc.h | 26 +-
+ arch/riscv/include/asm/tlbflush.h | 3 +-
+ arch/riscv/include/asm/vdso.h | 2 +-
+ .../include/asm/vdso/{time_data.h => arch_data.h} | 8 +-
+ arch/riscv/include/asm/vdso/gettimeofday.h | 14 +-
+ arch/riscv/include/asm/vdso/vsyscall.h | 9 -
+ arch/riscv/kernel/acpi.c | 2 +-
+ arch/riscv/kernel/sys_hwprobe.c | 3 +-
+ arch/riscv/kernel/vdso.c | 90 +-
+ arch/riscv/kernel/vdso/Makefile | 2 +-
+ arch/riscv/kernel/vdso/hwprobe.c | 6 +-
+ arch/riscv/kernel/vdso/vdso.lds.S | 7 +-
+ arch/riscv/mm/Makefile | 2 +-
+ arch/riscv/mm/init.c | 11 +-
+ arch/riscv/mm/tlbflush.c | 3 +-
+ arch/s390/Kconfig | 4 +-
+ arch/s390/configs/debug_defconfig | 2 +-
+ arch/s390/configs/defconfig | 2 +-
+ arch/s390/include/asm/bug.h | 17 +-
+ arch/s390/include/asm/io.h | 4 +-
+ arch/s390/include/asm/vdso.h | 4 +-
+ arch/s390/include/asm/vdso/getrandom.h | 12 -
+ arch/s390/include/asm/vdso/gettimeofday.h | 15 +-
+ arch/s390/include/asm/vdso/vsyscall.h | 20 -
+ arch/s390/kernel/time.c | 6 +-
+ arch/s390/kernel/vdso.c | 99 +-
+ arch/s390/kernel/vdso32/Makefile | 2 +-
+ arch/s390/kernel/vdso32/vdso32.lds.S | 7 +-
+ arch/s390/kernel/vdso64/Makefile | 2 +-
+ arch/s390/kernel/vdso64/vdso64.lds.S | 8 +-
+ arch/s390/mm/Makefile | 2 +-
+ arch/s390/mm/init.c | 33 +-
+ arch/s390/pci/pci.c | 4 +-
+ arch/sh/boards/mach-landisk/setup.c | 2 +-
+ arch/sh/boards/mach-lboxre2/setup.c | 2 +-
+ arch/sh/boards/mach-sh03/setup.c | 2 +-
+ arch/sh/include/asm/bug.h | 28 +-
+ arch/sh/include/asm/io.h | 2 +-
+ arch/sh/include/asm/pgalloc.h | 7 +-
+ arch/sh/mm/init.c | 10 -
+ arch/sh/mm/ioremap.c | 3 +-
+ arch/sparc/include/asm/pgtable_64.h | 2 -
+ arch/sparc/mm/init_32.c | 31 +-
+ arch/sparc/mm/init_64.c | 4 -
+ arch/sparc/mm/tlb.c | 5 +-
+ arch/um/include/asm/pgalloc.h | 21 +-
+ arch/um/include/shared/mem_user.h | 1 -
+ arch/um/kernel/mem.c | 9 +-
+ arch/um/kernel/physmem.c | 12 -
+ arch/um/kernel/um_arch.c | 2 -
+ arch/x86/Kconfig | 7 +-
+ arch/x86/Kconfig.debug | 2 +-
+ arch/x86/entry/vdso/Makefile | 2 +-
+ arch/x86/entry/vdso/vdso-layout.lds.S | 10 +-
+ arch/x86/entry/vdso/vdso2c.c | 21 -
+ arch/x86/entry/vdso/vdso2c.h | 20 -
+ arch/x86/entry/vdso/vma.c | 130 +-
+ arch/x86/include/asm/bug.h | 21 +-
+ arch/x86/include/asm/highmem.h | 3 -
+ arch/x86/include/asm/io.h | 2 +-
+ arch/x86/include/asm/numa.h | 4 -
+ arch/x86/include/asm/numa_32.h | 13 -
+ arch/x86/include/asm/percpu.h | 33 +-
+ arch/x86/include/asm/tlbflush.h | 3 +-
+ arch/x86/include/asm/vdso.h | 6 -
+ arch/x86/include/asm/vdso/getrandom.h | 10 -
+ arch/x86/include/asm/vdso/gettimeofday.h | 25 +-
+ arch/x86/include/asm/vdso/vsyscall.h | 23 +-
+ arch/x86/include/asm/xen/hypervisor.h | 15 +-
+ arch/x86/kernel/cpu/mce/severity.c | 11 +-
+ arch/x86/kernel/kgdb.c | 2 +-
+ arch/x86/kernel/paravirt.c | 17 +-
+ arch/x86/kernel/setup.c | 12 +-
+ arch/x86/mm/Makefile | 4 +-
+ arch/x86/mm/highmem_32.c | 34 -
+ arch/x86/mm/init_32.c | 41 +-
+ arch/x86/mm/init_64.c | 25 +-
+ arch/x86/mm/ioremap.c | 4 +-
+ arch/x86/mm/numa_32.c | 3 -
+ arch/x86/mm/pgtable.c | 27 +-
+ arch/x86/xen/enlighten_pv.c | 1 -
+ arch/xtensa/include/asm/io.h | 6 +-
+ arch/xtensa/mm/init.c | 66 +-
+ arch/xtensa/mm/ioremap.c | 4 +-
+ .../accel/habanalabs/common/command_submission.c | 2 +-
+ drivers/accel/habanalabs/common/debugfs.c | 2 +-
+ drivers/accel/habanalabs/common/device.c | 2 +-
+ drivers/accel/habanalabs/common/habanalabs_drv.c | 2 +-
+ drivers/ata/libata-zpodd.c | 3 +-
+ drivers/base/memory.c | 29 +-
+ drivers/block/zram/backend_zstd.c | 11 +-
+ drivers/block/zram/zcomp.c | 48 +-
+ drivers/block/zram/zcomp.h | 8 +-
+ drivers/block/zram/zram_drv.c | 330 ++---
+ drivers/block/zram/zram_drv.h | 17 +-
+ drivers/char/random.c | 6 +-
+ drivers/dax/device.c | 24 +-
+ drivers/gpu/drm/nouveau/nouveau_dmem.c | 3 +-
+ drivers/gpu/drm/nouveau/nouveau_svm.c | 5 +-
+ drivers/gpu/drm/tests/drm_rect_test.c | 16 +
+ drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 2 +-
+ drivers/nvdimm/pmem.c | 4 +-
+ drivers/nvme/host/core.c | 6 +-
+ drivers/pci/p2pdma.c | 19 +-
+ drivers/platform/chrome/cros_ec_lpc.c | 2 +-
+ drivers/platform/x86/amd/pmf/acpi.c | 2 +-
+ drivers/platform/x86/thinkpad_acpi.c | 2 +-
+ drivers/power/supply/da9030_battery.c | 3 +-
+ drivers/regulator/core.c | 4 +-
+ drivers/regulator/irq_helpers.c | 16 +-
+ drivers/s390/block/Kconfig | 12 +-
+ drivers/s390/block/dcssblk.c | 27 +-
+ drivers/scsi/lpfc/lpfc.h | 3 +-
+ drivers/scsi/lpfc/lpfc_els.c | 11 +-
+ drivers/scsi/lpfc/lpfc_hbadisc.c | 2 +-
+ drivers/scsi/lpfc/lpfc_init.c | 10 +-
+ drivers/scsi/lpfc/lpfc_scsi.c | 12 +-
+ drivers/scsi/lpfc/lpfc_sli.c | 41 +-
+ drivers/scsi/lpfc/lpfc_vport.c | 2 +-
+ drivers/spi/spi-fsl-lpspi.c | 2 +-
+ drivers/spi/spi-imx.c | 2 +-
+ drivers/thermal/thermal_core.c | 17 +-
+ drivers/thermal/thermal_core.h | 1 +
+ drivers/thermal/thermal_of.c | 7 +-
+ drivers/video/fbdev/core/fb_defio.c | 43 +-
+ fs/Kconfig | 1 +
+ fs/bcachefs/util.h | 2 +-
+ fs/btrfs/disk-io.c | 6 +-
+ fs/buffer.c | 14 +-
+ fs/dax.c | 364 +++--
+ fs/ext4/inline.c | 2 +-
+ fs/ext4/inode.c | 18 +-
+ fs/ext4/move_extent.c | 2 +-
+ fs/fuse/dax.c | 30 +-
+ fs/fuse/dir.c | 2 +-
+ fs/fuse/file.c | 4 +-
+ fs/fuse/virtio_fs.c | 3 +-
+ fs/hugetlbfs/inode.c | 28 +-
+ fs/iomap/buffered-io.c | 2 +-
+ fs/ocfs2/alloc.c | 8 +
+ fs/ocfs2/aops.c | 21 +-
+ fs/ocfs2/file.c | 2 +-
+ fs/ocfs2/quota_global.c | 2 +-
+ fs/proc/internal.h | 43 +
+ fs/proc/page.c | 11 +-
+ fs/proc/task_mmu.c | 56 +-
+ fs/udf/file.c | 2 +-
+ fs/xfs/xfs_icache.c | 2 +-
+ fs/xfs/xfs_inode.c | 31 +-
+ fs/xfs/xfs_inode.h | 2 +-
+ fs/xfs/xfs_super.c | 12 +
+ fs/xfs/xfs_sysfs.c | 8 +-
+ include/asm-generic/bug.h | 16 +-
+ include/asm-generic/io.h | 4 +-
+ include/asm-generic/memory_model.h | 5 +-
+ include/asm-generic/percpu.h | 39 +-
+ include/asm-generic/tlb.h | 94 +-
+ include/asm-generic/vdso/vsyscall.h | 27 +-
+ include/kunit/bug.h | 56 +
+ include/kunit/test.h | 1 +
+ include/linux/align.h | 10 +-
+ include/linux/bit_spinlock.h | 8 +-
+ include/linux/bootmem_info.h | 7 +
+ include/linux/buffer_head.h | 2 +-
+ include/linux/bug.h | 13 +
+ include/linux/ceph/libceph.h | 12 +-
+ include/linux/cma.h | 9 +
+ include/linux/compaction.h | 5 +-
+ include/linux/compiler-clang.h | 8 +
+ include/linux/compiler-gcc.h | 8 +
+ include/linux/compiler.h | 20 +
+ include/linux/compiler_types.h | 2 +-
+ include/linux/cpu.h | 2 +-
+ include/linux/cpuhotplug.h | 1 -
+ include/linux/crash_reserve.h | 11 +-
+ include/linux/damon.h | 116 +-
+ include/linux/dax.h | 28 +
+ include/linux/fb.h | 1 +
+ include/linux/folio_queue.h | 12 +-
+ include/linux/huge_mm.h | 44 +-
+ include/linux/hugetlb.h | 35 +
+ include/linux/interval_tree_generic.h | 8 +-
+ include/linux/kexec.h | 9 +
+ include/linux/list_nulls.h | 1 +
+ include/linux/memblock.h | 1 -
+ include/linux/memcontrol.h | 32 +-
+ include/linux/memory.h | 2 +-
+ include/linux/memremap.h | 17 +-
+ include/linux/migrate.h | 4 +-
+ include/linux/min_heap.h | 12 +-
+ include/linux/mm.h | 343 +++--
+ include/linux/mm_types.h | 203 ++-
+ include/linux/mmap_lock.h | 6 -
+ include/linux/mmu_notifier.h | 8 +-
+ include/linux/mmzone.h | 53 +-
+ include/linux/mutex.h | 2 +
+ include/linux/page-flags.h | 10 +-
+ include/linux/page_counter.h | 9 +-
+ include/linux/page_ext.h | 93 ++
+ include/linux/pagemap.h | 25 -
+ include/linux/part_stat.h | 2 +-
+ include/linux/percpu-defs.h | 6 +-
+ include/linux/pgalloc_tag.h | 75 +-
+ include/linux/pgtable.h | 14 +-
+ include/linux/rcuwait.h | 13 +-
+ include/linux/reboot.h | 36 +-
+ include/linux/refcount.h | 125 ++
+ include/linux/rhashtable.h | 6 +-
+ include/linux/rmap.h | 293 +++-
+ include/linux/sched.h | 4 +
+ include/linux/slab.h | 15 +-
+ include/linux/swap.h | 41 +-
+ include/linux/swap_slots.h | 28 -
+ include/linux/swapops.h | 27 +-
+ include/linux/time_namespace.h | 2 -
+ include/linux/types.h | 13 +
+ include/linux/user_namespace.h | 15 +-
+ include/linux/vdso_datastore.h | 10 +
+ include/linux/vmstat.h | 2 +-
+ include/linux/writeback.h | 24 +
+ include/linux/xarray.h | 13 +
+ include/linux/zpool.h | 47 +-
+ include/linux/zsmalloc.h | 29 +-
+ include/linux/zswap.h | 6 +-
+ include/net/snmp.h | 5 +-
+ include/trace/events/kmem.h | 78 +
+ include/trace/events/writeback.h | 33 +-
+ include/uapi/linux/capability.h | 1 +
+ include/vdso/align.h | 15 +
+ include/vdso/datapage.h | 72 +-
+ include/vdso/helpers.h | 8 +-
+ init/Kconfig | 22 +
+ kernel/configs/debug.config | 1 -
+ kernel/crash_reserve.c | 9 +-
+ kernel/events/uprobes.c | 16 +-
+ kernel/fork.c | 182 ++-
+ kernel/hung_task.c | 38 +
+ kernel/kexec_core.c | 10 +
+ kernel/kexec_elf.c | 2 +-
+ kernel/kexec_file.c | 12 +
+ kernel/locking/mutex.c | 14 +
+ kernel/locking/percpu-rwsem.c | 2 +-
+ kernel/reboot.c | 142 +-
+ kernel/resource.c | 105 +-
+ kernel/signal.c | 7 +-
+ kernel/time/namespace.c | 12 +-
+ kernel/time/vsyscall.c | 19 +-
+ kernel/ucount.c | 97 +-
+ kernel/watchdog_perf.c | 6 +-
+ lib/Kconfig.debug | 11 +
+ lib/Makefile | 2 +-
+ lib/alloc_tag.c | 6 +-
+ lib/bug.c | 51 +-
+ lib/interval_tree.c | 12 +-
+ lib/interval_tree_test.c | 237 +++-
+ lib/kunit/Kconfig | 9 +
+ lib/kunit/Makefile | 7 +-
+ lib/kunit/backtrace-suppression-test.c | 104 ++
+ lib/kunit/bug.c | 42 +
+ lib/maple_tree.c | 10 +-
+ lib/min_heap.c | 4 +-
+ lib/plist.c | 12 +
+ lib/rbtree_test.c | 30 +-
+ lib/test_hmm.c | 72 +-
+ lib/test_xarray.c | 52 +
+ lib/vdso/Kconfig | 5 +
+ lib/vdso/Makefile | 19 +-
+ lib/vdso/Makefile.include | 18 +
+ lib/vdso/datastore.c | 130 ++
+ lib/vdso/getrandom.c | 8 +-
+ lib/vdso/gettimeofday.c | 74 +-
+ lib/xarray.c | 157 +-
+ lib/zlib_deflate/deflate.c | 6 +-
+ mm/Kconfig | 74 +-
+ mm/Kconfig.debug | 11 +-
+ mm/Makefile | 9 +-
+ mm/bootmem_info.c | 4 +-
+ mm/cma.c | 743 ++++++++--
+ mm/cma.h | 46 +-
+ mm/cma_debug.c | 61 +-
+ mm/cma_sysfs.c | 20 +
+ mm/compaction.c | 105 +-
+ mm/damon/core.c | 296 +++-
+ mm/damon/ops-common.c | 25 +-
+ mm/damon/paddr.c | 83 +-
+ mm/damon/sysfs-schemes.c | 178 ++-
+ mm/damon/sysfs.c | 357 +++--
+ mm/damon/tests/core-kunit.h | 6 +-
+ mm/damon/vaddr.c | 1 -
+ mm/debug.c | 46 +-
+ mm/filemap.c | 50 +-
+ mm/gup.c | 29 +-
+ mm/hmm.c | 2 +-
+ mm/huge_memory.c | 1115 ++++++++++-----
+ mm/hugetlb.c | 663 +++++----
+ mm/hugetlb_cgroup.c | 31 +-
+ mm/hugetlb_cma.c | 275 ++++
+ mm/hugetlb_cma.h | 57 +
+ mm/hugetlb_vmemmap.c | 199 ++-
+ mm/hugetlb_vmemmap.h | 23 +-
+ mm/init-mm.c | 1 +
+ mm/internal.h | 93 +-
+ mm/ioremap.c | 4 +-
+ mm/khugepaged.c | 8 +-
+ mm/kmemleak.c | 54 +-
+ mm/ksm.c | 9 +-
+ mm/list_lru.c | 15 +-
+ mm/madvise.c | 229 ++-
+ mm/memblock.c | 3 +-
+ mm/memcontrol-v1.c | 102 +-
+ mm/memcontrol-v1.h | 56 +-
+ mm/memcontrol.c | 335 ++---
+ mm/memfd.c | 4 +-
+ mm/memory-failure.c | 27 +-
+ mm/memory.c | 383 +++--
+ mm/mempolicy.c | 8 +-
+ mm/memremap.c | 60 +-
+ mm/migrate.c | 11 +-
+ mm/migrate_device.c | 18 +-
+ mm/mincore.c | 2 +-
+ mm/mlock.c | 2 +
+ mm/mm_init.c | 178 ++-
+ mm/mmap.c | 10 +-
+ mm/mmu_gather.c | 12 +-
+ mm/mprotect.c | 16 +-
+ mm/mremap.c | 1494 +++++++++++++-------
+ mm/nommu.c | 10 +-
+ mm/oom_kill.c | 2 +-
+ mm/page-writeback.c | 38 +-
+ mm/page_alloc.c | 758 ++++++----
+ mm/page_counter.c | 4 +-
+ mm/page_ext.c | 13 +
+ mm/page_idle.c | 9 +-
+ mm/page_io.c | 6 +-
+ mm/page_owner.c | 88 +-
+ mm/page_table_check.c | 44 +-
+ mm/page_vma_mapped.c | 16 +-
+ mm/percpu.c | 8 +-
+ mm/rmap.c | 937 +++++++-----
+ mm/shmem.c | 164 +--
+ mm/shrinker_debug.c | 8 +-
+ mm/slub.c | 51 +-
+ mm/sparse-vmemmap.c | 168 ++-
+ mm/sparse.c | 92 +-
+ mm/swap.c | 2 -
+ mm/swap.h | 6 -
+ mm/swap_cgroup.c | 3 +-
+ mm/swap_slots.c | 295 ----
+ mm/swap_state.c | 91 +-
+ mm/swapfile.c | 432 +++---
+ mm/truncate.c | 53 +-
+ mm/userfaultfd.c | 38 +-
+ mm/vma.c | 356 ++---
+ mm/vma.h | 101 +-
+ mm/vmalloc.c | 20 +-
+ mm/vmscan.c | 210 +--
+ mm/vmstat.c | 1 +
+ mm/z3fold.c | 1447 -------------------
+ mm/zbud.c | 455 ------
+ mm/zpool.c | 99 +-
+ mm/zsmalloc.c | 504 +++----
+ mm/zswap.c | 164 ++-
+ net/ceph/ceph_common.c | 18 +-
+ net/ceph/osd_client.c | 3 +-
+ net/mpls/internal.h | 4 +-
+ samples/Kconfig | 9 +
+ samples/Makefile | 1 +
+ samples/damon/Kconfig | 4 +-
+ samples/hung_task/Makefile | 2 +
+ samples/hung_task/hung_task_mutex.c | 66 +
+ samples/kmemleak/kmemleak-test.c | 36 +-
+ scripts/checkpatch.pl | 101 +-
+ scripts/coccinelle/misc/secs_to_jiffies.cocci | 10 +
+ scripts/extract-fwblobs | 30 +
+ scripts/gdb/linux/cpus.py | 22 +-
+ scripts/gdb/linux/symbols.py | 44 +-
+ scripts/gdb/linux/utils.py | 35 +
+ scripts/get_maintainer.pl | 49 +-
+ security/Kconfig | 21 +
+ sound/pci/ac97/ac97_codec.c | 3 +-
+ tools/include/asm/timex.h | 13 +
+ tools/include/linux/bitmap.h | 21 +
+ tools/include/linux/container_of.h | 18 +
+ tools/include/linux/kernel.h | 14 +-
+ tools/include/linux/math64.h | 5 +
+ tools/include/linux/moduleparam.h | 7 +
+ tools/include/linux/prandom.h | 51 +
+ tools/include/linux/refcount.h | 5 +
+ tools/include/linux/slab.h | 1 +
+ tools/include/linux/types.h | 2 +
+ tools/lib/bitmap.c | 20 +
+ tools/lib/slab.c | 16 +
+ tools/testing/radix-tree/Makefile | 1 +
+ tools/testing/rbtree/Makefile | 33 +
+ tools/testing/rbtree/interval_tree_test.c | 58 +
+ tools/testing/rbtree/rbtree_test.c | 48 +
+ tools/testing/rbtree/test.h | 4 +
+ tools/testing/selftests/Makefile | 1 +
+ tools/testing/selftests/mm/.gitignore | 2 +-
+ tools/testing/selftests/mm/Makefile | 2 +-
+ tools/testing/selftests/mm/cow.c | 2 +-
+ .../mm/{guard-pages.c => guard-regions.c} | 968 +++++++++++--
+ tools/testing/selftests/mm/gup_longterm.c | 45 +-
+ tools/testing/selftests/mm/map_populate.c | 7 +
+ tools/testing/selftests/mm/mlock-random-test.c | 4 +-
+ tools/testing/selftests/mm/mlock2.h | 8 +-
+ tools/testing/selftests/mm/run_vmtests.sh | 95 +-
+ tools/testing/selftests/mm/split_huge_page_test.c | 95 +-
+ tools/testing/selftests/mm/thuge-gen.c | 4 +-
+ tools/testing/selftests/mm/uffd-common.c | 12 +-
+ tools/testing/selftests/mm/uffd-common.h | 2 +-
+ tools/testing/selftests/mm/uffd-stress.c | 42 +-
+ tools/testing/selftests/mm/uffd-unit-tests.c | 2 +-
+ tools/testing/selftests/mm/uffd-wp-mremap.c | 5 +-
+ tools/testing/selftests/mm/vm_util.h | 1 +
+ .../selftests/mseal_system_mappings/.gitignore | 2 +
+ .../selftests/mseal_system_mappings/Makefile | 6 +
+ .../testing/selftests/mseal_system_mappings/config | 1 +
+ .../mseal_system_mappings/sysmap_is_sealed.c | 119 ++
+ tools/testing/selftests/x86/test_mremap_vdso.c | 43 +
+ tools/testing/shared/interval_tree-shim.c | 5 +
+ tools/testing/shared/linux/interval_tree.h | 7 +
+ tools/testing/shared/linux/interval_tree_generic.h | 2 +
+ tools/testing/shared/linux/rbtree.h | 8 +
+ tools/testing/shared/linux/rbtree_augmented.h | 7 +
+ tools/testing/shared/linux/rbtree_types.h | 8 +
+ tools/testing/shared/rbtree-shim.c | 6 +
+ tools/testing/vma/linux/atomic.h | 5 +
+ tools/testing/vma/vma.c | 105 +-
+ tools/testing/vma/vma_internal.h | 131 +-
+ 597 files changed, 15546 insertions(+), 11102 deletions(-)
+ delete mode 100644 Documentation/mm/z3fold.rst
+ delete mode 100644 Documentation/translations/zh_CN/mm/z3fold.rst
+ create mode 100644 arch/loongarch/include/asm/vdso/arch_data.h
+ create mode 100644 arch/powerpc/include/asm/crash_reserve.h
+ create mode 100644 arch/powerpc/include/asm/vdso/arch_data.h
+ rename arch/riscv/include/asm/vdso/{time_data.h => arch_data.h} (71%)
+ delete mode 100644 arch/x86/include/asm/numa_32.h
+ delete mode 100644 arch/x86/mm/highmem_32.c
+ create mode 100644 include/kunit/bug.h
+ delete mode 100644 include/linux/swap_slots.h
+ create mode 100644 include/linux/vdso_datastore.h
+ create mode 100644 include/vdso/align.h
+ create mode 100644 lib/kunit/backtrace-suppression-test.c
+ create mode 100644 lib/kunit/bug.c
+ create mode 100644 lib/vdso/Makefile.include
+ create mode 100644 lib/vdso/datastore.c
+ create mode 100644 mm/hugetlb_cma.c
+ create mode 100644 mm/hugetlb_cma.h
+ delete mode 100644 mm/swap_slots.c
+ delete mode 100644 mm/z3fold.c
+ delete mode 100644 mm/zbud.c
+ create mode 100644 samples/hung_task/Makefile
+ create mode 100644 samples/hung_task/hung_task_mutex.c
+ create mode 100755 scripts/extract-fwblobs
+ create mode 100644 tools/include/asm/timex.h
+ create mode 100644 tools/include/linux/container_of.h
+ create mode 100644 tools/include/linux/moduleparam.h
+ create mode 100644 tools/include/linux/prandom.h
+ create mode 100644 tools/testing/rbtree/Makefile
+ create mode 100644 tools/testing/rbtree/interval_tree_test.c
+ create mode 100644 tools/testing/rbtree/rbtree_test.c
+ create mode 100644 tools/testing/rbtree/test.h
+ rename tools/testing/selftests/mm/{guard-pages.c => guard-regions.c} (56%)
+ create mode 100644 tools/testing/selftests/mseal_system_mappings/.gitignore
+ create mode 100644 tools/testing/selftests/mseal_system_mappings/Makefile
+ create mode 100644 tools/testing/selftests/mseal_system_mappings/config
+ create mode 100644 tools/testing/selftests/mseal_system_mappings/sysmap_is_sealed.c
+ create mode 100644 tools/testing/shared/interval_tree-shim.c
+ create mode 100644 tools/testing/shared/linux/interval_tree.h
+ create mode 100644 tools/testing/shared/linux/interval_tree_generic.h
+ create mode 100644 tools/testing/shared/linux/rbtree.h
+ create mode 100644 tools/testing/shared/linux/rbtree_augmented.h
+ create mode 100644 tools/testing/shared/linux/rbtree_types.h
+ create mode 100644 tools/testing/shared/rbtree-shim.c
+Merging kbuild/for-next (e3de46f775ec rust: kbuild: skip `--remap-path-prefix` for `rustdoc`)
+$ 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 MAINTAINERS
+Auto-merging arch/Kconfig
+Auto-merging arch/mips/Kconfig
+Auto-merging arch/riscv/Kconfig
+Auto-merging arch/s390/Kconfig
+Auto-merging arch/x86/Kconfig
+Auto-merging lib/Kconfig.debug
+Auto-merging scripts/checkpatch.pl
+Merge made by the 'ort' strategy.
+ .gitignore | 1 +
+ Documentation/dev-tools/checkpatch.rst | 18 --
+ Documentation/kbuild/bash-completion.rst | 65 ++++
+ Documentation/kbuild/index.rst | 2 +
+ Documentation/kbuild/kconfig-language.rst | 29 +-
+ Documentation/kbuild/makefiles.rst | 17 +-
+ Documentation/kbuild/modules.rst | 2 +-
+ Documentation/kbuild/reproducible-builds.rst | 17 -
+ MAINTAINERS | 1 +
+ Makefile | 23 +-
+ arch/Kconfig | 7 +
+ arch/arm64/Makefile | 2 +-
+ arch/mips/Kconfig | 1 +
+ arch/mips/Makefile | 4 -
+ arch/mips/Makefile.postlink | 2 +-
+ arch/riscv/Kconfig | 1 +
+ arch/riscv/Makefile | 2 +-
+ arch/riscv/Makefile.postlink | 11 +-
+ arch/riscv/boot/Makefile | 5 +-
+ arch/s390/Kconfig | 1 +
+ arch/s390/Makefile | 2 +-
+ arch/s390/Makefile.postlink | 4 +-
+ arch/x86/Kconfig | 1 +
+ arch/x86/Makefile | 6 -
+ arch/x86/Makefile.postlink | 40 ---
+ arch/x86/boot/Makefile | 2 +-
+ arch/x86/boot/compressed/Makefile | 11 +-
+ kernel/gen_kheaders.sh | 1 -
+ lib/Kconfig.debug | 7 +-
+ rust/Makefile | 8 +-
+ scripts/Makefile.build | 4 -
+ scripts/Makefile.compiler | 4 +
+ scripts/Makefile.extrawarn | 3 -
+ scripts/Makefile.lib | 8 -
+ scripts/Makefile.vmlinux | 34 +-
+ scripts/bash-completion/make | 451 +++++++++++++++++++++++++++
+ scripts/checkpatch.pl | 14 -
+ scripts/clang-tools/gen_compile_commands.py | 8 +-
+ scripts/config | 26 +-
+ scripts/gendwarfksyms/die.c | 2 +-
+ scripts/gendwarfksyms/dwarf.c | 154 ++++-----
+ scripts/gendwarfksyms/gendwarfksyms.h | 2 +
+ scripts/gendwarfksyms/types.c | 2 +-
+ scripts/generate_builtin_ranges.awk | 5 +
+ scripts/genksyms/lex.l | 6 +-
+ scripts/kconfig/confdata.c | 19 +-
+ scripts/kconfig/symbol.c | 2 +-
+ scripts/link-vmlinux.sh | 20 +-
+ scripts/mod/modpost.c | 41 ++-
+ scripts/mod/modpost.h | 1 +
+ scripts/mod/sumversion.c | 17 +-
+ scripts/package/PKGBUILD | 6 +-
+ scripts/package/debian/rules | 4 +
+ scripts/package/mkdebian | 31 +-
+ scripts/show_delta | 2 +-
+ scripts/tracing/draw_functrace.py | 2 +-
+ 56 files changed, 828 insertions(+), 333 deletions(-)
+ create mode 100644 Documentation/kbuild/bash-completion.rst
+ delete mode 100644 arch/x86/Makefile.postlink
+ create mode 100644 scripts/bash-completion/make
+Merging clang-format/clang-format (c147f663b6a5 clang-format: Update with v6.11-rc1'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 (02ba09c8ab94 perf test stat_all_pmu.sh: Correctly check 'perf stat' result)
+$ 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
+Auto-merging tools/perf/Makefile.perf
+Merge made by the 'ort' strategy.
+ tools/arch/x86/lib/insn.c | 2 +-
+ tools/build/feature/test-backtrace.c | 2 +-
+ tools/build/feature/test-bpf.c | 2 +-
+ tools/build/feature/test-glibc.c | 2 +-
+ tools/build/feature/test-libdebuginfod.c | 2 +-
+ tools/build/feature/test-libdw.c | 2 +-
+ tools/build/feature/test-libelf-gelf_getnote.c | 2 +-
+ tools/build/feature/test-libelf.c | 2 +-
+ tools/build/feature/test-lzma.c | 2 +-
+ tools/lib/api/Makefile | 2 +-
+ tools/lib/api/io_dir.h | 105 +
+ tools/lib/perf/cpumap.c | 8 +-
+ tools/lib/perf/include/perf/cpumap.h | 3 +-
+ .../callchain-overhead-calculation.txt | 5 +-
+ .../Documentation/cpu-and-latency-overheads.txt | 85 +
+ tools/perf/Documentation/intel-hybrid.txt | 12 +-
+ tools/perf/Documentation/perf-annotate.txt | 4 +
+ tools/perf/Documentation/perf-list.txt | 4 +-
+ tools/perf/Documentation/perf-lock.txt | 5 +-
+ tools/perf/Documentation/perf-record.txt | 4 +
+ tools/perf/Documentation/perf-report.txt | 54 +-
+ tools/perf/Documentation/perf-script.txt | 23 +-
+ tools/perf/Documentation/perf-trace.txt | 4 +
+ tools/perf/Documentation/tips.txt | 4 +
+ tools/perf/Makefile.config | 10 +-
+ tools/perf/Makefile.perf | 2 +-
+ tools/perf/arch/arm/tests/dwarf-unwind.c | 2 +-
+ tools/perf/arch/arm/util/unwind-libdw.c | 2 +-
+ tools/perf/arch/arm64/tests/dwarf-unwind.c | 2 +-
+ tools/perf/arch/arm64/util/arm-spe.c | 21 +
+ tools/perf/arch/arm64/util/unwind-libdw.c | 2 +-
+ tools/perf/arch/csky/util/unwind-libdw.c | 2 +-
+ tools/perf/arch/loongarch/util/unwind-libdw.c | 2 +-
+ tools/perf/arch/powerpc/tests/dwarf-unwind.c | 2 +-
+ tools/perf/arch/powerpc/util/unwind-libdw.c | 2 +-
+ tools/perf/arch/riscv/util/unwind-libdw.c | 2 +-
+ tools/perf/arch/s390/util/unwind-libdw.c | 2 +-
+ tools/perf/arch/x86/annotate/instructions.c | 22 +-
+ tools/perf/arch/x86/tests/dwarf-unwind.c | 2 +-
+ tools/perf/arch/x86/util/evlist.c | 42 +-
+ tools/perf/arch/x86/util/iostat.c | 2 +-
+ tools/perf/arch/x86/util/topdown.c | 2 +-
+ tools/perf/arch/x86/util/unwind-libdw.c | 2 +-
+ tools/perf/bench/syscall.c | 22 +-
+ tools/perf/builtin-annotate.c | 19 +-
+ tools/perf/builtin-c2c.c | 4 +-
+ tools/perf/builtin-ftrace.c | 71 +-
+ tools/perf/builtin-list.c | 11 +-
+ tools/perf/builtin-lock.c | 56 +-
+ tools/perf/builtin-mem.c | 12 +-
+ tools/perf/builtin-record.c | 27 +-
+ tools/perf/builtin-report.c | 72 +-
+ tools/perf/builtin-script.c | 55 +-
+ tools/perf/builtin-stat.c | 2 +-
+ tools/perf/builtin-top.c | 13 +-
+ tools/perf/builtin-trace.c | 255 +-
+ .../pmu-events/arch/arm64/arm/neoverse-n3/bus.json | 18 +
+ .../arch/arm64/arm/neoverse-n3/exception.json | 62 +
+ .../arch/arm64/arm/neoverse-n3/fp_operation.json | 22 +
+ .../arch/arm64/arm/neoverse-n3/general.json | 10 +
+ .../arch/arm64/arm/neoverse-n3/l1d_cache.json | 50 +
+ .../arch/arm64/arm/neoverse-n3/l1i_cache.json | 14 +
+ .../arch/arm64/arm/neoverse-n3/l2_cache.json | 78 +
+ .../arch/arm64/arm/neoverse-n3/l3_cache.json | 26 +
+ .../arch/arm64/arm/neoverse-n3/ll_cache.json | 22 +
+ .../arch/arm64/arm/neoverse-n3/memory.json | 54 +
+ .../arch/arm64/arm/neoverse-n3/metrics.json | 457 ++++
+ .../arch/arm64/arm/neoverse-n3/retired.json | 90 +
+ .../pmu-events/arch/arm64/arm/neoverse-n3/spe.json | 42 +
+ .../arch/arm64/arm/neoverse-n3/spec_operation.json | 90 +
+ .../arch/arm64/arm/neoverse-n3/stall.json | 86 +
+ .../pmu-events/arch/arm64/arm/neoverse-n3/sve.json | 50 +
+ .../pmu-events/arch/arm64/arm/neoverse-n3/tlb.json | 74 +
+ .../arch/arm64/arm/neoverse-n3/trace.json | 42 +
+ .../arch/arm64/arm/neoverse-v3/brbe.json | 6 +
+ .../pmu-events/arch/arm64/arm/neoverse-v3/bus.json | 18 +
+ .../arch/arm64/arm/neoverse-v3/exception.json | 62 +
+ .../arch/arm64/arm/neoverse-v3/fp_operation.json | 22 +
+ .../arch/arm64/arm/neoverse-v3/general.json | 40 +
+ .../arch/arm64/arm/neoverse-v3/l1d_cache.json | 74 +
+ .../arch/arm64/arm/neoverse-v3/l1i_cache.json | 62 +
+ .../arch/arm64/arm/neoverse-v3/l2_cache.json | 78 +
+ .../arch/arm64/arm/neoverse-v3/ll_cache.json | 10 +
+ .../arch/arm64/arm/neoverse-v3/memory.json | 58 +
+ .../arch/arm64/arm/neoverse-v3/metrics.json | 457 ++++
+ .../arch/arm64/arm/neoverse-v3/retired.json | 98 +
+ .../pmu-events/arch/arm64/arm/neoverse-v3/spe.json | 42 +
+ .../arch/arm64/arm/neoverse-v3/spec_operation.json | 126 +
+ .../arch/arm64/arm/neoverse-v3/stall.json | 124 +
+ .../pmu-events/arch/arm64/arm/neoverse-v3/sve.json | 50 +
+ .../pmu-events/arch/arm64/arm/neoverse-v3/tlb.json | 138 +
+ .../arch/arm64/common-and-microarch.json | 310 +++
+ tools/perf/pmu-events/arch/arm64/mapfile.csv | 2 +
+ tools/perf/pmu-events/arch/riscv/mapfile.csv | 6 +-
+ .../bullet-07/cycle-and-instruction-count.json | 12 +
+ .../arch/riscv/sifive/bullet-07/firmware.json | 1 +
+ .../arch/riscv/sifive/bullet-07/instruction.json | 1 +
+ .../arch/riscv/sifive/bullet-07/memory.json | 1 +
+ .../arch/riscv/sifive/bullet-07/microarch.json | 62 +
+ .../arch/riscv/sifive/bullet-07/watchpoint.json | 42 +
+ .../bullet-0d/cycle-and-instruction-count.json | 1 +
+ .../arch/riscv/sifive/bullet-0d/firmware.json | 1 +
+ .../arch/riscv/sifive/bullet-0d/instruction.json | 1 +
+ .../arch/riscv/sifive/bullet-0d/memory.json | 1 +
+ .../arch/riscv/sifive/bullet-0d/microarch.json | 72 +
+ .../arch/riscv/sifive/bullet-0d/watchpoint.json | 1 +
+ .../riscv/sifive/{u74 => bullet}/firmware.json | 0
+ .../arch/riscv/sifive/bullet/instruction.json | 92 +
+ .../arch/riscv/sifive/bullet/memory.json | 32 +
+ .../arch/riscv/sifive/bullet/microarch.json | 57 +
+ .../arch/riscv/sifive/p550/firmware.json | 1 +
+ .../arch/riscv/sifive/p550/instruction.json | 1 +
+ .../pmu-events/arch/riscv/sifive/p550/memory.json | 47 +
+ .../arch/riscv/sifive/p550/microarch.json | 1 +
+ .../sifive/p650/cycle-and-instruction-count.json | 1 +
+ .../arch/riscv/sifive/p650/firmware.json | 1 +
+ .../arch/riscv/sifive/p650/instruction.json | 1 +
+ .../pmu-events/arch/riscv/sifive/p650/memory.json | 57 +
+ .../arch/riscv/sifive/p650/microarch.json | 62 +
+ .../arch/riscv/sifive/p650/watchpoint.json | 1 +
+ .../arch/riscv/sifive/u74/instructions.json | 92 -
+ .../pmu-events/arch/riscv/sifive/u74/memory.json | 32 -
+ .../arch/riscv/sifive/u74/microarch.json | 57 -
+ .../pmu-events/arch/x86/alderlake/adl-metrics.json | 920 ++++---
+ .../perf/pmu-events/arch/x86/alderlake/cache.json | 292 ++-
+ .../arch/x86/alderlake/floating-point.json | 19 +-
+ .../pmu-events/arch/x86/alderlake/frontend.json | 19 -
+ .../perf/pmu-events/arch/x86/alderlake/memory.json | 32 +-
+ .../arch/x86/alderlake/metricgroups.json | 10 +-
+ .../perf/pmu-events/arch/x86/alderlake/other.json | 92 +-
+ .../pmu-events/arch/x86/alderlake/pipeline.json | 127 +-
+ .../arch/x86/alderlake/virtual-memory.json | 33 +
+ .../arch/x86/alderlaken/adln-metrics.json | 85 +-
+ .../perf/pmu-events/arch/x86/alderlaken/cache.json | 227 +-
+ .../arch/x86/alderlaken/floating-point.json | 17 +-
+ .../pmu-events/arch/x86/alderlaken/memory.json | 20 +
+ .../perf/pmu-events/arch/x86/alderlaken/other.json | 81 +-
+ .../pmu-events/arch/x86/alderlaken/pipeline.json | 97 +-
+ .../arch/x86/alderlaken/virtual-memory.json | 30 +
+ .../pmu-events/arch/x86/arrowlake/arl-metrics.json | 2749 ++++++++++++++++++++
+ .../perf/pmu-events/arch/x86/arrowlake/cache.json | 1491 +++++++++++
+ .../arch/x86/arrowlake/floating-point.json | 532 ++++
+ .../pmu-events/arch/x86/arrowlake/frontend.json | 609 +++++
+ .../perf/pmu-events/arch/x86/arrowlake/memory.json | 387 +++
+ .../arch/x86/arrowlake/metricgroups.json | 150 ++
+ .../perf/pmu-events/arch/x86/arrowlake/other.json | 279 ++
+ .../pmu-events/arch/x86/arrowlake/pipeline.json | 2308 ++++++++++++++++
+ .../arch/x86/arrowlake/uncore-cache.json | 20 +
+ .../arch/x86/arrowlake/uncore-interconnect.json | 47 +
+ .../arch/x86/arrowlake/uncore-memory.json | 160 ++
+ .../x86/{haswell => arrowlake}/uncore-other.json | 2 +-
+ .../arch/x86/arrowlake/virtual-memory.json | 522 ++++
+ .../pmu-events/arch/x86/broadwell/bdw-metrics.json | 312 ++-
+ .../perf/pmu-events/arch/x86/broadwell/cache.json | 10 +-
+ .../pmu-events/arch/x86/broadwell/frontend.json | 4 +-
+ .../perf/pmu-events/arch/x86/broadwell/memory.json | 8 +-
+ .../arch/x86/broadwell/metricgroups.json | 5 +
+ .../pmu-events/arch/x86/broadwell/pipeline.json | 10 +-
+ .../arch/x86/broadwellde/bdwde-metrics.json | 256 +-
+ .../pmu-events/arch/x86/broadwellde/cache.json | 10 +-
+ .../pmu-events/arch/x86/broadwellde/frontend.json | 4 +-
+ .../pmu-events/arch/x86/broadwellde/memory.json | 6 +-
+ .../arch/x86/broadwellde/metricgroups.json | 5 +
+ .../pmu-events/arch/x86/broadwellde/pipeline.json | 10 +-
+ .../arch/x86/broadwellde/uncore-cache.json | 28 +-
+ .../arch/x86/broadwellde/uncore-interconnect.json | 16 +-
+ .../arch/x86/broadwellx/bdx-metrics.json | 344 +--
+ .../perf/pmu-events/arch/x86/broadwellx/cache.json | 10 +-
+ .../pmu-events/arch/x86/broadwellx/frontend.json | 4 +-
+ .../pmu-events/arch/x86/broadwellx/memory.json | 6 +-
+ .../arch/x86/broadwellx/metricgroups.json | 5 +
+ .../pmu-events/arch/x86/broadwellx/pipeline.json | 10 +-
+ .../arch/x86/broadwellx/uncore-cache.json | 28 +-
+ .../arch/x86/broadwellx/uncore-interconnect.json | 36 +-
+ .../arch/x86/broadwellx/uncore-memory.json | 1 +
+ .../arch/x86/cascadelakex/clx-metrics.json | 767 +++---
+ .../arch/x86/cascadelakex/metricgroups.json | 9 +-
+ .../arch/x86/cascadelakex/uncore-cache.json | 60 +-
+ .../arch/x86/cascadelakex/uncore-interconnect.json | 11 -
+ .../arch/x86/clearwaterforest/cache.json | 144 +
+ .../arch/x86/clearwaterforest/counter.json | 7 +
+ .../arch/x86/clearwaterforest/frontend.json | 18 +
+ .../arch/x86/clearwaterforest/memory.json | 22 +
+ .../arch/x86/clearwaterforest/other.json | 22 +
+ .../arch/x86/clearwaterforest/pipeline.json | 113 +
+ .../arch/x86/clearwaterforest/virtual-memory.json | 29 +
+ .../pmu-events/arch/x86/emeraldrapids/cache.json | 28 +-
+ .../arch/x86/emeraldrapids/emr-metrics.json | 982 +++----
+ .../arch/x86/emeraldrapids/frontend.json | 19 -
+ .../pmu-events/arch/x86/emeraldrapids/memory.json | 15 +-
+ .../arch/x86/emeraldrapids/metricgroups.json | 10 +-
+ .../arch/x86/emeraldrapids/pipeline.json | 23 -
+ .../arch/x86/emeraldrapids/uncore-io.json | 218 +-
+ .../arch/x86/grandridge/grr-metrics.json | 286 +-
+ .../pmu-events/arch/x86/grandridge/pipeline.json | 3 +-
+ .../arch/x86/grandridge/uncore-cache.json | 4 +-
+ .../arch/x86/grandridge/uncore-interconnect.json | 60 +
+ .../pmu-events/arch/x86/grandridge/uncore-io.json | 214 +-
+ .../arch/x86/grandridge/uncore-memory.json | 2 +-
+ .../pmu-events/arch/x86/graniterapids/cache.json | 130 +-
+ .../pmu-events/arch/x86/graniterapids/counter.json | 24 +-
+ .../arch/x86/graniterapids/frontend.json | 24 +-
+ .../arch/x86/graniterapids/gnr-metrics.json | 2325 +++++++++++++++++
+ .../pmu-events/arch/x86/graniterapids/memory.json | 121 +-
+ .../arch/x86/graniterapids/metricgroups.json | 145 ++
+ .../pmu-events/arch/x86/graniterapids/other.json | 109 +
+ .../arch/x86/graniterapids/pipeline.json | 40 +-
+ .../arch/x86/graniterapids/uncore-cache.json | 48 +-
+ .../arch/x86/graniterapids/uncore-cxl.json | 2 -
+ .../x86/graniterapids/uncore-interconnect.json | 87 +
+ .../arch/x86/graniterapids/uncore-io.json | 280 +-
+ .../arch/x86/graniterapids/uncore-memory.json | 122 +-
+ .../arch/x86/graniterapids/uncore-power.json | 98 +
+ .../pmu-events/arch/x86/haswell/hsw-metrics.json | 260 +-
+ tools/perf/pmu-events/arch/x86/haswell/memory.json | 2 +-
+ .../pmu-events/arch/x86/haswell/metricgroups.json | 5 +
+ .../pmu-events/arch/x86/haswellx/hsx-metrics.json | 296 ++-
+ .../pmu-events/arch/x86/haswellx/metricgroups.json | 5 +
+ .../pmu-events/arch/x86/haswellx/uncore-cache.json | 28 +-
+ .../arch/x86/haswellx/uncore-interconnect.json | 38 +-
+ tools/perf/pmu-events/arch/x86/icelake/cache.json | 34 +-
+ .../perf/pmu-events/arch/x86/icelake/frontend.json | 17 -
+ .../pmu-events/arch/x86/icelake/icl-metrics.json | 849 +++---
+ tools/perf/pmu-events/arch/x86/icelake/memory.json | 13 +-
+ .../pmu-events/arch/x86/icelake/metricgroups.json | 10 +-
+ .../perf/pmu-events/arch/x86/icelake/pipeline.json | 30 +-
+ .../arch/x86/icelake/uncore-interconnect.json | 76 -
+ .../pmu-events/arch/x86/icelake/uncore-other.json | 2 +-
+ .../arch/x86/icelake/virtual-memory.json | 18 +
+ tools/perf/pmu-events/arch/x86/icelakex/cache.json | 41 +-
+ .../pmu-events/arch/x86/icelakex/frontend.json | 17 -
+ .../pmu-events/arch/x86/icelakex/icx-metrics.json | 852 +++---
+ .../perf/pmu-events/arch/x86/icelakex/memory.json | 13 +-
+ .../pmu-events/arch/x86/icelakex/metricgroups.json | 10 +-
+ .../pmu-events/arch/x86/icelakex/pipeline.json | 30 +-
+ .../perf/pmu-events/arch/x86/lunarlake/cache.json | 1288 ++++++++-
+ .../arch/x86/lunarlake/floating-point.json | 484 ++++
+ .../pmu-events/arch/x86/lunarlake/frontend.json | 654 ++++-
+ .../pmu-events/arch/x86/lunarlake/lnl-metrics.json | 2730 +++++++++++++++++++
+ .../perf/pmu-events/arch/x86/lunarlake/memory.json | 264 +-
+ .../arch/x86/lunarlake/metricgroups.json | 150 ++
+ .../perf/pmu-events/arch/x86/lunarlake/other.json | 496 +++-
+ .../pmu-events/arch/x86/lunarlake/pipeline.json | 1743 ++++++++++++-
+ .../arch/x86/lunarlake/uncore-memory.json | 36 +
+ .../arch/x86/lunarlake/virtual-memory.json | 428 +++
+ tools/perf/pmu-events/arch/x86/mapfile.csv | 42 +-
+ .../perf/pmu-events/arch/x86/meteorlake/cache.json | 109 +-
+ .../pmu-events/arch/x86/meteorlake/frontend.json | 30 +-
+ .../pmu-events/arch/x86/meteorlake/memory.json | 22 +-
+ .../arch/x86/meteorlake/metricgroups.json | 10 +-
+ .../arch/x86/meteorlake/mtl-metrics.json | 1058 +++++---
+ .../perf/pmu-events/arch/x86/meteorlake/other.json | 54 +
+ .../pmu-events/arch/x86/meteorlake/pipeline.json | 89 +-
+ .../arch/x86/meteorlake/uncore-other.json | 2 +-
+ .../perf/pmu-events/arch/x86/rocketlake/cache.json | 34 +-
+ .../pmu-events/arch/x86/rocketlake/frontend.json | 17 -
+ .../pmu-events/arch/x86/rocketlake/memory.json | 13 +-
+ .../arch/x86/rocketlake/metricgroups.json | 10 +-
+ .../pmu-events/arch/x86/rocketlake/pipeline.json | 30 +-
+ .../arch/x86/rocketlake/rkl-metrics.json | 849 +++---
+ .../arch/x86/rocketlake/uncore-interconnect.json | 10 -
+ .../arch/x86/rocketlake/uncore-other.json | 2 +-
+ .../arch/x86/rocketlake/virtual-memory.json | 18 +
+ .../pmu-events/arch/x86/sapphirerapids/cache.json | 30 +-
+ .../arch/x86/sapphirerapids/frontend.json | 19 -
+ .../pmu-events/arch/x86/sapphirerapids/memory.json | 15 +-
+ .../arch/x86/sapphirerapids/metricgroups.json | 10 +-
+ .../arch/x86/sapphirerapids/pipeline.json | 23 -
+ .../arch/x86/sapphirerapids/spr-metrics.json | 914 ++++---
+ .../arch/x86/sapphirerapids/uncore-io.json | 138 +-
+ .../pmu-events/arch/x86/sierraforest/cache.json | 130 +-
+ .../pmu-events/arch/x86/sierraforest/counter.json | 24 +-
+ .../pmu-events/arch/x86/sierraforest/frontend.json | 8 +
+ .../pmu-events/arch/x86/sierraforest/other.json | 20 +
+ .../pmu-events/arch/x86/sierraforest/pipeline.json | 46 +-
+ .../arch/x86/sierraforest/srf-metrics.json | 310 +--
+ .../arch/x86/sierraforest/uncore-cache.json | 61 +-
+ .../arch/x86/sierraforest/uncore-cxl.json | 2 -
+ .../arch/x86/sierraforest/uncore-interconnect.json | 87 +
+ .../arch/x86/sierraforest/uncore-io.json | 280 +-
+ .../arch/x86/sierraforest/uncore-memory.json | 122 +-
+ .../arch/x86/sierraforest/uncore-power.json | 98 +
+ .../pmu-events/arch/x86/skylake/metricgroups.json | 9 +-
+ .../pmu-events/arch/x86/skylake/skl-metrics.json | 684 +++--
+ .../pmu-events/arch/x86/skylakex/metricgroups.json | 9 +-
+ .../pmu-events/arch/x86/skylakex/skx-metrics.json | 740 +++---
+ .../pmu-events/arch/x86/skylakex/uncore-cache.json | 60 +-
+ .../arch/x86/skylakex/uncore-interconnect.json | 11 -
+ .../perf/pmu-events/arch/x86/tigerlake/cache.json | 45 +-
+ .../pmu-events/arch/x86/tigerlake/frontend.json | 17 -
+ .../perf/pmu-events/arch/x86/tigerlake/memory.json | 13 +-
+ .../arch/x86/tigerlake/metricgroups.json | 10 +-
+ .../pmu-events/arch/x86/tigerlake/pipeline.json | 30 +-
+ .../pmu-events/arch/x86/tigerlake/tgl-metrics.json | 745 +++---
+ .../arch/x86/tigerlake/uncore-interconnect.json | 4 +-
+ .../arch/x86/tigerlake/uncore-other.json | 2 +-
+ .../arch/x86/tigerlake/virtual-memory.json | 18 +
+ tools/perf/pmu-events/empty-pmu-events.c | 8 +-
+ tools/perf/pmu-events/jevents.py | 8 +-
+ tools/perf/python/tracepoint.py | 23 +-
+ tools/perf/scripts/python/bin/flamegraph-report | 2 +-
+ tools/perf/tests/code-reading.c | 12 +-
+ tools/perf/tests/dwarf-unwind.c | 6 +-
+ tools/perf/tests/event_update.c | 1 +
+ tools/perf/tests/hwmon_pmu.c | 16 +-
+ tools/perf/tests/mmap-basic.c | 3 +
+ tools/perf/tests/mmap-thread-lookup.c | 4 +-
+ tools/perf/tests/openat-syscall-tp-fields.c | 4 +-
+ tools/perf/tests/parse-no-sample-id-all.c | 6 +-
+ tools/perf/tests/perf-record.c | 2 +
+ tools/perf/tests/perf-time-to-tsc.c | 2 +
+ tools/perf/tests/pmu.c | 85 +-
+ tools/perf/tests/sample-parsing.c | 58 +-
+ tools/perf/tests/shell/base_report/setup.sh | 18 +-
+ tools/perf/tests/shell/base_report/test_basic.sh | 52 +
+ .../perf/tests/shell/lib/perf_json_output_lint.py | 7 +
+ tools/perf/tests/shell/lib/stat_output.sh | 8 +
+ tools/perf/tests/shell/perftool-testsuite_probe.sh | 1 +
+ tools/perf/tests/shell/probe_vfs_getname.sh | 1 +
+ .../tests/shell/record+probe_libc_inet_pton.sh | 1 +
+ .../tests/shell/record+script_probe_vfs_getname.sh | 1 +
+ tools/perf/tests/shell/record.sh | 59 +-
+ tools/perf/tests/shell/stat+csv_output.sh | 2 +
+ tools/perf/tests/shell/stat+json_output.sh | 9 +
+ tools/perf/tests/shell/stat+std_output.sh | 8 +
+ tools/perf/tests/shell/stat.sh | 83 +-
+ tools/perf/tests/shell/stat_all_metrics.sh | 8 +-
+ tools/perf/tests/shell/stat_all_pmu.sh | 48 +-
+ tools/perf/tests/shell/test_data_symbol.sh | 32 +-
+ tools/perf/tests/shell/test_stat_intel_tpebs.sh | 89 +-
+ .../tests/shell/test_uprobe_from_different_cu.sh | 11 +-
+ tools/perf/tests/shell/trace+probe_vfs_getname.sh | 1 +
+ tools/perf/tests/shell/trace_btf_enum.sh | 1 +
+ tools/perf/tests/shell/trace_btf_general.sh | 1 +
+ tools/perf/tests/shell/trace_exit_race.sh | 1 +
+ tools/perf/tests/shell/trace_record_replay.sh | 21 +
+ tools/perf/tests/sw-clock.c | 3 +
+ tools/perf/tests/switch-tracking.c | 14 +-
+ tools/perf/tests/tool_pmu.c | 4 +-
+ tools/perf/tests/workloads/datasym.c | 34 +-
+ tools/perf/ui/browsers/hists.c | 27 +-
+ tools/perf/ui/hist.c | 117 +-
+ tools/perf/ui/stdio/hist.c | 4 +
+ tools/perf/util/Build | 1 +
+ tools/perf/util/addr_location.c | 1 +
+ tools/perf/util/addr_location.h | 6 +-
+ tools/perf/util/annotate-data.c | 49 +-
+ tools/perf/util/annotate-data.h | 13 +
+ tools/perf/util/annotate.c | 267 +-
+ tools/perf/util/annotate.h | 9 +-
+ tools/perf/util/arm-spe-decoder/arm-spe-decoder.c | 23 +-
+ tools/perf/util/arm-spe-decoder/arm-spe-decoder.h | 11 +-
+ .../util/arm-spe-decoder/arm-spe-pkt-decoder.c | 14 +-
+ .../util/arm-spe-decoder/arm-spe-pkt-decoder.h | 12 +-
+ tools/perf/util/arm-spe.c | 167 +-
+ .../perf/util/arm64-frame-pointer-unwind-support.c | 29 +-
+ tools/perf/util/auxtrace.c | 15 +-
+ tools/perf/util/bpf_ftrace.c | 14 +-
+ tools/perf/util/bpf_lock_contention.c | 85 +-
+ tools/perf/util/bpf_skel/func_latency.bpf.c | 28 +-
+ tools/perf/util/bpf_skel/lock_contention.bpf.c | 245 +-
+ tools/perf/util/bpf_skel/lock_data.h | 7 +
+ tools/perf/util/branch.h | 3 +-
+ tools/perf/util/callchain.c | 10 +-
+ tools/perf/util/color.h | 5 -
+ tools/perf/util/color_config.c | 11 -
+ tools/perf/util/comm.c | 2 +
+ tools/perf/util/compress.h | 20 +
+ tools/perf/util/config.c | 6 -
+ tools/perf/util/config.h | 1 -
+ tools/perf/util/cpumap.c | 66 +-
+ tools/perf/util/cs-etm.c | 31 +-
+ tools/perf/util/data.c | 20 -
+ tools/perf/util/data.h | 1 -
+ tools/perf/util/debug.c | 2 +-
+ tools/perf/util/debuginfo.c | 6 +-
+ tools/perf/util/disasm.c | 27 +-
+ tools/perf/util/dso.c | 3 +
+ tools/perf/util/dso.h | 1 +
+ tools/perf/util/env.c | 2 +-
+ tools/perf/util/event.c | 11 +
+ tools/perf/util/event.h | 12 +-
+ tools/perf/util/events_stats.h | 2 +
+ tools/perf/util/evlist.c | 27 +-
+ tools/perf/util/evlist.h | 1 +
+ tools/perf/util/evsel.c | 51 +-
+ tools/perf/util/evsel.h | 2 +
+ tools/perf/util/expr.c | 2 +
+ tools/perf/util/ftrace.h | 2 +
+ tools/perf/util/header.c | 31 +-
+ tools/perf/util/hist.c | 108 +-
+ tools/perf/util/hist.h | 32 +-
+ tools/perf/util/hwmon_pmu.c | 56 +-
+ tools/perf/util/hwmon_pmu.h | 16 +
+ tools/perf/util/intel-bts.c | 4 +-
+ tools/perf/util/intel-pt.c | 136 +-
+ tools/perf/util/jitdump.c | 10 +-
+ tools/perf/util/lock-contention.h | 7 +
+ tools/perf/util/lzma.c | 29 +-
+ tools/perf/util/machine.c | 92 +-
+ tools/perf/util/machine.h | 8 +-
+ tools/perf/util/maps.c | 58 +-
+ tools/perf/util/mem-events.c | 69 +-
+ tools/perf/util/mem-events.h | 3 +-
+ tools/perf/util/mmap.c | 11 -
+ tools/perf/util/mmap.h | 3 -
+ tools/perf/util/parse-events.c | 177 +-
+ tools/perf/util/parse-events.l | 51 +-
+ tools/perf/util/perf_event_attr_fprintf.c | 140 +-
+ tools/perf/util/pmu.c | 315 ++-
+ tools/perf/util/pmu.h | 12 +-
+ tools/perf/util/pmus.c | 199 +-
+ tools/perf/util/pmus.h | 1 -
+ tools/perf/util/probe-finder.c | 21 +-
+ tools/perf/util/probe-finder.h | 1 +
+ tools/perf/util/pstack.c | 14 -
+ tools/perf/util/pstack.h | 1 -
+ tools/perf/util/python.c | 136 +-
+ tools/perf/util/rb_resort.h | 146 --
+ tools/perf/util/s390-cpumsf.c | 6 +-
+ tools/perf/util/sample.c | 43 +
+ tools/perf/util/sample.h | 11 +-
+ .../util/scripting-engines/trace-event-python.c | 29 +-
+ tools/perf/util/session.c | 106 +-
+ tools/perf/util/session.h | 1 +
+ tools/perf/util/sort.c | 108 +-
+ tools/perf/util/sort.h | 3 +-
+ tools/perf/util/stat-display.c | 111 +-
+ tools/perf/util/stat-shadow.c | 3 +-
+ tools/perf/util/stat.c | 13 +-
+ tools/perf/util/symbol-elf.c | 106 +-
+ tools/perf/util/symbol.c | 36 +
+ tools/perf/util/symbol_conf.h | 8 +-
+ tools/perf/util/synthetic-events.c | 46 +-
+ tools/perf/util/tool_pmu.c | 24 +-
+ tools/perf/util/tool_pmu.h | 2 +-
+ tools/perf/util/trace-event-scripting.c | 116 +-
+ tools/perf/util/trace-event.h | 2 +
+ tools/perf/util/units.c | 2 +-
+ tools/perf/util/unwind-libdw.c | 9 +-
+ 440 files changed, 37929 insertions(+), 9015 deletions(-)
+ create mode 100644 tools/lib/api/io_dir.h
+ create mode 100644 tools/perf/Documentation/cpu-and-latency-overheads.txt
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n3/bus.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n3/exception.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n3/fp_operation.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n3/general.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n3/l1d_cache.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n3/l1i_cache.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n3/l2_cache.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n3/l3_cache.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n3/ll_cache.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n3/memory.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n3/metrics.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n3/retired.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n3/spe.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n3/spec_operation.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n3/stall.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n3/sve.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n3/tlb.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n3/trace.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-v3/brbe.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-v3/bus.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-v3/exception.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-v3/fp_operation.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-v3/general.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-v3/l1d_cache.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-v3/l1i_cache.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-v3/l2_cache.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-v3/ll_cache.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-v3/memory.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-v3/metrics.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-v3/retired.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-v3/spe.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-v3/spec_operation.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-v3/stall.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-v3/sve.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-v3/tlb.json
+ create mode 100644 tools/perf/pmu-events/arch/riscv/sifive/bullet-07/cycle-and-instruction-count.json
+ create mode 120000 tools/perf/pmu-events/arch/riscv/sifive/bullet-07/firmware.json
+ create mode 120000 tools/perf/pmu-events/arch/riscv/sifive/bullet-07/instruction.json
+ create mode 120000 tools/perf/pmu-events/arch/riscv/sifive/bullet-07/memory.json
+ create mode 100644 tools/perf/pmu-events/arch/riscv/sifive/bullet-07/microarch.json
+ create mode 100644 tools/perf/pmu-events/arch/riscv/sifive/bullet-07/watchpoint.json
+ create mode 120000 tools/perf/pmu-events/arch/riscv/sifive/bullet-0d/cycle-and-instruction-count.json
+ create mode 120000 tools/perf/pmu-events/arch/riscv/sifive/bullet-0d/firmware.json
+ create mode 120000 tools/perf/pmu-events/arch/riscv/sifive/bullet-0d/instruction.json
+ create mode 120000 tools/perf/pmu-events/arch/riscv/sifive/bullet-0d/memory.json
+ create mode 100644 tools/perf/pmu-events/arch/riscv/sifive/bullet-0d/microarch.json
+ create mode 120000 tools/perf/pmu-events/arch/riscv/sifive/bullet-0d/watchpoint.json
+ rename tools/perf/pmu-events/arch/riscv/sifive/{u74 => bullet}/firmware.json (100%)
+ create mode 100644 tools/perf/pmu-events/arch/riscv/sifive/bullet/instruction.json
+ create mode 100644 tools/perf/pmu-events/arch/riscv/sifive/bullet/memory.json
+ create mode 100644 tools/perf/pmu-events/arch/riscv/sifive/bullet/microarch.json
+ create mode 120000 tools/perf/pmu-events/arch/riscv/sifive/p550/firmware.json
+ create mode 120000 tools/perf/pmu-events/arch/riscv/sifive/p550/instruction.json
+ create mode 100644 tools/perf/pmu-events/arch/riscv/sifive/p550/memory.json
+ create mode 120000 tools/perf/pmu-events/arch/riscv/sifive/p550/microarch.json
+ create mode 120000 tools/perf/pmu-events/arch/riscv/sifive/p650/cycle-and-instruction-count.json
+ create mode 120000 tools/perf/pmu-events/arch/riscv/sifive/p650/firmware.json
+ create mode 120000 tools/perf/pmu-events/arch/riscv/sifive/p650/instruction.json
+ create mode 100644 tools/perf/pmu-events/arch/riscv/sifive/p650/memory.json
+ create mode 100644 tools/perf/pmu-events/arch/riscv/sifive/p650/microarch.json
+ create mode 120000 tools/perf/pmu-events/arch/riscv/sifive/p650/watchpoint.json
+ delete mode 100644 tools/perf/pmu-events/arch/riscv/sifive/u74/instructions.json
+ delete mode 100644 tools/perf/pmu-events/arch/riscv/sifive/u74/memory.json
+ delete mode 100644 tools/perf/pmu-events/arch/riscv/sifive/u74/microarch.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/arrowlake/arl-metrics.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/arrowlake/cache.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/arrowlake/floating-point.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/arrowlake/frontend.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/arrowlake/memory.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/arrowlake/metricgroups.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/arrowlake/other.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/arrowlake/pipeline.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/arrowlake/uncore-cache.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/arrowlake/uncore-interconnect.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/arrowlake/uncore-memory.json
+ rename tools/perf/pmu-events/arch/x86/{haswell => arrowlake}/uncore-other.json (90%)
+ create mode 100644 tools/perf/pmu-events/arch/x86/arrowlake/virtual-memory.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/clearwaterforest/cache.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/clearwaterforest/counter.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/clearwaterforest/frontend.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/clearwaterforest/memory.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/clearwaterforest/other.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/clearwaterforest/pipeline.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/clearwaterforest/virtual-memory.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/graniterapids/gnr-metrics.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/graniterapids/metricgroups.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/lunarlake/floating-point.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/lunarlake/lnl-metrics.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/lunarlake/metricgroups.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/lunarlake/uncore-memory.json
+ create mode 100755 tools/perf/tests/shell/trace_record_replay.sh
+ delete mode 100644 tools/perf/util/rb_resort.h
+ create mode 100644 tools/perf/util/sample.c
+Merging compiler-attributes/compiler-attributes (98f7e32f20d2 Linux 6.11)
+$ git merge -m Merge branch 'compiler-attributes' of https://github.com/ojeda/linux.git compiler-attributes/compiler-attributes
+Already up to date.
+Merging dma-mapping/dma-mapping-for-next (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'dma-mapping-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux.git dma-mapping/dma-mapping-for-next
+Already up to date.
+Merging asm-generic/master (9d48cc07d0d7 m68k/nommu: stop using GENERIC_IOMAP)
+$ 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 arch/mips/Kconfig
+Auto-merging arch/mips/include/asm/io.h
+Auto-merging arch/parisc/include/asm/io.h
+Auto-merging arch/powerpc/include/asm/io.h
+Auto-merging arch/sh/include/asm/io.h
+Merge made by the 'ort' strategy.
+ arch/alpha/include/asm/io.h | 31 ++++---
+ arch/m68k/Kconfig | 2 +-
+ arch/m68k/include/asm/io_no.h | 4 -
+ arch/mips/Kconfig | 2 +-
+ arch/mips/include/asm/io.h | 21 ++---
+ arch/mips/lib/iomap-pci.c | 9 ++
+ arch/parisc/include/asm/io.h | 36 ++++++--
+ arch/powerpc/include/asm/io.h | 48 ----------
+ arch/sh/include/asm/io.h | 30 ++-----
+ arch/sh/kernel/Makefile | 3 -
+ arch/sh/kernel/iomap.c | 162 ----------------------------------
+ arch/sh/kernel/ioport.c | 5 --
+ arch/sh/lib/io.c | 4 +-
+ drivers/gpu/drm/drm_draw.c | 2 +
+ drivers/sh/clk/cpg.c | 25 +++---
+ include/asm-generic/iomap.h | 36 ++------
+ include/linux/io-64-nonatomic-hi-lo.h | 16 ++++
+ include/linux/io-64-nonatomic-lo-hi.h | 16 ++++
+ include/linux/io.h | 3 -
+ lib/iomap.c | 40 ++++-----
+ 20 files changed, 146 insertions(+), 349 deletions(-)
+ delete mode 100644 arch/sh/kernel/iomap.c
+Merging alpha/alpha-next (1523226edda5 alpha: Use str_yes_no() helper in pci_dac_dma_supported())
+$ git merge -m Merge branch 'alpha-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha.git alpha/alpha-next
+Already up to date.
+Merging arm/for-next (f520fab580c9 ARM: 9440/1: cacheinfo fix format field mask)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git arm/for-next
+Already up to date.
+Merging arm64/for-next/core (b60cf0c4d94f Merge branch 'for-next/smt-control' 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 arch/arm64/Kconfig
+Auto-merging arch/arm64/include/asm/el2_setup.h
+Auto-merging arch/arm64/mm/hugetlbpage.c
+Auto-merging arch/arm64/mm/mmu.c
+Auto-merging tools/testing/selftests/mm/protection_keys.c
+Merge made by the 'ort' strategy.
+ Documentation/admin-guide/pm/cpufreq.rst | 17 +-
+ Documentation/arch/arm64/booting.rst | 22 +++
+ arch/arm64/Kconfig | 3 +-
+ arch/arm64/include/asm/asm-extable.h | 10 +-
+ arch/arm64/include/asm/asm-uaccess.h | 4 +
+ arch/arm64/include/asm/cputype.h | 14 ++
+ arch/arm64/include/asm/el2_setup.h | 25 +++
+ arch/arm64/include/asm/extable.h | 4 +-
+ arch/arm64/include/asm/fpsimd.h | 1 -
+ arch/arm64/include/asm/kernel-pgtable.h | 8 +-
+ arch/arm64/include/asm/mem_encrypt.h | 11 ++
+ arch/arm64/include/asm/pgtable-hwdef.h | 35 ++--
+ arch/arm64/include/asm/pgtable-prot.h | 36 ++--
+ arch/arm64/include/asm/pgtable.h | 80 +++++---
+ arch/arm64/include/asm/por.h | 11 +-
+ arch/arm64/include/asm/spectre.h | 3 +-
+ arch/arm64/include/asm/sysreg.h | 15 +-
+ arch/arm64/include/uapi/asm/kvm.h | 4 +
+ arch/arm64/kernel/cpufeature.c | 95 ++++++++--
+ arch/arm64/kernel/pi/map_range.c | 6 +-
+ arch/arm64/kernel/proton-pack.c | 208 +++++++++++----------
+ arch/arm64/kernel/signal.c | 2 +-
+ arch/arm64/kernel/topology.c | 182 +++++++++++++++++-
+ arch/arm64/kvm/at.c | 8 +-
+ arch/arm64/kvm/hypercalls.c | 21 +++
+ arch/arm64/kvm/ptdump.c | 4 +-
+ arch/arm64/lib/clear_user.S | 25 ++-
+ arch/arm64/lib/copy_from_user.S | 10 +
+ arch/arm64/lib/copy_template.S | 10 +
+ arch/arm64/lib/copy_to_user.S | 10 +
+ arch/arm64/mm/extable.c | 40 +++-
+ arch/arm64/mm/fault.c | 4 +-
+ arch/arm64/mm/hugetlbpage.c | 20 +-
+ arch/arm64/mm/kasan_init.c | 6 +-
+ arch/arm64/mm/mmu.c | 10 +-
+ arch/arm64/mm/ptdump.c | 4 +-
+ arch/arm64/tools/gen-sysreg.awk | 31 +--
+ arch/arm64/tools/sysreg | 105 ++++++++++-
+ arch/powerpc/include/asm/topology.h | 1 +
+ arch/x86/include/asm/topology.h | 2 +-
+ arch/x86/kernel/cpu/aperfmperf.c | 2 +-
+ arch/x86/kernel/cpu/proc.c | 7 +-
+ drivers/base/arch_topology.c | 26 ++-
+ drivers/cpufreq/Kconfig.x86 | 12 ++
+ drivers/cpufreq/cpufreq.c | 38 +++-
+ include/linux/arm-smccc.h | 5 +
+ include/linux/cpufreq.h | 2 +-
+ include/linux/dma-direct.h | 13 +-
+ include/linux/mem_encrypt.h | 23 +++
+ include/linux/topology.h | 23 +++
+ include/uapi/asm-generic/mman-common.h | 1 +
+ .../selftests/arm64/mte/check_hugetlb_options.c | 19 +-
+ tools/testing/selftests/mm/mseal_test.c | 6 +-
+ tools/testing/selftests/mm/pkey-helpers.h | 3 +-
+ tools/testing/selftests/mm/pkey_sighandler_tests.c | 4 +-
+ tools/testing/selftests/mm/protection_keys.c | 2 +-
+ tools/testing/selftests/powerpc/include/pkeys.h | 5 +-
+ .../testing/selftests/powerpc/mm/pkey_exec_prot.c | 2 +-
+ tools/testing/selftests/powerpc/mm/pkey_siginfo.c | 2 +-
+ tools/testing/selftests/powerpc/ptrace/core-pkey.c | 6 +-
+ .../testing/selftests/powerpc/ptrace/ptrace-pkey.c | 6 +-
+ 61 files changed, 1019 insertions(+), 295 deletions(-)
+Merging arm-perf/for-next/perf (a28f3cbfd11f perf/arm_cspmu: Add PMEVFILT2R 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
+Merge made by the 'ort' strategy.
+ arch/arm64/include/asm/apple_m1_pmu.h | 1 +
+ drivers/perf/apple_m1_cpu_pmu.c | 70 +++++++++++++++++++-----------
+ drivers/perf/arm-cmn.c | 5 ++-
+ drivers/perf/arm_cspmu/ampere_cspmu.c | 32 +++++---------
+ drivers/perf/arm_cspmu/arm_cspmu.c | 81 ++++++++---------------------------
+ drivers/perf/arm_cspmu/arm_cspmu.h | 57 ++++++++++++++++++++++--
+ drivers/perf/arm_cspmu/nvidia_cspmu.c | 21 ++++++++-
+ drivers/perf/arm_pmu.c | 8 ++--
+ drivers/perf/arm_pmuv3.c | 11 ++---
+ drivers/perf/arm_v7_pmu.c | 50 ---------------------
+ drivers/perf/dwc_pcie_pmu.c | 51 ++++++++++++++--------
+ include/linux/perf/arm_pmu.h | 13 +++---
+ 12 files changed, 197 insertions(+), 203 deletions(-)
+$ git reset --hard HEAD^
+HEAD is now at ddc9a7763f64 Merge branch 'for-next/core' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
+Merging next-20250314 version of arm-perf
+$ git merge -m next-20250314/arm-perf 7f35b429802a8065aa61e2a3f567089649f4d98e
+Merge made by the 'ort' strategy.
+ drivers/perf/apple_m1_cpu_pmu.c | 4 ----
+ drivers/perf/arm-cmn.c | 5 ++--
+ drivers/perf/arm_pmu.c | 8 +++----
+ drivers/perf/arm_pmuv3.c | 11 ++++-----
+ drivers/perf/arm_v7_pmu.c | 50 ----------------------------------------
+ drivers/perf/dwc_pcie_pmu.c | 51 +++++++++++++++++++++++++++--------------
+ include/linux/perf/arm_pmu.h | 13 ++++++-----
+ 7 files changed, 51 insertions(+), 91 deletions(-)
+Merging arm-soc/for-next (69e7831ba231 Merge branch 'arm/fixes' into for-next)
+$ 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 drivers/nvme/host/apple.c
+Auto-merging include/linux/arm-smccc.h
+Merge made by the 'ort' strategy.
+ Documentation/devicetree/bindings/arm/apple.yaml | 41 +
+ .../devicetree/bindings/arm/apple/apple,pmgr.yaml | 5 +
+ .../devicetree/bindings/arm/arm,morello.yaml | 35 +
+ Documentation/devicetree/bindings/arm/cpus.yaml | 1 +
+ .../devicetree/bindings/arm/mediatek.yaml | 5 +
+ Documentation/devicetree/bindings/arm/pmu.yaml | 1 +
+ .../bindings/power/apple,pmgr-pwrstate.yaml | 5 +
+ .../soc/renesas/renesas,r9a09g057-sys.yaml | 5 +-
+ .../devicetree/bindings/soc/renesas/renesas.yaml | 16 +
+ .../devicetree/bindings/usb/mediatek,mtk-xhci.yaml | 4 +
+ .../devicetree/bindings/usb/mediatek,mtu3.yaml | 12 +
+ .../devicetree/bindings/vendor-prefixes.yaml | 2 +
+ MAINTAINERS | 7 +
+ arch/arm/arm-soc-for-next-contents.txt | 56 +
+ .../dts/intel/ixp/intel-ixp42x-netgear-wg302v1.dts | 40 +-
+ arch/arm/boot/dts/intel/ixp/intel-ixp4xx.dtsi | 2 +-
+ arch/arm/boot/dts/renesas/r8a7790-lager.dts | 1 +
+ arch/arm/boot/dts/renesas/r8a7790-stout.dts | 1 +
+ arch/arm/boot/dts/renesas/r8a7790.dtsi | 7 +
+ arch/arm/boot/dts/renesas/r8a7791-koelsch.dts | 1 +
+ arch/arm/boot/dts/renesas/r8a7791-porter.dts | 1 +
+ arch/arm/boot/dts/renesas/r8a7791.dtsi | 7 +
+ arch/arm/boot/dts/renesas/r8a7792-blanche.dts | 1 +
+ arch/arm/boot/dts/renesas/r8a7792-wheat.dts | 1 +
+ arch/arm/boot/dts/renesas/r8a7792.dtsi | 6 +
+ arch/arm/boot/dts/renesas/r8a7793-gose.dts | 1 +
+ arch/arm/boot/dts/renesas/r8a7793.dtsi | 7 +
+ arch/arm/boot/dts/renesas/r8a7794-alt.dts | 1 +
+ arch/arm/boot/dts/renesas/r8a7794-silk.dts | 1 +
+ arch/arm/boot/dts/renesas/r8a7794.dtsi | 7 +
+ arch/arm/boot/dts/renesas/r9a06g032.dtsi | 20 +-
+ arch/arm/configs/shmobile_defconfig | 1 +
+ arch/arm/mach-shmobile/setup-rcar-gen2.c | 76 --
+ arch/arm64/Kconfig.platforms | 5 +-
+ arch/arm64/boot/dts/airoha/en7581-evb.dts | 44 +
+ arch/arm64/boot/dts/airoha/en7581.dtsi | 91 ++
+ arch/arm64/boot/dts/apple/Makefile | 16 +
+ arch/arm64/boot/dts/apple/s5l8960x-5s.dtsi | 5 +
+ arch/arm64/boot/dts/apple/s5l8960x-air1.dtsi | 5 +
+ arch/arm64/boot/dts/apple/s5l8960x-mini2.dtsi | 5 +
+ arch/arm64/boot/dts/apple/s5l8960x-opp.dtsi | 45 +
+ arch/arm64/boot/dts/apple/s5l8960x-pmgr.dtsi | 610 ++++++++++
+ arch/arm64/boot/dts/apple/s5l8960x.dtsi | 23 +
+ arch/arm64/boot/dts/apple/s5l8965x-opp.dtsi | 45 +
+ arch/arm64/boot/dts/apple/s800-0-3-pmgr.dtsi | 757 ++++++++++++
+ arch/arm64/boot/dts/apple/s800-0-3.dtsi | 172 +++
+ arch/arm64/boot/dts/apple/s8000.dtsi | 162 +--
+ arch/arm64/boot/dts/apple/s8001-common.dtsi | 1 +
+ arch/arm64/boot/dts/apple/s8001-j98a-j99a.dtsi | 26 +
+ arch/arm64/boot/dts/apple/s8001-j98a.dts | 1 +
+ arch/arm64/boot/dts/apple/s8001-j99a.dts | 1 +
+ arch/arm64/boot/dts/apple/s8001-pmgr.dtsi | 822 +++++++++++++
+ arch/arm64/boot/dts/apple/s8001.dtsi | 81 ++
+ arch/arm64/boot/dts/apple/s8003.dtsi | 63 +-
+ arch/arm64/boot/dts/apple/s800x-6s.dtsi | 4 +
+ arch/arm64/boot/dts/apple/s800x-ipad5.dtsi | 4 +
+ arch/arm64/boot/dts/apple/s800x-se.dtsi | 4 +
+ arch/arm64/boot/dts/apple/spi1-nvram.dtsi | 39 +
+ arch/arm64/boot/dts/apple/t600x-common.dtsi | 7 +
+ arch/arm64/boot/dts/apple/t600x-die0.dtsi | 28 +
+ arch/arm64/boot/dts/apple/t600x-gpio-pins.dtsi | 14 +
+ arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi | 2 +
+ arch/arm64/boot/dts/apple/t600x-j375.dtsi | 2 +
+ arch/arm64/boot/dts/apple/t7000-6.dtsi | 8 +
+ arch/arm64/boot/dts/apple/t7000-j42d.dts | 5 +
+ arch/arm64/boot/dts/apple/t7000-mini4.dtsi | 12 +
+ arch/arm64/boot/dts/apple/t7000-n102.dts | 4 +
+ arch/arm64/boot/dts/apple/t7000-pmgr.dtsi | 641 ++++++++++
+ arch/arm64/boot/dts/apple/t7000.dtsi | 66 ++
+ arch/arm64/boot/dts/apple/t7001-air2.dtsi | 1 +
+ arch/arm64/boot/dts/apple/t7001-pmgr.dtsi | 650 +++++++++++
+ arch/arm64/boot/dts/apple/t7001.dtsi | 65 ++
+ arch/arm64/boot/dts/apple/t8010-7.dtsi | 12 +
+ arch/arm64/boot/dts/apple/t8010-ipad6.dtsi | 12 +
+ arch/arm64/boot/dts/apple/t8010-n112.dts | 4 +
+ arch/arm64/boot/dts/apple/t8010-pmgr.dtsi | 772 ++++++++++++
+ arch/arm64/boot/dts/apple/t8010.dtsi | 108 ++
+ arch/arm64/boot/dts/apple/t8011-common.dtsi | 1 +
+ arch/arm64/boot/dts/apple/t8011-pmgr.dtsi | 806 +++++++++++++
+ arch/arm64/boot/dts/apple/t8011-pro2.dtsi | 8 +
+ arch/arm64/boot/dts/apple/t8011.dtsi | 101 ++
+ arch/arm64/boot/dts/apple/t8012-j132.dts | 14 +
+ arch/arm64/boot/dts/apple/t8012-j137.dts | 14 +
+ arch/arm64/boot/dts/apple/t8012-j140a.dts | 14 +
+ arch/arm64/boot/dts/apple/t8012-j140k.dts | 14 +
+ arch/arm64/boot/dts/apple/t8012-j152f.dts | 15 +
+ arch/arm64/boot/dts/apple/t8012-j160.dts | 14 +
+ arch/arm64/boot/dts/apple/t8012-j174.dts | 14 +
+ arch/arm64/boot/dts/apple/t8012-j185.dts | 14 +
+ arch/arm64/boot/dts/apple/t8012-j185f.dts | 14 +
+ arch/arm64/boot/dts/apple/t8012-j213.dts | 15 +
+ arch/arm64/boot/dts/apple/t8012-j214k.dts | 15 +
+ arch/arm64/boot/dts/apple/t8012-j215.dts | 15 +
+ arch/arm64/boot/dts/apple/t8012-j223.dts | 15 +
+ arch/arm64/boot/dts/apple/t8012-j230k.dts | 14 +
+ arch/arm64/boot/dts/apple/t8012-j680.dts | 15 +
+ arch/arm64/boot/dts/apple/t8012-j780.dts | 15 +
+ arch/arm64/boot/dts/apple/t8012-jxxx.dtsi | 44 +
+ arch/arm64/boot/dts/apple/t8012-pmgr.dtsi | 837 ++++++++++++++
+ arch/arm64/boot/dts/apple/t8012-touchbar.dtsi | 20 +
+ arch/arm64/boot/dts/apple/t8012.dtsi | 281 +++++
+ arch/arm64/boot/dts/apple/t8015-common.dtsi | 1 +
+ arch/arm64/boot/dts/apple/t8015-pmgr.dtsi | 931 +++++++++++++++
+ arch/arm64/boot/dts/apple/t8015.dtsi | 144 +++
+ arch/arm64/boot/dts/apple/t8103-j293.dts | 27 +
+ arch/arm64/boot/dts/apple/t8103-jxxx.dtsi | 2 +
+ arch/arm64/boot/dts/apple/t8103-pmgr.dtsi | 18 +-
+ arch/arm64/boot/dts/apple/t8103.dtsi | 76 ++
+ arch/arm64/boot/dts/apple/t8112-j493.dts | 23 +
+ arch/arm64/boot/dts/apple/t8112-jxxx.dtsi | 2 +
+ arch/arm64/boot/dts/apple/t8112.dtsi | 44 +-
+ arch/arm64/boot/dts/arm/Makefile | 1 +
+ arch/arm64/boot/dts/arm/corstone1000-fvp.dts | 26 +
+ arch/arm64/boot/dts/arm/corstone1000.dtsi | 3 +-
+ arch/arm64/boot/dts/arm/morello-fvp.dts | 77 ++
+ arch/arm64/boot/dts/arm/morello-sdp.dts | 157 +++
+ arch/arm64/boot/dts/arm/morello.dtsi | 323 ++++++
+ arch/arm64/boot/dts/mediatek/Makefile | 3 +
+ arch/arm64/boot/dts/mediatek/mt6359.dtsi | 3 +-
+ arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi | 2 -
+ arch/arm64/boot/dts/mediatek/mt8173.dtsi | 12 +-
+ .../dts/mediatek/mt8183-kukui-jacuzzi-damu.dts | 9 +-
+ .../mediatek/mt8183-kukui-jacuzzi-fennel-sku1.dts | 8 +-
+ .../mediatek/mt8183-kukui-jacuzzi-fennel-sku6.dts | 8 +-
+ .../mediatek/mt8183-kukui-jacuzzi-fennel-sku7.dts | 8 +-
+ arch/arm64/boot/dts/mediatek/mt8188-geralt.dtsi | 173 ++-
+ arch/arm64/boot/dts/mediatek/mt8188.dtsi | 307 ++++-
+ arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi | 184 ++-
+ arch/arm64/boot/dts/mediatek/mt8195.dtsi | 129 +++
+ arch/arm64/boot/dts/mediatek/mt8365-evk.dts | 245 +++-
+ arch/arm64/boot/dts/mediatek/mt8365.dtsi | 336 ++++++
+ .../boot/dts/mediatek/mt8370-genio-510-evk.dts | 19 +
+ arch/arm64/boot/dts/mediatek/mt8370.dtsi | 64 +
+ .../boot/dts/mediatek/mt8390-genio-700-evk.dts | 1033 +----------------
+ .../boot/dts/mediatek/mt8390-genio-common.dtsi | 1223 ++++++++++++++++++++
+ .../boot/dts/mediatek/mt8395-genio-1200-evk.dts | 102 ++
+ .../mediatek/mt8395-radxa-nio-12l-8-hd-panel.dtso | 84 ++
+ .../boot/dts/mediatek/mt8395-radxa-nio-12l.dts | 71 ++
+ arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts | 10 -
+ arch/arm64/boot/dts/renesas/Makefile | 5 +
+ .../arm64/boot/dts/renesas/beacon-renesom-som.dtsi | 1 +
+ arch/arm64/boot/dts/renesas/condor-common.dtsi | 1 +
+ arch/arm64/boot/dts/renesas/draak.dtsi | 1 +
+ arch/arm64/boot/dts/renesas/ebisu.dtsi | 1 +
+ arch/arm64/boot/dts/renesas/hihope-common.dtsi | 1 +
+ arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 8 +
+ arch/arm64/boot/dts/renesas/r8a774b1.dtsi | 8 +
+ arch/arm64/boot/dts/renesas/r8a774c0-cat874.dts | 1 +
+ arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 11 +
+ arch/arm64/boot/dts/renesas/r8a774e1.dtsi | 8 +
+ arch/arm64/boot/dts/renesas/r8a77951.dtsi | 7 +
+ arch/arm64/boot/dts/renesas/r8a77960.dtsi | 8 +
+ arch/arm64/boot/dts/renesas/r8a77961.dtsi | 8 +
+ arch/arm64/boot/dts/renesas/r8a77965.dtsi | 8 +
+ .../renesas/r8a77970-eagle-function-expansion.dtso | 2 +-
+ arch/arm64/boot/dts/renesas/r8a77970-eagle.dts | 1 +
+ arch/arm64/boot/dts/renesas/r8a77970-v3msk.dts | 1 +
+ arch/arm64/boot/dts/renesas/r8a77970.dtsi | 7 +
+ arch/arm64/boot/dts/renesas/r8a77980-v3hsk.dts | 1 +
+ arch/arm64/boot/dts/renesas/r8a77980.dtsi | 7 +
+ arch/arm64/boot/dts/renesas/r8a77990.dtsi | 11 +
+ arch/arm64/boot/dts/renesas/r8a77995.dtsi | 7 +
+ .../boot/dts/renesas/r8a779a0-falcon-cpu.dtsi | 1 +
+ arch/arm64/boot/dts/renesas/r8a779a0.dtsi | 88 ++
+ .../boot/dts/renesas/r8a779f0-spider-cpu.dtsi | 1 +
+ .../boot/dts/renesas/r8a779f0-spider-ethernet.dtsi | 108 +-
+ arch/arm64/boot/dts/renesas/r8a779f0.dtsi | 17 +-
+ arch/arm64/boot/dts/renesas/r8a779f4-s4sk.dts | 69 +-
+ arch/arm64/boot/dts/renesas/r8a779g0.dtsi | 88 +-
+ .../boot/dts/renesas/r8a779h0-gray-hawk-single.dts | 154 ++-
+ arch/arm64/boot/dts/renesas/r8a779h0.dtsi | 34 +-
+ .../arm64/boot/dts/renesas/r9a07g044l2-remi-pi.dts | 339 ++++++
+ arch/arm64/boot/dts/renesas/r9a08g045.dtsi | 29 +-
+ .../renesas/r9a08g045s33-smarc-pmod1-type-3a.dtso | 48 +
+ arch/arm64/boot/dts/renesas/r9a09g047.dtsi | 37 +
+ arch/arm64/boot/dts/renesas/r9a09g057.dtsi | 1 -
+ arch/arm64/boot/dts/renesas/r9a09g057h48-kakip.dts | 136 +++
+ arch/arm64/boot/dts/renesas/rzg3e-smarc-som.dtsi | 4 +
+ arch/arm64/boot/dts/renesas/rzg3s-smarc-som.dtsi | 20 +-
+ arch/arm64/boot/dts/renesas/rzg3s-smarc-switches.h | 40 +
+ arch/arm64/boot/dts/renesas/rzg3s-smarc.dtsi | 13 +
+ arch/arm64/boot/dts/renesas/salvator-common.dtsi | 1 +
+ .../ulcb-kf-audio-graph-card-mix+split.dtsi | 73 +-
+ .../ulcb-kf-audio-graph-card2-mix+split.dtsi | 66 +-
+ .../ulcb-kf-simple-audio-card-mix+split.dtsi | 53 +-
+ arch/arm64/boot/dts/renesas/ulcb.dtsi | 1 +
+ .../boot/dts/renesas/white-hawk-cpu-common.dtsi | 1 +
+ .../arm64/boot/dts/renesas/white-hawk-csi-dsi.dtsi | 8 +-
+ drivers/firmware/arm_ffa/bus.c | 14 +-
+ drivers/firmware/arm_ffa/driver.c | 568 ++++++---
+ drivers/firmware/arm_scmi/bus.c | 69 +-
+ drivers/firmware/arm_scmi/driver.c | 10 -
+ drivers/firmware/smccc/soc_id.c | 80 ++
+ drivers/nvme/host/apple.c | 2 +-
+ drivers/soc/apple/rtkit-internal.h | 1 +
+ drivers/soc/apple/rtkit.c | 112 +-
+ drivers/soc/mediatek/mt8167-mmsys.h | 31 +-
+ drivers/soc/mediatek/mt8173-mmsys.h | 99 +-
+ drivers/soc/mediatek/mt8183-mmsys.h | 50 +-
+ drivers/soc/mediatek/mt8186-mmsys.h | 88 +-
+ drivers/soc/mediatek/mt8188-mmsys.h | 266 ++---
+ drivers/soc/mediatek/mt8192-mmsys.h | 71 +-
+ drivers/soc/mediatek/mt8195-mmsys.h | 632 +++++-----
+ drivers/soc/mediatek/mt8365-mmsys.h | 84 +-
+ drivers/soc/mediatek/mtk-mmsys.h | 14 +
+ drivers/soc/mediatek/mtk-mutex.c | 6 +
+ drivers/soc/mediatek/mtk-socinfo.c | 22 +-
+ drivers/soc/renesas/Kconfig | 18 +
+ drivers/soc/renesas/Makefile | 4 +
+ drivers/soc/renesas/r9a08g045-sysc.c | 23 +
+ drivers/soc/renesas/r9a09g047-sys.c | 67 ++
+ drivers/soc/renesas/r9a09g057-sys.c | 67 ++
+ drivers/soc/renesas/renesas-soc.c | 33 +-
+ drivers/soc/renesas/rz-sysc.c | 137 +++
+ drivers/soc/renesas/rz-sysc.h | 46 +
+ include/linux/arm-smccc.h | 40 +
+ include/linux/arm_ffa.h | 22 +-
+ include/linux/soc/apple/rtkit.h | 2 +-
+ 218 files changed, 15651 insertions(+), 2609 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/arm/arm,morello.yaml
+ create mode 100644 arch/arm/arm-soc-for-next-contents.txt
+ create mode 100644 arch/arm64/boot/dts/apple/s5l8960x-opp.dtsi
+ create mode 100644 arch/arm64/boot/dts/apple/s5l8960x-pmgr.dtsi
+ create mode 100644 arch/arm64/boot/dts/apple/s5l8965x-opp.dtsi
+ create mode 100644 arch/arm64/boot/dts/apple/s800-0-3-pmgr.dtsi
+ create mode 100644 arch/arm64/boot/dts/apple/s800-0-3.dtsi
+ create mode 100644 arch/arm64/boot/dts/apple/s8001-j98a-j99a.dtsi
+ create mode 100644 arch/arm64/boot/dts/apple/s8001-pmgr.dtsi
+ create mode 100644 arch/arm64/boot/dts/apple/spi1-nvram.dtsi
+ create mode 100644 arch/arm64/boot/dts/apple/t7000-pmgr.dtsi
+ create mode 100644 arch/arm64/boot/dts/apple/t7001-pmgr.dtsi
+ create mode 100644 arch/arm64/boot/dts/apple/t8010-pmgr.dtsi
+ create mode 100644 arch/arm64/boot/dts/apple/t8011-pmgr.dtsi
+ create mode 100644 arch/arm64/boot/dts/apple/t8012-j132.dts
+ create mode 100644 arch/arm64/boot/dts/apple/t8012-j137.dts
+ create mode 100644 arch/arm64/boot/dts/apple/t8012-j140a.dts
+ create mode 100644 arch/arm64/boot/dts/apple/t8012-j140k.dts
+ create mode 100644 arch/arm64/boot/dts/apple/t8012-j152f.dts
+ create mode 100644 arch/arm64/boot/dts/apple/t8012-j160.dts
+ create mode 100644 arch/arm64/boot/dts/apple/t8012-j174.dts
+ create mode 100644 arch/arm64/boot/dts/apple/t8012-j185.dts
+ create mode 100644 arch/arm64/boot/dts/apple/t8012-j185f.dts
+ create mode 100644 arch/arm64/boot/dts/apple/t8012-j213.dts
+ create mode 100644 arch/arm64/boot/dts/apple/t8012-j214k.dts
+ create mode 100644 arch/arm64/boot/dts/apple/t8012-j215.dts
+ create mode 100644 arch/arm64/boot/dts/apple/t8012-j223.dts
+ create mode 100644 arch/arm64/boot/dts/apple/t8012-j230k.dts
+ create mode 100644 arch/arm64/boot/dts/apple/t8012-j680.dts
+ create mode 100644 arch/arm64/boot/dts/apple/t8012-j780.dts
+ create mode 100644 arch/arm64/boot/dts/apple/t8012-jxxx.dtsi
+ create mode 100644 arch/arm64/boot/dts/apple/t8012-pmgr.dtsi
+ create mode 100644 arch/arm64/boot/dts/apple/t8012-touchbar.dtsi
+ create mode 100644 arch/arm64/boot/dts/apple/t8012.dtsi
+ create mode 100644 arch/arm64/boot/dts/apple/t8015-pmgr.dtsi
+ create mode 100644 arch/arm64/boot/dts/arm/morello-fvp.dts
+ create mode 100644 arch/arm64/boot/dts/arm/morello-sdp.dts
+ create mode 100644 arch/arm64/boot/dts/arm/morello.dtsi
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8370-genio-510-evk.dts
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8370.dtsi
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8390-genio-common.dtsi
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8395-radxa-nio-12l-8-hd-panel.dtso
+ create mode 100644 arch/arm64/boot/dts/renesas/r9a07g044l2-remi-pi.dts
+ create mode 100644 arch/arm64/boot/dts/renesas/r9a08g045s33-smarc-pmod1-type-3a.dtso
+ create mode 100644 arch/arm64/boot/dts/renesas/r9a09g057h48-kakip.dts
+ create mode 100644 arch/arm64/boot/dts/renesas/rzg3s-smarc-switches.h
+ create mode 100644 drivers/soc/renesas/r9a08g045-sysc.c
+ create mode 100644 drivers/soc/renesas/r9a09g047-sys.c
+ create mode 100644 drivers/soc/renesas/r9a09g057-sys.c
+ create mode 100644 drivers/soc/renesas/rz-sysc.c
+ create mode 100644 drivers/soc/renesas/rz-sysc.h
+Merging amlogic/for-next (73e4ffb27bb8 Merge branch 'v6.15/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
+Auto-merging MAINTAINERS
+Auto-merging drivers/pinctrl/pinconf-generic.c
+Merge made by the 'ort' strategy.
+ .../bindings/pinctrl/amlogic,pinctrl-a4.yaml | 126 +++
+ MAINTAINERS | 8 +
+ arch/arm/boot/dts/amlogic/meson8.dtsi | 18 +-
+ arch/arm/boot/dts/amlogic/meson8b-ec100.dts | 2 -
+ arch/arm/boot/dts/amlogic/meson8b-mxq.dts | 2 -
+ arch/arm/boot/dts/amlogic/meson8b-odroidc1.dts | 2 -
+ arch/arm/boot/dts/amlogic/meson8b.dtsi | 18 +-
+ arch/arm64/boot/dts/amlogic/amlogic-a4.dtsi | 120 +++
+ arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 24 +-
+ arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 33 +-
+ arch/arm64/boot/dts/amlogic/meson-g12a-fbx8am.dts | 4 -
+ .../boot/dts/amlogic/meson-g12a-radxa-zero.dts | 4 -
+ arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts | 4 -
+ arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts | 2 -
+ arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts | 4 -
+ .../dts/amlogic/meson-g12b-a311d-libretech-cc.dts | 2 -
+ .../boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi | 4 -
+ .../boot/dts/amlogic/meson-g12b-bananapi.dtsi | 4 -
+ .../boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi | 4 -
+ arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi | 4 -
+ .../boot/dts/amlogic/meson-g12b-radxa-zero2.dts | 8 -
+ arch/arm64/boot/dts/amlogic/meson-g12b-w400.dtsi | 6 -
+ .../boot/dts/amlogic/meson-gx-libretech-pc.dtsi | 6 -
+ .../arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 2 -
+ arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 8 +-
+ .../boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 2 -
+ .../boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts | 2 -
+ arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi | 2 -
+ .../boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 2 -
+ arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi | 2 -
+ arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 25 +
+ .../boot/dts/amlogic/meson-gxl-s805x-p241.dts | 2 -
+ .../amlogic/meson-gxl-s905w-jethome-jethub-j80.dts | 2 -
+ .../dts/amlogic/meson-gxl-s905x-hwacom-amazetv.dts | 2 -
+ .../dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 2 -
+ .../dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts | 2 -
+ .../boot/dts/amlogic/meson-gxl-s905x-p212.dtsi | 2 -
+ arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 25 +
+ .../boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 4 -
+ arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts | 2 -
+ .../dts/amlogic/meson-libretech-cottonwood.dtsi | 6 -
+ arch/arm64/boot/dts/amlogic/meson-sm1-ac2xx.dtsi | 6 -
+ .../arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi | 2 -
+ .../boot/dts/amlogic/meson-sm1-khadas-vim3l.dts | 2 -
+ arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi | 2 -
+ arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts | 6 -
+ drivers/pinctrl/meson/Kconfig | 11 +
+ drivers/pinctrl/meson/Makefile | 1 +
+ drivers/pinctrl/meson/pinctrl-amlogic-a4.c | 1053 ++++++++++++++++++++
+ drivers/pinctrl/pinconf-generic.c | 130 +++
+ drivers/pinctrl/pinconf.h | 4 +
+ include/dt-bindings/pinctrl/amlogic,pinctrl.h | 46 +
+ include/linux/pinctrl/pinconf-generic.h | 4 +
+ 53 files changed, 1635 insertions(+), 135 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/amlogic,pinctrl-a4.yaml
+ create mode 100644 drivers/pinctrl/meson/pinctrl-amlogic-a4.c
+ create mode 100644 include/dt-bindings/pinctrl/amlogic,pinctrl.h
+Merging asahi-soc/asahi-soc/for-next (00a97a7f66d2 Merge branch 'asahi-soc/soc' into asahi-soc/for-next)
+$ git merge -m Merge branch 'asahi-soc/for-next' of https://github.com/AsahiLinux/linux.git asahi-soc/asahi-soc/for-next
+Merge made by the 'ort' strategy.
+ arch/arm64/boot/dts/apple/s5l8960x-5s.dtsi | 4 ++
+ arch/arm64/boot/dts/apple/s5l8960x.dtsi | 7 +++
+ arch/arm64/boot/dts/apple/s800-0-3-common.dtsi | 4 ++
+ arch/arm64/boot/dts/apple/s800-0-3.dtsi | 7 +++
+ arch/arm64/boot/dts/apple/t7000-handheld.dtsi | 4 ++
+ arch/arm64/boot/dts/apple/t7000.dtsi | 7 +++
+ arch/arm64/boot/dts/apple/t8010-common.dtsi | 4 ++
+ arch/arm64/boot/dts/apple/t8010.dtsi | 7 +++
+ arch/arm64/boot/dts/apple/t8015-8.dtsi | 4 ++
+ arch/arm64/boot/dts/apple/t8015.dtsi | 7 +++
+ arch/arm64/boot/dts/apple/t8103-j293.dts | 31 +++++++++++++
+ arch/arm64/boot/dts/apple/t8103.dtsi | 61 ++++++++++++++++++++++++++
+ arch/arm64/boot/dts/apple/t8112-j493.dts | 31 +++++++++++++
+ arch/arm64/boot/dts/apple/t8112.dtsi | 61 ++++++++++++++++++++++++++
+ 14 files changed, 239 insertions(+)
+Merging aspeed/for-next (bf8f48263c0e Merge remote-tracking branches 'aspeed/dt', 'aspeed/drivers', 'aspeed/fixes' and 'nuvoton/dt' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git aspeed/for-next
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/ipmi/ipmb-dev.yaml | 56 ++
+ arch/arm/boot/dts/aspeed/Makefile | 1 -
+ .../boot/dts/aspeed/aspeed-bmc-ampere-mtjade.dts | 2 +-
+ .../aspeed/aspeed-bmc-arm-stardragon4800-rep2.dts | 4 +-
+ .../dts/aspeed/aspeed-bmc-asrock-e3c246d4i.dts | 2 +-
+ .../boot/dts/aspeed/aspeed-bmc-bytedance-g220a.dts | 4 +-
+ .../boot/dts/aspeed/aspeed-bmc-delta-ahe50dc.dts | 2 +-
+ .../dts/aspeed/aspeed-bmc-facebook-bletchley.dts | 5 -
+ .../arm/boot/dts/aspeed/aspeed-bmc-ibm-bonnell.dts | 2 +-
+ .../arm/boot/dts/aspeed/aspeed-bmc-ibm-everest.dts | 2 +-
+ .../arm/boot/dts/aspeed/aspeed-bmc-ibm-rainier.dts | 4 +-
+ .../arm/boot/dts/aspeed/aspeed-bmc-ibm-system1.dts | 139 +--
+ .../boot/dts/aspeed/aspeed-bmc-lenovo-hr630.dts | 46 +-
+ .../boot/dts/aspeed/aspeed-bmc-lenovo-hr855xg2.dts | 68 +-
+ .../arm/boot/dts/aspeed/aspeed-bmc-opp-lanyang.dts | 14 +-
+ arch/arm/boot/dts/aspeed/aspeed-bmc-opp-nicole.dts | 10 +-
+ .../boot/dts/aspeed/aspeed-bmc-opp-palmetto.dts | 40 +-
+ .../arm/boot/dts/aspeed/aspeed-bmc-opp-romulus.dts | 6 +-
+ arch/arm/boot/dts/aspeed/aspeed-bmc-opp-swift.dts | 974 ---------------------
+ arch/arm/boot/dts/aspeed/aspeed-bmc-opp-zaius.dts | 8 +-
+ arch/arm/boot/dts/aspeed/aspeed-g4.dtsi | 93 +-
+ arch/arm/boot/dts/aspeed/aspeed-g5.dtsi | 109 ++-
+ arch/arm/boot/dts/aspeed/aspeed-g6.dtsi | 249 +++---
+ arch/arm/boot/dts/nuvoton/nuvoton-npcm730-gbs.dts | 12 +-
+ .../dts/nuvoton/nuvoton-npcm750-runbmc-olympus.dts | 120 +--
+ arch/arm/mach-aspeed/Kconfig | 1 -
+ drivers/soc/aspeed/aspeed-lpc-snoop.c | 2 +-
+ 27 files changed, 566 insertions(+), 1409 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/ipmi/ipmb-dev.yaml
+ delete mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-opp-swift.dts
+Merging at91/at91-next (a8aab30697c5 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 | 33 ++++++-
+ .../devicetree/bindings/arm/atmel-sysregs.txt | 1 +
+ arch/arm/boot/dts/microchip/aks-cdu.dts | 2 +-
+ arch/arm/boot/dts/microchip/animeo_ip.dts | 2 +-
+ arch/arm/boot/dts/microchip/at91-foxg20.dts | 2 +-
+ arch/arm/boot/dts/microchip/at91-qil_a9260.dts | 2 +-
+ arch/arm/boot/dts/microchip/at91-sam9_l9260.dts | 2 +-
+ .../boot/dts/microchip/at91-sama5d27_som1_ek.dts | 4 +-
+ .../arm/boot/dts/microchip/at91-sama5d2_ptc_ek.dts | 4 +-
+ .../boot/dts/microchip/at91-sama5d2_xplained.dts | 4 +-
+ .../boot/dts/microchip/at91-sama5d3_xplained.dts | 4 +-
+ .../boot/dts/microchip/at91-sama5d4_ma5d4evk.dts | 4 +-
+ .../boot/dts/microchip/at91-sama5d4_xplained.dts | 4 +-
+ arch/arm/boot/dts/microchip/at91-sama5d4ek.dts | 4 +-
+ .../boot/dts/microchip/at91-sama7d65_curiosity.dts | 73 +++++++++++++++
+ arch/arm/boot/dts/microchip/at91-sama7g5ek.dts | 1 +
+ arch/arm/boot/dts/microchip/at91-vinco.dts | 4 +-
+ arch/arm/boot/dts/microchip/at91rm9200.dtsi | 2 +-
+ arch/arm/boot/dts/microchip/at91rm9200ek.dts | 2 +-
+ arch/arm/boot/dts/microchip/at91sam9260.dtsi | 2 +-
+ arch/arm/boot/dts/microchip/at91sam9260ek.dts | 2 +-
+ arch/arm/boot/dts/microchip/at91sam9261.dtsi | 2 +-
+ arch/arm/boot/dts/microchip/at91sam9261ek.dts | 2 +-
+ arch/arm/boot/dts/microchip/at91sam9263.dtsi | 2 +-
+ arch/arm/boot/dts/microchip/at91sam9263ek.dts | 2 +-
+ .../boot/dts/microchip/at91sam9g20ek_common.dtsi | 2 +-
+ arch/arm/boot/dts/microchip/at91sam9g45.dtsi | 4 +-
+ arch/arm/boot/dts/microchip/at91sam9m10g45ek.dts | 4 +-
+ arch/arm/boot/dts/microchip/at91sam9n12.dtsi | 2 +-
+ arch/arm/boot/dts/microchip/at91sam9n12ek.dts | 2 +-
+ arch/arm/boot/dts/microchip/at91sam9x5.dtsi | 4 +-
+ arch/arm/boot/dts/microchip/ethernut5.dts | 2 +-
+ arch/arm/boot/dts/microchip/evk-pro3.dts | 2 +-
+ arch/arm/boot/dts/microchip/mpa1600.dts | 2 +-
+ arch/arm/boot/dts/microchip/pm9g45.dts | 4 +-
+ arch/arm/boot/dts/microchip/sam9x60.dtsi | 4 +-
+ arch/arm/boot/dts/microchip/sama5d2.dtsi | 4 +-
+ arch/arm/boot/dts/microchip/sama5d3.dtsi | 4 +-
+ arch/arm/boot/dts/microchip/sama5d3xmb.dtsi | 4 +-
+ arch/arm/boot/dts/microchip/sama5d4.dtsi | 4 +-
+ arch/arm/boot/dts/microchip/sama7d65.dtsi | 95 +++++++++++++++++++
+ arch/arm/boot/dts/microchip/tny_a9260.dts | 2 +-
+ arch/arm/boot/dts/microchip/tny_a9260_common.dtsi | 2 +-
+ arch/arm/boot/dts/microchip/tny_a9263.dts | 2 +-
+ arch/arm/boot/dts/microchip/tny_a9g20.dts | 2 +-
+ arch/arm/boot/dts/microchip/usb_a9260.dts | 2 +-
+ arch/arm/boot/dts/microchip/usb_a9260_common.dtsi | 11 +--
+ arch/arm/boot/dts/microchip/usb_a9263.dts | 11 +--
+ arch/arm/boot/dts/microchip/usb_a9g20-dab-mmx.dtsi | 10 +-
+ arch/arm/boot/dts/microchip/usb_a9g20.dts | 2 +-
+ arch/arm/boot/dts/microchip/usb_a9g20_common.dtsi | 2 +-
+ arch/arm/boot/dts/microchip/usb_a9g20_lpw.dts | 4 +-
+ arch/arm/mach-at91/pm.c | 47 +++++++---
+ arch/arm/mach-at91/pm.h | 1 +
+ arch/arm/mach-at91/pm_data-offsets.c | 2 +
+ arch/arm/mach-at91/pm_suspend.S | 101 +++++++++++++++++++--
+ drivers/soc/atmel/soc.c | 5 +
+ drivers/soc/atmel/soc.h | 3 +
+ 58 files changed, 411 insertions(+), 107 deletions(-)
+Merging broadcom/next (bdac656f1bb5 Merge branch 'devicetree/fixes' into next)
+$ git merge -m Merge branch 'next' of https://github.com/Broadcom/stblinux.git broadcom/next
+Auto-merging arch/arm/boot/dts/broadcom/bcm2711.dtsi
+Auto-merging arch/arm64/boot/dts/broadcom/bcm2712.dtsi
+Merge made by the 'ort' strategy.
+ arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts | 8 ++
+ arch/arm64/boot/dts/broadcom/bcm2712.dtsi | 147 +++++++++++++++++++++++
+ 2 files changed, 155 insertions(+)
+Merging davinci/davinci/for-next (58abc69e479c ARM: dts: ti: davinci: Align GPIO hog name with bindings)
+$ 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
+Merge made by the 'ort' strategy.
+ arch/arm/boot/dts/ti/davinci/da850-lego-ev3.dts | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+Merging drivers-memory/for-next (90a0fbaac4a5 memory: mtk-smi: Add ostd setting for mt8192)
+$ 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.
+ drivers/memory/mtk-smi.c | 33 +++++++++++++++++++++++++++++++++
+ drivers/memory/tegra/tegra20-emc.c | 4 +---
+ 2 files changed, 34 insertions(+), 3 deletions(-)
+Merging imx-mxs/for-next (90453dc4dee2 Merge branch 'imx/dt64' 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 MAINTAINERS
+Merge made by the 'ort' strategy.
+ Documentation/devicetree/bindings/arm/fsl.yaml | 27 +-
+ MAINTAINERS | 1 +
+ arch/arm/boot/dts/nxp/imx/Makefile | 10 +
+ arch/arm/boot/dts/nxp/imx/imx31.dtsi | 2 +-
+ arch/arm/boot/dts/nxp/imx/imx50.dtsi | 2 +-
+ arch/arm/boot/dts/nxp/imx/imx51.dtsi | 2 +-
+ arch/arm/boot/dts/nxp/imx/imx53-mba53.dts | 2 +-
+ arch/arm/boot/dts/nxp/imx/imx53-ppd.dts | 2 +-
+ arch/arm/boot/dts/nxp/imx/imx53.dtsi | 2 +-
+ .../boot/dts/nxp/imx/imx6dl-colibri-v1.2-aster.dts | 11 +
+ .../dts/nxp/imx/imx6dl-colibri-v1.2-eval-v3.dts | 11 +
+ .../dts/nxp/imx/imx6dl-colibri-v1.2-iris-v2.dts | 11 +
+ .../boot/dts/nxp/imx/imx6dl-colibri-v1.2-iris.dts | 11 +
+ .../dts/nxp/imx/imx6q-apalis-v1.2-eval-v1.2.dts | 11 +
+ .../boot/dts/nxp/imx/imx6q-apalis-v1.2-eval.dts | 11 +
+ .../dts/nxp/imx/imx6q-apalis-v1.2-ixora-v1.1.dts | 11 +
+ .../dts/nxp/imx/imx6q-apalis-v1.2-ixora-v1.2.dts | 11 +
+ .../boot/dts/nxp/imx/imx6q-apalis-v1.2-ixora.dts | 11 +
+ arch/arm/boot/dts/nxp/imx/imx6qdl-apalis-v1.2.dtsi | 57 +
+ arch/arm/boot/dts/nxp/imx/imx6qdl-apalis.dtsi | 2 -
+ .../arm/boot/dts/nxp/imx/imx6qdl-colibri-v1.2.dtsi | 57 +
+ arch/arm/boot/dts/nxp/imx/imx6qdl-colibri.dtsi | 2 -
+ arch/arm/boot/dts/nxp/imx/imx6qdl-mba6.dtsi | 2 +-
+ arch/arm/boot/dts/nxp/imx/imx6qdl-tqma6.dtsi | 25 +-
+ arch/arm/boot/dts/nxp/imx/imx6qdl-tqma6a.dtsi | 4 +-
+ arch/arm/boot/dts/nxp/imx/imx6qdl-tqma6b.dtsi | 4 +-
+ arch/arm/boot/dts/nxp/imx/imx6ul-14x14-evk.dtsi | 32 +
+ .../boot/dts/nxp/imx/imx6ul-tqma6ul-common.dtsi | 11 +-
+ .../boot/dts/nxp/imx/imx6ul-tqma6ul1-mba6ulx.dts | 3 +-
+ arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul1.dtsi | 2 -
+ .../boot/dts/nxp/imx/imx6ul-var-som-concerto.dts | 320 ++++++
+ arch/arm/boot/dts/nxp/imx/imx6ul-var-som.dtsi | 233 ++++
+ arch/arm/boot/dts/nxp/imx/imx7-mba7.dtsi | 2 +-
+ arch/arm/boot/dts/nxp/imx/imx7-tqma7.dtsi | 7 +
+ arch/arm/boot/dts/nxp/imx/imx7d-sdb.dts | 32 +
+ arch/arm/boot/dts/nxp/imx/imx7s.dtsi | 56 +-
+ arch/arm/boot/dts/nxp/imx/mba6ulx.dtsi | 2 +-
+ arch/arm/boot/dts/nxp/mxs/Makefile | 3 +
+ arch/arm/boot/dts/nxp/mxs/imx28-btt3-0.dts | 12 +
+ arch/arm/boot/dts/nxp/mxs/imx28-btt3-1.dts | 8 +
+ arch/arm/boot/dts/nxp/mxs/imx28-btt3-2.dts | 39 +
+ arch/arm/boot/dts/nxp/mxs/imx28-btt3.dtsi | 313 ++++++
+ arch/arm/boot/dts/nxp/mxs/imx28-sps1.dts | 13 +-
+ arch/arm/boot/dts/nxp/vf/vf610-bk4.dts | 4 +-
+ arch/arm/boot/dts/nxp/vf/vf610-colibri.dtsi | 1 -
+ arch/arm/boot/dts/nxp/vf/vf610-zii-dev-rev-c.dts | 4 +-
+ arch/arm/boot/dts/nxp/vf/vfxxx.dtsi | 21 +-
+ arch/arm/mach-imx/common.h | 2 +-
+ arch/arm64/boot/dts/freescale/Makefile | 21 +
+ .../arm64/boot/dts/freescale/fsl-ls1088a-ten64.dts | 44 +
+ .../arm64/boot/dts/freescale/imx8-apalis-v1.1.dtsi | 16 +
+ arch/arm64/boot/dts/freescale/imx8-ss-hsio.dtsi | 30 +-
+ arch/arm64/boot/dts/freescale/imx8dxl-evk.dts | 42 +
+ .../arm64/boot/dts/freescale/imx8mm-kontron-bl.dts | 10 +-
+ .../boot/dts/freescale/imx8mm-kontron-osm-s.dtsi | 7 +-
+ .../freescale/imx8mm-phyboard-polis-peb-av-10.dtso | 237 ++++
+ .../imx8mm-phyboard-polis-peb-eval-01.dtso | 72 ++
+ .../dts/freescale/imx8mm-phyboard-polis-rdk.dts | 17 +-
+ .../boot/dts/freescale/imx8mm-phycore-no-eth.dtso | 12 +
+ .../dts/freescale/imx8mm-phycore-no-spiflash.dtso | 16 +
+ .../boot/dts/freescale/imx8mm-phycore-rpmsg.dtso | 58 +
+ .../boot/dts/freescale/imx8mm-phycore-som.dtsi | 22 +-
+ .../boot/dts/freescale/imx8mm-phygate-tauri-l.dts | 11 +
+ .../arm64/boot/dts/freescale/imx8mm-tqma8mqml.dtsi | 1 +
+ arch/arm64/boot/dts/freescale/imx8mm-verdin.dtsi | 21 -
+ .../boot/dts/freescale/imx8mn-bsh-smm-s2pro.dts | 1 -
+ .../arm64/boot/dts/freescale/imx8mn-tqma8mqnl.dtsi | 1 +
+ arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 22 +
+ .../boot/dts/freescale/imx8mp-kontron-osm-s.dtsi | 7 +-
+ arch/arm64/boot/dts/freescale/imx8mp-nominal.dtsi | 64 ++
+ .../arm64/boot/dts/freescale/imx8mp-skov-basic.dts | 10 +
+ .../arm64/boot/dts/freescale/imx8mp-skov-reva.dtsi | 126 ++-
+ .../boot/dts/freescale/imx8mp-skov-revb-hdmi.dts | 45 +-
+ .../boot/dts/freescale/imx8mp-skov-revb-lt6.dts | 60 ++
+ .../freescale/imx8mp-skov-revb-mi1010ait-1cp1.dts | 30 +-
+ .../boot/dts/freescale/imx8mp-skov-revc-bd500.dts | 91 ++
+ .../dts/freescale/imx8mp-skov-revc-tian-g07017.dts | 81 ++
+ .../dts/freescale/imx8mp-tqma8mpql-mba8mpxl.dts | 2 +-
+ .../arm64/boot/dts/freescale/imx8mp-tqma8mpql.dtsi | 1 +
+ arch/arm64/boot/dts/freescale/imx8mp.dtsi | 23 +-
+ .../boot/dts/freescale/imx8mq-librem5-devkit.dts | 25 +-
+ arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi | 26 +-
+ arch/arm64/boot/dts/freescale/imx8mq-tqma8mq.dtsi | 1 +
+ .../boot/dts/freescale/imx8qm-apalis-v1.1.dtsi | 2 -
+ arch/arm64/boot/dts/freescale/imx8qm-apalis.dtsi | 2 -
+ arch/arm64/boot/dts/freescale/imx8qm-mek.dts | 112 ++
+ arch/arm64/boot/dts/freescale/imx8qm-ss-hsio.dtsi | 24 +-
+ .../boot/dts/freescale/imx8qxp-mek-pcie-ep.dtso | 22 +
+ arch/arm64/boot/dts/freescale/imx8qxp-mek.dts | 32 +
+ arch/arm64/boot/dts/freescale/imx8x-colibri.dtsi | 4 +-
+ .../boot/dts/freescale/imx93-kontron-osm-s.dtsi | 5 +-
+ .../dts/freescale/imx93-tqma9352-mba93xxca.dts | 56 +-
+ .../dts/freescale/imx93-tqma9352-mba93xxla.dts | 6 +-
+ arch/arm64/boot/dts/freescale/imx93.dtsi | 8 +
+ arch/arm64/boot/dts/freescale/imx95-15x15-evk.dts | 1130 ++++++++++++++++++++
+ arch/arm64/boot/dts/freescale/imx95-19x19-evk.dts | 83 ++
+ arch/arm64/boot/dts/freescale/imx95.dtsi | 108 +-
+ arch/arm64/boot/dts/freescale/mba8mx.dtsi | 2 +-
+ arch/arm64/boot/dts/freescale/mba8xx.dtsi | 31 +-
+ arch/arm64/boot/dts/freescale/s32g2.dtsi | 141 +++
+ arch/arm64/boot/dts/freescale/s32g274a-evb.dts | 1 +
+ arch/arm64/boot/dts/freescale/s32g274a-rdb2.dts | 1 +
+ arch/arm64/boot/dts/freescale/s32g3.dtsi | 150 +++
+ arch/arm64/boot/dts/freescale/s32g399a-rdb3.dts | 9 +
+ arch/arm64/boot/dts/freescale/s32gxxxa-evb.dtsi | 222 ++++
+ arch/arm64/boot/dts/freescale/s32gxxxa-rdb.dtsi | 170 +++
+ arch/arm64/boot/dts/freescale/tqma8xx.dtsi | 12 +-
+ 107 files changed, 4712 insertions(+), 296 deletions(-)
+ create mode 100644 arch/arm/boot/dts/nxp/imx/imx6dl-colibri-v1.2-aster.dts
+ create mode 100644 arch/arm/boot/dts/nxp/imx/imx6dl-colibri-v1.2-eval-v3.dts
+ create mode 100644 arch/arm/boot/dts/nxp/imx/imx6dl-colibri-v1.2-iris-v2.dts
+ create mode 100644 arch/arm/boot/dts/nxp/imx/imx6dl-colibri-v1.2-iris.dts
+ create mode 100644 arch/arm/boot/dts/nxp/imx/imx6q-apalis-v1.2-eval-v1.2.dts
+ create mode 100644 arch/arm/boot/dts/nxp/imx/imx6q-apalis-v1.2-eval.dts
+ create mode 100644 arch/arm/boot/dts/nxp/imx/imx6q-apalis-v1.2-ixora-v1.1.dts
+ create mode 100644 arch/arm/boot/dts/nxp/imx/imx6q-apalis-v1.2-ixora-v1.2.dts
+ create mode 100644 arch/arm/boot/dts/nxp/imx/imx6q-apalis-v1.2-ixora.dts
+ create mode 100644 arch/arm/boot/dts/nxp/imx/imx6qdl-apalis-v1.2.dtsi
+ create mode 100644 arch/arm/boot/dts/nxp/imx/imx6qdl-colibri-v1.2.dtsi
+ create mode 100644 arch/arm/boot/dts/nxp/imx/imx6ul-var-som-concerto.dts
+ create mode 100644 arch/arm/boot/dts/nxp/imx/imx6ul-var-som.dtsi
+ create mode 100644 arch/arm/boot/dts/nxp/mxs/imx28-btt3-0.dts
+ create mode 100644 arch/arm/boot/dts/nxp/mxs/imx28-btt3-1.dts
+ create mode 100644 arch/arm/boot/dts/nxp/mxs/imx28-btt3-2.dts
+ create mode 100644 arch/arm/boot/dts/nxp/mxs/imx28-btt3.dtsi
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-phyboard-polis-peb-av-10.dtso
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-phyboard-polis-peb-eval-01.dtso
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-phycore-no-eth.dtso
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-phycore-no-spiflash.dtso
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-phycore-rpmsg.dtso
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-nominal.dtsi
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-skov-basic.dts
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-skov-revc-bd500.dts
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-skov-revc-tian-g07017.dts
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8qxp-mek-pcie-ep.dtso
+ create mode 100644 arch/arm64/boot/dts/freescale/imx95-15x15-evk.dts
+ create mode 100644 arch/arm64/boot/dts/freescale/s32gxxxa-evb.dtsi
+ create mode 100644 arch/arm64/boot/dts/freescale/s32gxxxa-rdb.dtsi
+Merging mediatek/for-next (a8a297e8bb3d Merge branch 'v6.14-next/soc' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux.git mediatek/for-next
+Merge made by the 'ort' strategy.
+Merging mvebu/for-next (ed9c2b28ebef arm64: dts: marvell: Use preferred node names for "simple-bus")
+$ 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.
+ .../bindings/arm/marvell/armada-37xx.yaml | 1 +
+ .../bindings/arm/marvell/armada-7k-8k.yaml | 25 ++++++++++++++++
+ .../devicetree/bindings/arm/marvell/armada-8kp.txt | 15 ----------
+ .../boot/dts/marvell/armada-385-clearfog-gtr.dtsi | 8 +++---
+ .../boot/dts/marvell/armada-388-clearfog-base.dts | 2 +-
+ arch/arm/boot/dts/marvell/kirkwood-openrd.dtsi | 4 +--
+ arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi | 2 +-
+ arch/arm64/boot/dts/marvell/armada-371x.dtsi | 17 -----------
+ arch/arm64/boot/dts/marvell/armada-3720-db.dts | 2 +-
+ .../dts/marvell/armada-3720-espressobin-emmc.dts | 2 +-
+ .../dts/marvell/armada-3720-espressobin-ultra.dts | 2 +-
+ .../marvell/armada-3720-espressobin-v7-emmc.dts | 2 +-
+ .../dts/marvell/armada-3720-espressobin-v7.dts | 2 +-
+ .../boot/dts/marvell/armada-3720-espressobin.dts | 2 +-
+ .../boot/dts/marvell/armada-3720-gl-mv1000.dts | 2 +-
+ .../boot/dts/marvell/armada-3720-turris-mox.dts | 2 +-
+ arch/arm64/boot/dts/marvell/armada-372x.dtsi | 3 --
+ arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 4 +--
+ arch/arm64/boot/dts/marvell/armada-7020.dtsi | 6 ----
+ arch/arm64/boot/dts/marvell/armada-7040.dtsi | 6 ----
+ arch/arm64/boot/dts/marvell/armada-8020.dtsi | 6 ----
+ .../dts/marvell/armada-8040-clearfog-gt-8k.dts | 8 +++---
+ .../boot/dts/marvell/armada-8040-puzzle-m801.dts | 2 +-
+ arch/arm64/boot/dts/marvell/armada-8040.dtsi | 6 ----
+ arch/arm64/boot/dts/marvell/armada-8080.dtsi | 6 ----
+ arch/arm64/boot/dts/marvell/armada-ap806-dual.dtsi | 3 --
+ arch/arm64/boot/dts/marvell/armada-ap806-quad.dtsi | 3 --
+ arch/arm64/boot/dts/marvell/armada-ap806.dtsi | 6 ----
+ arch/arm64/boot/dts/marvell/armada-ap807-quad.dtsi | 3 --
+ arch/arm64/boot/dts/marvell/armada-ap807.dtsi | 6 ----
+ arch/arm64/boot/dts/marvell/armada-ap80x.dtsi | 33 +++++++++++-----------
+ .../dts/marvell/armada-ap810-ap0-octa-core.dtsi | 1 -
+ arch/arm64/boot/dts/marvell/armada-ap810-ap0.dtsi | 24 ++++++++--------
+ arch/arm64/boot/dts/marvell/armada-cp110.dtsi | 4 ---
+ arch/arm64/boot/dts/marvell/armada-cp115.dtsi | 4 ---
+ arch/arm64/boot/dts/marvell/armada-cp11x.dtsi | 4 +--
+ arch/arm64/boot/dts/marvell/cn9130-sr-som.dtsi | 3 --
+ 37 files changed, 78 insertions(+), 153 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/arm/marvell/armada-8kp.txt
+ delete mode 100644 arch/arm64/boot/dts/marvell/armada-371x.dtsi
+Merging omap/for-next (065f3bd4f22b Merge branch 'omap-for-v6.15/dt' into tmp/omap-next-20250205.163245)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap.git omap/for-next
+Merge made by the 'ort' strategy.
+ Documentation/devicetree/bindings/arm/ti/omap.yaml | 7 +++++++
+ arch/arm/boot/dts/ti/omap/omap3-evm-processor-common.dtsi | 2 +-
+ arch/arm/boot/dts/ti/omap/omap4-l4.dtsi | 8 ++++----
+ arch/arm/boot/dts/ti/omap/omap4-panda-a4.dts | 5 +++++
+ 4 files changed, 17 insertions(+), 5 deletions(-)
+Merging qcom/for-next (e1b3b837e020 Merge branches 'arm32-for-6.15', 'arm64-defconfig-for-6.15', 'arm64-fixes-for-6.14', 'arm64-for-6.15', 'clk-fixes-for-6.14', 'clk-for-6.15', 'drivers-fixes-for-6.14' and 'drivers-for-6.15' 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/arm64/configs/defconfig
+Auto-merging drivers/clk/qcom/dispcc-sm8750.c
+Merge made by the 'ort' strategy.
+ Documentation/devicetree/bindings/arm/qcom.yaml | 5 +-
+ .../devicetree/bindings/clock/qcom,rpmcc.yaml | 2 +
+ .../bindings/clock/qcom,sc7280-lpasscorecc.yaml | 5 +-
+ .../bindings/clock/qcom,sm8450-camcc.yaml | 1 -
+ .../bindings/power/qcom,kpss-acc-v2.yaml | 4 +-
+ .../devicetree/bindings/soc/qcom/qcom,geni-se.yaml | 5 +
+ .../bindings/soc/qcom/qcom,pmic-glink.yaml | 1 +
+ arch/arm/boot/dts/qcom/msm8926.dtsi | 11 +
+ .../dts/qcom/qcom-apq8026-samsung-matisse-wifi.dts | 1 +
+ .../dts/qcom/qcom-apq8026-samsung-milletwifi.dts | 2 +
+ .../arm/boot/dts/qcom/qcom-apq8074-dragonboard.dts | 4 +-
+ arch/arm/boot/dts/qcom/qcom-ipq4018-ap120c-ac.dtsi | 2 +-
+ arch/arm/boot/dts/qcom/qcom-ipq4018-jalapeno.dts | 4 +-
+ arch/arm/boot/dts/qcom/qcom-ipq4019-ap.dk07.1.dtsi | 2 +-
+ arch/arm/boot/dts/qcom/qcom-ipq4019.dtsi | 2 +-
+ .../dts/qcom/qcom-msm8226-microsoft-common.dtsi | 6 +-
+ .../dts/qcom/qcom-msm8226-microsoft-dempsey.dts | 1 +
+ .../dts/qcom/qcom-msm8226-microsoft-makepeace.dts | 1 +
+ .../dts/qcom/qcom-msm8226-microsoft-moneypenny.dts | 1 +
+ .../qcom/qcom-msm8226-samsung-matisse-common.dtsi | 19 +-
+ arch/arm/boot/dts/qcom/qcom-msm8226.dtsi | 155 ++
+ arch/arm/boot/dts/qcom/qcom-msm8926-htc-memul.dts | 14 +-
+ .../qcom/qcom-msm8926-microsoft-superman-lte.dts | 1 +
+ .../boot/dts/qcom/qcom-msm8926-microsoft-tesla.dts | 1 +
+ .../dts/qcom/qcom-msm8926-motorola-peregrine.dts | 2 +-
+ .../dts/qcom/qcom-msm8926-samsung-matisselte.dts | 5 +
+ arch/arm/boot/dts/qcom/qcom-msm8960.dtsi | 99 +-
+ arch/arm64/boot/dts/qcom/Makefile | 7 +
+ arch/arm64/boot/dts/qcom/ipq5332.dtsi | 135 +
+ arch/arm64/boot/dts/qcom/ipq5424-rdp466.dts | 7 +
+ arch/arm64/boot/dts/qcom/ipq5424.dtsi | 208 ++
+ arch/arm64/boot/dts/qcom/ipq6018-cp01-c1.dts | 2 +-
+ arch/arm64/boot/dts/qcom/ipq6018-mp5496.dtsi | 44 +
+ arch/arm64/boot/dts/qcom/ipq6018.dtsi | 28 +-
+ arch/arm64/boot/dts/qcom/ipq9574-rdp-common.dtsi | 55 +-
+ arch/arm64/boot/dts/qcom/ipq9574-rdp433.dts | 12 -
+ arch/arm64/boot/dts/qcom/ipq9574.dtsi | 85 +-
+ arch/arm64/boot/dts/qcom/msm8917-xiaomi-riva.dts | 27 +-
+ arch/arm64/boot/dts/qcom/msm8917.dtsi | 2 +-
+ .../boot/dts/qcom/msm8998-lenovo-miix-630.dts | 2 +-
+ arch/arm64/boot/dts/qcom/pm8937.dtsi | 8 +
+ arch/arm64/boot/dts/qcom/qcm2290.dtsi | 24 +
+ arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts | 116 +-
+ arch/arm64/boot/dts/qcom/qcm6490-idp.dts | 23 +-
+ arch/arm64/boot/dts/qcom/qcm6490-shift-otter.dts | 2 +-
+ arch/arm64/boot/dts/qcom/qcs615.dtsi | 29 +-
+ .../dts/qcom/qcs6490-rb3gen2-vision-mezzanine.dtso | 89 +
+ arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts | 282 ++-
+ arch/arm64/boot/dts/qcom/qcs8300-pmics.dtsi | 51 +
+ arch/arm64/boot/dts/qcom/qcs8300-ride.dts | 37 +-
+ arch/arm64/boot/dts/qcom/qcs8300.dtsi | 1947 +++++++++++++-
+ arch/arm64/boot/dts/qcom/qrb2210-rb1.dts | 2 +-
+ arch/arm64/boot/dts/qcom/qrb4210-rb2.dts | 2 +-
+ .../dts/qcom/qrb5165-rb5-vision-mezzanine.dtso | 11 -
+ arch/arm64/boot/dts/qcom/qrb5165-rb5.dts | 23 +-
+ arch/arm64/boot/dts/qcom/sa8155p-adp.dts | 4 +-
+ arch/arm64/boot/dts/qcom/sa8540p-ride.dts | 2 -
+ arch/arm64/boot/dts/qcom/sa8775p-ride.dtsi | 5 +-
+ arch/arm64/boot/dts/qcom/sa8775p.dtsi | 162 +-
+ arch/arm64/boot/dts/qcom/sar2130p.dtsi | 61 +
+ .../boot/dts/qcom/sc7180-trogdor-homestar.dtsi | 2 +-
+ .../boot/dts/qcom/sc7180-trogdor-kingoftown.dts | 2 +-
+ arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 2 +-
+ .../boot/dts/qcom/sc7180-trogdor-pazquel360.dtsi | 2 +-
+ .../arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi | 2 +-
+ .../boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi | 2 +-
+ arch/arm64/boot/dts/qcom/sc7280.dtsi | 186 +-
+ arch/arm64/boot/dts/qcom/sc8180x.dtsi | 2 +-
+ arch/arm64/boot/dts/qcom/sc8280xp-crd.dts | 24 +-
+ .../dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 5 +-
+ .../boot/dts/qcom/sc8280xp-microsoft-arcata.dts | 2 +-
+ .../boot/dts/qcom/sc8280xp-microsoft-blackrock.dts | 2 +-
+ arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi | 58 +-
+ arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 16 +-
+ .../arm64/boot/dts/qcom/sda660-inforce-ifc6560.dts | 2 +-
+ .../boot/dts/qcom/sdm630-sony-xperia-nile.dtsi | 2 +-
+ arch/arm64/boot/dts/qcom/sdm630.dtsi | 3 +
+ arch/arm64/boot/dts/qcom/sdm632-fairphone-fp3.dts | 48 +-
+ arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 4 -
+ .../qcom/sdm845-db845c-navigation-mezzanine.dtso | 11 -
+ arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 12 +-
+ arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 6 +-
+ .../arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 4 -
+ .../boot/dts/qcom/sdm845-samsung-starqltechn.dts | 271 +-
+ arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts | 4 -
+ .../boot/dts/qcom/sdm845-sony-xperia-tama.dtsi | 4 -
+ .../dts/qcom/sdm845-xiaomi-beryllium-common.dtsi | 4 -
+ arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts | 4 -
+ arch/arm64/boot/dts/qcom/sdm845.dtsi | 2 -
+ .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 6 +-
+ arch/arm64/boot/dts/qcom/sdx75.dtsi | 16 +-
+ arch/arm64/boot/dts/qcom/sm6115-fxtec-pro1x.dts | 2 +-
+ arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts | 2 +-
+ arch/arm64/boot/dts/qcom/sm6125-xiaomi-ginkgo.dts | 295 +++
+ .../boot/dts/qcom/sm7325-nothing-spacewar.dts | 208 +-
+ arch/arm64/boot/dts/qcom/sm8150-hdk.dts | 2 +-
+ .../boot/dts/qcom/sm8150-microsoft-surface-duo.dts | 8 +-
+ arch/arm64/boot/dts/qcom/sm8150-mtp.dts | 8 +-
+ .../boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi | 2 +-
+ arch/arm64/boot/dts/qcom/sm8250.dtsi | 2 +-
+ arch/arm64/boot/dts/qcom/sm8350.dtsi | 6 +-
+ arch/arm64/boot/dts/qcom/sm8450.dtsi | 64 +
+ arch/arm64/boot/dts/qcom/sm8550-samsung-q5q.dts | 12 +-
+ arch/arm64/boot/dts/qcom/sm8550.dtsi | 604 ++++-
+ arch/arm64/boot/dts/qcom/sm8650.dtsi | 2645 +++++++++++++++-----
+ arch/arm64/boot/dts/qcom/sm8750-mtp.dts | 14 +
+ arch/arm64/boot/dts/qcom/sm8750-qrd.dts | 14 +
+ arch/arm64/boot/dts/qcom/sm8750.dtsi | 618 ++++-
+ arch/arm64/boot/dts/qcom/x1-crd.dtsi | 1750 +++++++++++++
+ arch/arm64/boot/dts/qcom/x1e001de-devkit.dts | 8 +-
+ .../qcom/x1e78100-lenovo-thinkpad-t14s-oled.dts | 12 +
+ .../dts/qcom/x1e78100-lenovo-thinkpad-t14s.dts | 1126 +--------
+ .../dts/qcom/x1e78100-lenovo-thinkpad-t14s.dtsi | 1487 +++++++++++
+ arch/arm64/boot/dts/qcom/x1e80100-crd.dts | 1270 +---------
+ .../boot/dts/qcom/x1e80100-dell-xps13-9345.dts | 22 +-
+ .../boot/dts/qcom/x1e80100-hp-omnibook-x14.dts | 4 +
+ .../boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts | 5 +-
+ .../boot/dts/qcom/x1e80100-microsoft-romulus.dtsi | 4 +-
+ arch/arm64/boot/dts/qcom/x1e80100-pmics.dtsi | 2 +-
+ arch/arm64/boot/dts/qcom/x1e80100-qcp.dts | 149 ++
+ arch/arm64/boot/dts/qcom/x1e80100.dtsi | 968 +++----
+ arch/arm64/boot/dts/qcom/x1p42100-crd.dts | 17 +
+ arch/arm64/boot/dts/qcom/x1p42100.dtsi | 81 +
+ arch/arm64/configs/defconfig | 4 +
+ drivers/bus/qcom-ssc-block-bus.c | 34 +-
+ drivers/clk/qcom/Kconfig | 2 +-
+ drivers/clk/qcom/camcc-sa8775p.c | 3 +-
+ drivers/clk/qcom/camcc-sc7180.c | 2 +-
+ drivers/clk/qcom/camcc-sc7280.c | 2 +-
+ drivers/clk/qcom/camcc-sc8280xp.c | 2 +-
+ drivers/clk/qcom/camcc-sdm845.c | 1 +
+ drivers/clk/qcom/camcc-sm4450.c | 3 +-
+ drivers/clk/qcom/camcc-sm6350.c | 1 +
+ drivers/clk/qcom/camcc-sm7150.c | 1 -
+ drivers/clk/qcom/camcc-sm8150.c | 4 +-
+ drivers/clk/qcom/camcc-sm8250.c | 58 +-
+ drivers/clk/qcom/camcc-sm8550.c | 2 +-
+ drivers/clk/qcom/camcc-sm8650.c | 2 +-
+ drivers/clk/qcom/clk-alpha-pll.c | 52 +-
+ drivers/clk/qcom/clk-branch.c | 4 +-
+ drivers/clk/qcom/clk-smd-rpm.c | 32 +
+ drivers/clk/qcom/common.c | 6 +
+ drivers/clk/qcom/dispcc-qcm2290.c | 3 +-
+ drivers/clk/qcom/dispcc-sc7180.c | 1 +
+ drivers/clk/qcom/dispcc-sc7280.c | 1 +
+ drivers/clk/qcom/dispcc-sc8280xp.c | 7 +-
+ drivers/clk/qcom/dispcc-sdm845.c | 2 +-
+ drivers/clk/qcom/dispcc-sm4450.c | 3 +-
+ drivers/clk/qcom/dispcc-sm6115.c | 3 +-
+ drivers/clk/qcom/dispcc-sm6125.c | 1 +
+ drivers/clk/qcom/dispcc-sm6350.c | 1 +
+ drivers/clk/qcom/dispcc-sm6375.c | 1 +
+ drivers/clk/qcom/dispcc-sm7150.c | 1 -
+ drivers/clk/qcom/dispcc-sm8250.c | 2 +-
+ drivers/clk/qcom/dispcc-sm8450.c | 5 +-
+ drivers/clk/qcom/dispcc-sm8550.c | 5 +-
+ drivers/clk/qcom/dispcc-sm8750.c | 4 +-
+ drivers/clk/qcom/dispcc0-sa8775p.c | 3 +-
+ drivers/clk/qcom/dispcc1-sa8775p.c | 3 +-
+ drivers/clk/qcom/gcc-ipq5424.c | 24 +-
+ drivers/clk/qcom/gcc-msm8960.c | 1 -
+ drivers/clk/qcom/gcc-msm8974.c | 1 -
+ drivers/clk/qcom/gcc-sdm660.c | 2 +
+ drivers/clk/qcom/gcc-sm8650.c | 4 +-
+ drivers/clk/qcom/gcc-x1e80100.c | 30 -
+ drivers/clk/qcom/gdsc.c | 98 +-
+ drivers/clk/qcom/gdsc.h | 1 +
+ drivers/clk/qcom/gpucc-msm8998.c | 3 +-
+ drivers/clk/qcom/gpucc-sa8775p.c | 49 +-
+ drivers/clk/qcom/gpucc-sar2130p.c | 1 +
+ drivers/clk/qcom/gpucc-sc7180.c | 1 +
+ drivers/clk/qcom/gpucc-sc7280.c | 1 +
+ drivers/clk/qcom/gpucc-sc8280xp.c | 3 +-
+ drivers/clk/qcom/gpucc-sdm660.c | 5 +-
+ drivers/clk/qcom/gpucc-sdm845.c | 1 +
+ drivers/clk/qcom/gpucc-sm4450.c | 1 -
+ drivers/clk/qcom/gpucc-sm6350.c | 1 +
+ drivers/clk/qcom/gpucc-sm8150.c | 1 +
+ drivers/clk/qcom/gpucc-sm8250.c | 1 +
+ drivers/clk/qcom/gpucc-sm8350.c | 2 +-
+ drivers/clk/qcom/gpucc-x1p42100.c | 2 +-
+ drivers/clk/qcom/kpss-xcc.c | 1 -
+ drivers/clk/qcom/krait-cc.c | 1 -
+ drivers/clk/qcom/lpassaudiocc-sc7280.c | 23 +-
+ drivers/clk/qcom/lpasscc-sdm845.c | 1 -
+ drivers/clk/qcom/lpasscorecc-sc7180.c | 1 -
+ drivers/clk/qcom/lpasscorecc-sc7280.c | 1 -
+ drivers/clk/qcom/mmcc-apq8084.c | 2 +-
+ drivers/clk/qcom/mmcc-msm8960.c | 4 +-
+ drivers/clk/qcom/mmcc-msm8974.c | 2 +-
+ drivers/clk/qcom/mmcc-msm8994.c | 3 +-
+ drivers/clk/qcom/mmcc-msm8996.c | 4 +-
+ drivers/clk/qcom/mmcc-msm8998.c | 3 +-
+ drivers/clk/qcom/mmcc-sdm660.c | 6 +-
+ drivers/clk/qcom/videocc-sa8775p.c | 10 +-
+ drivers/clk/qcom/videocc-sm8350.c | 2 +-
+ drivers/clk/qcom/videocc-sm8450.c | 2 +-
+ drivers/clk/qcom/videocc-sm8550.c | 2 +-
+ drivers/mmc/host/sdhci-msm.c | 2 +-
+ drivers/soc/qcom/ice.c | 51 +-
+ drivers/soc/qcom/pdr_internal.h | 1 -
+ drivers/soc/qcom/qcom_aoss.c | 3 +-
+ drivers/soc/qcom/qcom_pd_mapper.c | 12 +
+ drivers/soc/qcom/qcom_pdr_msg.c | 3 +-
+ drivers/ufs/host/ufs-qcom.c | 2 +-
+ include/dt-bindings/clock/qcom,gcc-sdm660.h | 2 +
+ include/dt-bindings/clock/qcom,rpmcc.h | 4 +
+ include/soc/qcom/ice.h | 3 +-
+ 208 files changed, 12255 insertions(+), 4361 deletions(-)
+ create mode 100644 arch/arm/boot/dts/qcom/msm8926.dtsi
+ create mode 100644 arch/arm64/boot/dts/qcom/ipq6018-mp5496.dtsi
+ create mode 100644 arch/arm64/boot/dts/qcom/qcs6490-rb3gen2-vision-mezzanine.dtso
+ create mode 100644 arch/arm64/boot/dts/qcom/qcs8300-pmics.dtsi
+ create mode 100644 arch/arm64/boot/dts/qcom/sm6125-xiaomi-ginkgo.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/x1-crd.dtsi
+ create mode 100644 arch/arm64/boot/dts/qcom/x1e78100-lenovo-thinkpad-t14s-oled.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/x1e78100-lenovo-thinkpad-t14s.dtsi
+ create mode 100644 arch/arm64/boot/dts/qcom/x1p42100-crd.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/x1p42100.dtsi
+Merging renesas/next (3ade232c98a8 Merge branch 'renesas-fixes-for-v6.14' 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
+Merge made by the 'ort' strategy.
+ arch/arm64/boot/dts/renesas/r9a09g057.dtsi | 51 ++++++++++++++++++++++
+ .../boot/dts/renesas/r9a09g057h44-rzv2h-evk.dts | 15 +++++++
+ 2 files changed, 66 insertions(+)
+Merging reset/reset/next (c361baf67200 reset: imx: fix incorrect module device table)
+$ git merge -m Merge branch 'reset/next' of https://git.pengutronix.de/git/pza/linux reset/reset/next
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/firmware/fsl,scu.yaml | 12 +++
+ .../bindings/reset/atmel,at91sam9260-reset.yaml | 4 +
+ drivers/reset/Kconfig | 7 ++
+ drivers/reset/Makefile | 1 +
+ drivers/reset/reset-imx-scu.c | 101 +++++++++++++++++++++
+ 5 files changed, 125 insertions(+)
+ create mode 100644 drivers/reset/reset-imx-scu.c
+Merging rockchip/for-next (7131dad5dba8 Merge branch 'v6.15-armsoc/dts64' 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
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml
+Auto-merging arch/arm64/configs/defconfig
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/arm/rockchip.yaml | 25 +-
+ .../bindings/clock/rockchip,rk3528-cru.yaml | 64 +
+ .../bindings/clock/rockchip,rk3562-cru.yaml | 55 +
+ Documentation/devicetree/bindings/mfd/syscon.yaml | 2 +
+ .../devicetree/bindings/soc/rockchip/grf.yaml | 3 +
+ .../devicetree/bindings/vendor-prefixes.yaml | 4 +-
+ arch/arm64/boot/dts/rockchip/Makefile | 63 +
+ .../px30-ringneck-haikou-lvds-9904379.dtso | 130 ++
+ .../rockchip/px30-ringneck-haikou-video-demo.dtso | 190 +++
+ .../boot/dts/rockchip/px30-ringneck-haikou.dts | 2 +
+ arch/arm64/boot/dts/rockchip/px30-ringneck.dtsi | 4 -
+ arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts | 2 +-
+ arch/arm64/boot/dts/rockchip/rk3318-a95x-z2.dts | 4 +-
+ arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts | 8 +
+ arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi | 2 +-
+ .../rockchip/rk3399-puma-haikou-video-demo.dtso | 166 +++
+ .../arm64/boot/dts/rockchip/rk3399-puma-haikou.dts | 26 +-
+ arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 10 +-
+ .../arm64/boot/dts/rockchip/rk3399-roc-pc-plus.dts | 2 +-
+ arch/arm64/boot/dts/rockchip/rk3528-pinctrl.dtsi | 1397 ++++++++++++++++++++
+ arch/arm64/boot/dts/rockchip/rk3528-radxa-e20c.dts | 133 ++
+ arch/arm64/boot/dts/rockchip/rk3528.dtsi | 378 +++++-
+ arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi | 2 +
+ arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts | 8 +-
+ arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts | 8 +-
+ arch/arm64/boot/dts/rockchip/rk3568-photonicat.dts | 588 ++++++++
+ arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts | 14 -
+ arch/arm64/boot/dts/rockchip/rk356x-base.dtsi | 30 +-
+ .../boot/dts/rockchip/rk3576-armsom-sige5.dts | 50 +-
+ arch/arm64/boot/dts/rockchip/rk3576-evb1-v10.dts | 47 +
+ arch/arm64/boot/dts/rockchip/rk3576-roc-pc.dts | 736 +++++++++++
+ arch/arm64/boot/dts/rockchip/rk3576-rock-4d.dts | 751 +++++++++++
+ arch/arm64/boot/dts/rockchip/rk3576.dtsi | 205 ++-
+ .../arm64/boot/dts/rockchip/rk3588-armsom-lm7.dtsi | 4 +
+ .../boot/dts/rockchip/rk3588-armsom-sige7.dts | 75 ++
+ arch/arm64/boot/dts/rockchip/rk3588-base.dtsi | 110 +-
+ .../boot/dts/rockchip/rk3588-coolpi-cm5-evb.dts | 2 +-
+ .../dts/rockchip/rk3588-coolpi-cm5-genbook.dts | 2 +-
+ .../arm64/boot/dts/rockchip/rk3588-coolpi-cm5.dtsi | 4 +
+ .../dts/rockchip/rk3588-edgeble-neu6a-common.dtsi | 4 +
+ .../boot/dts/rockchip/rk3588-edgeble-neu6a-io.dtsi | 47 +
+ arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts | 50 +-
+ arch/arm64/boot/dts/rockchip/rk3588-extra.dtsi | 186 +++
+ arch/arm64/boot/dts/rockchip/rk3588-fet3588-c.dtsi | 4 +
+ .../dts/rockchip/rk3588-firefly-core-3588j.dtsi | 4 +
+ .../dts/rockchip/rk3588-firefly-icore-3588q.dtsi | 443 +++++++
+ .../boot/dts/rockchip/rk3588-firefly-itx-3588j.dts | 2 +-
+ .../rockchip/rk3588-friendlyelec-cm3588-nas.dts | 2 +-
+ .../dts/rockchip/rk3588-friendlyelec-cm3588.dtsi | 4 +
+ .../arm64/boot/dts/rockchip/rk3588-h96-max-v58.dts | 30 +-
+ .../dts/rockchip/rk3588-jaguar-pre-ict-tester.dtso | 171 +++
+ arch/arm64/boot/dts/rockchip/rk3588-jaguar.dts | 224 +++-
+ .../arm64/boot/dts/rockchip/rk3588-mnt-reform2.dts | 336 +++++
+ arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi | 6 +-
+ arch/arm64/boot/dts/rockchip/rk3588-ok3588-c.dts | 4 +
+ .../dts/rockchip/rk3588-orangepi-5-compact.dtsi | 11 +-
+ .../boot/dts/rockchip/rk3588-orangepi-5-max.dts | 67 +-
+ .../boot/dts/rockchip/rk3588-orangepi-5-plus.dts | 56 +-
+ .../boot/dts/rockchip/rk3588-orangepi-5-ultra.dts | 83 ++
+ .../arm64/boot/dts/rockchip/rk3588-orangepi-5.dtsi | 6 +-
+ .../arm64/boot/dts/rockchip/rk3588-quartzpro64.dts | 6 +-
+ arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts | 53 +
+ arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 83 +-
+ .../boot/dts/rockchip/rk3588-tiger-haikou.dts | 4 +-
+ arch/arm64/boot/dts/rockchip/rk3588-tiger.dtsi | 5 +-
+ .../arm64/boot/dts/rockchip/rk3588-toybrick-x0.dts | 4 +
+ .../arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi | 4 +
+ arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts | 31 +-
+ arch/arm64/boot/dts/rockchip/rk3588s-evb1-v10.dts | 6 +-
+ .../boot/dts/rockchip/rk3588s-gameforce-ace.dts | 6 +-
+ .../boot/dts/rockchip/rk3588s-indiedroid-nova.dts | 8 +-
+ .../boot/dts/rockchip/rk3588s-khadas-edge2.dts | 4 +
+ .../arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi | 6 +-
+ arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dts | 6 +-
+ .../boot/dts/rockchip/rk3588s-orangepi-5.dtsi | 16 +-
+ arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts | 6 +-
+ arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts | 42 +-
+ arch/arm64/configs/defconfig | 3 +
+ drivers/clk/rockchip/Kconfig | 14 +
+ drivers/clk/rockchip/Makefile | 2 +
+ drivers/clk/rockchip/clk-pll.c | 10 +-
+ drivers/clk/rockchip/clk-rk3188.c | 4 +-
+ drivers/clk/rockchip/clk-rk3328.c | 2 +-
+ drivers/clk/rockchip/clk-rk3528.c | 1116 ++++++++++++++++
+ drivers/clk/rockchip/clk-rk3562.c | 1101 +++++++++++++++
+ drivers/clk/rockchip/clk-rk3568.c | 1 +
+ drivers/clk/rockchip/clk.h | 63 +
+ drivers/clk/rockchip/rst-rk3528.c | 306 +++++
+ drivers/clk/rockchip/rst-rk3562.c | 429 ++++++
+ include/dt-bindings/clock/rk3188-cru-common.h | 2 +
+ include/dt-bindings/clock/rockchip,rk3528-cru.h | 453 +++++++
+ include/dt-bindings/clock/rockchip,rk3562-cru.h | 379 ++++++
+ include/dt-bindings/clock/rockchip,rk3576-cru.h | 5 +
+ include/dt-bindings/reset/rockchip,rk3528-cru.h | 241 ++++
+ include/dt-bindings/reset/rockchip,rk3562-cru.h | 358 +++++
+ 95 files changed, 11705 insertions(+), 120 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3528-cru.yaml
+ create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3562-cru.yaml
+ create mode 100644 arch/arm64/boot/dts/rockchip/px30-ringneck-haikou-lvds-9904379.dtso
+ create mode 100644 arch/arm64/boot/dts/rockchip/px30-ringneck-haikou-video-demo.dtso
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-puma-haikou-video-demo.dtso
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3528-pinctrl.dtsi
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3568-photonicat.dts
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3576-roc-pc.dts
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3576-rock-4d.dts
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-firefly-icore-3588q.dtsi
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-jaguar-pre-ict-tester.dtso
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-mnt-reform2.dts
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-ultra.dts
+ create mode 100644 drivers/clk/rockchip/clk-rk3528.c
+ create mode 100644 drivers/clk/rockchip/clk-rk3562.c
+ create mode 100644 drivers/clk/rockchip/rst-rk3528.c
+ create mode 100644 drivers/clk/rockchip/rst-rk3562.c
+ create mode 100644 include/dt-bindings/clock/rockchip,rk3528-cru.h
+ create mode 100644 include/dt-bindings/clock/rockchip,rk3562-cru.h
+ create mode 100644 include/dt-bindings/reset/rockchip,rk3528-cru.h
+ create mode 100644 include/dt-bindings/reset/rockchip,rk3562-cru.h
+Merging samsung-krzk/for-next (f0dbe0d40d08 Merge branch 'next/soc' 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 drivers/firmware/Kconfig
+Merge made by the 'ort' strategy.
+ Documentation/devicetree/bindings/arm/google.yaml | 3 +-
+ .../bindings/clock/samsung,exynos2200-cmu.yaml | 247 ++
+ .../bindings/clock/samsung,exynos7870-cmu.yaml | 227 ++
+ .../bindings/clock/samsung,exynos990-clock.yaml | 19 +
+ .../bindings/firmware/google,gs101-acpm-ipc.yaml | 50 +
+ .../bindings/hwinfo/samsung,exynos-chipid.yaml | 2 +
+ .../bindings/soc/samsung/exynos-pmu.yaml | 2 +
+ .../bindings/soc/samsung/exynos-usi.yaml | 100 +-
+ .../soc/samsung/samsung,exynos-sysreg.yaml | 5 +
+ MAINTAINERS | 10 +
+ arch/arm/mach-s3c/devs.c | 1 -
+ arch/arm/mach-s3c/setup-fb-24bpp-s3c64xx.c | 1 -
+ arch/arm64/boot/dts/exynos/exynos8895-dreamlte.dts | 72 +
+ arch/arm64/boot/dts/exynos/exynos8895.dtsi | 956 ++++-
+ arch/arm64/boot/dts/exynos/exynos990.dtsi | 92 +-
+ arch/arm64/boot/dts/exynos/exynosautov920.dtsi | 138 +
+ arch/arm64/boot/dts/exynos/google/Makefile | 1 +
+ arch/arm64/boot/dts/exynos/google/gs101-oriole.dts | 267 +-
+ .../boot/dts/exynos/google/gs101-pixel-common.dtsi | 294 ++
+ arch/arm64/boot/dts/exynos/google/gs101-raven.dts | 29 +
+ arch/arm64/boot/dts/exynos/google/gs101.dtsi | 66 +-
+ arch/arm64/boot/dts/tesla/fsd.dtsi | 26 +-
+ drivers/clk/samsung/Makefile | 2 +
+ drivers/clk/samsung/clk-cpu.c | 2 +-
+ drivers/clk/samsung/clk-exynos-audss.c | 1 +
+ drivers/clk/samsung/clk-exynos-clkout.c | 1 +
+ drivers/clk/samsung/clk-exynos2200.c | 3928 ++++++++++++++++++++
+ drivers/clk/samsung/clk-exynos3250.c | 4 +-
+ drivers/clk/samsung/clk-exynos4.c | 2 +-
+ drivers/clk/samsung/clk-exynos4412-isp.c | 2 +-
+ drivers/clk/samsung/clk-exynos5-subcmu.c | 1 +
+ drivers/clk/samsung/clk-exynos5250.c | 1 +
+ drivers/clk/samsung/clk-exynos5260.c | 3 -
+ drivers/clk/samsung/clk-exynos5410.c | 2 -
+ drivers/clk/samsung/clk-exynos5420.c | 1 +
+ drivers/clk/samsung/clk-exynos5433.c | 4 +-
+ drivers/clk/samsung/clk-exynos7.c | 1 -
+ drivers/clk/samsung/clk-exynos7870.c | 1829 +++++++++
+ drivers/clk/samsung/clk-exynos7885.c | 2 +-
+ drivers/clk/samsung/clk-exynos850.c | 2 +-
+ drivers/clk/samsung/clk-exynos8895.c | 2 +-
+ drivers/clk/samsung/clk-exynos990.c | 182 +-
+ drivers/clk/samsung/clk-exynosautov9.c | 2 +-
+ drivers/clk/samsung/clk-exynosautov920.c | 2 +-
+ drivers/clk/samsung/clk-fsd.c | 2 +-
+ drivers/clk/samsung/clk-gs101.c | 2 +-
+ drivers/clk/samsung/clk-pll.c | 1 +
+ drivers/clk/samsung/clk-pll.h | 1 +
+ drivers/clk/samsung/clk-s3c64xx.c | 1 -
+ drivers/clk/samsung/clk-s5pv210-audss.c | 1 +
+ drivers/clk/samsung/clk-s5pv210.c | 1 -
+ drivers/clk/samsung/clk.c | 4 +-
+ drivers/clk/samsung/clk.h | 1 +
+ drivers/firmware/Kconfig | 1 +
+ drivers/firmware/Makefile | 1 +
+ drivers/firmware/samsung/Kconfig | 14 +
+ drivers/firmware/samsung/Makefile | 4 +
+ drivers/firmware/samsung/exynos-acpm-pmic.c | 224 ++
+ drivers/firmware/samsung/exynos-acpm-pmic.h | 29 +
+ drivers/firmware/samsung/exynos-acpm.c | 769 ++++
+ drivers/firmware/samsung/exynos-acpm.h | 23 +
+ drivers/soc/samsung/exynos-asv.c | 1 +
+ drivers/soc/samsung/exynos-chipid.c | 5 +
+ drivers/soc/samsung/exynos-pmu.c | 1 +
+ drivers/soc/samsung/exynos-usi.c | 108 +-
+ drivers/soc/samsung/exynos3250-pmu.c | 1 +
+ drivers/soc/samsung/exynos5250-pmu.c | 1 +
+ drivers/soc/samsung/exynos5420-pmu.c | 1 +
+ include/dt-bindings/clock/samsung,exynos2200-cmu.h | 431 +++
+ include/dt-bindings/clock/samsung,exynos7870-cmu.h | 324 ++
+ include/dt-bindings/clock/samsung,exynos990.h | 21 +
+ include/dt-bindings/soc/samsung,exynos-usi.h | 17 +-
+ .../linux/firmware/samsung/exynos-acpm-protocol.h | 49 +
+ 73 files changed, 10194 insertions(+), 429 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/clock/samsung,exynos2200-cmu.yaml
+ create mode 100644 Documentation/devicetree/bindings/clock/samsung,exynos7870-cmu.yaml
+ create mode 100644 Documentation/devicetree/bindings/firmware/google,gs101-acpm-ipc.yaml
+ create mode 100644 arch/arm64/boot/dts/exynos/google/gs101-pixel-common.dtsi
+ create mode 100644 arch/arm64/boot/dts/exynos/google/gs101-raven.dts
+ create mode 100644 drivers/clk/samsung/clk-exynos2200.c
+ create mode 100644 drivers/clk/samsung/clk-exynos7870.c
+ create mode 100644 drivers/firmware/samsung/Kconfig
+ create mode 100644 drivers/firmware/samsung/Makefile
+ create mode 100644 drivers/firmware/samsung/exynos-acpm-pmic.c
+ create mode 100644 drivers/firmware/samsung/exynos-acpm-pmic.h
+ create mode 100644 drivers/firmware/samsung/exynos-acpm.c
+ create mode 100644 drivers/firmware/samsung/exynos-acpm.h
+ create mode 100644 include/dt-bindings/clock/samsung,exynos2200-cmu.h
+ create mode 100644 include/dt-bindings/clock/samsung,exynos7870-cmu.h
+ create mode 100644 include/linux/firmware/samsung/exynos-acpm-protocol.h
+Merging scmi/for-linux-next (dbbf6170bba6 Merge branch 'for-next/scmi/fixes', tags 'scmi-updates-6.15', 'juno-updates-6.15', 'ffa-updates-6.15' and 'smccc-update-6.15' of ssh://gitolite.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 drivers/firmware/arm_scmi/driver.c
+Merge made by the 'ort' strategy.
+ drivers/firmware/arm_scmi/bus.c | 3 +++
+ drivers/firmware/arm_scmi/driver.c | 13 ++++++++-----
+ 2 files changed, 11 insertions(+), 5 deletions(-)
+Merging sophgo/for-next (f047a9285f9f riscv: sophgo: dts: add cooling maps for Milk-V Pioneer)
+$ 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 | 4 ++-
+ .../riscv/boot/dts/sophgo/sg2042-milkv-pioneer.dts | 36 ++++++++++++++++++++++
+ arch/riscv/boot/dts/sophgo/sg2042.dtsi | 9 ++++++
+ 3 files changed, 48 insertions(+), 1 deletion(-)
+Merging spacemit/for-next (5b90a3d6092d riscv: dts: spacemit: Add Milk-V Jupiter board device tree)
+$ git merge -m Merge branch 'for-next' of https://github.com/spacemit-com/linux spacemit/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/riscv/spacemit.yaml | 1 +
+ MAINTAINERS | 3 +++
+ arch/riscv/boot/dts/spacemit/Makefile | 1 +
+ arch/riscv/boot/dts/spacemit/k1-milkv-jupiter.dts | 27 ++++++++++++++++++++++
+ 4 files changed, 32 insertions(+)
+ create mode 100644 arch/riscv/boot/dts/spacemit/k1-milkv-jupiter.dts
+Merging stm32/stm32-next (65954899a157 arm64: dts: st: add stm32mp215f-dk board support)
+$ git merge -m Merge branch 'stm32-next' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml
+Auto-merging arch/arm64/Kconfig.platforms
+Merge made by the 'ort' strategy.
+ .../bindings/arm/stm32/st,stm32-syscon.yaml | 2 +
+ .../devicetree/bindings/arm/stm32/stm32.yaml | 22 +
+ .../devicetree/bindings/sound/ics43432.txt | 19 -
+ .../bindings/sound/invensense,ics43432.yaml | 51 +
+ .../devicetree/bindings/vendor-prefixes.yaml | 2 +
+ arch/arm/boot/dts/st/Makefile | 4 +
+ arch/arm/boot/dts/st/stm32f746-disco.dts | 18 +
+ arch/arm/boot/dts/st/stm32f769-disco.dts | 7 +-
+ arch/arm/boot/dts/st/stm32mp131.dtsi | 35 +
+ arch/arm/boot/dts/st/stm32mp133c-prihmb.dts | 496 ++++++++
+ arch/arm/boot/dts/st/stm32mp135f-dhcor-dhsbc.dts | 30 +-
+ arch/arm/boot/dts/st/stm32mp15-pinctrl.dtsi | 292 +++++
+ arch/arm/boot/dts/st/stm32mp151c-plyaqm.dts | 376 ++++++
+ .../boot/dts/st/stm32mp153c-lxa-fairytux2-gen1.dts | 103 ++
+ .../boot/dts/st/stm32mp153c-lxa-fairytux2-gen2.dts | 147 +++
+ .../arm/boot/dts/st/stm32mp153c-lxa-fairytux2.dtsi | 397 +++++++
+ arch/arm/boot/dts/st/stm32mp157c-dk2.dts | 2 +-
+ arch/arm64/Kconfig.platforms | 4 +
+ arch/arm64/boot/dts/st/Makefile | 6 +-
+ arch/arm64/boot/dts/st/stm32mp211.dtsi | 128 +++
+ arch/arm64/boot/dts/st/stm32mp213.dtsi | 9 +
+ arch/arm64/boot/dts/st/stm32mp215.dtsi | 9 +
+ arch/arm64/boot/dts/st/stm32mp215f-dk.dts | 49 +
+ arch/arm64/boot/dts/st/stm32mp21xc.dtsi | 8 +
+ arch/arm64/boot/dts/st/stm32mp21xf.dtsi | 8 +
+ arch/arm64/boot/dts/st/stm32mp231.dtsi | 1214 ++++++++++++++++++++
+ arch/arm64/boot/dts/st/stm32mp233.dtsi | 94 ++
+ arch/arm64/boot/dts/st/stm32mp235.dtsi | 16 +
+ arch/arm64/boot/dts/st/stm32mp235f-dk.dts | 113 ++
+ arch/arm64/boot/dts/st/stm32mp23xc.dtsi | 8 +
+ arch/arm64/boot/dts/st/stm32mp23xf.dtsi | 8 +
+ arch/arm64/boot/dts/st/stm32mp257f-dk.dts | 113 ++
+ 32 files changed, 3765 insertions(+), 25 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/sound/ics43432.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/invensense,ics43432.yaml
+ create mode 100644 arch/arm/boot/dts/st/stm32mp133c-prihmb.dts
+ create mode 100644 arch/arm/boot/dts/st/stm32mp151c-plyaqm.dts
+ create mode 100644 arch/arm/boot/dts/st/stm32mp153c-lxa-fairytux2-gen1.dts
+ create mode 100644 arch/arm/boot/dts/st/stm32mp153c-lxa-fairytux2-gen2.dts
+ create mode 100644 arch/arm/boot/dts/st/stm32mp153c-lxa-fairytux2.dtsi
+ create mode 100644 arch/arm64/boot/dts/st/stm32mp211.dtsi
+ create mode 100644 arch/arm64/boot/dts/st/stm32mp213.dtsi
+ create mode 100644 arch/arm64/boot/dts/st/stm32mp215.dtsi
+ create mode 100644 arch/arm64/boot/dts/st/stm32mp215f-dk.dts
+ create mode 100644 arch/arm64/boot/dts/st/stm32mp21xc.dtsi
+ create mode 100644 arch/arm64/boot/dts/st/stm32mp21xf.dtsi
+ create mode 100644 arch/arm64/boot/dts/st/stm32mp231.dtsi
+ create mode 100644 arch/arm64/boot/dts/st/stm32mp233.dtsi
+ create mode 100644 arch/arm64/boot/dts/st/stm32mp235.dtsi
+ create mode 100644 arch/arm64/boot/dts/st/stm32mp235f-dk.dts
+ create mode 100644 arch/arm64/boot/dts/st/stm32mp23xc.dtsi
+ create mode 100644 arch/arm64/boot/dts/st/stm32mp23xf.dtsi
+ create mode 100644 arch/arm64/boot/dts/st/stm32mp257f-dk.dts
+Merging sunxi/sunxi/for-next (96b0934c0283 Merge branch 'sunxi/clk-for-6.15' 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 | 5 +
+ .../bindings/clock/allwinner,sun55i-a523-ccu.yaml | 103 ++
+ .../devicetree/bindings/vendor-prefixes.yaml | 2 +
+ arch/arm/boot/dts/allwinner/Makefile | 2 +
+ .../dts/allwinner/sun8i-v3s-netcube-kumquat.dts | 276 ++++
+ arch/arm/boot/dts/allwinner/sun8i-v3s.dtsi | 6 +
+ .../dts/allwinner/sun50i-a100-allwinner-perf1.dts | 5 +
+ .../boot/dts/allwinner/sun50i-a100-cpu-opp.dtsi | 90 ++
+ arch/arm64/boot/dts/allwinner/sun50i-a100.dtsi | 8 +
+ .../allwinner/sun50i-h700-anbernic-rg35xx-2024.dts | 18 +-
+ .../allwinner/sun50i-h700-anbernic-rg35xx-h.dts | 23 +
+ drivers/clk/sunxi-ng/Kconfig | 10 +
+ drivers/clk/sunxi-ng/Makefile | 4 +
+ drivers/clk/sunxi-ng/ccu-sun50i-h616.c | 60 +-
+ drivers/clk/sunxi-ng/ccu-sun50i-h616.h | 2 +-
+ drivers/clk/sunxi-ng/ccu-sun55i-a523-r.c | 248 +++
+ drivers/clk/sunxi-ng/ccu-sun55i-a523-r.h | 14 +
+ drivers/clk/sunxi-ng/ccu-sun55i-a523.c | 1685 ++++++++++++++++++++
+ drivers/clk/sunxi-ng/ccu-sun55i-a523.h | 14 +
+ drivers/clk/sunxi-ng/ccu_common.h | 5 +
+ drivers/clk/sunxi-ng/ccu_div.c | 2 +
+ drivers/clk/sunxi-ng/ccu_gate.c | 4 +
+ drivers/clk/sunxi-ng/ccu_mp.c | 51 +-
+ drivers/clk/sunxi-ng/ccu_mp.h | 58 +-
+ drivers/clk/sunxi-ng/ccu_mux.c | 2 +
+ include/dt-bindings/clock/sun50i-h616-ccu.h | 4 +
+ include/dt-bindings/clock/sun55i-a523-ccu.h | 189 +++
+ include/dt-bindings/clock/sun55i-a523-r-ccu.h | 37 +
+ include/dt-bindings/reset/sun50i-h616-ccu.h | 2 +
+ include/dt-bindings/reset/sun55i-a523-ccu.h | 88 +
+ include/dt-bindings/reset/sun55i-a523-r-ccu.h | 25 +
+ 31 files changed, 3024 insertions(+), 18 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun55i-a523-ccu.yaml
+ create mode 100644 arch/arm/boot/dts/allwinner/sun8i-v3s-netcube-kumquat.dts
+ create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a100-cpu-opp.dtsi
+ create mode 100644 drivers/clk/sunxi-ng/ccu-sun55i-a523-r.c
+ create mode 100644 drivers/clk/sunxi-ng/ccu-sun55i-a523-r.h
+ create mode 100644 drivers/clk/sunxi-ng/ccu-sun55i-a523.c
+ create mode 100644 drivers/clk/sunxi-ng/ccu-sun55i-a523.h
+ create mode 100644 include/dt-bindings/clock/sun55i-a523-ccu.h
+ create mode 100644 include/dt-bindings/clock/sun55i-a523-r-ccu.h
+ create mode 100644 include/dt-bindings/reset/sun55i-a523-ccu.h
+ create mode 100644 include/dt-bindings/reset/sun55i-a523-r-ccu.h
+Merging tee/next (a7562ff02879 Merge branch 'optee_for_v6.14' 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.
+Merging tegra/for-next (4e16110559c3 Merge branch for-6.15/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
+Merge made by the 'ort' strategy.
+ .../display/tegra/nvidia,tegra114-mipi.yaml | 1 +
+ .../bindings/sound/nvidia,tegra30-hda.yaml | 1 +
+ arch/arm/boot/dts/nvidia/tegra114.dtsi | 34 +++++++++++++++---
+ arch/arm/boot/dts/nvidia/tegra124.dtsi | 40 ++++++++++++++++++++++
+ arch/arm/boot/dts/nvidia/tegra20-asus-tf101.dts | 11 ++++++
+ arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi | 13 +++++++
+ arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi | 20 ++++++++++-
+ arch/arm64/boot/dts/nvidia/tegra210.dtsi | 10 ++++++
+ .../dts/nvidia/tegra234-p3740-0002+p3701-0008.dts | 10 ++++++
+ .../boot/dts/nvidia/tegra234-p3768-0000+p3767.dtsi | 7 ----
+ drivers/soc/tegra/pmc.c | 3 +-
+ include/soc/tegra/bpmp-abi.h | 2 +-
+ 12 files changed, 137 insertions(+), 15 deletions(-)
+Merging thead-dt/thead-dt-for-next (c95c1362e5bc riscv: dts: thead: Add mailbox node)
+$ git merge -m Merge branch 'thead-dt-for-next' of https://github.com/pdp7/linux.git thead-dt/thead-dt-for-next
+Already up to date.
+Merging ti/ti-next (15b2ed044c78 Merge branch 'ti-k3-config-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/arm64/configs/defconfig
+Auto-merging drivers/firmware/Kconfig
+Merge made by the 'ort' strategy.
+ arch/arm64/boot/dts/ti/Makefile | 3 +
+ arch/arm64/boot/dts/ti/k3-am62-phycore-som.dtsi | 25 ++-
+ arch/arm64/boot/dts/ti/k3-am62-verdin-dahlia.dtsi | 6 +-
+ arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts | 8 +
+ arch/arm64/boot/dts/ti/k3-am62a-mcu.dtsi | 1 -
+ arch/arm64/boot/dts/ti/k3-am62a-phycore-som.dtsi | 19 +-
+ arch/arm64/boot/dts/ti/k3-am62a7-sk.dts | 4 +
+ .../boot/dts/ti/k3-am62p-j722s-common-mcu.dtsi | 8 -
+ .../boot/dts/ti/k3-am62p-j722s-common-wakeup.dtsi | 36 +++-
+ arch/arm64/boot/dts/ti/k3-am62p-main.dtsi | 26 ++-
+ arch/arm64/boot/dts/ti/k3-am62p5-sk.dts | 4 +-
+ arch/arm64/boot/dts/ti/k3-am62x-phyboard-lyra.dtsi | 9 +
+ arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi | 2 +
+ arch/arm64/boot/dts/ti/k3-am64-phycore-som.dtsi | 33 +++-
+ .../boot/dts/ti/k3-am642-phyboard-electra-rdk.dts | 19 +-
+ ...m642-phyboard-electra-x27-gpio1-spi1-uart3.dtso | 63 +++++++
+ .../boot/dts/ti/k3-j721e-common-proc-board.dts | 1 +
+ arch/arm64/boot/dts/ti/k3-j721e-sk.dts | 1 +
+ arch/arm64/boot/dts/ti/k3-j721s2-som-p0.dtsi | 41 ++++
+ arch/arm64/boot/dts/ti/k3-j722s-evm.dts | 30 ++-
+ arch/arm64/boot/dts/ti/k3-j722s-main.dtsi | 208 +++++++++++++++++++--
+ .../dts/ti/k3-j784s4-evm-quad-port-eth-exp1.dtso | 7 -
+ .../boot/dts/ti/k3-j784s4-j742s2-main-common.dtsi | 6 +-
+ arch/arm64/configs/defconfig | 4 +
+ drivers/firmware/Kconfig | 1 +
+ drivers/soc/ti/k3-socinfo.c | 13 +-
+ 26 files changed, 505 insertions(+), 73 deletions(-)
+ create mode 100644 arch/arm64/boot/dts/ti/k3-am642-phyboard-electra-x27-gpio1-spi1-uart3.dtso
+Merging xilinx/for-next (d6ccf528cb3c Merge branch 'zynqmp/dt' into for-next)
+$ git merge -m Merge branch 'for-next' of git://github.com/Xilinx/linux-xlnx.git xilinx/for-next
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/ata/ceva,ahci-1v84.yaml | 4 +-
+ .../bindings/dma/xilinx/xlnx,zynqmp-dma-1.0.yaml | 3 +-
+ .../bindings/iio/adc/xlnx,zynqmp-ams.yaml | 3 +-
+ .../devicetree/bindings/net/cdns,macb.yaml | 7 +-
+ .../devicetree/bindings/soc/xilinx/xilinx.yaml | 11 +-
+ .../devicetree/bindings/spi/spi-zynqmp-qspi.yaml | 3 +-
+ .../devicetree/bindings/usb/dwc3-xilinx.yaml | 3 +-
+ arch/arm/boot/dts/xilinx/zynq-7000.dtsi | 33 +-
+ arch/arm/boot/dts/xilinx/zynq-cc108.dts | 41 +-
+ arch/arm/boot/dts/xilinx/zynq-ebaz4205.dts | 2 +
+ arch/arm/boot/dts/xilinx/zynq-microzed.dts | 10 +-
+ arch/arm/boot/dts/xilinx/zynq-parallella.dts | 1 -
+ arch/arm/boot/dts/xilinx/zynq-zc702.dts | 85 ++-
+ arch/arm/boot/dts/xilinx/zynq-zc706.dts | 67 +-
+ arch/arm/boot/dts/xilinx/zynq-zc770-xm010.dts | 39 +-
+ arch/arm/boot/dts/xilinx/zynq-zc770-xm011.dts | 31 +
+ arch/arm/boot/dts/xilinx/zynq-zc770-xm012.dts | 35 +
+ arch/arm/boot/dts/xilinx/zynq-zc770-xm013.dts | 41 +-
+ arch/arm/boot/dts/xilinx/zynq-zed.dts | 43 +-
+ arch/arm/boot/dts/xilinx/zynq-zturn-common.dtsi | 8 +
+ arch/arm/boot/dts/xilinx/zynq-zybo-z7.dts | 10 +-
+ arch/arm/boot/dts/xilinx/zynq-zybo.dts | 9 +-
+ arch/arm64/boot/dts/xilinx/Makefile | 2 +
+ arch/arm64/boot/dts/xilinx/versal-net-clk.dtsi | 231 +++++++
+ .../dts/xilinx/versal-net-vn-x-b2197-01-revA.dts | 116 ++++
+ arch/arm64/boot/dts/xilinx/versal-net.dtsi | 752 +++++++++++++++++++++
+ arch/arm64/boot/dts/xilinx/xlnx-zynqmp-clk.h | 126 ++++
+ arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi | 17 +-
+ drivers/firmware/xilinx/zynqmp.c | 6 +-
+ include/dt-bindings/clock/xlnx-zynqmp-clk.h | 7 +
+ 30 files changed, 1667 insertions(+), 79 deletions(-)
+ create mode 100644 arch/arm64/boot/dts/xilinx/versal-net-clk.dtsi
+ create mode 100644 arch/arm64/boot/dts/xilinx/versal-net-vn-x-b2197-01-revA.dts
+ create mode 100644 arch/arm64/boot/dts/xilinx/versal-net.dtsi
+ create mode 100644 arch/arm64/boot/dts/xilinx/xlnx-zynqmp-clk.h
+Merging clk/clk-next (82f69876ef45 Merge branch 'clk-imx' 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
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/clock/imx8m-clock.yaml | 8 ++
+ .../devicetree/bindings/clock/imx8mp-audiomix.yaml | 10 +-
+ .../bindings/clock/mediatek,mt8188-clock.yaml | 21 +++
+ drivers/clk/clk-stm32f4.c | 4 +-
+ drivers/clk/clk.c | 13 +-
+ drivers/clk/imgtec/clk-boston.c | 6 +-
+ drivers/clk/imx/clk-imx8mp-audiomix.c | 6 +-
+ drivers/clk/imx/clk-imx8mp.c | 151 +++++++++++++++++++++
+ drivers/clk/keystone/syscon-clk.c | 13 +-
+ drivers/clk/mediatek/clk-mt8188-cam.c | 17 +++
+ drivers/clk/mediatek/clk-mt8188-img.c | 18 +++
+ drivers/clk/mediatek/clk-mt8188-ipe.c | 14 ++
+ drivers/clk/mediatek/clk-mt8188-vdo1.c | 11 ++
+ drivers/clk/mmp/clk-pxa1908-apmu.c | 4 +-
+ drivers/clk/renesas/r7s9210-cpg-mssr.c | 10 +-
+ drivers/clk/renesas/r8a779a0-cpg-mssr.c | 8 ++
+ drivers/clk/renesas/r8a779g0-cpg-mssr.c | 2 +
+ drivers/clk/renesas/r8a779h0-cpg-mssr.c | 3 +
+ drivers/clk/renesas/r9a07g043-cpg.c | 7 +
+ drivers/clk/renesas/r9a07g044-cpg.c | 55 +++++++-
+ drivers/clk/renesas/r9a08g045-cpg.c | 9 +-
+ drivers/clk/renesas/r9a09g047-cpg.c | 86 ++++++++++++
+ drivers/clk/renesas/r9a09g057-cpg.c | 24 ++++
+ drivers/clk/renesas/renesas-cpg-mssr.c | 5 -
+ drivers/clk/renesas/rzg2l-cpg.c | 133 +++++++++---------
+ drivers/clk/renesas/rzg2l-cpg.h | 12 +-
+ drivers/clk/renesas/rzv2h-cpg.c | 16 +--
+ drivers/clk/renesas/rzv2h-cpg.h | 2 +
+ include/dt-bindings/clock/mediatek,mt8188-clk.h | 2 +-
+ 29 files changed, 564 insertions(+), 106 deletions(-)
+Merging clk-imx/for-next (06a61b5cb6a8 clk: imx8mp: inform CCF of maximum frequency of clocks)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk-imx/for-next
+Already up to date.
+Merging clk-renesas/renesas-clk (e1a098330ef0 clk: renesas: r9a09g047: Add clock and reset signals for the TSU IP)
+$ 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
+Already up to date.
+Merging csky/linux-next (2b48804336be csky: fix csky_cmpxchg_fixup not working)
+$ git merge -m Merge branch 'linux-next' of git://github.com/c-sky/csky-linux.git csky/linux-next
+Merge made by the 'ort' strategy.
+ arch/csky/mm/fault.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+Merging loongarch/loongarch-next (6bdbb73dc8d9 LoongArch: KVM: Fix GPA size issue about VM)
+$ git merge -m Merge branch 'loongarch-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git loongarch/loongarch-next
+Already up to date.
+Merging m68k/for-next (3c4e4ec957b6 m68k: setup: Remove size argument when calling strscpy())
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k/for-next
+Merge made by the 'ort' strategy.
+ arch/m68k/include/asm/processor.h | 14 ++++++++++++++
+ arch/m68k/kernel/setup_mm.c | 3 +--
+ arch/m68k/sun3/mmu_emu.c | 7 ++++---
+ 3 files changed, 19 insertions(+), 5 deletions(-)
+Merging m68knommu/for-next (184815cc99d1 m68k: mm: Replace deprecated strncpy() with strscpy())
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git m68knommu/for-next
+Auto-merging arch/m68k/kernel/setup_mm.c
+Merge made by the 'ort' strategy.
+ arch/m68k/kernel/setup_mm.c | 3 +--
+ arch/m68k/kernel/setup_no.c | 1 -
+ arch/m68k/kernel/uboot.c | 1 -
+ 3 files changed, 1 insertion(+), 4 deletions(-)
+Merging microblaze/next (920354d7818b microblaze: Use of_property_present() for non-boolean properties)
+$ git merge -m Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze.git microblaze/next
+Merge made by the 'ort' strategy.
+ arch/microblaze/kernel/timer.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging mips/mips-next (a547dc46e393 MIPS: dec: Remove dec_irq_dispatch())
+$ git merge -m Merge branch 'mips-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next
+Merge made by the 'ort' strategy.
+ .../bindings/clock/mediatek,mtmips-sysc.yaml | 11 +-
+ .../devicetree/bindings/mips/mti,mips-cm.yaml | 57 ++++
+ arch/mips/boot/dts/ingenic/gcw0.dts | 2 +-
+ arch/mips/boot/dts/ingenic/rs90.dts | 2 +-
+ arch/mips/boot/dts/mobileye/eyeq6h.dtsi | 4 +
+ .../dts/ralink/gardena_smart_gateway_mt7688.dts | 2 +-
+ arch/mips/boot/dts/ralink/mt7620a.dtsi | 10 +-
+ arch/mips/boot/dts/ralink/mt7620a_eval.dts | 2 +-
+ arch/mips/boot/dts/ralink/mt7628a.dtsi | 40 +--
+ arch/mips/boot/dts/ralink/omega2p.dts | 2 +-
+ arch/mips/boot/dts/ralink/rt2880.dtsi | 10 +-
+ arch/mips/boot/dts/ralink/rt2880_eval.dts | 2 +-
+ arch/mips/boot/dts/ralink/rt3050.dtsi | 10 +-
+ arch/mips/boot/dts/ralink/rt3883.dtsi | 10 +-
+ arch/mips/boot/dts/ralink/rt3883_eval.dts | 2 +-
+ arch/mips/boot/dts/realtek/cisco_sg220-26.dts | 10 +-
+ arch/mips/boot/dts/realtek/rtl838x.dtsi | 111 +++++++-
+ arch/mips/boot/dts/realtek/rtl83xx.dtsi | 59 -----
+ arch/mips/boot/dts/realtek/rtl930x.dtsi | 148 ++++++-----
+ arch/mips/dec/int-handler.S | 2 +-
+ arch/mips/dec/prom/init.c | 2 +-
+ arch/mips/dec/setup.c | 6 -
+ arch/mips/include/asm/ds1287.h | 2 +-
+ arch/mips/include/asm/ftrace.h | 16 ++
+ arch/mips/include/asm/mips-cm.h | 40 +++
+ arch/mips/include/asm/smp-cps.h | 7 +-
+ arch/mips/kernel/asm-offsets.c | 3 +
+ arch/mips/kernel/cevt-ds1287.c | 1 +
+ arch/mips/kernel/cps-vec.S | 19 +-
+ arch/mips/kernel/mips-cm.c | 18 +-
+ arch/mips/kernel/pm-cps.c | 35 ++-
+ arch/mips/kernel/smp-cps.c | 290 +++++++++++++++++----
+ arch/mips/loongson2ef/common/machtype.c | 3 +-
+ arch/mips/sni/setup.c | 1 -
+ drivers/clocksource/mips-gic-timer.c | 6 +-
+ include/dt-bindings/clock/mediatek,mtmips-sysc.h | 130 +++++++++
+ 36 files changed, 841 insertions(+), 234 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mips/mti,mips-cm.yaml
+ delete mode 100644 arch/mips/boot/dts/realtek/rtl83xx.dtsi
+ create mode 100644 include/dt-bindings/clock/mediatek,mtmips-sysc.h
+Merging openrisc/for-next (ea1413e5b53a rseq/selftests: Add support for OpenRISC)
+$ 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 (e822b8f01b40 parisc: led: Use scnprintf() to avoid string truncation warning)
+$ 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
+Auto-merging arch/parisc/include/asm/io.h
+Merge made by the 'ort' strategy.
+ arch/parisc/include/asm/io.h | 3 -
+ arch/parisc/kernel/parisc_ksyms.c | 1 -
+ arch/parisc/kernel/pdt.c | 2 +
+ arch/parisc/kernel/perf.c | 6 +-
+ arch/parisc/lib/io.c | 119 ++++++++++----------------------------
+ drivers/input/serio/gscps2.c | 6 ++
+ drivers/parisc/led.c | 4 +-
+ 7 files changed, 41 insertions(+), 100 deletions(-)
+Merging powerpc/next (861efb8a48ee powerpc/kexec: fix physical address calculation in clear_utlb_entry())
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next
+Auto-merging CREDITS
+Auto-merging MAINTAINERS
+Auto-merging arch/powerpc/Kconfig
+Auto-merging arch/powerpc/include/asm/io.h
+Auto-merging arch/powerpc/kernel/time.c
+Auto-merging arch/powerpc/mm/ioremap.c
+Auto-merging arch/powerpc/mm/mem.c
+Auto-merging kernel/irq/Kconfig
+Merge made by the 'ort' strategy.
+ CREDITS | 11 +
+ Documentation/ABI/testing/sysfs-kernel-fadump | 3 +-
+ .../admin-guide/kernel-per-CPU-kthreads.rst | 7 +-
+ .../arch/powerpc/firmware-assisted-dump.rst | 22 +
+ Documentation/arch/powerpc/papr_hcalls.rst | 11 +
+ .../networking/device_drivers/ethernet/index.rst | 1 -
+ .../device_drivers/ethernet/toshiba/spider_net.rst | 202 --
+ MAINTAINERS | 9 -
+ arch/powerpc/Kconfig | 11 +-
+ arch/powerpc/Kconfig.debug | 7 -
+ arch/powerpc/boot/Makefile | 2 -
+ arch/powerpc/boot/dts/microwatt.dts | 107 +-
+ arch/powerpc/configs/cell_defconfig | 2 -
+ arch/powerpc/configs/ppc64_defconfig | 2 -
+ arch/powerpc/crypto/Makefile | 1 +
+ arch/powerpc/include/asm/cell-pmu.h | 56 -
+ arch/powerpc/include/asm/cell-regs.h | 296 ---
+ arch/powerpc/include/asm/dcr-generic.h | 36 -
+ arch/powerpc/include/asm/dcr-mmio.h | 44 -
+ arch/powerpc/include/asm/dcr.h | 32 -
+ arch/powerpc/include/asm/hvcall.h | 34 +
+ arch/powerpc/include/asm/io-defs.h | 70 +-
+ arch/powerpc/include/asm/io-workarounds.h | 55 -
+ arch/powerpc/include/asm/io.h | 409 ++--
+ arch/powerpc/include/asm/iommu.h | 6 -
+ arch/powerpc/include/asm/mmzone.h | 1 +
+ arch/powerpc/include/asm/plpar_wrappers.h | 21 +
+ arch/powerpc/include/asm/pmi.h | 53 -
+ arch/powerpc/include/asm/prom.h | 2 +
+ arch/powerpc/include/asm/spu_priv1.h | 2 -
+ arch/powerpc/include/asm/static_call.h | 2 +
+ arch/powerpc/include/asm/time.h | 3 -
+ arch/powerpc/include/asm/xics.h | 1 -
+ arch/powerpc/include/asm/xmon.h | 2 -
+ arch/powerpc/kernel/Makefile | 4 +-
+ arch/powerpc/kernel/dma-iommu.c | 2 +-
+ arch/powerpc/kernel/exceptions-64s.S | 55 -
+ arch/powerpc/kernel/fadump.c | 21 +-
+ arch/powerpc/kernel/io-workarounds.c | 197 --
+ arch/powerpc/kernel/io.c | 58 +-
+ arch/powerpc/kernel/of_platform.c | 102 -
+ arch/powerpc/kernel/prom_init.c | 6 +-
+ arch/powerpc/kernel/rtas.c | 75 -
+ arch/powerpc/kernel/setup_64.c | 2 +-
+ arch/powerpc/kernel/static_call.c | 58 +-
+ arch/powerpc/kernel/switch.S | 1 -
+ arch/powerpc/kernel/time.c | 65 +-
+ arch/powerpc/kernel/udbg.c | 3 -
+ arch/powerpc/kernel/vmlinux.lds.S | 9 -
+ arch/powerpc/kexec/relocate_32.S | 7 +-
+ arch/powerpc/kvm/book3s_32_mmu_host.c | 2 -
+ arch/powerpc/kvm/book3s_hv_rmhandlers.S | 2 -
+ arch/powerpc/kvm/powerpc.c | 5 +-
+ arch/powerpc/mm/book3s64/hash_utils.c | 12 -
+ arch/powerpc/mm/book3s64/pgtable.c | 4 +-
+ arch/powerpc/mm/ioremap.c | 9 -
+ arch/powerpc/mm/ioremap_64.c | 2 +-
+ arch/powerpc/mm/mem.c | 22 -
+ arch/powerpc/mm/numa.c | 2 +-
+ arch/powerpc/perf/core-book3s.c | 20 +
+ arch/powerpc/perf/isa207-common.c | 18 +-
+ arch/powerpc/perf/vpa-pmu.c | 1 +
+ arch/powerpc/platforms/44x/uic.c | 2 +-
+ arch/powerpc/platforms/Kconfig | 10 -
+ arch/powerpc/platforms/Kconfig.cputype | 13 +
+ arch/powerpc/platforms/cell/Kconfig | 80 -
+ arch/powerpc/platforms/cell/Makefile | 23 -
+ arch/powerpc/platforms/cell/axon_msi.c | 481 ----
+ arch/powerpc/platforms/cell/cbe_powerbutton.c | 106 -
+ arch/powerpc/platforms/cell/cbe_regs.c | 298 ---
+ arch/powerpc/platforms/cell/cbe_thermal.c | 387 ---
+ arch/powerpc/platforms/cell/cell.h | 15 -
+ arch/powerpc/platforms/cell/cpufreq_spudemand.c | 134 -
+ arch/powerpc/platforms/cell/interrupt.c | 390 ---
+ arch/powerpc/platforms/cell/interrupt.h | 90 -
+ arch/powerpc/platforms/cell/iommu.c | 1060 --------
+ arch/powerpc/platforms/cell/pervasive.c | 125 -
+ arch/powerpc/platforms/cell/pervasive.h | 26 -
+ arch/powerpc/platforms/cell/pmu.c | 412 ----
+ arch/powerpc/platforms/cell/ras.c | 352 ---
+ arch/powerpc/platforms/cell/ras.h | 13 -
+ arch/powerpc/platforms/cell/setup.c | 274 ---
+ arch/powerpc/platforms/cell/smp.c | 162 --
+ arch/powerpc/platforms/cell/spider-pci.c | 170 --
+ arch/powerpc/platforms/cell/spider-pic.c | 344 ---
+ arch/powerpc/platforms/cell/spu_base.c | 2 -
+ arch/powerpc/platforms/cell/spu_manage.c | 530 ----
+ arch/powerpc/platforms/cell/spu_priv1_mmio.c | 167 --
+ arch/powerpc/platforms/cell/spu_priv1_mmio.h | 14 -
+ arch/powerpc/platforms/microwatt/Kconfig | 3 +-
+ arch/powerpc/platforms/microwatt/Makefile | 1 +
+ arch/powerpc/platforms/microwatt/microwatt.h | 1 +
+ arch/powerpc/platforms/microwatt/setup.c | 18 +
+ arch/powerpc/platforms/microwatt/smp.c | 80 +
+ arch/powerpc/platforms/powernv/Kconfig | 1 +
+ arch/powerpc/platforms/pseries/Kconfig | 10 +
+ arch/powerpc/platforms/pseries/Makefile | 1 +
+ arch/powerpc/platforms/pseries/htmdump.c | 121 +
+ arch/powerpc/platforms/pseries/iommu.c | 139 +-
+ arch/powerpc/sysdev/Makefile | 1 -
+ arch/powerpc/sysdev/dcr.c | 182 --
+ arch/powerpc/sysdev/ipic.c | 3 +-
+ arch/powerpc/sysdev/pmi.c | 267 --
+ arch/powerpc/sysdev/xics/icp-native.c | 21 -
+ arch/powerpc/xmon/Makefile | 5 +-
+ arch/powerpc/xmon/spu-dis.c | 237 --
+ arch/powerpc/xmon/spu-insns.h | 399 ---
+ arch/powerpc/xmon/spu-opc.c | 34 -
+ arch/powerpc/xmon/spu.h | 115 -
+ arch/powerpc/xmon/xmon.c | 273 ---
+ arch/x86/kernel/static_call.c | 2 +-
+ drivers/cpufreq/Kconfig.powerpc | 18 -
+ drivers/cpufreq/Makefile | 3 -
+ drivers/cpufreq/ppc_cbe_cpufreq.c | 173 --
+ drivers/cpufreq/ppc_cbe_cpufreq.h | 33 -
+ drivers/cpufreq/ppc_cbe_cpufreq_pervasive.c | 102 -
+ drivers/cpufreq/ppc_cbe_cpufreq_pmi.c | 150 --
+ drivers/net/ethernet/toshiba/Kconfig | 11 +-
+ drivers/net/ethernet/toshiba/Makefile | 2 -
+ drivers/net/ethernet/toshiba/spider_net.c | 2556 --------------------
+ drivers/net/ethernet/toshiba/spider_net.h | 475 ----
+ drivers/net/ethernet/toshiba/spider_net_ethtool.c | 174 --
+ kernel/irq/Kconfig | 4 -
+ kernel/irq/chip.c | 47 -
+ kernel/static_call_inline.c | 2 +-
+ tools/objtool/arch/powerpc/decode.c | 10 +-
+ .../event_alternatives_tests_p10.c | 3 +-
+ .../event_code_tests/generic_events_valid_test.c | 3 +-
+ .../group_constraint_l2l3_sel_test.c | 2 +-
+ .../group_constraint_radix_scope_qual_test.c | 2 +-
+ .../group_constraint_thresh_cmp_test.c | 2 +-
+ .../pmu/event_code_tests/invalid_event_code_test.c | 4 +-
+ .../reserved_bits_mmcra_sample_elig_mode_test.c | 5 +-
+ .../selftests/powerpc/pmu/sampling_tests/Makefile | 3 +-
+ .../pmu/sampling_tests/bhrb_filter_map_test.c | 17 +-
+ .../pmu/sampling_tests/check_extended_reg_test.c | 35 +
+ .../selftests/powerpc/pmu/sampling_tests/misc.c | 20 +-
+ .../selftests/powerpc/pmu/sampling_tests/misc.h | 12 +-
+ .../pmu/sampling_tests/mmcra_bhrb_cond_test.c | 2 +-
+ .../mmcra_bhrb_disable_no_branch_test.c | 2 +-
+ .../pmu/sampling_tests/mmcra_bhrb_disable_test.c | 2 +-
+ .../pmu/sampling_tests/mmcra_bhrb_ind_call_test.c | 2 +-
+ 142 files changed, 1043 insertions(+), 12714 deletions(-)
+ delete mode 100644 Documentation/networking/device_drivers/ethernet/toshiba/spider_net.rst
+ delete mode 100644 arch/powerpc/include/asm/dcr-generic.h
+ delete mode 100644 arch/powerpc/include/asm/dcr-mmio.h
+ delete mode 100644 arch/powerpc/include/asm/io-workarounds.h
+ delete mode 100644 arch/powerpc/include/asm/pmi.h
+ delete mode 100644 arch/powerpc/kernel/io-workarounds.c
+ delete mode 100644 arch/powerpc/kernel/of_platform.c
+ delete mode 100644 arch/powerpc/platforms/cell/axon_msi.c
+ delete mode 100644 arch/powerpc/platforms/cell/cbe_powerbutton.c
+ delete mode 100644 arch/powerpc/platforms/cell/cbe_regs.c
+ delete mode 100644 arch/powerpc/platforms/cell/cbe_thermal.c
+ delete mode 100644 arch/powerpc/platforms/cell/cell.h
+ delete mode 100644 arch/powerpc/platforms/cell/cpufreq_spudemand.c
+ delete mode 100644 arch/powerpc/platforms/cell/interrupt.c
+ delete mode 100644 arch/powerpc/platforms/cell/interrupt.h
+ delete mode 100644 arch/powerpc/platforms/cell/iommu.c
+ delete mode 100644 arch/powerpc/platforms/cell/pervasive.c
+ delete mode 100644 arch/powerpc/platforms/cell/pervasive.h
+ delete mode 100644 arch/powerpc/platforms/cell/pmu.c
+ delete mode 100644 arch/powerpc/platforms/cell/ras.c
+ delete mode 100644 arch/powerpc/platforms/cell/ras.h
+ delete mode 100644 arch/powerpc/platforms/cell/setup.c
+ delete mode 100644 arch/powerpc/platforms/cell/smp.c
+ delete mode 100644 arch/powerpc/platforms/cell/spider-pci.c
+ delete mode 100644 arch/powerpc/platforms/cell/spider-pic.c
+ delete mode 100644 arch/powerpc/platforms/cell/spu_manage.c
+ delete mode 100644 arch/powerpc/platforms/cell/spu_priv1_mmio.c
+ delete mode 100644 arch/powerpc/platforms/cell/spu_priv1_mmio.h
+ create mode 100644 arch/powerpc/platforms/microwatt/smp.c
+ create mode 100644 arch/powerpc/platforms/pseries/htmdump.c
+ delete mode 100644 arch/powerpc/sysdev/pmi.c
+ delete mode 100644 arch/powerpc/xmon/spu-dis.c
+ delete mode 100644 arch/powerpc/xmon/spu-insns.h
+ delete mode 100644 arch/powerpc/xmon/spu-opc.c
+ delete mode 100644 arch/powerpc/xmon/spu.h
+ delete mode 100644 drivers/cpufreq/ppc_cbe_cpufreq.c
+ delete mode 100644 drivers/cpufreq/ppc_cbe_cpufreq.h
+ delete mode 100644 drivers/cpufreq/ppc_cbe_cpufreq_pervasive.c
+ delete mode 100644 drivers/cpufreq/ppc_cbe_cpufreq_pmi.c
+ delete mode 100644 drivers/net/ethernet/toshiba/spider_net.c
+ delete mode 100644 drivers/net/ethernet/toshiba/spider_net.h
+ delete mode 100644 drivers/net/ethernet/toshiba/spider_net_ethtool.c
+ create mode 100644 tools/testing/selftests/powerpc/pmu/sampling_tests/check_extended_reg_test.c
+Merging risc-v/for-next (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v/for-next
+Already up to date.
+Merging riscv-dt/riscv-dt-for-next (38818f7c9c17 riscv: dts: starfive: jh7110-pine64-star64: enable USB 3.0 port)
+$ 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
+Merge made by the 'ort' strategy.
+ .../boot/dts/microchip/mpfs-icicle-kit-fabric.dtsi | 5 ++--
+ .../boot/dts/microchip/mpfs-m100pfs-fabric.dtsi | 5 ++--
+ .../boot/dts/microchip/mpfs-polarberry-fabric.dtsi | 5 ++--
+ arch/riscv/boot/dts/starfive/jh7110-common.dtsi | 8 +----
+ .../dts/starfive/jh7110-deepcomputing-fml13v01.dts | 34 ++++++++++++++++++++++
+ .../boot/dts/starfive/jh7110-pine64-star64.dts | 5 ++++
+ arch/riscv/boot/dts/starfive/jh7110.dtsi | 2 ++
+ 7 files changed, 51 insertions(+), 13 deletions(-)
+Merging riscv-soc/riscv-soc-for-next (2014c95afece Linux 6.14-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 (745a0de1a0b2 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/configs/debug_defconfig
+Auto-merging arch/s390/include/asm/io.h
+CONFLICT (content): Merge conflict in arch/s390/include/asm/io.h
+Auto-merging arch/s390/kernel/time.c
+Auto-merging arch/s390/kvm/kvm-s390.c
+Auto-merging arch/s390/mm/gmap.c
+Auto-merging arch/s390/mm/init.c
+Auto-merging arch/s390/pci/pci.c
+Resolved 'arch/s390/include/asm/io.h' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master c614ddc4fb6e] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git
+$ git diff -M --stat --summary HEAD^..
+ arch/s390/Kconfig | 1 +
+ arch/s390/Kconfig.debug | 10 ++
+ arch/s390/boot/Makefile | 2 +-
+ arch/s390/boot/alternative.c | 135 ++++++++++++++++
+ arch/s390/boot/boot.h | 8 +-
+ arch/s390/boot/head.S | 25 +--
+ arch/s390/boot/ipl_parm.c | 31 ++--
+ arch/s390/boot/{pgm_check_info.c => pgm_check.c} | 48 ++++--
+ arch/s390/boot/physmem_info.c | 78 +++------
+ arch/s390/boot/printk.c | 4 +-
+ arch/s390/boot/startup.c | 112 +++++++++----
+ arch/s390/boot/vmem.c | 8 +-
+ arch/s390/boot/vmlinux.lds.S | 2 +-
+ arch/s390/configs/debug_defconfig | 2 +
+ arch/s390/configs/mmtypes.config | 2 +
+ arch/s390/hypfs/hypfs_diag0c.c | 5 +-
+ arch/s390/hypfs/hypfs_diag_fs.c | 3 +-
+ arch/s390/hypfs/hypfs_vm.c | 5 +-
+ arch/s390/hypfs/inode.c | 5 +-
+ arch/s390/include/asm/abs_lowcore.h | 7 -
+ arch/s390/include/asm/alternative.h | 11 +-
+ arch/s390/include/asm/appldata.h | 3 +-
+ arch/s390/include/asm/asm-extable.h | 8 +
+ arch/s390/include/asm/atomic_ops.h | 8 +-
+ arch/s390/include/asm/cpufeature.h | 14 ++
+ arch/s390/include/asm/fpu.h | 7 +-
+ arch/s390/include/asm/hugetlb.h | 3 +-
+ arch/s390/include/asm/io.h | 2 -
+ arch/s390/include/asm/lowcore.h | 9 +-
+ arch/s390/include/asm/machine.h | 103 ++++++++++++
+ arch/s390/include/asm/page.h | 71 ++++----
+ arch/s390/include/asm/pgtable.h | 20 ++-
+ arch/s390/include/asm/sclp.h | 1 +
+ arch/s390/include/asm/setup.h | 42 -----
+ arch/s390/include/asm/syscall.h | 6 +-
+ arch/s390/include/asm/sysinfo.h | 28 +++-
+ arch/s390/include/asm/timex.h | 5 +-
+ arch/s390/include/asm/tlbflush.h | 8 +-
+ arch/s390/include/asm/uaccess.h | 198 ++++++++++-------------
+ arch/s390/kernel/abs_lowcore.c | 1 -
+ arch/s390/kernel/alternative.c | 65 +++++++-
+ arch/s390/kernel/asm-offsets.c | 5 +-
+ arch/s390/kernel/early.c | 116 ++-----------
+ arch/s390/kernel/entry.S | 19 +--
+ arch/s390/kernel/entry.h | 2 +-
+ arch/s390/kernel/ftrace.c | 11 +-
+ arch/s390/kernel/guarded_storage.c | 3 +-
+ arch/s390/kernel/head64.S | 4 +-
+ arch/s390/kernel/hiperdispatch.c | 3 +-
+ arch/s390/kernel/ipl.c | 21 +--
+ arch/s390/kernel/irq.c | 8 +-
+ arch/s390/kernel/kprobes.c | 5 +-
+ arch/s390/kernel/machine_kexec.c | 6 +-
+ arch/s390/kernel/nmi.c | 9 +-
+ arch/s390/kernel/processor.c | 10 +-
+ arch/s390/kernel/ptrace.c | 22 +--
+ arch/s390/kernel/setup.c | 23 ++-
+ arch/s390/kernel/smp.c | 8 +-
+ arch/s390/kernel/syscall.c | 3 +-
+ arch/s390/kernel/sysinfo.c | 48 +-----
+ arch/s390/kernel/time.c | 4 +-
+ arch/s390/kernel/topology.c | 19 +--
+ arch/s390/kernel/traps.c | 109 +++++--------
+ arch/s390/kvm/interrupt.c | 6 +-
+ arch/s390/kvm/kvm-s390.c | 18 ++-
+ arch/s390/lib/spinlock.c | 7 +-
+ arch/s390/lib/uaccess.c | 122 +++++++++-----
+ arch/s390/mm/dump_pagetables.c | 8 +-
+ arch/s390/mm/extable.c | 47 ++++++
+ arch/s390/mm/extmem.c | 9 +-
+ arch/s390/mm/fault.c | 16 +-
+ arch/s390/mm/gmap.c | 16 +-
+ arch/s390/mm/hugetlbpage.c | 7 +-
+ arch/s390/mm/init.c | 5 +-
+ arch/s390/mm/mmap.c | 9 +-
+ arch/s390/mm/pageattr.c | 9 +-
+ arch/s390/mm/pgtable.c | 88 +++++-----
+ arch/s390/mm/vmem.c | 9 +-
+ arch/s390/pci/pci.c | 5 +-
+ drivers/s390/block/dasd.c | 3 +-
+ drivers/s390/block/dasd_devmap.c | 3 +-
+ drivers/s390/block/dasd_diag.c | 3 +-
+ drivers/s390/block/dasd_eckd.c | 3 +-
+ drivers/s390/char/con3215.c | 3 +-
+ drivers/s390/char/con3270.c | 3 +-
+ drivers/s390/char/hmcdrv_ftp.c | 6 +-
+ drivers/s390/char/monreader.c | 3 +-
+ drivers/s390/char/monwriter.c | 3 +-
+ drivers/s390/char/raw3270.c | 3 +-
+ drivers/s390/char/sclp.h | 7 +-
+ drivers/s390/char/sclp_cmd.c | 3 +-
+ drivers/s390/char/sclp_con.c | 17 ++
+ drivers/s390/char/sclp_early.c | 6 +-
+ drivers/s390/char/sclp_early_core.c | 13 ++
+ drivers/s390/char/sclp_tty.c | 16 +-
+ drivers/s390/char/vmcp.c | 5 +-
+ drivers/s390/char/vmlogrdr.c | 3 +-
+ drivers/s390/char/vmur.c | 3 +-
+ drivers/s390/cio/crw.c | 5 +-
+ drivers/s390/cio/device_id.c | 3 +-
+ drivers/s390/cio/vfio_ccw_drv.c | 6 +-
+ drivers/s390/cio/vfio_ccw_private.h | 2 +-
+ drivers/s390/crypto/ap_bus.c | 3 +-
+ drivers/s390/crypto/vfio_ap_ops.c | 68 +++++++-
+ drivers/s390/crypto/vfio_ap_private.h | 4 +-
+ drivers/s390/net/qeth_l2_main.c | 3 +-
+ drivers/s390/net/smsgiucv.c | 3 +-
+ drivers/s390/net/smsgiucv_app.c | 3 +-
+ drivers/s390/scsi/zfcp_aux.c | 2 +-
+ drivers/tty/hvc/hvc_iucv.c | 7 +-
+ drivers/watchdog/diag288_wdt.c | 7 +-
+ include/uapi/linux/vfio.h | 1 +
+ lib/raid6/s390vx.uc | 1 +
+ net/iucv/af_iucv.c | 3 +-
+ net/iucv/iucv.c | 3 +-
+ 115 files changed, 1279 insertions(+), 896 deletions(-)
+ rename arch/s390/boot/{pgm_check_info.c => pgm_check.c} (66%)
+ create mode 100644 arch/s390/configs/mmtypes.config
+ create mode 100644 arch/s390/include/asm/machine.h
+Merging sh/for-next (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'for-next' of git:git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux.git sh/for-next
+Already up to date.
+Merging sparc/for-next (2cec2c4dc90c sparc/irq: Remove unneeded if check in sun4v_cookie_only_virqs())
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git sparc/for-next
+Already up to date.
+Merging uml/next (2d2b61ae38bd um: Remove unused asm/archparam.h header)
+$ 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 (dbef257ab7fa xtensa: ptrace: Remove zero-length alignment array)
+$ 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/ptrace.h | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+Merging fs-next (2ba7f9e7fdd5 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git)
+$ git merge -m Merge branch 'fs-next' of linux-next fs-next
+Auto-merging Documentation/admin-guide/sysctl/vm.rst
+Auto-merging MAINTAINERS
+Auto-merging arch/loongarch/configs/loongson3_defconfig
+Auto-merging fs/Kconfig
+Auto-merging fs/bcachefs/util.h
+Auto-merging fs/btrfs/disk-io.c
+Auto-merging fs/buffer.c
+Auto-merging fs/dax.c
+Auto-merging fs/ext4/inode.c
+Auto-merging fs/fuse/dir.c
+Auto-merging fs/hugetlbfs/inode.c
+Auto-merging fs/iomap/buffered-io.c
+Auto-merging fs/xfs/xfs_icache.c
+Auto-merging fs/xfs/xfs_inode.c
+Auto-merging fs/xfs/xfs_inode.h
+Auto-merging fs/xfs/xfs_super.c
+Auto-merging fs/xfs/xfs_sysfs.c
+Auto-merging include/linux/buffer_head.h
+Auto-merging include/linux/mm.h
+Auto-merging include/linux/pagemap.h
+Auto-merging init/Kconfig
+Auto-merging kernel/fork.c
+Auto-merging kernel/signal.c
+Auto-merging lib/Kconfig.debug
+Auto-merging mm/filemap.c
+Auto-merging mm/gup.c
+Auto-merging mm/shmem.c
+Auto-merging tools/testing/selftests/Makefile
+Auto-merging tools/testing/selftests/mm/guard-regions.c
+Merge made by the 'ort' strategy.
+ Documentation/ABI/testing/sysfs-fs-f2fs | 18 +
+ Documentation/admin-guide/sysctl/fs.rst | 25 +
+ Documentation/admin-guide/sysctl/vm.rst | 2 +-
+ .../filesystems/bcachefs/SubmittingPatches.rst | 43 +-
+ Documentation/filesystems/bcachefs/casefolding.rst | 90 ++
+ Documentation/filesystems/bcachefs/index.rst | 20 +-
+ Documentation/filesystems/f2fs.rst | 3 +
+ Documentation/filesystems/fscrypt.rst | 8 +-
+ Documentation/filesystems/fsverity.rst | 16 +-
+ Documentation/filesystems/index.rst | 1 -
+ Documentation/filesystems/iomap/design.rst | 9 +
+ Documentation/filesystems/iomap/operations.rst | 33 +-
+ Documentation/filesystems/journalling.rst | 4 +-
+ Documentation/filesystems/locking.rst | 2 +-
+ Documentation/filesystems/nfs/reexport.rst | 10 +-
+ Documentation/filesystems/overlayfs.rst | 24 +-
+ Documentation/filesystems/porting.rst | 48 +
+ Documentation/filesystems/sysv-fs.rst | 264 ----
+ Documentation/filesystems/vfs.rst | 23 +-
+ Documentation/netlink/specs/lockd.yaml | 45 +
+ MAINTAINERS | 6 -
+ arch/alpha/kernel/syscalls/syscall.tbl | 1 +
+ arch/arm/tools/syscall.tbl | 1 +
+ arch/arm64/kernel/elfcore.c | 3 +-
+ arch/arm64/tools/syscall_32.tbl | 1 +
+ arch/loongarch/configs/loongson3_defconfig | 1 -
+ arch/m68k/configs/amiga_defconfig | 1 -
+ arch/m68k/configs/apollo_defconfig | 1 -
+ arch/m68k/configs/atari_defconfig | 1 -
+ arch/m68k/configs/bvme6000_defconfig | 1 -
+ arch/m68k/configs/hp300_defconfig | 1 -
+ arch/m68k/configs/mac_defconfig | 1 -
+ arch/m68k/configs/multi_defconfig | 1 -
+ arch/m68k/configs/mvme147_defconfig | 1 -
+ arch/m68k/configs/mvme16x_defconfig | 1 -
+ arch/m68k/configs/q40_defconfig | 1 -
+ arch/m68k/configs/sun3_defconfig | 1 -
+ arch/m68k/configs/sun3x_defconfig | 1 -
+ arch/m68k/kernel/syscalls/syscall.tbl | 1 +
+ arch/microblaze/kernel/syscalls/syscall.tbl | 1 +
+ arch/mips/configs/malta_defconfig | 1 -
+ arch/mips/configs/malta_kvm_defconfig | 1 -
+ arch/mips/configs/maltaup_xpa_defconfig | 1 -
+ arch/mips/configs/rm200_defconfig | 1 -
+ arch/mips/kernel/syscalls/syscall_n32.tbl | 1 +
+ arch/mips/kernel/syscalls/syscall_n64.tbl | 1 +
+ arch/mips/kernel/syscalls/syscall_o32.tbl | 1 +
+ arch/parisc/configs/generic-64bit_defconfig | 1 -
+ arch/parisc/kernel/syscalls/syscall.tbl | 1 +
+ arch/powerpc/configs/fsl-emb-nonhw.config | 1 -
+ arch/powerpc/configs/ppc6xx_defconfig | 1 -
+ arch/powerpc/kernel/syscalls/syscall.tbl | 1 +
+ arch/powerpc/platforms/pseries/papr-vpd.c | 7 +-
+ arch/s390/kernel/syscalls/syscall.tbl | 1 +
+ arch/sh/kernel/syscalls/syscall.tbl | 1 +
+ arch/sparc/kernel/syscalls/syscall.tbl | 1 +
+ arch/x86/entry/syscalls/syscall_32.tbl | 1 +
+ arch/x86/entry/syscalls/syscall_64.tbl | 1 +
+ arch/xtensa/kernel/syscalls/syscall.tbl | 1 +
+ block/bdev.c | 13 +-
+ block/blk-core.c | 19 +-
+ drivers/base/devtmpfs.c | 153 ++-
+ drivers/vfio/group.c | 16 +-
+ fs/9p/vfs_inode.c | 7 +-
+ fs/9p/vfs_inode_dotl.c | 10 +-
+ fs/Kconfig | 1 -
+ fs/Makefile | 1 -
+ fs/affs/affs.h | 2 +-
+ fs/affs/namei.c | 8 +-
+ fs/afs/addr_list.c | 50 +
+ fs/afs/cell.c | 441 +++----
+ fs/afs/cmservice.c | 82 +-
+ fs/afs/dir.c | 17 +-
+ fs/afs/dynroot.c | 540 ++++-----
+ fs/afs/fs_probe.c | 32 +-
+ fs/afs/fsclient.c | 4 +-
+ fs/afs/internal.h | 98 +-
+ fs/afs/main.c | 16 +-
+ fs/afs/mntpt.c | 5 +-
+ fs/afs/proc.c | 15 +-
+ fs/afs/rxrpc.c | 8 +-
+ fs/afs/server.c | 621 ++++------
+ fs/afs/server_list.c | 6 +-
+ fs/afs/super.c | 25 +-
+ fs/afs/vl_alias.c | 7 +-
+ fs/afs/vl_rotate.c | 2 +-
+ fs/afs/volume.c | 15 +-
+ fs/autofs/autofs_i.h | 2 +
+ fs/autofs/dev-ioctl.c | 3 -
+ fs/autofs/root.c | 14 +-
+ fs/bad_inode.c | 6 +-
+ fs/bcachefs/Kconfig | 2 +-
+ fs/bcachefs/Makefile | 1 +
+ fs/bcachefs/alloc_background.c | 161 ++-
+ fs/bcachefs/alloc_background.h | 2 +-
+ fs/bcachefs/alloc_foreground.c | 25 +-
+ fs/bcachefs/alloc_foreground.h | 17 +
+ fs/bcachefs/alloc_types.h | 2 +
+ fs/bcachefs/backpointers.c | 140 +--
+ fs/bcachefs/backpointers.h | 26 +-
+ fs/bcachefs/bcachefs.h | 17 +-
+ fs/bcachefs/bcachefs_format.h | 16 +-
+ fs/bcachefs/bcachefs_ioctl.h | 29 +-
+ fs/bcachefs/btree_cache.c | 1 +
+ fs/bcachefs/btree_gc.c | 18 +-
+ fs/bcachefs/btree_io.c | 245 +++-
+ fs/bcachefs/btree_io.h | 4 +
+ fs/bcachefs/btree_iter.c | 14 -
+ fs/bcachefs/btree_node_scan.c | 29 +-
+ fs/bcachefs/btree_trans_commit.c | 91 +-
+ fs/bcachefs/btree_types.h | 13 +
+ fs/bcachefs/btree_update.c | 3 +-
+ fs/bcachefs/btree_update_interior.c | 146 ++-
+ fs/bcachefs/btree_update_interior.h | 7 +
+ fs/bcachefs/buckets.c | 14 +-
+ fs/bcachefs/buckets.h | 31 +-
+ fs/bcachefs/buckets_types.h | 27 +
+ fs/bcachefs/chardev.c | 38 +-
+ fs/bcachefs/checksum.c | 23 +-
+ fs/bcachefs/checksum.h | 2 +
+ fs/bcachefs/compress.c | 8 +-
+ fs/bcachefs/data_update.c | 235 +++-
+ fs/bcachefs/data_update.h | 17 +-
+ fs/bcachefs/debug.c | 34 +-
+ fs/bcachefs/dirent.c | 223 +++-
+ fs/bcachefs/dirent.h | 15 +-
+ fs/bcachefs/dirent_format.h | 20 +-
+ fs/bcachefs/ec.c | 466 +++----
+ fs/bcachefs/ec.h | 44 +-
+ fs/bcachefs/ec_types.h | 12 +-
+ fs/bcachefs/errcode.h | 32 +-
+ fs/bcachefs/error.c | 94 +-
+ fs/bcachefs/error.h | 55 +-
+ fs/bcachefs/extents.c | 211 +++-
+ fs/bcachefs/extents.h | 24 +-
+ fs/bcachefs/extents_format.h | 24 +-
+ fs/bcachefs/extents_types.h | 11 +-
+ fs/bcachefs/eytzinger.c | 136 ++-
+ fs/bcachefs/eytzinger.h | 93 +-
+ fs/bcachefs/fs-common.c | 30 +-
+ fs/bcachefs/fs-io-buffered.c | 38 +-
+ fs/bcachefs/fs-io-direct.c | 20 +-
+ fs/bcachefs/fs-ioctl.c | 32 +-
+ fs/bcachefs/fs-ioctl.h | 20 +-
+ fs/bcachefs/fs.c | 110 +-
+ fs/bcachefs/inode.c | 13 -
+ fs/bcachefs/inode_format.h | 3 +-
+ fs/bcachefs/io_misc.c | 3 +-
+ fs/bcachefs/io_read.c | 762 ++++++------
+ fs/bcachefs/io_read.h | 94 +-
+ fs/bcachefs/io_write.c | 235 ++--
+ fs/bcachefs/io_write.h | 43 +-
+ fs/bcachefs/io_write_types.h | 2 +-
+ fs/bcachefs/journal.c | 127 +-
+ fs/bcachefs/journal.h | 38 +-
+ fs/bcachefs/journal_io.c | 97 +-
+ fs/bcachefs/journal_seq_blacklist.c | 7 +-
+ fs/bcachefs/journal_types.h | 20 +-
+ fs/bcachefs/lru.c | 100 +-
+ fs/bcachefs/lru.h | 22 +-
+ fs/bcachefs/lru_format.h | 6 +-
+ fs/bcachefs/migrate.c | 26 +-
+ fs/bcachefs/move.c | 472 +++++---
+ fs/bcachefs/move_types.h | 18 +-
+ fs/bcachefs/movinggc.c | 15 +-
+ fs/bcachefs/opts.h | 12 +-
+ fs/bcachefs/progress.c | 63 +
+ fs/bcachefs/progress.h | 29 +
+ fs/bcachefs/rebalance.c | 46 +-
+ fs/bcachefs/recovery.c | 2 +-
+ fs/bcachefs/recovery_passes_types.h | 2 +-
+ fs/bcachefs/reflink.c | 23 +-
+ fs/bcachefs/sb-counters.c | 90 +-
+ fs/bcachefs/sb-counters.h | 4 +
+ fs/bcachefs/sb-counters_format.h | 31 +-
+ fs/bcachefs/sb-downgrade.c | 8 +-
+ fs/bcachefs/sb-errors_format.h | 5 +-
+ fs/bcachefs/sb-members.h | 16 +-
+ fs/bcachefs/snapshot.c | 7 +-
+ fs/bcachefs/snapshot.h | 1 +
+ fs/bcachefs/str_hash.c | 2 +-
+ fs/bcachefs/str_hash.h | 12 +-
+ fs/bcachefs/super-io.c | 48 +-
+ fs/bcachefs/super-io.h | 8 +-
+ fs/bcachefs/super.c | 126 +-
+ fs/bcachefs/super.h | 2 +
+ fs/bcachefs/super_types.h | 8 +-
+ fs/bcachefs/sysfs.c | 15 +-
+ fs/bcachefs/trace.h | 105 +-
+ fs/bcachefs/util.c | 231 +++-
+ fs/bcachefs/util.h | 12 +
+ fs/btrfs/Kconfig | 1 +
+ fs/btrfs/accessors.h | 1 +
+ fs/btrfs/acl.h | 2 +
+ fs/btrfs/async-thread.c | 11 +-
+ fs/btrfs/backref.c | 4 +-
+ fs/btrfs/bio.c | 38 +-
+ fs/btrfs/block-group.c | 155 ++-
+ fs/btrfs/btrfs_inode.h | 17 +-
+ fs/btrfs/compression.c | 33 +-
+ fs/btrfs/compression.h | 26 +-
+ fs/btrfs/ctree.c | 18 +-
+ fs/btrfs/ctree.h | 2 +-
+ fs/btrfs/defrag.c | 80 +-
+ fs/btrfs/defrag.h | 4 +-
+ fs/btrfs/delayed-inode.c | 99 +-
+ fs/btrfs/delayed-inode.h | 2 +-
+ fs/btrfs/delayed-ref.h | 2 +
+ fs/btrfs/dev-replace.c | 33 +-
+ fs/btrfs/dir-item.c | 24 +-
+ fs/btrfs/dir-item.h | 1 +
+ fs/btrfs/direct-io.c | 20 +-
+ fs/btrfs/direct-io.h | 2 +
+ fs/btrfs/discard.c | 38 +-
+ fs/btrfs/discard.h | 1 +
+ fs/btrfs/disk-io.c | 109 +-
+ fs/btrfs/export.c | 51 +-
+ fs/btrfs/extent-io-tree.c | 8 +-
+ fs/btrfs/extent-tree.c | 222 +++-
+ fs/btrfs/extent-tree.h | 6 +-
+ fs/btrfs/extent_io.c | 604 +++++-----
+ fs/btrfs/extent_io.h | 19 +-
+ fs/btrfs/file-item.c | 30 +-
+ fs/btrfs/file-item.h | 2 +
+ fs/btrfs/file.c | 34 +-
+ fs/btrfs/file.h | 2 +
+ fs/btrfs/free-space-cache.c | 89 +-
+ fs/btrfs/free-space-cache.h | 8 +-
+ fs/btrfs/free-space-tree.c | 45 +-
+ fs/btrfs/fs.c | 1 -
+ fs/btrfs/fs.h | 26 +-
+ fs/btrfs/inode-item.c | 6 +-
+ fs/btrfs/inode.c | 621 +++++-----
+ fs/btrfs/ioctl.c | 279 +++--
+ fs/btrfs/ioctl.h | 4 +-
+ fs/btrfs/locking.c | 1 -
+ fs/btrfs/ordered-data.c | 23 +-
+ fs/btrfs/ordered-data.h | 9 +-
+ fs/btrfs/print-tree.h | 2 +
+ fs/btrfs/props.c | 66 +-
+ fs/btrfs/props.h | 8 +-
+ fs/btrfs/qgroup.c | 2 +-
+ fs/btrfs/qgroup.h | 3 +
+ fs/btrfs/raid-stripe-tree.h | 1 +
+ fs/btrfs/reflink.c | 102 +-
+ fs/btrfs/relocation.c | 34 +-
+ fs/btrfs/scrub.c | 146 +--
+ fs/btrfs/send.c | 544 ++++-----
+ fs/btrfs/send.h | 4 +-
+ fs/btrfs/space-info.c | 2 +-
+ fs/btrfs/subpage.c | 224 ++--
+ fs/btrfs/subpage.h | 56 +-
+ fs/btrfs/super.c | 6 +-
+ fs/btrfs/sysfs.c | 14 +-
+ fs/btrfs/sysfs.h | 1 +
+ fs/btrfs/tests/extent-io-tests.c | 6 +-
+ fs/btrfs/tests/extent-map-tests.c | 1 +
+ fs/btrfs/transaction.c | 39 +-
+ fs/btrfs/tree-log.c | 267 ++--
+ fs/btrfs/verity.c | 4 +-
+ fs/btrfs/volumes.c | 26 +-
+ fs/btrfs/volumes.h | 5 +
+ fs/btrfs/xattr.h | 2 +
+ fs/btrfs/zlib.c | 83 +-
+ fs/btrfs/zoned.c | 3 +
+ fs/btrfs/zstd.c | 66 +-
+ fs/buffer.c | 58 +-
+ fs/cachefiles/namei.c | 16 +-
+ fs/cachefiles/ondemand.c | 7 +-
+ fs/ceph/addr.c | 1275 ++++++++++++--------
+ fs/ceph/dir.c | 45 +-
+ fs/ceph/inode.c | 31 +-
+ fs/ceph/mds_client.c | 2 +
+ fs/ceph/mds_client.h | 3 +
+ fs/ceph/super.c | 11 +
+ fs/ceph/super.h | 2 +-
+ fs/coda/dir.c | 14 +-
+ fs/configfs/dir.c | 6 +-
+ fs/coredump.c | 38 +-
+ fs/crypto/Kconfig | 20 +-
+ fs/crypto/crypto.c | 22 +-
+ fs/dax.c | 111 +-
+ fs/dcache.c | 46 -
+ fs/devpts/inode.c | 247 ++--
+ fs/dlm/config.h | 2 +-
+ fs/dlm/lock.c | 2 +
+ fs/dlm/lockspace.c | 2 +-
+ fs/drop_caches.c | 2 +-
+ fs/ecryptfs/crypto.c | 2 +-
+ fs/ecryptfs/ecryptfs_kernel.h | 1 -
+ fs/ecryptfs/inode.c | 20 +-
+ fs/ecryptfs/keystore.c | 4 +-
+ fs/ecryptfs/super.c | 1 -
+ fs/erofs/Kconfig | 14 +-
+ fs/erofs/compress.h | 2 +-
+ fs/erofs/data.c | 148 +--
+ fs/erofs/decompressor.c | 95 +-
+ fs/erofs/decompressor_deflate.c | 8 +-
+ fs/erofs/decompressor_lzma.c | 8 +-
+ fs/erofs/decompressor_zstd.c | 8 +-
+ fs/erofs/dir.c | 9 +-
+ fs/erofs/erofs_fs.h | 191 ++-
+ fs/erofs/fileio.c | 2 +-
+ fs/erofs/fscache.c | 2 +-
+ fs/erofs/inode.c | 129 +-
+ fs/erofs/internal.h | 47 +-
+ fs/erofs/namei.c | 2 +-
+ fs/erofs/super.c | 79 +-
+ fs/erofs/sysfs.c | 2 +
+ fs/erofs/xattr.c | 12 +-
+ fs/erofs/zdata.c | 102 +-
+ fs/erofs/zmap.c | 290 +++--
+ fs/eventfd.c | 5 +-
+ fs/eventpoll.c | 95 +-
+ fs/exfat/balloc.c | 14 -
+ fs/exfat/exfat_fs.h | 2 -
+ fs/exfat/fatent.c | 29 +
+ fs/exfat/namei.c | 8 +-
+ fs/exfat/super.c | 10 -
+ fs/exportfs/expfs.c | 2 -
+ fs/ext2/ext2.h | 1 +
+ fs/ext2/namei.c | 9 +-
+ fs/ext2/super.c | 589 +++++----
+ fs/ext4/ext4.h | 4 +
+ fs/ext4/ext4_jbd2.h | 84 --
+ fs/ext4/extents.c | 533 +++-----
+ fs/ext4/inode.c | 207 ++--
+ fs/ext4/namei.c | 24 +-
+ fs/ext4/page-io.c | 2 +-
+ fs/ext4/super.c | 15 -
+ fs/f2fs/checkpoint.c | 71 +-
+ fs/f2fs/compress.c | 1 +
+ fs/f2fs/data.c | 184 ++-
+ fs/f2fs/debug.c | 3 +
+ fs/f2fs/dir.c | 2 +-
+ fs/f2fs/f2fs.h | 157 ++-
+ fs/f2fs/file.c | 126 +-
+ fs/f2fs/gc.c | 42 +-
+ fs/f2fs/inline.c | 22 +-
+ fs/f2fs/inode.c | 33 +-
+ fs/f2fs/namei.c | 22 +-
+ fs/f2fs/node.c | 450 ++++---
+ fs/f2fs/node.h | 13 +-
+ fs/f2fs/segment.c | 51 +-
+ fs/f2fs/segment.h | 9 +-
+ fs/f2fs/shrinker.c | 92 +-
+ fs/f2fs/super.c | 191 ++-
+ fs/f2fs/sysfs.c | 139 ++-
+ fs/f2fs/xattr.c | 8 +-
+ fs/fat/namei_msdos.c | 8 +-
+ fs/fat/namei_vfat.c | 8 +-
+ fs/file.c | 82 +-
+ fs/file_table.c | 74 +-
+ fs/fsopen.c | 2 +-
+ fs/fuse/dev.c | 128 +-
+ fs/fuse/dev_uring.c | 27 +
+ fs/fuse/dev_uring_i.h | 12 +-
+ fs/fuse/dir.c | 61 +-
+ fs/fuse/fuse_dev_i.h | 3 +
+ fs/fuse/fuse_i.h | 44 +-
+ fs/fuse/inode.c | 51 +-
+ fs/fuse/sysctl.c | 24 +
+ fs/gfs2/bmap.c | 3 +-
+ fs/gfs2/glock.c | 124 +-
+ fs/gfs2/incore.h | 4 +-
+ fs/gfs2/inode.c | 9 +-
+ fs/gfs2/lops.c | 78 +-
+ fs/gfs2/meta_io.c | 15 +-
+ fs/gfs2/super.c | 24 +-
+ fs/gfs2/trace_gfs2.h | 10 +-
+ fs/gfs2/trans.c | 4 +-
+ fs/hfs/dir.c | 10 +-
+ fs/hfsplus/dir.c | 6 +-
+ fs/hostfs/hostfs_kern.c | 16 +-
+ fs/hpfs/namei.c | 10 +-
+ fs/hugetlbfs/inode.c | 6 +-
+ fs/init.c | 7 +-
+ fs/inode.c | 84 +-
+ fs/internal.h | 11 +-
+ fs/ioctl.c | 10 +-
+ fs/iomap/Makefile | 1 +
+ fs/iomap/buffered-io.c | 345 ++----
+ fs/iomap/direct-io.c | 176 ++-
+ fs/iomap/fiemap.c | 21 +-
+ fs/iomap/internal.h | 10 +
+ fs/iomap/ioend.c | 216 ++++
+ fs/iomap/iter.c | 97 +-
+ fs/iomap/seek.c | 16 +-
+ fs/iomap/swapfile.c | 7 +-
+ fs/iomap/trace.h | 10 +-
+ fs/isofs/dir.c | 3 +-
+ fs/jbd2/recovery.c | 58 +-
+ fs/jbd2/revoke.c | 8 +-
+ fs/jbd2/transaction.c | 1 -
+ fs/jffs2/dir.c | 18 +-
+ fs/jfs/inode.c | 2 +-
+ fs/jfs/jfs_dmap.c | 39 +-
+ fs/jfs/jfs_dtree.c | 3 +-
+ fs/jfs/jfs_extent.c | 10 +
+ fs/jfs/jfs_imap.c | 17 +-
+ fs/jfs/namei.c | 8 +-
+ fs/jfs/super.c | 6 +-
+ fs/jfs/xattr.c | 13 +-
+ fs/kernfs/dir.c | 12 +-
+ fs/libfs.c | 4 +-
+ fs/lockd/Makefile | 2 +-
+ fs/lockd/netlink.c | 44 +
+ fs/lockd/netlink.h | 19 +
+ fs/lockd/netns.h | 3 +
+ fs/lockd/svc.c | 123 +-
+ fs/minix/namei.c | 8 +-
+ fs/mnt_idmapping.c | 51 +
+ fs/mount.h | 37 +
+ fs/mpage.c | 49 +-
+ fs/namei.c | 149 +--
+ fs/namespace.c | 849 ++++++++++---
+ fs/nfs/dir.c | 20 +-
+ fs/nfs/export.c | 3 +-
+ fs/nfs/internal.h | 4 +-
+ fs/nfs/nfs3proc.c | 29 +-
+ fs/nfs/nfs4proc.c | 47 +-
+ fs/nfs/proc.c | 12 +-
+ fs/nfs_common/nfsacl.c | 8 +-
+ fs/nfsd/Kconfig | 12 +-
+ fs/nfsd/filecache.c | 122 +-
+ fs/nfsd/filecache.h | 7 +
+ fs/nfsd/nfs4callback.c | 146 ++-
+ fs/nfsd/nfs4layouts.c | 7 +-
+ fs/nfsd/nfs4proc.c | 2 +-
+ fs/nfsd/nfs4recover.c | 7 +-
+ fs/nfsd/nfs4state.c | 114 +-
+ fs/nfsd/nfsctl.c | 53 +-
+ fs/nfsd/state.h | 20 +-
+ fs/nfsd/stats.c | 4 +-
+ fs/nfsd/stats.h | 2 +-
+ fs/nfsd/trace.h | 24 +-
+ fs/nfsd/vfs.c | 140 ++-
+ fs/nilfs2/namei.c | 8 +-
+ fs/notify/fanotify/fanotify.c | 38 +-
+ fs/notify/fanotify/fanotify.h | 18 +
+ fs/notify/fanotify/fanotify_user.c | 89 +-
+ fs/notify/fdinfo.c | 5 +
+ fs/notify/fsnotify.c | 47 +-
+ fs/notify/fsnotify.h | 11 +
+ fs/notify/mark.c | 14 +-
+ fs/nsfs.c | 32 +-
+ fs/ntfs3/attrib.c | 3 +-
+ fs/ntfs3/file.c | 42 +-
+ fs/ntfs3/frecord.c | 63 +-
+ fs/ntfs3/fsntfs.c | 28 -
+ fs/ntfs3/index.c | 4 +-
+ fs/ntfs3/inode.c | 40 -
+ fs/ntfs3/namei.c | 8 +-
+ fs/ntfs3/ntfs.h | 2 +-
+ fs/ntfs3/ntfs_fs.h | 6 -
+ fs/ntfs3/super.c | 89 +-
+ fs/ocfs2/dlmfs/dlmfs.c | 10 +-
+ fs/ocfs2/namei.c | 10 +-
+ fs/omfs/dir.c | 6 +-
+ fs/open.c | 35 +-
+ fs/orangefs/file.c | 4 +-
+ fs/orangefs/inode.c | 149 +--
+ fs/orangefs/namei.c | 8 +-
+ fs/orangefs/orangefs-debug.h | 43 -
+ fs/orangefs/orangefs-debugfs.c | 43 +
+ fs/overlayfs/dir.c | 46 +-
+ fs/overlayfs/overlayfs.h | 15 +-
+ fs/overlayfs/params.c | 25 +
+ fs/overlayfs/super.c | 23 +-
+ fs/pidfs.c | 234 +++-
+ fs/pipe.c | 189 +--
+ fs/pnode.c | 14 +-
+ fs/pnode.h | 2 +-
+ fs/pstore/inode.c | 109 +-
+ fs/ramfs/inode.c | 6 +-
+ fs/read_write.c | 13 +-
+ fs/signalfd.c | 7 +-
+ fs/smb/client/cifsacl.c | 17 +-
+ fs/smb/client/cifsfs.h | 4 +-
+ fs/smb/client/connect.c | 17 +-
+ fs/smb/client/file.c | 2 +-
+ fs/smb/client/inode.c | 10 +-
+ fs/smb/client/sess.c | 7 +
+ fs/smb/server/Kconfig | 2 +-
+ fs/smb/server/transport_rdma.c | 5 +-
+ fs/smb/server/vfs.c | 58 +-
+ fs/splice.c | 40 +-
+ fs/super.c | 57 +-
+ fs/sysv/Kconfig | 38 -
+ fs/sysv/Makefile | 9 -
+ fs/sysv/balloc.c | 240 ----
+ fs/sysv/dir.c | 378 ------
+ fs/sysv/file.c | 59 -
+ fs/sysv/ialloc.c | 235 ----
+ fs/sysv/inode.c | 354 ------
+ fs/sysv/itree.c | 511 --------
+ fs/sysv/namei.c | 280 -----
+ fs/sysv/super.c | 595 ---------
+ fs/sysv/sysv.h | 245 ----
+ fs/timerfd.c | 6 +-
+ fs/tracefs/inode.c | 10 +-
+ fs/ubifs/dir.c | 10 +-
+ fs/udf/inode.c | 1 +
+ fs/udf/namei.c | 12 +-
+ fs/ufs/namei.c | 8 +-
+ fs/vboxsf/dir.c | 8 +-
+ fs/verity/Kconfig | 8 +-
+ fs/xfs/Makefile | 7 +-
+ fs/xfs/libxfs/xfs_bmap.c | 316 +----
+ fs/xfs/libxfs/xfs_bmap.h | 7 +-
+ fs/xfs/libxfs/xfs_format.h | 20 +-
+ fs/xfs/libxfs/xfs_fs.h | 14 +-
+ fs/xfs/libxfs/xfs_group.h | 31 +-
+ fs/xfs/libxfs/xfs_ialloc.c | 4 +-
+ fs/xfs/libxfs/xfs_inode_buf.c | 23 +-
+ fs/xfs/libxfs/xfs_inode_util.c | 1 +
+ fs/xfs/libxfs/xfs_log_format.h | 7 +-
+ fs/xfs/libxfs/xfs_metafile.c | 175 ++-
+ fs/xfs/libxfs/xfs_metafile.h | 6 +-
+ fs/xfs/libxfs/xfs_ondisk.h | 6 +-
+ fs/xfs/libxfs/xfs_rtbitmap.c | 11 +
+ fs/xfs/libxfs/xfs_rtgroup.c | 39 +-
+ fs/xfs/libxfs/xfs_rtgroup.h | 50 +-
+ fs/xfs/libxfs/xfs_rtrmap_btree.c | 19 +
+ fs/xfs/libxfs/xfs_rtrmap_btree.h | 2 +
+ fs/xfs/libxfs/xfs_sb.c | 81 +-
+ fs/xfs/libxfs/xfs_types.h | 28 +
+ fs/xfs/libxfs/xfs_zones.c | 186 +++
+ fs/xfs/libxfs/xfs_zones.h | 35 +
+ fs/xfs/scrub/agheader.c | 2 +
+ fs/xfs/scrub/bmap.c | 4 +-
+ fs/xfs/scrub/fscounters.c | 22 +-
+ fs/xfs/scrub/fscounters_repair.c | 12 +-
+ fs/xfs/scrub/inode.c | 7 +
+ fs/xfs/scrub/inode_repair.c | 7 +-
+ fs/xfs/scrub/newbt.c | 2 +-
+ fs/xfs/scrub/orphanage.c | 9 +-
+ fs/xfs/scrub/reap.c | 9 +-
+ fs/xfs/scrub/repair.c | 37 +-
+ fs/xfs/scrub/rtbitmap.c | 11 +-
+ fs/xfs/scrub/rtrefcount_repair.c | 34 +-
+ fs/xfs/scrub/rtrmap_repair.c | 29 +-
+ fs/xfs/scrub/scrub.c | 2 +
+ fs/xfs/xfs_aops.c | 194 ++-
+ fs/xfs/xfs_aops.h | 3 +-
+ fs/xfs/xfs_bmap_util.c | 32 +-
+ fs/xfs/xfs_bmap_util.h | 12 +-
+ fs/xfs/xfs_buf.c | 381 +++---
+ fs/xfs/xfs_buf.h | 25 +-
+ fs/xfs/xfs_buf_item.c | 114 --
+ fs/xfs/xfs_buf_item_recover.c | 8 +-
+ fs/xfs/xfs_buf_mem.c | 43 +-
+ fs/xfs/xfs_buf_mem.h | 6 +-
+ fs/xfs/xfs_discard.c | 3 +-
+ fs/xfs/xfs_extent_busy.c | 2 +-
+ fs/xfs/xfs_extfree_item.c | 35 +-
+ fs/xfs/xfs_file.c | 351 +++++-
+ fs/xfs/xfs_fsmap.c | 86 +-
+ fs/xfs/xfs_fsops.c | 50 +-
+ fs/xfs/xfs_fsops.h | 3 +-
+ fs/xfs/xfs_icache.c | 6 +-
+ fs/xfs/xfs_inode.c | 6 +-
+ fs/xfs/xfs_inode.h | 28 +-
+ fs/xfs/xfs_inode_item.c | 1 +
+ fs/xfs/xfs_inode_item_recover.c | 1 +
+ fs/xfs/xfs_ioctl.c | 12 +-
+ fs/xfs/xfs_iomap.c | 528 +++++++-
+ fs/xfs/xfs_iomap.h | 7 +-
+ fs/xfs/xfs_iops.c | 35 +-
+ fs/xfs/xfs_log.c | 4 +
+ fs/xfs/xfs_message.c | 4 +
+ fs/xfs/xfs_message.h | 1 +
+ fs/xfs/xfs_mount.c | 212 ++--
+ fs/xfs/xfs_mount.h | 131 +-
+ fs/xfs/xfs_qm.c | 3 +-
+ fs/xfs/xfs_reflink.c | 18 +-
+ fs/xfs/xfs_rtalloc.c | 240 ++--
+ fs/xfs/xfs_rtalloc.h | 5 -
+ fs/xfs/xfs_super.c | 168 ++-
+ fs/xfs/xfs_sysfs.c | 75 +-
+ fs/xfs/xfs_sysfs.h | 5 +-
+ fs/xfs/xfs_trace.c | 2 +
+ fs/xfs/xfs_trace.h | 218 +++-
+ fs/xfs/xfs_zone_alloc.c | 1211 +++++++++++++++++++
+ fs/xfs/xfs_zone_alloc.h | 70 ++
+ fs/xfs/xfs_zone_gc.c | 1165 ++++++++++++++++++
+ fs/xfs/xfs_zone_info.c | 105 ++
+ fs/xfs/xfs_zone_priv.h | 119 ++
+ fs/xfs/xfs_zone_space_resv.c | 263 ++++
+ fs/zonefs/file.c | 2 +-
+ include/linux/blkdev.h | 8 +-
+ include/linux/buffer_head.h | 1 -
+ include/linux/dcache.h | 39 +-
+ include/linux/eventpoll.h | 4 +
+ include/linux/exportfs.h | 14 +-
+ include/linux/fanotify.h | 12 +-
+ include/linux/file_ref.h | 34 +
+ include/linux/fs.h | 72 +-
+ include/linux/fs_context.h | 2 -
+ include/linux/fscrypt.h | 12 +-
+ include/linux/fsnotify.h | 20 +
+ include/linux/fsnotify_backend.h | 42 +
+ include/linux/iomap.h | 118 +-
+ include/linux/jbd2.h | 8 +-
+ include/linux/kstrtox.h | 1 +
+ include/linux/mm.h | 2 +-
+ include/linux/mnt_idmapping.h | 5 +
+ include/linux/namei.h | 45 +-
+ include/linux/nfs_xdr.h | 2 +-
+ include/linux/pagemap.h | 57 +-
+ include/linux/pid.h | 7 +-
+ include/linux/pidfs.h | 1 +
+ include/linux/pipe_fs_i.h | 2 +-
+ include/linux/posix_acl.h | 11 +-
+ include/linux/syscalls.h | 8 +-
+ include/linux/sysv_fs.h | 214 ----
+ include/linux/uidgid.h | 6 +
+ include/linux/vfsdebug.h | 45 +
+ include/linux/wait.h | 3 +
+ include/net/af_rxrpc.h | 2 +
+ include/trace/events/afs.h | 83 +-
+ include/trace/events/erofs.h | 2 +-
+ include/uapi/asm-generic/unistd.h | 4 +-
+ include/uapi/linux/btrfs.h | 69 +-
+ include/uapi/linux/f2fs.h | 7 +
+ include/uapi/linux/fanotify.h | 10 +
+ include/uapi/linux/fuse.h | 12 +-
+ include/uapi/linux/lockd_netlink.h | 29 +
+ include/uapi/linux/mount.h | 10 +-
+ include/uapi/linux/pidfd.h | 27 +-
+ init/.kunitconfig | 3 +
+ init/Kconfig | 7 +
+ init/Makefile | 1 +
+ init/initramfs.c | 66 +-
+ init/initramfs_internal.h | 8 +
+ init/initramfs_test.c | 407 +++++++
+ kernel/audit_watch.c | 12 +-
+ kernel/auditsc.c | 12 +-
+ kernel/bpf/inode.c | 8 +-
+ kernel/exit.c | 58 +-
+ kernel/fork.c | 22 +-
+ kernel/kcmp.c | 2 +-
+ kernel/pid.c | 106 +-
+ kernel/signal.c | 117 +-
+ kernel/sys.c | 14 +-
+ kernel/user_namespace.c | 26 +-
+ kernel/watch_queue.c | 16 +-
+ lib/Kconfig.debug | 9 +
+ lib/vsprintf.c | 7 +
+ mm/filemap.c | 2 +-
+ mm/folio-compat.c | 14 -
+ mm/gup.c | 6 +-
+ mm/shmem.c | 8 +-
+ net/9p/client.c | 42 +-
+ net/9p/trans_fd.c | 65 +-
+ net/rxrpc/ar-internal.h | 1 +
+ net/rxrpc/peer_object.c | 30 +-
+ net/sunrpc/auth_gss/gss_krb5_crypto.c | 144 ---
+ net/sunrpc/auth_gss/gss_krb5_internal.h | 7 -
+ net/sunrpc/cache.c | 6 +-
+ net/sunrpc/xprtrdma/svc_rdma_transport.c | 3 +-
+ samples/vfs/samples-vfs.h | 14 +-
+ samples/vfs/test-list-all-mounts.c | 35 +-
+ scripts/syscall.tbl | 1 +
+ security/apparmor/apparmorfs.c | 8 +-
+ security/landlock/fs.c | 2 +-
+ security/selinux/hooks.c | 3 +
+ security/selinux/include/classmap.h | 2 +-
+ tools/testing/selftests/Makefile | 1 +
+ .../selftests/filesystems/mount-notify/.gitignore | 2 +
+ .../selftests/filesystems/mount-notify/Makefile | 6 +
+ .../filesystems/mount-notify/mount-notify_test.c | 516 ++++++++
+ .../selftests/filesystems/nsfs/iterate_mntns.c | 14 +
+ .../selftests/filesystems/overlayfs/Makefile | 11 +-
+ .../filesystems/overlayfs/set_layers_via_fds.c | 503 ++++++++
+ .../selftests/filesystems/overlayfs/wrappers.h | 17 +
+ .../selftests/filesystems/statmount/statmount.h | 2 +-
+ tools/testing/selftests/filesystems/utils.c | 501 ++++++++
+ tools/testing/selftests/filesystems/utils.h | 45 +
+ tools/testing/selftests/mm/guard-regions.c | 16 +-
+ .../selftests/mount_setattr/mount_setattr_test.c | 652 ++++++++++
+ tools/testing/selftests/pidfd/.gitignore | 2 +
+ tools/testing/selftests/pidfd/Makefile | 4 +-
+ tools/testing/selftests/pidfd/pidfd.h | 109 ++
+ tools/testing/selftests/pidfd/pidfd_exec_helper.c | 12 +
+ tools/testing/selftests/pidfd/pidfd_fdinfo_test.c | 1 +
+ tools/testing/selftests/pidfd/pidfd_info_test.c | 497 ++++++++
+ tools/testing/selftests/pidfd/pidfd_open_test.c | 30 +-
+ tools/testing/selftests/pidfd/pidfd_setns_test.c | 45 -
+ tools/testing/selftests/pidfd/pidfd_test.c | 80 +-
+ virt/kvm/kvm_main.c | 11 +-
+ 691 files changed, 25533 insertions(+), 16130 deletions(-)
+ create mode 100644 Documentation/filesystems/bcachefs/casefolding.rst
+ delete mode 100644 Documentation/filesystems/sysv-fs.rst
+ create mode 100644 Documentation/netlink/specs/lockd.yaml
+ create mode 100644 fs/bcachefs/progress.c
+ create mode 100644 fs/bcachefs/progress.h
+ create mode 100644 fs/iomap/internal.h
+ create mode 100644 fs/iomap/ioend.c
+ create mode 100644 fs/lockd/netlink.c
+ create mode 100644 fs/lockd/netlink.h
+ delete mode 100644 fs/sysv/Kconfig
+ delete mode 100644 fs/sysv/Makefile
+ delete mode 100644 fs/sysv/balloc.c
+ delete mode 100644 fs/sysv/dir.c
+ delete mode 100644 fs/sysv/file.c
+ delete mode 100644 fs/sysv/ialloc.c
+ delete mode 100644 fs/sysv/inode.c
+ delete mode 100644 fs/sysv/itree.c
+ delete mode 100644 fs/sysv/namei.c
+ delete mode 100644 fs/sysv/super.c
+ delete mode 100644 fs/sysv/sysv.h
+ create mode 100644 fs/xfs/libxfs/xfs_zones.c
+ create mode 100644 fs/xfs/libxfs/xfs_zones.h
+ create mode 100644 fs/xfs/xfs_zone_alloc.c
+ create mode 100644 fs/xfs/xfs_zone_alloc.h
+ create mode 100644 fs/xfs/xfs_zone_gc.c
+ create mode 100644 fs/xfs/xfs_zone_info.c
+ create mode 100644 fs/xfs/xfs_zone_priv.h
+ create mode 100644 fs/xfs/xfs_zone_space_resv.c
+ delete mode 100644 include/linux/sysv_fs.h
+ create mode 100644 include/linux/vfsdebug.h
+ create mode 100644 include/uapi/linux/lockd_netlink.h
+ create mode 100644 init/.kunitconfig
+ create mode 100644 init/initramfs_internal.h
+ create mode 100644 init/initramfs_test.c
+ create mode 100644 tools/testing/selftests/filesystems/mount-notify/.gitignore
+ create mode 100644 tools/testing/selftests/filesystems/mount-notify/Makefile
+ create mode 100644 tools/testing/selftests/filesystems/mount-notify/mount-notify_test.c
+ create mode 100644 tools/testing/selftests/filesystems/utils.c
+ create mode 100644 tools/testing/selftests/filesystems/utils.h
+ create mode 100644 tools/testing/selftests/pidfd/pidfd_exec_helper.c
+ create mode 100644 tools/testing/selftests/pidfd/pidfd_info_test.c
+Merging printk/for-next (b6e2174ef49b Merge branch 'for-6.15-console-suspend-api-cleanup' 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 drivers/tty/serial/serial_core.c
+Auto-merging kernel/kexec_core.c
+Auto-merging kernel/power/hibernate.c
+Merge made by the 'ort' strategy.
+ drivers/gpu/drm/clients/drm_log.c | 4 +--
+ drivers/tty/serial/serial_core.c | 6 ++---
+ include/linux/console.h | 8 +++---
+ kernel/kexec_core.c | 4 +--
+ kernel/power/hibernate.c | 16 ++++++------
+ kernel/power/suspend.c | 8 +++---
+ kernel/printk/printk.c | 30 ++++++++++++++--------
+ .../pm-graph/config/custom-timeline-functions.cfg | 4 +--
+ tools/power/pm-graph/sleepgraph.py | 6 ++---
+ 9 files changed, 48 insertions(+), 38 deletions(-)
+Merging pci/next (df90ab163b75 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 Documentation/devicetree/bindings/vendor-prefixes.yaml
+Auto-merging MAINTAINERS
+Auto-merging arch/s390/Kconfig
+Auto-merging drivers/base/core.c
+Auto-merging drivers/irqchip/Kconfig
+Auto-merging drivers/pci/pcie/aspm.c
+Auto-merging drivers/pci/probe.c
+Auto-merging drivers/pci/quirks.c
+Auto-merging drivers/perf/dwc_pcie_pmu.c
+Auto-merging drivers/s390/net/ism_drv.c
+Auto-merging include/linux/pci_ids.h
+Merge made by the 'ort' strategy.
+ Documentation/ABI/testing/debugfs-dwc-pcie | 157 +++++
+ Documentation/ABI/testing/sysfs-bus-pci | 29 +
+ Documentation/PCI/endpoint/pci-endpoint.rst | 7 +-
+ .../interrupt-controller/brcm,bcm2712-msix.yaml | 60 ++
+ .../bindings/pci/altr,pcie-root-port.yaml | 10 +
+ .../bindings/pci/amd,versal2-mdb-host.yaml | 121 ++++
+ .../devicetree/bindings/pci/brcm,stb-pcie.yaml | 6 +-
+ .../devicetree/bindings/pci/fsl,imx6q-pcie.yaml | 4 +
+ .../bindings/pci/fsl,layerscape-pcie-ep.yaml | 3 -
+ .../devicetree/bindings/pci/fsl,mpc8xxx-pci.yaml | 113 ++++
+ Documentation/devicetree/bindings/pci/fsl,pci.txt | 27 -
+ .../bindings/pci/mediatek-pcie-gen3.yaml | 17 +
+ .../devicetree/bindings/pci/qcom,pcie-ep.yaml | 100 ++-
+ .../devicetree/bindings/pci/qcom,pcie.yaml | 8 +-
+ .../devicetree/bindings/pci/snps,dw-pcie.yaml | 2 +
+ .../devicetree/bindings/pci/xilinx-versal-cpm.yaml | 1 +
+ .../devicetree/bindings/vendor-prefixes.yaml | 2 +-
+ MAINTAINERS | 1 +
+ arch/s390/Kconfig | 4 +-
+ arch/s390/include/asm/pci.h | 3 +
+ arch/s390/pci/Makefile | 2 +-
+ arch/s390/pci/pci_fixup.c | 23 +
+ arch/s390/pci/pci_mmio.c | 18 +-
+ drivers/base/core.c | 61 ++
+ drivers/irqchip/Kconfig | 16 +
+ drivers/irqchip/Makefile | 1 +
+ drivers/irqchip/irq-bcm2712-mip.c | 292 +++++++++
+ drivers/misc/pci_endpoint_test.c | 131 ++--
+ drivers/pci/Kconfig | 5 +-
+ drivers/pci/bus.c | 43 --
+ drivers/pci/controller/cadence/pci-j721e.c | 5 +-
+ drivers/pci/controller/cadence/pcie-cadence-ep.c | 11 +-
+ drivers/pci/controller/cadence/pcie-cadence.h | 2 +-
+ drivers/pci/controller/dwc/Kconfig | 21 +
+ drivers/pci/controller/dwc/Makefile | 2 +
+ drivers/pci/controller/dwc/pci-imx6.c | 88 +--
+ drivers/pci/controller/dwc/pci-keystone.c | 6 +-
+ drivers/pci/controller/dwc/pcie-amd-mdb.c | 476 +++++++++++++++
+ .../pci/controller/dwc/pcie-designware-debugfs.c | 677 +++++++++++++++++++++
+ drivers/pci/controller/dwc/pcie-designware-ep.c | 247 ++++++--
+ drivers/pci/controller/dwc/pcie-designware-host.c | 4 +
+ drivers/pci/controller/dwc/pcie-designware.c | 46 ++
+ drivers/pci/controller/dwc/pcie-designware.h | 58 ++
+ drivers/pci/controller/dwc/pcie-dw-rockchip.c | 53 +-
+ drivers/pci/controller/dwc/pcie-histb.c | 9 +-
+ drivers/pci/controller/dwc/pcie-kirin.c | 50 +-
+ drivers/pci/controller/dwc/pcie-qcom-ep.c | 17 +-
+ drivers/pci/controller/dwc/pcie-qcom.c | 12 +-
+ drivers/pci/controller/pci-hyperv.c | 2 +-
+ drivers/pci/controller/pci-mvebu.c | 2 +-
+ drivers/pci/controller/pci-tegra.c | 80 +--
+ drivers/pci/controller/pci-thunder-ecam.c | 2 +-
+ drivers/pci/controller/pci-xgene-msi.c | 2 +-
+ drivers/pci/controller/pcie-altera.c | 257 +++++++-
+ drivers/pci/controller/pcie-apple.c | 4 +-
+ drivers/pci/controller/pcie-brcmstb.c | 201 +++---
+ drivers/pci/controller/pcie-mediatek-gen3.c | 64 +-
+ drivers/pci/controller/pcie-mediatek.c | 15 +-
+ drivers/pci/controller/pcie-mt7621.c | 15 +-
+ drivers/pci/controller/pcie-rcar-host.c | 10 +-
+ drivers/pci/controller/pcie-rockchip-host.c | 2 +-
+ drivers/pci/controller/pcie-rockchip.h | 1 -
+ drivers/pci/controller/pcie-xilinx-cpm.c | 50 +-
+ drivers/pci/controller/vmd.c | 12 +-
+ drivers/pci/devres.c | 18 +-
+ drivers/pci/doe.c | 247 ++++++--
+ drivers/pci/endpoint/Kconfig | 2 +-
+ drivers/pci/endpoint/functions/pci-epf-mhi.c | 2 +-
+ drivers/pci/endpoint/functions/pci-epf-test.c | 142 +++--
+ drivers/pci/endpoint/pci-epc-core.c | 56 +-
+ drivers/pci/endpoint/pci-epf-core.c | 4 +
+ drivers/pci/hotplug/Kconfig | 2 +-
+ drivers/pci/hotplug/cpci_hotplug.h | 2 -
+ drivers/pci/hotplug/cpci_hotplug_core.c | 17 +-
+ drivers/pci/hotplug/pci_hotplug_core.c | 142 ++---
+ drivers/pci/hotplug/pciehp_core.c | 5 +-
+ drivers/pci/hotplug/pciehp_hpc.c | 7 +-
+ drivers/pci/hotplug/shpchp.h | 18 +-
+ drivers/pci/hotplug/shpchp_core.c | 13 +-
+ drivers/pci/hotplug/shpchp_hpc.c | 2 +-
+ drivers/pci/iomap.c | 29 +-
+ drivers/pci/iov.c | 2 +-
+ drivers/pci/msi/api.c | 2 +-
+ drivers/pci/of.c | 127 +++-
+ drivers/pci/of_property.c | 115 +++-
+ drivers/pci/pci-sysfs.c | 9 +-
+ drivers/pci/pci.c | 64 +-
+ drivers/pci/pci.h | 89 ++-
+ drivers/pci/pcie/aer.c | 79 +--
+ drivers/pci/pcie/aspm.c | 17 +-
+ drivers/pci/pcie/dpc.c | 18 +-
+ drivers/pci/pcie/portdrv.c | 8 +-
+ drivers/pci/pcie/tlp.c | 56 +-
+ drivers/pci/probe.c | 78 ++-
+ drivers/pci/proc.c | 4 +
+ drivers/pci/pwrctrl/Kconfig | 11 +
+ drivers/pci/pwrctrl/Makefile | 3 +
+ drivers/pci/pwrctrl/core.c | 2 +-
+ drivers/pci/pwrctrl/slot.c | 93 +++
+ drivers/pci/quirks.c | 4 +-
+ drivers/pci/remove.c | 5 +-
+ drivers/pci/setup-bus.c | 577 ++++++++++--------
+ drivers/pci/setup-res.c | 24 +-
+ drivers/pci/slot.c | 44 --
+ drivers/perf/dwc_pcie_pmu.c | 25 +-
+ drivers/s390/net/ism_drv.c | 1 -
+ drivers/vfio/pci/Kconfig | 4 -
+ drivers/vfio/pci/vfio_pci_core.c | 2 +-
+ include/linux/aer.h | 12 +-
+ include/linux/device.h | 2 +
+ include/linux/pci-epc.h | 7 +-
+ include/linux/pci-epf.h | 17 +-
+ include/linux/pci.h | 14 +-
+ include/linux/pci_hotplug.h | 2 -
+ include/linux/pci_ids.h | 3 +
+ include/linux/pcie-dwc.h | 38 ++
+ include/ras/ras_event.h | 12 +-
+ include/uapi/linux/pci_regs.h | 13 +-
+ include/uapi/linux/pcitest.h | 6 +
+ tools/Makefile | 13 +-
+ .../selftests/pci_endpoint/pci_endpoint_test.c | 31 +-
+ tools/testing/selftests/pcie_bwctrl/Makefile | 2 +-
+ 122 files changed, 4765 insertions(+), 1348 deletions(-)
+ create mode 100644 Documentation/ABI/testing/debugfs-dwc-pcie
+ create mode 100644 Documentation/devicetree/bindings/interrupt-controller/brcm,bcm2712-msix.yaml
+ create mode 100644 Documentation/devicetree/bindings/pci/amd,versal2-mdb-host.yaml
+ create mode 100644 Documentation/devicetree/bindings/pci/fsl,mpc8xxx-pci.yaml
+ delete mode 100644 Documentation/devicetree/bindings/pci/fsl,pci.txt
+ create mode 100644 arch/s390/pci/pci_fixup.c
+ create mode 100644 drivers/irqchip/irq-bcm2712-mip.c
+ create mode 100644 drivers/pci/controller/dwc/pcie-amd-mdb.c
+ create mode 100644 drivers/pci/controller/dwc/pcie-designware-debugfs.c
+ create mode 100644 drivers/pci/pwrctrl/slot.c
+ create mode 100644 include/linux/pcie-dwc.h
+Merging pstore/for-next/pstore (5674609535ba pstore: Change kmsg_bytes storage size to u32)
+$ 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 fs/pstore/inode.c
+Merge made by the 'ort' strategy.
+ fs/pstore/inode.c | 2 +-
+ fs/pstore/internal.h | 4 ++--
+ fs/pstore/platform.c | 11 ++++++-----
+ 3 files changed, 9 insertions(+), 8 deletions(-)
+Merging hid/for-next (160957abbf99 Merge branch 'for-6.15/intel-ish' 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
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ Documentation/ABI/testing/sysfs-driver-amd-sfh | 13 +
+ .../ABI/testing/sysfs-driver-hid-appletb-kbd | 13 +
+ MAINTAINERS | 8 +
+ drivers/hid/Kconfig | 40 ++
+ drivers/hid/Makefile | 4 +-
+ drivers/hid/amd-sfh-hid/amd_sfh_common.h | 1 +
+ drivers/hid/amd-sfh-hid/amd_sfh_pcie.c | 58 +++
+ drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.c | 50 +-
+ drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.h | 3 +
+ drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_interface.c | 2 +-
+ drivers/hid/bpf/progs/Huion__Kamvas-Pro-19.bpf.c | 75 ++-
+ drivers/hid/bpf/progs/Huion__KeydialK20.bpf.c | 531 +++++++++++++++++++
+ .../progs/TUXEDO__Sirius-16-Gen1-and-Gen2.bpf.c | 47 ++
+ drivers/hid/bpf/progs/XPPen__ACK05.bpf.c | 330 ++++++++++++
+ drivers/hid/bpf/progs/XPPen__ArtistPro16Gen2.bpf.c | 44 +-
+ drivers/hid/bpf/progs/hid_bpf_async.h | 219 ++++++++
+ drivers/hid/bpf/progs/hid_bpf_helpers.h | 19 +
+ drivers/hid/hid-appletb-bl.c | 204 ++++++++
+ drivers/hid/hid-appletb-kbd.c | 507 ++++++++++++++++++
+ drivers/hid/hid-core.c | 6 +-
+ drivers/hid/hid-google-hammer.c | 1 -
+ drivers/hid/hid-ids.h | 37 ++
+ drivers/hid/hid-lg-g15.c | 146 +++---
+ drivers/hid/hid-plantronics.c | 144 +++---
+ drivers/hid/hid-quirks.c | 24 +-
+ drivers/hid/hid-steam.c | 7 +-
+ drivers/hid/hid-universal-pidff.c | 202 ++++++++
+ .../intel-thc-hid/intel-quicki2c/pci-quicki2c.c | 14 +-
+ .../intel-thc-hid/intel-quickspi/pci-quickspi.c | 16 +-
+ .../intel-thc-hid/intel-quickspi/quickspi-dev.h | 4 +-
+ .../intel-quickspi/quickspi-protocol.c | 2 +-
+ .../hid/intel-thc-hid/intel-thc/intel-thc-dma.c | 2 +-
+ drivers/hid/usbhid/hid-core.c | 1 +
+ drivers/hid/usbhid/hid-pidff.c | 571 ++++++++++++++-------
+ drivers/hid/usbhid/hid-pidff.h | 33 ++
+ drivers/hid/usbhid/usbkbd.c | 2 +-
+ drivers/hid/wacom_sys.c | 35 +-
+ drivers/hid/wacom_wac.c | 8 +-
+ drivers/hid/wacom_wac.h | 7 +-
+ include/linux/hid.h | 8 +-
+ sound/usb/mixer_quirks.c | 51 ++
+ 41 files changed, 3054 insertions(+), 435 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-driver-amd-sfh
+ create mode 100644 Documentation/ABI/testing/sysfs-driver-hid-appletb-kbd
+ create mode 100644 drivers/hid/bpf/progs/Huion__KeydialK20.bpf.c
+ create mode 100644 drivers/hid/bpf/progs/TUXEDO__Sirius-16-Gen1-and-Gen2.bpf.c
+ create mode 100644 drivers/hid/bpf/progs/XPPen__ACK05.bpf.c
+ create mode 100644 drivers/hid/bpf/progs/hid_bpf_async.h
+ create mode 100644 drivers/hid/hid-appletb-bl.c
+ create mode 100644 drivers/hid/hid-appletb-kbd.c
+ create mode 100644 drivers/hid/hid-universal-pidff.c
+ create mode 100644 drivers/hid/usbhid/hid-pidff.h
+Merging i2c/i2c/for-next (7a098757ac56 Merge branch 'i2c/for-current' into i2c/for-next)
+$ 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
+Merge made by the 'ort' strategy.
+ Documentation/devicetree/bindings/eeprom/at24.yaml | 5 ++++-
+ drivers/i2c/i2c-core-of.c | 1 -
+ drivers/i2c/i2c-core.h | 9 +++++++++
+ drivers/misc/eeprom/at24.c | 10 ++++------
+ drivers/power/supply/ip5xxx_power.c | 7 ++-----
+ include/linux/i2c.h | 11 -----------
+ 6 files changed, 19 insertions(+), 24 deletions(-)
+Merging i2c-host/i2c/i2c-host (42c1c13f4b70 i2c: i801: Use MMIO if available)
+$ 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 include/linux/i2c.h
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/i2c/i2c-exynos5.yaml | 1 +
+ .../devicetree/bindings/i2c/i2c-imx-lpi2c.yaml | 1 +
+ .../devicetree/bindings/i2c/i2c-rk3x.yaml | 1 +
+ .../devicetree/bindings/i2c/qcom,i2c-qup.yaml | 14 ++
+ .../bindings/i2c/samsung,s3c2410-i2c.yaml | 1 +
+ drivers/i2c/busses/i2c-amd-asf-plat.c | 8 +-
+ drivers/i2c/busses/i2c-axxia.c | 21 +-
+ drivers/i2c/busses/i2c-bcm-kona.c | 6 +-
+ drivers/i2c/busses/i2c-brcmstb.c | 11 +-
+ drivers/i2c/busses/i2c-cadence.c | 19 +-
+ drivers/i2c/busses/i2c-designware-amdpsp.c | 26 +-
+ drivers/i2c/busses/i2c-designware-master.c | 2 +-
+ drivers/i2c/busses/i2c-eg20t.c | 28 +--
+ drivers/i2c/busses/i2c-exynos5.c | 2 +-
+ drivers/i2c/busses/i2c-i801.c | 271 ++++++++++-----------
+ drivers/i2c/busses/i2c-ibm_iic.c | 14 +-
+ drivers/i2c/busses/i2c-kempld.c | 10 +-
+ drivers/i2c/busses/i2c-mt7621.c | 20 +-
+ drivers/i2c/busses/i2c-mv64xxx.c | 12 +-
+ drivers/i2c/busses/i2c-octeon-core.c | 86 ++++---
+ drivers/i2c/busses/i2c-pxa.c | 5 +-
+ drivers/i2c/busses/i2c-qup.c | 36 +++
+ drivers/i2c/busses/i2c-rzv2m.c | 15 +-
+ drivers/i2c/muxes/i2c-mux-ltc4306.c | 2 +-
+ drivers/i2c/muxes/i2c-mux-reg.c | 2 +-
+ include/linux/i2c.h | 15 ++
+ 26 files changed, 318 insertions(+), 311 deletions(-)
+Merging i3c/i3c/next (2a785307e41b i3c: master: svc: Fix npcm845 DAA process corruption)
+$ git merge -m Merge branch 'i3c/next' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c/i3c/next
+Auto-merging CREDITS
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ CREDITS | 4 +
+ .../bindings/i3c/silvaco,i3c-master.yaml | 4 +-
+ .../bindings/i3c/snps,dw-i3c-master.yaml | 3 +
+ MAINTAINERS | 4 +-
+ drivers/i3c/master/dw-i3c-master.c | 2 +-
+ drivers/i3c/master/i3c-master-cdns.c | 2 +-
+ drivers/i3c/master/mipi-i3c-hci/core.c | 10 +-
+ drivers/i3c/master/svc-i3c-master.c | 131 +++++++++++++++++++--
+ include/linux/i3c/master.h | 2 +-
+ 9 files changed, 140 insertions(+), 22 deletions(-)
+Merging dmi/dmi-for-next (4d1b28a8119c firmware: dmi: Add info message for number of populated and total memory slots)
+$ git merge -m Merge branch 'dmi-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git dmi/dmi-for-next
+Already up to date.
+Merging hwmon-staging/hwmon-next (dbcfcb239b3b hwmon: (dell-smm) Increment the number of fans)
+$ 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 drivers/hwmon/ntc_thermistor.c
+Auto-merging drivers/hwmon/xgene-hwmon.c
+Auto-merging include/linux/pci_ids.h
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/hwmon/gpio-fan.yaml | 3 +
+ .../devicetree/bindings/hwmon/lltc,ltc2978.yaml | 2 +
+ .../devicetree/bindings/hwmon/national,lm90.yaml | 6 +
+ .../devicetree/bindings/hwmon/ntc-thermistor.yaml | 2 +-
+ .../bindings/hwmon/pmbus/ti,ucd90320.yaml | 9 +
+ Documentation/hwmon/abituguru-datasheet.rst | 8 +-
+ Documentation/hwmon/abituguru.rst | 2 +-
+ Documentation/hwmon/asus_ec_sensors.rst | 1 +
+ Documentation/hwmon/dell-smm-hwmon.rst | 14 +-
+ Documentation/hwmon/lm90.rst | 43 +++
+ Documentation/hwmon/ltc2978.rst | 8 +
+ Documentation/hwmon/nct6683.rst | 3 +-
+ drivers/hwmon/Kconfig | 4 +-
+ drivers/hwmon/acpi_power_meter.c | 8 +-
+ drivers/hwmon/asus-ec-sensors.c | 10 +
+ drivers/hwmon/dell-smm-hwmon.c | 5 +-
+ drivers/hwmon/gpio-fan.c | 16 +-
+ drivers/hwmon/gsc-hwmon.c | 1 -
+ drivers/hwmon/hwmon.c | 4 +-
+ drivers/hwmon/ina3221.c | 9 +-
+ drivers/hwmon/isl28022.c | 44 +--
+ drivers/hwmon/k10temp.c | 2 +
+ drivers/hwmon/lm90.c | 82 ++++-
+ drivers/hwmon/ltc4282.c | 44 +--
+ drivers/hwmon/nct6683.c | 3 +
+ drivers/hwmon/ntc_thermistor.c | 15 +-
+ drivers/hwmon/pmbus/Kconfig | 4 +-
+ drivers/hwmon/pmbus/ltc2978.c | 25 +-
+ drivers/hwmon/pmbus/pmbus_core.c | 377 ++++++++-------------
+ drivers/hwmon/pt5161l.c | 46 +--
+ drivers/hwmon/sg2042-mcu.c | 42 +--
+ drivers/hwmon/sht3x.c | 67 +---
+ drivers/hwmon/tps23861.c | 31 +-
+ drivers/hwmon/xgene-hwmon.c | 2 +-
+ include/linux/pci_ids.h | 1 +
+ 35 files changed, 435 insertions(+), 508 deletions(-)
+Merging jc_docs/docs-next (2d38f5fe1a20 Documentation: dma-buf: heaps: Add heap name definitions)
+$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next
+Auto-merging Documentation/ABI/testing/sysfs-fs-f2fs
+Auto-merging Documentation/admin-guide/README.rst
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Auto-merging Documentation/filesystems/bcachefs/SubmittingPatches.rst
+Auto-merging MAINTAINERS
+Auto-merging include/asm-generic/io.h
+Merge made by the 'ort' strategy.
+ Documentation/ABI/README | 3 +-
+ Documentation/ABI/removed/sysfs-class-rfkill | 2 +-
+ Documentation/ABI/stable/sysfs-class-rfkill | 12 +-
+ Documentation/ABI/stable/sysfs-devices-system-cpu | 10 -
+ Documentation/ABI/stable/sysfs-driver-dma-idxd | 4 +-
+ .../ABI/testing/configfs-usb-gadget-midi2 | 2 +-
+ .../ABI/testing/sysfs-bus-coresight-devices-cti | 78 +-
+ .../ABI/testing/sysfs-bus-coresight-devices-tpdm | 52 +-
+ Documentation/ABI/testing/sysfs-fs-f2fs | 4 +-
+ Documentation/ABI/testing/sysfs-power | 2 +-
+ Documentation/Makefile | 2 +-
+ Documentation/admin-guide/README.rst | 2 +-
+ Documentation/admin-guide/abi-obsolete-files.rst | 7 +
+ Documentation/admin-guide/abi-obsolete.rst | 6 +-
+ Documentation/admin-guide/abi-removed-files.rst | 7 +
+ Documentation/admin-guide/abi-removed.rst | 6 +-
+ Documentation/admin-guide/abi-stable-files.rst | 7 +
+ Documentation/admin-guide/abi-stable.rst | 6 +-
+ Documentation/admin-guide/abi-testing-files.rst | 7 +
+ Documentation/admin-guide/abi-testing.rst | 6 +-
+ Documentation/admin-guide/abi.rst | 18 +
+ Documentation/admin-guide/gpio/gpio-sim.rst | 2 +-
+ Documentation/admin-guide/gpio/gpio-virtuser.rst | 2 +-
+ Documentation/admin-guide/iostats.rst | 75 +-
+ Documentation/admin-guide/kernel-parameters.txt | 2 +-
+ Documentation/admin-guide/thunderbolt.rst | 2 +-
+ Documentation/admin-guide/workload-tracing.rst | 2 +-
+ Documentation/arch/arm64/amu.rst | 2 +-
+ Documentation/arch/arm64/asymmetric-32bit.rst | 2 +-
+ Documentation/conf.py | 2 +-
+ Documentation/core-api/min_heap.rst | 4 +-
+ Documentation/dev-tools/kcsan.rst | 2 +-
+ .../bindings/net/can/microchip,mcp251xfd.yaml | 2 +-
+ Documentation/driver-api/generic-counter.rst | 4 +-
+ Documentation/driver-api/iio/core.rst | 2 +-
+ Documentation/driver-api/infiniband.rst | 16 +-
+ Documentation/driver-api/media/drivers/zoran.rst | 2 +-
+ .../driver-api/media/maintainer-entry-profile.rst | 2 +-
+ Documentation/driver-api/nvdimm/nvdimm.rst | 6 +-
+ Documentation/driver-api/pm/devices.rst | 2 +-
+ .../debug/kprobes-on-ftrace/arch-support.txt | 2 +-
+ Documentation/features/list-arch.sh | 2 +-
+ Documentation/filesystems/9p.rst | 2 +-
+ .../filesystems/bcachefs/SubmittingPatches.rst | 4 +-
+ Documentation/filesystems/coda.rst | 2 +-
+ Documentation/filesystems/debugfs.rst | 2 +-
+ Documentation/filesystems/netfs_library.rst | 2 +-
+ .../filesystems/xfs/xfs-delayed-logging-design.rst | 2 +-
+ .../xfs/xfs-maintainer-entry-profile.rst | 2 +-
+ .../filesystems/xfs/xfs-online-fsck-design.rst | 4 +-
+ Documentation/iio/iio_devbuf.rst | 2 +-
+ Documentation/input/devices/elantech.rst | 2 +-
+ Documentation/input/input-programming.rst | 19 +
+ Documentation/mm/split_page_table_lock.rst | 2 +-
+ Documentation/networking/statistics.rst | 2 +-
+ Documentation/nvme/nvme-pci-endpoint-target.rst | 2 +-
+ Documentation/process/changes.rst | 4 +-
+ .../process/code-of-conduct-interpretation.rst | 17 +-
+ Documentation/process/kernel-docs.rst | 11 +
+ Documentation/process/submit-checklist.rst | 12 +-
+ Documentation/process/submitting-patches.rst | 6 +
+ Documentation/scheduler/sched-bwc.rst | 2 +-
+ Documentation/sound/soc/machine.rst | 2 +-
+ Documentation/sphinx/automarkup.py | 82 +-
+ Documentation/sphinx/cdomain.py | 7 +-
+ Documentation/sphinx/kernel_abi.py | 164 +--
+ Documentation/sphinx/kernel_feat.py | 4 +-
+ Documentation/sphinx/kernel_include.py | 4 +-
+ Documentation/sphinx/kerneldoc.py | 19 +-
+ Documentation/sphinx/kernellog.py | 22 -
+ Documentation/sphinx/kfigure.py | 91 +-
+ Documentation/sphinx/load_config.py | 2 +-
+ Documentation/sphinx/maintainers_include.py | 4 +-
+ Documentation/sphinx/rstFlatTable.py | 10 +-
+ Documentation/trace/postprocess/decode_msr.py | 2 +-
+ .../it_IT/process/submit-checklist.rst | 7 +-
+ Documentation/translations/ja_JP/SubmitChecklist | 105 --
+ .../translations/ja_JP/disclaimer-ja_JP.rst | 24 +
+ Documentation/translations/ja_JP/index.rst | 2 +
+ Documentation/translations/ja_JP/process/howto.rst | 37 +-
+ .../ja_JP/process/submit-checklist.rst | 163 +++
+ .../sp_SP/process/submit-checklist.rst | 7 +-
+ .../translations/zh_CN/admin-guide/README.rst | 2 +-
+ .../translations/zh_CN/dev-tools/ubsan.rst | 33 +-
+ Documentation/translations/zh_CN/index.rst | 8 +-
+ .../zh_CN/process/submit-checklist.rst | 4 +-
+ .../translations/zh_CN/security/credentials.rst | 479 +++++++++
+ .../translations/zh_CN/security/index.rst | 6 +-
+ .../translations/zh_CN/security/keys/index.rst | 22 +
+ .../translations/zh_CN/security/secrets/index.rst | 17 +
+ .../zh_CN/security/self-protection.rst | 271 +++++
+ .../translations/zh_CN/security/tpm/index.rst | 20 +
+ .../zh_CN/security/tpm/tpm-security.rst | 151 +++
+ .../zh_CN/security/tpm/tpm_event_log.rst | 49 +
+ .../zh_CN/security/tpm/tpm_ftpm_tee.rst | 31 +
+ .../translations/zh_CN/security/tpm/tpm_tis.rst | 43 +
+ .../zh_CN/security/tpm/tpm_vtpm_proxy.rst | 51 +
+ .../zh_CN/security/tpm/xen-tpmfront.rst | 114 ++
+ .../translations/zh_TW/admin-guide/README.rst | 2 +-
+ .../zh_TW/process/submit-checklist.rst | 4 +-
+ Documentation/usb/gadget-testing.rst | 2 +-
+ Documentation/userspace-api/accelerators/ocxl.rst | 7 +-
+ Documentation/userspace-api/dma-buf-heaps.rst | 25 +
+ Documentation/userspace-api/index.rst | 1 +
+ .../userspace-api/media/rc/rc-sysfs-nodes.rst | 2 +-
+ MAINTAINERS | 3 +
+ .../staging/media/ipu3/include/uapi/intel-ipu3.h | 3 +-
+ include/asm-generic/io.h | 6 +-
+ include/uapi/linux/firewire-cdev.h | 3 +-
+ scripts/documentation-file-ref-check | 2 +-
+ scripts/get_abi.pl | 1103 --------------------
+ scripts/get_abi.py | 214 ++++
+ scripts/get_feat.pl | 4 +-
+ scripts/kernel-doc | 163 +--
+ scripts/lib/abi/abi_parser.py | 628 +++++++++++
+ scripts/lib/abi/abi_regex.py | 234 +++++
+ scripts/lib/abi/helpers.py | 38 +
+ scripts/lib/abi/system_symbols.py | 378 +++++++
+ 118 files changed, 3547 insertions(+), 1815 deletions(-)
+ create mode 100644 Documentation/admin-guide/abi-obsolete-files.rst
+ create mode 100644 Documentation/admin-guide/abi-removed-files.rst
+ create mode 100644 Documentation/admin-guide/abi-stable-files.rst
+ create mode 100644 Documentation/admin-guide/abi-testing-files.rst
+ delete mode 100644 Documentation/sphinx/kernellog.py
+ delete mode 100644 Documentation/translations/ja_JP/SubmitChecklist
+ create mode 100644 Documentation/translations/ja_JP/disclaimer-ja_JP.rst
+ create mode 100644 Documentation/translations/ja_JP/process/submit-checklist.rst
+ create mode 100644 Documentation/translations/zh_CN/security/credentials.rst
+ create mode 100644 Documentation/translations/zh_CN/security/keys/index.rst
+ create mode 100644 Documentation/translations/zh_CN/security/secrets/index.rst
+ create mode 100644 Documentation/translations/zh_CN/security/self-protection.rst
+ create mode 100644 Documentation/translations/zh_CN/security/tpm/index.rst
+ create mode 100644 Documentation/translations/zh_CN/security/tpm/tpm-security.rst
+ create mode 100644 Documentation/translations/zh_CN/security/tpm/tpm_event_log.rst
+ create mode 100644 Documentation/translations/zh_CN/security/tpm/tpm_ftpm_tee.rst
+ create mode 100644 Documentation/translations/zh_CN/security/tpm/tpm_tis.rst
+ create mode 100644 Documentation/translations/zh_CN/security/tpm/tpm_vtpm_proxy.rst
+ create mode 100644 Documentation/translations/zh_CN/security/tpm/xen-tpmfront.rst
+ create mode 100644 Documentation/userspace-api/dma-buf-heaps.rst
+ delete mode 100755 scripts/get_abi.pl
+ create mode 100755 scripts/get_abi.py
+ create mode 100644 scripts/lib/abi/abi_parser.py
+ create mode 100644 scripts/lib/abi/abi_regex.py
+ create mode 100644 scripts/lib/abi/helpers.py
+ create mode 100644 scripts/lib/abi/system_symbols.py
+Merging v4l-dvb/next (f2151613e040 media: pci: mgb4: include linux/errno.h)
+$ git merge -m Merge branch 'next' of git://linuxtv.org/media-ci/media-pending.git v4l-dvb/next
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ Documentation/admin-guide/media/cec.rst | 2 +-
+ Documentation/admin-guide/media/mgb4.rst | 4 +-
+ .../bindings/media/aspeed,video-engine.yaml | 70 +
+ .../devicetree/bindings/media/aspeed-video.txt | 33 -
+ .../devicetree/bindings/media/i2c/adv7180.yaml | 4 +
+ .../bindings/media/i2c/st,st-mipid02.yaml | 2 +-
+ .../media/mediatek,vcodec-subdev-decoder.yaml | 86 +-
+ .../bindings/media/mediatek-jpeg-decoder.yaml | 3 +-
+ .../bindings/media/mediatek-jpeg-encoder.yaml | 2 +-
+ .../bindings/media/qcom,sc7280-camss.yaml | 10 +-
+ .../bindings/media/qcom,sdm670-camss.yaml | 318 +++
+ .../bindings/media/qcom,sm8550-camss.yaml | 597 +++++
+ .../bindings/media/qcom,sm8550-iris.yaml | 158 ++
+ .../devicetree/bindings/media/snps,dw-hdmi-rx.yaml | 132 +
+ .../bindings/media/st,stm32mp25-csi.yaml | 5 +-
+ Documentation/driver-api/media/tx-rx.rst | 26 +-
+ .../userspace-api/media/drivers/uvcvideo.rst | 64 +
+ .../userspace-api/media/v4l/vidioc-g-ext-ctrls.rst | 26 +-
+ .../userspace-api/media/v4l/vidioc-queryctrl.rst | 14 +
+ .../userspace-api/media/videodev2.h.rst.exceptions | 4 +
+ MAINTAINERS | 20 +-
+ drivers/media/cec/core/cec-api.c | 2 +-
+ drivers/media/cec/core/cec-pin.c | 11 +-
+ drivers/media/common/siano/smsdvb-main.c | 2 +
+ drivers/media/common/v4l2-tpg/v4l2-tpg-core.c | 8 +-
+ drivers/media/dvb-frontends/dibx000_common.c | 10 +-
+ drivers/media/dvb-frontends/stv0299.c | 2 +-
+ drivers/media/dvb-frontends/tda10048.c | 8 +-
+ drivers/media/i2c/Kconfig | 12 +
+ drivers/media/i2c/Makefile | 1 +
+ drivers/media/i2c/adv7180.c | 34 +-
+ drivers/media/i2c/adv748x/adv748x.h | 2 +-
+ drivers/media/i2c/adv7511-v4l2.c | 6 +-
+ drivers/media/i2c/ccs-pll.c | 16 +-
+ drivers/media/i2c/ccs/ccs-core.c | 6 +-
+ drivers/media/i2c/dw9719.c | 113 +-
+ drivers/media/i2c/hi556.c | 46 +-
+ drivers/media/i2c/imx214.c | 1247 +++++----
+ drivers/media/i2c/imx219.c | 320 ++-
+ drivers/media/i2c/imx283.c | 37 +-
+ drivers/media/i2c/imx319.c | 9 +-
+ drivers/media/i2c/imx335.c | 21 +-
+ drivers/media/i2c/imx415.c | 183 +-
+ drivers/media/i2c/lt6911uxe.c | 707 +++++
+ drivers/media/i2c/ov08x40.c | 186 +-
+ drivers/media/i2c/ov2740.c | 27 +-
+ drivers/media/i2c/ov7251.c | 4 +-
+ drivers/media/i2c/ov9282.c | 23 +-
+ drivers/media/i2c/st-mipid02.c | 5 +-
+ drivers/media/i2c/tc358746.c | 235 +-
+ drivers/media/i2c/tda1997x.c | 7 +-
+ drivers/media/i2c/vgxy61.c | 4 +-
+ drivers/media/i2c/video-i2c.c | 12 +-
+ drivers/media/pci/cx23885/cx23885-cards.c | 30 +
+ drivers/media/pci/cx23885/cx23885-core.c | 33 +-
+ drivers/media/pci/cx23885/cx23885-video.c | 3 +-
+ drivers/media/pci/cx23885/cx23885.h | 1 +
+ drivers/media/pci/cx23885/netup-eeprom.c | 29 -
+ drivers/media/pci/cx23885/netup-eeprom.h | 1 -
+ drivers/media/pci/intel/ipu3/ipu3-cio2.c | 11 +-
+ drivers/media/pci/intel/ipu6/ipu6-dma.c | 33 -
+ drivers/media/pci/intel/ipu6/ipu6-dma.h | 3 -
+ drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c | 12 +-
+ drivers/media/pci/intel/ipu6/ipu6-isys-queue.c | 2 -
+ drivers/media/pci/intel/ipu6/ipu6-isys-video.c | 1 +
+ drivers/media/pci/intel/ivsc/mei_csi.c | 78 +-
+ drivers/media/pci/mgb4/mgb4_cmt.c | 8 +-
+ drivers/media/pci/mgb4/mgb4_core.c | 13 +-
+ drivers/media/pci/mgb4/mgb4_core.h | 8 +-
+ drivers/media/pci/mgb4/mgb4_regs.c | 1 +
+ drivers/media/platform/Kconfig | 1 +
+ drivers/media/platform/Makefile | 1 +
+ drivers/media/platform/allegro-dvt/allegro-core.c | 1 +
+ drivers/media/platform/cadence/cdns-csi2rx.c | 4 +-
+ .../media/platform/chips-media/coda/coda-common.c | 1 +
+ .../media/platform/chips-media/wave5/wave5-hw.c | 2 +-
+ .../platform/chips-media/wave5/wave5-vpu-dec.c | 31 +-
+ .../media/platform/chips-media/wave5/wave5-vpu.c | 4 +-
+ .../platform/chips-media/wave5/wave5-vpuapi.c | 10 +
+ .../mediatek/vcodec/common/mtk_vcodec_fw_scp.c | 5 +-
+ .../mediatek/vcodec/encoder/venc/venc_h264_if.c | 6 +-
+ drivers/media/platform/nuvoton/npcm-video.c | 6 +-
+ drivers/media/platform/nxp/imx-mipi-csis.c | 5 +-
+ drivers/media/platform/nxp/imx8mq-mipi-csi2.c | 11 +-
+ drivers/media/platform/qcom/Kconfig | 1 +
+ drivers/media/platform/qcom/Makefile | 1 +
+ drivers/media/platform/qcom/camss/Makefile | 2 +
+ drivers/media/platform/qcom/camss/camss-csid-4-1.c | 19 -
+ drivers/media/platform/qcom/camss/camss-csid-4-7.c | 42 -
+ drivers/media/platform/qcom/camss/camss-csid-780.c | 337 +++
+ drivers/media/platform/qcom/camss/camss-csid-780.h | 25 +
+ .../media/platform/qcom/camss/camss-csid-gen2.c | 60 -
+ drivers/media/platform/qcom/camss/camss-csid.c | 262 +-
+ drivers/media/platform/qcom/camss/camss-csid.h | 54 +-
+ .../platform/qcom/camss/camss-csiphy-2ph-1-0.c | 6 +
+ .../platform/qcom/camss/camss-csiphy-3ph-1-0.c | 796 +++---
+ drivers/media/platform/qcom/camss/camss-csiphy.c | 4 +
+ drivers/media/platform/qcom/camss/camss-csiphy.h | 8 +
+ drivers/media/platform/qcom/camss/camss-vfe-17x.c | 112 +-
+ drivers/media/platform/qcom/camss/camss-vfe-4-1.c | 9 -
+ drivers/media/platform/qcom/camss/camss-vfe-4-7.c | 11 -
+ drivers/media/platform/qcom/camss/camss-vfe-4-8.c | 11 -
+ drivers/media/platform/qcom/camss/camss-vfe-480.c | 276 +-
+ drivers/media/platform/qcom/camss/camss-vfe-780.c | 159 ++
+ drivers/media/platform/qcom/camss/camss-vfe-gen1.c | 9 +-
+ drivers/media/platform/qcom/camss/camss-vfe.c | 275 ++
+ drivers/media/platform/qcom/camss/camss-vfe.h | 59 +-
+ drivers/media/platform/qcom/camss/camss.c | 595 ++++-
+ drivers/media/platform/qcom/camss/camss.h | 6 +-
+ drivers/media/platform/qcom/iris/Kconfig | 13 +
+ drivers/media/platform/qcom/iris/Makefile | 31 +
+ drivers/media/platform/qcom/iris/iris_buffer.c | 623 +++++
+ drivers/media/platform/qcom/iris/iris_buffer.h | 117 +
+ drivers/media/platform/qcom/iris/iris_core.c | 96 +
+ drivers/media/platform/qcom/iris/iris_core.h | 111 +
+ drivers/media/platform/qcom/iris/iris_ctrls.c | 259 ++
+ drivers/media/platform/qcom/iris/iris_ctrls.h | 22 +
+ drivers/media/platform/qcom/iris/iris_firmware.c | 116 +
+ drivers/media/platform/qcom/iris/iris_firmware.h | 15 +
+ drivers/media/platform/qcom/iris/iris_hfi_common.c | 176 ++
+ drivers/media/platform/qcom/iris/iris_hfi_common.h | 155 ++
+ drivers/media/platform/qcom/iris/iris_hfi_gen1.h | 16 +
+ .../platform/qcom/iris/iris_hfi_gen1_command.c | 826 ++++++
+ .../platform/qcom/iris/iris_hfi_gen1_defines.h | 448 ++++
+ .../platform/qcom/iris/iris_hfi_gen1_response.c | 666 +++++
+ drivers/media/platform/qcom/iris/iris_hfi_gen2.h | 41 +
+ .../platform/qcom/iris/iris_hfi_gen2_command.c | 957 +++++++
+ .../platform/qcom/iris/iris_hfi_gen2_defines.h | 161 ++
+ .../platform/qcom/iris/iris_hfi_gen2_packet.c | 292 +++
+ .../platform/qcom/iris/iris_hfi_gen2_packet.h | 125 +
+ .../platform/qcom/iris/iris_hfi_gen2_response.c | 934 +++++++
+ drivers/media/platform/qcom/iris/iris_hfi_queue.c | 318 +++
+ drivers/media/platform/qcom/iris/iris_hfi_queue.h | 182 ++
+ drivers/media/platform/qcom/iris/iris_instance.h | 77 +
+ .../platform/qcom/iris/iris_platform_common.h | 186 ++
+ .../platform/qcom/iris/iris_platform_sm8250.c | 149 ++
+ .../platform/qcom/iris/iris_platform_sm8550.c | 266 ++
+ drivers/media/platform/qcom/iris/iris_power.c | 140 +
+ drivers/media/platform/qcom/iris/iris_power.h | 13 +
+ drivers/media/platform/qcom/iris/iris_probe.c | 349 +++
+ drivers/media/platform/qcom/iris/iris_resources.c | 131 +
+ drivers/media/platform/qcom/iris/iris_resources.h | 18 +
+ drivers/media/platform/qcom/iris/iris_state.c | 276 ++
+ drivers/media/platform/qcom/iris/iris_state.h | 144 +
+ drivers/media/platform/qcom/iris/iris_utils.c | 90 +
+ drivers/media/platform/qcom/iris/iris_utils.h | 53 +
+ drivers/media/platform/qcom/iris/iris_vb2.c | 335 +++
+ drivers/media/platform/qcom/iris/iris_vb2.h | 19 +
+ drivers/media/platform/qcom/iris/iris_vdec.c | 659 +++++
+ drivers/media/platform/qcom/iris/iris_vdec.h | 25 +
+ drivers/media/platform/qcom/iris/iris_vidc.c | 453 ++++
+ drivers/media/platform/qcom/iris/iris_vidc.h | 15 +
+ drivers/media/platform/qcom/iris/iris_vpu2.c | 38 +
+ drivers/media/platform/qcom/iris/iris_vpu3.c | 122 +
+ drivers/media/platform/qcom/iris/iris_vpu_buffer.c | 270 ++
+ drivers/media/platform/qcom/iris/iris_vpu_buffer.h | 91 +
+ drivers/media/platform/qcom/iris/iris_vpu_common.c | 369 +++
+ drivers/media/platform/qcom/iris/iris_vpu_common.h | 28 +
+ .../platform/qcom/iris/iris_vpu_register_defines.h | 17 +
+ drivers/media/platform/qcom/venus/Kconfig | 2 +-
+ drivers/media/platform/qcom/venus/hfi_parser.c | 100 +-
+ drivers/media/platform/qcom/venus/hfi_venus.c | 18 +-
+ drivers/media/platform/qcom/venus/venc_ctrls.c | 9 +-
+ drivers/media/platform/raspberrypi/rp1-cfe/cfe.c | 6 +-
+ drivers/media/platform/renesas/rcar-csi2.c | 118 +-
+ drivers/media/platform/renesas/rcar-isp.c | 162 +-
+ drivers/media/platform/renesas/rcar-vin/rcar-dma.c | 4 +-
+ drivers/media/platform/rockchip/rga/rga-buf.c | 7 +
+ drivers/media/platform/rockchip/rga/rga-hw.c | 2 +-
+ .../platform/samsung/s5p-mfc/s5p_mfc_opr_v6.c | 5 +-
+ .../platform/st/sti/c8sectpfe/c8sectpfe-core.c | 3 +-
+ drivers/media/platform/st/stm32/dma2d/dma2d.c | 3 +-
+ drivers/media/platform/st/stm32/stm32-csi.c | 106 +-
+ .../platform/st/stm32/stm32-dcmipp/dcmipp-core.c | 23 +-
+ drivers/media/platform/synopsys/Kconfig | 3 +
+ drivers/media/platform/synopsys/Makefile | 2 +
+ drivers/media/platform/synopsys/hdmirx/Kconfig | 35 +
+ drivers/media/platform/synopsys/hdmirx/Makefile | 4 +
+ .../media/platform/synopsys/hdmirx/snps_hdmirx.c | 2746 ++++++++++++++++++++
+ .../media/platform/synopsys/hdmirx/snps_hdmirx.h | 394 +++
+ .../platform/synopsys/hdmirx/snps_hdmirx_cec.c | 275 ++
+ .../platform/synopsys/hdmirx/snps_hdmirx_cec.h | 43 +
+ drivers/media/platform/ti/cal/cal-camerarx.c | 3 +-
+ drivers/media/platform/ti/cal/cal.c | 4 +-
+ drivers/media/platform/ti/cal/cal.h | 1 +
+ drivers/media/platform/ti/omap3isp/isp.c | 54 +-
+ drivers/media/platform/ti/omap3isp/isp.h | 2 -
+ .../platform/verisilicon/hantro_g2_hevc_dec.c | 1 +
+ .../media/platform/verisilicon/hantro_g2_vp9_dec.c | 8 +-
+ drivers/media/platform/xilinx/xilinx-tpg.c | 2 -
+ drivers/media/radio/radio-aztech.c | 2 +-
+ drivers/media/radio/radio-wl1273.c | 4 +-
+ drivers/media/rc/keymaps/Makefile | 1 +
+ drivers/media/rc/keymaps/rc-siemens-gigaset-rc20.c | 71 +
+ drivers/media/rc/rc-core-priv.h | 4 +-
+ drivers/media/rc/streamzap.c | 70 +-
+ drivers/media/test-drivers/vim2m.c | 6 +-
+ drivers/media/test-drivers/vimc/vimc-streamer.c | 6 +
+ drivers/media/test-drivers/visl/visl-core.c | 12 +
+ drivers/media/test-drivers/vivid/Kconfig | 12 +-
+ drivers/media/test-drivers/vivid/Makefile | 5 +-
+ drivers/media/test-drivers/vivid/vivid-core.c | 14 +-
+ drivers/media/test-drivers/vivid/vivid-core.h | 2 +
+ drivers/media/test-drivers/vivid/vivid-ctrls.c | 36 +-
+ .../media/test-drivers/vivid/vivid-kthread-cap.c | 11 +-
+ .../media/test-drivers/vivid/vivid-kthread-out.c | 11 +-
+ .../media/test-drivers/vivid/vivid-kthread-touch.c | 11 +-
+ drivers/media/test-drivers/vivid/vivid-osd.c | 24 +-
+ drivers/media/test-drivers/vivid/vivid-osd.h | 19 +-
+ drivers/media/test-drivers/vivid/vivid-sdr-cap.c | 11 +-
+ drivers/media/test-drivers/vivid/vivid-vid-out.c | 3 +-
+ drivers/media/tuners/tuner-simple.c | 20 +-
+ drivers/media/tuners/tuner-types.c | 296 +--
+ drivers/media/usb/cx231xx/cx231xx-417.c | 17 +-
+ drivers/media/usb/cx231xx/cx231xx-pcb-cfg.h | 18 +-
+ drivers/media/usb/dvb-usb-v2/af9015.c | 2 +-
+ drivers/media/usb/dvb-usb-v2/af9035.c | 2 +-
+ drivers/media/usb/dvb-usb-v2/anysee.c | 2 +-
+ drivers/media/usb/dvb-usb-v2/au6610.c | 2 +-
+ drivers/media/usb/dvb-usb-v2/az6007.c | 2 +-
+ drivers/media/usb/dvb-usb-v2/ce6230.c | 2 +-
+ drivers/media/usb/dvb-usb-v2/dvb_usb.h | 2 +-
+ drivers/media/usb/dvb-usb-v2/dvbsky.c | 2 +-
+ drivers/media/usb/dvb-usb-v2/ec168.c | 2 +-
+ drivers/media/usb/dvb-usb-v2/gl861.c | 2 +-
+ drivers/media/usb/dvb-usb-v2/lmedm04.c | 2 +-
+ drivers/media/usb/dvb-usb-v2/mxl111sf.c | 2 +-
+ drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 2 +-
+ drivers/media/usb/dvb-usb/a800.c | 2 +-
+ drivers/media/usb/dvb-usb/af9005.c | 4 +-
+ drivers/media/usb/dvb-usb/az6027.c | 4 +-
+ drivers/media/usb/dvb-usb/cinergyT2-core.c | 2 +-
+ drivers/media/usb/dvb-usb/cxusb-analog.c | 4 +-
+ drivers/media/usb/dvb-usb/cxusb.c | 6 +-
+ drivers/media/usb/dvb-usb/dibusb-mb.c | 2 +-
+ drivers/media/usb/dvb-usb/dibusb-mc.c | 2 +-
+ drivers/media/usb/dvb-usb/digitv.c | 4 +-
+ drivers/media/usb/dvb-usb/dtt200u.c | 2 +-
+ drivers/media/usb/dvb-usb/dtv5100.c | 4 +-
+ drivers/media/usb/dvb-usb/dvb-usb.h | 6 +-
+ drivers/media/usb/dvb-usb/dw2102.c | 16 +-
+ drivers/media/usb/dvb-usb/gp8psk.c | 2 +-
+ drivers/media/usb/dvb-usb/m920x.c | 4 +-
+ drivers/media/usb/dvb-usb/nova-t-usb2.c | 2 +-
+ drivers/media/usb/dvb-usb/opera1.c | 4 +-
+ drivers/media/usb/dvb-usb/pctv452e.c | 6 +-
+ drivers/media/usb/dvb-usb/technisat-usb2.c | 4 +-
+ drivers/media/usb/dvb-usb/ttusb2.c | 4 +-
+ drivers/media/usb/dvb-usb/umt-010.c | 2 +-
+ drivers/media/usb/dvb-usb/vp702x.c | 2 +-
+ drivers/media/usb/dvb-usb/vp7045.c | 2 +-
+ drivers/media/usb/pvrusb2/pvrusb2-v4l2.c | 40 +-
+ drivers/media/usb/pwc/pwc-if.c | 1 -
+ drivers/media/usb/uvc/uvc_ctrl.c | 799 ++++--
+ drivers/media/usb/uvc/uvc_driver.c | 44 +-
+ drivers/media/usb/uvc/uvc_v4l2.c | 74 +-
+ drivers/media/usb/uvc/uvcvideo.h | 32 +-
+ drivers/media/v4l2-core/v4l2-common.c | 32 +-
+ drivers/media/v4l2-core/v4l2-ctrls-api.c | 109 +-
+ drivers/media/v4l2-core/v4l2-ctrls-core.c | 169 +-
+ drivers/media/v4l2-core/v4l2-dev.c | 6 +-
+ drivers/media/v4l2-core/v4l2-dv-timings.c | 40 +-
+ drivers/media/v4l2-core/v4l2-ioctl.c | 43 +-
+ drivers/media/v4l2-core/v4l2-subdev.c | 2 +
+ drivers/staging/media/atomisp/pci/atomisp_ioctl.c | 35 +-
+ .../isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c | 9 +-
+ drivers/staging/media/imx/imx-media-vdic.c | 54 -
+ include/media/rc-core.h | 46 +-
+ include/media/rc-map.h | 1 +
+ include/media/tuner-types.h | 6 +-
+ include/media/v4l2-common.h | 19 +-
+ include/media/v4l2-ctrls.h | 50 +-
+ include/media/v4l2-dv-timings.h | 1 +
+ include/media/v4l2-ioctl.h | 12 -
+ include/media/v4l2-mediabus.h | 2 +
+ include/media/v4l2-subdev.h | 4 +-
+ include/uapi/linux/rkisp1-config.h | 2 +-
+ include/uapi/linux/usb/video.h | 1 +
+ include/uapi/linux/uvcvideo.h | 13 +
+ include/uapi/linux/v4l2-controls.h | 7 +
+ include/uapi/linux/videodev2.h | 5 +
+ 281 files changed, 22616 insertions(+), 3402 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/media/aspeed,video-engine.yaml
+ delete mode 100644 Documentation/devicetree/bindings/media/aspeed-video.txt
+ create mode 100644 Documentation/devicetree/bindings/media/qcom,sdm670-camss.yaml
+ create mode 100644 Documentation/devicetree/bindings/media/qcom,sm8550-camss.yaml
+ create mode 100644 Documentation/devicetree/bindings/media/qcom,sm8550-iris.yaml
+ create mode 100644 Documentation/devicetree/bindings/media/snps,dw-hdmi-rx.yaml
+ create mode 100644 drivers/media/i2c/lt6911uxe.c
+ create mode 100644 drivers/media/platform/qcom/camss/camss-csid-780.c
+ create mode 100644 drivers/media/platform/qcom/camss/camss-csid-780.h
+ create mode 100644 drivers/media/platform/qcom/camss/camss-vfe-780.c
+ create mode 100644 drivers/media/platform/qcom/iris/Kconfig
+ create mode 100644 drivers/media/platform/qcom/iris/Makefile
+ create mode 100644 drivers/media/platform/qcom/iris/iris_buffer.c
+ create mode 100644 drivers/media/platform/qcom/iris/iris_buffer.h
+ create mode 100644 drivers/media/platform/qcom/iris/iris_core.c
+ create mode 100644 drivers/media/platform/qcom/iris/iris_core.h
+ create mode 100644 drivers/media/platform/qcom/iris/iris_ctrls.c
+ create mode 100644 drivers/media/platform/qcom/iris/iris_ctrls.h
+ create mode 100644 drivers/media/platform/qcom/iris/iris_firmware.c
+ create mode 100644 drivers/media/platform/qcom/iris/iris_firmware.h
+ create mode 100644 drivers/media/platform/qcom/iris/iris_hfi_common.c
+ create mode 100644 drivers/media/platform/qcom/iris/iris_hfi_common.h
+ create mode 100644 drivers/media/platform/qcom/iris/iris_hfi_gen1.h
+ create mode 100644 drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c
+ create mode 100644 drivers/media/platform/qcom/iris/iris_hfi_gen1_defines.h
+ create mode 100644 drivers/media/platform/qcom/iris/iris_hfi_gen1_response.c
+ create mode 100644 drivers/media/platform/qcom/iris/iris_hfi_gen2.h
+ create mode 100644 drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c
+ create mode 100644 drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h
+ create mode 100644 drivers/media/platform/qcom/iris/iris_hfi_gen2_packet.c
+ create mode 100644 drivers/media/platform/qcom/iris/iris_hfi_gen2_packet.h
+ create mode 100644 drivers/media/platform/qcom/iris/iris_hfi_gen2_response.c
+ create mode 100644 drivers/media/platform/qcom/iris/iris_hfi_queue.c
+ create mode 100644 drivers/media/platform/qcom/iris/iris_hfi_queue.h
+ create mode 100644 drivers/media/platform/qcom/iris/iris_instance.h
+ create mode 100644 drivers/media/platform/qcom/iris/iris_platform_common.h
+ create mode 100644 drivers/media/platform/qcom/iris/iris_platform_sm8250.c
+ create mode 100644 drivers/media/platform/qcom/iris/iris_platform_sm8550.c
+ create mode 100644 drivers/media/platform/qcom/iris/iris_power.c
+ create mode 100644 drivers/media/platform/qcom/iris/iris_power.h
+ create mode 100644 drivers/media/platform/qcom/iris/iris_probe.c
+ create mode 100644 drivers/media/platform/qcom/iris/iris_resources.c
+ create mode 100644 drivers/media/platform/qcom/iris/iris_resources.h
+ create mode 100644 drivers/media/platform/qcom/iris/iris_state.c
+ create mode 100644 drivers/media/platform/qcom/iris/iris_state.h
+ create mode 100644 drivers/media/platform/qcom/iris/iris_utils.c
+ create mode 100644 drivers/media/platform/qcom/iris/iris_utils.h
+ create mode 100644 drivers/media/platform/qcom/iris/iris_vb2.c
+ create mode 100644 drivers/media/platform/qcom/iris/iris_vb2.h
+ create mode 100644 drivers/media/platform/qcom/iris/iris_vdec.c
+ create mode 100644 drivers/media/platform/qcom/iris/iris_vdec.h
+ create mode 100644 drivers/media/platform/qcom/iris/iris_vidc.c
+ create mode 100644 drivers/media/platform/qcom/iris/iris_vidc.h
+ create mode 100644 drivers/media/platform/qcom/iris/iris_vpu2.c
+ create mode 100644 drivers/media/platform/qcom/iris/iris_vpu3.c
+ create mode 100644 drivers/media/platform/qcom/iris/iris_vpu_buffer.c
+ create mode 100644 drivers/media/platform/qcom/iris/iris_vpu_buffer.h
+ create mode 100644 drivers/media/platform/qcom/iris/iris_vpu_common.c
+ create mode 100644 drivers/media/platform/qcom/iris/iris_vpu_common.h
+ create mode 100644 drivers/media/platform/qcom/iris/iris_vpu_register_defines.h
+ create mode 100644 drivers/media/platform/synopsys/Kconfig
+ create mode 100644 drivers/media/platform/synopsys/Makefile
+ create mode 100644 drivers/media/platform/synopsys/hdmirx/Kconfig
+ create mode 100644 drivers/media/platform/synopsys/hdmirx/Makefile
+ create mode 100644 drivers/media/platform/synopsys/hdmirx/snps_hdmirx.c
+ create mode 100644 drivers/media/platform/synopsys/hdmirx/snps_hdmirx.h
+ create mode 100644 drivers/media/platform/synopsys/hdmirx/snps_hdmirx_cec.c
+ create mode 100644 drivers/media/platform/synopsys/hdmirx/snps_hdmirx_cec.h
+ create mode 100644 drivers/media/rc/keymaps/rc-siemens-gigaset-rc20.c
+Merging v4l-dvb-next/master (b36c41c51e9d media: atomisp: set lock before calling vb2_queue_init())
+$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master
+Already up to date.
+Merging pm/linux-next (ca47140abd6f Merge branch 'thermal-intel' 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 MAINTAINERS
+Auto-merging drivers/thermal/thermal_of.c
+Auto-merging include/linux/cpufreq.h
+Auto-merging include/linux/device.h
+Auto-merging kernel/power/hibernate.c
+Auto-merging kernel/power/suspend.c
+Merge made by the 'ort' strategy.
+ Documentation/admin-guide/kernel-parameters.txt | 3 +
+ Documentation/admin-guide/pm/cpuidle.rst | 27 +-
+ Documentation/admin-guide/pm/intel_idle.rst | 18 +-
+ Documentation/admin-guide/pm/intel_pstate.rst | 3 +
+ Documentation/admin-guide/pnp.rst | 3 -
+ MAINTAINERS | 19 +-
+ arch/x86/include/asm/msr-index.h | 18 +-
+ arch/x86/kernel/acpi/cppc.c | 4 +-
+ drivers/acpi/Kconfig | 2 +-
+ drivers/acpi/acpi_video.c | 7 +-
+ drivers/acpi/button.c | 10 +-
+ drivers/acpi/device_pm.c | 4 +-
+ drivers/acpi/fan.h | 1 +
+ drivers/acpi/fan_attr.c | 37 +-
+ drivers/acpi/fan_core.c | 25 +-
+ drivers/acpi/fan_hwmon.c | 8 +
+ drivers/acpi/hed.c | 7 +-
+ drivers/acpi/platform_profile.c | 45 +-
+ drivers/acpi/power.c | 5 +-
+ drivers/acpi/thermal.c | 2 +-
+ drivers/base/power/clock_ops.c | 73 ---
+ drivers/base/power/generic_ops.c | 24 -
+ drivers/base/power/main.c | 165 +++--
+ drivers/base/power/runtime.c | 87 ++-
+ drivers/cpufreq/amd-pstate-trace.h | 57 +-
+ drivers/cpufreq/amd-pstate-ut.c | 217 +++----
+ drivers/cpufreq/amd-pstate.c | 666 +++++++++------------
+ drivers/cpufreq/amd-pstate.h | 65 +-
+ drivers/cpufreq/cpufreq_governor.c | 45 +-
+ drivers/cpufreq/intel_pstate.c | 27 +-
+ drivers/cpuidle/cpuidle-arm.c | 8 +-
+ drivers/cpuidle/cpuidle-big_little.c | 2 +-
+ drivers/cpuidle/cpuidle-psci.c | 4 +-
+ drivers/cpuidle/cpuidle-qcom-spm.c | 2 +-
+ drivers/cpuidle/cpuidle-riscv-sbi.c | 4 +-
+ drivers/cpuidle/governors/menu.c | 129 ++--
+ drivers/idle/intel_idle.c | 35 +-
+ drivers/mfd/intel-lpss.c | 2 +-
+ drivers/pci/pci-driver.c | 6 +-
+ drivers/pnp/base.h | 4 -
+ drivers/pnp/card.c | 32 -
+ drivers/pnp/core.c | 16 -
+ drivers/powercap/Kconfig | 2 +-
+ drivers/thermal/hisi_thermal.c | 4 +-
+ .../intel/int340x_thermal/int3402_thermal.c | 3 +
+ .../intel/int340x_thermal/int340x_thermal_zone.c | 6 +-
+ drivers/thermal/k3_j72xx_bandgap.c | 4 +-
+ drivers/thermal/thermal_debugfs.c | 4 +-
+ drivers/thermal/thermal_of.c | 2 +-
+ include/linux/cpufreq.h | 3 +
+ include/linux/device.h | 9 +
+ include/linux/energy_model.h | 20 +-
+ include/linux/platform_profile.h | 2 +-
+ include/linux/pm.h | 9 +-
+ include/linux/pm_clock.h | 5 -
+ include/linux/pm_runtime.h | 33 +-
+ include/linux/pm_wakeup.h | 6 +-
+ include/linux/pnp.h | 2 +-
+ kernel/power/Kconfig | 3 +-
+ kernel/power/energy_model.c | 67 +--
+ kernel/power/hibernate.c | 6 +-
+ kernel/power/snapshot.c | 16 +-
+ kernel/power/suspend.c | 14 +-
+ tools/power/cpupower/Makefile | 19 +-
+ tools/power/cpupower/bench/parse.c | 4 +
+ tools/power/cpupower/lib/cpupower.c | 48 +-
+ tools/power/cpupower/lib/cpupower.h | 3 +
+ .../cpupower/utils/idle_monitor/cpupower-monitor.c | 48 +-
+ 68 files changed, 1148 insertions(+), 1112 deletions(-)
+Merging cpufreq-arm/cpufreq/arm/linux-next (be4ae8c19492 cpufreq: tegra186: Share policy per cluster)
+$ 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
+Auto-merging drivers/cpufreq/amd-pstate.c
+Auto-merging drivers/cpufreq/cpufreq.c
+Auto-merging include/linux/cpufreq.h
+Merge made by the 'ort' strategy.
+ drivers/cpufreq/Kconfig.arm | 2 +-
+ drivers/cpufreq/acpi-cpufreq.c | 4 ++-
+ drivers/cpufreq/amd-pstate.c | 4 +--
+ drivers/cpufreq/apple-soc-cpufreq.c | 18 +------------
+ drivers/cpufreq/armada-37xx-cpufreq.c | 6 +----
+ drivers/cpufreq/bmips-cpufreq.c | 1 -
+ drivers/cpufreq/brcmstb-avs-cpufreq.c | 1 -
+ drivers/cpufreq/cppc_cpufreq.c | 9 +------
+ drivers/cpufreq/cpufreq-dt.c | 22 +---------------
+ drivers/cpufreq/cpufreq.c | 46 ++++++++++++++++++++--------------
+ drivers/cpufreq/davinci-cpufreq.c | 1 -
+ drivers/cpufreq/e_powersaver.c | 1 -
+ drivers/cpufreq/elanfreq.c | 1 -
+ drivers/cpufreq/freq_table.c | 15 ++++-------
+ drivers/cpufreq/imx6q-cpufreq.c | 1 -
+ drivers/cpufreq/kirkwood-cpufreq.c | 1 -
+ drivers/cpufreq/longhaul.c | 1 -
+ drivers/cpufreq/loongson2_cpufreq.c | 1 -
+ drivers/cpufreq/loongson3_cpufreq.c | 11 +-------
+ drivers/cpufreq/mediatek-cpufreq-hw.c | 1 -
+ drivers/cpufreq/mediatek-cpufreq.c | 1 -
+ drivers/cpufreq/omap-cpufreq.c | 1 -
+ drivers/cpufreq/p4-clockmod.c | 1 -
+ drivers/cpufreq/pasemi-cpufreq.c | 1 -
+ drivers/cpufreq/pmac32-cpufreq.c | 1 -
+ drivers/cpufreq/pmac64-cpufreq.c | 1 -
+ drivers/cpufreq/powernow-k6.c | 1 -
+ drivers/cpufreq/powernow-k7.c | 1 -
+ drivers/cpufreq/powernow-k8.c | 1 -
+ drivers/cpufreq/powernv-cpufreq.c | 11 +-------
+ drivers/cpufreq/qcom-cpufreq-hw.c | 14 +----------
+ drivers/cpufreq/qoriq-cpufreq.c | 1 -
+ drivers/cpufreq/sc520_freq.c | 1 -
+ drivers/cpufreq/scmi-cpufreq.c | 19 +-------------
+ drivers/cpufreq/scpi-cpufreq.c | 6 ++---
+ drivers/cpufreq/sh-cpufreq.c | 1 -
+ drivers/cpufreq/spear-cpufreq.c | 1 -
+ drivers/cpufreq/speedstep-centrino.c | 1 -
+ drivers/cpufreq/speedstep-ich.c | 1 -
+ drivers/cpufreq/speedstep-smi.c | 1 -
+ drivers/cpufreq/tegra186-cpufreq.c | 8 +++++-
+ drivers/cpufreq/tegra194-cpufreq.c | 1 -
+ drivers/cpufreq/vexpress-spc-cpufreq.c | 1 -
+ drivers/cpufreq/virtual-cpufreq.c | 1 -
+ include/linux/cpufreq.h | 21 +++++-----------
+ 45 files changed, 62 insertions(+), 183 deletions(-)
+Merging cpupower/cpupower (fffadbdd6b5a cpupower: Make lib versioning scheme more obvious and fix version link)
+$ git merge -m Merge branch 'cpupower' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git cpupower/cpupower
+Already up to date.
+Merging devfreq/devfreq-next (f3253b23535f PM / devfreq: exynos: remove unused function parameter)
+$ 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 (dc9a897dbb03 pmdomain: thead: Add power-domain driver for TH1520)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git pmdomain/next
+Auto-merging MAINTAINERS
+Auto-merging drivers/cpuidle/cpuidle-psci.c
+Auto-merging drivers/firmware/Kconfig
+Auto-merging drivers/firmware/Makefile
+Merge made by the 'ort' strategy.
+ .../bindings/firmware/thead,th1520-aon.yaml | 53 +++++
+ .../bindings/power/allwinner,sun20i-d1-ppu.yaml | 1 +
+ .../bindings/power/rockchip,power-controller.yaml | 3 +
+ MAINTAINERS | 7 +
+ drivers/cpuidle/cpuidle-psci.c | 3 +
+ drivers/firmware/Kconfig | 9 +
+ drivers/firmware/Makefile | 1 +
+ drivers/firmware/thead,th1520-aon.c | 248 +++++++++++++++++++++
+ drivers/pmdomain/Kconfig | 1 +
+ drivers/pmdomain/Makefile | 1 +
+ drivers/pmdomain/bcm/bcm2835-power.c | 1 +
+ drivers/pmdomain/core.c | 35 +++
+ drivers/pmdomain/imx/gpcv2.c | 2 +-
+ drivers/pmdomain/renesas/rcar-sysc.c | 2 -
+ drivers/pmdomain/rockchip/Kconfig | 2 +
+ drivers/pmdomain/rockchip/pm-domains.c | 219 +++++++++++-------
+ drivers/pmdomain/sunxi/sun20i-ppu.c | 15 ++
+ drivers/pmdomain/thead/Kconfig | 12 +
+ drivers/pmdomain/thead/Makefile | 2 +
+ drivers/pmdomain/thead/th1520-pm-domains.c | 218 ++++++++++++++++++
+ drivers/pmdomain/ti/omap_prm.c | 2 +-
+ drivers/regulator/devres.c | 17 ++
+ drivers/regulator/of_regulator.c | 21 ++
+ .../dt-bindings/power/allwinner,sun8i-v853-ppu.h | 10 +
+ include/dt-bindings/power/qcom-rpmpd.h | 2 +-
+ include/dt-bindings/power/thead,th1520-power.h | 19 ++
+ include/linux/firmware/thead/thead,th1520-aon.h | 200 +++++++++++++++++
+ include/linux/pm_domain.h | 7 +
+ include/linux/regulator/consumer.h | 6 +
+ include/soc/rockchip/rockchip_sip.h | 3 +
+ include/trace/events/power.h | 37 +++
+ 31 files changed, 1078 insertions(+), 81 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/firmware/thead,th1520-aon.yaml
+ create mode 100644 drivers/firmware/thead,th1520-aon.c
+ create mode 100644 drivers/pmdomain/thead/Kconfig
+ create mode 100644 drivers/pmdomain/thead/Makefile
+ create mode 100644 drivers/pmdomain/thead/th1520-pm-domains.c
+ create mode 100644 include/dt-bindings/power/allwinner,sun8i-v853-ppu.h
+ create mode 100644 include/dt-bindings/power/thead,th1520-power.h
+ create mode 100644 include/linux/firmware/thead/thead,th1520-aon.h
+Merging opp/opp/linux-next (2014c95afece Linux 6.14-rc1)
+$ 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
+Already up to date.
+Merging thermal/thermal/linux-next (ecb642900deb dt-bindings: thermal: Correct indentation and style in DTS example)
+$ 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 Documentation/devicetree/bindings/thermal/qcom-tsens.yaml
+Auto-merging include/linux/thermal.h
+Merge made by the 'ort' strategy.
+ .../bindings/thermal/allwinner,sun8i-a83t-ths.yaml | 48 +++---
+ .../devicetree/bindings/thermal/brcm,avs-tmon.yaml | 1 +
+ .../devicetree/bindings/thermal/imx-thermal.yaml | 36 ++---
+ .../bindings/thermal/imx8mm-thermal.yaml | 8 +-
+ .../devicetree/bindings/thermal/qcom-tsens.yaml | 18 +++
+ drivers/thermal/broadcom/brcmstb_thermal.c | 11 +-
+ drivers/thermal/mediatek/lvts_thermal.c | 103 ++++++++----
+ drivers/thermal/qcom/tsens-v2.c | 178 +++++++++++++++++++++
+ drivers/thermal/qcom/tsens.c | 8 +-
+ drivers/thermal/qcom/tsens.h | 3 +
+ drivers/thermal/qoriq_thermal.c | 47 +++---
+ drivers/thermal/rockchip_thermal.c | 1 +
+ include/linux/thermal.h | 2 -
+ 13 files changed, 358 insertions(+), 106 deletions(-)
+Merging rdma/for-next (0a924decd4a3 RDMA/rxe: Improve readability of ODP pagefault interface)
+$ 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/bnxt_re/bnxt_re.h
+Auto-merging drivers/infiniband/hw/mana/main.c
+Auto-merging drivers/infiniband/sw/rxe/rxe.c
+CONFLICT (content): Merge conflict in drivers/infiniband/sw/rxe/rxe.c
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/lib/fs_chains.c
+Auto-merging drivers/net/ethernet/microsoft/mana/gdma_main.c
+Resolved 'drivers/infiniband/sw/rxe/rxe.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master ba93f9aa3ac2] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git
+$ git diff -M --stat --summary HEAD^..
+ Documentation/infiniband/index.rst | 1 +
+ Documentation/infiniband/ucaps.rst | 71 +++++
+ drivers/infiniband/core/Makefile | 3 +-
+ drivers/infiniband/core/cache.c | 6 +
+ drivers/infiniband/core/cma.c | 24 +-
+ drivers/infiniband/core/device.c | 9 +
+ drivers/infiniband/core/iwcm.c | 4 +-
+ drivers/infiniband/core/sysfs.c | 15 +-
+ drivers/infiniband/core/ucaps.c | 267 +++++++++++++++++
+ drivers/infiniband/core/ucma.c | 4 +-
+ drivers/infiniband/core/umem.c | 36 ++-
+ drivers/infiniband/core/uverbs_cmd.c | 19 ++
+ drivers/infiniband/core/uverbs_main.c | 2 +
+ drivers/infiniband/core/uverbs_std_types_device.c | 4 +
+ drivers/infiniband/core/verbs.c | 11 +-
+ drivers/infiniband/hw/bnxt_re/bnxt_re.h | 2 +
+ drivers/infiniband/hw/bnxt_re/debugfs.c | 215 +++++++++++++-
+ drivers/infiniband/hw/bnxt_re/debugfs.h | 15 +
+ drivers/infiniband/hw/erdma/erdma_cm.c | 1 -
+ drivers/infiniband/hw/hfi1/chip.c | 18 --
+ drivers/infiniband/hw/hfi1/chip.h | 1 -
+ drivers/infiniband/hw/hfi1/driver.c | 2 +-
+ drivers/infiniband/hw/hfi1/mad.c | 4 +-
+ drivers/infiniband/hw/hfi1/qsfp.c | 20 --
+ drivers/infiniband/hw/hfi1/qsfp.h | 2 -
+ drivers/infiniband/hw/hns/hns_roce_mr.c | 2 +-
+ drivers/infiniband/hw/hns/hns_roce_qp.c | 2 +-
+ drivers/infiniband/hw/hns/hns_roce_srq.c | 2 +-
+ drivers/infiniband/hw/irdma/Kconfig | 1 +
+ drivers/infiniband/hw/irdma/main.h | 1 -
+ drivers/infiniband/hw/irdma/osdep.h | 6 +-
+ drivers/infiniband/hw/irdma/puda.c | 19 +-
+ drivers/infiniband/hw/irdma/puda.h | 5 +-
+ drivers/infiniband/hw/irdma/utils.c | 47 +--
+ drivers/infiniband/hw/mana/Makefile | 2 +-
+ drivers/infiniband/hw/mana/ah.c | 58 ++++
+ drivers/infiniband/hw/mana/counters.c | 105 +++++++
+ drivers/infiniband/hw/mana/counters.h | 44 +++
+ drivers/infiniband/hw/mana/cq.c | 233 +++++++++++++--
+ drivers/infiniband/hw/mana/device.c | 28 +-
+ drivers/infiniband/hw/mana/main.c | 103 ++++++-
+ drivers/infiniband/hw/mana/mana_ib.h | 208 ++++++++++++-
+ drivers/infiniband/hw/mana/mr.c | 105 +++++++
+ drivers/infiniband/hw/mana/qp.c | 245 +++++++++++++++-
+ drivers/infiniband/hw/mana/shadow_queue.h | 115 ++++++++
+ drivers/infiniband/hw/mana/wr.c | 168 +++++++++++
+ drivers/infiniband/hw/mlx5/devx.c | 41 ++-
+ drivers/infiniband/hw/mlx5/devx.h | 5 +-
+ drivers/infiniband/hw/mlx5/fs.c | 154 +++++++++-
+ drivers/infiniband/hw/mlx5/fs.h | 2 +
+ drivers/infiniband/hw/mlx5/main.c | 77 ++++-
+ drivers/infiniband/hw/mlx5/mlx5_ib.h | 3 +
+ drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.c | 28 --
+ drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.h | 2 -
+ drivers/infiniband/sw/rxe/Kconfig | 3 +-
+ drivers/infiniband/sw/rxe/Makefile | 2 +
+ drivers/infiniband/sw/rxe/rxe.c | 40 ++-
+ drivers/infiniband/sw/rxe/rxe.h | 38 ---
+ drivers/infiniband/sw/rxe/rxe_icrc.c | 40 +--
+ drivers/infiniband/sw/rxe/rxe_loc.h | 35 ++-
+ drivers/infiniband/sw/rxe/rxe_mr.c | 13 +-
+ drivers/infiniband/sw/rxe/rxe_odp.c | 326 +++++++++++++++++++++
+ drivers/infiniband/sw/rxe/rxe_req.c | 1 -
+ drivers/infiniband/sw/rxe/rxe_resp.c | 18 +-
+ drivers/infiniband/sw/rxe/rxe_verbs.c | 24 +-
+ drivers/infiniband/sw/rxe/rxe_verbs.h | 42 ++-
+ drivers/infiniband/sw/siw/Kconfig | 4 +-
+ drivers/infiniband/sw/siw/siw.h | 37 ++-
+ drivers/infiniband/sw/siw/siw_main.c | 22 +-
+ drivers/infiniband/sw/siw/siw_qp.c | 54 +---
+ drivers/infiniband/sw/siw/siw_qp_rx.c | 23 +-
+ drivers/infiniband/sw/siw/siw_qp_tx.c | 44 ++-
+ drivers/infiniband/sw/siw/siw_verbs.c | 3 -
+ drivers/infiniband/ulp/iser/iscsi_iser.c | 8 +-
+ drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 120 +++++++-
+ .../ethernet/mellanox/mlx5/core/esw/acl/helper.c | 2 +-
+ .../net/ethernet/mellanox/mlx5/core/esw/legacy.c | 2 +-
+ .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 6 +-
+ drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 2 +
+ drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 178 ++++++++++-
+ drivers/net/ethernet/mellanox/mlx5/core/fs_core.h | 12 +-
+ .../net/ethernet/mellanox/mlx5/core/fs_ft_pool.c | 6 +-
+ .../net/ethernet/mellanox/mlx5/core/fs_ft_pool.h | 2 -
+ drivers/net/ethernet/mellanox/mlx5/core/fw.c | 7 +
+ .../ethernet/mellanox/mlx5/core/lib/fs_chains.c | 3 +-
+ drivers/net/ethernet/mellanox/mlx5/core/main.c | 1 +
+ drivers/net/ethernet/microsoft/mana/gdma_main.c | 7 +-
+ include/linux/mlx5/device.h | 12 +
+ include/linux/mlx5/driver.h | 6 +
+ include/linux/mlx5/fs.h | 12 +-
+ include/linux/mlx5/mlx5_ifc.h | 53 +++-
+ include/net/mana/gdma.h | 7 +
+ include/rdma/ib_ucaps.h | 30 ++
+ include/rdma/ib_verbs.h | 19 ++
+ include/uapi/rdma/ib_user_ioctl_cmds.h | 1 +
+ include/uapi/rdma/mlx5_user_ioctl_cmds.h | 1 +
+ include/uapi/rdma/mlx5_user_ioctl_verbs.h | 2 +
+ 97 files changed, 3320 insertions(+), 515 deletions(-)
+ create mode 100644 Documentation/infiniband/ucaps.rst
+ create mode 100644 drivers/infiniband/core/ucaps.c
+ create mode 100644 drivers/infiniband/hw/mana/ah.c
+ create mode 100644 drivers/infiniband/hw/mana/counters.c
+ create mode 100644 drivers/infiniband/hw/mana/counters.h
+ create mode 100644 drivers/infiniband/hw/mana/shadow_queue.h
+ create mode 100644 drivers/infiniband/hw/mana/wr.c
+ create mode 100644 drivers/infiniband/sw/rxe/rxe_odp.c
+ create mode 100644 include/rdma/ib_ucaps.h
+Merging net-next/main (bfc6c67ec2d6 net/smc: use the correct ndev to find pnetid by pnetid table)
+$ 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 MAINTAINERS
+Auto-merging arch/s390/kernel/irq.c
+Auto-merging drivers/infiniband/hw/irdma/main.h
+Auto-merging drivers/net/ethernet/microsoft/mana/gdma_main.c
+Auto-merging fs/eventpoll.c
+CONFLICT (content): Merge conflict in fs/eventpoll.c
+Auto-merging lib/Kconfig.debug
+Auto-merging lib/Makefile
+Auto-merging net/xdp/xsk.c
+Resolved 'fs/eventpoll.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master f654ead4682a] Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git
+$ git diff -M --stat --summary HEAD^..
+ Documentation/arch/s390/driver-model.rst | 2 +-
+ .../devicetree/bindings/net/airoha,en7581-eth.yaml | 10 +
+ .../devicetree/bindings/net/airoha,en7581-npu.yaml | 84 +
+ .../bindings/net/amlogic,meson-dwmac.yaml | 6 +
+ .../devicetree/bindings/net/can/fsl,flexcan.yaml | 44 +-
+ .../devicetree/bindings/net/dsa/brcm,b53.yaml | 2 +
+ .../devicetree/bindings/net/ethernet-phy.yaml | 6 +
+ .../devicetree/bindings/net/faraday,ftgmac100.yaml | 3 +
+ .../devicetree/bindings/net/fsl,gianfar-mdio.yaml | 112 +
+ .../devicetree/bindings/net/fsl,gianfar.yaml | 248 ++
+ .../devicetree/bindings/net/fsl-tsec-phy.txt | 80 +-
+ .../devicetree/bindings/net/intel,dwmac-plat.yaml | 6 +
+ .../devicetree/bindings/net/mediatek-dwmac.yaml | 6 +
+ .../devicetree/bindings/net/nxp,dwmac-imx.yaml | 8 +
+ .../bindings/net/realtek,rtl9301-mdio.yaml | 86 +
+ .../{mfd => net}/realtek,rtl9301-switch.yaml | 63 +-
+ .../devicetree/bindings/net/rfkill-gpio.yaml | 5 +
+ .../devicetree/bindings/net/rockchip-dwmac.yaml | 31 +-
+ .../devicetree/bindings/net/snps,dwmac.yaml | 9 +-
+ .../bindings/net/sophgo,sg2044-dwmac.yaml | 126 +
+ .../devicetree/bindings/net/stm32-dwmac.yaml | 10 +
+ .../devicetree/bindings/net/tesla,fsd-ethqos.yaml | 118 +
+ .../bindings/net/toshiba,visconti-dwmac.yaml | 6 +
+ Documentation/netlink/genetlink-c.yaml | 7 +-
+ Documentation/netlink/genetlink-legacy.yaml | 10 +-
+ Documentation/netlink/genetlink.yaml | 7 +-
+ Documentation/netlink/specs/conntrack.yaml | 643 +++++
+ Documentation/netlink/specs/netdev.yaml | 38 +-
+ Documentation/netlink/specs/nl80211.yaml | 2000 ++++++++++++++
+ Documentation/netlink/specs/rt_addr.yaml | 23 +
+ Documentation/netlink/specs/rt_link.yaml | 19 +
+ Documentation/netlink/specs/rt_rule.yaml | 15 +
+ .../ethernet/freescale/dpaa2/switch-driver.rst | 2 +-
+ Documentation/networking/devlink/ice.rst | 11 +
+ Documentation/networking/devlink/mlx5.rst | 4 +
+ Documentation/networking/devlink/sfc.rst | 16 +-
+ Documentation/networking/ethtool-netlink.rst | 2 +-
+ Documentation/networking/ip-sysctl.rst | 13 +
+ Documentation/networking/j1939.rst | 675 +++++
+ Documentation/networking/napi.rst | 33 +-
+ .../net_cachelines/inet_connection_sock.rst | 1 +
+ .../networking/net_cachelines/net_device.rst | 2 +-
+ .../net_cachelines/netns_ipv4_sysctl.rst | 1 +
+ Documentation/networking/net_cachelines/snmp.rst | 1 +
+ Documentation/networking/netconsole.rst | 73 +
+ Documentation/networking/netdevices.rst | 71 +-
+ Documentation/networking/scaling.rst | 21 +-
+ Documentation/networking/switchdev.rst | 2 +-
+ Documentation/networking/xsk-tx-metadata.rst | 62 +
+ Documentation/process/maintainer-netdev.rst | 8 +
+ MAINTAINERS | 6 +-
+ arch/s390/include/asm/irq.h | 1 -
+ arch/s390/kernel/irq.c | 1 -
+ drivers/dpll/dpll_core.c | 5 +-
+ drivers/infiniband/hw/irdma/hw.c | 2 -
+ drivers/infiniband/hw/irdma/main.c | 46 +-
+ drivers/infiniband/hw/irdma/main.h | 3 +
+ drivers/infiniband/ulp/ipoib/ipoib_netlink.c | 9 +-
+ drivers/net/amt.c | 13 +-
+ drivers/net/bareudp.c | 9 +-
+ drivers/net/bonding/bond_main.c | 26 +-
+ drivers/net/bonding/bond_netlink.c | 6 +-
+ drivers/net/can/c_can/c_can_platform.c | 51 +-
+ drivers/net/can/dev/netlink.c | 4 +-
+ drivers/net/can/flexcan/flexcan-core.c | 35 +-
+ drivers/net/can/flexcan/flexcan.h | 5 +
+ drivers/net/can/rockchip/rockchip_canfd-core.c | 5 -
+ drivers/net/can/usb/gs_usb.c | 5 +
+ drivers/net/can/vxcan.c | 7 +-
+ drivers/net/dsa/Kconfig | 1 +
+ drivers/net/dsa/b53/b53_common.c | 14 +
+ drivers/net/dsa/b53/b53_mdio.c | 1 +
+ drivers/net/dsa/b53/b53_priv.h | 2 +
+ drivers/net/dsa/b53/b53_serdes.c | 1 -
+ drivers/net/dsa/mt7530.c | 310 +--
+ drivers/net/dsa/mt7530.h | 8 +-
+ drivers/net/dsa/mv88e6xxx/pcs-6185.c | 1 -
+ drivers/net/dsa/mv88e6xxx/pcs-6352.c | 1 -
+ drivers/net/dsa/mv88e6xxx/pcs-639x.c | 4 -
+ drivers/net/dsa/qca/qca8k-8xxx.c | 1 -
+ drivers/net/dsa/rzn1_a5psw.c | 8 +-
+ drivers/net/dsa/sja1105/sja1105_mdio.c | 6 +-
+ drivers/net/dummy.c | 1 +
+ drivers/net/ethernet/Kconfig | 1 +
+ drivers/net/ethernet/Makefile | 1 +
+ drivers/net/ethernet/actions/owl-emac.c | 7 +-
+ drivers/net/ethernet/adi/adin1110.c | 2 +-
+ drivers/net/ethernet/airoha/Kconfig | 27 +
+ drivers/net/ethernet/airoha/Makefile | 9 +
+ .../net/ethernet/{mediatek => airoha}/airoha_eth.c | 1372 +++-------
+ drivers/net/ethernet/airoha/airoha_eth.h | 552 ++++
+ drivers/net/ethernet/airoha/airoha_npu.c | 520 ++++
+ drivers/net/ethernet/airoha/airoha_npu.h | 34 +
+ drivers/net/ethernet/airoha/airoha_ppe.c | 910 +++++++
+ drivers/net/ethernet/airoha/airoha_ppe_debugfs.c | 181 ++
+ drivers/net/ethernet/airoha/airoha_regs.h | 803 ++++++
+ drivers/net/ethernet/amazon/ena/ena_netdev.c | 43 +-
+ drivers/net/ethernet/apm/xgene-v2/main.c | 4 +-
+ drivers/net/ethernet/apm/xgene-v2/mdio.c | 16 +-
+ drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c | 10 +-
+ .../net/ethernet/aquantia/atlantic/aq_drvinfo.c | 14 +-
+ .../aquantia/atlantic/hw_atl/hw_atl_utils.h | 1 -
+ drivers/net/ethernet/broadcom/bnxt/bnxt.c | 703 +++--
+ drivers/net/ethernet/broadcom/bnxt/bnxt.h | 8 +
+ drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 17 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c | 6 +
+ drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c | 16 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c | 18 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c | 4 +-
+ drivers/net/ethernet/broadcom/genet/bcmgenet.c | 1085 ++++----
+ drivers/net/ethernet/broadcom/genet/bcmgenet.h | 52 +-
+ drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c | 89 +-
+ drivers/net/ethernet/broadcom/genet/bcmmii.c | 6 +-
+ drivers/net/ethernet/brocade/bna/bnad.c | 1 +
+ drivers/net/ethernet/cadence/macb.h | 130 +-
+ drivers/net/ethernet/cadence/macb_main.c | 228 +-
+ .../ethernet/cavium/liquidio/cn23xx_pf_device.c | 76 +-
+ .../net/ethernet/cavium/liquidio/octeon_device.c | 16 -
+ .../net/ethernet/cavium/liquidio/octeon_device.h | 7 -
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 7 +-
+ drivers/net/ethernet/cisco/enic/Kconfig | 1 +
+ drivers/net/ethernet/cisco/enic/Makefile | 2 +-
+ drivers/net/ethernet/cisco/enic/cq_desc.h | 25 +-
+ drivers/net/ethernet/cisco/enic/cq_enet_desc.h | 142 +-
+ drivers/net/ethernet/cisco/enic/enic.h | 17 +-
+ drivers/net/ethernet/cisco/enic/enic_ethtool.c | 51 +-
+ drivers/net/ethernet/cisco/enic/enic_main.c | 343 +--
+ drivers/net/ethernet/cisco/enic/enic_res.c | 87 +-
+ drivers/net/ethernet/cisco/enic/enic_res.h | 11 +-
+ drivers/net/ethernet/cisco/enic/enic_rq.c | 436 +++
+ drivers/net/ethernet/cisco/enic/enic_rq.h | 8 +
+ drivers/net/ethernet/cisco/enic/enic_wq.c | 117 +
+ drivers/net/ethernet/cisco/enic/enic_wq.h | 7 +
+ drivers/net/ethernet/cisco/enic/vnic_cq.h | 45 +-
+ drivers/net/ethernet/cisco/enic/vnic_devcmd.h | 19 +
+ drivers/net/ethernet/cisco/enic/vnic_enet.h | 5 +
+ drivers/net/ethernet/cisco/enic/vnic_rq.h | 4 +-
+ drivers/net/ethernet/cisco/enic/vnic_wq.h | 2 +-
+ drivers/net/ethernet/cortina/gemini.c | 1 +
+ drivers/net/ethernet/engleder/tsnep_main.c | 4 +-
+ drivers/net/ethernet/freescale/fec_main.c | 52 +-
+ drivers/net/ethernet/freescale/fman/fman_dtsec.c | 1 -
+ drivers/net/ethernet/freescale/gianfar.c | 14 +-
+ drivers/net/ethernet/freescale/ucc_geth.c | 2 +-
+ drivers/net/ethernet/freescale/ucc_geth.h | 2 -
+ drivers/net/ethernet/google/gve/gve.h | 24 +-
+ drivers/net/ethernet/google/gve/gve_adminq.c | 66 +-
+ .../net/ethernet/google/gve/gve_buffer_mgmt_dqo.c | 27 +-
+ drivers/net/ethernet/google/gve/gve_ethtool.c | 60 +-
+ drivers/net/ethernet/google/gve/gve_main.c | 98 +-
+ drivers/net/ethernet/google/gve/gve_rx_dqo.c | 34 +-
+ drivers/net/ethernet/google/gve/gve_utils.c | 6 +-
+ drivers/net/ethernet/hisilicon/hibmcge/Makefile | 2 +-
+ .../net/ethernet/hisilicon/hibmcge/hbg_common.h | 122 +
+ .../net/ethernet/hisilicon/hibmcge/hbg_debugfs.c | 7 +-
+ .../net/ethernet/hisilicon/hibmcge/hbg_diagnose.c | 348 +++
+ .../net/ethernet/hisilicon/hibmcge/hbg_diagnose.h | 11 +
+ drivers/net/ethernet/hisilicon/hibmcge/hbg_err.c | 58 +
+ drivers/net/ethernet/hisilicon/hibmcge/hbg_err.h | 1 +
+ .../net/ethernet/hisilicon/hibmcge/hbg_ethtool.c | 298 +++
+ .../net/ethernet/hisilicon/hibmcge/hbg_ethtool.h | 5 +
+ drivers/net/ethernet/hisilicon/hibmcge/hbg_hw.c | 10 +
+ drivers/net/ethernet/hisilicon/hibmcge/hbg_irq.c | 55 +-
+ drivers/net/ethernet/hisilicon/hibmcge/hbg_main.c | 103 +
+ drivers/net/ethernet/hisilicon/hibmcge/hbg_mdio.c | 22 +
+ drivers/net/ethernet/hisilicon/hibmcge/hbg_mdio.h | 2 +
+ drivers/net/ethernet/hisilicon/hibmcge/hbg_reg.h | 105 +
+ drivers/net/ethernet/hisilicon/hibmcge/hbg_txrx.c | 181 +-
+ drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c | 24 +-
+ drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 3 +-
+ .../ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c | 63 +-
+ .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 10 +-
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.c | 3 +-
+ drivers/net/ethernet/hisilicon/hns_mdio.c | 2 +-
+ drivers/net/ethernet/ibm/emac/core.c | 7 +-
+ drivers/net/ethernet/intel/Kconfig | 3 +-
+ drivers/net/ethernet/intel/e1000e/mac.c | 15 +-
+ drivers/net/ethernet/intel/i40e/i40e_xsk.c | 4 +-
+ drivers/net/ethernet/intel/i40e/i40e_xsk.h | 10 +-
+ drivers/net/ethernet/intel/iavf/Makefile | 2 +
+ drivers/net/ethernet/intel/iavf/iavf.h | 35 +-
+ drivers/net/ethernet/intel/iavf/iavf_ethtool.c | 2 +-
+ drivers/net/ethernet/intel/iavf/iavf_main.c | 245 +-
+ drivers/net/ethernet/intel/iavf/iavf_ptp.c | 485 ++++
+ drivers/net/ethernet/intel/iavf/iavf_ptp.h | 47 +
+ drivers/net/ethernet/intel/iavf/iavf_trace.h | 6 +-
+ drivers/net/ethernet/intel/iavf/iavf_txrx.c | 437 ++-
+ drivers/net/ethernet/intel/iavf/iavf_txrx.h | 24 +-
+ drivers/net/ethernet/intel/iavf/iavf_type.h | 235 +-
+ drivers/net/ethernet/intel/iavf/iavf_types.h | 34 +
+ drivers/net/ethernet/intel/iavf/iavf_virtchnl.c | 203 ++
+ drivers/net/ethernet/intel/ice/devlink/devlink.c | 102 +
+ drivers/net/ethernet/intel/ice/ice.h | 29 +-
+ drivers/net/ethernet/intel/ice/ice_arfs.c | 33 +-
+ drivers/net/ethernet/intel/ice/ice_arfs.h | 2 -
+ drivers/net/ethernet/intel/ice/ice_base.c | 20 +-
+ drivers/net/ethernet/intel/ice/ice_common.c | 208 +-
+ drivers/net/ethernet/intel/ice/ice_common.h | 7 +-
+ drivers/net/ethernet/intel/ice/ice_ddp.c | 4 +-
+ drivers/net/ethernet/intel/ice/ice_dpll.c | 14 +-
+ drivers/net/ethernet/intel/ice/ice_ethtool.c | 11 +-
+ drivers/net/ethernet/intel/ice/ice_ethtool_fdir.c | 21 +-
+ drivers/net/ethernet/intel/ice/ice_gnss.c | 31 +-
+ drivers/net/ethernet/intel/ice/ice_gnss.h | 4 +-
+ drivers/net/ethernet/intel/ice/ice_hw_autogen.h | 12 +
+ drivers/net/ethernet/intel/ice/ice_idc.c | 64 +-
+ drivers/net/ethernet/intel/ice/ice_irq.c | 275 +-
+ drivers/net/ethernet/intel/ice/ice_irq.h | 13 +-
+ drivers/net/ethernet/intel/ice/ice_lib.c | 58 +-
+ drivers/net/ethernet/intel/ice/ice_main.c | 78 +-
+ drivers/net/ethernet/intel/ice/ice_ptp.c | 511 ++--
+ drivers/net/ethernet/intel/ice/ice_ptp.h | 17 +-
+ drivers/net/ethernet/intel/ice/ice_ptp_hw.c | 413 +--
+ drivers/net/ethernet/intel/ice/ice_ptp_hw.h | 28 +-
+ drivers/net/ethernet/intel/ice/ice_sriov.c | 154 +-
+ drivers/net/ethernet/intel/ice/ice_type.h | 9 -
+ drivers/net/ethernet/intel/ice/ice_vf_lib.h | 3 +
+ drivers/net/ethernet/intel/ice/ice_virtchnl.c | 80 +-
+ drivers/net/ethernet/intel/ice/ice_virtchnl.h | 6 +
+ .../ethernet/intel/ice/ice_virtchnl_allowlist.c | 7 +
+ drivers/net/ethernet/intel/ice/ice_xsk.c | 4 +-
+ drivers/net/ethernet/intel/ice/ice_xsk.h | 8 -
+ drivers/net/ethernet/intel/idpf/idpf_lib.c | 1 +
+ .../net/ethernet/intel/idpf/idpf_singleq_txrx.c | 51 +-
+ drivers/net/ethernet/intel/idpf/idpf_txrx.c | 38 +-
+ drivers/net/ethernet/intel/idpf/idpf_txrx.h | 25 +-
+ drivers/net/ethernet/intel/igc/igc.h | 1 +
+ drivers/net/ethernet/intel/igc/igc_main.c | 146 +-
+ drivers/net/ethernet/intel/igc/igc_xdp.c | 19 +-
+ drivers/net/ethernet/marvell/mvneta.c | 1 -
+ drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 2 -
+ drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 14 +-
+ drivers/net/ethernet/marvell/octeontx2/af/rvu.h | 2 +
+ .../net/ethernet/marvell/octeontx2/nic/Makefile | 2 +-
+ drivers/net/ethernet/marvell/octeontx2/nic/cn10k.c | 7 +-
+ .../ethernet/marvell/octeontx2/nic/otx2_common.c | 122 +-
+ .../ethernet/marvell/octeontx2/nic/otx2_common.h | 17 +-
+ .../ethernet/marvell/octeontx2/nic/otx2_ethtool.c | 6 +-
+ .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 34 +-
+ .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.c | 188 +-
+ .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.h | 9 +
+ .../net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 14 +-
+ .../net/ethernet/marvell/octeontx2/nic/otx2_xsk.c | 225 ++
+ .../net/ethernet/marvell/octeontx2/nic/otx2_xsk.h | 24 +
+ .../net/ethernet/marvell/octeontx2/nic/qos_sq.c | 2 +-
+ .../net/ethernet/marvell/prestera/prestera_main.c | 3 +-
+ drivers/net/ethernet/mediatek/Kconfig | 8 -
+ drivers/net/ethernet/mediatek/Makefile | 1 -
+ drivers/net/ethernet/mediatek/mtk_eth_soc.c | 74 +-
+ drivers/net/ethernet/mediatek/mtk_eth_soc.h | 11 +
+ drivers/net/ethernet/mediatek/mtk_ppe_offload.c | 22 +-
+ drivers/net/ethernet/mediatek/mtk_star_emac.c | 7 +-
+ drivers/net/ethernet/mellanox/mlx4/alloc.c | 28 +-
+ drivers/net/ethernet/mellanox/mlx4/en_rx.c | 119 +-
+ drivers/net/ethernet/mellanox/mlx4/en_tx.c | 17 +-
+ drivers/net/ethernet/mellanox/mlx4/mlx4.h | 6 -
+ drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 15 +-
+ drivers/net/ethernet/mellanox/mlx4/port.c | 20 -
+ drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 4 +-
+ .../mellanox/mlx5/core/diag/reporter_vnic.c | 46 +
+ drivers/net/ethernet/mellanox/mlx5/core/dpll.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en.h | 13 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en/fs.h | 4 +-
+ .../net/ethernet/mellanox/mlx5/core/en/params.c | 16 +-
+ .../net/ethernet/mellanox/mlx5/core/en/params.h | 1 -
+ drivers/net/ethernet/mellanox/mlx5/core/en/port.c | 73 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en/port.h | 1 +
+ drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c | 4 +-
+ .../ethernet/mellanox/mlx5/core/en/reporter_rx.c | 121 +-
+ .../ethernet/mellanox/mlx5/core/en/reporter_tx.c | 1 -
+ drivers/net/ethernet/mellanox/mlx5/core/en/rss.c | 28 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en/rss.h | 7 +-
+ .../net/ethernet/mellanox/mlx5/core/en/rx_res.c | 20 +-
+ .../net/ethernet/mellanox/mlx5/core/en/rx_res.h | 10 +-
+ .../ethernet/mellanox/mlx5/core/en/tc/act/act.h | 5 -
+ .../ethernet/mellanox/mlx5/core/en/tc_tun_vxlan.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en/tir.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en/tir.h | 1 +
+ drivers/net/ethernet/mellanox/mlx5/core/en/trap.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c | 57 +-
+ .../net/ethernet/mellanox/mlx5/core/en/xsk/rx.c | 6 +-
+ .../net/ethernet/mellanox/mlx5/core/en/xsk/setup.c | 2 +-
+ .../ethernet/mellanox/mlx5/core/en_accel/ipsec.c | 81 +-
+ .../ethernet/mellanox/mlx5/core/en_accel/ipsec.h | 40 +-
+ .../mellanox/mlx5/core/en_accel/ipsec_fs.c | 741 ++++-
+ .../mellanox/mlx5/core/en_accel/ipsec_stats.c | 1 +
+ .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 150 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 52 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 7 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 22 +-
+ .../net/ethernet/mellanox/mlx5/core/en_selftest.c | 3 +
+ .../net/ethernet/mellanox/mlx5/core/esw/bridge.c | 6 +-
+ .../net/ethernet/mellanox/mlx5/core/esw/ipsec_fs.c | 15 +-
+ .../net/ethernet/mellanox/mlx5/core/esw/ipsec_fs.h | 5 +
+ .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 29 +-
+ drivers/net/ethernet/mellanox/mlx5/core/events.c | 36 +-
+ drivers/net/ethernet/mellanox/mlx5/core/health.c | 15 +-
+ drivers/net/ethernet/mellanox/mlx5/core/hwmon.c | 5 +
+ drivers/net/ethernet/mellanox/mlx5/core/hwmon.h | 1 +
+ .../net/ethernet/mellanox/mlx5/core/lag/mpesw.c | 4 -
+ .../net/ethernet/mellanox/mlx5/core/lag/port_sel.c | 2 +-
+ .../net/ethernet/mellanox/mlx5/core/lib/clock.c | 586 +++-
+ .../net/ethernet/mellanox/mlx5/core/lib/clock.h | 39 +-
+ .../net/ethernet/mellanox/mlx5/core/lib/devcom.h | 1 +
+ .../ethernet/mellanox/mlx5/core/lib/fs_chains.c | 2 +-
+ .../net/ethernet/mellanox/mlx5/core/lib/fs_ttc.c | 19 +
+ .../net/ethernet/mellanox/mlx5/core/lib/fs_ttc.h | 1 +
+ drivers/net/ethernet/mellanox/mlx5/core/main.c | 15 +-
+ .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 94 +
+ drivers/net/ethernet/mellanox/mlx5/core/port.c | 165 +-
+ .../ethernet/mellanox/mlx5/core/steering/hws/bwc.c | 2 +-
+ .../mellanox/mlx5/core/steering/sws/dr_domain.c | 24 -
+ .../mellanox/mlx5/core/steering/sws/dr_send.c | 33 -
+ .../mellanox/mlx5/core/steering/sws/dr_types.h | 1 -
+ .../mellanox/mlx5/core/steering/sws/mlx5dr.h | 2 -
+ drivers/net/ethernet/mellanox/mlx5/core/vport.c | 25 +
+ drivers/net/ethernet/mellanox/mlxsw/pci.c | 2 +
+ drivers/net/ethernet/mellanox/mlxsw/pci_hw.h | 5 +
+ drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 8 +-
+ drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 3 -
+ .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 48 -
+ .../net/ethernet/mellanox/mlxsw/spectrum_router.h | 1 -
+ drivers/net/ethernet/meta/fbnic/Makefile | 3 +-
+ drivers/net/ethernet/meta/fbnic/fbnic.h | 9 +
+ drivers/net/ethernet/meta/fbnic/fbnic_csr.c | 1 +
+ drivers/net/ethernet/meta/fbnic/fbnic_csr.h | 84 +-
+ drivers/net/ethernet/meta/fbnic/fbnic_debugfs.c | 174 ++
+ drivers/net/ethernet/meta/fbnic/fbnic_ethtool.c | 882 +++++-
+ drivers/net/ethernet/meta/fbnic/fbnic_fw.c | 101 +-
+ drivers/net/ethernet/meta/fbnic/fbnic_fw.h | 8 +-
+ drivers/net/ethernet/meta/fbnic/fbnic_netdev.c | 50 +-
+ drivers/net/ethernet/meta/fbnic/fbnic_netdev.h | 9 +
+ drivers/net/ethernet/meta/fbnic/fbnic_phylink.c | 1 -
+ drivers/net/ethernet/meta/fbnic/fbnic_rpc.c | 356 ++-
+ drivers/net/ethernet/meta/fbnic/fbnic_rpc.h | 35 +
+ drivers/net/ethernet/meta/fbnic/fbnic_tlv.c | 55 +-
+ drivers/net/ethernet/meta/fbnic/fbnic_tlv.h | 39 +-
+ drivers/net/ethernet/meta/fbnic/fbnic_txrx.c | 269 +-
+ drivers/net/ethernet/meta/fbnic/fbnic_txrx.h | 33 +-
+ .../net/ethernet/microchip/lan966x/lan966x_main.c | 1 -
+ .../net/ethernet/microchip/sparx5/sparx5_main.c | 1 -
+ drivers/net/ethernet/microsoft/mana/gdma_main.c | 50 +-
+ drivers/net/ethernet/microsoft/mana/hw_channel.c | 6 +-
+ drivers/net/ethernet/microsoft/mana/mana_en.c | 64 +-
+ drivers/net/ethernet/netronome/nfp/nfp_hwmon.c | 40 +-
+ drivers/net/ethernet/qlogic/qed/qed_sriov.c | 8 +-
+ drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c | 9 +-
+ drivers/net/ethernet/realtek/Kconfig | 3 +-
+ drivers/net/ethernet/realtek/r8169_main.c | 44 +-
+ drivers/net/ethernet/renesas/rcar_gen4_ptp.c | 2 +-
+ drivers/net/ethernet/renesas/rswitch.c | 7 +-
+ drivers/net/ethernet/rocker/rocker_main.c | 2 +-
+ drivers/net/ethernet/sfc/Kconfig | 5 +-
+ drivers/net/ethernet/sfc/Makefile | 2 +-
+ drivers/net/ethernet/sfc/ef10.c | 7 +-
+ drivers/net/ethernet/sfc/efx_common.c | 1 +
+ drivers/net/ethernet/sfc/efx_devlink.c | 13 +
+ drivers/net/ethernet/sfc/efx_reflash.c | 514 ++++
+ drivers/net/ethernet/sfc/efx_reflash.h | 20 +
+ drivers/net/ethernet/sfc/fw_formats.h | 114 +
+ drivers/net/ethernet/sfc/mae.c | 2 +-
+ drivers/net/ethernet/sfc/mcdi.c | 115 +-
+ drivers/net/ethernet/sfc/mcdi.h | 22 +-
+ drivers/net/ethernet/sfc/net_driver.h | 2 +
+ drivers/net/ethernet/sfc/tc.c | 6 +-
+ drivers/net/ethernet/stmicro/stmmac/Kconfig | 12 +
+ drivers/net/ethernet/stmicro/stmmac/Makefile | 1 +
+ drivers/net/ethernet/stmicro/stmmac/common.h | 18 +-
+ .../ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c | 174 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c | 29 +-
+ .../net/ethernet/stmicro/stmmac/dwmac-intel-plat.c | 24 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 231 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac-intel.h | 29 +
+ .../net/ethernet/stmicro/stmmac/dwmac-ipq806x.c | 15 +-
+ .../net/ethernet/stmicro/stmmac/dwmac-loongson.c | 6 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c | 9 +-
+ .../ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 29 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 280 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac-s32.c | 22 +-
+ .../net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 2 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac-sophgo.c | 75 +
+ .../net/ethernet/stmicro/stmmac/dwmac-starfive.c | 26 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c | 8 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c | 2 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac-thead.c | 46 +-
+ .../net/ethernet/stmicro/stmmac/dwmac-visconti.c | 2 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac1000.h | 13 +-
+ .../net/ethernet/stmicro/stmmac/dwmac1000_core.c | 35 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 12 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 98 +-
+ drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h | 9 +-
+ .../net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 49 +-
+ drivers/net/ethernet/stmicro/stmmac/hwif.h | 21 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac.h | 15 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 274 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 2 +
+ .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 17 +-
+ drivers/net/ethernet/ti/Kconfig | 1 +
+ drivers/net/ethernet/ti/am65-cpsw-nuss.c | 211 +-
+ drivers/net/ethernet/ti/am65-cpsw-nuss.h | 8 +
+ drivers/net/ethernet/ti/cpsw_new.c | 3 +-
+ drivers/net/ethernet/ti/icssg/icss_iep.c | 63 +-
+ drivers/net/ethernet/ti/icssg/icssg_common.c | 421 ++-
+ drivers/net/ethernet/ti/icssg/icssg_prueth.c | 131 +-
+ drivers/net/ethernet/ti/icssg/icssg_prueth.h | 47 +-
+ drivers/net/ethernet/ti/icssg/icssg_prueth_sr1.c | 58 +-
+ drivers/net/ethernet/wangxun/Kconfig | 3 +
+ drivers/net/ethernet/wangxun/libwx/Makefile | 2 +-
+ drivers/net/ethernet/wangxun/libwx/wx_ethtool.c | 105 +-
+ drivers/net/ethernet/wangxun/libwx/wx_ethtool.h | 4 +
+ drivers/net/ethernet/wangxun/libwx/wx_hw.c | 236 +-
+ drivers/net/ethernet/wangxun/libwx/wx_hw.h | 1 +
+ drivers/net/ethernet/wangxun/libwx/wx_lib.c | 77 +-
+ drivers/net/ethernet/wangxun/libwx/wx_ptp.c | 883 ++++++
+ drivers/net/ethernet/wangxun/libwx/wx_ptp.h | 20 +
+ drivers/net/ethernet/wangxun/libwx/wx_type.h | 135 +-
+ drivers/net/ethernet/wangxun/ngbe/ngbe_ethtool.c | 2 +
+ drivers/net/ethernet/wangxun/ngbe/ngbe_main.c | 20 +-
+ drivers/net/ethernet/wangxun/ngbe/ngbe_mdio.c | 11 +
+ drivers/net/ethernet/wangxun/ngbe/ngbe_type.h | 5 +
+ drivers/net/ethernet/wangxun/txgbe/txgbe_ethtool.c | 2 +
+ drivers/net/ethernet/wangxun/txgbe/txgbe_hw.c | 6 +
+ drivers/net/ethernet/wangxun/txgbe/txgbe_irq.c | 7 +
+ drivers/net/ethernet/wangxun/txgbe/txgbe_main.c | 56 +-
+ drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c | 16 +
+ drivers/net/ethernet/wangxun/txgbe/txgbe_type.h | 14 +
+ drivers/net/ethernet/xilinx/Kconfig | 1 +
+ drivers/net/ethernet/xilinx/xilinx_axienet.h | 29 +-
+ drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 319 ++-
+ drivers/net/geneve.c | 62 +-
+ drivers/net/gtp.c | 10 +-
+ drivers/net/hamradio/baycom_par.c | 4 +-
+ drivers/net/hamradio/baycom_ser_fdx.c | 2 +-
+ drivers/net/hamradio/baycom_ser_hdx.c | 4 +-
+ drivers/net/hamradio/bpqether.c | 25 +-
+ drivers/net/hyperv/hyperv_net.h | 2 +
+ drivers/net/hyperv/netvsc_drv.c | 16 +
+ drivers/net/hyperv/rndis_filter.c | 13 +-
+ drivers/net/ipvlan/ipvlan.h | 3 +-
+ drivers/net/ipvlan/ipvlan_main.c | 9 +-
+ drivers/net/ipvlan/ipvtap.c | 6 +-
+ drivers/net/loopback.c | 3 +-
+ drivers/net/macsec.c | 10 +-
+ drivers/net/macvlan.c | 22 +-
+ drivers/net/macvtap.c | 6 +-
+ drivers/net/mctp/Kconfig | 10 +
+ drivers/net/mctp/Makefile | 1 +
+ drivers/net/mctp/mctp-usb.c | 385 +++
+ drivers/net/net_failover.c | 2 +-
+ drivers/net/netconsole.c | 328 ++-
+ drivers/net/netdevsim/bpf.c | 3 +-
+ drivers/net/netdevsim/ethtool.c | 2 -
+ drivers/net/netdevsim/netdev.c | 78 +-
+ drivers/net/netdevsim/netdevsim.h | 1 +
+ drivers/net/netkit.c | 15 +-
+ drivers/net/pcs/pcs-lynx.c | 1 -
+ drivers/net/pcs/pcs-mtk-lynxi.c | 1 -
+ drivers/net/pcs/pcs-rzn1-miic.c | 22 +-
+ drivers/net/pcs/pcs-xpcs.c | 105 +-
+ drivers/net/pcs/pcs-xpcs.h | 26 +-
+ drivers/net/pfcp.c | 9 +-
+ drivers/net/phy/Kconfig | 2 +-
+ drivers/net/phy/Makefile | 3 +-
+ drivers/net/phy/aquantia/aquantia_hwmon.c | 32 +-
+ drivers/net/phy/bcm54140.c | 1 +
+ drivers/net/phy/broadcom.c | 2 +-
+ drivers/net/phy/dp83822.c | 38 +
+ drivers/net/phy/dp83td510.c | 187 ++
+ drivers/net/phy/dp83tg720.c | 78 +
+ drivers/net/phy/marvell-88q2xxx.c | 274 +-
+ drivers/net/phy/marvell.c | 24 +-
+ drivers/net/phy/marvell10g.c | 24 +-
+ drivers/net/phy/mediatek/mtk-ge-soc.c | 277 +-
+ drivers/net/phy/mediatek/mtk-ge.c | 76 +-
+ drivers/net/phy/mediatek/mtk-phy-lib.c | 77 +
+ drivers/net/phy/mediatek/mtk.h | 15 +
+ drivers/net/phy/micrel.c | 9 +-
+ drivers/net/phy/mscc/mscc_main.c | 2 +
+ drivers/net/phy/mscc/mscc_ptp.c | 14 +-
+ drivers/net/phy/nxp-c45-tja11xx.c | 94 +-
+ drivers/net/phy/nxp-tja11xx.c | 38 +
+ drivers/net/phy/phy-c45.c | 49 +-
+ drivers/net/phy/phy-core.c | 26 +-
+ drivers/net/phy/phy.c | 33 +-
+ drivers/net/phy/phy_device.c | 357 +--
+ drivers/net/phy/phy_led_triggers.c | 2 +
+ drivers/net/phy/phy_package.c | 350 +++
+ drivers/net/phy/phylib-internal.h | 27 +
+ drivers/net/phy/phylib.h | 28 +
+ drivers/net/phy/phylink.c | 78 +-
+ drivers/net/phy/qcom/qca807x.c | 16 +-
+ drivers/net/phy/qt2025.rs | 2 +-
+ drivers/net/phy/realtek/Kconfig | 8 +-
+ drivers/net/phy/realtek/realtek_main.c | 119 +-
+ drivers/net/phy/sfp.c | 13 +-
+ drivers/net/ppp/ppp_generic.c | 14 +-
+ drivers/net/ppp/pppoe.c | 1 +
+ drivers/net/ppp/pptp.c | 1 +
+ drivers/net/tap.c | 168 +-
+ drivers/net/team/team_core.c | 9 +-
+ drivers/net/tun.c | 223 +-
+ drivers/net/tun_vnet.h | 186 ++
+ drivers/net/usb/asix_devices.c | 17 +
+ drivers/net/usb/cdc_mbim.c | 4 +-
+ drivers/net/usb/qmi_wwan.c | 6 +-
+ drivers/net/usb/r8152.c | 1 +
+ drivers/net/veth.c | 11 +-
+ drivers/net/virtio_net.c | 146 +-
+ drivers/net/vrf.c | 14 +-
+ drivers/net/vxlan/vxlan_core.c | 68 +-
+ drivers/net/wireguard/device.c | 7 +-
+ drivers/net/wireless/broadcom/b43/main.c | 2 +-
+ drivers/net/wireless/intel/ipw2x00/ipw2200.c | 2 +-
+ drivers/net/wireless/intel/ipw2x00/libipw.h | 2 -
+ drivers/net/wireless/intel/ipw2x00/libipw_rx.c | 91 -
+ drivers/net/wireless/intel/iwlegacy/4965-rs.c | 15 +-
+ drivers/net/wireless/intel/iwlegacy/common.h | 2 -
+ drivers/net/wireless/intel/iwlwifi/cfg/22000.c | 1 -
+ drivers/net/wireless/intel/iwlwifi/cfg/ax210.c | 1 -
+ drivers/net/wireless/intel/iwlwifi/cfg/bz.c | 10 +-
+ drivers/net/wireless/intel/iwlwifi/cfg/dr.c | 2 +-
+ drivers/net/wireless/intel/iwlwifi/cfg/sc.c | 8 +-
+ drivers/net/wireless/intel/iwlwifi/dvm/tt.c | 11 -
+ drivers/net/wireless/intel/iwlwifi/dvm/tt.h | 1 -
+ drivers/net/wireless/intel/iwlwifi/fw/api/alive.h | 4 +-
+ .../net/wireless/intel/iwlwifi/fw/api/commands.h | 7 +-
+ .../net/wireless/intel/iwlwifi/fw/api/context.h | 6 +-
+ drivers/net/wireless/intel/iwlwifi/fw/api/d3.h | 2 +-
+ .../net/wireless/intel/iwlwifi/fw/api/datapath.h | 19 +-
+ .../net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h | 9 +-
+ drivers/net/wireless/intel/iwlwifi/fw/api/dhc.h | 129 +
+ .../net/wireless/intel/iwlwifi/fw/api/location.h | 66 +-
+ .../net/wireless/intel/iwlwifi/fw/api/mac-cfg.h | 95 +-
+ drivers/net/wireless/intel/iwlwifi/fw/api/phy.h | 18 +-
+ drivers/net/wireless/intel/iwlwifi/fw/api/rs.h | 52 +
+ drivers/net/wireless/intel/iwlwifi/fw/api/sta.h | 1 +
+ .../net/wireless/intel/iwlwifi/fw/api/time-event.h | 42 +-
+ drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 108 +-
+ drivers/net/wireless/intel/iwlwifi/fw/dbg.h | 3 -
+ drivers/net/wireless/intel/iwlwifi/fw/regulatory.c | 56 +-
+ drivers/net/wireless/intel/iwlwifi/fw/regulatory.h | 4 +
+ drivers/net/wireless/intel/iwlwifi/fw/runtime.h | 2 +
+ drivers/net/wireless/intel/iwlwifi/fw/uefi.c | 3 +
+ drivers/net/wireless/intel/iwlwifi/iwl-config.h | 23 +-
+ .../wireless/intel/iwlwifi/iwl-context-info-gen3.h | 8 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-debug.h | 9 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 24 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-trans.c | 5 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 11 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 2 +-
+ .../net/wireless/intel/iwlwifi/mvm/ftm-initiator.c | 119 +-
+ .../net/wireless/intel/iwlwifi/mvm/ftm-responder.c | 86 -
+ drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 54 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 23 -
+ drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 9 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c | 2 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 16 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 6 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 2 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 61 -
+ drivers/net/wireless/intel/iwlwifi/mvm/sta.h | 4 -
+ .../net/wireless/intel/iwlwifi/mvm/time-event.c | 6 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/tt.c | 4 +-
+ .../wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c | 5 +-
+ drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 237 +-
+ .../net/wireless/intel/iwlwifi/pcie/trans-gen2.c | 4 +-
+ drivers/net/wireless/intel/iwlwifi/tests/devinfo.c | 15 +-
+ drivers/net/wireless/marvell/libertas/cmd.c | 143 +-
+ drivers/net/wireless/marvell/libertas/cmd.h | 10 -
+ drivers/net/wireless/marvell/libertas/cmdresp.c | 1 -
+ drivers/net/wireless/marvell/libertas/decl.h | 4 -
+ drivers/net/wireless/marvell/libertas/dev.h | 4 -
+ drivers/net/wireless/marvell/libertas/main.c | 88 +-
+ drivers/net/wireless/marvell/mwifiex/main.c | 4 +-
+ drivers/net/wireless/marvell/mwifiex/main.h | 4 +-
+ drivers/net/wireless/marvell/mwifiex/pcie.c | 4 +-
+ drivers/net/wireless/marvell/mwifiex/sdio.c | 4 +-
+ drivers/net/wireless/marvell/mwifiex/uap_event.c | 16 -
+ drivers/net/wireless/marvell/mwifiex/usb.c | 4 +-
+ drivers/net/wireless/quantenna/qtnfmac/qlink.h | 21 +-
+ drivers/net/wireless/realtek/rtl8xxxu/8192c.c | 2 +
+ drivers/net/wireless/realtek/rtl8xxxu/core.c | 17 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192de/phy.c | 6 +-
+ drivers/net/wireless/realtek/rtw88/fw.c | 15 +
+ drivers/net/wireless/realtek/rtw88/fw.h | 1 +
+ drivers/net/wireless/realtek/rtw88/mac.c | 6 +-
+ drivers/net/wireless/realtek/rtw88/main.c | 18 +-
+ drivers/net/wireless/realtek/rtw88/main.h | 36 +-
+ drivers/net/wireless/realtek/rtw88/pci.c | 4 +-
+ drivers/net/wireless/realtek/rtw88/phy.c | 191 +-
+ drivers/net/wireless/realtek/rtw88/phy.h | 20 +-
+ drivers/net/wireless/realtek/rtw88/reg.h | 3 +-
+ drivers/net/wireless/realtek/rtw88/rtw8723d.c | 4 +-
+ drivers/net/wireless/realtek/rtw88/rtw8821c.c | 16 +-
+ drivers/net/wireless/realtek/rtw88/rtw8822b.c | 16 +-
+ drivers/net/wireless/realtek/rtw88/rtw8822c.c | 2 +-
+ drivers/net/wireless/realtek/rtw88/rtw88xxa.c | 2 +-
+ drivers/net/wireless/realtek/rtw88/sar.c | 2 +-
+ drivers/net/wireless/realtek/rtw88/sdio.c | 2 +-
+ drivers/net/wireless/realtek/rtw88/usb.c | 2 +-
+ drivers/net/wireless/realtek/rtw89/Kconfig | 2 +-
+ drivers/net/wireless/realtek/rtw89/chan.c | 28 +-
+ drivers/net/wireless/realtek/rtw89/chan.h | 2 +-
+ drivers/net/wireless/realtek/rtw89/coex.c | 2829 +++++++++++---------
+ drivers/net/wireless/realtek/rtw89/coex.h | 18 +-
+ drivers/net/wireless/realtek/rtw89/core.c | 192 +-
+ drivers/net/wireless/realtek/rtw89/core.h | 169 +-
+ drivers/net/wireless/realtek/rtw89/debug.c | 2054 ++++++++------
+ drivers/net/wireless/realtek/rtw89/fw.c | 189 +-
+ drivers/net/wireless/realtek/rtw89/fw.h | 46 +-
+ drivers/net/wireless/realtek/rtw89/mac.c | 31 +-
+ drivers/net/wireless/realtek/rtw89/mac.h | 1 +
+ drivers/net/wireless/realtek/rtw89/mac80211.c | 283 +-
+ drivers/net/wireless/realtek/rtw89/mac_be.c | 2 +-
+ drivers/net/wireless/realtek/rtw89/phy.c | 746 +++---
+ drivers/net/wireless/realtek/rtw89/phy.h | 15 +-
+ drivers/net/wireless/realtek/rtw89/ps.c | 6 +-
+ drivers/net/wireless/realtek/rtw89/reg.h | 5 +
+ drivers/net/wireless/realtek/rtw89/regd.c | 574 ++--
+ drivers/net/wireless/realtek/rtw89/rtw8851b.c | 21 +-
+ drivers/net/wireless/realtek/rtw89/rtw8852a.c | 21 +-
+ drivers/net/wireless/realtek/rtw89/rtw8852b.c | 21 +-
+ drivers/net/wireless/realtek/rtw89/rtw8852bt.c | 21 +-
+ drivers/net/wireless/realtek/rtw89/rtw8852c.c | 21 +-
+ drivers/net/wireless/realtek/rtw89/rtw8922a.c | 15 +-
+ drivers/net/wireless/realtek/rtw89/sar.c | 63 +-
+ drivers/net/wireless/realtek/rtw89/sar.h | 5 +-
+ drivers/net/wireless/realtek/rtw89/ser.c | 17 +-
+ drivers/net/wireless/realtek/rtw89/util.c | 11 +
+ drivers/net/wireless/realtek/rtw89/util.h | 5 +-
+ drivers/net/wireless/realtek/rtw89/wow.c | 7 +-
+ drivers/net/wireless/virtual/mac80211_hwsim.c | 1 +
+ drivers/net/wireless/virtual/virt_wifi.c | 8 +-
+ drivers/net/wwan/t7xx/t7xx_hif_dpmaif_rx.c | 1 +
+ drivers/net/wwan/t7xx/t7xx_pci.c | 1 -
+ drivers/net/wwan/wwan_core.c | 16 +-
+ drivers/of/base.c | 27 +
+ drivers/ptp/ptp_chardev.c | 16 +
+ drivers/ptp/ptp_ocp.c | 3 -
+ drivers/s390/net/Kconfig | 11 +-
+ drivers/s390/net/Makefile | 1 -
+ drivers/s390/net/lcs.c | 2385 -----------------
+ drivers/s390/net/lcs.h | 342 ---
+ fs/eventpoll.c | 8 +-
+ include/linux/avf/virtchnl.h | 135 +-
+ include/linux/cpu_rmap.h | 1 +
+ include/linux/ethtool.h | 5 +-
+ include/linux/filter.h | 1 +
+ include/linux/ieee80211.h | 12 +
+ include/linux/if_macvlan.h | 6 +-
+ include/linux/ipv6.h | 1 +
+ include/linux/mlx4/device.h | 3 +-
+ include/linux/mlx5/device.h | 1 +
+ include/linux/mlx5/driver.h | 33 +-
+ include/linux/mlx5/eswitch.h | 2 +
+ include/linux/mlx5/mlx5_ifc.h | 11 +-
+ include/linux/mlx5/port.h | 86 +-
+ include/linux/net/intel/iidc.h | 2 +
+ include/linux/netdevice.h | 132 +-
+ include/linux/netpoll.h | 1 +
+ include/linux/of.h | 9 +
+ include/linux/pcs/pcs-xpcs.h | 3 +-
+ include/linux/phy.h | 219 +-
+ include/linux/phylink.h | 37 +-
+ include/linux/platform_data/x86/intel_pmc_ipc.h | 94 +
+ include/linux/posix-clock.h | 6 +-
+ include/linux/ppp_channel.h | 3 +-
+ include/linux/qed/qed_ll2_if.h | 2 +-
+ include/linux/rtnetlink.h | 1 +
+ include/linux/sctp.h | 2 -
+ include/linux/skbuff.h | 28 +-
+ include/linux/stmmac.h | 12 +-
+ include/linux/tcp.h | 2 +
+ include/linux/unroll.h | 44 +
+ include/linux/usb/mctp-usb.h | 30 +
+ include/linux/usb/r8152.h | 1 +
+ include/net/busy_poll.h | 21 +-
+ include/net/cfg80211.h | 48 +-
+ include/net/dropreason-core.h | 9 +
+ include/net/dropreason.h | 6 -
+ include/net/dst_metadata.h | 7 +-
+ include/net/fib_rules.h | 27 +-
+ include/net/gro.h | 38 +-
+ include/net/inet6_hashtables.h | 2 +-
+ include/net/inet_connection_sock.h | 4 +-
+ include/net/inet_hashtables.h | 11 +-
+ include/net/ip.h | 26 +-
+ include/net/ip_fib.h | 2 +
+ include/net/ip_tunnels.h | 12 +-
+ include/net/ipv6.h | 11 +-
+ include/net/libeth/rx.h | 47 +
+ include/net/lwtunnel.h | 12 +-
+ include/net/mac80211.h | 38 +-
+ include/net/mptcp.h | 5 +-
+ include/net/netdev_lock.h | 89 +
+ include/net/netdev_netlink.h | 12 +
+ include/net/netdev_queues.h | 5 +
+ include/net/netdev_rx_queue.h | 1 +
+ include/net/netlink.h | 15 +
+ include/net/netmem.h | 21 +-
+ include/net/netns/ipv4.h | 4 +
+ include/net/page_pool/memory_provider.h | 45 +
+ include/net/page_pool/types.h | 4 +
+ include/net/rtnetlink.h | 40 +-
+ include/net/sock.h | 35 +-
+ include/net/tcp.h | 37 +-
+ include/net/xdp.h | 1 -
+ include/net/xdp_sock.h | 10 +
+ include/net/xdp_sock_drv.h | 44 +-
+ include/net/xsk_buff_pool.h | 8 +
+ include/trace/events/tcp.h | 6 +
+ include/uapi/linux/bpf.h | 30 +
+ include/uapi/linux/can.h | 3 +-
+ include/uapi/linux/ethtool.h | 22 +
+ include/uapi/linux/fib_rules.h | 3 +
+ include/uapi/linux/if_link.h | 7 +
+ include/uapi/linux/if_xdp.h | 10 +
+ include/uapi/linux/netdev.h | 16 +
+ include/uapi/linux/nl80211.h | 4 +-
+ include/uapi/linux/rtnetlink.h | 1 +
+ include/uapi/linux/snmp.h | 1 +
+ include/uapi/linux/tcp.h | 1 +
+ include/uapi/linux/usb/ch9.h | 1 +
+ io_uring/napi.c | 4 +-
+ kernel/bpf/btf.c | 1 +
+ kernel/bpf/cpumap.c | 150 +-
+ kernel/bpf/offload.c | 11 +-
+ kernel/time/posix-clock.c | 3 +-
+ lib/Kconfig.debug | 20 +-
+ lib/Makefile | 2 +-
+ ...{test_blackhole_dev.c => blackhole_dev_kunit.c} | 47 +-
+ lib/cpu_rmap.c | 2 +-
+ net/8021q/vlan_dev.c | 5 +-
+ net/8021q/vlan_netlink.c | 9 +-
+ net/batman-adv/soft-interface.c | 11 +-
+ net/bluetooth/6lowpan.c | 1 +
+ net/bridge/br_device.c | 4 +-
+ net/bridge/br_mdb.c | 2 +-
+ net/bridge/br_netlink.c | 6 +-
+ net/caif/chnl_net.c | 5 +-
+ net/can/raw.c | 2 +-
+ net/core/Makefile | 2 +-
+ net/core/dev.c | 608 +++--
+ net/core/dev.h | 35 +-
+ net/core/dev_api.c | 320 +++
+ net/core/dev_ioctl.c | 70 +-
+ net/core/devmem.c | 96 +-
+ net/core/devmem.h | 51 +-
+ net/core/dst.c | 6 +-
+ net/core/fib_rules.c | 223 +-
+ net/core/filter.c | 80 +-
+ net/core/flow_dissector.c | 10 +-
+ net/core/gro.c | 103 +-
+ net/core/lwtunnel.c | 23 +-
+ net/core/neighbour.c | 13 +-
+ net/core/net-sysfs.c | 419 ++-
+ net/core/netdev-genl-gen.c | 4 +-
+ net/core/netdev-genl-gen.h | 6 +-
+ net/core/netdev-genl.c | 76 +-
+ net/core/netdev_rx_queue.c | 109 +-
+ net/core/netpoll.c | 15 +-
+ net/core/page_pool.c | 66 +-
+ net/core/page_pool_user.c | 9 +-
+ net/core/pktgen.c | 336 +--
+ net/core/rtnetlink.c | 93 +-
+ net/core/secure_seq.c | 2 +-
+ net/core/skbuff.c | 115 +
+ net/core/sock.c | 35 +-
+ net/core/xdp.c | 10 -
+ net/dccp/ipv4.c | 3 -
+ net/dccp/ipv6.c | 9 +-
+ net/dsa/conduit.c | 17 +-
+ net/dsa/user.c | 27 +-
+ net/ethtool/cabletest.c | 21 +-
+ net/ethtool/cmis_fw_update.c | 8 +-
+ net/ethtool/common.c | 42 +
+ net/ethtool/features.c | 8 +-
+ net/ethtool/ioctl.c | 31 +-
+ net/ethtool/module.c | 9 +-
+ net/ethtool/netlink.c | 13 +
+ net/ethtool/phy.c | 21 +-
+ net/ethtool/rss.c | 4 +
+ net/ethtool/tsinfo.c | 10 +-
+ net/hsr/Kconfig | 18 +
+ net/hsr/Makefile | 2 +
+ net/hsr/hsr_device.c | 4 +-
+ net/hsr/hsr_forward.c | 4 +-
+ net/hsr/hsr_framereg.c | 99 +-
+ net/hsr/hsr_framereg.h | 8 +-
+ net/hsr/hsr_main.h | 2 +
+ net/hsr/hsr_netlink.c | 12 +-
+ net/hsr/prp_dup_discard_test.c | 212 ++
+ net/ieee802154/6lowpan/core.c | 10 +-
+ net/ieee802154/core.c | 10 +-
+ net/ipv4/af_inet.c | 2 +-
+ net/ipv4/arp.c | 12 +-
+ net/ipv4/devinet.c | 77 +-
+ net/ipv4/fib_frontend.c | 78 +-
+ net/ipv4/fib_rules.c | 59 +-
+ net/ipv4/fib_semantics.c | 206 +-
+ net/ipv4/fib_trie.c | 22 -
+ net/ipv4/icmp.c | 39 +-
+ net/ipv4/igmp.c | 14 +-
+ net/ipv4/igmp_internal.h | 17 +
+ net/ipv4/inet_connection_sock.c | 86 +-
+ net/ipv4/inet_diag.c | 2 +-
+ net/ipv4/inet_hashtables.c | 122 +-
+ net/ipv4/inet_timewait_sock.c | 2 +-
+ net/ipv4/inetpeer.c | 8 +-
+ net/ipv4/ip_gre.c | 38 +-
+ net/ipv4/ip_tunnel.c | 10 +-
+ net/ipv4/ip_vti.c | 9 +-
+ net/ipv4/ipip.c | 9 +-
+ net/ipv4/ipmr.c | 2 +-
+ net/ipv4/nexthop.c | 3 +-
+ net/ipv4/ping.c | 26 +-
+ net/ipv4/proc.c | 1 +
+ net/ipv4/raw.c | 6 +-
+ net/ipv4/syncookies.c | 9 +-
+ net/ipv4/sysctl_net_ipv4.c | 10 +
+ net/ipv4/tcp.c | 115 +-
+ net/ipv4/tcp_diag.c | 21 +-
+ net/ipv4/tcp_fastopen.c | 6 +-
+ net/ipv4/tcp_input.c | 50 +-
+ net/ipv4/tcp_ipv4.c | 74 +-
+ net/ipv4/tcp_metrics.c | 6 +-
+ net/ipv4/tcp_minisocks.c | 55 +-
+ net/ipv4/tcp_offload.c | 2 +-
+ net/ipv4/tcp_output.c | 40 +-
+ net/ipv4/tcp_timer.c | 56 +-
+ net/ipv4/udp.c | 75 +-
+ net/ipv4/udp_offload.c | 2 +-
+ net/ipv6/exthdrs.c | 3 +-
+ net/ipv6/fib6_rules.c | 57 +-
+ net/ipv6/icmp.c | 7 +-
+ net/ipv6/inet6_hashtables.c | 40 +-
+ net/ipv6/ip6_gre.c | 29 +-
+ net/ipv6/ip6_output.c | 11 +-
+ net/ipv6/ip6_tunnel.c | 21 +-
+ net/ipv6/ip6_vti.c | 15 +-
+ net/ipv6/ip6mr.c | 2 +-
+ net/ipv6/ndisc.c | 8 +-
+ net/ipv6/ping.c | 3 -
+ net/ipv6/raw.c | 15 +-
+ net/ipv6/route.c | 6 +-
+ net/ipv6/sit.c | 23 +-
+ net/ipv6/tcp_ipv6.c | 35 +-
+ net/ipv6/tcpv6_offload.c | 2 +-
+ net/ipv6/udp.c | 12 +-
+ net/ipv6/udp_offload.c | 2 +-
+ net/l2tp/l2tp_eth.c | 1 +
+ net/l2tp/l2tp_ip6.c | 8 +-
+ net/l2tp/l2tp_ppp.c | 1 +
+ net/mac80211/agg-rx.c | 22 +-
+ net/mac80211/agg-tx.c | 9 +-
+ net/mac80211/cfg.c | 23 +-
+ net/mac80211/chan.c | 20 +-
+ net/mac80211/debugfs.c | 44 +-
+ net/mac80211/driver-ops.h | 3 +-
+ net/mac80211/drop.h | 21 +-
+ net/mac80211/ethtool.c | 2 +-
+ net/mac80211/ieee80211_i.h | 30 +-
+ net/mac80211/iface.c | 76 +-
+ net/mac80211/main.c | 16 +-
+ net/mac80211/mesh_hwmp.c | 14 +-
+ net/mac80211/mlme.c | 582 +++-
+ net/mac80211/rx.c | 219 +-
+ net/mac80211/sta_info.c | 64 +-
+ net/mac80211/status.c | 34 +-
+ net/mac80211/tests/Makefile | 2 +-
+ net/mac80211/tests/chan-mode.c | 254 ++
+ net/mac80211/tests/util.c | 6 +-
+ net/mac80211/tx.c | 5 +-
+ net/mac80211/util.c | 3 +-
+ net/mptcp/Makefile | 2 +-
+ net/mptcp/ctrl.c | 32 +-
+ net/mptcp/diag.c | 42 +-
+ net/mptcp/fastopen.c | 27 +-
+ net/mptcp/pm.c | 565 +++-
+ net/mptcp/pm_kernel.c | 1410 ++++++++++
+ net/mptcp/pm_netlink.c | 1939 +-------------
+ net/mptcp/pm_userspace.c | 265 +-
+ net/mptcp/protocol.c | 329 +--
+ net/mptcp/protocol.h | 82 +-
+ net/mptcp/sched.c | 39 +-
+ net/mptcp/subflow.c | 36 +-
+ net/netlink/af_netlink.c | 1 +
+ net/nfc/hci/llc.c | 11 -
+ net/nfc/hci/llc.h | 1 -
+ net/openvswitch/vport-internal_dev.c | 2 +-
+ net/packet/af_packet.c | 9 +-
+ net/rds/stats.c | 3 +-
+ net/rfkill/rfkill-gpio.c | 3 +
+ net/sched/act_tunnel_key.c | 8 +-
+ net/sched/em_meta.c | 2 +-
+ net/sched/sch_api.c | 216 +-
+ net/sched/sch_qfq.c | 2 +-
+ net/sctp/protocol.c | 7 +-
+ net/smc/smc_pnet.c | 8 +-
+ net/socket.c | 13 +-
+ net/tipc/link.c | 3 +-
+ net/tls/tls_main.c | 4 +-
+ net/unix/af_unix.c | 1 -
+ net/wireless/core.c | 10 +-
+ net/wireless/core.h | 1 -
+ net/wireless/nl80211.c | 19 +-
+ net/wireless/scan.c | 8 +-
+ net/wireless/trace.h | 2 +-
+ net/xdp/xsk.c | 9 +-
+ net/xdp/xsk_buff_pool.c | 49 +-
+ net/xfrm/xfrm_interface_core.c | 15 +-
+ scripts/coccinelle/misc/newline_in_nl_msg.cocci | 13 +-
+ tools/include/uapi/linux/bpf.h | 30 +
+ tools/include/uapi/linux/if_xdp.h | 10 +
+ tools/include/uapi/linux/netdev.h | 16 +
+ tools/net/ynl/Makefile.deps | 5 +-
+ tools/net/ynl/pyynl/lib/ynl.py | 46 +-
+ tools/net/ynl/pyynl/ynl_gen_c.py | 36 +-
+ tools/testing/selftests/bpf/network_helpers.c | 28 +
+ tools/testing/selftests/bpf/network_helpers.h | 3 +
+ .../testing/selftests/bpf/prog_tests/lwt_helpers.h | 29 -
+ .../selftests/bpf/prog_tests/net_timestamping.c | 239 ++
+ .../bpf/prog_tests/xdp_context_test_run.c | 145 +-
+ .../testing/selftests/bpf/progs/bpf_tracing_net.h | 1 +
+ .../testing/selftests/bpf/progs/net_timestamping.c | 248 ++
+ tools/testing/selftests/bpf/progs/setget_sockopt.c | 1 +
+ tools/testing/selftests/bpf/progs/test_xdp_meta.c | 53 +-
+ tools/testing/selftests/bpf/xdp_hw_metadata.c | 168 +-
+ tools/testing/selftests/drivers/net/.gitignore | 2 +
+ tools/testing/selftests/drivers/net/Makefile | 5 +
+ tools/testing/selftests/drivers/net/README.rst | 4 +-
+ tools/testing/selftests/drivers/net/config | 1 +
+ tools/testing/selftests/drivers/net/hds.py | 3 +-
+ tools/testing/selftests/drivers/net/hw/Makefile | 6 +
+ tools/testing/selftests/drivers/net/hw/csum.py | 50 +-
+ tools/testing/selftests/drivers/net/hw/devmem.py | 6 +-
+ tools/testing/selftests/drivers/net/hw/irq.py | 99 +
+ tools/testing/selftests/drivers/net/hw/ncdevmem.c | 1 -
+ tools/testing/selftests/drivers/net/hw/rss_ctx.py | 46 +-
+ .../selftests/drivers/net/hw/rss_input_xfrm.py | 87 +
+ tools/testing/selftests/drivers/net/hw/tso.py | 241 ++
+ .../selftests/drivers/net/hw/xdp_dummy.bpf.c | 13 +
+ tools/testing/selftests/drivers/net/lib/py/env.py | 137 +-
+ .../selftests/drivers/net/lib/sh/lib_netcons.sh | 24 +
+ .../drivers/net/netcons_fragmented_msg.sh | 122 +
+ .../selftests/drivers/net/netcons_sysdata.sh | 204 ++
+ tools/testing/selftests/drivers/net/ping.py | 22 +-
+ tools/testing/selftests/drivers/net/queues.py | 45 +-
+ tools/testing/selftests/drivers/net/xdp_helper.c | 151 ++
+ tools/testing/selftests/net/.gitignore | 2 +
+ tools/testing/selftests/net/Makefile | 9 +-
+ tools/testing/selftests/net/bpf_offload.py | 5 +-
+ tools/testing/selftests/net/cmsg_ip.sh | 187 ++
+ tools/testing/selftests/net/cmsg_ipv6.sh | 154 --
+ tools/testing/selftests/net/cmsg_sender.c | 114 +-
+ tools/testing/selftests/net/config | 8 +
+ tools/testing/selftests/net/fcnal-test.sh | 4 +-
+ tools/testing/selftests/net/fdb_flush.sh | 2 +-
+ tools/testing/selftests/net/fib_nexthops.sh | 9 +-
+ tools/testing/selftests/net/fib_rule_tests.sh | 74 +
+ tools/testing/selftests/net/forwarding/README | 2 +-
+ .../testing/selftests/net/forwarding/bridge_mdb.sh | 2 +-
+ tools/testing/selftests/net/forwarding/lib.sh | 10 -
+ .../selftests/net/forwarding/vxlan_bridge_1d.sh | 2 +
+ tools/testing/selftests/net/gro.c | 8 +-
+ tools/testing/selftests/net/gro.sh | 7 +-
+ tools/testing/selftests/net/ip_local_port_range.sh | 4 +-
+ tools/testing/selftests/net/lib.sh | 19 +
+ tools/testing/selftests/net/lib/py/__init__.py | 4 +-
+ tools/testing/selftests/net/lib/py/ksft.py | 7 +-
+ tools/testing/selftests/net/lib/py/netns.py | 18 +
+ tools/testing/selftests/net/lib/py/utils.py | 89 +-
+ tools/testing/selftests/net/lib/py/ynl.py | 4 +
+ tools/testing/selftests/net/link_netns.py | 141 +
+ tools/testing/selftests/net/mptcp/Makefile | 2 +-
+ tools/testing/selftests/net/mptcp/diag.sh | 27 +
+ tools/testing/selftests/net/mptcp/mptcp_diag.c | 272 ++
+ tools/testing/selftests/net/mptcp/simult_flows.sh | 2 +-
+ tools/testing/selftests/net/netns-name.sh | 10 +
+ tools/testing/selftests/net/nl_netdev.py | 18 +-
+ .../selftests/net/openvswitch/openvswitch.sh | 11 +-
+ tools/testing/selftests/net/proc_net_pktgen.c | 646 +++++
+ tools/testing/selftests/net/psock_tpacket.c | 2 +-
+ .../selftests/net/reuseaddr_ports_exhausted.c | 2 +-
+ tools/testing/selftests/net/rtnetlink.py | 30 +
+ tools/testing/selftests/net/setup_veth.sh | 3 +-
+ tools/testing/selftests/net/so_rcv_listener.c | 168 ++
+ tools/testing/selftests/net/test_blackhole_dev.sh | 11 -
+ tools/testing/selftests/net/test_so_rcv.sh | 73 +
+ .../selftests/net/test_vxlan_fdb_changelink.sh | 111 +-
+ tools/testing/selftests/net/ynl.mk | 3 +-
+ tools/testing/selftests/ptp/testptp.c | 37 +-
+ 992 files changed, 45074 insertions(+), 21508 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/net/airoha,en7581-npu.yaml
+ create mode 100644 Documentation/devicetree/bindings/net/fsl,gianfar-mdio.yaml
+ create mode 100644 Documentation/devicetree/bindings/net/fsl,gianfar.yaml
+ create mode 100644 Documentation/devicetree/bindings/net/realtek,rtl9301-mdio.yaml
+ rename Documentation/devicetree/bindings/{mfd => net}/realtek,rtl9301-switch.yaml (66%)
+ create mode 100644 Documentation/devicetree/bindings/net/sophgo,sg2044-dwmac.yaml
+ create mode 100644 Documentation/devicetree/bindings/net/tesla,fsd-ethqos.yaml
+ create mode 100644 Documentation/netlink/specs/conntrack.yaml
+ create mode 100644 Documentation/netlink/specs/nl80211.yaml
+ create mode 100644 drivers/net/ethernet/airoha/Kconfig
+ create mode 100644 drivers/net/ethernet/airoha/Makefile
+ rename drivers/net/ethernet/{mediatek => airoha}/airoha_eth.c (66%)
+ create mode 100644 drivers/net/ethernet/airoha/airoha_eth.h
+ create mode 100644 drivers/net/ethernet/airoha/airoha_npu.c
+ create mode 100644 drivers/net/ethernet/airoha/airoha_npu.h
+ create mode 100644 drivers/net/ethernet/airoha/airoha_ppe.c
+ create mode 100644 drivers/net/ethernet/airoha/airoha_ppe_debugfs.c
+ create mode 100644 drivers/net/ethernet/airoha/airoha_regs.h
+ create mode 100644 drivers/net/ethernet/cisco/enic/enic_rq.c
+ create mode 100644 drivers/net/ethernet/cisco/enic/enic_rq.h
+ create mode 100644 drivers/net/ethernet/cisco/enic/enic_wq.c
+ create mode 100644 drivers/net/ethernet/cisco/enic/enic_wq.h
+ create mode 100644 drivers/net/ethernet/hisilicon/hibmcge/hbg_diagnose.c
+ create mode 100644 drivers/net/ethernet/hisilicon/hibmcge/hbg_diagnose.h
+ create mode 100644 drivers/net/ethernet/intel/iavf/iavf_ptp.c
+ create mode 100644 drivers/net/ethernet/intel/iavf/iavf_ptp.h
+ create mode 100644 drivers/net/ethernet/intel/iavf/iavf_types.h
+ create mode 100644 drivers/net/ethernet/marvell/octeontx2/nic/otx2_xsk.c
+ create mode 100644 drivers/net/ethernet/marvell/octeontx2/nic/otx2_xsk.h
+ create mode 100644 drivers/net/ethernet/sfc/efx_reflash.c
+ create mode 100644 drivers/net/ethernet/sfc/efx_reflash.h
+ create mode 100644 drivers/net/ethernet/sfc/fw_formats.h
+ create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-sophgo.c
+ create mode 100644 drivers/net/ethernet/wangxun/libwx/wx_ptp.c
+ create mode 100644 drivers/net/ethernet/wangxun/libwx/wx_ptp.h
+ create mode 100644 drivers/net/mctp/mctp-usb.c
+ create mode 100644 drivers/net/phy/phy_package.c
+ create mode 100644 drivers/net/phy/phylib-internal.h
+ create mode 100644 drivers/net/phy/phylib.h
+ create mode 100644 drivers/net/tun_vnet.h
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/dhc.h
+ delete mode 100644 drivers/s390/net/lcs.c
+ delete mode 100644 drivers/s390/net/lcs.h
+ create mode 100644 include/linux/platform_data/x86/intel_pmc_ipc.h
+ create mode 100644 include/linux/usb/mctp-usb.h
+ create mode 100644 include/net/netdev_lock.h
+ create mode 100644 include/net/netdev_netlink.h
+ create mode 100644 include/net/page_pool/memory_provider.h
+ rename lib/{test_blackhole_dev.c => blackhole_dev_kunit.c} (68%)
+ create mode 100644 net/core/dev_api.c
+ create mode 100644 net/hsr/prp_dup_discard_test.c
+ create mode 100644 net/ipv4/igmp_internal.h
+ create mode 100644 net/mac80211/tests/chan-mode.c
+ create mode 100644 net/mptcp/pm_kernel.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/net_timestamping.c
+ create mode 100644 tools/testing/selftests/bpf/progs/net_timestamping.c
+ create mode 100644 tools/testing/selftests/drivers/net/.gitignore
+ create mode 100755 tools/testing/selftests/drivers/net/hw/irq.py
+ create mode 100755 tools/testing/selftests/drivers/net/hw/rss_input_xfrm.py
+ create mode 100755 tools/testing/selftests/drivers/net/hw/tso.py
+ create mode 100644 tools/testing/selftests/drivers/net/hw/xdp_dummy.bpf.c
+ create mode 100755 tools/testing/selftests/drivers/net/netcons_fragmented_msg.sh
+ create mode 100755 tools/testing/selftests/drivers/net/netcons_sysdata.sh
+ create mode 100644 tools/testing/selftests/drivers/net/xdp_helper.c
+ create mode 100755 tools/testing/selftests/net/cmsg_ip.sh
+ delete mode 100755 tools/testing/selftests/net/cmsg_ipv6.sh
+ create mode 100755 tools/testing/selftests/net/link_netns.py
+ create mode 100644 tools/testing/selftests/net/mptcp/mptcp_diag.c
+ create mode 100644 tools/testing/selftests/net/proc_net_pktgen.c
+ create mode 100755 tools/testing/selftests/net/rtnetlink.py
+ create mode 100644 tools/testing/selftests/net/so_rcv_listener.c
+ delete mode 100755 tools/testing/selftests/net/test_blackhole_dev.sh
+ create mode 100755 tools/testing/selftests/net/test_so_rcv.sh
+Merging bpf-next/for-next (722ce03eaed9 Merge branch 'bpf-next/try_alloc_pages' into for-next)
+$ 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 include/linux/mm.h
+Auto-merging include/linux/mm_types.h
+Auto-merging include/linux/mmzone.h
+Auto-merging mm/internal.h
+Auto-merging mm/memcontrol.c
+Auto-merging mm/memory.c
+Auto-merging mm/nommu.c
+Auto-merging mm/page_alloc.c
+Auto-merging mm/page_owner.c
+CONFLICT (content): Merge conflict in mm/page_owner.c
+Auto-merging security/selinux/hooks.c
+Resolved 'mm/page_owner.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 855a4109ba36] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git
+$ git diff -M --stat --summary HEAD^..
+ Documentation/bpf/bpf_iterators.rst | 2 +-
+ Documentation/bpf/btf.rst | 25 +-
+ .../bpf/standardization/instruction-set.rst | 20 +-
+ arch/arm64/include/asm/insn.h | 12 +-
+ arch/arm64/lib/insn.c | 29 +
+ arch/arm64/net/bpf_jit.h | 20 +
+ arch/arm64/net/bpf_jit_comp.c | 92 +-
+ arch/s390/net/bpf_jit_comp.c | 14 +-
+ arch/x86/net/Makefile | 2 +-
+ arch/x86/net/bpf_jit_comp.c | 100 +-
+ arch/x86/net/bpf_timed_may_goto.S | 44 +
+ fs/bpf_fs_kfuncs.c | 225 +++-
+ include/linux/bpf-cgroup.h | 1 +
+ include/linux/bpf.h | 29 +-
+ include/linux/bpf_lsm.h | 18 +
+ include/linux/bpf_verifier.h | 32 +-
+ include/linux/btf.h | 3 +
+ include/linux/filter.h | 20 +
+ include/linux/gfp.h | 23 +
+ include/linux/local_lock.h | 70 ++
+ include/linux/local_lock_internal.h | 146 +++
+ include/linux/lsm_hook_defs.h | 6 +-
+ include/linux/mm.h | 5 +
+ include/linux/mm_types.h | 4 +
+ include/linux/mmzone.h | 3 +
+ include/linux/security.h | 12 +-
+ include/uapi/linux/bpf.h | 9 +-
+ include/uapi/linux/btf.h | 3 +-
+ include/uapi/linux/xattr.h | 4 +
+ kernel/bpf/arena.c | 9 +-
+ kernel/bpf/bpf_iter.c | 13 +-
+ kernel/bpf/bpf_lsm.c | 2 +
+ kernel/bpf/bpf_struct_ops.c | 135 +-
+ kernel/bpf/btf.c | 127 +-
+ kernel/bpf/cgroup.c | 33 +-
+ kernel/bpf/core.c | 112 +-
+ kernel/bpf/cpumask.c | 53 +
+ kernel/bpf/disasm.c | 12 +
+ kernel/bpf/hashtab.c | 6 +-
+ kernel/bpf/helpers.c | 121 +-
+ kernel/bpf/preload/bpf_preload_kern.c | 1 +
+ kernel/bpf/syscall.c | 44 +-
+ kernel/bpf/verifier.c | 1306 +++++++++++++++-----
+ kernel/trace/bpf_trace.c | 9 +-
+ lib/stackdepot.c | 10 +-
+ mm/internal.h | 1 +
+ mm/memcontrol.c | 53 +-
+ mm/memory.c | 118 ++
+ mm/nommu.c | 79 ++
+ mm/page_alloc.c | 203 ++-
+ mm/page_owner.c | 8 +-
+ net/core/filter.c | 51 +-
+ samples/bpf/Makefile | 2 +-
+ scripts/Makefile.btf | 2 +-
+ security/security.c | 15 +-
+ security/selinux/hooks.c | 6 +-
+ tools/bpf/bpftool/common.c | 3 +-
+ tools/bpf/bpftool/gen.c | 12 +-
+ tools/bpf/bpftool/link.c | 14 +-
+ tools/bpf/bpftool/main.c | 8 +-
+ tools/bpf/bpftool/map.c | 14 +-
+ tools/bpf/bpftool/prog.c | 1 +
+ tools/bpf/runqslower/Makefile | 3 +-
+ tools/include/uapi/linux/bpf.h | 9 +-
+ tools/include/uapi/linux/btf.h | 3 +-
+ tools/lib/bpf/btf.c | 90 +-
+ tools/lib/bpf/btf.h | 3 +
+ tools/lib/bpf/btf_dump.c | 5 +-
+ tools/lib/bpf/libbpf.c | 227 ++--
+ tools/lib/bpf/libbpf.h | 13 +
+ tools/lib/bpf/libbpf.map | 3 +
+ tools/lib/bpf/linker.c | 2 +-
+ tools/lib/bpf/relo_core.c | 24 +-
+ tools/lib/bpf/usdt.bpf.h | 32 +
+ tools/testing/selftests/bpf/DENYLIST.aarch64 | 9 -
+ tools/testing/selftests/bpf/Makefile | 24 +-
+ tools/testing/selftests/bpf/bpf_arena_spin_lock.h | 533 ++++++++
+ tools/testing/selftests/bpf/bpf_atomic.h | 140 +++
+ tools/testing/selftests/bpf/bpf_experimental.h | 15 +-
+ tools/testing/selftests/bpf/bpf_kfuncs.h | 5 +
+ tools/testing/selftests/bpf/cap_helpers.c | 8 +-
+ tools/testing/selftests/bpf/cap_helpers.h | 1 +
+ tools/testing/selftests/bpf/network_helpers.c | 111 +-
+ tools/testing/selftests/bpf/network_helpers.h | 21 +
+ tools/testing/selftests/bpf/prog_tests/align.c | 11 +-
+ .../selftests/bpf/prog_tests/arena_atomics.c | 66 +-
+ .../selftests/bpf/prog_tests/arena_spin_lock.c | 108 ++
+ .../selftests/bpf/prog_tests/bloom_filter_map.c | 5 +
+ tools/testing/selftests/bpf/prog_tests/bpf_iter.c | 68 +
+ tools/testing/selftests/bpf/prog_tests/bpf_nf.c | 9 +-
+ tools/testing/selftests/bpf/prog_tests/btf.c | 23 +-
+ tools/testing/selftests/bpf/prog_tests/btf_dump.c | 147 ++-
+ .../selftests/bpf/prog_tests/cgroup_preorder.c | 128 ++
+ .../testing/selftests/bpf/prog_tests/cgroup_v1v2.c | 13 +-
+ .../selftests/bpf/prog_tests/changes_pkt_data.c | 107 --
+ .../bpf/prog_tests/compute_live_registers.c | 9 +
+ .../testing/selftests/bpf/prog_tests/core_reloc.c | 6 +-
+ tools/testing/selftests/bpf/prog_tests/cpumask.c | 5 +-
+ tools/testing/selftests/bpf/prog_tests/dynptr.c | 21 +
+ tools/testing/selftests/bpf/prog_tests/fd_array.c | 4 +-
+ tools/testing/selftests/bpf/prog_tests/fs_kfuncs.c | 162 ++-
+ .../testing/selftests/bpf/prog_tests/kernel_flag.c | 43 +
+ .../selftests/bpf/prog_tests/lwt_ip_encap.c | 540 ++++++++
+ .../selftests/bpf/prog_tests/lwt_seg6local.c | 176 +++
+ .../selftests/bpf/prog_tests/netns_cookie.c | 21 +-
+ .../selftests/bpf/prog_tests/ns_current_pid_tgid.c | 49 +-
+ tools/testing/selftests/bpf/prog_tests/prepare.c | 99 ++
+ .../selftests/bpf/prog_tests/pro_epilogue.c | 2 +
+ .../selftests/bpf/prog_tests/rcu_read_lock.c | 3 +
+ .../selftests/bpf/prog_tests/read_vsyscall.c | 1 +
+ .../selftests/bpf/prog_tests/setget_sockopt.c | 2 +-
+ tools/testing/selftests/bpf/prog_tests/spin_lock.c | 3 +
+ .../selftests/bpf/prog_tests/summarization.c | 144 +++
+ tools/testing/selftests/bpf/prog_tests/tailcalls.c | 1 +
+ tools/testing/selftests/bpf/prog_tests/tc_links.c | 28 +-
+ tools/testing/selftests/bpf/prog_tests/tc_opts.c | 40 +-
+ .../bpf/prog_tests/test_struct_ops_kptr_return.c | 16 +
+ .../bpf/prog_tests/test_struct_ops_refcounted.c | 14 +
+ .../testing/selftests/bpf/prog_tests/test_tunnel.c | 633 ++++++++--
+ .../selftests/bpf/prog_tests/test_veristat.c | 139 +++
+ .../selftests/bpf/prog_tests/test_xdp_veth.c | 658 ++++++++--
+ tools/testing/selftests/bpf/prog_tests/usdt.c | 11 +-
+ tools/testing/selftests/bpf/prog_tests/verifier.c | 8 +-
+ tools/testing/selftests/bpf/progs/arena_atomics.c | 121 +-
+ .../testing/selftests/bpf/progs/arena_spin_lock.c | 51 +
+ tools/testing/selftests/bpf/progs/bpf_iter_tasks.c | 110 ++
+ tools/testing/selftests/bpf/progs/bpf_misc.h | 22 +
+ .../testing/selftests/bpf/progs/bpf_tracing_net.h | 4 +
+ ...ore_reloc_arrays___err_bad_signed_arr_elem_sz.c | 3 +
+ .../testing/selftests/bpf/progs/cgroup_preorder.c | 41 +
+ .../testing/selftests/bpf/progs/changes_pkt_data.c | 39 -
+ .../selftests/bpf/progs/compute_live_registers.c | 424 +++++++
+ .../testing/selftests/bpf/progs/connect4_dropper.c | 4 +-
+ .../testing/selftests/bpf/progs/core_reloc_types.h | 10 +
+ tools/testing/selftests/bpf/progs/cpumask_common.h | 1 +
+ .../testing/selftests/bpf/progs/cpumask_failure.c | 38 +
+ .../testing/selftests/bpf/progs/cpumask_success.c | 120 +-
+ tools/testing/selftests/bpf/progs/dynptr_success.c | 123 +-
+ tools/testing/selftests/bpf/progs/irq.c | 71 +-
+ tools/testing/selftests/bpf/progs/iters.c | 139 +++
+ .../selftests/bpf/progs/netns_cookie_prog.c | 9 +
+ tools/testing/selftests/bpf/progs/preempt_lock.c | 68 +-
+ tools/testing/selftests/bpf/progs/prepare.c | 28 +
+ .../selftests/bpf/progs/pro_epilogue_with_kfunc.c | 88 ++
+ tools/testing/selftests/bpf/progs/rcu_read_lock.c | 61 +-
+ tools/testing/selftests/bpf/progs/read_vsyscall.c | 11 +-
+ .../testing/selftests/bpf/progs/set_global_vars.c | 47 +
+ tools/testing/selftests/bpf/progs/setget_sockopt.c | 2 +
+ tools/testing/selftests/bpf/progs/strncmp_bench.c | 5 +-
+ .../selftests/bpf/progs/struct_ops_kptr_return.c | 30 +
+ .../struct_ops_kptr_return_fail__invalid_scalar.c | 26 +
+ .../struct_ops_kptr_return_fail__local_kptr.c | 34 +
+ .../struct_ops_kptr_return_fail__nonzero_offset.c | 25 +
+ .../struct_ops_kptr_return_fail__wrong_type.c | 30 +
+ .../selftests/bpf/progs/struct_ops_refcounted.c | 31 +
+ .../struct_ops_refcounted_fail__global_subprog.c | 39 +
+ .../progs/struct_ops_refcounted_fail__ref_leak.c | 22 +
+ .../progs/struct_ops_refcounted_fail__tail_call.c | 36 +
+ tools/testing/selftests/bpf/progs/summarization.c | 78 ++
+ ...kt_data_freplace.c => summarization_freplace.c} | 17 +-
+ .../selftests/bpf/progs/test_cgroup1_hierarchy.c | 4 +-
+ .../selftests/bpf/progs/test_core_reloc_arrays.c | 5 +
+ tools/testing/selftests/bpf/progs/test_get_xattr.c | 28 +-
+ .../testing/selftests/bpf/progs/test_kernel_flag.c | 28 +
+ .../selftests/bpf/progs/test_kfunc_dynptr_param.c | 6 +-
+ .../testing/selftests/bpf/progs/test_lookup_key.c | 2 +-
+ .../selftests/bpf/progs/test_ptr_untrusted.c | 2 +-
+ .../bpf/progs/test_select_reuseport_kern.c | 1 -
+ .../selftests/bpf/progs/test_set_remove_xattr.c | 133 ++
+ .../selftests/bpf/progs/test_spin_lock_fail.c | 69 ++
+ .../selftests/bpf/progs/test_task_under_cgroup.c | 2 +-
+ tools/testing/selftests/bpf/progs/test_usdt.c | 14 +
+ .../selftests/bpf/progs/test_verify_pkcs7_sig.c | 2 +-
+ .../selftests/bpf/progs/verifier_bpf_fastcall.c | 58 +-
+ tools/testing/selftests/bpf/progs/verifier_gotol.c | 6 +-
+ .../bpf/progs/verifier_iterating_callbacks.c | 6 +-
+ .../selftests/bpf/progs/verifier_load_acquire.c | 196 +++
+ .../selftests/bpf/progs/verifier_may_goto_1.c | 34 +-
+ .../selftests/bpf/progs/verifier_precision.c | 49 +
+ .../selftests/bpf/progs/verifier_stack_ptr.c | 52 +
+ .../selftests/bpf/progs/verifier_store_release.c | 264 ++++
+ .../testing/selftests/bpf/progs/xdp_redirect_map.c | 88 ++
+ .../selftests/bpf/progs/xdp_redirect_multi_kern.c | 39 +-
+ tools/testing/selftests/bpf/test_btf.h | 6 +
+ .../testing/selftests/bpf/test_kmods/bpf_testmod.c | 108 ++
+ .../testing/selftests/bpf/test_kmods/bpf_testmod.h | 6 +
+ tools/testing/selftests/bpf/test_loader.c | 32 +-
+ tools/testing/selftests/bpf/test_lwt_ip_encap.sh | 476 -------
+ tools/testing/selftests/bpf/test_lwt_seg6local.sh | 156 ---
+ tools/testing/selftests/bpf/test_maps.c | 9 +-
+ tools/testing/selftests/bpf/test_progs.c | 88 +-
+ tools/testing/selftests/bpf/test_progs.h | 8 +
+ tools/testing/selftests/bpf/test_tunnel.sh | 645 ----------
+ .../selftests/bpf/test_xdp_redirect_multi.sh | 214 ----
+ tools/testing/selftests/bpf/veristat.c | 367 +++++-
+ tools/testing/selftests/bpf/with_addr.sh | 54 -
+ tools/testing/selftests/bpf/with_tunnels.sh | 36 -
+ tools/testing/selftests/bpf/xdp_redirect_multi.c | 226 ----
+ 198 files changed, 10650 insertions(+), 3237 deletions(-)
+ create mode 100644 arch/x86/net/bpf_timed_may_goto.S
+ create mode 100644 tools/testing/selftests/bpf/bpf_arena_spin_lock.h
+ create mode 100644 tools/testing/selftests/bpf/bpf_atomic.h
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/arena_spin_lock.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/cgroup_preorder.c
+ delete mode 100644 tools/testing/selftests/bpf/prog_tests/changes_pkt_data.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/compute_live_registers.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/kernel_flag.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/lwt_ip_encap.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/lwt_seg6local.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/prepare.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/summarization.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/test_struct_ops_kptr_return.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/test_struct_ops_refcounted.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/test_veristat.c
+ create mode 100644 tools/testing/selftests/bpf/progs/arena_spin_lock.c
+ create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_arrays___err_bad_signed_arr_elem_sz.c
+ create mode 100644 tools/testing/selftests/bpf/progs/cgroup_preorder.c
+ delete mode 100644 tools/testing/selftests/bpf/progs/changes_pkt_data.c
+ create mode 100644 tools/testing/selftests/bpf/progs/compute_live_registers.c
+ create mode 100644 tools/testing/selftests/bpf/progs/prepare.c
+ create mode 100644 tools/testing/selftests/bpf/progs/pro_epilogue_with_kfunc.c
+ create mode 100644 tools/testing/selftests/bpf/progs/set_global_vars.c
+ create mode 100644 tools/testing/selftests/bpf/progs/struct_ops_kptr_return.c
+ create mode 100644 tools/testing/selftests/bpf/progs/struct_ops_kptr_return_fail__invalid_scalar.c
+ create mode 100644 tools/testing/selftests/bpf/progs/struct_ops_kptr_return_fail__local_kptr.c
+ create mode 100644 tools/testing/selftests/bpf/progs/struct_ops_kptr_return_fail__nonzero_offset.c
+ create mode 100644 tools/testing/selftests/bpf/progs/struct_ops_kptr_return_fail__wrong_type.c
+ create mode 100644 tools/testing/selftests/bpf/progs/struct_ops_refcounted.c
+ create mode 100644 tools/testing/selftests/bpf/progs/struct_ops_refcounted_fail__global_subprog.c
+ create mode 100644 tools/testing/selftests/bpf/progs/struct_ops_refcounted_fail__ref_leak.c
+ create mode 100644 tools/testing/selftests/bpf/progs/struct_ops_refcounted_fail__tail_call.c
+ create mode 100644 tools/testing/selftests/bpf/progs/summarization.c
+ rename tools/testing/selftests/bpf/progs/{changes_pkt_data_freplace.c => summarization_freplace.c} (57%)
+ create mode 100644 tools/testing/selftests/bpf/progs/test_kernel_flag.c
+ create mode 100644 tools/testing/selftests/bpf/progs/test_set_remove_xattr.c
+ create mode 100644 tools/testing/selftests/bpf/progs/verifier_load_acquire.c
+ create mode 100644 tools/testing/selftests/bpf/progs/verifier_store_release.c
+ delete mode 100755 tools/testing/selftests/bpf/test_lwt_ip_encap.sh
+ delete mode 100755 tools/testing/selftests/bpf/test_lwt_seg6local.sh
+ delete mode 100755 tools/testing/selftests/bpf/test_tunnel.sh
+ delete mode 100755 tools/testing/selftests/bpf/test_xdp_redirect_multi.sh
+ delete mode 100755 tools/testing/selftests/bpf/with_addr.sh
+ delete mode 100755 tools/testing/selftests/bpf/with_tunnels.sh
+ delete mode 100644 tools/testing/selftests/bpf/xdp_redirect_multi.c
+$ git am -3 ../patches/0001-fix-up-for-memcg-Use-trylock-to-access-memcg-stock_l.patch
+Applying: fix up for "memcg: Use trylock to access memcg stock_lock"
+$ git reset HEAD^
+Unstaged changes after reset:
+M mm/memcontrol.c
+$ git add -A .
+$ git commit -v -a --amend
+[master ba9b9042aa11] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git
+ Date: Mon Mar 17 12:52:36 2025 +1100
+Merging ipsec-next/master (2e460eefbd44 xfrm: state: make xfrm_state_lookup_byaddr lockless)
+$ 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 drivers/net/bonding/bond_main.c
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c
+Auto-merging drivers/net/netdevsim/netdevsim.h
+Auto-merging net/xfrm/xfrm_output.c
+Merge made by the 'ort' strategy.
+ Documentation/networking/xfrm_device.rst | 3 +-
+ drivers/net/bonding/bond_main.c | 16 ++-----
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 21 ---------
+ .../chelsio/inline_crypto/ch_ipsec/chcr_ipsec.c | 16 -------
+ drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c | 21 ---------
+ drivers/net/ethernet/intel/ixgbevf/ipsec.c | 21 ---------
+ .../ethernet/marvell/octeontx2/nic/cn10k_ipsec.c | 15 ------
+ .../ethernet/mellanox/mlx5/core/en_accel/ipsec.c | 16 -------
+ drivers/net/ethernet/netronome/nfp/crypto/ipsec.c | 11 -----
+ drivers/net/netdevsim/ipsec.c | 11 -----
+ drivers/net/netdevsim/netdevsim.h | 1 -
+ include/net/xfrm.h | 21 ++++++++-
+ net/xfrm/xfrm_device.c | 46 +++++++++++++-----
+ net/xfrm/xfrm_output.c | 6 ++-
+ net/xfrm/xfrm_state.c | 54 ++++++++++------------
+ net/xfrm/xfrm_user.c | 14 +++++-
+ 16 files changed, 101 insertions(+), 192 deletions(-)
+Merging mlx5-next/mlx5-next (f550694e88b7 net/mlx5: Add IFC bits for PPCNT recovery counters group)
+$ 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 (71ca3561c268 Merge branch 'mptcp-pm-code-reorganisation')
+$ 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 (4e41231249f4 Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue)
+$ 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 (5c301fb00b84 Bluetooth: hci_vhci: Mark Sync Flow Control as supported)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master
+Auto-merging drivers/bluetooth/btusb.c
+Auto-merging include/net/bluetooth/hci_core.h
+Auto-merging net/bluetooth/6lowpan.c
+Auto-merging net/bluetooth/hci_core.c
+Auto-merging net/bluetooth/hci_event.c
+Auto-merging net/bluetooth/l2cap_core.c
+Auto-merging net/bluetooth/mgmt.c
+Merge made by the 'ort' strategy.
+ .../bindings/net/bluetooth/nxp,88w8987-bt.yaml | 18 +-
+ .../bindings/net/bluetooth/qualcomm-bluetooth.yaml | 2 +
+ drivers/bluetooth/bfusb.c | 3 +-
+ drivers/bluetooth/btintel.c | 8 +
+ drivers/bluetooth/btintel.h | 1 +
+ drivers/bluetooth/btintel_pcie.c | 582 ++++++++++++++++++++-
+ drivers/bluetooth/btintel_pcie.h | 93 ++++
+ drivers/bluetooth/btnxpuart.c | 285 ++++++++--
+ drivers/bluetooth/btqca.c | 27 +-
+ drivers/bluetooth/btqca.h | 4 +
+ drivers/bluetooth/btusb.c | 36 +-
+ drivers/bluetooth/hci_ldisc.c | 19 +-
+ drivers/bluetooth/hci_qca.c | 27 +-
+ drivers/bluetooth/hci_uart.h | 1 +
+ drivers/bluetooth/hci_vhci.c | 5 +-
+ include/net/bluetooth/hci.h | 31 +-
+ include/net/bluetooth/hci_core.h | 7 +-
+ include/net/bluetooth/l2cap.h | 4 +-
+ net/bluetooth/6lowpan.c | 7 +-
+ net/bluetooth/hci_core.c | 62 +--
+ net/bluetooth/hci_event.c | 5 +
+ net/bluetooth/hci_sync.c | 32 +-
+ net/bluetooth/l2cap_core.c | 4 +-
+ net/bluetooth/mgmt.c | 46 +-
+ net/bluetooth/mgmt_util.c | 17 -
+ net/bluetooth/mgmt_util.h | 4 -
+ net/bluetooth/smp.c | 2 +-
+ 27 files changed, 1146 insertions(+), 186 deletions(-)
+Merging wireless-next/for-next (54be64fdf3ba wifi: iwlwifi: Fix uninitialized variable with __free())
+$ 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
+Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-drv.c
+Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-trans.c
+Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c
+Auto-merging net/mac80211/mlme.c
+Auto-merging net/wireless/core.c
+Auto-merging net/wireless/nl80211.c
+CONFLICT (content): Merge conflict in net/wireless/nl80211.c
+Auto-merging net/wireless/reg.c
+Resolved 'net/wireless/nl80211.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 319a387567d5] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git
+$ git diff -M --stat --summary HEAD^..
+ .../bindings/net/wireless/qcom,ath10k.yaml | 25 +-
+ .../bindings/net/wireless/qcom,ath11k-pci.yaml | 9 +-
+ .../bindings/net/wireless/qcom,ath11k.yaml | 7 +
+ .../bindings/net/wireless/qcom,ath12k-wsi.yaml | 13 +-
+ drivers/net/wireless/ath/ath10k/core.c | 13 +-
+ drivers/net/wireless/ath/ath11k/Makefile | 1 +
+ drivers/net/wireless/ath/ath11k/ahb.c | 4 +-
+ drivers/net/wireless/ath/ath11k/core.c | 11 +-
+ drivers/net/wireless/ath/ath11k/core.h | 13 +-
+ drivers/net/wireless/ath/ath11k/coredump.c | 52 +
+ drivers/net/wireless/ath/ath11k/coredump.h | 79 +
+ drivers/net/wireless/ath/ath11k/dp.c | 35 +-
+ drivers/net/wireless/ath/ath11k/dp.h | 6 +-
+ drivers/net/wireless/ath/ath11k/dp_rx.c | 133 +-
+ drivers/net/wireless/ath/ath11k/fw.c | 3 +-
+ drivers/net/wireless/ath/ath11k/hif.h | 7 +
+ drivers/net/wireless/ath/ath11k/mac.c | 145 +-
+ drivers/net/wireless/ath/ath11k/mhi.c | 5 +
+ drivers/net/wireless/ath/ath11k/mhi.h | 1 +
+ drivers/net/wireless/ath/ath11k/pci.c | 195 +-
+ drivers/net/wireless/ath/ath11k/qmi.c | 19 +-
+ drivers/net/wireless/ath/ath11k/qmi.h | 10 +-
+ drivers/net/wireless/ath/ath11k/reg.c | 107 +-
+ drivers/net/wireless/ath/ath11k/reg.h | 3 +-
+ drivers/net/wireless/ath/ath11k/testmode.c | 80 +-
+ drivers/net/wireless/ath/ath11k/wmi.c | 11 +-
+ drivers/net/wireless/ath/ath11k/wmi.h | 11 +-
+ drivers/net/wireless/ath/ath12k/Makefile | 3 +-
+ drivers/net/wireless/ath/ath12k/acpi.c | 202 +-
+ drivers/net/wireless/ath/ath12k/acpi.h | 40 +-
+ drivers/net/wireless/ath/ath12k/core.c | 103 +-
+ drivers/net/wireless/ath/ath12k/core.h | 139 +-
+ drivers/net/wireless/ath/ath12k/debug.c | 6 +-
+ drivers/net/wireless/ath/ath12k/debug.h | 10 +-
+ drivers/net/wireless/ath/ath12k/debugfs.c | 1191 ++++++++-
+ drivers/net/wireless/ath/ath12k/debugfs.h | 115 +-
+ .../net/wireless/ath/ath12k/debugfs_htt_stats.c | 1238 ++++++++-
+ .../net/wireless/ath/ath12k/debugfs_htt_stats.h | 453 +++-
+ drivers/net/wireless/ath/ath12k/debugfs_sta.c | 337 +++
+ drivers/net/wireless/ath/ath12k/debugfs_sta.h | 24 +
+ drivers/net/wireless/ath/ath12k/dp.c | 5 +-
+ drivers/net/wireless/ath/ath12k/dp.h | 82 +-
+ drivers/net/wireless/ath/ath12k/dp_mon.c | 1425 ++++++++---
+ drivers/net/wireless/ath/ath12k/dp_mon.h | 11 +-
+ drivers/net/wireless/ath/ath12k/dp_rx.c | 66 +-
+ drivers/net/wireless/ath/ath12k/dp_rx.h | 8 +-
+ drivers/net/wireless/ath/ath12k/dp_tx.c | 253 +-
+ drivers/net/wireless/ath/ath12k/dp_tx.h | 4 +-
+ drivers/net/wireless/ath/ath12k/hal_desc.h | 5 +-
+ drivers/net/wireless/ath/ath12k/hal_rx.h | 442 +++-
+ drivers/net/wireless/ath/ath12k/hal_tx.h | 10 +-
+ drivers/net/wireless/ath/ath12k/hw.c | 8 +-
+ drivers/net/wireless/ath/ath12k/mac.c | 870 +++++--
+ drivers/net/wireless/ath/ath12k/mac.h | 10 +-
+ drivers/net/wireless/ath/ath12k/pci.c | 22 +-
+ drivers/net/wireless/ath/ath12k/qmi.c | 23 +-
+ drivers/net/wireless/ath/ath12k/reg.h | 5 +-
+ drivers/net/wireless/ath/ath12k/rx_desc.h | 12 +-
+ drivers/net/wireless/ath/ath12k/testmode.c | 395 +++
+ drivers/net/wireless/ath/ath12k/testmode.h | 40 +
+ drivers/net/wireless/ath/ath12k/wmi.c | 1176 ++++++++-
+ drivers/net/wireless/ath/ath12k/wmi.h | 290 ++-
+ drivers/net/wireless/ath/ath12k/wow.c | 3 +-
+ drivers/net/wireless/ath/ath9k/ath9k.h | 3 +-
+ drivers/net/wireless/ath/ath9k/common-spectral.c | 4 +-
+ drivers/net/wireless/ath/ath9k/init.c | 4 +-
+ drivers/net/wireless/ath/ath9k/xmit.c | 9 -
+ drivers/net/wireless/ath/{ath11k => }/testmode_i.h | 54 +-
+ drivers/net/wireless/intel/iwlegacy/4965-rs.c | 3 +
+ drivers/net/wireless/intel/iwlwifi/Kconfig | 15 +-
+ drivers/net/wireless/intel/iwlwifi/Makefile | 5 +-
+ drivers/net/wireless/intel/iwlwifi/cfg/bz.c | 11 +-
+ drivers/net/wireless/intel/iwlwifi/cfg/dr.c | 6 +-
+ drivers/net/wireless/intel/iwlwifi/cfg/sc.c | 8 +-
+ drivers/net/wireless/intel/iwlwifi/fw/api/debug.h | 42 +-
+ drivers/net/wireless/intel/iwlwifi/fw/api/phy.h | 4 +-
+ drivers/net/wireless/intel/iwlwifi/fw/uefi.c | 10 +-
+ drivers/net/wireless/intel/iwlwifi/fw/uefi.h | 4 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-config.h | 7 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c | 10 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 28 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 12 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-trans.c | 5 +-
+ drivers/net/wireless/intel/iwlwifi/mld/Makefile | 16 +
+ drivers/net/wireless/intel/iwlwifi/mld/agg.c | 670 +++++
+ drivers/net/wireless/intel/iwlwifi/mld/agg.h | 127 +
+ drivers/net/wireless/intel/iwlwifi/mld/ap.c | 344 +++
+ drivers/net/wireless/intel/iwlwifi/mld/ap.h | 45 +
+ drivers/net/wireless/intel/iwlwifi/mld/coex.c | 40 +
+ drivers/net/wireless/intel/iwlwifi/mld/coex.h | 15 +
+ drivers/net/wireless/intel/iwlwifi/mld/constants.h | 88 +
+ drivers/net/wireless/intel/iwlwifi/mld/d3.c | 1998 +++++++++++++++
+ drivers/net/wireless/intel/iwlwifi/mld/d3.h | 51 +
+ drivers/net/wireless/intel/iwlwifi/mld/debugfs.c | 823 ++++++
+ drivers/net/wireless/intel/iwlwifi/mld/debugfs.h | 200 ++
+ .../net/wireless/intel/iwlwifi/mld/ftm-initiator.c | 451 ++++
+ .../net/wireless/intel/iwlwifi/mld/ftm-initiator.h | 29 +
+ drivers/net/wireless/intel/iwlwifi/mld/fw.c | 536 ++++
+ drivers/net/wireless/intel/iwlwifi/mld/hcmd.h | 56 +
+ drivers/net/wireless/intel/iwlwifi/mld/iface.c | 671 +++++
+ drivers/net/wireless/intel/iwlwifi/mld/iface.h | 236 ++
+ drivers/net/wireless/intel/iwlwifi/mld/key.c | 358 +++
+ drivers/net/wireless/intel/iwlwifi/mld/key.h | 39 +
+ drivers/net/wireless/intel/iwlwifi/mld/led.c | 100 +
+ drivers/net/wireless/intel/iwlwifi/mld/led.h | 29 +
+ drivers/net/wireless/intel/iwlwifi/mld/link.c | 1216 +++++++++
+ drivers/net/wireless/intel/iwlwifi/mld/link.h | 153 ++
+ .../net/wireless/intel/iwlwifi/mld/low_latency.c | 335 +++
+ .../net/wireless/intel/iwlwifi/mld/low_latency.h | 68 +
+ drivers/net/wireless/intel/iwlwifi/mld/mac80211.c | 2678 ++++++++++++++++++++
+ drivers/net/wireless/intel/iwlwifi/mld/mac80211.h | 13 +
+ drivers/net/wireless/intel/iwlwifi/mld/mcc.c | 329 +++
+ drivers/net/wireless/intel/iwlwifi/mld/mcc.h | 17 +
+ drivers/net/wireless/intel/iwlwifi/mld/mld.c | 720 ++++++
+ drivers/net/wireless/intel/iwlwifi/mld/mld.h | 583 +++++
+ drivers/net/wireless/intel/iwlwifi/mld/mlo.c | 999 ++++++++
+ drivers/net/wireless/intel/iwlwifi/mld/mlo.h | 154 ++
+ drivers/net/wireless/intel/iwlwifi/mld/notif.c | 758 ++++++
+ drivers/net/wireless/intel/iwlwifi/mld/notif.h | 35 +
+ drivers/net/wireless/intel/iwlwifi/mld/phy.c | 155 ++
+ drivers/net/wireless/intel/iwlwifi/mld/phy.h | 55 +
+ drivers/net/wireless/intel/iwlwifi/mld/power.c | 396 +++
+ drivers/net/wireless/intel/iwlwifi/mld/power.h | 33 +
+ drivers/net/wireless/intel/iwlwifi/mld/ptp.c | 321 +++
+ drivers/net/wireless/intel/iwlwifi/mld/ptp.h | 45 +
+ .../net/wireless/intel/iwlwifi/mld/regulatory.c | 393 +++
+ .../net/wireless/intel/iwlwifi/mld/regulatory.h | 23 +
+ drivers/net/wireless/intel/iwlwifi/mld/roc.c | 224 ++
+ drivers/net/wireless/intel/iwlwifi/mld/roc.h | 20 +
+ drivers/net/wireless/intel/iwlwifi/mld/rx.c | 2060 +++++++++++++++
+ drivers/net/wireless/intel/iwlwifi/mld/rx.h | 72 +
+ drivers/net/wireless/intel/iwlwifi/mld/scan.c | 2008 +++++++++++++++
+ drivers/net/wireless/intel/iwlwifi/mld/scan.h | 136 +
+ .../wireless/intel/iwlwifi/mld/session-protect.c | 222 ++
+ .../wireless/intel/iwlwifi/mld/session-protect.h | 102 +
+ drivers/net/wireless/intel/iwlwifi/mld/sta.c | 1289 ++++++++++
+ drivers/net/wireless/intel/iwlwifi/mld/sta.h | 266 ++
+ drivers/net/wireless/intel/iwlwifi/mld/stats.c | 513 ++++
+ drivers/net/wireless/intel/iwlwifi/mld/stats.h | 22 +
+ .../net/wireless/intel/iwlwifi/mld/tests/Makefile | 5 +
+ drivers/net/wireless/intel/iwlwifi/mld/tests/agg.c | 663 +++++
+ .../net/wireless/intel/iwlwifi/mld/tests/hcmd.c | 62 +
+ .../intel/iwlwifi/mld/tests/link-selection.c | 171 ++
+ .../net/wireless/intel/iwlwifi/mld/tests/link.c | 103 +
+ .../net/wireless/intel/iwlwifi/mld/tests/module.c | 11 +
+ drivers/net/wireless/intel/iwlwifi/mld/tests/rx.c | 353 +++
+ .../net/wireless/intel/iwlwifi/mld/tests/utils.c | 476 ++++
+ .../net/wireless/intel/iwlwifi/mld/tests/utils.h | 124 +
+ drivers/net/wireless/intel/iwlwifi/mld/thermal.c | 438 ++++
+ drivers/net/wireless/intel/iwlwifi/mld/thermal.h | 36 +
+ drivers/net/wireless/intel/iwlwifi/mld/time_sync.c | 240 ++
+ drivers/net/wireless/intel/iwlwifi/mld/time_sync.h | 26 +
+ drivers/net/wireless/intel/iwlwifi/mld/tlc.c | 700 +++++
+ drivers/net/wireless/intel/iwlwifi/mld/tlc.h | 23 +
+ drivers/net/wireless/intel/iwlwifi/mld/tx.c | 1374 ++++++++++
+ drivers/net/wireless/intel/iwlwifi/mld/tx.h | 77 +
+ drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 38 +-
+ .../net/wireless/intel/iwlwifi/mvm/ftm-initiator.c | 4 +
+ drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 15 +
+ .../net/wireless/intel/iwlwifi/mvm/mld-mac80211.c | 3 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 3 +
+ drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 30 +-
+ drivers/net/wireless/marvell/mwifiex/cfp.c | 2 +-
+ drivers/net/wireless/silabs/wfx/bus.h | 1 +
+ drivers/net/wireless/silabs/wfx/bus_sdio.c | 54 +
+ drivers/net/wireless/silabs/wfx/bus_spi.c | 47 +-
+ drivers/net/wireless/silabs/wfx/main.c | 14 +
+ drivers/net/wireless/silabs/wfx/sta.c | 25 +
+ drivers/net/wireless/silabs/wfx/sta.h | 3 +
+ drivers/net/wireless/virtual/mac80211_hwsim.c | 14 +-
+ drivers/net/wireless/virtual/virt_wifi.c | 2 +-
+ drivers/net/wireless/zydas/zd1211rw/zd_mac.c | 2 +-
+ include/net/cfg80211.h | 40 +-
+ include/uapi/linux/nl80211.h | 68 +-
+ net/mac80211/cfg.c | 7 +-
+ net/mac80211/ieee80211_i.h | 13 +-
+ net/mac80211/mlme.c | 138 +-
+ net/mac80211/wbrf.c | 3 +-
+ net/wireless/chan.c | 13 +-
+ net/wireless/core.c | 3 +-
+ net/wireless/core.h | 6 +-
+ net/wireless/mlme.c | 17 +-
+ net/wireless/nl80211.c | 40 +-
+ net/wireless/rdev-ops.h | 10 +-
+ net/wireless/reg.c | 4 +-
+ net/wireless/trace.h | 17 +-
+ net/wireless/util.c | 4 +-
+ 187 files changed, 37791 insertions(+), 1334 deletions(-)
+ create mode 100644 drivers/net/wireless/ath/ath11k/coredump.c
+ create mode 100644 drivers/net/wireless/ath/ath11k/coredump.h
+ create mode 100644 drivers/net/wireless/ath/ath12k/debugfs_sta.c
+ create mode 100644 drivers/net/wireless/ath/ath12k/debugfs_sta.h
+ create mode 100644 drivers/net/wireless/ath/ath12k/testmode.c
+ create mode 100644 drivers/net/wireless/ath/ath12k/testmode.h
+ rename drivers/net/wireless/ath/{ath11k => }/testmode_i.h (50%)
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/Makefile
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/agg.c
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/agg.h
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/ap.c
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/ap.h
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/coex.c
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/coex.h
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/constants.h
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/d3.c
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/d3.h
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/debugfs.c
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/debugfs.h
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/ftm-initiator.c
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/ftm-initiator.h
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/fw.c
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/hcmd.h
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/iface.c
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/iface.h
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/key.c
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/key.h
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/led.c
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/led.h
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/link.c
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/link.h
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/low_latency.c
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/low_latency.h
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/mac80211.c
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/mac80211.h
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/mcc.c
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/mcc.h
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/mld.c
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/mld.h
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/mlo.c
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/mlo.h
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/notif.c
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/notif.h
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/phy.c
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/phy.h
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/power.c
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/power.h
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/ptp.c
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/ptp.h
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/regulatory.c
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/regulatory.h
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/roc.c
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/roc.h
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/rx.c
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/rx.h
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/scan.c
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/scan.h
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/session-protect.c
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/session-protect.h
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/sta.c
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/sta.h
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/stats.c
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/stats.h
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/tests/Makefile
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/tests/agg.c
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/tests/hcmd.c
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/tests/link-selection.c
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/tests/link.c
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/tests/module.c
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/tests/rx.c
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/tests/utils.c
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/tests/utils.h
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/thermal.c
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/thermal.h
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/time_sync.c
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/time_sync.h
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/tlc.c
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/tlc.h
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/tx.c
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/tx.h
+Merging ath-next/for-next (0e28ee106c46 Merge tag 'ath-next-20250305' of git://git.kernel.org/pub/scm/linux/kernel/git/ath/ath)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git ath-next/for-next
+Already up to date.
+Merging wpan-next/master (a5d4d993fac4 dt-bindings: ieee802154: ca8210: Update polarity of the reset pin)
+$ 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.
+ .../devicetree/bindings/net/ieee802154/ca8210.txt | 2 +-
+ drivers/gpio/gpiolib-of.c | 9 +++
+ drivers/net/ieee802154/ca8210.c | 78 +++++++++-------------
+ 3 files changed, 41 insertions(+), 48 deletions(-)
+Merging wpan-staging/staging (a5d4d993fac4 dt-bindings: ieee802154: ca8210: Update polarity of the reset pin)
+$ 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 (2a6a44555f07 mtd: Fix error handling in mtd_device_parse_register() error path)
+$ 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.
+ Documentation/devicetree/bindings/mtd/mtd-physmap.yaml | 5 +++--
+ drivers/mtd/mtdcore.c | 14 ++++++++++----
+ drivers/mtd/mtdpstore.c | 12 ++++++------
+ 3 files changed, 19 insertions(+), 12 deletions(-)
+Merging nand/nand/next (ddc210cf8b8a mtd: rawnand: brcmnand: fix PM resume warning)
+$ 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 drivers/mtd/nand/raw/qcom_nandc.c
+Merge made by the 'ort' strategy.
+ .../bindings/mtd/arasan,nand-controller.yaml | 2 +-
+ .../devicetree/bindings/mtd/mxc-nand.yaml | 8 +-
+ drivers/mtd/nand/raw/brcmnand/brcmnand.c | 2 +-
+ drivers/mtd/nand/raw/nand_base.c | 4 +-
+ drivers/mtd/nand/raw/qcom_nandc.c | 36 +-
+ drivers/mtd/nand/spi/Makefile | 3 +-
+ drivers/mtd/nand/spi/core.c | 85 ++++-
+ drivers/mtd/nand/spi/esmt.c | 90 ++++-
+ drivers/mtd/nand/spi/macronix.c | 79 ++++-
+ drivers/mtd/nand/spi/micron.c | 135 +++++++-
+ drivers/mtd/nand/spi/otp.c | 362 +++++++++++++++++++++
+ include/linux/mtd/nand-qpic-common.h | 6 +-
+ include/linux/mtd/spinand.h | 125 +++++++
+ 13 files changed, 883 insertions(+), 54 deletions(-)
+ create mode 100644 drivers/mtd/nand/spi/otp.c
+Merging spi-nor/spi-nor/next (93020292fea7 mtd: spi-nor: explicitly include <linux/math64.h>)
+$ 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.
+ drivers/mtd/spi-nor/core.c | 75 ++++++++++++-----------------------
+ drivers/mtd/spi-nor/macronix.c | 31 +++++++++++++++
+ drivers/mtd/spi-nor/otp.c | 1 +
+ drivers/mtd/spi-nor/swp.c | 1 +
+ drivers/mtd/spi-nor/winbond.c | 88 ++++++++++++++++++++++++++++++++++++++++++
+ 5 files changed, 145 insertions(+), 51 deletions(-)
+Merging crypto/master (d2d072a313c1 crypto: testmgr - Remove NULL dst acomp tests)
+$ 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
+Merge made by the 'ort' strategy.
+ Documentation/crypto/index.rst | 1 +
+ Documentation/crypto/krb5.rst | 262 +++++++
+ .../devicetree/bindings/crypto/fsl,sec2.0.yaml | 144 ++++
+ .../devicetree/bindings/crypto/fsl-sec2.txt | 65 --
+ .../crypto/inside-secure,safexcel-eip93.yaml | 67 ++
+ .../bindings/crypto/inside-secure,safexcel.yaml | 2 +
+ .../devicetree/bindings/crypto/qcom,prng.yaml | 1 +
+ .../devicetree/bindings/crypto/qcom-qce.yaml | 1 +
+ .../bindings/rng/rockchip,rk3588-rng.yaml | 59 ++
+ MAINTAINERS | 39 +
+ arch/arm/crypto/Kconfig | 10 +-
+ arch/arm/crypto/aes-ce-glue.c | 2 +-
+ arch/arm/crypto/ghash-ce-glue.c | 16 +-
+ arch/arm64/crypto/Kconfig | 6 +-
+ arch/arm64/crypto/aes-ce-ccm-glue.c | 20 +-
+ arch/arm64/crypto/aes-neonbs-glue.c | 3 +-
+ arch/arm64/crypto/ghash-ce-glue.c | 17 +-
+ arch/arm64/crypto/sm4-ce-ccm-glue.c | 27 +-
+ arch/arm64/crypto/sm4-ce-gcm-glue.c | 31 +-
+ arch/mips/crypto/Kconfig | 7 +-
+ arch/powerpc/crypto/Kconfig | 7 +-
+ arch/powerpc/crypto/aes-gcm-p10-glue.c | 6 +-
+ arch/powerpc/crypto/aes_ctr.c | 2 +-
+ arch/riscv/crypto/Kconfig | 1 -
+ arch/s390/crypto/Kconfig | 3 +-
+ arch/s390/crypto/aes_s390.c | 46 +-
+ arch/sparc/crypto/aes_glue.c | 2 +-
+ arch/x86/crypto/Kconfig | 11 +-
+ arch/x86/crypto/Makefile | 2 +-
+ arch/x86/crypto/aegis128-aesni-glue.c | 9 +-
+ arch/x86/crypto/aes-ctr-avx-x86_64.S | 592 ++++++++++++++
+ arch/x86/crypto/aes-xts-avx-x86_64.S | 55 +-
+ arch/x86/crypto/aes_ctrby8_avx-x86_64.S | 597 --------------
+ arch/x86/crypto/aesni-intel_glue.c | 461 +++++------
+ arch/x86/crypto/des3_ede_glue.c | 2 +-
+ arch/x86/crypto/ghash-clmulni-intel_glue.c | 23 +-
+ crypto/842.c | 8 +-
+ crypto/Kconfig | 16 +
+ crypto/Makefile | 3 +
+ crypto/acompress.c | 203 ++++-
+ crypto/aead.c | 5 +-
+ crypto/aegis128-core.c | 9 +-
+ crypto/ahash.c | 575 ++++++++++++--
+ crypto/algapi.c | 2 +-
+ crypto/api.c | 27 +-
+ crypto/asymmetric_keys/public_key.c | 9 +-
+ crypto/async_tx/async_xor.c | 26 -
+ crypto/bpf_crypto_skcipher.c | 1 +
+ crypto/compress.h | 2 -
+ crypto/crypto_null.c | 37 +-
+ crypto/ctr.c | 10 +-
+ crypto/deflate.c | 4 +-
+ crypto/ecc.c | 2 +-
+ crypto/ecdsa-p1363.c | 2 +-
+ crypto/ecdsa-x962.c | 4 +-
+ crypto/internal.h | 20 +-
+ crypto/krb5/Kconfig | 26 +
+ crypto/krb5/Makefile | 18 +
+ crypto/krb5/internal.h | 247 ++++++
+ crypto/krb5/krb5_api.c | 452 +++++++++++
+ crypto/krb5/krb5_kdf.c | 145 ++++
+ crypto/krb5/rfc3961_simplified.c | 797 +++++++++++++++++++
+ crypto/krb5/rfc3962_aes.c | 115 +++
+ crypto/krb5/rfc6803_camellia.c | 237 ++++++
+ crypto/krb5/rfc8009_aes2.c | 362 +++++++++
+ crypto/krb5/selftest.c | 544 +++++++++++++
+ crypto/krb5/selftest_data.c | 291 +++++++
+ crypto/krb5enc.c | 504 ++++++++++++
+ crypto/lrw.c | 2 +-
+ crypto/lz4.c | 8 +-
+ crypto/lz4hc.c | 8 +-
+ crypto/lzo-rle.c | 10 +-
+ crypto/lzo.c | 10 +-
+ crypto/pcbc.c | 28 +-
+ crypto/rsassa-pkcs1.c | 2 +-
+ crypto/scatterwalk.c | 126 ++-
+ crypto/scompress.c | 94 ++-
+ crypto/skcipher.c | 139 ++--
+ crypto/tcrypt.c | 231 ++++++
+ crypto/testmgr.c | 52 +-
+ crypto/testmgr.h | 351 +++++++++
+ crypto/xctr.c | 2 +-
+ crypto/xts.c | 2 +-
+ crypto/zstd.c | 4 +-
+ drivers/char/hw_random/Kconfig | 21 +-
+ drivers/char/hw_random/imx-rngc.c | 69 +-
+ drivers/char/hw_random/rockchip-rng.c | 254 +++++-
+ drivers/crypto/Kconfig | 1 +
+ drivers/crypto/Makefile | 2 +-
+ drivers/crypto/axis/artpec6_crypto.c | 4 +-
+ drivers/crypto/bcm/cipher.c | 27 +-
+ drivers/crypto/bcm/spu2.c | 3 +-
+ drivers/crypto/caam/caamalg_qi2.c | 3 +-
+ drivers/crypto/cavium/zip/zip_crypto.c | 6 +-
+ drivers/crypto/cavium/zip/zip_crypto.h | 6 +-
+ drivers/crypto/ccp/sp-pci.c | 16 +-
+ drivers/crypto/hisilicon/hpre/hpre_crypto.c | 7 +
+ drivers/crypto/hisilicon/sec2/sec.h | 1 -
+ drivers/crypto/hisilicon/sec2/sec_crypto.c | 125 ++-
+ drivers/crypto/inside-secure/Makefile | 1 +
+ drivers/crypto/inside-secure/eip93/Kconfig | 20 +
+ drivers/crypto/inside-secure/eip93/Makefile | 5 +
+ drivers/crypto/inside-secure/eip93/eip93-aead.c | 711 +++++++++++++++++
+ drivers/crypto/inside-secure/eip93/eip93-aead.h | 38 +
+ drivers/crypto/inside-secure/eip93/eip93-aes.h | 16 +
+ drivers/crypto/inside-secure/eip93/eip93-cipher.c | 413 ++++++++++
+ drivers/crypto/inside-secure/eip93/eip93-cipher.h | 60 ++
+ drivers/crypto/inside-secure/eip93/eip93-common.c | 822 +++++++++++++++++++
+ drivers/crypto/inside-secure/eip93/eip93-common.h | 24 +
+ drivers/crypto/inside-secure/eip93/eip93-des.h | 16 +
+ drivers/crypto/inside-secure/eip93/eip93-hash.c | 866 +++++++++++++++++++++
+ drivers/crypto/inside-secure/eip93/eip93-hash.h | 82 ++
+ drivers/crypto/inside-secure/eip93/eip93-main.c | 501 ++++++++++++
+ drivers/crypto/inside-secure/eip93/eip93-main.h | 151 ++++
+ drivers/crypto/inside-secure/eip93/eip93-regs.h | 335 ++++++++
+ drivers/crypto/intel/iaa/iaa_crypto_main.c | 4 +-
+ drivers/crypto/intel/qat/qat_420xx/Makefile | 2 +-
+ .../crypto/intel/qat/qat_420xx/adf_420xx_hw_data.c | 16 +-
+ drivers/crypto/intel/qat/qat_4xxx/Makefile | 2 +-
+ .../crypto/intel/qat/qat_4xxx/adf_4xxx_hw_data.c | 11 +-
+ drivers/crypto/intel/qat/qat_c3xxx/Makefile | 2 +-
+ drivers/crypto/intel/qat/qat_c3xxxvf/Makefile | 2 +-
+ drivers/crypto/intel/qat/qat_c62x/Makefile | 2 +-
+ drivers/crypto/intel/qat/qat_c62xvf/Makefile | 2 +-
+ drivers/crypto/intel/qat/qat_common/Makefile | 68 +-
+ .../intel/qat/qat_common/adf_accel_devices.h | 1 +
+ .../crypto/intel/qat/qat_common/adf_cfg_services.c | 167 +++-
+ .../crypto/intel/qat/qat_common/adf_cfg_services.h | 28 +-
+ .../crypto/intel/qat/qat_common/adf_cfg_strings.h | 6 +-
+ .../crypto/intel/qat/qat_common/adf_gen4_config.c | 15 +-
+ .../crypto/intel/qat/qat_common/adf_gen4_hw_data.c | 26 +-
+ .../crypto/intel/qat/qat_common/adf_gen4_hw_data.h | 1 +
+ drivers/crypto/intel/qat/qat_common/adf_sysfs.c | 22 +-
+ .../crypto/intel/qat/qat_common/icp_qat_fw_comp.h | 4 +-
+ drivers/crypto/intel/qat/qat_dh895xcc/Makefile | 2 +-
+ drivers/crypto/intel/qat/qat_dh895xccvf/Makefile | 2 +-
+ drivers/crypto/marvell/octeontx/otx_cptpf_ucode.c | 16 +-
+ drivers/crypto/marvell/octeontx/otx_cptpf_ucode.h | 2 -
+ .../crypto/marvell/octeontx2/otx2_cptpf_ucode.c | 100 +--
+ .../crypto/marvell/octeontx2/otx2_cptpf_ucode.h | 1 -
+ .../crypto/marvell/octeontx2/otx2_cptvf_reqmgr.c | 7 +-
+ drivers/crypto/mxs-dcp.c | 8 +-
+ drivers/crypto/nx/nx-aes-ccm.c | 16 +-
+ drivers/crypto/nx/nx-aes-gcm.c | 17 +-
+ drivers/crypto/nx/nx.c | 34 +-
+ drivers/crypto/nx/nx.h | 3 -
+ drivers/crypto/s5p-sss.c | 38 +-
+ drivers/crypto/stm32/stm32-cryp.c | 34 +-
+ drivers/crypto/tegra/tegra-se-aes.c | 401 ++++++----
+ drivers/crypto/tegra/tegra-se-hash.c | 287 ++++---
+ drivers/crypto/tegra/tegra-se-key.c | 29 +-
+ drivers/crypto/tegra/tegra-se-main.c | 16 +-
+ drivers/crypto/tegra/tegra-se.h | 39 +-
+ .../crypto/virtio/virtio_crypto_akcipher_algs.c | 41 +-
+ drivers/crypto/virtio/virtio_crypto_core.c | 6 +-
+ drivers/crypto/virtio/virtio_crypto_mgr.c | 2 +-
+ .../crypto/virtio/virtio_crypto_skcipher_algs.c | 17 +-
+ include/crypto/acompress.h | 228 +++++-
+ include/crypto/algapi.h | 33 +-
+ include/crypto/authenc.h | 2 +
+ include/crypto/ctr.h | 2 +-
+ include/crypto/hash.h | 72 +-
+ include/crypto/internal/acompress.h | 59 +-
+ include/crypto/internal/hash.h | 15 +
+ include/crypto/internal/scompress.h | 16 +-
+ include/crypto/internal/skcipher.h | 40 +-
+ include/crypto/krb5.h | 160 ++++
+ include/crypto/scatterwalk.h | 219 ++++--
+ include/crypto/sig.h | 5 +-
+ include/crypto/skcipher.h | 19 +-
+ include/dt-bindings/reset/rockchip,rk3588-cru.h | 41 +-
+ include/linux/async_tx.h | 5 -
+ include/linux/crypto.h | 24 +
+ include/linux/lzo.h | 8 +
+ include/linux/math.h | 12 +
+ include/linux/spinlock.h | 13 +
+ include/uapi/linux/psp-sev.h | 21 +-
+ lib/842/842_compress.c | 2 +
+ lib/crypto/Kconfig | 37 +-
+ lib/crypto/chacha20poly1305.c | 7 +-
+ lib/lzo/Makefile | 2 +-
+ lib/lzo/lzo1x_compress.c | 102 ++-
+ lib/lzo/lzo1x_compress_safe.c | 18 +
+ net/tls/tls_device_fallback.c | 31 +-
+ 184 files changed, 13191 insertions(+), 2478 deletions(-)
+ create mode 100644 Documentation/crypto/krb5.rst
+ create mode 100644 Documentation/devicetree/bindings/crypto/fsl,sec2.0.yaml
+ delete mode 100644 Documentation/devicetree/bindings/crypto/fsl-sec2.txt
+ create mode 100644 Documentation/devicetree/bindings/crypto/inside-secure,safexcel-eip93.yaml
+ create mode 100644 Documentation/devicetree/bindings/rng/rockchip,rk3588-rng.yaml
+ create mode 100644 arch/x86/crypto/aes-ctr-avx-x86_64.S
+ delete mode 100644 arch/x86/crypto/aes_ctrby8_avx-x86_64.S
+ create mode 100644 crypto/krb5/Kconfig
+ create mode 100644 crypto/krb5/Makefile
+ create mode 100644 crypto/krb5/internal.h
+ create mode 100644 crypto/krb5/krb5_api.c
+ create mode 100644 crypto/krb5/krb5_kdf.c
+ create mode 100644 crypto/krb5/rfc3961_simplified.c
+ create mode 100644 crypto/krb5/rfc3962_aes.c
+ create mode 100644 crypto/krb5/rfc6803_camellia.c
+ create mode 100644 crypto/krb5/rfc8009_aes2.c
+ create mode 100644 crypto/krb5/selftest.c
+ create mode 100644 crypto/krb5/selftest_data.c
+ create mode 100644 crypto/krb5enc.c
+ create mode 100644 drivers/crypto/inside-secure/eip93/Kconfig
+ create mode 100644 drivers/crypto/inside-secure/eip93/Makefile
+ create mode 100644 drivers/crypto/inside-secure/eip93/eip93-aead.c
+ create mode 100644 drivers/crypto/inside-secure/eip93/eip93-aead.h
+ create mode 100644 drivers/crypto/inside-secure/eip93/eip93-aes.h
+ create mode 100644 drivers/crypto/inside-secure/eip93/eip93-cipher.c
+ create mode 100644 drivers/crypto/inside-secure/eip93/eip93-cipher.h
+ create mode 100644 drivers/crypto/inside-secure/eip93/eip93-common.c
+ create mode 100644 drivers/crypto/inside-secure/eip93/eip93-common.h
+ create mode 100644 drivers/crypto/inside-secure/eip93/eip93-des.h
+ create mode 100644 drivers/crypto/inside-secure/eip93/eip93-hash.c
+ create mode 100644 drivers/crypto/inside-secure/eip93/eip93-hash.h
+ create mode 100644 drivers/crypto/inside-secure/eip93/eip93-main.c
+ create mode 100644 drivers/crypto/inside-secure/eip93/eip93-main.h
+ create mode 100644 drivers/crypto/inside-secure/eip93/eip93-regs.h
+ create mode 100644 include/crypto/krb5.h
+ create mode 100644 lib/lzo/lzo1x_compress_safe.c
+Merging drm/drm-next (d115a38f3c07 Merge tag 'drm-intel-gt-next-2025-02-26' of https://gitlab.freedesktop.org/drm/i915/kernel into drm-next)
+$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/drm/kernel.git drm/drm-next
+Auto-merging .mailmap
+Auto-merging CREDITS
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml
+Auto-merging MAINTAINERS
+Auto-merging arch/parisc/configs/generic-64bit_defconfig
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/vce_v2_0.c
+Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
+Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c
+Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c
+Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
+Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_resource.c
+Auto-merging drivers/gpu/drm/display/drm_dp_mst_topology.c
+Auto-merging drivers/gpu/drm/drm_atomic_uapi.c
+Auto-merging drivers/gpu/drm/drm_panic_qr.rs
+Auto-merging drivers/gpu/drm/i915/display/intel_display.c
+Auto-merging drivers/gpu/drm/nouveau/nouveau_svm.c
+Auto-merging drivers/gpu/drm/scheduler/sched_entity.c
+Auto-merging drivers/gpu/drm/v3d/v3d_sched.c
+Auto-merging drivers/gpu/drm/xe/xe_guc_pc.c
+Auto-merging drivers/gpu/drm/xe/xe_guc_submit.c
+Auto-merging drivers/gpu/drm/xe/xe_pm.c
+Auto-merging drivers/gpu/drm/xe/xe_vm.c
+Auto-merging include/linux/migrate.h
+Auto-merging mm/memory.c
+CONFLICT (content): Merge conflict in mm/memory.c
+Auto-merging mm/migrate_device.c
+Resolved 'mm/memory.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 95f1a0f83309] Merge branch 'drm-next' of https://gitlab.freedesktop.org/drm/kernel.git
+$ git diff -M --stat --summary HEAD^..
+ .mailmap | 12 +-
+ CREDITS | 4 +
+ .../ABI/testing/sysfs-driver-intel-xe-hwmon | 16 +
+ .../display/apple,h7-display-pipe-mipi.yaml | 83 +
+ .../bindings/display/apple,h7-display-pipe.yaml | 88 +
+ .../bindings/display/bridge/ti,sn65dsi83.yaml | 3 +
+ .../bindings/display/msm/dsi-controller-main.yaml | 70 +-
+ .../bindings/display/msm/dsi-phy-common.yaml | 2 +
+ .../devicetree/bindings/display/msm/gmu.yaml | 1 +
+ .../bindings/display/msm/qcom,sa8775p-mdss.yaml | 32 +-
+ .../bindings/display/msm/qcom,sm8550-mdss.yaml | 14 +-
+ .../bindings/display/msm/qcom,sm8650-mdss.yaml | 13 +-
+ .../bindings/display/panel/apple,summit.yaml | 58 +
+ .../bindings/display/panel/himax,hx83102.yaml | 6 +
+ .../panel/panel-simple-lvds-dual-ports.yaml | 2 +
+ .../bindings/display/panel/panel-simple.yaml | 2 +
+ .../bindings/display/panel/raydium,rm67200.yaml | 72 +
+ .../bindings/display/panel/visionox,rm692e5.yaml | 77 +
+ .../devicetree/bindings/display/renesas,du.yaml | 36 +-
+ .../rockchip/rockchip,rk3588-dw-hdmi-qp.yaml | 3 +-
+ .../bindings/display/rockchip/rockchip-vop2.yaml | 115 +-
+ .../devicetree/bindings/gpu/arm,mali-bifrost.yaml | 1 +
+ .../devicetree/bindings/vendor-prefixes.yaml | 2 +
+ Documentation/gpu/amdgpu/amdgpu-glossary.rst | 45 +-
+ Documentation/gpu/amdgpu/display/dc-glossary.rst | 6 -
+ Documentation/gpu/drivers.rst | 2 +
+ Documentation/gpu/drm-internals.rst | 7 +
+ Documentation/gpu/drm-uapi.rst | 116 +-
+ Documentation/gpu/drm-usage-stats.rst | 5 +-
+ Documentation/gpu/nouveau.rst | 29 +
+ Documentation/gpu/nova/core/guidelines.rst | 24 +
+ Documentation/gpu/nova/core/todo.rst | 446 +
+ Documentation/gpu/nova/guidelines.rst | 69 +
+ Documentation/gpu/nova/index.rst | 30 +
+ Documentation/gpu/panthor.rst | 10 +
+ Documentation/gpu/rfc/gpusvm.rst | 107 +
+ Documentation/gpu/rfc/index.rst | 4 +
+ Kbuild | 1 +
+ MAINTAINERS | 74 +-
+ arch/arm/configs/multi_v7_defconfig | 4 +-
+ arch/parisc/configs/generic-32bit_defconfig | 4 +-
+ arch/parisc/configs/generic-64bit_defconfig | 4 +-
+ drivers/accel/amdxdna/aie2_ctx.c | 73 +-
+ drivers/accel/amdxdna/aie2_error.c | 8 +-
+ drivers/accel/amdxdna/aie2_message.c | 10 +-
+ drivers/accel/amdxdna/aie2_pci.h | 10 +-
+ drivers/accel/amdxdna/aie2_smu.c | 2 +
+ drivers/accel/amdxdna/amdxdna_ctx.c | 2 +
+ drivers/accel/amdxdna/amdxdna_ctx.h | 3 +
+ drivers/accel/amdxdna/amdxdna_mailbox.c | 23 +-
+ drivers/accel/amdxdna/amdxdna_mailbox.h | 2 +-
+ drivers/accel/amdxdna/amdxdna_mailbox_helper.c | 6 +-
+ drivers/accel/amdxdna/amdxdna_mailbox_helper.h | 2 +-
+ drivers/accel/ivpu/ivpu_debugfs.c | 89 +
+ drivers/accel/ivpu/ivpu_drv.c | 90 +-
+ drivers/accel/ivpu/ivpu_drv.h | 14 +-
+ drivers/accel/ivpu/ivpu_fw.c | 9 +-
+ drivers/accel/ivpu/ivpu_gem.c | 43 +
+ drivers/accel/ivpu/ivpu_gem.h | 1 +
+ drivers/accel/ivpu/ivpu_hw.c | 110 +-
+ drivers/accel/ivpu/ivpu_hw.h | 14 +-
+ drivers/accel/ivpu/ivpu_hw_btrs.c | 10 +-
+ drivers/accel/ivpu/ivpu_hw_btrs.h | 1 +
+ drivers/accel/ivpu/ivpu_hw_btrs_lnl_reg.h | 1 +
+ drivers/accel/ivpu/ivpu_hw_ip.c | 4 +-
+ drivers/accel/ivpu/ivpu_hw_reg_io.h | 62 +-
+ drivers/accel/ivpu/ivpu_ipc.c | 7 +-
+ drivers/accel/ivpu/ivpu_ipc.h | 2 +-
+ drivers/accel/ivpu/ivpu_job.c | 522 +-
+ drivers/accel/ivpu/ivpu_job.h | 8 +-
+ drivers/accel/ivpu/ivpu_jsm_msg.c | 29 +-
+ drivers/accel/ivpu/ivpu_mmu.c | 121 +-
+ drivers/accel/ivpu/ivpu_mmu.h | 2 +
+ drivers/accel/ivpu/ivpu_mmu_context.c | 13 -
+ drivers/accel/ivpu/ivpu_mmu_context.h | 2 -
+ drivers/accel/ivpu/ivpu_pm.c | 10 +-
+ drivers/accel/ivpu/ivpu_pm.h | 2 +-
+ drivers/accel/ivpu/ivpu_sysfs.c | 35 +-
+ drivers/accel/qaic/mhi_controller.c | 360 +-
+ drivers/accel/qaic/mhi_controller.h | 2 +-
+ drivers/accel/qaic/qaic.h | 14 +-
+ drivers/accel/qaic/qaic_drv.c | 97 +-
+ drivers/accel/qaic/qaic_timesync.c | 2 +-
+ drivers/accel/qaic/sahara.c | 43 +-
+ drivers/base/component.c | 17 +
+ drivers/base/devres.c | 12 +-
+ drivers/bus/mhi/host/boot.c | 203 +-
+ drivers/bus/mhi/host/init.c | 2 +-
+ drivers/bus/mhi/host/internal.h | 7 +
+ drivers/dma-buf/dma-fence-unwrap.c | 11 +-
+ drivers/dma-buf/st-dma-fence-unwrap.c | 268 +-
+ drivers/gpu/Makefile | 1 +
+ drivers/gpu/drm/Kconfig | 24 +-
+ drivers/gpu/drm/Makefile | 22 +-
+ drivers/gpu/drm/adp/Kconfig | 17 +
+ drivers/gpu/drm/adp/Makefile | 5 +
+ drivers/gpu/drm/adp/adp-mipi.c | 276 +
+ drivers/gpu/drm/adp/adp_drv.c | 612 +
+ drivers/gpu/drm/amd/amdgpu/Makefile | 3 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu.h | 12 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_aca.c | 49 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_aca.h | 22 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 10 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 46 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 15 +-
+ .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_aldebaran.c | 1 +
+ .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c | 3 +-
+ .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gc_9_4_3.c | 14 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | 9 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.h | 2 +
+ .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10_3.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v11.c | 9 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v12.c | 7 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 16 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.h | 2 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 116 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 44 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 18 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 20 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 8 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_cper.c | 580 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_cper.h | 105 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_dev_coredump.c | 4 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 129 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 83 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 12 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c | 25 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 110 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 12 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 7 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 23 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_i2c.c | 19 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_i2c.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h | 3 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_isp.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_isp.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 52 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c | 84 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h | 16 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 11 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 38 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 83 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 297 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 74 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.h | 20 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 128 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 6 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c | 177 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 14 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 22 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 42 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 7 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_umsch_mm.c | 465 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 460 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 54 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 160 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 23 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 18 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 5 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c | 43 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 1 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 106 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h | 70 +-
+ drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h | 40 +-
+ drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c | 8 +-
+ drivers/gpu/drm/amd/amdgpu/atombios_dp.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/atombios_dp.h | 2 +-
+ drivers/gpu/drm/amd/amdgpu/cik.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/cik_ih.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/cikd.h | 9 +
+ drivers/gpu/drm/amd/amdgpu/cz_ih.c | 4 +-
+ 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 | 89 +-
+ drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 16 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 104 +-
+ .../gpu/drm/amd/amdgpu/gfx_v10_0_cleaner_shader.h | 35 +
+ .../drm/amd/amdgpu/gfx_v10_1_10_cleaner_shader.asm | 126 +
+ drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 48 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c | 36 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 10 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 24 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v9_4.c | 1 -
+ drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 117 +-
+ drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 10 +-
+ drivers/gpu/drm/amd/amdgpu/gfxhub_v1_2.c | 22 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 9 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 8 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 93 +-
+ drivers/gpu/drm/amd/amdgpu/hdp_v4_0.c | 1 -
+ drivers/gpu/drm/amd/amdgpu/hdp_v5_0.c | 1 -
+ drivers/gpu/drm/amd/amdgpu/hdp_v5_2.c | 1 -
+ drivers/gpu/drm/amd/amdgpu/hdp_v6_0.c | 1 -
+ drivers/gpu/drm/amd/amdgpu/hdp_v7_0.c | 1 -
+ drivers/gpu/drm/amd/amdgpu/iceland_ih.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/ih_v6_0.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/ih_v6_1.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/ih_v7_0.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/imu_v11_0.c | 1 +
+ drivers/gpu/drm/amd/amdgpu/isp_v4_1_0.c | 57 +-
+ drivers/gpu/drm/amd/amdgpu/isp_v4_1_0.h | 4 +-
+ drivers/gpu/drm/amd/amdgpu/isp_v4_1_1.c | 54 +-
+ drivers/gpu/drm/amd/amdgpu/isp_v4_1_1.h | 5 +-
+ drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c | 43 +-
+ drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 148 +-
+ drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c | 43 +-
+ drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c | 47 +-
+ drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c | 346 +-
+ drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_5.c | 31 +-
+ drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c | 28 +-
+ drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_1.c | 255 +-
+ drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_1.h | 74 +-
+ drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 79 +-
+ drivers/gpu/drm/amd/amdgpu/mes_v12_0.c | 47 +-
+ drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c | 25 +
+ drivers/gpu/drm/amd/amdgpu/mmhub_v1_8.c | 31 +-
+ drivers/gpu/drm/amd/amdgpu/mmhub_v3_3.c | 1 +
+ drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 31 +
+ drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c | 14 +
+ drivers/gpu/drm/amd/amdgpu/mxgpu_nv.h | 2 +
+ drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/nbif_v6_3_1.c | 47 -
+ drivers/gpu/drm/amd/amdgpu/nbif_v6_3_1.h | 1 -
+ drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 1 -
+ drivers/gpu/drm/amd/amdgpu/nbio_v4_3.c | 1 -
+ drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c | 1 -
+ drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c | 1 -
+ drivers/gpu/drm/amd/amdgpu/nbio_v7_11.c | 1 -
+ drivers/gpu/drm/amd/amdgpu/nbio_v7_2.c | 1 -
+ drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 1 -
+ drivers/gpu/drm/amd/amdgpu/nbio_v7_7.c | 1 -
+ drivers/gpu/drm/amd/amdgpu/nbio_v7_9.c | 1 -
+ drivers/gpu/drm/amd/amdgpu/nv.c | 7 +-
+ drivers/gpu/drm/amd/amdgpu/nvd.h | 208 +
+ drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 1 +
+ drivers/gpu/drm/amd/amdgpu/psp_v14_0.c | 10 +
+ drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 8 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 10 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c | 181 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 8 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 8 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 7 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/si.c | 8 +-
+ drivers/gpu/drm/amd/amdgpu/si_dma.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/si_ih.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/soc15.c | 15 +-
+ drivers/gpu/drm/amd/amdgpu/soc15d.h | 139 +
+ drivers/gpu/drm/amd/amdgpu/soc21.c | 36 +-
+ drivers/gpu/drm/amd/amdgpu/soc24.c | 7 +-
+ drivers/gpu/drm/amd/amdgpu/tonga_ih.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/umc_v12_0.c | 1 +
+ drivers/gpu/drm/amd/amdgpu/uvd_v3_1.c | 10 +-
+ drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 7 +-
+ drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 8 +-
+ drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 10 +-
+ drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 8 +-
+ drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 10 +-
+ drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 201 +-
+ drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 221 +-
+ drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 1039 +-
+ drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 663 +-
+ drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 693 +-
+ drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c | 643 +-
+ drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.h | 9 +
+ drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c | 686 +-
+ drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c | 610 +-
+ drivers/gpu/drm/amd/amdgpu/vcn_v5_0_1.c | 605 +-
+ drivers/gpu/drm/amd/amdgpu/vcn_v5_0_1.h | 3 +
+ drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/vega20_ih.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/vi.c | 6 +-
+ drivers/gpu/drm/amd/amdkfd/Makefile | 1 -
+ drivers/gpu/drm/amd/amdkfd/cik_event_interrupt.c | 18 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 38 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 28 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_debug.c | 14 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_device.c | 20 +-
+ .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 286 +-
+ .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 7 +-
+ .../drm/amd/amdkfd/kfd_device_queue_manager_cik.c | 75 +-
+ .../drm/amd/amdkfd/kfd_device_queue_manager_v10.c | 45 +-
+ .../drm/amd/amdkfd/kfd_device_queue_manager_v11.c | 47 +-
+ .../drm/amd/amdkfd/kfd_device_queue_manager_v12.c | 47 +-
+ .../drm/amd/amdkfd/kfd_device_queue_manager_v9.c | 46 +-
+ .../drm/amd/amdkfd/kfd_device_queue_manager_vi.c | 83 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_events.c | 43 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c | 2 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 2 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 2 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c | 4 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_vi.c | 3 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_pasid.c | 70 -
+ drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 17 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_process.c | 154 +-
+ .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 41 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_queue.c | 12 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 25 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_svm.h | 2 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 67 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 18 +
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 356 +-
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 31 +-
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 2 +-
+ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 1 +
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 16 +-
+ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 14 +-
+ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.h | 6 +-
+ .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 9 +-
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 13 +-
+ drivers/gpu/drm/amd/display/dc/Makefile | 2 +-
+ drivers/gpu/drm/amd/display/dc/basics/dc_common.c | 3 +-
+ drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 15 +-
+ .../gpu/drm/amd/display/dc/bios/command_table2.c | 56 +-
+ .../drm/amd/display/dc/bios/command_table_helper.c | 104 +
+ .../drm/amd/display/dc/bios/command_table_helper.h | 8 +
+ .../amd/display/dc/bios/command_table_helper2.c | 4 +-
+ .../dc/bios/dce110/command_table_helper_dce110.c | 104 -
+ .../dc/bios/dce112/command_table_helper2_dce112.c | 106 +-
+ .../dc/bios/dce112/command_table_helper_dce112.c | 104 -
+ .../dc/bios/dce60/command_table_helper_dce60.c | 104 -
+ .../dc/bios/dce80/command_table_helper_dce80.c | 104 -
+ .../amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c | 37 +-
+ .../amd/display/dc/clk_mgr/dcn401/dcn401_clk_mgr.c | 2 +
+ drivers/gpu/drm/amd/display/dc/core/dc.c | 183 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_debug.c | 120 -
+ .../gpu/drm/amd/display/dc/core/dc_hw_sequencer.c | 54 +-
+ .../gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c | 27 +-
+ .../gpu/drm/amd/display/dc/core/dc_link_exports.c | 6 +
+ drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 304 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 3 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_surface.c | 31 +-
+ drivers/gpu/drm/amd/display/dc/dc.h | 22 +-
+ drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 50 +-
+ drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 70 +-
+ drivers/gpu/drm/amd/display/dc/dc_helper.c | 2 +
+ drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 4 +-
+ drivers/gpu/drm/amd/display/dc/dc_plane.h | 4 +-
+ drivers/gpu/drm/amd/display/dc/dc_spl_translate.c | 1 -
+ drivers/gpu/drm/amd/display/dc/dc_stream.h | 12 -
+ drivers/gpu/drm/amd/display/dc/dc_types.h | 8 +
+ .../gpu/drm/amd/display/dc/dccg/dcn20/dcn20_dccg.h | 94 +-
+ .../drm/amd/display/dc/dccg/dcn401/dcn401_dccg.c | 26 +-
+ .../drm/amd/display/dc/dccg/dcn401/dcn401_dccg.h | 41 +-
+ .../drm/amd/display/dc/dce/dce_stream_encoder.c | 3 +-
+ drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 4 +
+ .../drm/amd/display/dc/dce110/dce110_compressor.c | 13 -
+ .../drm/amd/display/dc/dce110/dce110_compressor.h | 2 -
+ .../drm/amd/display/dc/dce60/dce60_hw_sequencer.c | 1 +
+ .../display/dc/dcn10/dcn10_hw_sequencer_debug.c | 7 +-
+ .../display/dc/dio/dcn10/dcn10_stream_encoder.c | 3 +-
+ .../dc/dio/dcn30/dcn30_dio_stream_encoder.c | 2 +-
+ .../dc/dio/dcn30/dcn30_dio_stream_encoder.h | 6 +-
+ .../display/dc/dio/dcn35/dcn35_dio_link_encoder.c | 50 +-
+ .../display/dc/dio/dcn35/dcn35_dio_link_encoder.h | 23 +
+ .../dc/dio/dcn401/dcn401_dio_stream_encoder.c | 17 +-
+ .../dc/dio/dcn401/dcn401_dio_stream_encoder.h | 23 +
+ drivers/gpu/drm/amd/display/dc/dm_services.h | 7 +
+ drivers/gpu/drm/amd/display/dc/dm_services_types.h | 26 +
+ .../gpu/drm/amd/display/dc/dml/dcn30/dcn30_fpu.c | 76 -
+ .../gpu/drm/amd/display/dc/dml/dcn30/dcn30_fpu.h | 3 -
+ .../amd/display/dc/dml/dcn30/display_mode_vba_30.c | 12 +-
+ .../gpu/drm/amd/display/dc/dml/dcn314/dcn314_fpu.c | 3 +
+ .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 1 +
+ .../gpu/drm/amd/display/dc/dml/dcn35/dcn35_fpu.c | 2 +
+ .../gpu/drm/amd/display/dc/dml/dcn351/dcn351_fpu.c | 1 +
+ .../amd/display/dc/dml/display_rq_dlg_helpers.c | 11 -
+ .../amd/display/dc/dml/display_rq_dlg_helpers.h | 1 -
+ .../display/dc/dml2/display_mode_core_structs.h | 1 +
+ .../drm/amd/display/dc/dml2/dml21/dml21_utils.c | 1 -
+ .../drm/amd/display/dc/dml2/dml21/dml21_wrapper.c | 14 +
+ .../amd/display/dc/dml2/dml21/inc/dml_top_types.h | 10 +-
+ .../dc/dml2/dml21/src/dml2_core/dml2_core_dcn4.c | 33 +-
+ .../dc/dml2/dml21/src/dml2_core/dml2_core_dcn4.h | 3 -
+ .../dml21/src/dml2_core/dml2_core_dcn4_calcs.c | 132 +-
+ .../dc/dml2/dml21/src/dml2_core/dml2_core_shared.c | 12413 ----
+ .../dml21/src/dml2_core/dml2_core_shared_types.h | 14 +-
+ .../dc/dml2/dml21/src/dml2_core/dml2_core_utils.c | 3 +-
+ .../dc/dml2/dml21/src/dml2_dpmm/dml2_dpmm_dcn4.c | 4 +-
+ .../dc/dml2/dml21/src/dml2_dpmm/dml2_dpmm_dcn4.h | 2 -
+ .../dc/dml2/dml21/src/dml2_mcg/dml2_mcg_factory.c | 2 +-
+ .../dml2/dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.c | 20 +
+ .../dml2/dml21/src/dml2_top/dml2_top_interfaces.c | 1 -
+ .../dc/dml2/dml21/src/dml2_top/dml2_top_soc15.c | 8 -
+ .../display/dc/dml2/dml21/src/dml2_top/dml_top.c | 354 -
+ .../amd/display/dc/dml2/dml21/src/inc/dml2_debug.c | 5 -
+ .../amd/display/dc/dml2/dml21/src/inc/dml2_debug.h | 6 +-
+ .../dml21/src/inc/dml2_internal_shared_types.h | 6 -
+ .../amd/display/dc/dml2/dml2_dc_resource_mgmt.c | 26 -
+ drivers/gpu/drm/amd/display/dc/dml2/dml2_policy.c | 1 +
+ .../amd/display/dc/dml2/dml2_translation_helper.c | 4 +
+ drivers/gpu/drm/amd/display/dc/dml2/dml2_wrapper.c | 10 +-
+ drivers/gpu/drm/amd/display/dc/dml2/dml2_wrapper.h | 1 +
+ .../gpu/drm/amd/display/dc/dpp/dcn20/dcn20_dpp.h | 1 -
+ .../gpu/drm/amd/display/dc/dpp/dcn30/dcn30_dpp.c | 11 +-
+ .../gpu/drm/amd/display/dc/dpp/dcn32/dcn32_dpp.h | 1 -
+ .../gpu/drm/amd/display/dc/dpp/dcn401/dcn401_dpp.h | 148 +-
+ .../gpu/drm/amd/display/dc/dsc/dcn401/dcn401_dsc.c | 19 +-
+ .../gpu/drm/amd/display/dc/dsc/dcn401/dcn401_dsc.h | 7 +
+ drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c | 1 +
+ drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c | 1 +
+ .../dc/hpo/dcn31/dcn31_hpo_dp_link_encoder.c | 10 +-
+ .../dc/hpo/dcn31/dcn31_hpo_dp_link_encoder.h | 6 +
+ .../dc/hpo/dcn31/dcn31_hpo_dp_stream_encoder.c | 3 +-
+ .../dc/hpo/dcn32/dcn32_hpo_dp_link_encoder.c | 2 +-
+ .../dc/hpo/dcn32/dcn32_hpo_dp_link_encoder.h | 4 +
+ .../drm/amd/display/dc/hubbub/dcn10/dcn10_hubbub.c | 18 -
+ .../drm/amd/display/dc/hubbub/dcn10/dcn10_hubbub.h | 3 -
+ .../drm/amd/display/dc/hubbub/dcn35/dcn35_hubbub.c | 14 +-
+ .../drm/amd/display/dc/hubbub/dcn35/dcn35_hubbub.h | 16 +
+ .../gpu/drm/amd/display/dc/hubp/dcn20/dcn20_hubp.h | 5 +-
+ .../gpu/drm/amd/display/dc/hubp/dcn31/dcn31_hubp.c | 2 +-
+ .../gpu/drm/amd/display/dc/hubp/dcn35/dcn35_hubp.c | 2 +-
+ .../gpu/drm/amd/display/dc/hubp/dcn35/dcn35_hubp.h | 1 +
+ .../gpu/drm/amd/display/dc/hwss/dce/dce_hwseq.h | 9 +
+ .../drm/amd/display/dc/hwss/dce100/dce100_hwseq.c | 30 +
+ .../drm/amd/display/dc/hwss/dce100/dce100_hwseq.h | 4 +
+ .../drm/amd/display/dc/hwss/dce110/dce110_hwseq.c | 8 +-
+ .../drm/amd/display/dc/hwss/dce120/dce120_hwseq.c | 2 +
+ .../drm/amd/display/dc/hwss/dce80/dce80_hwseq.c | 1 +
+ .../drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c | 102 +-
+ .../drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.h | 4 +
+ .../gpu/drm/amd/display/dc/hwss/dcn10/dcn10_init.c | 1 +
+ .../drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c | 22 +-
+ .../gpu/drm/amd/display/dc/hwss/dcn20/dcn20_init.c | 1 +
+ .../drm/amd/display/dc/hwss/dcn201/dcn201_init.c | 1 +
+ .../gpu/drm/amd/display/dc/hwss/dcn21/dcn21_init.c | 1 +
+ .../gpu/drm/amd/display/dc/hwss/dcn30/dcn30_init.c | 1 +
+ .../drm/amd/display/dc/hwss/dcn301/dcn301_init.c | 1 +
+ .../drm/amd/display/dc/hwss/dcn31/dcn31_hwseq.c | 8 +-
+ .../gpu/drm/amd/display/dc/hwss/dcn31/dcn31_init.c | 1 +
+ .../drm/amd/display/dc/hwss/dcn314/dcn314_init.c | 1 +
+ .../drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.c | 5 +-
+ .../gpu/drm/amd/display/dc/hwss/dcn32/dcn32_init.c | 1 +
+ .../gpu/drm/amd/display/dc/hwss/dcn35/dcn35_init.c | 1 +
+ .../drm/amd/display/dc/hwss/dcn351/dcn351_init.c | 1 +
+ .../drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c | 89 +-
+ .../drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.h | 7 +
+ .../drm/amd/display/dc/hwss/dcn401/dcn401_init.c | 3 +-
+ drivers/gpu/drm/amd/display/dc/hwss/hw_sequencer.h | 6 +
+ drivers/gpu/drm/amd/display/dc/inc/core_types.h | 7 +-
+ .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 1 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h | 6 +-
+ drivers/gpu/drm/amd/display/dc/inc/hw/optc.h | 30 +-
+ .../drm/amd/display/dc/inc/hw/timing_generator.h | 30 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/transform.h | 2 +-
+ drivers/gpu/drm/amd/display/dc/inc/link_enc_cfg.h | 5 -
+ drivers/gpu/drm/amd/display/dc/inc/resource.h | 8 +-
+ drivers/gpu/drm/amd/display/dc/irq/Makefile | 9 +
+ .../amd/display/dc/irq/dcn36/irq_service_dcn36.c | 408 +
+ .../amd/display/dc/irq/dcn36/irq_service_dcn36.h | 12 +
+ drivers/gpu/drm/amd/display/dc/irq_types.h | 1 +
+ .../drm/amd/display/dc/link/hwss/link_hwss_dio.c | 71 +-
+ .../link/hwss/link_hwss_dio_fixed_vs_pe_retimer.c | 5 +-
+ .../drm/amd/display/dc/link/hwss/link_hwss_dpia.c | 60 +-
+ .../gpu/drm/amd/display/dc/link/link_detection.c | 5 +-
+ drivers/gpu/drm/amd/display/dc/link/link_dpms.c | 15 +-
+ .../display/dc/link/protocols/link_dp_capability.c | 86 +-
+ .../display/dc/link/protocols/link_dp_capability.h | 1 +
+ .../display/dc/link/protocols/link_dp_dpia_bw.c | 26 +
+ .../display/dc/link/protocols/link_dp_dpia_bw.h | 10 +
+ .../dc/link/protocols/link_dp_irq_handler.c | 43 +-
+ .../amd/display/dc/link/protocols/link_dp_phy.c | 24 +-
+ .../amd/display/dc/link/protocols/link_dp_phy.h | 3 +-
+ .../display/dc/link/protocols/link_dp_training.c | 25 +-
+ .../display/dc/link/protocols/link_dp_training.h | 2 +
+ .../dc/link/protocols/link_dp_training_128b_132b.c | 4 +-
+ .../dc/link/protocols/link_dp_training_128b_132b.h | 1 +
+ .../dc/link/protocols/link_dp_training_8b_10b.c | 12 +-
+ .../dc/link/protocols/link_dp_training_8b_10b.h | 3 +-
+ .../dc/link/protocols/link_dp_training_auxless.c | 1 +
+ .../dc/link/protocols/link_dp_training_dpia.c | 14 +-
+ .../link_dp_training_fixed_vs_pe_retimer.c | 3 +-
+ drivers/gpu/drm/amd/display/dc/mmhubbub/Makefile | 2 +-
+ drivers/gpu/drm/amd/display/dc/mpc/Makefile | 2 +-
+ .../gpu/drm/amd/display/dc/mpc/dcn10/dcn10_mpc.c | 16 -
+ .../gpu/drm/amd/display/dc/mpc/dcn10/dcn10_mpc.h | 4 -
+ .../gpu/drm/amd/display/dc/mpc/dcn401/dcn401_mpc.c | 4 +-
+ .../gpu/drm/amd/display/dc/mpc/dcn401/dcn401_mpc.h | 28 +-
+ .../gpu/drm/amd/display/dc/optc/dcn10/dcn10_optc.c | 7 +-
+ .../gpu/drm/amd/display/dc/optc/dcn10/dcn10_optc.h | 213 +-
+ .../gpu/drm/amd/display/dc/optc/dcn20/dcn20_optc.c | 1 +
+ .../drm/amd/display/dc/optc/dcn201/dcn201_optc.c | 1 +
+ .../gpu/drm/amd/display/dc/optc/dcn30/dcn30_optc.c | 1 +
+ .../drm/amd/display/dc/optc/dcn301/dcn301_optc.c | 1 +
+ .../gpu/drm/amd/display/dc/optc/dcn31/dcn31_optc.c | 71 +
+ .../gpu/drm/amd/display/dc/optc/dcn31/dcn31_optc.h | 7 +-
+ .../drm/amd/display/dc/optc/dcn314/dcn314_optc.c | 1 +
+ .../drm/amd/display/dc/optc/dcn314/dcn314_optc.h | 4 +-
+ .../gpu/drm/amd/display/dc/optc/dcn32/dcn32_optc.c | 1 +
+ .../gpu/drm/amd/display/dc/optc/dcn32/dcn32_optc.h | 3 +-
+ .../gpu/drm/amd/display/dc/optc/dcn35/dcn35_optc.c | 1 +
+ .../gpu/drm/amd/display/dc/optc/dcn35/dcn35_optc.h | 3 +-
+ .../drm/amd/display/dc/optc/dcn401/dcn401_optc.c | 23 +-
+ .../drm/amd/display/dc/optc/dcn401/dcn401_optc.h | 22 +-
+ drivers/gpu/drm/amd/display/dc/resource/Makefile | 8 +
+ .../display/dc/resource/dce120/dce120_resource.c | 17 +
+ .../amd/display/dc/resource/dcn20/dcn20_resource.c | 5 +-
+ .../amd/display/dc/resource/dcn21/dcn21_resource.c | 6 +-
+ .../amd/display/dc/resource/dcn31/dcn31_resource.c | 2 +-
+ .../amd/display/dc/resource/dcn32/dcn32_resource.h | 3 +-
+ .../amd/display/dc/resource/dcn35/dcn35_resource.c | 7 +-
+ .../amd/display/dc/resource/dcn35/dcn35_resource.h | 3 +-
+ .../display/dc/resource/dcn351/dcn351_resource.c | 7 +-
+ .../amd/display/dc/resource/dcn36/dcn36_resource.c | 2171 +
+ .../amd/display/dc/resource/dcn36/dcn36_resource.h | 73 +
+ .../display/dc/resource/dcn401/dcn401_resource.c | 17 +-
+ .../display/dc/resource/dcn401/dcn401_resource.h | 3 +-
+ drivers/gpu/drm/amd/display/dc/spl/dc_spl.h | 18 -
+ .../drm/amd/display/dc/spl/dc_spl_scl_filters.h | 22 -
+ .../gpu/drm/amd/display/dc/{spl => sspl}/Makefile | 2 +-
+ .../gpu/drm/amd/display/dc/{spl => sspl}/dc_spl.c | 102 +-
+ drivers/gpu/drm/amd/display/dc/sspl/dc_spl.h | 30 +
+ .../amd/display/dc/{spl => sspl}/dc_spl_filters.c | 0
+ .../amd/display/dc/{spl => sspl}/dc_spl_filters.h | 0
+ .../dc/{spl => sspl}/dc_spl_isharp_filters.c | 458 +-
+ .../dc/{spl => sspl}/dc_spl_isharp_filters.h | 18 +-
+ .../dc/{spl => sspl}/dc_spl_scl_easf_filters.c | 1056 +-
+ .../dc/{spl => sspl}/dc_spl_scl_easf_filters.h | 9 +-
+ .../display/dc/{spl => sspl}/dc_spl_scl_filters.c | 232 +-
+ .../drm/amd/display/dc/sspl/dc_spl_scl_filters.h | 13 +
+ .../amd/display/dc/{spl => sspl}/dc_spl_types.h | 12 +-
+ .../display/dc/{spl => sspl}/spl_custom_float.c | 0
+ .../display/dc/{spl => sspl}/spl_custom_float.h | 0
+ .../drm/amd/display/dc/{spl => sspl}/spl_debug.h | 0
+ .../amd/display/dc/{spl => sspl}/spl_fixpt31_32.c | 2 +-
+ .../amd/display/dc/{spl => sspl}/spl_fixpt31_32.h | 4 +-
+ .../amd/display/dc/{spl => sspl}/spl_os_types.h | 0
+ drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 1 +
+ drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 82 +
+ drivers/gpu/drm/amd/display/dmub/src/Makefile | 1 +
+ drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c | 18 +-
+ drivers/gpu/drm/amd/display/dmub/src/dmub_dcn35.c | 4 +-
+ drivers/gpu/drm/amd/display/dmub/src/dmub_dcn36.c | 34 +
+ drivers/gpu/drm/amd/display/dmub/src/dmub_dcn36.h | 13 +
+ drivers/gpu/drm/amd/display/dmub/src/dmub_dcn401.c | 47 +-
+ drivers/gpu/drm/amd/display/dmub/src/dmub_dcn401.h | 3 +-
+ drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 4 +
+ drivers/gpu/drm/amd/display/include/dal_asic_id.h | 1 +
+ drivers/gpu/drm/amd/display/include/dal_types.h | 1 +
+ .../gpu/drm/amd/display/include/logger_interface.h | 5 -
+ drivers/gpu/drm/amd/display/include/logger_types.h | 1 +
+ .../drm/amd/display/modules/freesync/freesync.c | 137 -
+ .../gpu/drm/amd/display/modules/inc/mod_freesync.h | 26 -
+ .../amd/display/modules/info_packet/info_packet.c | 4 +-
+ drivers/gpu/drm/amd/include/amd_acpi.h | 4 +-
+ drivers/gpu/drm/amd/include/amd_cper.h | 269 +
+ drivers/gpu/drm/amd/include/amd_shared.h | 8 +-
+ .../amd/include/asic_reg/dcn/dcn_3_6_0_offset.h | 15485 +++++
+ .../amd/include/asic_reg/dcn/dcn_3_6_0_sh_mask.h | 61940 +++++++++++++++++++
+ .../drm/amd/include/asic_reg/gc/gc_11_5_0_offset.h | 2 +
+ .../drm/amd/include/asic_reg/gc/gc_9_4_3_sh_mask.h | 2 +
+ .../include/asic_reg/mmhub/mmhub_9_4_1_offset.h | 32 +
+ .../include/asic_reg/mmhub/mmhub_9_4_1_sh_mask.h | 48 +
+ .../amd/include/asic_reg/vcn/vcn_4_0_3_offset.h | 37 +-
+ drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 2 +
+ drivers/gpu/drm/amd/include/mes_v11_api_def.h | 3 +-
+ drivers/gpu/drm/amd/include/mes_v12_api_def.h | 42 +-
+ drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 27 +
+ drivers/gpu/drm/amd/pm/amdgpu_pm.c | 641 +-
+ drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 1 +
+ drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.c | 2 +-
+ drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c | 2 +-
+ drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c | 7 +-
+ .../drm/amd/pm/powerplay/hwmgr/hardwaremanager.c | 10 -
+ .../gpu/drm/amd/pm/powerplay/hwmgr/ppatomfwctrl.c | 78 -
+ .../gpu/drm/amd/pm/powerplay/hwmgr/ppatomfwctrl.h | 3 -
+ .../gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c | 1 -
+ .../amd/pm/powerplay/hwmgr/smu7_clockpowergating.c | 2 +-
+ .../amd/pm/powerplay/hwmgr/smu7_clockpowergating.h | 1 -
+ .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 1 -
+ .../gpu/drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c | 1 -
+ .../gpu/drm/amd/pm/powerplay/inc/hardwaremanager.h | 1 -
+ drivers/gpu/drm/amd/pm/powerplay/inc/hwmgr.h | 1 -
+ drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 58 +-
+ drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 5 +
+ .../amd/pm/swsmu/inc/pmfw_if/smu_v13_0_12_pmfw.h | 281 +
+ .../amd/pm/swsmu/inc/pmfw_if/smu_v13_0_12_ppsmc.h | 143 +
+ .../amd/pm/swsmu/inc/pmfw_if/smu_v13_0_6_pmfw.h | 115 +-
+ .../amd/pm/swsmu/inc/pmfw_if/smu_v13_0_6_ppsmc.h | 2 +-
+ drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h | 5 +-
+ drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 13 +
+ drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 12 +-
+ drivers/gpu/drm/amd/pm/swsmu/smu13/Makefile | 2 +-
+ drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 5 +-
+ .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 11 +-
+ .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_12_ppt.c | 485 +
+ .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 300 +-
+ .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.h | 24 +
+ .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 1 -
+ drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c | 54 +
+ drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 3 +-
+ drivers/gpu/drm/arm/Kconfig | 1 +
+ .../drm/arm/display/komeda/komeda_wb_connector.c | 2 +-
+ drivers/gpu/drm/arm/malidp_mw.c | 2 +-
+ drivers/gpu/drm/aspeed/aspeed_gfx_drv.c | 4 +-
+ drivers/gpu/drm/ast/Makefile | 2 +
+ drivers/gpu/drm/ast/ast_cursor.c | 309 +
+ drivers/gpu/drm/ast/ast_dp.c | 269 +-
+ drivers/gpu/drm/ast/ast_drv.c | 8 +-
+ drivers/gpu/drm/ast/ast_drv.h | 73 +-
+ drivers/gpu/drm/ast/ast_main.c | 215 +-
+ drivers/gpu/drm/ast/ast_mode.c | 588 +-
+ drivers/gpu/drm/ast/ast_post.c | 51 +-
+ drivers/gpu/drm/ast/ast_reg.h | 31 +-
+ drivers/gpu/drm/ast/ast_tables.h | 187 +-
+ drivers/gpu/drm/ast/ast_vbios.c | 241 +
+ drivers/gpu/drm/ast/ast_vbios.h | 108 +
+ drivers/gpu/drm/bridge/Kconfig | 8 +
+ drivers/gpu/drm/bridge/Makefile | 4 +
+ drivers/gpu/drm/bridge/adv7511/adv7511_audio.c | 5 +
+ drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 16 +-
+ drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 29 +-
+ drivers/gpu/drm/bridge/analogix/anx7625.c | 8 +-
+ .../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 19 +-
+ drivers/gpu/drm/bridge/chipone-icn6211.c | 7 +-
+ drivers/gpu/drm/bridge/fsl-ldb.c | 5 +-
+ drivers/gpu/drm/bridge/imx/imx8mp-hdmi-pvi.c | 7 +-
+ drivers/gpu/drm/bridge/imx/imx8qm-ldb.c | 10 +-
+ drivers/gpu/drm/bridge/imx/imx8qxp-ldb.c | 21 +-
+ .../gpu/drm/bridge/imx/imx8qxp-pixel-combiner.c | 5 +-
+ drivers/gpu/drm/bridge/imx/imx8qxp-pixel-link.c | 10 +-
+ drivers/gpu/drm/bridge/imx/imx8qxp-pxl2dpi.c | 8 +-
+ drivers/gpu/drm/bridge/ite-it6263.c | 11 +-
+ drivers/gpu/drm/bridge/ite-it6505.c | 16 +-
+ drivers/gpu/drm/bridge/ite-it66121.c | 5 +-
+ drivers/gpu/drm/bridge/lontium-lt9211.c | 5 +-
+ drivers/gpu/drm/bridge/lontium-lt9611.c | 18 +-
+ .../drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 7 -
+ drivers/gpu/drm/bridge/microchip-lvds.c | 3 +-
+ drivers/gpu/drm/bridge/nwl-dsi.c | 11 +-
+ drivers/gpu/drm/bridge/nxp-ptn3460.c | 1 -
+ drivers/gpu/drm/bridge/panel.c | 16 +-
+ drivers/gpu/drm/bridge/parade-ps8622.c | 1 -
+ drivers/gpu/drm/bridge/parade-ps8640.c | 5 +-
+ drivers/gpu/drm/bridge/samsung-dsim.c | 8 +-
+ drivers/gpu/drm/bridge/sii902x.c | 6 +-
+ drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c | 494 +-
+ drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 9 +-
+ drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 6 +-
+ drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi2.c | 6 +-
+ drivers/gpu/drm/bridge/tc358762.c | 11 +-
+ drivers/gpu/drm/bridge/tc358767.c | 20 +-
+ drivers/gpu/drm/bridge/tc358775.c | 1 -
+ drivers/gpu/drm/{i2c => bridge}/tda998x_drv.c | 49 +-
+ drivers/gpu/drm/bridge/ti-dlpc3433.c | 6 +-
+ drivers/gpu/drm/bridge/ti-sn65dsi83.c | 153 +-
+ drivers/gpu/drm/bridge/ti-sn65dsi86.c | 19 +-
+ drivers/gpu/drm/bridge/ti-tdp158.c | 6 +-
+ drivers/gpu/drm/ci/build.sh | 2 +-
+ drivers/gpu/drm/ci/build.yml | 104 +-
+ drivers/gpu/drm/ci/container.yml | 22 +-
+ drivers/gpu/drm/ci/gitlab-ci.yml | 197 +-
+ drivers/gpu/drm/ci/igt_runner.sh | 13 +-
+ drivers/gpu/drm/ci/image-tags.yml | 11 +-
+ drivers/gpu/drm/ci/lava-submit.sh | 100 +-
+ drivers/gpu/drm/ci/test.yml | 37 +-
+ drivers/gpu/drm/ci/xfails/amdgpu-stoney-fails.txt | 8 +-
+ drivers/gpu/drm/ci/xfails/amdgpu-stoney-flakes.txt | 21 +-
+ drivers/gpu/drm/ci/xfails/amdgpu-stoney-skips.txt | 5 +
+ drivers/gpu/drm/ci/xfails/i915-amly-fails.txt | 20 +-
+ drivers/gpu/drm/ci/xfails/i915-amly-flakes.txt | 14 +
+ drivers/gpu/drm/ci/xfails/i915-amly-skips.txt | 1 +
+ drivers/gpu/drm/ci/xfails/i915-apl-fails.txt | 8 +-
+ drivers/gpu/drm/ci/xfails/i915-cml-fails.txt | 22 +-
+ drivers/gpu/drm/ci/xfails/i915-cml-flakes.txt | 7 +
+ drivers/gpu/drm/ci/xfails/i915-cml-skips.txt | 1 +
+ drivers/gpu/drm/ci/xfails/i915-glk-fails.txt | 31 +-
+ drivers/gpu/drm/ci/xfails/i915-glk-flakes.txt | 7 +
+ drivers/gpu/drm/ci/xfails/i915-glk-skips.txt | 298 +
+ drivers/gpu/drm/ci/xfails/i915-jsl-fails.txt | 18 +-
+ drivers/gpu/drm/ci/xfails/i915-jsl-flakes.txt | 15 +-
+ drivers/gpu/drm/ci/xfails/i915-kbl-skips.txt | 112 +
+ drivers/gpu/drm/ci/xfails/i915-tgl-fails.txt | 55 +-
+ drivers/gpu/drm/ci/xfails/i915-tgl-skips.txt | 13 +
+ drivers/gpu/drm/ci/xfails/i915-whl-fails.txt | 15 +-
+ drivers/gpu/drm/ci/xfails/i915-whl-flakes.txt | 7 +
+ .../gpu/drm/ci/xfails/mediatek-mt8173-fails.txt | 7 +-
+ .../gpu/drm/ci/xfails/mediatek-mt8173-flakes.txt | 7 +
+ .../gpu/drm/ci/xfails/mediatek-mt8173-skips.txt | 5 +
+ .../gpu/drm/ci/xfails/mediatek-mt8183-fails.txt | 12 +-
+ .../gpu/drm/ci/xfails/mediatek-mt8183-skips.txt | 5 +
+ drivers/gpu/drm/ci/xfails/msm-apq8016-fails.txt | 3 +
+ .../xfails/msm-sc7180-trogdor-kingoftown-fails.txt | 1 -
+ .../msm-sc7180-trogdor-kingoftown-flakes.txt | 14 +
+ .../xfails/msm-sc7180-trogdor-kingoftown-skips.txt | 5 +
+ .../msm-sc7180-trogdor-lazor-limozeen-fails.txt | 1 -
+ .../msm-sc7180-trogdor-lazor-limozeen-skips.txt | 5 +
+ drivers/gpu/drm/ci/xfails/msm-sdm845-fails.txt | 2 -
+ drivers/gpu/drm/ci/xfails/msm-sdm845-skips.txt | 5 +
+ drivers/gpu/drm/ci/xfails/msm-sm8350-hdk-fails.txt | 5 -
+ .../gpu/drm/ci/xfails/rockchip-rk3288-fails.txt | 26 +-
+ .../gpu/drm/ci/xfails/rockchip-rk3399-fails.txt | 13 +-
+ .../gpu/drm/ci/xfails/rockchip-rk3399-flakes.txt | 56 +
+ .../gpu/drm/ci/xfails/rockchip-rk3399-skips.txt | 5 +
+ .../gpu/drm/ci/xfails/virtio_gpu-none-skips.txt | 5 +
+ drivers/gpu/drm/ci/xfails/vkms-none-fails.txt | 10 +-
+ drivers/gpu/drm/ci/xfails/vkms-none-skips.txt | 543 +-
+ drivers/gpu/drm/display/drm_bridge_connector.c | 2 +-
+ drivers/gpu/drm/display/drm_dp_dual_mode_helper.c | 4 +-
+ drivers/gpu/drm/display/drm_dp_helper.c | 119 +
+ drivers/gpu/drm/display/drm_dp_mst_topology.c | 31 +-
+ drivers/gpu/drm/display/drm_hdmi_state_helper.c | 2 +-
+ drivers/gpu/drm/drm_atomic_helper.c | 333 +-
+ drivers/gpu/drm/drm_atomic_uapi.c | 37 +-
+ drivers/gpu/drm/drm_bridge.c | 79 +-
+ drivers/gpu/drm/drm_buddy.c | 11 +-
+ drivers/gpu/drm/drm_client_event.c | 41 +-
+ drivers/gpu/drm/drm_crtc.c | 20 +
+ drivers/gpu/drm/drm_crtc_helper_internal.h | 2 +-
+ drivers/gpu/drm/drm_damage_helper.c | 2 +-
+ drivers/gpu/drm/drm_debugfs.c | 2 +-
+ drivers/gpu/drm/drm_drv.c | 68 +
+ drivers/gpu/drm/drm_fb_dma_helper.c | 2 +-
+ drivers/gpu/drm/drm_fb_helper.c | 20 +-
+ drivers/gpu/drm/drm_file.c | 26 +-
+ drivers/gpu/drm/drm_format_helper.c | 123 +
+ drivers/gpu/drm/drm_gem.c | 4 +-
+ drivers/gpu/drm/drm_gem_dma_helper.c | 4 +-
+ drivers/gpu/drm/drm_gem_framebuffer_helper.c | 12 +-
+ drivers/gpu/drm/drm_gem_shmem_helper.c | 30 +-
+ drivers/gpu/drm/drm_gpusvm.c | 2236 +
+ drivers/gpu/drm/drm_managed.c | 8 +
+ drivers/gpu/drm/drm_mipi_dbi.c | 2 +-
+ drivers/gpu/drm/drm_mipi_dsi.c | 54 +-
+ drivers/gpu/drm/drm_of.c | 2 +-
+ drivers/gpu/drm/drm_panel.c | 5 +-
+ drivers/gpu/drm/drm_panel_orientation_quirks.c | 46 +-
+ drivers/gpu/drm/drm_panic.c | 2 +-
+ drivers/gpu/drm/drm_panic_qr.rs | 108 +-
+ drivers/gpu/drm/drm_prime.c | 8 +-
+ drivers/gpu/drm/drm_probe_helper.c | 35 +-
+ drivers/gpu/drm/drm_writeback.c | 222 +-
+ drivers/gpu/drm/etnaviv/etnaviv_sched.c | 20 +-
+ drivers/gpu/drm/exynos/exynos_hdmi.c | 2 +-
+ drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 2 +-
+ drivers/gpu/drm/gma500/cdv_device.c | 2 +-
+ drivers/gpu/drm/gma500/cdv_intel_crt.c | 2 +-
+ drivers/gpu/drm/gma500/cdv_intel_dp.c | 5 +-
+ drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 2 +-
+ drivers/gpu/drm/gma500/cdv_intel_lvds.c | 2 +-
+ drivers/gpu/drm/gma500/oaktrail_hdmi.c | 2 +-
+ drivers/gpu/drm/gma500/psb_intel_drv.h | 2 +-
+ drivers/gpu/drm/gma500/psb_intel_lvds.c | 2 +-
+ drivers/gpu/drm/gma500/psb_intel_sdvo.c | 2 +-
+ drivers/gpu/drm/i2c/Kconfig | 36 -
+ drivers/gpu/drm/i2c/Makefile | 10 -
+ drivers/gpu/drm/i915/Makefile | 2 +
+ 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 | 4 +-
+ drivers/gpu/drm/i915/display/dvo_sil164.c | 2 +-
+ drivers/gpu/drm/i915/display/dvo_tfp410.c | 2 +-
+ drivers/gpu/drm/i915/display/g4x_dp.c | 114 +-
+ drivers/gpu/drm/i915/display/g4x_dp.h | 14 +-
+ drivers/gpu/drm/i915/display/g4x_hdmi.c | 172 +-
+ drivers/gpu/drm/i915/display/g4x_hdmi.h | 6 +-
+ drivers/gpu/drm/i915/display/hsw_ips.c | 26 +-
+ drivers/gpu/drm/i915/display/i9xx_plane.c | 372 +-
+ drivers/gpu/drm/i915/display/i9xx_plane.h | 10 +-
+ drivers/gpu/drm/i915/display/i9xx_wm.c | 24 +-
+ drivers/gpu/drm/i915/display/icl_dsi.c | 40 +-
+ drivers/gpu/drm/i915/display/intel_acpi.c | 2 +
+ drivers/gpu/drm/i915/display/intel_atomic.h | 1 -
+ drivers/gpu/drm/i915/display/intel_atomic_plane.c | 444 +-
+ drivers/gpu/drm/i915/display/intel_atomic_plane.h | 9 +
+ drivers/gpu/drm/i915/display/intel_audio.c | 500 +-
+ drivers/gpu/drm/i915/display/intel_audio.h | 14 +-
+ drivers/gpu/drm/i915/display/intel_backlight.c | 496 +-
+ drivers/gpu/drm/i915/display/intel_bios.c | 5 +-
+ drivers/gpu/drm/i915/display/intel_bw.c | 74 +-
+ drivers/gpu/drm/i915/display/intel_bw.h | 6 +-
+ drivers/gpu/drm/i915/display/intel_cdclk.c | 204 +-
+ drivers/gpu/drm/i915/display/intel_cdclk.h | 4 +-
+ drivers/gpu/drm/i915/display/intel_cmtg.c | 189 +
+ drivers/gpu/drm/i915/display/intel_cmtg.h | 13 +
+ drivers/gpu/drm/i915/display/intel_cmtg_regs.h | 21 +
+ drivers/gpu/drm/i915/display/intel_color.c | 11 +-
+ drivers/gpu/drm/i915/display/intel_combo_phy.c | 180 +-
+ drivers/gpu/drm/i915/display/intel_combo_phy.h | 8 +-
+ .../gpu/drm/i915/display/intel_combo_phy_regs.h | 2 +
+ drivers/gpu/drm/i915/display/intel_connector.c | 46 +-
+ drivers/gpu/drm/i915/display/intel_connector.h | 2 +
+ drivers/gpu/drm/i915/display/intel_crt.c | 46 +-
+ drivers/gpu/drm/i915/display/intel_crtc.c | 78 +-
+ drivers/gpu/drm/i915/display/intel_crtc.h | 7 +-
+ .../gpu/drm/i915/display/intel_crtc_state_dump.c | 28 +-
+ drivers/gpu/drm/i915/display/intel_cursor.c | 212 +-
+ drivers/gpu/drm/i915/display/intel_cursor.h | 4 +-
+ drivers/gpu/drm/i915/display/intel_cx0_phy.c | 299 +-
+ drivers/gpu/drm/i915/display/intel_cx0_phy.h | 2 +-
+ drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h | 33 +-
+ drivers/gpu/drm/i915/display/intel_ddi.c | 516 +-
+ drivers/gpu/drm/i915/display/intel_ddi.h | 4 +-
+ drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c | 58 +-
+ drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h | 1 -
+ drivers/gpu/drm/i915/display/intel_display.c | 2225 +-
+ drivers/gpu/drm/i915/display/intel_display.h | 67 +-
+ drivers/gpu/drm/i915/display/intel_display_core.h | 4 +-
+ .../gpu/drm/i915/display/intel_display_debugfs.c | 289 +-
+ .../gpu/drm/i915/display/intel_display_debugfs.h | 6 +-
+ .../gpu/drm/i915/display/intel_display_device.c | 13 +
+ .../gpu/drm/i915/display/intel_display_device.h | 14 +
+ .../gpu/drm/i915/display/intel_display_driver.c | 38 +-
+ drivers/gpu/drm/i915/display/intel_display_irq.c | 789 +-
+ drivers/gpu/drm/i915/display/intel_display_irq.h | 8 +-
+ .../gpu/drm/i915/display/intel_display_params.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_display_power.c | 134 +-
+ drivers/gpu/drm/i915/display/intel_display_power.h | 78 +-
+ .../gpu/drm/i915/display/intel_display_power_map.c | 2 +
+ .../drm/i915/display/intel_display_power_well.c | 28 +-
+ .../drm/i915/display/intel_display_power_well.h | 4 +-
+ drivers/gpu/drm/i915/display/intel_display_reset.c | 75 +-
+ drivers/gpu/drm/i915/display/intel_display_reset.h | 12 +-
+ drivers/gpu/drm/i915/display/intel_display_rps.c | 4 +-
+ drivers/gpu/drm/i915/display/intel_display_rps.h | 4 +-
+ drivers/gpu/drm/i915/display/intel_display_trace.h | 150 +-
+ drivers/gpu/drm/i915/display/intel_display_types.h | 100 +-
+ drivers/gpu/drm/i915/display/intel_dkl_phy.c | 62 +-
+ drivers/gpu/drm/i915/display/intel_dkl_phy.h | 12 +-
+ drivers/gpu/drm/i915/display/intel_dmc.c | 7 +-
+ drivers/gpu/drm/i915/display/intel_dmc_wl.c | 76 +-
+ drivers/gpu/drm/i915/display/intel_dp.c | 376 +-
+ drivers/gpu/drm/i915/display/intel_dp.h | 5 +-
+ drivers/gpu/drm/i915/display/intel_dp_aux.c | 5 +-
+ .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 183 +-
+ drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 8 +-
+ .../gpu/drm/i915/display/intel_dp_link_training.c | 31 +-
+ .../gpu/drm/i915/display/intel_dp_link_training.h | 1 +
+ drivers/gpu/drm/i915/display/intel_dp_mst.c | 514 +-
+ drivers/gpu/drm/i915/display/intel_dp_mst.h | 3 +-
+ drivers/gpu/drm/i915/display/intel_dp_test.c | 6 +-
+ drivers/gpu/drm/i915/display/intel_dp_tunnel.c | 3 +-
+ drivers/gpu/drm/i915/display/intel_dp_tunnel.h | 5 +-
+ drivers/gpu/drm/i915/display/intel_dpio_phy.c | 36 +-
+ drivers/gpu/drm/i915/display/intel_dpio_phy.h | 6 +
+ drivers/gpu/drm/i915/display/intel_dpll.c | 41 +-
+ drivers/gpu/drm/i915/display/intel_dpll.h | 5 +-
+ drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 1044 +-
+ drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 29 +-
+ drivers/gpu/drm/i915/display/intel_dpt.c | 29 +-
+ drivers/gpu/drm/i915/display/intel_dpt.h | 7 +-
+ drivers/gpu/drm/i915/display/intel_drrs.c | 45 +-
+ drivers/gpu/drm/i915/display/intel_drrs.h | 10 +-
+ drivers/gpu/drm/i915/display/intel_dsb.c | 126 +-
+ drivers/gpu/drm/i915/display/intel_dsb.h | 3 +
+ drivers/gpu/drm/i915/display/intel_dsi.c | 10 +-
+ drivers/gpu/drm/i915/display/intel_dsi.h | 2 +-
+ drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_dvo.c | 10 +-
+ drivers/gpu/drm/i915/display/intel_dvo_dev.h | 4 +-
+ drivers/gpu/drm/i915/display/intel_fb.c | 410 +-
+ drivers/gpu/drm/i915/display/intel_fb.h | 31 +-
+ drivers/gpu/drm/i915/display/intel_fb_bo.c | 18 +-
+ drivers/gpu/drm/i915/display/intel_fb_bo.h | 8 +-
+ drivers/gpu/drm/i915/display/intel_fb_pin.c | 33 +-
+ drivers/gpu/drm/i915/display/intel_fb_pin.h | 4 +-
+ drivers/gpu/drm/i915/display/intel_fbc.c | 270 +-
+ drivers/gpu/drm/i915/display/intel_fbc.h | 10 +-
+ drivers/gpu/drm/i915/display/intel_fbc_regs.h | 9 +
+ drivers/gpu/drm/i915/display/intel_fbdev.c | 352 +-
+ drivers/gpu/drm/i915/display/intel_fbdev.h | 25 +-
+ drivers/gpu/drm/i915/display/intel_fdi.c | 483 +-
+ drivers/gpu/drm/i915/display/intel_fdi.h | 23 +-
+ drivers/gpu/drm/i915/display/intel_fifo_underrun.c | 183 +-
+ drivers/gpu/drm/i915/display/intel_fifo_underrun.h | 18 +-
+ drivers/gpu/drm/i915/display/intel_frontbuffer.c | 14 +-
+ drivers/gpu/drm/i915/display/intel_gmbus.c | 10 +-
+ drivers/gpu/drm/i915/display/intel_hdcp.c | 291 +-
+ drivers/gpu/drm/i915/display/intel_hdcp.h | 11 +-
+ drivers/gpu/drm/i915/display/intel_hdmi.c | 31 +-
+ drivers/gpu/drm/i915/display/intel_hdmi.h | 10 +-
+ drivers/gpu/drm/i915/display/intel_hotplug.c | 31 +-
+ drivers/gpu/drm/i915/display/intel_hotplug.h | 4 +-
+ drivers/gpu/drm/i915/display/intel_hotplug_irq.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_link_bw.c | 3 +-
+ drivers/gpu/drm/i915/display/intel_lpe_audio.c | 118 +-
+ drivers/gpu/drm/i915/display/intel_lpe_audio.h | 18 +-
+ drivers/gpu/drm/i915/display/intel_lspcon.c | 30 +-
+ drivers/gpu/drm/i915/display/intel_lspcon.h | 25 +-
+ drivers/gpu/drm/i915/display/intel_lvds.c | 23 +-
+ drivers/gpu/drm/i915/display/intel_modeset_setup.c | 74 +-
+ .../gpu/drm/i915/display/intel_modeset_verify.c | 3 +-
+ drivers/gpu/drm/i915/display/intel_overlay.c | 28 +-
+ drivers/gpu/drm/i915/display/intel_overlay.h | 1 -
+ drivers/gpu/drm/i915/display/intel_panel.c | 1 +
+ drivers/gpu/drm/i915/display/intel_pch_display.c | 84 +-
+ drivers/gpu/drm/i915/display/intel_pch_refclk.c | 34 +-
+ drivers/gpu/drm/i915/display/intel_pfit.c | 170 +-
+ drivers/gpu/drm/i915/display/intel_pfit.h | 10 +-
+ drivers/gpu/drm/i915/display/intel_pfit_regs.h | 79 +
+ drivers/gpu/drm/i915/display/intel_pipe_crc.c | 5 +-
+ drivers/gpu/drm/i915/display/intel_pipe_crc.h | 1 -
+ drivers/gpu/drm/i915/display/intel_plane_initial.c | 7 +-
+ drivers/gpu/drm/i915/display/intel_plane_initial.h | 2 +
+ drivers/gpu/drm/i915/display/intel_pmdemand.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_pps.c | 34 +-
+ drivers/gpu/drm/i915/display/intel_psr.c | 230 +-
+ drivers/gpu/drm/i915/display/intel_psr.h | 10 +-
+ drivers/gpu/drm/i915/display/intel_psr_regs.h | 10 +
+ drivers/gpu/drm/i915/display/intel_quirks.c | 2 +
+ drivers/gpu/drm/i915/display/intel_sdvo.c | 302 +-
+ drivers/gpu/drm/i915/display/intel_sdvo.h | 10 +-
+ drivers/gpu/drm/i915/display/intel_sdvo_regs.h | 2 +-
+ drivers/gpu/drm/i915/display/intel_snps_hdmi_pll.c | 364 +
+ drivers/gpu/drm/i915/display/intel_snps_hdmi_pll.h | 17 +
+ drivers/gpu/drm/i915/display/intel_snps_phy.c | 114 +-
+ drivers/gpu/drm/i915/display/intel_snps_phy.h | 7 +-
+ drivers/gpu/drm/i915/display/intel_sprite.c | 178 +-
+ drivers/gpu/drm/i915/display/intel_sprite.h | 6 +-
+ drivers/gpu/drm/i915/display/intel_tc.c | 90 +-
+ drivers/gpu/drm/i915/display/intel_tdf.h | 6 +-
+ drivers/gpu/drm/i915/display/intel_tv.c | 8 +-
+ drivers/gpu/drm/i915/display/intel_vblank.c | 86 +-
+ drivers/gpu/drm/i915/display/intel_vblank.h | 6 +
+ drivers/gpu/drm/i915/display/intel_vdsc.c | 249 +-
+ drivers/gpu/drm/i915/display/intel_vga.c | 5 +-
+ drivers/gpu/drm/i915/display/intel_vrr.c | 172 +-
+ drivers/gpu/drm/i915/display/intel_vrr.h | 9 +-
+ drivers/gpu/drm/i915/display/intel_wm.c | 6 +
+ drivers/gpu/drm/i915/display/intel_wm.h | 1 +
+ drivers/gpu/drm/i915/display/skl_scaler.c | 390 +-
+ drivers/gpu/drm/i915/display/skl_scaler.h | 7 +-
+ drivers/gpu/drm/i915/display/skl_universal_plane.c | 703 +-
+ drivers/gpu/drm/i915/display/skl_universal_plane.h | 14 +-
+ drivers/gpu/drm/i915/display/skl_watermark.c | 169 +-
+ drivers/gpu/drm/i915/display/skl_watermark.h | 7 +-
+ drivers/gpu/drm/i915/display/vlv_dsi.c | 18 +-
+ drivers/gpu/drm/i915/display/vlv_dsi_pll.c | 14 +-
+ drivers/gpu/drm/i915/display/vlv_dsi_pll.h | 16 +-
+ drivers/gpu/drm/i915/gem/i915_gem_context.c | 6 +-
+ drivers/gpu/drm/i915/gem/i915_gem_context_types.h | 6 +-
+ drivers/gpu/drm/i915/gem/i915_gem_create.c | 2 +-
+ drivers/gpu/drm/i915/gem/i915_gem_domain.c | 17 +-
+ drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 6 +-
+ drivers/gpu/drm/i915/gem/i915_gem_object.h | 2 +-
+ drivers/gpu/drm/i915/gem/i915_gem_region.c | 2 +-
+ drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 4 +-
+ drivers/gpu/drm/i915/gem/i915_gem_tiling.c | 2 +-
+ drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 2 +-
+ drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c | 2 +-
+ drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 2 +-
+ drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 2 +-
+ drivers/gpu/drm/i915/gem/selftests/mock_context.c | 38 -
+ drivers/gpu/drm/i915/gem/selftests/mock_context.h | 3 -
+ drivers/gpu/drm/i915/gem/selftests/mock_dmabuf.c | 3 +-
+ drivers/gpu/drm/i915/gt/gen2_engine_cs.c | 2 +-
+ drivers/gpu/drm/i915/gt/intel_engine_cs.c | 10 +-
+ drivers/gpu/drm/i915/gt/intel_engine_types.h | 4 +-
+ drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c | 7 +-
+ drivers/gpu/drm/i915/gt/intel_gt_irq.c | 2 +-
+ drivers/gpu/drm/i915/gt/intel_gt_mcr.c | 2 +-
+ drivers/gpu/drm/i915/gt/intel_gt_pm.c | 8 +-
+ drivers/gpu/drm/i915/gt/intel_gt_regs.h | 3 +
+ drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c | 47 +
+ drivers/gpu/drm/i915/gt/intel_migrate.c | 4 +-
+ drivers/gpu/drm/i915/gt/intel_mocs.c | 2 +-
+ drivers/gpu/drm/i915/gt/intel_reset.c | 52 +-
+ drivers/gpu/drm/i915/gt/intel_reset.h | 2 +
+ drivers/gpu/drm/i915/gt/intel_reset_types.h | 3 +-
+ drivers/gpu/drm/i915/gt/intel_ring_submission.c | 2 +-
+ drivers/gpu/drm/i915/gt/intel_rps.c | 4 +
+ drivers/gpu/drm/i915/gt/intel_rps_types.h | 4 +-
+ drivers/gpu/drm/i915/gt/intel_sa_media.c | 2 +-
+ drivers/gpu/drm/i915/gt/intel_sseu.c | 2 +-
+ drivers/gpu/drm/i915/gt/intel_workarounds.c | 21 +-
+ drivers/gpu/drm/i915/gt/selftest_execlists.c | 2 +-
+ drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 2 +-
+ drivers/gpu/drm/i915/gt/selftest_lrc.c | 2 +-
+ drivers/gpu/drm/i915/gt/selftest_rc6.c | 2 +-
+ drivers/gpu/drm/i915/gt/selftest_rps.c | 15 +-
+ drivers/gpu/drm/i915/gt/selftest_slpc.c | 17 +-
+ drivers/gpu/drm/i915/gt/shaders/README | 6 +-
+ .../gpu/drm/i915/gt/shaders/clear_kernel/hsw.asm | 2 +-
+ .../gpu/drm/i915/gt/shaders/clear_kernel/ivb.asm | 2 +-
+ drivers/gpu/drm/i915/gt/shmem_utils.c | 8 +-
+ .../gpu/drm/i915/gt/uc/abi/guc_actions_slpc_abi.h | 5 +
+ drivers/gpu/drm/i915/gt/uc/guc_capture_fwif.h | 4 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc.c | 2 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc.h | 2 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c | 11 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h | 2 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc_hwconfig.c | 3 +
+ drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c | 104 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.h | 1 +
+ drivers/gpu/drm/i915/gt/uc/intel_guc_slpc_types.h | 3 +
+ drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 4 +-
+ drivers/gpu/drm/i915/gt/uc/intel_huc.c | 12 +-
+ drivers/gpu/drm/i915/gt/uc/intel_uc.c | 2 +-
+ .../gpu/drm/i915/gt/uc/selftest_guc_hangcheck.c | 2 +-
+ drivers/gpu/drm/i915/gvt/cmd_parser.c | 15 +-
+ drivers/gpu/drm/i915/gvt/display.c | 2 +-
+ drivers/gpu/drm/i915/gvt/dmabuf.c | 2 +-
+ drivers/gpu/drm/i915/gvt/edid.c | 2 +-
+ drivers/gpu/drm/i915/gvt/fb_decoder.c | 117 -
+ drivers/gpu/drm/i915/gvt/fb_decoder.h | 2 -
+ drivers/gpu/drm/i915/gvt/gtt.c | 68 +-
+ drivers/gpu/drm/i915/gvt/gvt.h | 14 +-
+ drivers/gpu/drm/i915/gvt/handlers.c | 23 +-
+ drivers/gpu/drm/i915/gvt/kvmgt.c | 2 +-
+ drivers/gpu/drm/i915/gvt/mmio.h | 3 -
+ drivers/gpu/drm/i915/gvt/mmio_context.c | 6 +-
+ drivers/gpu/drm/i915/gvt/scheduler.c | 11 +-
+ drivers/gpu/drm/i915/gvt/vgpu.c | 6 +-
+ drivers/gpu/drm/i915/i915_debugfs.c | 3 -
+ drivers/gpu/drm/i915/i915_driver.c | 23 +-
+ drivers/gpu/drm/i915/i915_drv.h | 1 -
+ drivers/gpu/drm/i915/i915_gem.c | 6 +-
+ drivers/gpu/drm/i915/i915_gpu_error.h | 2 -
+ drivers/gpu/drm/i915/i915_gtt_view_types.h | 59 +
+ drivers/gpu/drm/i915/i915_irq.c | 69 +-
+ drivers/gpu/drm/i915/i915_irq.h | 4 +
+ drivers/gpu/drm/i915/i915_module.c | 4 +-
+ drivers/gpu/drm/i915/i915_perf.c | 19 +-
+ drivers/gpu/drm/i915/i915_pmu.c | 120 +-
+ drivers/gpu/drm/i915/i915_pmu.h | 13 +-
+ drivers/gpu/drm/i915/i915_reg.h | 145 +-
+ drivers/gpu/drm/i915/i915_reg_defs.h | 8 +
+ drivers/gpu/drm/i915/i915_request.c | 2 +-
+ drivers/gpu/drm/i915/i915_request.h | 4 +-
+ drivers/gpu/drm/i915/i915_vma.c | 10 +-
+ drivers/gpu/drm/i915/i915_vma_types.h | 52 +-
+ drivers/gpu/drm/i915/intel_clock_gating.c | 2 +-
+ drivers/gpu/drm/i915/intel_gvt.c | 2 +-
+ drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 3 +-
+ drivers/gpu/drm/i915/intel_runtime_pm.c | 2 +-
+ drivers/gpu/drm/i915/intel_runtime_pm.h | 2 +-
+ drivers/gpu/drm/i915/intel_uncore.c | 2 +-
+ drivers/gpu/drm/i915/pxp/intel_pxp.c | 6 +-
+ drivers/gpu/drm/i915/pxp/intel_pxp.h | 4 +-
+ .../gpu/drm/i915/pxp/intel_pxp_cmd_interface_43.h | 2 +-
+ drivers/gpu/drm/i915/pxp/intel_pxp_types.h | 2 +-
+ drivers/gpu/drm/i915/selftests/i915_gem.c | 9 +-
+ drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 21 +-
+ drivers/gpu/drm/i915/selftests/i915_vma.c | 15 +-
+ drivers/gpu/drm/i915/soc/intel_pch.c | 44 +-
+ drivers/gpu/drm/i915/soc/intel_pch.h | 45 +-
+ drivers/gpu/drm/imagination/pvr_job.c | 12 +-
+ drivers/gpu/drm/imagination/pvr_queue.c | 18 +-
+ drivers/gpu/drm/imx/ipuv3/imx-tve.c | 2 +-
+ drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 4 +-
+ drivers/gpu/drm/lima/lima_sched.c | 16 +-
+ drivers/gpu/drm/loongson/lsdc_plane.c | 3 +-
+ drivers/gpu/drm/mediatek/mtk_disp_color.c | 4 +-
+ drivers/gpu/drm/mediatek/mtk_disp_gamma.c | 4 +-
+ drivers/gpu/drm/mediatek/mtk_disp_merge.c | 4 +-
+ drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 4 +-
+ drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 4 +-
+ drivers/gpu/drm/mediatek/mtk_dp.c | 6 +-
+ drivers/gpu/drm/mediatek/mtk_dsi.c | 12 +-
+ drivers/gpu/drm/mediatek/mtk_hdmi.c | 13 +-
+ drivers/gpu/drm/mediatek/mtk_mdp_rdma.c | 4 +-
+ drivers/gpu/drm/mediatek/mtk_plane.c | 2 +-
+ drivers/gpu/drm/meson/meson_encoder_cvbs.c | 5 +-
+ drivers/gpu/drm/meson/meson_encoder_dsi.c | 5 +-
+ drivers/gpu/drm/meson/meson_encoder_hdmi.c | 5 +-
+ drivers/gpu/drm/mgag200/Makefile | 1 +
+ drivers/gpu/drm/mgag200/mgag200_drv.c | 4 +
+ drivers/gpu/drm/mgag200/mgag200_drv.h | 3 +
+ drivers/gpu/drm/mgag200/mgag200_g200eh5.c | 204 +
+ drivers/gpu/drm/msm/Kconfig | 2 +
+ drivers/gpu/drm/msm/adreno/a6xx_catalog.c | 29 +
+ drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 82 +-
+ drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 8 +
+ drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 15 +-
+ drivers/gpu/drm/msm/adreno/a6xx_gpu_state.h | 17 +
+ drivers/gpu/drm/msm/adreno/adreno_gpu.c | 10 +
+ drivers/gpu/drm/msm/adreno/adreno_gpu.h | 5 +
+ .../drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h | 5 +-
+ .../drm/msm/disp/dpu1/catalog/dpu_1_14_msm8937.h | 1 +
+ .../drm/msm/disp/dpu1/catalog/dpu_1_15_msm8917.h | 1 +
+ .../drm/msm/disp/dpu1/catalog/dpu_1_16_msm8953.h | 1 +
+ .../drm/msm/disp/dpu1/catalog/dpu_1_7_msm8996.h | 1 +
+ .../drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h | 1 +
+ .../gpu/drm/msm/disp/dpu1/catalog/dpu_3_2_sdm660.h | 1 +
+ .../gpu/drm/msm/disp/dpu1/catalog/dpu_3_3_sdm630.h | 1 +
+ .../gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h | 1 +
+ .../gpu/drm/msm/disp/dpu1/catalog/dpu_4_1_sdm670.h | 1 +
+ .../gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h | 5 +-
+ .../drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h | 5 +-
+ .../gpu/drm/msm/disp/dpu1/catalog/dpu_5_2_sm7150.h | 5 +-
+ .../gpu/drm/msm/disp/dpu1/catalog/dpu_5_3_sm6150.h | 19 +
+ .../gpu/drm/msm/disp/dpu1/catalog/dpu_5_4_sm6125.h | 5 +-
+ .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h | 2 +-
+ .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h | 5 +-
+ .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_4_sm6350.h | 5 +-
+ .../gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h | 5 +-
+ .../gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h | 2 +-
+ .../drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h | 1 +
+ .../gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h | 5 +-
+ .../drm/msm/disp/dpu1/catalog/dpu_8_4_sa8775p.h | 2 +-
+ .../gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h | 5 +-
+ .../drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h | 5 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c | 140 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.h | 10 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 233 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h | 3 +
+ drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 476 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h | 12 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h | 7 +-
+ .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 5 +-
+ .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c | 16 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 40 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_cdm.c | 4 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 30 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.h | 15 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h | 2 +
+ drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 21 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 13 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 298 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h | 14 +-
+ .../gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c | 2 +-
+ drivers/gpu/drm/msm/disp/mdp5/mdp5_ctl.c | 3 +-
+ drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 2 +-
+ drivers/gpu/drm/msm/dp/dp_ctrl.c | 25 +-
+ drivers/gpu/drm/msm/dp/dp_display.c | 47 +-
+ drivers/gpu/drm/msm/dp/dp_drm.c | 24 +-
+ drivers/gpu/drm/msm/dp/dp_drm.h | 6 +-
+ drivers/gpu/drm/msm/dsi/dsi_host.c | 193 +-
+ drivers/gpu/drm/msm/dsi/dsi_manager.c | 32 +-
+ drivers/gpu/drm/msm/dsi/phy/dsi_phy.h | 5 +-
+ drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c | 1 +
+ drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c | 1 +
+ drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c | 1 +
+ drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c | 1 +
+ drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c | 21 +-
+ drivers/gpu/drm/msm/hdmi/hdmi.c | 120 +-
+ drivers/gpu/drm/msm/hdmi/hdmi.h | 31 +-
+ drivers/gpu/drm/msm/hdmi/hdmi_audio.c | 122 +-
+ drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 334 +-
+ drivers/gpu/drm/msm/msm_atomic.c | 15 +-
+ drivers/gpu/drm/msm/msm_drv.c | 1 +
+ drivers/gpu/drm/msm/msm_dsc_helper.h | 11 -
+ drivers/gpu/drm/msm/msm_gem_submit.c | 2 +-
+ drivers/gpu/drm/msm/msm_gpu.c | 9 +
+ drivers/gpu/drm/msm/msm_gpu.h | 8 +
+ drivers/gpu/drm/msm/msm_iommu.c | 54 +-
+ drivers/gpu/drm/msm/msm_kms.c | 19 +-
+ drivers/gpu/drm/msm/msm_kms.h | 10 +
+ drivers/gpu/drm/msm/msm_mmu.h | 4 +-
+ drivers/gpu/drm/msm/msm_ringbuffer.c | 17 +-
+ .../gpu/drm/msm/registers/display/dsi_phy_7nm.xml | 1 +
+ drivers/gpu/drm/msm/registers/display/hdmi.xml | 2 +-
+ drivers/gpu/drm/nouveau/Kconfig | 18 +
+ drivers/gpu/drm/nouveau/dispnv04/Kbuild | 3 +
+ drivers/gpu/drm/nouveau/dispnv04/dfp.c | 17 +-
+ drivers/gpu/drm/nouveau/dispnv04/i2c/Kbuild | 5 +
+ .../drm/{ => nouveau/dispnv04}/i2c/ch7006_drv.c | 32 +-
+ .../drm/{ => nouveau/dispnv04}/i2c/ch7006_mode.c | 8 +-
+ .../drm/{ => nouveau/dispnv04}/i2c/ch7006_priv.h | 11 +-
+ .../drm/{ => nouveau/dispnv04}/i2c/sil164_drv.c | 35 +-
+ .../dispnv04/nouveau_i2c_encoder.c} | 95 +-
+ drivers/gpu/drm/nouveau/dispnv04/tvnv04.c | 24 +-
+ drivers/gpu/drm/nouveau/dispnv04/tvnv17.c | 6 +-
+ drivers/gpu/drm/nouveau/dispnv50/disp.c | 2 +-
+ .../gpu/drm/nouveau/include/dispnv04}/i2c/ch7006.h | 4 +-
+ .../drm/nouveau/include/dispnv04/i2c/encoder_i2c.h | 123 +-
+ .../gpu/drm/nouveau/include/dispnv04}/i2c/sil164.h | 4 +-
+ drivers/gpu/drm/nouveau/include/nvif/ioctl.h | 32 +-
+ drivers/gpu/drm/nouveau/include/nvkm/subdev/gsp.h | 8 +-
+ drivers/gpu/drm/nouveau/nouveau_connector.c | 12 +-
+ drivers/gpu/drm/nouveau/nouveau_dp.c | 17 +-
+ drivers/gpu/drm/nouveau/nouveau_drm.c | 2 +-
+ drivers/gpu/drm/nouveau/nouveau_encoder.h | 13 +-
+ drivers/gpu/drm/nouveau/nouveau_sched.c | 16 +-
+ drivers/gpu/drm/nouveau/nouveau_svm.c | 4 +-
+ drivers/gpu/drm/nouveau/nvif/object.c | 12 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c | 735 +-
+ drivers/gpu/drm/omapdrm/dss/dss.c | 14 +-
+ drivers/gpu/drm/omapdrm/dss/hdmi4.c | 5 +-
+ drivers/gpu/drm/omapdrm/dss/hdmi5.c | 5 +-
+ drivers/gpu/drm/omapdrm/dss/hdmi5_core.c | 17 -
+ drivers/gpu/drm/omapdrm/dss/hdmi5_core.h | 1 -
+ drivers/gpu/drm/panel/Kconfig | 31 +
+ drivers/gpu/drm/panel/Makefile | 3 +
+ drivers/gpu/drm/panel/panel-ebbg-ft8719.c | 67 +-
+ drivers/gpu/drm/panel/panel-edp.c | 23 +
+ drivers/gpu/drm/panel/panel-himax-hx83102.c | 380 +
+ drivers/gpu/drm/panel/panel-ilitek-ili9882t.c | 2 +-
+ drivers/gpu/drm/panel/panel-raydium-rm67200.c | 499 +
+ .../drm/panel/panel-samsung-s6e88a0-ams452ef01.c | 91 +-
+ drivers/gpu/drm/panel/panel-sharp-ls060t1sx01.c | 59 +-
+ drivers/gpu/drm/panel/panel-simple.c | 64 +
+ drivers/gpu/drm/panel/panel-sony-td4353-jdi.c | 107 +-
+ drivers/gpu/drm/panel/panel-summit.c | 132 +
+ drivers/gpu/drm/panel/panel-visionox-r66451.c | 181 +-
+ drivers/gpu/drm/panel/panel-visionox-rm692e5.c | 442 +
+ drivers/gpu/drm/panel/panel-xinpeng-xpp055c272.c | 174 +-
+ drivers/gpu/drm/panfrost/panfrost_job.c | 20 +-
+ drivers/gpu/drm/panthor/panthor_device.c | 22 +-
+ drivers/gpu/drm/panthor/panthor_drv.c | 14 +
+ drivers/gpu/drm/panthor/panthor_fw.c | 10 +-
+ drivers/gpu/drm/panthor/panthor_fw.h | 6 +-
+ drivers/gpu/drm/panthor/panthor_gem.h | 5 -
+ drivers/gpu/drm/panthor/panthor_heap.c | 54 +-
+ drivers/gpu/drm/panthor/panthor_heap.h | 2 +
+ drivers/gpu/drm/panthor/panthor_mmu.c | 114 +-
+ drivers/gpu/drm/panthor/panthor_mmu.h | 3 +
+ drivers/gpu/drm/panthor/panthor_sched.c | 115 +-
+ drivers/gpu/drm/panthor/panthor_sched.h | 3 +
+ drivers/gpu/drm/qxl/qxl_display.c | 2 +-
+ drivers/gpu/drm/radeon/atombios_dp.c | 2 +-
+ drivers/gpu/drm/radeon/ci_dpm.c | 34 +-
+ drivers/gpu/drm/radeon/radeon_connectors.c | 10 +-
+ drivers/gpu/drm/radeon/radeon_device.c | 6 +-
+ drivers/gpu/drm/radeon/radeon_fence.c | 2 +-
+ drivers/gpu/drm/radeon/radeon_mode.h | 2 +-
+ drivers/gpu/drm/radeon/si.c | 2 +-
+ drivers/gpu/drm/renesas/rcar-du/rcar_lvds.c | 5 +-
+ drivers/gpu/drm/renesas/rcar-du/rcar_mipi_dsi.c | 4 +-
+ drivers/gpu/drm/renesas/rz-du/rzg2l_mipi_dsi.c | 5 +-
+ drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 114 +-
+ drivers/gpu/drm/rockchip/cdn-dp-core.c | 2 +-
+ drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 16 +-
+ drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c | 250 +-
+ drivers/gpu/drm/rockchip/inno_hdmi.c | 4 +-
+ drivers/gpu/drm/rockchip/rk3066_hdmi.c | 2 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 6 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 2 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 1592 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_vop2.h | 278 +-
+ drivers/gpu/drm/rockchip/rockchip_lvds.c | 80 +-
+ drivers/gpu/drm/rockchip/rockchip_vop2_reg.c | 1798 +-
+ drivers/gpu/drm/scheduler/sched_entity.c | 25 +-
+ drivers/gpu/drm/scheduler/sched_fence.c | 2 +
+ drivers/gpu/drm/scheduler/sched_internal.h | 91 +
+ drivers/gpu/drm/scheduler/sched_main.c | 131 +-
+ drivers/gpu/drm/solomon/ssd130x-spi.c | 7 +-
+ drivers/gpu/drm/solomon/ssd130x.c | 6 +-
+ drivers/gpu/drm/sti/sti_dvo.c | 2 +-
+ drivers/gpu/drm/sti/sti_hda.c | 12 +-
+ drivers/gpu/drm/sti/sti_hdmi.c | 2 +-
+ drivers/gpu/drm/stm/ltdc.c | 4 +-
+ drivers/gpu/drm/stm/lvds.c | 5 +-
+ drivers/gpu/drm/tegra/dc.c | 3 +-
+ drivers/gpu/drm/tegra/dsi.c | 2 +-
+ drivers/gpu/drm/tegra/hdmi.c | 2 +-
+ drivers/gpu/drm/tegra/sor.c | 2 +-
+ drivers/gpu/drm/tests/Makefile | 1 +
+ drivers/gpu/drm/tests/drm_atomic_state_test.c | 379 +
+ drivers/gpu/drm/tests/drm_buddy_test.c | 30 +-
+ drivers/gpu/drm/tests/drm_format_helper_test.c | 81 +
+ drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c | 254 +-
+ drivers/gpu/drm/tests/drm_kunit_helpers.c | 41 -
+ drivers/gpu/drm/tidss/tidss_dispc_regs.h | 2 +-
+ drivers/gpu/drm/tidss/tidss_plane.c | 2 +-
+ drivers/gpu/drm/tiny/Kconfig | 12 +
+ drivers/gpu/drm/tiny/Makefile | 1 +
+ drivers/gpu/drm/tiny/appletbdrm.c | 841 +
+ drivers/gpu/drm/tiny/arcpgu.c | 4 +-
+ drivers/gpu/drm/tiny/repaper.c | 4 +-
+ drivers/gpu/drm/ttm/Makefile | 2 +-
+ drivers/gpu/drm/ttm/ttm_backup.c | 207 +
+ drivers/gpu/drm/ttm/ttm_bo.c | 3 +-
+ drivers/gpu/drm/ttm/ttm_bo_util.c | 250 +-
+ drivers/gpu/drm/ttm/ttm_pool.c | 776 +-
+ drivers/gpu/drm/ttm/ttm_resource.c | 50 +-
+ drivers/gpu/drm/ttm/ttm_tt.c | 83 +
+ drivers/gpu/drm/v3d/v3d_drv.c | 25 +-
+ drivers/gpu/drm/v3d/v3d_drv.h | 1 -
+ drivers/gpu/drm/v3d/v3d_sched.c | 67 +-
+ drivers/gpu/drm/vboxvideo/hgsmi_base.c | 37 -
+ drivers/gpu/drm/vboxvideo/vboxvideo_guest.h | 2 -
+ drivers/gpu/drm/vc4/Kconfig | 1 +
+ drivers/gpu/drm/vc4/tests/vc4_test_pv_muxing.c | 46 +-
+ drivers/gpu/drm/vc4/vc4_crtc.c | 33 +-
+ drivers/gpu/drm/vc4/vc4_drv.h | 27 -
+ drivers/gpu/drm/vc4/vc4_dsi.c | 9 +-
+ drivers/gpu/drm/vc4/vc4_gem.c | 183 +-
+ drivers/gpu/drm/vc4/vc4_hdmi.c | 111 +-
+ drivers/gpu/drm/vc4/vc4_plane.c | 2 +-
+ drivers/gpu/drm/vc4/vc4_txp.c | 2 +-
+ drivers/gpu/drm/vc4/vc4_validate.c | 11 -
+ drivers/gpu/drm/virtio/virtgpu_display.c | 2 +-
+ drivers/gpu/drm/virtio/virtgpu_drv.c | 41 +-
+ drivers/gpu/drm/virtio/virtgpu_drv.h | 11 +
+ drivers/gpu/drm/virtio/virtgpu_gem.c | 14 +
+ drivers/gpu/drm/virtio/virtgpu_plane.c | 96 +
+ drivers/gpu/drm/virtio/virtgpu_prime.c | 36 +-
+ drivers/gpu/drm/virtio/virtgpu_vq.c | 154 +
+ drivers/gpu/drm/virtio/virtgpu_vram.c | 9 +-
+ drivers/gpu/drm/vkms/vkms_crtc.c | 35 +-
+ drivers/gpu/drm/vkms/vkms_drv.c | 24 +-
+ drivers/gpu/drm/vkms/vkms_drv.h | 11 +-
+ drivers/gpu/drm/vkms/vkms_formats.c | 32 +
+ drivers/gpu/drm/vkms/vkms_output.c | 61 +-
+ drivers/gpu/drm/vkms/vkms_plane.c | 1 +
+ drivers/gpu/drm/vkms/vkms_writeback.c | 37 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 2 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 2 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 2 +-
+ drivers/gpu/drm/xe/Kconfig | 24 +
+ drivers/gpu/drm/xe/Kconfig.profile | 1 +
+ drivers/gpu/drm/xe/Makefile | 28 +-
+ drivers/gpu/drm/xe/abi/gsc_pxp_commands_abi.h | 41 +
+ drivers/gpu/drm/xe/abi/guc_actions_abi.h | 1 +
+ drivers/gpu/drm/xe/abi/guc_actions_slpc_abi.h | 3 +
+ .../xe/compat-i915-headers/gem/i915_gem_object.h | 15 +
+ .../xe/compat-i915-headers/gem/i915_gem_stolen.h | 5 +
+ drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h | 8 -
+ .../xe/compat-i915-headers/i915_gtt_view_types.h | 7 +
+ .../xe/compat-i915-headers/i915_scheduler_types.h | 13 +
+ drivers/gpu/drm/xe/compat-i915-headers/i915_vma.h | 3 +
+ .../drm/xe/compat-i915-headers/i915_vma_types.h | 74 -
+ .../gpu/drm/xe/compat-i915-headers/intel_uncore.h | 2 +
+ .../gpu/drm/xe/compat-i915-headers/pxp/intel_pxp.h | 19 +-
+ drivers/gpu/drm/xe/display/ext/i915_irq.c | 23 +
+ drivers/gpu/drm/xe/display/intel_bo.c | 2 +-
+ drivers/gpu/drm/xe/display/intel_fb_bo.c | 11 +-
+ drivers/gpu/drm/xe/display/intel_fbdev_fb.c | 4 +-
+ drivers/gpu/drm/xe/display/xe_display.c | 201 +-
+ drivers/gpu/drm/xe/display/xe_display.h | 11 +-
+ drivers/gpu/drm/xe/display/xe_display_rps.c | 2 +-
+ drivers/gpu/drm/xe/display/xe_fb_pin.c | 50 +-
+ drivers/gpu/drm/xe/display/xe_plane_initial.c | 21 +-
+ drivers/gpu/drm/xe/display/xe_tdf.c | 6 +-
+ drivers/gpu/drm/xe/instructions/xe_instr_defs.h | 1 +
+ drivers/gpu/drm/xe/instructions/xe_mfx_commands.h | 28 +
+ drivers/gpu/drm/xe/instructions/xe_mi_commands.h | 5 +
+ drivers/gpu/drm/xe/regs/xe_engine_regs.h | 1 +
+ drivers/gpu/drm/xe/regs/xe_eu_stall_regs.h | 29 +
+ drivers/gpu/drm/xe/regs/xe_gt_regs.h | 13 +-
+ drivers/gpu/drm/xe/regs/xe_irq_regs.h | 8 +
+ drivers/gpu/drm/xe/regs/xe_mchbar_regs.h | 3 +
+ drivers/gpu/drm/xe/regs/xe_pcode_regs.h | 2 +
+ drivers/gpu/drm/xe/regs/xe_pxp_regs.h | 23 +
+ drivers/gpu/drm/xe/regs/xe_reg_defs.h | 28 +-
+ drivers/gpu/drm/xe/regs/xe_regs.h | 4 -
+ drivers/gpu/drm/xe/tests/xe_bo.c | 6 +-
+ drivers/gpu/drm/xe/tests/xe_guc_buf_kunit.c | 334 +
+ drivers/gpu/drm/xe/tests/xe_pci.c | 26 +-
+ drivers/gpu/drm/xe/xe_bo.c | 431 +-
+ drivers/gpu/drm/xe/xe_bo.h | 64 +
+ drivers/gpu/drm/xe/xe_bo_types.h | 10 +
+ drivers/gpu/drm/xe/xe_debugfs.c | 6 +-
+ drivers/gpu/drm/xe/xe_devcoredump.c | 8 +-
+ drivers/gpu/drm/xe/xe_device.c | 253 +-
+ drivers/gpu/drm/xe/xe_device.h | 5 +
+ drivers/gpu/drm/xe/xe_device_sysfs.c | 6 -
+ drivers/gpu/drm/xe/xe_device_types.h | 66 +-
+ drivers/gpu/drm/xe/xe_drm_client.c | 8 +
+ drivers/gpu/drm/xe/xe_eu_stall.c | 960 +
+ drivers/gpu/drm/xe/xe_eu_stall.h | 24 +
+ drivers/gpu/drm/xe/xe_exec.c | 6 +
+ drivers/gpu/drm/xe/xe_exec_queue.c | 77 +-
+ drivers/gpu/drm/xe/xe_exec_queue.h | 5 +
+ drivers/gpu/drm/xe/xe_exec_queue_types.h | 10 +
+ drivers/gpu/drm/xe/xe_execlist.c | 17 +-
+ drivers/gpu/drm/xe/xe_gen_wa_oob.c | 6 +-
+ drivers/gpu/drm/xe/xe_gpu_scheduler.c | 17 +-
+ drivers/gpu/drm/xe/xe_gsc.c | 9 -
+ drivers/gpu/drm/xe/xe_gsc.h | 1 -
+ drivers/gpu/drm/xe/xe_gsc_proxy.c | 63 +-
+ drivers/gpu/drm/xe/xe_gsc_proxy.h | 1 -
+ drivers/gpu/drm/xe/xe_gsc_types.h | 1 +
+ drivers/gpu/drm/xe/xe_gt.c | 73 +-
+ drivers/gpu/drm/xe/xe_gt.h | 1 -
+ drivers/gpu/drm/xe/xe_gt_clock.c | 53 +-
+ drivers/gpu/drm/xe/xe_gt_debugfs.c | 11 +
+ drivers/gpu/drm/xe/xe_gt_idle.c | 23 +-
+ drivers/gpu/drm/xe/xe_gt_idle.h | 1 +
+ drivers/gpu/drm/xe/xe_gt_idle_types.h | 3 +
+ drivers/gpu/drm/xe/xe_gt_mcr.c | 8 +-
+ drivers/gpu/drm/xe/xe_gt_pagefault.c | 29 +-
+ drivers/gpu/drm/xe/xe_gt_sriov_pf.c | 49 +-
+ drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c | 161 +-
+ drivers/gpu/drm/xe/xe_gt_sriov_pf_config.h | 1 +
+ drivers/gpu/drm/xe/xe_gt_sriov_pf_policy.c | 50 +-
+ drivers/gpu/drm/xe/xe_gt_sriov_pf_service.c | 28 +-
+ drivers/gpu/drm/xe/xe_gt_sriov_pf_types.h | 10 +
+ drivers/gpu/drm/xe/xe_gt_sriov_vf.c | 28 +-
+ drivers/gpu/drm/xe/xe_gt_sriov_vf.h | 1 +
+ drivers/gpu/drm/xe/xe_gt_stats.c | 8 +-
+ drivers/gpu/drm/xe/xe_gt_stats_types.h | 2 +
+ drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c | 22 +
+ drivers/gpu/drm/xe/xe_gt_tlb_invalidation.h | 2 +
+ drivers/gpu/drm/xe/xe_gt_topology.c | 16 +-
+ drivers/gpu/drm/xe/xe_gt_topology.h | 13 +
+ drivers/gpu/drm/xe/xe_gt_types.h | 15 +-
+ drivers/gpu/drm/xe/xe_guc.c | 10 +
+ drivers/gpu/drm/xe/xe_guc_ads.c | 2 +-
+ drivers/gpu/drm/xe/xe_guc_buf.c | 176 +
+ drivers/gpu/drm/xe/xe_guc_buf.h | 47 +
+ drivers/gpu/drm/xe/xe_guc_buf_types.h | 28 +
+ drivers/gpu/drm/xe/xe_guc_debugfs.c | 28 +
+ drivers/gpu/drm/xe/xe_guc_engine_activity.c | 373 +
+ drivers/gpu/drm/xe/xe_guc_engine_activity.h | 19 +
+ drivers/gpu/drm/xe/xe_guc_engine_activity_types.h | 92 +
+ drivers/gpu/drm/xe/xe_guc_fwif.h | 19 +
+ drivers/gpu/drm/xe/xe_guc_log.c | 8 +-
+ drivers/gpu/drm/xe/xe_guc_pc.c | 97 +-
+ drivers/gpu/drm/xe/xe_guc_pc.h | 2 +
+ drivers/gpu/drm/xe/xe_guc_relay.c | 2 +-
+ drivers/gpu/drm/xe/xe_guc_submit.c | 8 +
+ drivers/gpu/drm/xe/xe_guc_types.h | 7 +
+ drivers/gpu/drm/xe/xe_heci_gsc.c | 40 +-
+ drivers/gpu/drm/xe/xe_heci_gsc.h | 3 +-
+ drivers/gpu/drm/xe/xe_hw_engine_group.c | 1 +
+ drivers/gpu/drm/xe/xe_hwmon.c | 91 +-
+ drivers/gpu/drm/xe/xe_hwmon.h | 4 +-
+ drivers/gpu/drm/xe/xe_irq.c | 20 +-
+ drivers/gpu/drm/xe/xe_lmtt.c | 4 +-
+ drivers/gpu/drm/xe/xe_lrc.c | 18 +-
+ drivers/gpu/drm/xe/xe_lrc.h | 7 +-
+ drivers/gpu/drm/xe/xe_migrate.c | 175 +
+ drivers/gpu/drm/xe/xe_migrate.h | 10 +
+ drivers/gpu/drm/xe/xe_mmio.c | 77 +-
+ drivers/gpu/drm/xe/xe_mmio.h | 4 +-
+ drivers/gpu/drm/xe/xe_module.c | 12 +-
+ drivers/gpu/drm/xe/xe_module.h | 2 +
+ drivers/gpu/drm/xe/xe_oa.c | 125 +-
+ drivers/gpu/drm/xe/xe_oa.h | 4 +-
+ drivers/gpu/drm/xe/xe_observation.c | 14 +
+ drivers/gpu/drm/xe/xe_pci.c | 302 +-
+ drivers/gpu/drm/xe/xe_pci_sriov.c | 51 +
+ drivers/gpu/drm/xe/xe_pci_types.h | 20 +-
+ drivers/gpu/drm/xe/xe_pcode_api.h | 14 +
+ drivers/gpu/drm/xe/xe_pm.c | 41 +-
+ drivers/gpu/drm/xe/xe_pmu.c | 531 +
+ drivers/gpu/drm/xe/xe_pmu.h | 18 +
+ drivers/gpu/drm/xe/xe_pmu_types.h | 39 +
+ drivers/gpu/drm/xe/xe_pt.c | 399 +-
+ drivers/gpu/drm/xe/xe_pt.h | 5 +
+ drivers/gpu/drm/xe/xe_pt_types.h | 2 +
+ drivers/gpu/drm/xe/xe_pxp.c | 919 +
+ drivers/gpu/drm/xe/xe_pxp.h | 35 +
+ drivers/gpu/drm/xe/xe_pxp_debugfs.c | 120 +
+ drivers/gpu/drm/xe/xe_pxp_debugfs.h | 13 +
+ drivers/gpu/drm/xe/xe_pxp_submit.c | 588 +
+ drivers/gpu/drm/xe/xe_pxp_submit.h | 22 +
+ drivers/gpu/drm/xe/xe_pxp_types.h | 135 +
+ drivers/gpu/drm/xe/xe_query.c | 82 +-
+ drivers/gpu/drm/xe/xe_res_cursor.h | 123 +-
+ drivers/gpu/drm/xe/xe_ring_ops.c | 8 +-
+ drivers/gpu/drm/xe/xe_sa.c | 51 +-
+ drivers/gpu/drm/xe/xe_sa.h | 30 +-
+ drivers/gpu/drm/xe/xe_sched_job_types.h | 4 +-
+ drivers/gpu/drm/xe/xe_shrinker.c | 258 +
+ drivers/gpu/drm/xe/xe_shrinker.h | 18 +
+ drivers/gpu/drm/xe/xe_sriov.c | 2 +-
+ drivers/gpu/drm/xe/xe_survivability_mode.c | 237 +
+ drivers/gpu/drm/xe/xe_survivability_mode.h | 17 +
+ drivers/gpu/drm/xe/xe_survivability_mode_types.h | 35 +
+ drivers/gpu/drm/xe/xe_svm.c | 946 +
+ drivers/gpu/drm/xe/xe_svm.h | 150 +
+ drivers/gpu/drm/xe/xe_sync.c | 1 +
+ drivers/gpu/drm/xe/xe_tile.c | 23 +-
+ drivers/gpu/drm/xe/xe_tile.h | 1 +
+ drivers/gpu/drm/xe/xe_trace.h | 30 +
+ drivers/gpu/drm/xe/xe_trace_bo.h | 19 +-
+ drivers/gpu/drm/xe/xe_trace_guc.h | 49 +
+ drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c | 17 +-
+ drivers/gpu/drm/xe/xe_ttm_stolen_mgr.h | 2 +-
+ drivers/gpu/drm/xe/xe_ttm_sys_mgr.c | 3 +-
+ drivers/gpu/drm/xe/xe_ttm_vram_mgr.c | 3 +-
+ drivers/gpu/drm/xe/xe_ttm_vram_mgr_types.h | 4 -
+ drivers/gpu/drm/xe/xe_tuning.c | 72 +-
+ drivers/gpu/drm/xe/xe_tuning.h | 3 +
+ drivers/gpu/drm/xe/xe_uc.c | 16 +-
+ drivers/gpu/drm/xe/xe_uc.h | 1 -
+ drivers/gpu/drm/xe/xe_vm.c | 540 +-
+ drivers/gpu/drm/xe/xe_vm.h | 23 +-
+ drivers/gpu/drm/xe/xe_vm_doc.h | 2 +-
+ drivers/gpu/drm/xe/xe_vm_types.h | 58 +
+ drivers/gpu/drm/xe/xe_wa.c | 27 +-
+ drivers/gpu/drm/xe/xe_wa_oob.rules | 11 +
+ drivers/gpu/drm/xlnx/zynqmp_dp.c | 165 +-
+ drivers/gpu/drm/xlnx/zynqmp_dp_audio.c | 4 +
+ drivers/gpu/drm/xlnx/zynqmp_dpsub.c | 2 +
+ drivers/gpu/host1x/debug.c | 9 -
+ drivers/gpu/host1x/debug.h | 1 -
+ drivers/gpu/ipu-v3/ipu-common.c | 38 -
+ drivers/gpu/ipu-v3/ipu-cpmem.c | 23 -
+ drivers/gpu/ipu-v3/ipu-csi.c | 108 -
+ drivers/gpu/ipu-v3/ipu-ic.c | 73 -
+ drivers/gpu/ipu-v3/ipu-image-convert.c | 48 -
+ drivers/gpu/ipu-v3/ipu-prv.h | 2 -
+ drivers/gpu/ipu-v3/ipu-vdi.c | 11 -
+ drivers/gpu/nova-core/Kconfig | 14 +
+ drivers/gpu/nova-core/Makefile | 3 +
+ drivers/gpu/nova-core/driver.rs | 47 +
+ drivers/gpu/nova-core/firmware.rs | 45 +
+ drivers/gpu/nova-core/gpu.rs | 199 +
+ drivers/gpu/nova-core/nova_core.rs | 20 +
+ drivers/gpu/nova-core/regs.rs | 55 +
+ drivers/gpu/nova-core/util.rs | 21 +
+ drivers/media/cec/i2c/Kconfig | 9 +
+ drivers/media/cec/i2c/Makefile | 1 +
+ drivers/{gpu/drm => media/cec}/i2c/tda9950.c | 0
+ drivers/staging/fbtft/fbtft-core.c | 4 +-
+ drivers/video/Kconfig | 1 +
+ include/Kbuild | 1 +
+ include/drm/Makefile | 18 +
+ include/drm/display/drm_dp.h | 17 +-
+ include/drm/display/drm_dp_dual_mode_helper.h | 2 +-
+ include/drm/display/drm_dp_helper.h | 3 +
+ include/drm/display/drm_dp_mst_helper.h | 7 +
+ include/drm/display/drm_hdmi_state_helper.h | 2 +-
+ include/drm/drm_atomic.h | 54 +-
+ include/drm/drm_atomic_helper.h | 2 +
+ include/drm/drm_bridge.h | 8 +-
+ include/drm/drm_client.h | 8 +
+ include/drm/drm_client_event.h | 2 +
+ include/drm/drm_crtc.h | 2 +-
+ include/drm/drm_damage_helper.h | 2 +-
+ include/drm/drm_device.h | 8 +
+ include/drm/drm_drv.h | 1 +
+ include/drm/drm_fb_helper.h | 44 +-
+ include/drm/drm_file.h | 5 +
+ include/drm/drm_format_helper.h | 6 +
+ include/drm/drm_gem.h | 14 +
+ include/drm/drm_gem_shmem_helper.h | 2 +-
+ include/drm/drm_gpusvm.h | 509 +
+ include/drm/drm_gpuvm.h | 5 +
+ include/drm/drm_kunit_helpers.h | 2 -
+ include/drm/drm_managed.h | 12 +
+ include/drm/drm_mipi_dsi.h | 2 +-
+ include/drm/drm_mode_object.h | 2 +-
+ include/drm/drm_modeset_helper_vtables.h | 11 +-
+ include/drm/drm_pagemap.h | 107 +
+ include/drm/drm_panel.h | 1 -
+ include/drm/drm_print.h | 41 +-
+ include/drm/drm_writeback.h | 6 +
+ include/drm/gpu_scheduler.h | 180 +-
+ include/drm/i2c/tda998x.h | 40 -
+ include/drm/intel/pciids.h | 18 +-
+ include/drm/ttm/ttm_backup.h | 74 +
+ include/drm/ttm/ttm_bo.h | 93 +
+ include/drm/ttm/ttm_pool.h | 8 +
+ include/drm/ttm/ttm_resource.h | 11 +-
+ include/drm/ttm/ttm_tt.h | 69 +-
+ include/dt-bindings/clock/qcom,dsi-phy-28nm.h | 9 +
+ include/linux/component.h | 4 +-
+ include/linux/migrate.h | 1 +
+ include/sound/hdmi-codec.h | 1 +
+ include/uapi/drm/amdgpu_drm.h | 10 +
+ include/uapi/drm/drm_fourcc.h | 41 +
+ include/uapi/drm/ivpu_accel.h | 84 +
+ include/uapi/drm/panthor_drm.h | 86 +-
+ include/uapi/drm/xe_drm.h | 240 +-
+ include/uapi/linux/kfd_ioctl.h | 10 +-
+ include/uapi/linux/kfd_sysfs.h | 3 +
+ include/video/imx-ipu-image-convert.h | 32 -
+ include/video/imx-ipu-v3.h | 14 -
+ mm/memory.c | 15 +-
+ mm/migrate_device.c | 120 +-
+ rust/kernel/firmware.rs | 216 +
+ rust/macros/module.rs | 4 +
+ sound/soc/codecs/hdmi-codec.c | 4 +
+ 1567 files changed, 139994 insertions(+), 39013 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/display/apple,h7-display-pipe-mipi.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/apple,h7-display-pipe.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/panel/apple,summit.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/panel/raydium,rm67200.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/panel/visionox,rm692e5.yaml
+ create mode 100644 Documentation/gpu/nouveau.rst
+ create mode 100644 Documentation/gpu/nova/core/guidelines.rst
+ create mode 100644 Documentation/gpu/nova/core/todo.rst
+ create mode 100644 Documentation/gpu/nova/guidelines.rst
+ create mode 100644 Documentation/gpu/nova/index.rst
+ create mode 100644 Documentation/gpu/rfc/gpusvm.rst
+ create mode 100644 drivers/gpu/drm/adp/Kconfig
+ create mode 100644 drivers/gpu/drm/adp/Makefile
+ create mode 100644 drivers/gpu/drm/adp/adp-mipi.c
+ create mode 100644 drivers/gpu/drm/adp/adp_drv.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_cper.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_cper.h
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/gfx_v10_1_10_cleaner_shader.asm
+ delete mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_pasid.c
+ delete mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_core/dml2_core_shared.c
+ delete mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_top/dml_top.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn36/irq_service_dcn36.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn36/irq_service_dcn36.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/resource/dcn36/dcn36_resource.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/resource/dcn36/dcn36_resource.h
+ delete mode 100644 drivers/gpu/drm/amd/display/dc/spl/dc_spl.h
+ delete mode 100644 drivers/gpu/drm/amd/display/dc/spl/dc_spl_scl_filters.h
+ rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/Makefile (96%)
+ rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/dc_spl.c (96%)
+ create mode 100644 drivers/gpu/drm/amd/display/dc/sspl/dc_spl.h
+ rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/dc_spl_filters.c (100%)
+ rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/dc_spl_filters.h (100%)
+ rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/dc_spl_isharp_filters.c (62%)
+ rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/dc_spl_isharp_filters.h (61%)
+ rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/dc_spl_scl_easf_filters.c (60%)
+ rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/dc_spl_scl_easf_filters.h (79%)
+ rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/dc_spl_scl_filters.c (87%)
+ create mode 100644 drivers/gpu/drm/amd/display/dc/sspl/dc_spl_scl_filters.h
+ rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/dc_spl_types.h (98%)
+ rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/spl_custom_float.c (100%)
+ rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/spl_custom_float.h (100%)
+ rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/spl_debug.h (100%)
+ rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/spl_fixpt31_32.c (99%)
+ rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/spl_fixpt31_32.h (99%)
+ rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/spl_os_types.h (100%)
+ create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn36.c
+ create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn36.h
+ create mode 100644 drivers/gpu/drm/amd/include/amd_cper.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_6_0_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_6_0_sh_mask.h
+ create mode 100644 drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v13_0_12_pmfw.h
+ create mode 100644 drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v13_0_12_ppsmc.h
+ create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_12_ppt.c
+ create mode 100644 drivers/gpu/drm/ast/ast_cursor.c
+ create mode 100644 drivers/gpu/drm/ast/ast_vbios.c
+ create mode 100644 drivers/gpu/drm/ast/ast_vbios.h
+ rename drivers/gpu/drm/{i2c => bridge}/tda998x_drv.c (97%)
+ create mode 100644 drivers/gpu/drm/drm_gpusvm.c
+ delete mode 100644 drivers/gpu/drm/i2c/Kconfig
+ delete mode 100644 drivers/gpu/drm/i2c/Makefile
+ create mode 100644 drivers/gpu/drm/i915/display/intel_cmtg.c
+ create mode 100644 drivers/gpu/drm/i915/display/intel_cmtg.h
+ create mode 100644 drivers/gpu/drm/i915/display/intel_cmtg_regs.h
+ create mode 100644 drivers/gpu/drm/i915/display/intel_pfit_regs.h
+ create mode 100644 drivers/gpu/drm/i915/display/intel_snps_hdmi_pll.c
+ create mode 100644 drivers/gpu/drm/i915/display/intel_snps_hdmi_pll.h
+ create mode 100644 drivers/gpu/drm/i915/i915_gtt_view_types.h
+ create mode 100644 drivers/gpu/drm/mgag200/mgag200_g200eh5.c
+ create mode 100644 drivers/gpu/drm/nouveau/dispnv04/i2c/Kbuild
+ rename drivers/gpu/drm/{ => nouveau/dispnv04}/i2c/ch7006_drv.c (94%)
+ rename drivers/gpu/drm/{ => nouveau/dispnv04}/i2c/ch7006_mode.c (98%)
+ rename drivers/gpu/drm/{ => nouveau/dispnv04}/i2c/ch7006_priv.h (97%)
+ rename drivers/gpu/drm/{ => nouveau/dispnv04}/i2c/sil164_drv.c (92%)
+ rename drivers/gpu/drm/{drm_encoder_slave.c => nouveau/dispnv04/nouveau_i2c_encoder.c} (54%)
+ rename {include/drm => drivers/gpu/drm/nouveau/include/dispnv04}/i2c/ch7006.h (97%)
+ rename include/drm/drm_encoder_slave.h => drivers/gpu/drm/nouveau/include/dispnv04/i2c/encoder_i2c.h (59%)
+ rename {include/drm => drivers/gpu/drm/nouveau/include/dispnv04}/i2c/sil164.h (96%)
+ create mode 100644 drivers/gpu/drm/panel/panel-raydium-rm67200.c
+ create mode 100644 drivers/gpu/drm/panel/panel-summit.c
+ create mode 100644 drivers/gpu/drm/panel/panel-visionox-rm692e5.c
+ create mode 100644 drivers/gpu/drm/scheduler/sched_internal.h
+ create mode 100644 drivers/gpu/drm/tests/drm_atomic_state_test.c
+ create mode 100644 drivers/gpu/drm/tiny/appletbdrm.c
+ create mode 100644 drivers/gpu/drm/ttm/ttm_backup.c
+ create mode 100644 drivers/gpu/drm/xe/compat-i915-headers/gem/i915_gem_object.h
+ create mode 100644 drivers/gpu/drm/xe/compat-i915-headers/i915_gtt_view_types.h
+ create mode 100644 drivers/gpu/drm/xe/compat-i915-headers/i915_scheduler_types.h
+ delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/i915_vma_types.h
+ create mode 100644 drivers/gpu/drm/xe/instructions/xe_mfx_commands.h
+ create mode 100644 drivers/gpu/drm/xe/regs/xe_eu_stall_regs.h
+ create mode 100644 drivers/gpu/drm/xe/regs/xe_pxp_regs.h
+ create mode 100644 drivers/gpu/drm/xe/tests/xe_guc_buf_kunit.c
+ create mode 100644 drivers/gpu/drm/xe/xe_eu_stall.c
+ create mode 100644 drivers/gpu/drm/xe/xe_eu_stall.h
+ create mode 100644 drivers/gpu/drm/xe/xe_guc_buf.c
+ create mode 100644 drivers/gpu/drm/xe/xe_guc_buf.h
+ create mode 100644 drivers/gpu/drm/xe/xe_guc_buf_types.h
+ create mode 100644 drivers/gpu/drm/xe/xe_guc_engine_activity.c
+ create mode 100644 drivers/gpu/drm/xe/xe_guc_engine_activity.h
+ create mode 100644 drivers/gpu/drm/xe/xe_guc_engine_activity_types.h
+ create mode 100644 drivers/gpu/drm/xe/xe_pmu.c
+ create mode 100644 drivers/gpu/drm/xe/xe_pmu.h
+ create mode 100644 drivers/gpu/drm/xe/xe_pmu_types.h
+ create mode 100644 drivers/gpu/drm/xe/xe_pxp.c
+ create mode 100644 drivers/gpu/drm/xe/xe_pxp.h
+ create mode 100644 drivers/gpu/drm/xe/xe_pxp_debugfs.c
+ create mode 100644 drivers/gpu/drm/xe/xe_pxp_debugfs.h
+ create mode 100644 drivers/gpu/drm/xe/xe_pxp_submit.c
+ create mode 100644 drivers/gpu/drm/xe/xe_pxp_submit.h
+ create mode 100644 drivers/gpu/drm/xe/xe_pxp_types.h
+ create mode 100644 drivers/gpu/drm/xe/xe_shrinker.c
+ create mode 100644 drivers/gpu/drm/xe/xe_shrinker.h
+ create mode 100644 drivers/gpu/drm/xe/xe_survivability_mode.c
+ create mode 100644 drivers/gpu/drm/xe/xe_survivability_mode.h
+ create mode 100644 drivers/gpu/drm/xe/xe_survivability_mode_types.h
+ create mode 100644 drivers/gpu/drm/xe/xe_svm.c
+ create mode 100644 drivers/gpu/drm/xe/xe_svm.h
+ create mode 100644 drivers/gpu/nova-core/Kconfig
+ create mode 100644 drivers/gpu/nova-core/Makefile
+ create mode 100644 drivers/gpu/nova-core/driver.rs
+ create mode 100644 drivers/gpu/nova-core/firmware.rs
+ create mode 100644 drivers/gpu/nova-core/gpu.rs
+ create mode 100644 drivers/gpu/nova-core/nova_core.rs
+ create mode 100644 drivers/gpu/nova-core/regs.rs
+ create mode 100644 drivers/gpu/nova-core/util.rs
+ rename drivers/{gpu/drm => media/cec}/i2c/tda9950.c (100%)
+ create mode 100644 include/Kbuild
+ create mode 100644 include/drm/Makefile
+ create mode 100644 include/drm/drm_gpusvm.h
+ create mode 100644 include/drm/drm_pagemap.h
+ delete mode 100644 include/drm/i2c/tda998x.h
+ create mode 100644 include/drm/ttm/ttm_backup.h
+ create mode 100644 include/dt-bindings/clock/qcom,dsi-phy-28nm.h
+$ git am -3 ../patches/0001-fix-up-for-drm-gpusvm-Add-support-for-GPU-Shared-Vir.patch
+Applying: fix up for "drm/gpusvm: Add support for GPU Shared Virtual Memory"
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/gpu/drm/drm_gpusvm.c
+$ git add -A .
+$ git commit -v -a --amend
+[master 473c53b8679a] Merge branch 'drm-next' of https://gitlab.freedesktop.org/drm/kernel.git
+ Date: Mon Mar 17 13:43:33 2025 +1100
+$ git am -3 ../patches/0001-fixup-for-drm-xe-Add-drm_pagemap-ops-to-SVM.patch
+Applying: fixup for "drm/xe: Add drm_pagemap ops to SVM"
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/gpu/drm/xe/xe_svm.c
+$ git add -A .
+$ git commit -v -a --amend
+[master e144d9fa179d] Merge branch 'drm-next' of https://gitlab.freedesktop.org/drm/kernel.git
+ Date: Mon Mar 17 13:43:33 2025 +1100
+Merging drm-exynos/for-linux-next (81a50378559b drm/exynos: Remove unnecessary checking)
+$ 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
+Merge made by the 'ort' strategy.
+ drivers/gpu/drm/exynos/exynos_drm_drv.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+Merging drm-misc/for-linux-next (914ee6e730e1 drm/appletbdrm: Fix ref-counting on dmadev)
+$ git merge -m Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/misc/kernel.git drm-misc/for-linux-next
+Merge made by the 'ort' strategy.
+ drivers/gpu/drm/tiny/appletbdrm.c | 1 -
+ 1 file changed, 1 deletion(-)
+Merging amdgpu/drm-next (eb6cdfb807d0 drm/amdgpu: Restore uncached behaviour on GFX12)
+$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next
+Auto-merging drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c
+Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
+Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c
+Recorded preimage for 'drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c'
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+Recorded resolution for 'drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c'.
+[master d412f50faf7e] Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux
+$ git diff -M --stat --summary HEAD^..
+ .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_aldebaran.c | 2 +-
+ .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c | 2 +-
+ .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gc_9_4_3.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | 28 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.h | 5 +-
+ .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10_3.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 28 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.h | 5 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 3 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 3 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h | 6 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 30 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 9 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 9 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 2 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 73 ++-
+ drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 47 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c | 50 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 15 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/gfxhub_v2_1.c | 37 --
+ drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c | 22 +-
+ drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 59 +-
+ drivers/gpu/drm/amd/amdgpu/mes_v12_0.c | 43 +-
+ drivers/gpu/drm/amd/amdgpu/nv.c | 36 +-
+ drivers/gpu/drm/amd/amdgpu/si.c | 68 +-
+ drivers/gpu/drm/amd/amdgpu/si_enums.h | 12 -
+ drivers/gpu/drm/amd/amdgpu/sid.h | 369 +----------
+ drivers/gpu/drm/amd/amdgpu/soc15.c | 21 +-
+ drivers/gpu/drm/amd/amdgpu/soc21.c | 10 +-
+ drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 120 +++-
+ drivers/gpu/drm/amd/amdgpu/vi.c | 43 +-
+ drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h | 703 +++++++++++----------
+ .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx12.asm | 82 +--
+ drivers/gpu/drm/amd/amdkfd/kfd_debug.c | 12 +-
+ .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 45 +-
+ .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 11 +-
+ .../drm/amd/amdkfd/kfd_device_queue_manager_v9.c | 3 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 27 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 26 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c | 76 ++-
+ drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_vi.c | 4 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 28 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 39 +-
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 25 +-
+ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 42 +-
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 2 +-
+ .../amd/display/dc/clk_mgr/dcn315/dcn315_clk_mgr.c | 2 -
+ .../amd/display/dc/clk_mgr/dcn316/dcn316_clk_mgr.c | 2 -
+ drivers/gpu/drm/amd/display/dc/core/dc.c | 10 +-
+ .../gpu/drm/amd/display/dc/core/dc_hw_sequencer.c | 24 +-
+ drivers/gpu/drm/amd/display/dc/dc.h | 2 +-
+ drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 272 ++++----
+ drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 4 +-
+ drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 27 +-
+ drivers/gpu/drm/amd/display/dc/dc_helper.c | 2 +-
+ drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 1 +
+ drivers/gpu/drm/amd/display/dc/dce/dmub_abm_lcd.c | 3 +-
+ .../gpu/drm/amd/display/dc/dce/dmub_hw_lock_mgr.c | 4 +
+ drivers/gpu/drm/amd/display/dc/dce/dmub_replay.c | 19 +-
+ .../dml21/src/dml2_core/dml2_core_dcn4_calcs.c | 2 +
+ .../drm/amd/display/dc/hwss/dce110/dce110_hwseq.c | 17 +-
+ .../drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c | 7 +-
+ .../drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c | 8 +-
+ .../drm/amd/display/dc/hwss/dcn31/dcn31_hwseq.c | 4 +-
+ .../drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c | 3 +-
+ .../drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c | 10 +-
+ drivers/gpu/drm/amd/display/dc/hwss/hw_sequencer.h | 6 +
+ .../display/dc/link/protocols/link_dp_capability.c | 55 +-
+ .../amd/display/dc/link/protocols/link_dp_dpia.c | 1 +
+ .../display/dc/link/protocols/link_dp_training.c | 5 +-
+ .../dc/link/protocols/link_edp_panel_control.c | 25 +-
+ .../amd/display/dc/resource/dcn30/dcn30_resource.c | 3 +-
+ .../amd/display/dc/resource/dcn31/dcn31_resource.c | 3 +-
+ .../display/dc/resource/dcn314/dcn314_resource.c | 3 +-
+ .../display/dc/resource/dcn315/dcn315_resource.c | 40 +-
+ .../amd/display/dc/resource/dcn32/dcn32_resource.c | 3 +-
+ drivers/gpu/drm/amd/display/dc/sspl/dc_spl.h | 3 -
+ drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 143 +++--
+ drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 49 +-
+ drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.c | 75 +--
+ drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.h | 2 +-
+ drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c | 81 +--
+ drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.h | 2 +-
+ drivers/gpu/drm/amd/display/dmub/src/dmub_dcn32.c | 86 +--
+ drivers/gpu/drm/amd/display/dmub/src/dmub_dcn32.h | 2 +-
+ drivers/gpu/drm/amd/display/dmub/src/dmub_dcn35.c | 81 +--
+ drivers/gpu/drm/amd/display/dmub/src/dmub_dcn35.h | 2 +-
+ drivers/gpu/drm/amd/display/dmub/src/dmub_dcn401.c | 206 +++---
+ drivers/gpu/drm/amd/display/dmub/src/dmub_dcn401.h | 6 +-
+ drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 326 ++++++----
+ drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 5 +-
+ drivers/gpu/drm/amd/pm/amdgpu_pm.c | 29 +-
+ drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 8 +-
+ drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h | 4 +-
+ drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c | 6 +
+ .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 10 +
+ .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_12_ppt.c | 5 +
+ .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 10 +
+ .../gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c | 45 ++
+ drivers/gpu/drm/radeon/radeon_vce.c | 2 +-
+ 106 files changed, 2239 insertions(+), 1820 deletions(-)
+Merging drm-intel/for-linux-next (d115a38f3c07 Merge tag 'drm-intel-gt-next-2025-02-26' of https://gitlab.freedesktop.org/drm/i915/kernel into drm-next)
+$ git merge -m Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/i915/kernel drm-intel/for-linux-next
+Already up to date.
+Merging drm-msm/msm-next (83ee6d2ec52f dt-bindings: display/msm: dsi-controller-main: Add missing minItems)
+$ git merge -m Merge branch 'msm-next' of https://gitlab.freedesktop.org/drm/msm.git drm-msm/msm-next
+Already up to date.
+Merging drm-msm-lumag/msm-next-lumag (83ee6d2ec52f dt-bindings: display/msm: dsi-controller-main: Add missing minItems)
+$ 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-nova/nova-next (b28786b190d1 gpu: nova-core: add initial documentation)
+$ git merge -m Merge branch 'nova-next' of https://gitlab.freedesktop.org/drm/nova.git drm-nova/nova-next
+Already up to date.
+Merging drm-xe/drm-xe-next (278469ff569e drm/xe/eustall: Fix a possible pointer dereference after free)
+$ 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/drm_gpusvm.c
+Auto-merging drivers/gpu/drm/xe/display/xe_fb_pin.c
+Auto-merging drivers/gpu/drm/xe/xe_device.c
+Auto-merging drivers/gpu/drm/xe/xe_svm.c
+Merge made by the 'ort' strategy.
+ Documentation/gpu/rfc/gpusvm.rst | 15 ++-
+ drivers/gpu/drm/drm_gpusvm.c | 124 ++++++++++++---------
+ drivers/gpu/drm/xe/display/xe_fb_pin.c | 20 ++--
+ drivers/gpu/drm/xe/instructions/xe_alu_commands.h | 79 +++++++++++++
+ .../gpu/drm/xe/instructions/xe_gfxpipe_commands.h | 1 +
+ drivers/gpu/drm/xe/instructions/xe_mi_commands.h | 5 +
+ drivers/gpu/drm/xe/regs/xe_engine_regs.h | 4 +
+ drivers/gpu/drm/xe/tests/xe_rtp_test.c | 2 +-
+ drivers/gpu/drm/xe/xe_device.c | 16 ++-
+ drivers/gpu/drm/xe/xe_eu_stall.c | 8 +-
+ drivers/gpu/drm/xe/xe_force_wake.c | 6 -
+ drivers/gpu/drm/xe/xe_gt.c | 84 ++++++++++----
+ drivers/gpu/drm/xe/xe_gt_clock.c | 15 ++-
+ drivers/gpu/drm/xe/xe_gt_pagefault.c | 2 +-
+ drivers/gpu/drm/xe/xe_gt_sriov_pf_service.c | 6 -
+ drivers/gpu/drm/xe/xe_gt_stats.c | 1 +
+ drivers/gpu/drm/xe/xe_gt_stats_types.h | 1 +
+ drivers/gpu/drm/xe/xe_guc.c | 8 --
+ drivers/gpu/drm/xe/xe_hw_engine.c | 6 +-
+ drivers/gpu/drm/xe/xe_lrc.c | 1 +
+ drivers/gpu/drm/xe/xe_memirq.c | 2 +-
+ drivers/gpu/drm/xe/xe_mmio.c | 10 +-
+ drivers/gpu/drm/xe/xe_mocs.c | 4 +-
+ drivers/gpu/drm/xe/xe_reg_sr.c | 3 +
+ drivers/gpu/drm/xe/xe_reg_whitelist.c | 4 +-
+ drivers/gpu/drm/xe/xe_ring_ops.c | 28 ++---
+ drivers/gpu/drm/xe/xe_rtp.c | 7 +-
+ drivers/gpu/drm/xe/xe_rtp.h | 2 +-
+ drivers/gpu/drm/xe/xe_svm.c | 8 +-
+ drivers/gpu/drm/xe/xe_svm.h | 7 +-
+ drivers/gpu/drm/xe/xe_tuning.c | 12 +-
+ drivers/gpu/drm/xe/xe_wa.c | 12 +-
+ 32 files changed, 320 insertions(+), 183 deletions(-)
+ create mode 100644 drivers/gpu/drm/xe/instructions/xe_alu_commands.h
+Merging etnaviv/etnaviv/next (6bde14ba5f7e drm/etnaviv: add optional reset support)
+$ git merge -m Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux etnaviv/etnaviv/next
+Already up to date.
+Merging fbdev/for-next (95c7757266fa MAINTAINERS: Add contact info for fbdev packed pixel drawing)
+$ 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 MAINTAINERS
+Merge made by the 'ort' strategy.
+ MAINTAINERS | 16 ++
+ drivers/video/console/Kconfig | 9 +-
+ drivers/video/fbdev/aty/mach64_cursor.c | 7 +-
+ drivers/video/fbdev/au1100fb.c | 4 +-
+ drivers/video/fbdev/core/Kconfig | 10 +-
+ drivers/video/fbdev/core/bitblit.c | 5 +-
+ drivers/video/fbdev/core/cfbcopyarea.c | 428 +--------------------------
+ drivers/video/fbdev/core/cfbfillrect.c | 362 +----------------------
+ drivers/video/fbdev/core/cfbimgblt.c | 357 +----------------------
+ drivers/video/fbdev/core/cfbmem.h | 43 +++
+ drivers/video/fbdev/core/fb_copyarea.h | 405 ++++++++++++++++++++++++++
+ drivers/video/fbdev/core/fb_draw.h | 290 +++++++++----------
+ drivers/video/fbdev/core/fb_fillrect.h | 280 ++++++++++++++++++
+ drivers/video/fbdev/core/fb_imageblit.h | 495 ++++++++++++++++++++++++++++++++
+ drivers/video/fbdev/core/fbcon.c | 10 +-
+ drivers/video/fbdev/core/fbcon.h | 38 +--
+ drivers/video/fbdev/core/fbcon_ccw.c | 5 +-
+ drivers/video/fbdev/core/fbcon_cw.c | 5 +-
+ drivers/video/fbdev/core/fbcon_ud.c | 5 +-
+ drivers/video/fbdev/core/fbsysfs.c | 69 +++--
+ drivers/video/fbdev/core/syscopyarea.c | 369 +-----------------------
+ drivers/video/fbdev/core/sysfillrect.c | 324 +--------------------
+ drivers/video/fbdev/core/sysimgblt.c | 333 +--------------------
+ drivers/video/fbdev/core/sysmem.h | 39 +++
+ drivers/video/fbdev/core/tileblit.c | 45 ++-
+ drivers/video/fbdev/pxafb.c | 23 +-
+ drivers/video/fbdev/sh_mobile_lcdcfb.c | 29 +-
+ drivers/video/fbdev/wmt_ge_rops.c | 30 +-
+ 28 files changed, 1644 insertions(+), 2391 deletions(-)
+ create mode 100644 drivers/video/fbdev/core/cfbmem.h
+ create mode 100644 drivers/video/fbdev/core/fb_copyarea.h
+ create mode 100644 drivers/video/fbdev/core/fb_fillrect.h
+ create mode 100644 drivers/video/fbdev/core/fb_imageblit.h
+ create mode 100644 drivers/video/fbdev/core/sysmem.h
+Merging regmap/for-next (14b33926f576 Merge remote-tracking branch 'regmap/for-6.15' 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 | 12 ++++++------
+ drivers/base/regmap/regmap-irq.c | 2 +-
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+Merging sound/for-next (c2820405ba55 ALSA: usb-audio: Fix CME quirk for UF series keyboards)
+$ 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 sound/core/seq/seq_clientmgr.c
+Auto-merging sound/pci/hda/Kconfig
+Auto-merging sound/pci/hda/hda_codec.c
+Auto-merging sound/pci/hda/hda_intel.c
+Auto-merging sound/pci/hda/patch_realtek.c
+Auto-merging sound/soc/codecs/hdmi-codec.c
+Auto-merging sound/usb/midi.c
+Auto-merging sound/usb/mixer_quirks.c
+Auto-merging sound/usb/quirks.c
+Merge made by the 'ort' strategy.
+ Documentation/sound/alsa-configuration.rst | 2 +-
+ Documentation/sound/designs/powersave.rst | 6 +-
+ include/sound/hda_codec.h | 1 +
+ include/sound/pcm_drm_eld.h | 91 +++++++
+ sound/ac97/bus.c | 9 +-
+ sound/arm/aaci.c | 2 +-
+ sound/atmel/ac97c.c | 9 +-
+ sound/core/pcm.c | 4 +-
+ sound/core/pcm_drm_eld.c | 387 +++++++++++++++++++++++++++++
+ sound/core/pcm_misc.c | 4 +-
+ sound/core/seq/oss/seq_oss_event.c | 8 +-
+ sound/core/seq/seq_clientmgr.c | 7 +-
+ sound/core/seq/seq_memory.c | 1 +
+ sound/isa/es18xx.c | 8 +-
+ sound/isa/opti9xx/opti92x-ad1848.c | 2 +-
+ sound/pci/ctxfi/ctdaio.c | 4 +-
+ sound/pci/emu10k1/memory.c | 2 +-
+ sound/pci/hda/Kconfig | 1 +
+ sound/pci/hda/hda_beep.c | 15 +-
+ sound/pci/hda/hda_bind.c | 2 +-
+ sound/pci/hda/hda_codec.c | 3 +-
+ sound/pci/hda/hda_eld.c | 383 +---------------------------
+ sound/pci/hda/hda_intel.c | 56 ++++-
+ sound/pci/hda/hda_local.h | 49 +---
+ sound/pci/hda/hda_tegra.c | 16 +-
+ sound/pci/hda/patch_hdmi.c | 6 +-
+ sound/pci/hda/patch_realtek.c | 34 ++-
+ sound/pci/lola/lola.h | 2 -
+ sound/pci/lola/lola_mixer.c | 43 ----
+ sound/pci/oxygen/oxygen.c | 4 +-
+ sound/pci/oxygen/oxygen.h | 2 -
+ sound/pci/oxygen/oxygen_lib.c | 5 +-
+ sound/pci/oxygen/se6x.c | 4 +-
+ sound/pci/oxygen/virtuoso.c | 4 +-
+ sound/pci/vx222/vx222.c | 9 +-
+ sound/soc/codecs/hdmi-codec.c | 68 +++++
+ sound/usb/format.c | 4 +
+ sound/usb/midi.c | 80 +++++-
+ sound/usb/mixer_quirks.c | 3 +
+ sound/usb/quirks.c | 4 +-
+ sound/x86/intel_hdmi_audio.c | 8 +-
+ 41 files changed, 783 insertions(+), 569 deletions(-)
+Merging ieee1394/for-next (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git ieee1394/for-next
+Already up to date.
+Merging sound-asoc/for-next (d9a06936ee9e ASoC: sun4i-codec: add headphone dectection for)
+$ 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 MAINTAINERS
+Auto-merging arch/x86/kernel/amd_nb.c
+Auto-merging include/linux/device.h
+Auto-merging include/linux/io.h
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/mfd/motorola-cpcap.txt | 6 +
+ .../devicetree/bindings/misc/atmel-ssc.txt | 50 -
+ .../bindings/sound/allwinner,sun4i-a10-codec.yaml | 6 +
+ .../devicetree/bindings/sound/atmel,at91-ssc.yaml | 104 ++
+ .../bindings/sound/atmel,at91sam9g20ek-wm8731.yaml | 72 +
+ .../sound/atmel-at91sam9g20ek-wm8731-audio.txt | 26 -
+ .../devicetree/bindings/sound/dmic-codec.yaml | 3 +
+ .../devicetree/bindings/sound/everest,es8328.yaml | 11 +-
+ .../devicetree/bindings/sound/fsl,audmix.yaml | 61 +-
+ .../devicetree/bindings/sound/fsl,easrc.yaml | 5 +-
+ .../devicetree/bindings/sound/fsl,imx-asrc.yaml | 15 +-
+ .../devicetree/bindings/sound/fsl,sai.yaml | 51 +
+ .../devicetree/bindings/sound/imx-audio-card.yaml | 14 +
+ .../bindings/sound/mediatek,mt8188-mt6359.yaml | 1 +
+ .../bindings/sound/qcom,wcd937x-sdw.yaml | 36 +
+ .../devicetree/bindings/sound/rockchip-spdif.yaml | 4 +
+ .../devicetree/bindings/sound/ti,tas2770.yaml | 1 +
+ .../devicetree/bindings/sound/ti,tas27xx.yaml | 1 +
+ .../devicetree/bindings/sound/wlf,wm8960.yaml | 4 +
+ .../bindings/sound/xlnx,audio-formatter.txt | 29 -
+ .../bindings/sound/xlnx,audio-formatter.yaml | 72 +
+ .../devicetree/bindings/sound/xlnx,i2s.txt | 28 -
+ .../devicetree/bindings/sound/xlnx,i2s.yaml | 65 +
+ .../devicetree/bindings/sound/xlnx,spdif.txt | 28 -
+ .../devicetree/bindings/sound/xlnx,spdif.yaml | 77 ++
+ Documentation/sound/soc/codec-to-codec.rst | 4 +-
+ Documentation/sound/soc/dpcm.rst | 21 +-
+ MAINTAINERS | 11 +-
+ arch/x86/entry/common.c | 2 +-
+ arch/x86/include/asm/amd_nb.h | 1 -
+ arch/x86/include/asm/amd_node.h | 24 +
+ arch/x86/kernel/amd_nb.c | 1 -
+ arch/x86/kernel/amd_node.c | 149 +++
+ arch/x86/kernel/cpu/mtrr/generic.c | 13 +-
+ drivers/base/regmap/regcache.c | 31 +
+ .../firmware/cirrus/test/cs_dsp_test_bin_error.c | 13 +-
+ .../cirrus/test/cs_dsp_test_control_parse.c | 51 +-
+ drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_i2c.c | 2 +-
+ drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_spi.c | 2 +-
+ drivers/platform/x86/amd/hsmp/Kconfig | 2 +-
+ drivers/platform/x86/amd/hsmp/acpi.c | 7 +-
+ drivers/platform/x86/amd/hsmp/hsmp.c | 1 -
+ drivers/platform/x86/amd/hsmp/hsmp.h | 3 -
+ drivers/platform/x86/amd/hsmp/plat.c | 36 +-
+ drivers/soundwire/qcom.c | 26 +
+ include/dt-bindings/sound/qcom,wcd934x.h | 16 +
+ include/linux/device.h | 119 +-
+ include/linux/device/devres.h | 129 ++
+ include/linux/err.h | 3 +
+ include/linux/gpio/consumer.h | 11 +
+ include/linux/io.h | 2 -
+ include/linux/regmap.h | 7 +
+ include/sound/hda-mlink.h | 25 +
+ include/sound/sdca.h | 22 +-
+ include/sound/sdca_function.h | 1089 ++++++++++++++-
+ include/sound/sdca_regmap.h | 31 +
+ include/sound/simple_card_utils.h | 8 +-
+ include/sound/soc-dai.h | 8 +-
+ include/sound/soc-dapm.h | 65 +-
+ include/sound/soc-dpcm.h | 8 +-
+ include/sound/soc.h | 109 +-
+ include/sound/sof/ipc4/header.h | 13 +
+ include/sound/tas2781.h | 22 +-
+ include/uapi/sound/intel/avs/tokens.h | 11 +
+ sound/hda/intel-dsp-config.c | 4 +
+ sound/pci/hda/tas2781-spi.h | 1 -
+ sound/pci/hda/tas2781_hda_i2c.c | 8 +-
+ sound/pci/hda/tas2781_hda_spi.c | 3 -
+ sound/soc/amd/Kconfig | 10 +-
+ sound/soc/amd/acp/Kconfig | 4 +
+ sound/soc/amd/acp/Makefile | 2 +-
+ sound/soc/amd/acp/acp-i2s.c | 183 ++-
+ sound/soc/amd/acp/acp-legacy-common.c | 266 +++-
+ sound/soc/amd/acp/acp-mach-common.c | 2 +-
+ sound/soc/amd/acp/acp-pci.c | 208 +--
+ sound/soc/amd/acp/acp-pdm.c | 53 +-
+ sound/soc/amd/acp/acp-platform.c | 145 +-
+ sound/soc/amd/acp/acp-rembrandt.c | 139 +-
+ sound/soc/amd/acp/acp-renoir.c | 110 +-
+ sound/soc/amd/acp/acp-sdw-legacy-mach.c | 45 +
+ sound/soc/amd/acp/acp-sdw-mach-common.c | 34 +
+ sound/soc/amd/acp/acp3x-es83xx/acp3x-es83xx.c | 5 +-
+ sound/soc/amd/acp/acp63.c | 149 +--
+ sound/soc/amd/acp/acp70.c | 126 +-
+ sound/soc/amd/acp/amd-acp70-acpi-match.c | 160 +++
+ sound/soc/amd/acp/amd.h | 271 +++-
+ sound/soc/amd/acp/chip_offset_byte.h | 12 +-
+ sound/soc/amd/acp/soc_amd_sdw_common.h | 12 +
+ sound/soc/amd/mach-config.h | 1 +
+ sound/soc/amd/ps/Makefile | 2 +-
+ sound/soc/amd/ps/acp63.h | 246 +++-
+ sound/soc/amd/ps/pci-ps.c | 448 +++----
+ sound/soc/amd/ps/ps-common.c | 475 +++++++
+ sound/soc/amd/ps/ps-pdm-dma.c | 6 +-
+ sound/soc/amd/ps/ps-sdw-dma.c | 375 +++++-
+ sound/soc/atmel/atmel-classd.c | 3 +-
+ sound/soc/atmel/tse850-pcm5142.c | 11 +-
+ sound/soc/codecs/adau1701.c | 4 +-
+ sound/soc/codecs/adau17x1.c | 2 +-
+ sound/soc/codecs/arizona.c | 12 +-
+ sound/soc/codecs/cpcap.c | 200 ++-
+ sound/soc/codecs/cros_ec_codec.c | 3 +-
+ sound/soc/codecs/cs35l32.c | 4 +-
+ sound/soc/codecs/cs35l33.c | 4 +-
+ sound/soc/codecs/cs35l34.c | 4 +-
+ sound/soc/codecs/cs35l41-spi.c | 5 +-
+ sound/soc/codecs/cs4234.c | 4 +-
+ sound/soc/codecs/cs4265.c | 4 +-
+ sound/soc/codecs/cs4270.c | 4 +-
+ sound/soc/codecs/cs4271.c | 4 +-
+ sound/soc/codecs/cs42l42.c | 4 +-
+ sound/soc/codecs/cs42l51.c | 4 +-
+ sound/soc/codecs/cs42l52.c | 4 +-
+ sound/soc/codecs/cs42l56.c | 4 +-
+ sound/soc/codecs/cs42l73.c | 4 +-
+ sound/soc/codecs/cs42xx8.c | 4 +-
+ sound/soc/codecs/cs43130.c | 24 +-
+ sound/soc/codecs/cs4341.c | 2 +-
+ sound/soc/codecs/cs530x.c | 4 +-
+ sound/soc/codecs/cs53l30.c | 4 +-
+ sound/soc/codecs/da7210.c | 4 +-
+ sound/soc/codecs/da7218.c | 4 +-
+ sound/soc/codecs/da7219.c | 4 +-
+ sound/soc/codecs/da732x.c | 4 +-
+ sound/soc/codecs/da9055.c | 4 +-
+ sound/soc/codecs/dmic.c | 23 +-
+ sound/soc/codecs/hdac_hdmi.c | 3 +-
+ sound/soc/codecs/jz4760.c | 32 +-
+ sound/soc/codecs/jz4770.c | 40 +-
+ sound/soc/codecs/lochnagar-sc.c | 4 +-
+ sound/soc/codecs/madera.c | 12 +-
+ sound/soc/codecs/mt6358.c | 104 --
+ sound/soc/codecs/mt6358.h | 4 -
+ sound/soc/codecs/mt6359.c | 9 +-
+ sound/soc/codecs/nau8540.c | 4 +-
+ sound/soc/codecs/nau8810.c | 4 +-
+ sound/soc/codecs/nau8822.c | 4 +-
+ sound/soc/codecs/nau8824.c | 4 +-
+ sound/soc/codecs/nau8825.c | 4 +-
+ sound/soc/codecs/pcm3168a-i2c.c | 9 +
+ sound/soc/codecs/pcm3168a.c | 11 +-
+ sound/soc/codecs/rk817_codec.c | 4 +-
+ sound/soc/codecs/rt1011.c | 8 +-
+ sound/soc/codecs/rt1015.c | 10 +-
+ sound/soc/codecs/rt1016.c | 10 +-
+ sound/soc/codecs/rt1019.c | 6 +-
+ sound/soc/codecs/rt1305.c | 12 +-
+ sound/soc/codecs/rt1308.c | 8 +-
+ sound/soc/codecs/rt1318.c | 6 +-
+ sound/soc/codecs/rt274.c | 12 +-
+ sound/soc/codecs/rt286.c | 9 +-
+ sound/soc/codecs/rt298.c | 9 +-
+ sound/soc/codecs/rt5514.c | 6 +-
+ sound/soc/codecs/rt5616.c | 4 +-
+ sound/soc/codecs/rt5631.c | 4 +-
+ sound/soc/codecs/rt5640.c | 18 +-
+ sound/soc/codecs/rt5645.c | 16 +-
+ sound/soc/codecs/rt5651.c | 12 +-
+ sound/soc/codecs/rt5659.c | 12 +-
+ sound/soc/codecs/rt5660.c | 12 +-
+ sound/soc/codecs/rt5663.c | 10 +-
+ sound/soc/codecs/rt5665.c | 12 +-
+ sound/soc/codecs/rt5668.c | 10 +-
+ sound/soc/codecs/rt5670.c | 12 +-
+ sound/soc/codecs/rt5677-spi.c | 3 +-
+ sound/soc/codecs/rt5677.c | 5 +-
+ sound/soc/codecs/rt5682-i2c.c | 6 +-
+ sound/soc/codecs/rt5682.c | 4 +-
+ sound/soc/codecs/rt5682s.c | 4 +-
+ sound/soc/codecs/rt712-sdca.c | 80 +-
+ sound/soc/codecs/rt712-sdca.h | 3 +
+ sound/soc/codecs/rt715-sdca.c | 8 -
+ sound/soc/codecs/rt715.c | 8 -
+ sound/soc/codecs/rt722-sdca-sdw.c | 130 +-
+ sound/soc/codecs/rt722-sdca-sdw.h | 99 +-
+ sound/soc/codecs/rt722-sdca.c | 135 +-
+ sound/soc/codecs/rt722-sdca.h | 4 +-
+ sound/soc/codecs/sgtl5000.c | 4 +-
+ sound/soc/codecs/sma1307.c | 11 +-
+ sound/soc/codecs/src4xxx.c | 4 +-
+ sound/soc/codecs/tas2562.c | 14 +-
+ sound/soc/codecs/tas2764.c | 113 +-
+ sound/soc/codecs/tas2764.h | 7 +
+ sound/soc/codecs/tas2770.c | 57 +-
+ sound/soc/codecs/tas2781-fmwlib.c | 7 +-
+ sound/soc/codecs/tlv320dac33.c | 6 +-
+ sound/soc/codecs/tscs454.c | 5 +-
+ sound/soc/codecs/twl4030.c | 2 +-
+ sound/soc/codecs/uda1380.c | 6 +-
+ sound/soc/codecs/wcd934x.c | 16 +-
+ sound/soc/codecs/wcd937x-sdw.c | 41 +-
+ sound/soc/codecs/wcd937x.c | 53 +-
+ sound/soc/codecs/wcd937x.h | 7 +-
+ sound/soc/codecs/wcd938x-sdw.c | 2 +-
+ sound/soc/codecs/wcd938x.c | 9 +-
+ sound/soc/codecs/wcd939x-sdw.c | 2 +-
+ sound/soc/codecs/wm2200.c | 8 +-
+ sound/soc/codecs/wm5100.c | 8 +-
+ sound/soc/codecs/wm8350.c | 4 +-
+ sound/soc/codecs/wm8400.c | 4 +-
+ sound/soc/codecs/wm8510.c | 4 +-
+ sound/soc/codecs/wm8523.c | 4 +-
+ sound/soc/codecs/wm8524.c | 2 +-
+ sound/soc/codecs/wm8580.c | 4 +-
+ sound/soc/codecs/wm8711.c | 4 +-
+ sound/soc/codecs/wm8728.c | 2 +-
+ sound/soc/codecs/wm8737.c | 4 +-
+ sound/soc/codecs/wm8741.c | 2 +-
+ sound/soc/codecs/wm8750.c | 4 +-
+ sound/soc/codecs/wm8753.c | 12 +-
+ sound/soc/codecs/wm8770.c | 4 +-
+ sound/soc/codecs/wm8776.c | 4 +-
+ sound/soc/codecs/wm8804.c | 4 +-
+ sound/soc/codecs/wm8900.c | 8 +-
+ sound/soc/codecs/wm8903.c | 8 +-
+ sound/soc/codecs/wm8904.c | 8 +-
+ sound/soc/codecs/wm8940.c | 4 +-
+ sound/soc/codecs/wm8955.c | 4 +-
+ sound/soc/codecs/wm8960.c | 4 +-
+ sound/soc/codecs/wm8961.c | 4 +-
+ sound/soc/codecs/wm8962.c | 4 +-
+ sound/soc/codecs/wm8971.c | 4 +-
+ sound/soc/codecs/wm8974.c | 4 +-
+ sound/soc/codecs/wm8978.c | 4 +-
+ sound/soc/codecs/wm8983.c | 4 +-
+ sound/soc/codecs/wm8985.c | 4 +-
+ sound/soc/codecs/wm8988.c | 4 +-
+ sound/soc/codecs/wm8990.c | 4 +-
+ sound/soc/codecs/wm8991.c | 4 +-
+ sound/soc/codecs/wm8993.c | 8 +-
+ sound/soc/codecs/wm8994.c | 4 +-
+ sound/soc/codecs/wm8995.c | 4 +-
+ sound/soc/codecs/wm8996.c | 8 +-
+ sound/soc/codecs/wm9081.c | 8 +-
+ sound/soc/codecs/wm9712.c | 10 +-
+ sound/soc/codecs/wm9713.c | 18 +-
+ sound/soc/codecs/wm_hubs.c | 3 +-
+ sound/soc/codecs/wsa881x.c | 9 +-
+ sound/soc/codecs/wsa883x.c | 194 +++
+ sound/soc/fsl/fsl-asoc-card.c | 4 +-
+ sound/soc/fsl/fsl_audmix.c | 16 +-
+ sound/soc/fsl/fsl_micfil.c | 49 +-
+ sound/soc/fsl/fsl_micfil.h | 1 +
+ sound/soc/fsl/fsl_qmc_audio.c | 4 +-
+ sound/soc/fsl/imx-card.c | 5 +
+ sound/soc/generic/audio-graph-card.c | 97 +-
+ .../generic/audio-graph-card2-custom-sample.dtsi | 702 ----------
+ .../generic/audio-graph-card2-custom-sample1.dtsi | 396 ++++++
+ .../generic/audio-graph-card2-custom-sample2.dtsi | 382 ++++++
+ sound/soc/generic/audio-graph-card2.c | 95 +-
+ sound/soc/generic/simple-card-utils.c | 170 ++-
+ sound/soc/generic/simple-card.c | 132 +-
+ sound/soc/intel/avs/avs.h | 1 +
+ sound/soc/intel/avs/board_selection.c | 17 +-
+ sound/soc/intel/avs/boards/Kconfig | 10 +
+ sound/soc/intel/avs/boards/Makefile | 2 +
+ sound/soc/intel/avs/boards/da7219.c | 5 +-
+ sound/soc/intel/avs/boards/es8336.c | 3 +-
+ sound/soc/intel/avs/boards/max98357a.c | 2 +-
+ sound/soc/intel/avs/boards/max98927.c | 2 +-
+ sound/soc/intel/avs/boards/nau8825.c | 5 +-
+ sound/soc/intel/avs/boards/pcm3168a.c | 143 ++
+ sound/soc/intel/avs/boards/rt274.c | 5 +-
+ sound/soc/intel/avs/boards/rt286.c | 5 +-
+ sound/soc/intel/avs/boards/rt298.c | 7 +-
+ sound/soc/intel/avs/boards/rt5514.c | 2 +-
+ sound/soc/intel/avs/boards/rt5663.c | 3 +-
+ sound/soc/intel/avs/boards/rt5682.c | 3 +-
+ sound/soc/intel/avs/boards/ssm4567.c | 2 +-
+ sound/soc/intel/avs/control.c | 186 ++-
+ sound/soc/intel/avs/control.h | 12 +-
+ sound/soc/intel/avs/dsp.c | 3 +-
+ sound/soc/intel/avs/loader.c | 74 +-
+ sound/soc/intel/avs/messages.c | 149 ++-
+ sound/soc/intel/avs/messages.h | 46 +-
+ sound/soc/intel/avs/path.c | 387 ++++--
+ sound/soc/intel/avs/path.h | 5 +
+ sound/soc/intel/avs/tgl.c | 33 +
+ sound/soc/intel/avs/topology.c | 89 +-
+ sound/soc/intel/avs/topology.h | 16 +-
+ sound/soc/intel/common/soc-acpi-intel-adl-match.c | 29 +
+ sound/soc/intel/common/soc-acpi-intel-lnl-match.c | 137 ++
+ sound/soc/intel/common/soc-acpi-intel-ptl-match.c | 284 ++++
+ .../intel/common/soc-acpi-intel-sdw-mockup-match.c | 42 +
+ .../intel/common/soc-acpi-intel-sdw-mockup-match.h | 1 +
+ sound/soc/kirkwood/armada-370-db.c | 6 +-
+ sound/soc/mediatek/common/mtk-afe-fe-dai.c | 20 -
+ sound/soc/mediatek/common/mtk-afe-fe-dai.h | 2 -
+ sound/soc/mediatek/mt2701/mt2701-cs42448.c | 8 +-
+ sound/soc/mediatek/mt2701/mt2701-wm8960.c | 2 +-
+ sound/soc/mediatek/mt7986/mt7986-dai-etdm.c | 4 +-
+ sound/soc/mediatek/mt7986/mt7986-wm8960.c | 2 +-
+ sound/soc/mediatek/mt8173/mt8173-max98090.c | 2 +-
+ sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c | 2 +-
+ sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c | 4 +-
+ sound/soc/mediatek/mt8173/mt8173-rt5650.c | 2 +-
+ sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c | 2 +-
+ .../mt8183/mt8183-mt6358-ts3a227-max98357.c | 4 +-
+ sound/soc/mediatek/mt8186/mt8186-afe-clk.c | 55 -
+ sound/soc/mediatek/mt8186/mt8186-afe-clk.h | 2 -
+ sound/soc/mediatek/mt8186/mt8186-mt6366.c | 2 +-
+ sound/soc/mediatek/mt8188/Makefile | 1 +
+ sound/soc/mediatek/mt8188/mt8188-afe-clk.c | 8 +
+ sound/soc/mediatek/mt8188/mt8188-afe-clk.h | 8 +
+ sound/soc/mediatek/mt8188/mt8188-afe-common.h | 1 +
+ sound/soc/mediatek/mt8188/mt8188-afe-pcm.c | 28 +-
+ sound/soc/mediatek/mt8188/mt8188-audsys-clk.c | 4 +
+ sound/soc/mediatek/mt8188/mt8188-audsys-clkid.h | 4 +
+ sound/soc/mediatek/mt8188/mt8188-dai-dmic.c | 683 ++++++++++
+ sound/soc/mediatek/mt8188/mt8188-mt6359.c | 14 +
+ sound/soc/mediatek/mt8188/mt8188-reg.h | 17 +-
+ .../mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c | 2 +-
+ sound/soc/mediatek/mt8195/mt8195-mt6359.c | 12 +-
+ sound/soc/mediatek/mt8365/mt8365-dai-i2s.c | 12 +-
+ sound/soc/mediatek/mt8365/mt8365-dai-pcm.c | 4 +-
+ sound/soc/mediatek/mt8365/mt8365-mt6357.c | 2 +-
+ sound/soc/meson/axg-tdm-interface.c | 9 +-
+ sound/soc/meson/meson-card-utils.c | 4 +-
+ sound/soc/meson/t9015.c | 4 +-
+ sound/soc/mxs/mxs-sgtl5000.c | 2 +-
+ sound/soc/pxa/spitz.c | 2 +-
+ sound/soc/qcom/qdsp6/q6apm.c | 2 +-
+ sound/soc/qcom/sc7180.c | 2 +-
+ sound/soc/qcom/sc7280.c | 4 +-
+ sound/soc/qcom/sdw.c | 34 +-
+ sound/soc/qcom/sm8250.c | 3 +
+ sound/soc/renesas/migor.c | 2 +-
+ sound/soc/rockchip/rk3288_hdmi_analog.c | 2 +-
+ sound/soc/rockchip/rk3399_gru_sound.c | 10 +-
+ sound/soc/rockchip/rockchip_max98090.c | 8 +-
+ sound/soc/rockchip/rockchip_rt5645.c | 2 +-
+ sound/soc/samsung/aries_wm8994.c | 6 +-
+ sound/soc/samsung/arndale.c | 4 +-
+ sound/soc/samsung/bells.c | 21 +-
+ sound/soc/samsung/littlemill.c | 5 +-
+ sound/soc/samsung/lowland.c | 7 +-
+ sound/soc/samsung/midas_wm1811.c | 2 +-
+ sound/soc/samsung/odroid.c | 2 +-
+ sound/soc/samsung/smdk_wm8994.c | 4 +-
+ sound/soc/samsung/smdk_wm8994pcm.c | 2 +-
+ sound/soc/samsung/snow.c | 2 +-
+ sound/soc/samsung/speyside.c | 53 +-
+ sound/soc/samsung/tm2_wm5110.c | 9 +-
+ sound/soc/samsung/tobermory.c | 3 +-
+ sound/soc/sdca/Makefile | 2 +-
+ sound/soc/sdca/sdca_device.c | 3 +-
+ sound/soc/sdca/sdca_functions.c | 1407 +++++++++++++++++++-
+ sound/soc/sdca/sdca_regmap.c | 321 +++++
+ sound/soc/sdw_utils/soc_sdw_utils.c | 14 +-
+ sound/soc/soc-card.c | 14 +-
+ sound/soc/soc-component.c | 36 +-
+ sound/soc/soc-compress.c | 2 +-
+ sound/soc/soc-core.c | 50 +-
+ sound/soc/soc-dai.c | 38 +-
+ sound/soc/soc-dapm.c | 51 +-
+ sound/soc/soc-link.c | 18 +-
+ sound/soc/soc-ops.c | 53 +-
+ sound/soc/soc-pcm.c | 261 ++--
+ sound/soc/soc-topology.c | 59 +-
+ sound/soc/soc-utils.c | 27 +
+ sound/soc/sof/amd/Kconfig | 5 +
+ sound/soc/sof/amd/acp.c | 56 +-
+ sound/soc/sof/amd/acp.h | 2 -
+ sound/soc/sof/amd/pci-acp63.c | 1 -
+ sound/soc/sof/amd/pci-acp70.c | 1 -
+ sound/soc/sof/amd/pci-rmb.c | 1 -
+ sound/soc/sof/amd/pci-rn.c | 1 -
+ sound/soc/sof/amd/pci-vangogh.c | 1 -
+ sound/soc/sof/imx/Kconfig | 17 +-
+ sound/soc/sof/imx/Makefile | 6 +-
+ sound/soc/sof/imx/imx-common.c | 430 +++++-
+ sound/soc/sof/imx/imx-common.h | 151 +++
+ sound/soc/sof/imx/imx8.c | 803 ++++-------
+ sound/soc/sof/imx/imx8m.c | 567 --------
+ sound/soc/sof/imx/imx8ulp.c | 520 --------
+ sound/soc/sof/imx/imx9.c | 137 ++
+ sound/soc/sof/intel/Makefile | 2 +-
+ sound/soc/sof/intel/bdw.c | 1 -
+ sound/soc/sof/intel/byt.c | 1 -
+ sound/soc/sof/intel/hda-dai.c | 2 +-
+ sound/soc/sof/intel/hda-mlink.c | 127 ++
+ sound/soc/sof/intel/hda.c | 34 +
+ sound/soc/sof/intel/hda.h | 4 -
+ sound/soc/sof/intel/lnl.c | 117 +-
+ sound/soc/sof/intel/lnl.h | 6 +
+ sound/soc/sof/intel/mtl.c | 81 +-
+ sound/soc/sof/intel/mtl.h | 15 +-
+ sound/soc/sof/intel/pci-lnl.c | 12 +-
+ sound/soc/sof/intel/pci-mtl.c | 8 +
+ sound/soc/sof/intel/pci-ptl.c | 17 +-
+ sound/soc/sof/intel/pci-tng.c | 1 -
+ sound/soc/sof/intel/ptl.c | 106 ++
+ sound/soc/sof/intel/ptl.h | 19 +
+ sound/soc/sof/intel/shim.h | 2 +
+ sound/soc/sof/ipc3-pcm.c | 13 +-
+ sound/soc/sof/ipc3-topology.c | 20 +-
+ sound/soc/sof/ipc3.c | 12 +-
+ sound/soc/sof/ipc4-loader.c | 176 ++-
+ sound/soc/sof/ipc4-pcm.c | 21 +-
+ sound/soc/sof/ipc4-priv.h | 6 +
+ sound/soc/sof/ipc4-topology.c | 65 +-
+ sound/soc/sof/ipc4.c | 26 +-
+ sound/soc/sof/mediatek/mt8195/mt8195-clk.c | 3 +-
+ sound/soc/sof/pcm.c | 169 ++-
+ sound/soc/sof/sof-audio.c | 49 -
+ sound/soc/sof/sof-audio.h | 17 +-
+ sound/soc/sof/topology.c | 4 +-
+ sound/soc/sunxi/sun4i-codec.c | 57 +-
+ sound/soc/tegra/Makefile | 2 +-
+ sound/soc/tegra/tegra210_admaif.c | 24 +-
+ sound/soc/tegra/tegra210_admaif.h | 9 +-
+ sound/soc/tegra/tegra_asoc_machine.c | 18 +-
+ sound/soc/tegra/tegra_isomgr_bw.c | 129 ++
+ sound/soc/tegra/tegra_isomgr_bw.h | 31 +
+ sound/soc/tegra/tegra_wm8903.c | 2 +-
+ sound/soc/ti/ams-delta.c | 2 +-
+ sound/soc/ti/davinci-evm.c | 2 +-
+ sound/soc/ti/j721e-evm.c | 2 +-
+ sound/soc/ti/n810.c | 2 +-
+ sound/soc/ti/omap-twl4030.c | 6 +-
+ sound/soc/ti/omap3pandora.c | 4 +-
+ sound/soc/ti/osk5912.c | 2 +-
+ sound/soc/ti/rx51.c | 2 +-
+ sound/soc/uniphier/aio-cpu.c | 8 +-
+ sound/soc/ux500/mop500_ab8500.c | 4 +-
+ 425 files changed, 13437 insertions(+), 6439 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/misc/atmel-ssc.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/atmel,at91-ssc.yaml
+ create mode 100644 Documentation/devicetree/bindings/sound/atmel,at91sam9g20ek-wm8731.yaml
+ delete mode 100644 Documentation/devicetree/bindings/sound/atmel-at91sam9g20ek-wm8731-audio.txt
+ delete mode 100644 Documentation/devicetree/bindings/sound/xlnx,audio-formatter.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/xlnx,audio-formatter.yaml
+ delete mode 100644 Documentation/devicetree/bindings/sound/xlnx,i2s.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/xlnx,i2s.yaml
+ delete mode 100644 Documentation/devicetree/bindings/sound/xlnx,spdif.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/xlnx,spdif.yaml
+ create mode 100644 include/dt-bindings/sound/qcom,wcd934x.h
+ create mode 100644 include/linux/device/devres.h
+ create mode 100644 include/sound/sdca_regmap.h
+ create mode 100644 sound/soc/amd/acp/amd-acp70-acpi-match.c
+ create mode 100644 sound/soc/amd/ps/ps-common.c
+ delete mode 100644 sound/soc/generic/audio-graph-card2-custom-sample.dtsi
+ create mode 100644 sound/soc/generic/audio-graph-card2-custom-sample1.dtsi
+ create mode 100644 sound/soc/generic/audio-graph-card2-custom-sample2.dtsi
+ create mode 100644 sound/soc/intel/avs/boards/pcm3168a.c
+ create mode 100644 sound/soc/mediatek/mt8188/mt8188-dai-dmic.c
+ create mode 100644 sound/soc/sdca/sdca_regmap.c
+ delete mode 100644 sound/soc/sof/imx/imx8m.c
+ delete mode 100644 sound/soc/sof/imx/imx8ulp.c
+ create mode 100644 sound/soc/sof/imx/imx9.c
+ create mode 100644 sound/soc/sof/intel/ptl.c
+ create mode 100644 sound/soc/sof/intel/ptl.h
+ create mode 100644 sound/soc/tegra/tegra_isomgr_bw.c
+ create mode 100644 sound/soc/tegra/tegra_isomgr_bw.h
+Merging modules/modules-next (085c5e37427d module: Remove unnecessary size argument when calling strscpy())
+$ git merge -m Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/modules/linux.git modules/modules-next
+Auto-merging kernel/static_call_inline.c
+Auto-merging kernel/trace/bpf_trace.c
+Auto-merging lib/bug.c
+Merge made by the 'ort' strategy.
+ arch/arm/kernel/module-plts.c | 4 +-
+ arch/arm64/kernel/ftrace.c | 7 +-
+ arch/loongarch/kernel/ftrace_dyn.c | 9 ++-
+ arch/loongarch/kernel/unwind_orc.c | 4 +-
+ arch/powerpc/kernel/trace/ftrace.c | 6 +-
+ arch/powerpc/kernel/trace/ftrace_64_pg.c | 6 +-
+ arch/x86/kernel/callthunks.c | 3 +-
+ arch/x86/kernel/unwind_orc.c | 4 +-
+ include/linux/kallsyms.h | 3 +-
+ include/linux/module.h | 2 +-
+ kernel/cfi.c | 5 +-
+ kernel/jump_label.c | 31 +++++----
+ kernel/kprobes.c | 2 +-
+ kernel/livepatch/core.c | 4 +-
+ kernel/module/internal.h | 11 ----
+ kernel/module/kallsyms.c | 73 ++++++++-------------
+ kernel/module/main.c | 109 +++++++++++--------------------
+ kernel/module/tracking.c | 2 -
+ kernel/module/tree_lookup.c | 8 +--
+ kernel/module/version.c | 14 ++--
+ kernel/params.c | 29 ++++----
+ kernel/static_call_inline.c | 13 ++--
+ kernel/trace/bpf_trace.c | 24 +++----
+ kernel/trace/trace_kprobe.c | 9 +--
+ lib/bug.c | 22 +++----
+ lib/tests/module/gen_test_kallsyms.sh | 2 +-
+ 26 files changed, 157 insertions(+), 249 deletions(-)
+Merging input/next (4d395cb071a3 Input: goodix_berlin - add support for Berlin-A series)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next
+Auto-merging MAINTAINERS
+Auto-merging drivers/input/touchscreen/goodix_berlin_core.c
+Merge made by the 'ort' strategy.
+ .../bindings/input/gpio-matrix-keypad.txt | 49 ---
+ .../bindings/input/gpio-matrix-keypad.yaml | 103 +++++
+ .../bindings/input/qcom,pm8921-keypad.yaml | 46 +-
+ .../bindings/input/qcom,pm8921-pwrkey.yaml | 36 +-
+ .../input/touchscreen/apple,z2-multitouch.yaml | 70 +++
+ .../bindings/input/touchscreen/goodix,gt9916.yaml | 1 +
+ .../bindings/input/touchscreen/ti,ads7843.yaml | 30 +-
+ .../devicetree/bindings/power/wakeup-source.txt | 2 +-
+ MAINTAINERS | 2 +
+ drivers/input/joystick/walkera0701.c | 3 +-
+ drivers/input/keyboard/gpio_keys.c | 10 +-
+ drivers/input/keyboard/matrix_keypad.c | 8 +-
+ drivers/input/misc/pm8941-pwrkey.c | 4 +-
+ drivers/input/mouse/synaptics.c | 2 +
+ drivers/input/rmi4/rmi_f54.c | 2 -
+ drivers/input/touchscreen/Kconfig | 13 +
+ drivers/input/touchscreen/Makefile | 1 +
+ drivers/input/touchscreen/apple_z2.c | 477 +++++++++++++++++++++
+ drivers/input/touchscreen/atmel_mxt_ts.c | 2 -
+ drivers/input/touchscreen/goodix_berlin.h | 16 +-
+ drivers/input/touchscreen/goodix_berlin_core.c | 21 +-
+ drivers/input/touchscreen/goodix_berlin_i2c.c | 14 +-
+ drivers/input/touchscreen/goodix_berlin_spi.c | 48 ++-
+ drivers/input/touchscreen/sur40.c | 2 -
+ 24 files changed, 813 insertions(+), 149 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/input/gpio-matrix-keypad.txt
+ create mode 100644 Documentation/devicetree/bindings/input/gpio-matrix-keypad.yaml
+ create mode 100644 Documentation/devicetree/bindings/input/touchscreen/apple,z2-multitouch.yaml
+ create mode 100644 drivers/input/touchscreen/apple_z2.c
+Merging block/for-next (8fb5da8b1939 Merge branch 'for-6.15/io_uring' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next
+Auto-merging MAINTAINERS
+Auto-merging block/blk-core.c
+Auto-merging drivers/block/null_blk/main.c
+Auto-merging drivers/block/ublk_drv.c
+Auto-merging drivers/block/virtio_blk.c
+Auto-merging drivers/mmc/host/sdhci-msm.c
+Auto-merging drivers/nvdimm/pmem.c
+Auto-merging drivers/nvme/host/apple.c
+Auto-merging drivers/nvme/host/ioctl.c
+Auto-merging drivers/nvme/host/pci.c
+Auto-merging drivers/ufs/host/ufs-qcom.c
+Auto-merging include/linux/blk-mq.h
+Auto-merging include/linux/blkdev.h
+Auto-merging include/linux/wait.h
+Auto-merging io_uring/rw.c
+Auto-merging tools/testing/selftests/Makefile
+Auto-merging tools/testing/selftests/drivers/net/hw/Makefile
+CONFLICT (content): Merge conflict in tools/testing/selftests/drivers/net/hw/Makefile
+Resolved 'tools/testing/selftests/drivers/net/hw/Makefile' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 47648b90dc79] Merge branch 'for-next' of git://git.kernel.dk/linux-block.git
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/stable/sysfs-block | 20 +
+ Documentation/block/inline-encryption.rst | 255 ++++-
+ Documentation/networking/index.rst | 1 +
+ Documentation/networking/iou-zcrx.rst | 202 ++++
+ Documentation/userspace-api/ioctl/ioctl-number.rst | 2 +
+ Kconfig | 2 +
+ MAINTAINERS | 1 +
+ block/Makefile | 3 +-
+ block/badblocks.c | 329 +++---
+ block/bio-integrity-auto.c | 191 ++++
+ block/bio-integrity.c | 266 +----
+ block/bio.c | 17 +-
+ block/blk-core.c | 1 +
+ block/blk-crypto-fallback.c | 7 +-
+ block/blk-crypto-internal.h | 10 +
+ block/blk-crypto-profile.c | 101 ++
+ block/blk-crypto-sysfs.c | 35 +
+ block/blk-crypto.c | 204 +++-
+ block/blk-flush.c | 10 +-
+ block/blk-iocost.c | 5 +-
+ block/blk-merge.c | 4 +-
+ block/blk-mq-debugfs.c | 41 +-
+ block/blk-mq-sched.c | 2 +-
+ block/blk-mq-sysfs.c | 4 +-
+ block/blk-mq-tag.c | 3 +-
+ block/blk-mq.c | 22 +-
+ block/blk-mq.h | 4 +-
+ block/blk-rq-qos.c | 82 +-
+ block/blk-settings.c | 58 +-
+ block/blk-sysfs.c | 307 ++++--
+ block/blk-throttle.c | 82 +-
+ block/blk-throttle.h | 7 +-
+ block/blk-wbt.c | 17 +-
+ block/blk.h | 2 +-
+ block/bounce.c | 2 -
+ block/bsg-lib.c | 2 +-
+ block/elevator.c | 43 +-
+ block/elevator.h | 2 -
+ block/genhd.c | 9 +-
+ block/ioctl.c | 5 +
+ block/kyber-iosched.c | 2 +-
+ block/partitions/sgi.c | 2 -
+ block/partitions/sun.c | 2 -
+ block/t10-pi.c | 6 +-
+ drivers/block/loop.c | 86 +-
+ drivers/block/mtip32xx/mtip32xx.c | 2 +-
+ drivers/block/null_blk/main.c | 181 ++--
+ drivers/block/null_blk/null_blk.h | 6 +
+ drivers/block/null_blk/zoned.c | 20 +-
+ drivers/block/rnbd/rnbd-clt.c | 2 +-
+ drivers/block/sunvdc.c | 2 +-
+ drivers/block/ublk_drv.c | 125 ++-
+ drivers/block/virtio_blk.c | 2 +-
+ drivers/block/xen-blkfront.c | 2 +-
+ drivers/md/dm-integrity.c | 12 -
+ drivers/md/dm-table.c | 7 +-
+ drivers/md/md-bitmap.c | 14 +-
+ drivers/md/md-cluster.c | 18 +-
+ drivers/md/md-cluster.h | 6 +
+ drivers/md/md-linear.c | 15 +-
+ drivers/md/md.c | 364 +++----
+ drivers/md/md.h | 62 +-
+ drivers/md/raid0.c | 18 +-
+ drivers/md/raid1-10.c | 6 +-
+ drivers/md/raid1.c | 56 +-
+ drivers/md/raid10.c | 66 +-
+ drivers/md/raid5.c | 91 +-
+ drivers/memstick/core/ms_block.c | 2 +-
+ drivers/memstick/core/mspro_block.c | 4 +-
+ drivers/mmc/core/queue.c | 2 +-
+ drivers/mmc/host/cqhci-crypto.c | 8 +-
+ drivers/mmc/host/sdhci-msm.c | 3 +-
+ drivers/mtd/ubi/block.c | 2 +-
+ drivers/nvdimm/badrange.c | 2 +-
+ drivers/nvdimm/nd.h | 2 +-
+ drivers/nvdimm/pfn_devs.c | 7 +-
+ drivers/nvdimm/pmem.c | 2 +-
+ drivers/nvme/host/apple.c | 2 +-
+ drivers/nvme/host/fc.c | 2 +-
+ drivers/nvme/host/ioctl.c | 12 +-
+ drivers/nvme/host/pci.c | 2 +-
+ drivers/nvme/host/rdma.c | 3 +-
+ drivers/nvme/target/loop.c | 2 +-
+ drivers/scsi/scsi_lib.c | 2 +-
+ drivers/target/target_core_iblock.c | 12 -
+ drivers/ufs/core/ufshcd-crypto.c | 7 +-
+ drivers/ufs/host/ufs-exynos.c | 3 +-
+ drivers/ufs/host/ufs-qcom.c | 3 +-
+ fs/crypto/inline_crypt.c | 4 +-
+ include/linux/badblocks.h | 10 +-
+ include/linux/bio-integrity.h | 25 +-
+ include/linux/bio.h | 4 -
+ include/linux/blk-crypto-profile.h | 73 ++
+ include/linux/blk-crypto.h | 73 +-
+ include/linux/blk-mq.h | 9 +-
+ include/linux/blkdev.h | 15 +
+ include/linux/io_uring/cmd.h | 17 +-
+ include/linux/io_uring_types.h | 37 +-
+ include/linux/wait.h | 6 +-
+ include/uapi/linux/blk-crypto.h | 44 +
+ include/uapi/linux/fs.h | 6 +-
+ include/uapi/linux/io_uring.h | 59 +-
+ include/uapi/linux/ublk_cmd.h | 11 +
+ io_uring/Kconfig | 10 +
+ io_uring/Makefile | 10 +-
+ io_uring/alloc_cache.h | 15 +-
+ io_uring/cancel.c | 42 +
+ io_uring/cancel.h | 8 +
+ io_uring/epoll.c | 35 +-
+ io_uring/epoll.h | 2 +
+ io_uring/filetable.c | 2 +-
+ io_uring/futex.c | 62 +-
+ io_uring/io-wq.c | 230 ++--
+ io_uring/io-wq.h | 7 +-
+ io_uring/io_uring.c | 253 +++--
+ io_uring/io_uring.h | 44 +-
+ io_uring/kbuf.c | 200 ++--
+ io_uring/kbuf.h | 100 +-
+ io_uring/memmap.c | 5 +-
+ io_uring/memmap.h | 1 +
+ io_uring/msg_ring.c | 2 +-
+ io_uring/net.c | 500 +++++----
+ io_uring/net.h | 6 +-
+ io_uring/nop.c | 18 +-
+ io_uring/notif.c | 4 +-
+ io_uring/opdef.c | 73 +-
+ io_uring/opdef.h | 12 +-
+ io_uring/poll.c | 23 +-
+ io_uring/poll.h | 4 +-
+ io_uring/register.c | 7 +
+ io_uring/rsrc.c | 415 +++++++-
+ io_uring/rsrc.h | 49 +-
+ io_uring/rw.c | 302 ++++--
+ io_uring/rw.h | 11 +-
+ io_uring/splice.c | 3 +-
+ io_uring/timeout.c | 16 +-
+ io_uring/uring_cmd.c | 31 +-
+ io_uring/waitid.c | 56 +-
+ io_uring/zcrx.c | 960 +++++++++++++++++
+ io_uring/zcrx.h | 73 ++
+ tools/testing/selftests/Makefile | 1 +
+ tools/testing/selftests/drivers/net/hw/.gitignore | 2 +
+ tools/testing/selftests/drivers/net/hw/Makefile | 5 +
+ tools/testing/selftests/drivers/net/hw/iou-zcrx.c | 457 ++++++++
+ tools/testing/selftests/drivers/net/hw/iou-zcrx.py | 87 ++
+ tools/testing/selftests/ublk/.gitignore | 3 +
+ tools/testing/selftests/ublk/Makefile | 22 +
+ tools/testing/selftests/ublk/config | 1 +
+ tools/testing/selftests/ublk/file_backed.c | 220 ++++
+ tools/testing/selftests/ublk/kublk.c | 1123 ++++++++++++++++++++
+ tools/testing/selftests/ublk/kublk.h | 328 ++++++
+ tools/testing/selftests/ublk/null.c | 38 +
+ tools/testing/selftests/ublk/test_common.sh | 220 ++++
+ tools/testing/selftests/ublk/test_loop_01.sh | 32 +
+ tools/testing/selftests/ublk/test_loop_02.sh | 22 +
+ tools/testing/selftests/ublk/test_loop_03.sh | 31 +
+ tools/testing/selftests/ublk/test_loop_04.sh | 22 +
+ tools/testing/selftests/ublk/test_null_01.sh | 20 +
+ tools/testing/selftests/ublk/test_stress_01.sh | 47 +
+ tools/testing/selftests/ublk/test_stress_02.sh | 47 +
+ 160 files changed, 7960 insertions(+), 2371 deletions(-)
+ create mode 100644 Documentation/networking/iou-zcrx.rst
+ create mode 100644 block/bio-integrity-auto.c
+ create mode 100644 include/uapi/linux/blk-crypto.h
+ create mode 100644 io_uring/Kconfig
+ create mode 100644 io_uring/zcrx.c
+ create mode 100644 io_uring/zcrx.h
+ create mode 100644 tools/testing/selftests/drivers/net/hw/iou-zcrx.c
+ create mode 100755 tools/testing/selftests/drivers/net/hw/iou-zcrx.py
+ create mode 100644 tools/testing/selftests/ublk/.gitignore
+ create mode 100644 tools/testing/selftests/ublk/Makefile
+ create mode 100644 tools/testing/selftests/ublk/config
+ create mode 100644 tools/testing/selftests/ublk/file_backed.c
+ create mode 100644 tools/testing/selftests/ublk/kublk.c
+ create mode 100644 tools/testing/selftests/ublk/kublk.h
+ create mode 100644 tools/testing/selftests/ublk/null.c
+ create mode 100755 tools/testing/selftests/ublk/test_common.sh
+ create mode 100755 tools/testing/selftests/ublk/test_loop_01.sh
+ create mode 100755 tools/testing/selftests/ublk/test_loop_02.sh
+ create mode 100755 tools/testing/selftests/ublk/test_loop_03.sh
+ create mode 100755 tools/testing/selftests/ublk/test_loop_04.sh
+ create mode 100755 tools/testing/selftests/ublk/test_null_01.sh
+ create mode 100755 tools/testing/selftests/ublk/test_stress_01.sh
+ create mode 100755 tools/testing/selftests/ublk/test_stress_02.sh
+Merging device-mapper/for-next (45fc728515c1 dm: restrict dm device size to 2^63-512 bytes)
+$ 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 drivers/md/dm-integrity.c
+Auto-merging drivers/md/dm-table.c
+Auto-merging drivers/md/dm-vdo/dedupe.c
+Merge made by the 'ort' strategy.
+ .../admin-guide/device-mapper/dm-crypt.rst | 5 +
+ .../admin-guide/device-mapper/dm-integrity.rst | 5 +
+ Documentation/admin-guide/device-mapper/verity.rst | 9 +
+ drivers/md/Kconfig | 1 +
+ drivers/md/dm-bufio.c | 4 +-
+ drivers/md/dm-cache-target.c | 96 +++++++++-
+ drivers/md/dm-crypt.c | 41 ++---
+ drivers/md/dm-integrity.c | 3 +
+ drivers/md/dm-stripe.c | 2 +-
+ drivers/md/dm-table.c | 4 +
+ drivers/md/dm-vdo/block-map.c | 13 +-
+ drivers/md/dm-vdo/constants.h | 3 -
+ drivers/md/dm-vdo/dedupe.c | 20 +--
+ drivers/md/dm-vdo/encodings.c | 20 +--
+ drivers/md/dm-vdo/indexer/index-layout.c | 5 +-
+ drivers/md/dm-vdo/indexer/index-session.c | 6 +-
+ drivers/md/dm-vdo/indexer/indexer.h | 53 +++---
+ drivers/md/dm-vdo/io-submitter.c | 6 +-
+ drivers/md/dm-vdo/io-submitter.h | 18 +-
+ drivers/md/dm-vdo/packer.h | 2 +-
+ drivers/md/dm-vdo/priority-table.c | 2 +-
+ drivers/md/dm-vdo/recovery-journal.h | 6 +-
+ drivers/md/dm-vdo/slab-depot.c | 197 +++++++++++++++------
+ drivers/md/dm-vdo/slab-depot.h | 13 +-
+ drivers/md/dm-vdo/types.h | 3 +
+ drivers/md/dm-vdo/vdo.c | 11 +-
+ drivers/md/dm-vdo/vio.c | 54 +++---
+ drivers/md/dm-vdo/vio.h | 13 +-
+ drivers/md/dm-vdo/wait-queue.c | 2 +-
+ drivers/md/dm-verity-target.c | 25 ++-
+ drivers/md/dm.c | 8 +-
+ 31 files changed, 433 insertions(+), 217 deletions(-)
+Merging libata/for-next (725ad0283033 ata: libata: Improve return value of atapi_check_dma())
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux libata/for-next
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Auto-merging drivers/ata/libata-core.c
+Merge made by the 'ort' strategy.
+ Documentation/admin-guide/kernel-parameters.txt | 2 +
+ .../devicetree/bindings/ata/fsl,pq-sata.yaml | 60 ++++++++++++++++++++++
+ Documentation/devicetree/bindings/ata/fsl-sata.txt | 28 ----------
+ drivers/ata/ahci.c | 2 +
+ drivers/ata/libata-core.c | 40 ++++++++++++++-
+ drivers/ata/libata-eh.c | 11 +++-
+ drivers/ata/sata_via.c | 3 +-
+ 7 files changed, 114 insertions(+), 32 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/ata/fsl,pq-sata.yaml
+ delete mode 100644 Documentation/devicetree/bindings/ata/fsl-sata.txt
+Merging pcmcia/pcmcia-next (0630e3bc0e91 pcmcia: add missing MODULE_DESCRIPTION() macros)
+$ git merge -m Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git pcmcia/pcmcia-next
+Already up to date.
+Merging mmc/next (4139badab0d8 mmc: Merge branch fixes into next)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next
+Merge made by the 'ort' strategy.
+ .../bindings/mmc/allwinner,sun4i-a10-mmc.yaml | 38 +++---
+ .../bindings/mmc/amlogic,meson-mx-sdio.yaml | 3 +
+ .../devicetree/bindings/mmc/atmel,hsmci.yaml | 106 +++++++++++++++++
+ .../devicetree/bindings/mmc/atmel-hsmci.txt | 73 ------------
+ .../devicetree/bindings/mmc/fsl-imx-esdhc.yaml | 1 +
+ .../devicetree/bindings/mmc/mmc-controller.yaml | 2 +-
+ .../devicetree/bindings/mmc/mmc-slot.yaml | 1 -
+ .../devicetree/bindings/mmc/renesas,sdhi.yaml | 16 +++
+ .../devicetree/bindings/mmc/rockchip-dw-mshc.yaml | 2 +
+ .../bindings/mmc/samsung,exynos-dw-mshc.yaml | 2 +
+ .../bindings/mmc/snps,dwcmshc-sdhci.yaml | 5 +-
+ drivers/mmc/core/mmc.c | 6 +-
+ drivers/mmc/core/sd.c | 4 +
+ drivers/mmc/core/slot-gpio.c | 12 --
+ drivers/mmc/host/dw_mmc-exynos.c | 41 ++++++-
+ drivers/mmc/host/dw_mmc.c | 94 ++++++++++++++-
+ drivers/mmc/host/dw_mmc.h | 27 +++++
+ drivers/mmc/host/renesas_sdhi.h | 1 +
+ drivers/mmc/host/renesas_sdhi_core.c | 130 +++++++++++++++++++++
+ drivers/mmc/host/sdhci-of-dwcmshc.c | 72 +++---------
+ drivers/mmc/host/sdhci.c | 9 +-
+ drivers/mmc/host/tmio_mmc.h | 10 ++
+ include/linux/mmc/slot-gpio.h | 1 -
+ 23 files changed, 483 insertions(+), 173 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mmc/atmel,hsmci.yaml
+ delete mode 100644 Documentation/devicetree/bindings/mmc/atmel-hsmci.txt
+Merging mfd/for-mfd-next (be2314746229 mfd: mt6397-core: Add mfd_cell for mt6359-accdet)
+ 7f3e3e7228bb ("dt-bindings: mfd: syscon: Add rk3528 QoS register compatible")
+$ 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/mfd/syscon.c
+Merge made by the 'ort' strategy.
+ .../bindings/mfd/atmel,sama5d2-flexcom.yaml | 9 +-
+ .../bindings/mfd/fsl,mcu-mpc8349emitx.yaml | 53 ++
+ .../devicetree/bindings/mfd/maxim,max77705.yaml | 158 +++++
+ .../devicetree/bindings/mfd/qcom,tcsr.yaml | 1 +
+ .../devicetree/bindings/mfd/samsung,s2mps11.yaml | 13 +
+ .../devicetree/bindings/mfd/st,stm32-timers.yaml | 18 +-
+ .../bindings/power/supply/maxim,max77705.yaml | 50 ++
+ .../bindings/powerpc/fsl/mcu-mpc8349emitx.txt | 17 -
+ .../bindings/regulator/samsung,s2mpu05.yaml | 47 ++
+ .../devicetree/bindings/regulator/ti,tps65219.yaml | 27 +-
+ MAINTAINERS | 4 +
+ drivers/input/misc/Kconfig | 6 +-
+ drivers/input/misc/max77693-haptic.c | 13 +-
+ drivers/leds/Kconfig | 8 +
+ drivers/leds/Makefile | 1 +
+ drivers/leds/leds-max77705.c | 275 +++++++++
+ drivers/mfd/Kconfig | 23 +-
+ drivers/mfd/Makefile | 2 +-
+ drivers/mfd/axp20x.c | 1 +
+ drivers/mfd/ene-kb3930.c | 2 +-
+ drivers/mfd/ezx-pcap.c | 33 --
+ drivers/mfd/intel_soc_pmic_chtdc_ti.c | 1 -
+ drivers/mfd/intel_soc_pmic_crc.c | 1 -
+ drivers/mfd/ipaq-micro.c | 3 +-
+ drivers/mfd/max77620.c | 5 +
+ drivers/mfd/max77705.c | 182 ++++++
+ drivers/mfd/max8997-irq.c | 15 +-
+ drivers/mfd/mt6397-core.c | 12 +
+ drivers/mfd/sec-core.c | 12 +
+ drivers/mfd/sec-irq.c | 34 ++
+ drivers/mfd/simple-mfd-i2c.c | 11 +
+ drivers/mfd/sm501.c | 6 +-
+ drivers/mfd/sta2x11-mfd.c | 645 ---------------------
+ drivers/mfd/stm32-timers.c | 31 +-
+ drivers/mfd/syscon.c | 9 +-
+ drivers/mfd/tps65010.c | 13 +-
+ drivers/mfd/tps65219.c | 279 ++++++++-
+ drivers/mfd/upboard-fpga.c | 3 +-
+ drivers/power/supply/Kconfig | 6 +
+ drivers/power/supply/Makefile | 1 +
+ drivers/power/supply/max77705_charger.c | 581 +++++++++++++++++++
+ drivers/regulator/Kconfig | 4 +-
+ drivers/regulator/s2mps11.c | 92 ++-
+ include/linux/mfd/axp20x.h | 1 +
+ include/linux/mfd/dbx500-prcmu.h | 6 +-
+ include/linux/mfd/ezx-pcap.h | 1 -
+ include/linux/mfd/lp3943.h | 1 -
+ include/linux/mfd/max77693-common.h | 4 +-
+ include/linux/mfd/max77705-private.h | 195 +++++++
+ include/linux/mfd/max8997-private.h | 1 -
+ include/linux/mfd/samsung/core.h | 1 +
+ include/linux/mfd/samsung/irq.h | 44 ++
+ include/linux/mfd/samsung/s2mpu05.h | 183 ++++++
+ include/linux/mfd/sta2x11-mfd.h | 506 ----------------
+ include/linux/mfd/stm32-timers.h | 9 +
+ include/linux/mfd/tps65219.h | 136 ++++-
+ include/linux/power/max77705_charger.h | 195 +++++++
+ 57 files changed, 2704 insertions(+), 1286 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mfd/fsl,mcu-mpc8349emitx.yaml
+ create mode 100644 Documentation/devicetree/bindings/mfd/maxim,max77705.yaml
+ create mode 100644 Documentation/devicetree/bindings/power/supply/maxim,max77705.yaml
+ delete mode 100644 Documentation/devicetree/bindings/powerpc/fsl/mcu-mpc8349emitx.txt
+ create mode 100644 Documentation/devicetree/bindings/regulator/samsung,s2mpu05.yaml
+ create mode 100644 drivers/leds/leds-max77705.c
+ create mode 100644 drivers/mfd/max77705.c
+ delete mode 100644 drivers/mfd/sta2x11-mfd.c
+ create mode 100644 drivers/power/supply/max77705_charger.c
+ create mode 100644 include/linux/mfd/max77705-private.h
+ create mode 100644 include/linux/mfd/samsung/s2mpu05.h
+ delete mode 100644 include/linux/mfd/sta2x11-mfd.h
+ create mode 100644 include/linux/power/max77705_charger.h
+Merging backlight/for-backlight-next (d1ebaf003a06 MAINTAINERS: Add entries for Apple DWI backlight controller)
+$ 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
+CONFLICT (content): Merge conflict in MAINTAINERS
+Recorded preimage for 'MAINTAINERS'
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+Recorded resolution for 'MAINTAINERS'.
+[master 8dbc86141b0d] Merge branch 'for-backlight-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git
+$ git diff -M --stat --summary HEAD^..
+ .../bindings/leds/backlight/apple,dwi-bl.yaml | 57 ++++++++++
+ MAINTAINERS | 2 +
+ drivers/video/backlight/88pm860x_bl.c | 1 -
+ drivers/video/backlight/Kconfig | 11 ++
+ drivers/video/backlight/Makefile | 1 +
+ drivers/video/backlight/adp5520_bl.c | 1 -
+ drivers/video/backlight/adp8860_bl.c | 1 -
+ drivers/video/backlight/adp8870_bl.c | 1 -
+ drivers/video/backlight/apple_dwi_bl.c | 123 +++++++++++++++++++++
+ drivers/video/backlight/as3711_bl.c | 1 -
+ drivers/video/backlight/bd6107.c | 1 -
+ drivers/video/backlight/da903x_bl.c | 1 -
+ drivers/video/backlight/da9052_bl.c | 1 -
+ drivers/video/backlight/ep93xx_bl.c | 1 -
+ drivers/video/backlight/hp680_bl.c | 1 -
+ drivers/video/backlight/led_bl.c | 5 +-
+ drivers/video/backlight/locomolcd.c | 1 -
+ drivers/video/backlight/lv5207lp.c | 1 -
+ drivers/video/backlight/max8925_bl.c | 1 -
+ drivers/video/backlight/tps65217_bl.c | 1 -
+ drivers/video/backlight/vgg2432a4.c | 1 -
+ drivers/video/backlight/wm831x_bl.c | 1 -
+ 22 files changed, 198 insertions(+), 17 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/leds/backlight/apple,dwi-bl.yaml
+ create mode 100644 drivers/video/backlight/apple_dwi_bl.c
+Merging battery/for-next (aae075a93f77 power: supply: pcf50633: Remove charger)
+$ 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/Kconfig
+Auto-merging drivers/power/supply/Makefile
+Auto-merging drivers/power/supply/axp20x_battery.c
+Auto-merging drivers/power/supply/ip5xxx_power.c
+Auto-merging drivers/power/supply/power_supply_core.c
+Merge made by the 'ort' strategy.
+ .../bindings/power/reset/atmel,sama5d2-shdwc.yaml | 5 +
+ .../bindings/power/reset/xlnx,zynqmp-power.yaml | 1 -
+ .../x-powers,axp20x-battery-power-supply.yaml | 20 +-
+ drivers/iio/adc/xilinx-xadc-core.c | 4 +-
+ drivers/input/keyboard/ipaq-micro-keys.c | 5 +-
+ drivers/input/sparse-keymap.c | 3 +-
+ drivers/pinctrl/intel/pinctrl-baytrail.c | 6 +-
+ drivers/pinctrl/intel/pinctrl-cherryview.c | 5 +-
+ drivers/pinctrl/intel/pinctrl-intel.c | 6 +-
+ drivers/pinctrl/intel/pinctrl-tangier.c | 5 +-
+ drivers/pinctrl/pxa/pinctrl-pxa2xx.c | 8 +-
+ drivers/power/reset/at91-sama5d2_shdwc.c | 1 +
+ drivers/power/supply/Kconfig | 6 -
+ drivers/power/supply/Makefile | 1 -
+ drivers/power/supply/ab8500_charger.c | 4 +-
+ drivers/power/supply/acer_a500_battery.c | 3 +-
+ drivers/power/supply/act8945a_charger.c | 2 +-
+ drivers/power/supply/axp20x_ac_power.c | 2 +-
+ drivers/power/supply/axp20x_battery.c | 23 +-
+ drivers/power/supply/axp20x_usb_power.c | 4 +-
+ drivers/power/supply/bd99954-charger.c | 4 +-
+ drivers/power/supply/bq2415x_charger.c | 2 +-
+ drivers/power/supply/bq24190_charger.c | 2 +-
+ drivers/power/supply/bq24257_charger.c | 2 +-
+ drivers/power/supply/bq24735-charger.c | 2 +-
+ drivers/power/supply/bq2515x_charger.c | 6 +-
+ drivers/power/supply/bq256xx_charger.c | 2 +-
+ drivers/power/supply/bq25890_charger.c | 2 +-
+ drivers/power/supply/bq25980_charger.c | 8 +-
+ drivers/power/supply/bq27xxx_battery.c | 57 ++-
+ drivers/power/supply/cpcap-battery.c | 2 +-
+ drivers/power/supply/cpcap-charger.c | 2 +-
+ drivers/power/supply/ds2760_battery.c | 52 +--
+ drivers/power/supply/generic-adc-battery.c | 2 +-
+ drivers/power/supply/gpio-charger.c | 2 +-
+ drivers/power/supply/ingenic-battery.c | 2 +-
+ drivers/power/supply/ip5xxx_power.c | 2 +-
+ drivers/power/supply/lego_ev3_battery.c | 3 +-
+ drivers/power/supply/lt3651-charger.c | 2 +-
+ drivers/power/supply/ltc4162-l-charger.c | 4 +-
+ drivers/power/supply/max17042_battery.c | 2 +-
+ drivers/power/supply/max1720x_battery.c | 51 ++-
+ drivers/power/supply/max77650-charger.c | 2 +-
+ drivers/power/supply/max8903_charger.c | 2 +-
+ drivers/power/supply/mm8013.c | 2 +-
+ drivers/power/supply/mt6360_charger.c | 2 +-
+ drivers/power/supply/mt6370-charger.c | 2 +-
+ drivers/power/supply/olpc_battery.c | 4 +-
+ drivers/power/supply/pcf50633-charger.c | 466 ---------------------
+ drivers/power/supply/pm8916_bms_vm.c | 2 +-
+ drivers/power/supply/pm8916_lbc.c | 2 +-
+ drivers/power/supply/power_supply_core.c | 30 +-
+ drivers/power/supply/qcom_battmgr.c | 5 +-
+ drivers/power/supply/qcom_pmi8998_charger.c | 2 +-
+ drivers/power/supply/qcom_smbb.c | 2 +-
+ drivers/power/supply/rk817_charger.c | 2 +-
+ drivers/power/supply/rt5033_battery.c | 2 +-
+ drivers/power/supply/rt5033_charger.c | 3 +-
+ drivers/power/supply/rt9455_charger.c | 4 +-
+ drivers/power/supply/rt9467-charger.c | 2 +-
+ drivers/power/supply/rt9471.c | 2 +-
+ drivers/power/supply/sbs-battery.c | 2 +-
+ drivers/power/supply/sbs-charger.c | 2 +-
+ drivers/power/supply/sbs-manager.c | 2 +-
+ drivers/power/supply/sc2731_charger.c | 2 +-
+ drivers/power/supply/sc27xx_fuel_gauge.c | 8 +-
+ drivers/power/supply/smb347-charger.c | 4 +-
+ drivers/power/supply/tps65090-charger.c | 2 +-
+ drivers/power/supply/tps65217_charger.c | 2 +-
+ drivers/power/supply/ucs1002_power.c | 2 +-
+ include/linux/power/bq27xxx_battery.h | 1 +
+ include/linux/power_supply.h | 3 -
+ 72 files changed, 243 insertions(+), 652 deletions(-)
+ delete mode 100644 drivers/power/supply/pcf50633-charger.c
+Merging regulator/for-next (557b4c79dfeb Merge remote-tracking branch 'regulator/for-6.15' 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
+Auto-merging arch/arm64/boot/dts/freescale/imx8mp-skov-reva.dtsi
+Auto-merging drivers/regulator/Kconfig
+Merge made by the 'ort' strategy.
+ .../bindings/regulator/nxp,pca9450-regulator.yaml | 29 ++++-
+ .../arm64/boot/dts/freescale/imx8mp-skov-reva.dtsi | 5 +-
+ drivers/regulator/Kconfig | 7 --
+ drivers/regulator/Makefile | 1 -
+ drivers/regulator/ad5398.c | 30 +++--
+ drivers/regulator/cros-ec-regulator.c | 4 +-
+ drivers/regulator/devres.c | 5 +-
+ drivers/regulator/pca9450-regulator.c | 91 ++++++++++++---
+ drivers/regulator/pcf50633-regulator.c | 124 ---------------------
+ 9 files changed, 126 insertions(+), 170 deletions(-)
+ delete mode 100644 drivers/regulator/pcf50633-regulator.c
+Merging security/next (65b796acea1e mailmap: map Stephen Smalley's old email addresses)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git security/next
+Auto-merging .mailmap
+Auto-merging MAINTAINERS
+Auto-merging arch/x86/events/intel/core.c
+Auto-merging include/linux/lsm_hook_defs.h
+Auto-merging include/linux/security.h
+Auto-merging io_uring/io_uring.c
+Auto-merging kernel/events/core.c
+Auto-merging security/security.c
+Auto-merging security/selinux/hooks.c
+Auto-merging security/selinux/include/classmap.h
+Merge made by the 'ort' strategy.
+ .mailmap | 2 ++
+ MAINTAINERS | 10 ++++++++++
+ arch/x86/events/intel/bts.c | 2 +-
+ arch/x86/events/intel/core.c | 2 +-
+ arch/x86/events/intel/p4.c | 2 +-
+ drivers/perf/arm_spe_pmu.c | 4 ++--
+ include/linux/lsm_audit.h | 2 +-
+ include/linux/lsm_hook_defs.h | 3 ++-
+ include/linux/perf_event.h | 10 +++++-----
+ include/linux/security.h | 10 +++++++---
+ io_uring/io_uring.c | 21 ++++++++++++++-------
+ kernel/events/core.c | 14 +++++++-------
+ kernel/trace/trace_event_perf.c | 4 ++--
+ rust/kernel/cred.rs | 5 +++++
+ rust/kernel/security.rs | 12 ++++++++----
+ security/lsm_audit.c | 2 +-
+ security/security.c | 17 ++++++++++++++---
+ security/selinux/hooks.c | 16 +++++++++++++++-
+ security/selinux/include/classmap.h | 2 +-
+ 19 files changed, 99 insertions(+), 41 deletions(-)
+Merging apparmor/apparmor-next (3e45553acb14 apparmor: Remove unused variable 'sock' in __file_sock_perm())
+$ git merge -m Merge branch 'apparmor-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor apparmor/apparmor-next
+Auto-merging security/apparmor/apparmorfs.c
+Auto-merging security/apparmor/lsm.c
+Merge made by the 'ort' strategy.
+ security/apparmor/Makefile | 2 +-
+ security/apparmor/af_unix.c | 702 +++++++++++++++++++++++++++++++++
+ security/apparmor/apparmorfs.c | 36 +-
+ security/apparmor/audit.c | 2 +-
+ security/apparmor/capability.c | 56 +++
+ security/apparmor/domain.c | 118 +++---
+ security/apparmor/file.c | 61 +--
+ security/apparmor/include/af_unix.h | 57 +++
+ security/apparmor/include/apparmor.h | 4 +-
+ security/apparmor/include/capability.h | 1 +
+ security/apparmor/include/file.h | 9 +-
+ security/apparmor/include/ipc.h | 3 +
+ security/apparmor/include/label.h | 24 +-
+ security/apparmor/include/lib.h | 43 +-
+ security/apparmor/include/net.h | 31 +-
+ security/apparmor/include/path.h | 1 +
+ security/apparmor/include/policy.h | 46 ++-
+ security/apparmor/include/sig_names.h | 6 +-
+ security/apparmor/include/signal.h | 19 +
+ security/apparmor/ipc.c | 10 +-
+ security/apparmor/label.c | 37 +-
+ security/apparmor/lib.c | 91 +++++
+ security/apparmor/lsm.c | 249 ++++++++++--
+ security/apparmor/net.c | 180 ++++++++-
+ security/apparmor/policy.c | 39 +-
+ security/apparmor/policy_compat.c | 6 +-
+ security/apparmor/policy_ns.c | 2 +-
+ security/apparmor/policy_unpack.c | 29 +-
+ security/apparmor/procattr.c | 6 +-
+ 29 files changed, 1637 insertions(+), 233 deletions(-)
+ create mode 100644 security/apparmor/af_unix.c
+ create mode 100644 security/apparmor/include/af_unix.h
+ create mode 100644 security/apparmor/include/signal.h
+Merging integrity/next-integrity (672a4c654a08 ima: limit the number of ToMToU integrity violations)
+$ 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/ima/ima.h | 3 ++-
+ security/integrity/ima/ima_main.c | 18 +++++++++++++-----
+ 2 files changed, 15 insertions(+), 6 deletions(-)
+Merging selinux/next (8af43b61c17e selinux: support wildcard network interface names)
+$ 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
+Auto-merging security/selinux/include/classmap.h
+Merge made by the 'ort' strategy.
+ scripts/selinux/install_policy.sh | 15 ++++----
+ security/selinux/avc.c | 2 +-
+ security/selinux/hooks.c | 58 ++++++++++++++++++++++++------
+ security/selinux/include/classmap.h | 4 ++-
+ security/selinux/include/policycap.h | 1 +
+ security/selinux/include/policycap_names.h | 1 +
+ security/selinux/include/security.h | 8 ++++-
+ security/selinux/ss/services.c | 16 +++++++--
+ 8 files changed, 80 insertions(+), 25 deletions(-)
+Merging smack/next (a158a937d864 smack: recognize ipv4 CIPSO w/o categories)
+$ git merge -m Merge branch 'next' of git://github.com/cschaufler/smack-next smack/next
+Merge made by the 'ort' strategy.
+ security/smack/smack.h | 20 +++++++++++++-------
+ security/smack/smack_access.c | 6 ++++--
+ security/smack/smack_lsm.c | 40 ++++++++++++----------------------------
+ security/smack/smackfs.c | 29 ++++++++++++++---------------
+ 4 files changed, 43 insertions(+), 52 deletions(-)
+Merging tomoyo/master (09fbf3d50205 Merge tag 'tomoyo-pr-20250211' of git://git.code.sf.net/p/tomoyo/tomoyo)
+$ git merge -m Merge branch 'master' of git://git.code.sf.net/p/tomoyo/tomoyo.git tomoyo/master
+Already up to date.
+Merging tpmdd/next (4576ad38bb9b tpm, tpm_tis: Workaround failed command reception on Infineon devices)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tpmdd/next
+Merge made by the 'ort' strategy.
+ drivers/char/tpm/tpm-chip.c | 5 +++++
+ drivers/char/tpm/tpm-interface.c | 7 -------
+ drivers/char/tpm/tpm2-cmd.c | 1 -
+ drivers/char/tpm/tpm2-sessions.c | 2 +-
+ drivers/char/tpm/tpm_ftpm_tee.c | 2 +-
+ drivers/char/tpm/tpm_tis_core.c | 20 +++++++++++++++-----
+ drivers/char/tpm/tpm_tis_core.h | 1 +
+ include/linux/tpm.h | 1 +
+ 8 files changed, 24 insertions(+), 15 deletions(-)
+Merging watchdog/master (48a136639ec2 watchdog: aspeed: fix 64-bit division)
+$ git merge -m Merge branch 'master' of git://www.linux-watchdog.org/linux-watchdog-next.git watchdog/master
+Merge made by the 'ort' strategy.
+ .../bindings/watchdog/fsl-imx7ulp-wdt.yaml | 4 +
+ .../devicetree/bindings/watchdog/renesas,wdt.yaml | 4 +
+ drivers/watchdog/Kconfig | 22 +-
+ drivers/watchdog/Makefile | 1 +
+ drivers/watchdog/aspeed_wdt.c | 81 ++++-
+ drivers/watchdog/cros_ec_wdt.c | 10 +-
+ drivers/watchdog/lenovo_se30_wdt.c | 394 +++++++++++++++++++++
+ drivers/watchdog/nic7018_wdt.c | 9 +-
+ drivers/watchdog/npcm_wdt.c | 9 +-
+ drivers/watchdog/s3c2410_wdt.c | 10 +-
+ drivers/watchdog/watchdog_core.c | 6 +-
+ 11 files changed, 522 insertions(+), 28 deletions(-)
+ create mode 100644 drivers/watchdog/lenovo_se30_wdt.c
+Merging iommu/next (f5a5f66e2791 Merge branches 'apple/dart', 'arm/smmu/updates', 'arm/smmu/bindings', 's390', 'core', 'intel/vt-d' and 'amd/amd-vi' into next)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux.git iommu/next
+Auto-merging arch/s390/include/asm/pci.h
+Auto-merging arch/s390/pci/pci.c
+Auto-merging drivers/irqchip/Kconfig
+Auto-merging drivers/pci/pci-driver.c
+Auto-merging kernel/irq/Kconfig
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/iommu/arm,smmu.yaml | 3 +-
+ .../devicetree/bindings/iommu/qcom,iommu.yaml | 1 +
+ arch/s390/include/asm/pci.h | 4 +-
+ arch/s390/include/asm/pci_clp.h | 4 +-
+ arch/s390/kvm/pci.c | 17 +-
+ arch/s390/pci/pci.c | 35 +--
+ arch/s390/pci/pci_bus.c | 25 ++
+ arch/s390/pci/pci_clp.c | 1 +
+ arch/s390/pci/pci_sysfs.c | 11 +-
+ drivers/acpi/arm64/dma.c | 5 +
+ drivers/acpi/scan.c | 7 -
+ drivers/amba/bus.c | 3 +-
+ drivers/base/platform.c | 3 +-
+ drivers/bus/fsl-mc/fsl-mc-bus.c | 3 +-
+ drivers/cdx/cdx.c | 3 +-
+ drivers/iommu/Kconfig | 4 +-
+ drivers/iommu/amd/amd_iommu.h | 8 +-
+ drivers/iommu/amd/amd_iommu_types.h | 30 +--
+ drivers/iommu/amd/init.c | 69 +++---
+ drivers/iommu/amd/io_pgtable.c | 7 -
+ drivers/iommu/amd/io_pgtable_v2.c | 2 +-
+ drivers/iommu/amd/iommu.c | 91 ++++---
+ drivers/iommu/amd/pasid.c | 2 +-
+ drivers/iommu/apple-dart.c | 19 +-
+ drivers/iommu/arm/arm-smmu/arm-smmu.c | 11 +-
+ drivers/iommu/dma-iommu.c | 82 ++-----
+ drivers/iommu/intel/iommu.c | 237 +++++++-----------
+ drivers/iommu/intel/iommu.h | 28 +--
+ drivers/iommu/intel/pasid.c | 43 +---
+ drivers/iommu/intel/prq.c | 2 +-
+ drivers/iommu/intel/svm.c | 43 ++++
+ drivers/iommu/io-pgtable-dart.c | 2 +-
+ drivers/iommu/iommu-priv.h | 5 +-
+ drivers/iommu/iommu.c | 220 +++++++++++------
+ drivers/iommu/iommufd/device.c | 268 +++++++++++++++++++--
+ drivers/iommu/iommufd/fault.c | 130 +---------
+ drivers/iommu/iommufd/hw_pagetable.c | 5 +-
+ drivers/iommu/iommufd/iommufd_private.h | 64 ++---
+ drivers/iommu/iommufd/main.c | 9 +
+ drivers/iommu/mtk_iommu_v1.c | 25 +-
+ drivers/iommu/of_iommu.c | 13 +-
+ drivers/iommu/s390-iommu.c | 138 +++++++++--
+ drivers/iommu/tegra-smmu.c | 1 -
+ drivers/irqchip/Kconfig | 4 +
+ drivers/irqchip/irq-gic-v2m.c | 5 +-
+ drivers/irqchip/irq-gic-v3-its.c | 13 +-
+ drivers/irqchip/irq-gic-v3-mbi.c | 12 +-
+ drivers/irqchip/irq-ls-scfg-msi.c | 5 +-
+ drivers/of/device.c | 7 +-
+ drivers/pci/pci-driver.c | 3 +-
+ include/linux/iommu.h | 61 ++---
+ include/linux/msi.h | 61 +++--
+ kernel/irq/Kconfig | 1 +
+ 53 files changed, 1041 insertions(+), 814 deletions(-)
+Merging audit/next (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git audit/next
+Already up to date.
+Merging devicetree/for-next (590f5d6752f7 of: Move of_prop_val_eq() next to the single user)
+$ 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/gpu/arm,mali-bifrost.yaml
+Auto-merging drivers/of/base.c
+Auto-merging drivers/of/of_private.h
+CONFLICT (content): Merge conflict in drivers/of/of_private.h
+Auto-merging include/linux/of.h
+Resolved 'drivers/of/of_private.h' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master f1622c3c0f98] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git
+$ git diff -M --stat --summary HEAD^..
+ .../bindings/display/bridge/lvds-codec.yaml | 1 +
+ .../display/panel/mitsubishi,aa104xd12.yaml | 6 +-
+ .../devicetree/bindings/fsi/ibm,p9-scom.yaml | 1 +
+ .../devicetree/bindings/gpu/arm,mali-bifrost.yaml | 3 +
+ .../interrupt-controller/nxp,lpc3220-mic.txt | 58 --------------
+ .../interrupt-controller/nxp,lpc3220-mic.yaml | 68 ++++++++++++++++
+ .../bindings/memory-controllers/exynos-srom.yaml | 36 +--------
+ .../memory-controllers/mc-peripheral-props.yaml | 2 +
+ .../qcom,ebi2-peripheral-props.yaml | 91 ++++++++++++++++++++++
+ .../{bus => memory-controllers}/qcom,ebi2.yaml | 87 +--------------------
+ .../samsung,exynos4210-srom-peripheral-props.yaml | 35 +++++++++
+ .../devicetree/bindings/net/smsc,lan9115.yaml | 6 +-
+ .../devicetree/bindings/soc/imx/fsl,aips-bus.yaml | 5 +-
+ .../devicetree/bindings/submitting-patches.rst | 19 ++++-
+ .../devicetree/bindings/trivial-devices.yaml | 9 +++
+ Documentation/devicetree/bindings/xilinx.txt | 26 -------
+ Documentation/process/maintainer-soc-clean-dts.rst | 5 +-
+ drivers/of/base.c | 6 +-
+ drivers/of/irq.c | 82 ++++++++++---------
+ drivers/of/of_private.h | 7 ++
+ drivers/of/overlay.c | 10 ++-
+ drivers/of/platform.c | 8 +-
+ drivers/of/resolver.c | 41 ++++------
+ drivers/of/unittest-data/tests-interrupts.dtsi | 13 ++++
+ drivers/of/unittest.c | 67 ++++++++++++++++
+ include/linux/fwnode.h | 2 +-
+ include/linux/of.h | 8 +-
+ 27 files changed, 406 insertions(+), 296 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/nxp,lpc3220-mic.txt
+ create mode 100644 Documentation/devicetree/bindings/interrupt-controller/nxp,lpc3220-mic.yaml
+ create mode 100644 Documentation/devicetree/bindings/memory-controllers/qcom,ebi2-peripheral-props.yaml
+ rename Documentation/devicetree/bindings/{bus => memory-controllers}/qcom,ebi2.yaml (63%)
+ create mode 100644 Documentation/devicetree/bindings/memory-controllers/samsung,exynos4210-srom-peripheral-props.yaml
+Merging dt-krzk/for-next (854a080f0b73 loongarch: dts: remove non-existent DAC from 2k1000-ref)
+$ 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/cirrus/ep7211-edb7211.dts | 2 +-
+ arch/loongarch/boot/dts/loongson-2k1000-ref.dts | 5 -----
+ 2 files changed, 1 insertion(+), 6 deletions(-)
+Merging mailbox/for-next (d44ee3bd382d MAINTAINERS: add mailbox API's tree type and location)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jassibrar/mailbox.git mailbox/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ .../bindings/mailbox/mediatek,gce-mailbox.yaml | 4 ++
+ MAINTAINERS | 1 +
+ drivers/mailbox/arm_mhu.c | 2 +-
+ drivers/mailbox/arm_mhu_db.c | 2 +-
+ drivers/mailbox/arm_mhuv2.c | 2 +-
+ drivers/mailbox/mailbox.c | 28 ++++-----
+ drivers/mailbox/mailbox.h | 2 +
+ drivers/mailbox/pl320-ipc.c | 14 +----
+ drivers/mailbox/tegra-hsp.c | 72 ++++++++++++++++++----
+ include/linux/mailbox/mtk-cmdq-mailbox.h | 1 -
+ include/linux/mailbox_client.h | 2 +-
+ include/linux/mailbox_controller.h | 6 +-
+ 12 files changed, 87 insertions(+), 49 deletions(-)
+Merging spi/for-next (7c51d2d7f82a Merge remote-tracking branch 'spi/for-6.15' 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 Documentation/devicetree/bindings/vendor-prefixes.yaml
+Auto-merging MAINTAINERS
+Auto-merging include/linux/mtd/nand-qpic-common.h
+Merge made by the 'ort' strategy.
+ .../connector/gocontroll,moduline-module-slot.yaml | 88 ++
+ .../bindings/spi/adi,axi-spi-engine.yaml | 24 +
+ .../devicetree/bindings/spi/fsl,espi.yaml | 65 +
+ Documentation/devicetree/bindings/spi/fsl,spi.yaml | 74 +
+ Documentation/devicetree/bindings/spi/fsl-spi.txt | 62 -
+ .../bindings/spi/mediatek,spi-mt65xx.yaml | 2 +
+ .../bindings/spi/qcom,spi-qpic-snand.yaml | 83 +
+ .../devicetree/bindings/spi/spi-fsl-lpspi.yaml | 1 +
+ .../devicetree/bindings/spi/spi-rockchip.yaml | 1 +
+ .../devicetree/bindings/spi/spi-sg2044-nor.yaml | 52 +
+ .../devicetree/bindings/spi/st,stm32mp25-ospi.yaml | 105 ++
+ .../bindings/trigger-source/pwm-trigger.yaml | 37 +
+ .../devicetree/bindings/vendor-prefixes.yaml | 2 +
+ MAINTAINERS | 17 +
+ drivers/mtd/nand/Makefile | 4 +
+ drivers/spi/Kconfig | 44 +
+ drivers/spi/Makefile | 7 +
+ drivers/spi/spi-axi-spi-engine.c | 315 +++-
+ drivers/spi/spi-cadence-quadspi.c | 8 +-
+ drivers/spi/spi-fsi.c | 13 +
+ drivers/spi/spi-gpio.c | 45 +-
+ drivers/spi/spi-mt65xx.c | 17 +
+ drivers/spi/spi-offload-trigger-pwm.c | 169 ++
+ drivers/spi/spi-offload.c | 468 ++++++
+ drivers/spi/spi-qpic-snand.c | 1631 ++++++++++++++++++++
+ drivers/spi/spi-realtek-rtl-snand.c | 1 -
+ drivers/spi/spi-s3c64xx.c | 4 +-
+ drivers/spi/spi-sg2044-nor.c | 500 ++++++
+ drivers/spi/spi-stm32-ospi.c | 1063 +++++++++++++
+ drivers/spi/spi-zynqmp-gqspi.c | 169 +-
+ drivers/spi/spi.c | 111 +-
+ drivers/spi/spidev.c | 2 +
+ include/linux/mtd/nand-qpic-common.h | 7 +
+ include/linux/spi/offload/consumer.h | 39 +
+ include/linux/spi/offload/provider.h | 47 +
+ include/linux/spi/offload/types.h | 100 ++
+ include/linux/spi/spi.h | 56 +-
+ 37 files changed, 5161 insertions(+), 272 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/connector/gocontroll,moduline-module-slot.yaml
+ create mode 100644 Documentation/devicetree/bindings/spi/fsl,espi.yaml
+ create mode 100644 Documentation/devicetree/bindings/spi/fsl,spi.yaml
+ delete mode 100644 Documentation/devicetree/bindings/spi/fsl-spi.txt
+ create mode 100644 Documentation/devicetree/bindings/spi/qcom,spi-qpic-snand.yaml
+ create mode 100644 Documentation/devicetree/bindings/spi/spi-sg2044-nor.yaml
+ create mode 100644 Documentation/devicetree/bindings/spi/st,stm32mp25-ospi.yaml
+ create mode 100644 Documentation/devicetree/bindings/trigger-source/pwm-trigger.yaml
+ create mode 100644 drivers/spi/spi-offload-trigger-pwm.c
+ create mode 100644 drivers/spi/spi-offload.c
+ create mode 100644 drivers/spi/spi-qpic-snand.c
+ create mode 100644 drivers/spi/spi-sg2044-nor.c
+ create mode 100644 drivers/spi/spi-stm32-ospi.c
+ create mode 100644 include/linux/spi/offload/consumer.h
+ create mode 100644 include/linux/spi/offload/provider.h
+ create mode 100644 include/linux/spi/offload/types.h
+Merging tip/master (7bd346e10c48 Merge branch into tip/master: 'x86/sev')
+$ 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 Makefile
+Auto-merging arch/Kconfig
+Auto-merging arch/arm64/Kconfig
+Auto-merging arch/arm64/boot/dts/rockchip/rk356x-base.dtsi
+Auto-merging arch/arm64/include/asm/vdso/compat_gettimeofday.h
+CONFLICT (content): Merge conflict in arch/arm64/include/asm/vdso/compat_gettimeofday.h
+Auto-merging arch/arm64/include/asm/vdso/vsyscall.h
+CONFLICT (content): Merge conflict in arch/arm64/include/asm/vdso/vsyscall.h
+Auto-merging arch/arm64/kernel/vdso.c
+Auto-merging arch/loongarch/Kconfig
+Auto-merging arch/mips/Kconfig
+Auto-merging arch/powerpc/Kconfig
+Auto-merging arch/powerpc/include/asm/vdso/gettimeofday.h
+CONFLICT (content): Merge conflict in arch/powerpc/include/asm/vdso/gettimeofday.h
+Auto-merging arch/powerpc/kernel/time.c
+Auto-merging arch/powerpc/kvm/powerpc.c
+Auto-merging arch/riscv/Kconfig
+Auto-merging arch/riscv/boot/dts/sophgo/sg2042.dtsi
+Auto-merging arch/riscv/include/asm/io.h
+CONFLICT (content): Merge conflict in arch/riscv/include/asm/io.h
+Auto-merging arch/s390/Kconfig
+Auto-merging arch/s390/kernel/time.c
+CONFLICT (content): Merge conflict in arch/s390/kernel/time.c
+Auto-merging arch/s390/kernel/vdso.c
+Auto-merging arch/s390/kvm/interrupt.c
+Auto-merging arch/s390/kvm/kvm-s390.c
+Auto-merging arch/um/kernel/um_arch.c
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/x86/Makefile
+Auto-merging arch/x86/boot/Makefile
+Auto-merging arch/x86/boot/compressed/Makefile
+Auto-merging arch/x86/entry/syscalls/syscall_32.tbl
+Auto-merging arch/x86/entry/vdso/Makefile
+Auto-merging arch/x86/entry/vdso/vma.c
+Auto-merging arch/x86/events/intel/bts.c
+Auto-merging arch/x86/events/intel/core.c
+Auto-merging arch/x86/include/asm/bug.h
+Auto-merging arch/x86/include/asm/io.h
+Auto-merging arch/x86/include/asm/msr-index.h
+Auto-merging arch/x86/include/asm/percpu.h
+Auto-merging arch/x86/include/asm/tlbflush.h
+Auto-merging arch/x86/include/asm/vdso/getrandom.h
+CONFLICT (content): Merge conflict in arch/x86/include/asm/vdso/getrandom.h
+Auto-merging arch/x86/include/asm/vdso/gettimeofday.h
+CONFLICT (content): Merge conflict in arch/x86/include/asm/vdso/gettimeofday.h
+Auto-merging arch/x86/include/asm/vdso/vsyscall.h
+Auto-merging arch/x86/kernel/callthunks.c
+Auto-merging arch/x86/kernel/paravirt.c
+CONFLICT (content): Merge conflict in arch/x86/kernel/paravirt.c
+Auto-merging arch/x86/kernel/setup.c
+Auto-merging arch/x86/mm/init_32.c
+Auto-merging arch/x86/mm/init_64.c
+Auto-merging arch/x86/mm/ioremap.c
+Auto-merging arch/x86/mm/pgtable.c
+CONFLICT (content): Merge conflict in arch/x86/mm/pgtable.c
+Auto-merging arch/x86/net/bpf_jit_comp.c
+Auto-merging arch/x86/xen/enlighten_pv.c
+Auto-merging block/blk-iocost.c
+Auto-merging drivers/base/power/runtime.c
+Auto-merging drivers/block/null_blk/main.c
+Auto-merging drivers/cpufreq/intel_pstate.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
+Auto-merging drivers/gpu/drm/i915/gt/uc/intel_huc.c
+Auto-merging drivers/gpu/drm/i915/gvt/display.c
+Auto-merging drivers/gpu/drm/i915/i915_perf.c
+Auto-merging drivers/gpu/drm/i915/i915_pmu.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_pmu.c
+Auto-merging drivers/gpu/drm/i915/i915_request.c
+Auto-merging drivers/gpu/drm/i915/intel_uncore.c
+Auto-merging drivers/gpu/drm/vkms/vkms_crtc.c
+Auto-merging drivers/gpu/drm/xe/xe_oa.c
+Auto-merging drivers/idle/intel_idle.c
+Auto-merging drivers/irqchip/Kconfig
+Auto-merging drivers/irqchip/Makefile
+Auto-merging drivers/irqchip/irq-gic-v2m.c
+Auto-merging drivers/irqchip/irq-gic-v3-its.c
+Auto-merging drivers/irqchip/irq-gic-v3-mbi.c
+Auto-merging drivers/mailbox/mailbox.c
+CONFLICT (content): Merge conflict in drivers/mailbox/mailbox.c
+Auto-merging drivers/media/cec/core/cec-pin.c
+Auto-merging drivers/media/platform/chips-media/wave5/wave5-vpu.c
+Auto-merging drivers/mmc/host/dw_mmc.c
+Auto-merging drivers/net/ethernet/cortina/gemini.c
+Auto-merging drivers/net/ethernet/intel/igc/igc_main.c
+Auto-merging drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
+Auto-merging drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+Auto-merging drivers/net/ethernet/ti/am65-cpsw-nuss.c
+Auto-merging drivers/net/ethernet/ti/icssg/icssg_common.c
+Auto-merging drivers/net/ethernet/ti/icssg/icssg_prueth.c
+Auto-merging drivers/net/wireless/virtual/mac80211_hwsim.c
+Auto-merging drivers/pci/Kconfig
+Auto-merging drivers/s390/crypto/ap_bus.c
+Auto-merging drivers/scsi/lpfc/lpfc_init.c
+Auto-merging fs/timerfd.c
+Auto-merging include/asm-generic/vdso/vsyscall.h
+CONFLICT (content): Merge conflict in include/asm-generic/vdso/vsyscall.h
+Auto-merging include/linux/compiler.h
+Auto-merging include/linux/module.h
+Auto-merging include/linux/msi.h
+Auto-merging include/linux/percpu-defs.h
+Auto-merging include/linux/perf_event.h
+Auto-merging include/linux/pgtable.h
+Auto-merging include/vdso/datapage.h
+CONFLICT (content): Merge conflict in include/vdso/datapage.h
+Auto-merging include/vdso/helpers.h
+CONFLICT (content): Merge conflict in include/vdso/helpers.h
+Auto-merging init/Kconfig
+Auto-merging io_uring/io_uring.c
+Auto-merging io_uring/timeout.c
+Auto-merging kernel/bpf/helpers.c
+Auto-merging kernel/bpf/verifier.c
+Auto-merging kernel/cfi.c
+Auto-merging kernel/events/core.c
+Auto-merging kernel/events/uprobes.c
+Auto-merging kernel/fork.c
+Auto-merging kernel/irq/chip.c
+Auto-merging kernel/locking/mutex.c
+Auto-merging kernel/module/main.c
+Auto-merging kernel/signal.c
+Auto-merging kernel/sys.c
+Auto-merging kernel/time/namespace.c
+CONFLICT (content): Merge conflict in kernel/time/namespace.c
+Auto-merging kernel/time/posix-clock.c
+Auto-merging kernel/time/vsyscall.c
+CONFLICT (content): Merge conflict in kernel/time/vsyscall.c
+Auto-merging kernel/trace/bpf_trace.c
+Auto-merging kernel/watchdog_perf.c
+Auto-merging lib/Makefile
+Auto-merging lib/vdso/datastore.c
+CONFLICT (add/add): Merge conflict in lib/vdso/datastore.c
+Auto-merging lib/vdso/gettimeofday.c
+CONFLICT (content): Merge conflict in lib/vdso/gettimeofday.c
+Auto-merging mm/memory.c
+Auto-merging mm/percpu.c
+Auto-merging mm/vmstat.c
+Auto-merging net/core/dev.c
+CONFLICT (content): Merge conflict in net/core/dev.c
+Auto-merging net/ipv4/tcp_timer.c
+Auto-merging net/sched/sch_api.c
+Auto-merging net/xfrm/xfrm_state.c
+Auto-merging scripts/gdb/linux/cpus.py
+Auto-merging scripts/link-vmlinux.sh
+Auto-merging tools/objtool/arch/powerpc/decode.c
+Resolved 'arch/arm64/include/asm/vdso/compat_gettimeofday.h' using previous resolution.
+Resolved 'arch/arm64/include/asm/vdso/vsyscall.h' using previous resolution.
+Resolved 'arch/powerpc/include/asm/vdso/gettimeofday.h' using previous resolution.
+Resolved 'arch/riscv/include/asm/io.h' using previous resolution.
+Resolved 'arch/s390/kernel/time.c' using previous resolution.
+Recorded preimage for 'arch/x86/include/asm/vdso/getrandom.h'
+Resolved 'arch/x86/include/asm/vdso/gettimeofday.h' using previous resolution.
+Resolved 'arch/x86/kernel/paravirt.c' using previous resolution.
+Resolved 'arch/x86/mm/pgtable.c' using previous resolution.
+Resolved 'drivers/gpu/drm/i915/i915_pmu.c' using previous resolution.
+Resolved 'drivers/mailbox/mailbox.c' using previous resolution.
+Resolved 'include/asm-generic/vdso/vsyscall.h' using previous resolution.
+Resolved 'include/vdso/datapage.h' using previous resolution.
+Resolved 'include/vdso/helpers.h' using previous resolution.
+Resolved 'kernel/time/namespace.c' using previous resolution.
+Resolved 'kernel/time/vsyscall.c' using previous resolution.
+Resolved 'lib/vdso/datastore.c' using previous resolution.
+Resolved 'lib/vdso/gettimeofday.c' using previous resolution.
+Resolved 'net/core/dev.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+Recorded resolution for 'arch/x86/include/asm/vdso/getrandom.h'.
+[master 936a6599a035] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git
+$ git diff -M --stat --summary HEAD^..
+ .../admin-guide/hw-vuln/reg-file-data-sampling.rst | 8 -
+ Documentation/admin-guide/hw-vuln/srso.rst | 13 +
+ Documentation/admin-guide/kdump/kdump.rst | 4 -
+ Documentation/admin-guide/kernel-parameters.txt | 13 +-
+ Documentation/arch/arm64/silicon-errata.rst | 2 +
+ Documentation/arch/x86/boot.rst | 10 -
+ Documentation/arch/x86/usb-legacy-support.rst | 11 +-
+ .../allwinner,sun7i-a20-sc-nmi.yaml | 1 +
+ .../interrupt-controller/renesas,rzv2h-icu.yaml | 6 +-
+ .../bindings/interrupt-controller/riscv,aplic.yaml | 8 +
+ .../interrupt-controller/sophgo,sg2042-msi.yaml | 61 ++
+ MAINTAINERS | 2 +
+ Makefile | 3 +
+ arch/arm/include/asm/io.h | 2 +-
+ arch/arm/mach-davinci/da830.c | 1 -
+ arch/arm/mach-imx/mmdc.c | 5 +-
+ arch/arm/mm/cache-l2x0-pmu.c | 3 +-
+ arch/arm/mm/ioremap.c | 2 +-
+ arch/arm/mm/nommu.c | 2 +-
+ arch/arm64/Kconfig | 9 +
+ arch/arm64/boot/dts/rockchip/rk356x-base.dtsi | 14 +-
+ arch/arm64/include/asm/cache.h | 4 +-
+ arch/arm64/include/asm/vdso/compat_gettimeofday.h | 6 +-
+ arch/arm64/include/asm/vdso/vsyscall.h | 4 +-
+ arch/arm64/kvm/arch_timer.c | 7 +-
+ arch/loongarch/Kconfig | 3 +
+ arch/loongarch/Makefile | 6 +-
+ arch/loongarch/kvm/vcpu.c | 4 +-
+ arch/mips/kvm/mips.c | 5 +-
+ arch/powerpc/include/asm/vdso/gettimeofday.h | 2 +-
+ arch/powerpc/kernel/watchdog.c | 3 +-
+ arch/powerpc/kvm/powerpc.c | 4 +-
+ arch/riscv/Kconfig | 1 +
+ arch/riscv/boot/dts/sophgo/sg2042.dtsi | 10 +
+ arch/riscv/include/asm/io.h | 2 +-
+ arch/riscv/kvm/vcpu_timer.c | 7 +-
+ arch/s390/kernel/time.c | 11 +-
+ arch/s390/kvm/interrupt.c | 3 +-
+ arch/s390/kvm/kvm-s390.c | 4 +-
+ arch/sparc/vdso/Makefile | 7 +-
+ arch/sparc/vdso/checkundef.sh | 10 -
+ arch/um/kernel/um_arch.c | 11 +-
+ arch/x86/Kconfig | 207 +++---
+ arch/x86/Kconfig.cpu | 105 +---
+ arch/x86/Kconfig.cpufeatures | 201 ++++++
+ arch/x86/Makefile | 51 +-
+ arch/x86/Makefile_32.cpu | 5 +-
+ arch/x86/boot/Makefile | 7 +-
+ arch/x86/boot/boot.h | 4 +-
+ arch/x86/boot/compressed/Makefile | 1 +
+ arch/x86/boot/compressed/head_64.S | 103 ---
+ arch/x86/boot/compressed/la57toggle.S | 112 ++++
+ arch/x86/boot/compressed/misc.c | 14 +-
+ arch/x86/boot/compressed/vmlinux.lds.S | 2 +-
+ arch/x86/boot/cpucheck.c | 3 +-
+ arch/x86/boot/cpuflags.c | 27 +-
+ arch/x86/boot/cpuflags.h | 7 +-
+ arch/x86/boot/genimage.sh | 5 +-
+ arch/x86/boot/mkcpustr.c | 3 +-
+ arch/x86/boot/setup.ld | 2 +
+ arch/x86/boot/tools/.gitignore | 2 -
+ arch/x86/boot/tools/build.c | 247 --------
+ arch/x86/configs/xen.config | 2 -
+ arch/x86/crypto/aesni-intel_asm.S | 2 +
+ arch/x86/crypto/camellia-aesni-avx-asm_64.S | 7 +-
+ arch/x86/crypto/camellia-aesni-avx2-asm_64.S | 1 +
+ arch/x86/crypto/camellia-x86_64-asm_64.S | 9 +-
+ arch/x86/crypto/serpent-avx-x86_64-asm_64.S | 7 +-
+ arch/x86/crypto/twofish-x86_64-asm_64-3way.S | 5 +-
+ arch/x86/crypto/twofish-x86_64-asm_64.S | 5 +-
+ arch/x86/entry/Makefile | 8 +-
+ arch/x86/entry/calling.h | 1 +
+ arch/x86/entry/common.c | 524 ----------------
+ arch/x86/entry/entry.S | 6 +-
+ arch/x86/entry/entry_32.S | 4 +-
+ arch/x86/entry/entry_64.S | 11 +-
+ arch/x86/entry/entry_64_compat.S | 4 +-
+ arch/x86/entry/entry_64_fred.S | 1 +
+ arch/x86/entry/syscall_32.c | 332 +++++++++-
+ arch/x86/entry/syscall_64.c | 111 +++-
+ arch/x86/entry/syscall_x32.c | 25 -
+ arch/x86/entry/syscalls/syscall_32.tbl | 2 +-
+ arch/x86/entry/vdso/Makefile | 8 +-
+ arch/x86/entry/vdso/checkundef.sh | 10 -
+ arch/x86/entry/vdso/extable.h | 2 +-
+ arch/x86/entry/vdso/vma.c | 3 +-
+ arch/x86/events/amd/ibs.c | 206 +++++-
+ arch/x86/events/amd/iommu.c | 2 +-
+ arch/x86/events/core.c | 15 +-
+ arch/x86/events/intel/bts.c | 43 +-
+ arch/x86/events/intel/core.c | 137 ++--
+ arch/x86/events/intel/ds.c | 204 +++++-
+ arch/x86/events/intel/uncore.c | 3 +-
+ arch/x86/events/perf_event.h | 35 +-
+ arch/x86/events/perf_event_flags.h | 2 +-
+ arch/x86/events/rapl.c | 3 +-
+ arch/x86/hyperv/mmu.c | 1 -
+ arch/x86/include/asm/Kbuild | 1 +
+ arch/x86/include/asm/alternative.h | 47 +-
+ arch/x86/include/asm/amd-ibs.h | 3 +-
+ arch/x86/include/asm/apic.h | 4 +-
+ arch/x86/include/asm/arch_hweight.h | 14 +-
+ arch/x86/include/asm/asm-prototypes.h | 2 +-
+ arch/x86/include/asm/asm.h | 21 +-
+ arch/x86/include/asm/atomic.h | 14 +-
+ arch/x86/include/asm/atomic64_32.h | 98 +--
+ arch/x86/include/asm/atomic64_64.h | 14 +-
+ arch/x86/include/asm/barrier.h | 8 +-
+ arch/x86/include/asm/bitops.h | 14 +-
+ arch/x86/include/asm/boot.h | 2 +-
+ arch/x86/include/asm/bug.h | 8 +-
+ arch/x86/include/asm/cfi.h | 26 +
+ arch/x86/include/asm/cmpxchg.h | 28 +-
+ arch/x86/include/asm/cmpxchg_32.h | 42 +-
+ arch/x86/include/asm/cmpxchg_64.h | 4 +-
+ arch/x86/include/asm/coco.h | 10 +-
+ arch/x86/include/asm/cpu.h | 15 -
+ arch/x86/include/asm/cpu_device_id.h | 130 ++--
+ arch/x86/include/asm/cpufeature.h | 81 +--
+ arch/x86/include/asm/cpufeatures.h | 15 +-
+ arch/x86/include/asm/cpuid.h | 1 +
+ arch/x86/include/asm/cpumask.h | 4 +-
+ arch/x86/include/asm/current.h | 40 +-
+ arch/x86/include/asm/desc.h | 1 -
+ arch/x86/include/asm/desc_defs.h | 4 +-
+ arch/x86/include/asm/disabled-features.h | 161 -----
+ arch/x86/include/asm/dwarf2.h | 2 +-
+ arch/x86/include/asm/e820/api.h | 1 -
+ arch/x86/include/asm/e820/types.h | 9 -
+ arch/x86/include/asm/edac.h | 2 +-
+ arch/x86/include/asm/elf.h | 5 +-
+ arch/x86/include/asm/fixmap.h | 4 +-
+ arch/x86/include/asm/fpu/api.h | 17 +-
+ arch/x86/include/asm/frame.h | 10 +-
+ arch/x86/include/asm/fred.h | 4 +-
+ arch/x86/include/asm/fsgsbase.h | 4 +-
+ arch/x86/include/asm/ftrace.h | 24 +-
+ arch/x86/include/asm/hardirq.h | 4 +-
+ arch/x86/include/asm/hw_irq.h | 4 +-
+ arch/x86/include/asm/ibt.h | 25 +-
+ arch/x86/include/asm/idtentry.h | 6 +-
+ arch/x86/include/asm/init.h | 4 +
+ arch/x86/include/asm/inst.h | 2 +-
+ arch/x86/include/asm/intel-family.h | 29 +-
+ arch/x86/include/asm/io.h | 3 +
+ arch/x86/include/asm/irq_stack.h | 12 +-
+ arch/x86/include/asm/irqflags.h | 10 +-
+ arch/x86/include/asm/jump_label.h | 4 +-
+ arch/x86/include/asm/kasan.h | 2 +-
+ arch/x86/include/asm/kexec.h | 64 +-
+ arch/x86/include/asm/linkage.h | 24 +-
+ arch/x86/include/asm/mce.h | 2 -
+ arch/x86/include/asm/mem_encrypt.h | 4 +-
+ arch/x86/include/asm/mmu.h | 12 +
+ arch/x86/include/asm/mmu_context.h | 10 +-
+ arch/x86/include/asm/mshyperv.h | 18 +-
+ arch/x86/include/asm/msr-index.h | 3 +
+ arch/x86/include/asm/msr.h | 4 +-
+ arch/x86/include/asm/nmi.h | 2 +
+ arch/x86/include/asm/nops.h | 2 +-
+ arch/x86/include/asm/nospec-branch.h | 21 +-
+ arch/x86/include/asm/orc_types.h | 4 +-
+ arch/x86/include/asm/page.h | 4 +-
+ arch/x86/include/asm/page_32.h | 4 +-
+ arch/x86/include/asm/page_32_types.h | 8 +-
+ arch/x86/include/asm/page_64.h | 9 +-
+ arch/x86/include/asm/page_64_types.h | 2 +-
+ arch/x86/include/asm/page_types.h | 4 +-
+ arch/x86/include/asm/paravirt.h | 19 +-
+ arch/x86/include/asm/paravirt_types.h | 20 +-
+ arch/x86/include/asm/percpu.h | 153 ++---
+ arch/x86/include/asm/perf_event.h | 20 +
+ arch/x86/include/asm/pgalloc.h | 5 -
+ arch/x86/include/asm/pgtable-2level_types.h | 4 +-
+ arch/x86/include/asm/pgtable-3level_types.h | 4 +-
+ arch/x86/include/asm/pgtable-invert.h | 4 +-
+ arch/x86/include/asm/pgtable.h | 12 +-
+ arch/x86/include/asm/pgtable_32.h | 4 +-
+ arch/x86/include/asm/pgtable_32_areas.h | 2 +-
+ arch/x86/include/asm/pgtable_64.h | 6 +-
+ arch/x86/include/asm/pgtable_64_types.h | 4 +-
+ arch/x86/include/asm/pgtable_types.h | 14 +-
+ arch/x86/include/asm/preempt.h | 25 +-
+ arch/x86/include/asm/processor.h | 67 +-
+ arch/x86/include/asm/prom.h | 4 +-
+ arch/x86/include/asm/proto.h | 3 +-
+ arch/x86/include/asm/pti.h | 4 +-
+ arch/x86/include/asm/ptrace.h | 4 +-
+ arch/x86/include/asm/purgatory.h | 4 +-
+ arch/x86/include/asm/pvclock-abi.h | 4 +-
+ arch/x86/include/asm/realmode.h | 4 +-
+ arch/x86/include/asm/required-features.h | 105 ----
+ arch/x86/include/asm/resctrl.h | 36 +-
+ arch/x86/include/asm/rmwcc.h | 2 +-
+ arch/x86/include/asm/runtime-const.h | 13 +
+ arch/x86/include/asm/segment.h | 8 +-
+ arch/x86/include/asm/set_memory.h | 2 -
+ arch/x86/include/asm/setup.h | 7 +-
+ arch/x86/include/asm/setup_data.h | 4 +-
+ arch/x86/include/asm/shared/tdx.h | 4 +-
+ arch/x86/include/asm/shstk.h | 4 +-
+ arch/x86/include/asm/signal.h | 8 +-
+ arch/x86/include/asm/smap.h | 6 +-
+ arch/x86/include/asm/smp.h | 24 +-
+ arch/x86/include/asm/special_insns.h | 22 +-
+ arch/x86/include/asm/sta2x11.h | 13 -
+ arch/x86/include/asm/stackprotector.h | 36 +-
+ arch/x86/include/asm/string_64.h | 2 +
+ arch/x86/include/asm/sync_bitops.h | 12 +-
+ arch/x86/include/asm/tdx.h | 4 +-
+ arch/x86/include/asm/thread_info.h | 12 +-
+ arch/x86/include/asm/tlb.h | 138 ++++
+ arch/x86/include/asm/tlbflush.h | 71 ++-
+ arch/x86/include/asm/traps.h | 2 -
+ arch/x86/include/asm/unwind_hints.h | 4 +-
+ arch/x86/include/asm/vdso/getrandom.h | 4 +-
+ arch/x86/include/asm/vdso/gettimeofday.h | 20 +-
+ arch/x86/include/asm/vdso/processor.h | 4 +-
+ arch/x86/include/asm/vdso/vsyscall.h | 4 +-
+ arch/x86/include/asm/vermagic.h | 4 -
+ arch/x86/include/asm/xen/interface.h | 10 +-
+ arch/x86/include/asm/xen/interface_32.h | 4 +-
+ arch/x86/include/asm/xen/interface_64.h | 4 +-
+ arch/x86/include/uapi/asm/bootparam.h | 4 +-
+ arch/x86/include/uapi/asm/e820.h | 4 +-
+ arch/x86/include/uapi/asm/ldt.h | 4 +-
+ arch/x86/include/uapi/asm/msr.h | 4 +-
+ arch/x86/include/uapi/asm/ptrace-abi.h | 6 +-
+ arch/x86/include/uapi/asm/ptrace.h | 4 +-
+ arch/x86/include/uapi/asm/setup_data.h | 4 +-
+ arch/x86/include/uapi/asm/signal.h | 8 +-
+ arch/x86/kernel/Makefile | 2 +
+ arch/x86/kernel/acpi/cstate.c | 11 +
+ arch/x86/kernel/acpi/madt_playdead.S | 1 +
+ arch/x86/kernel/acpi/madt_wakeup.c | 73 +--
+ arch/x86/kernel/acpi/wakeup_64.S | 1 +
+ arch/x86/kernel/alternative.c | 647 ++++++++++++++-----
+ arch/x86/kernel/apic/Makefile | 3 -
+ arch/x86/kernel/apic/apic.c | 3 -
+ arch/x86/kernel/apic/bigsmp_32.c | 105 ----
+ arch/x86/kernel/apic/ipi.c | 33 +-
+ arch/x86/kernel/apic/local.h | 13 -
+ arch/x86/kernel/apic/probe_32.c | 29 -
+ arch/x86/kernel/apic/vector.c | 231 ++++---
+ arch/x86/kernel/asm-offsets.c | 5 -
+ arch/x86/kernel/asm-offsets_64.c | 6 -
+ arch/x86/kernel/bootflag.c | 29 +-
+ arch/x86/kernel/callthunks.c | 13 -
+ arch/x86/kernel/cfi.c | 26 +-
+ arch/x86/kernel/cpu/amd.c | 30 +-
+ arch/x86/kernel/cpu/bugs.c | 121 ++--
+ arch/x86/kernel/cpu/bus_lock.c | 20 +-
+ arch/x86/kernel/cpu/cacheinfo.c | 31 +-
+ arch/x86/kernel/cpu/common.c | 241 ++++---
+ arch/x86/kernel/cpu/cpu.h | 8 -
+ arch/x86/kernel/cpu/cpuid-deps.c | 35 ++
+ arch/x86/kernel/cpu/debugfs.c | 4 +-
+ arch/x86/kernel/cpu/hygon.c | 16 +-
+ arch/x86/kernel/cpu/intel.c | 229 +++----
+ arch/x86/kernel/cpu/match.c | 30 +
+ arch/x86/kernel/cpu/mce/core.c | 44 +-
+ arch/x86/kernel/cpu/mce/inject.c | 1 -
+ arch/x86/kernel/cpu/mtrr/if.c | 6 +-
+ arch/x86/kernel/cpu/resctrl/Makefile | 5 +-
+ arch/x86/kernel/cpu/resctrl/core.c | 181 ++----
+ arch/x86/kernel/cpu/resctrl/ctrlmondata.c | 93 ++-
+ arch/x86/kernel/cpu/resctrl/internal.h | 201 ++----
+ arch/x86/kernel/cpu/resctrl/monitor.c | 119 ++--
+ arch/x86/kernel/cpu/resctrl/pseudo_lock.c | 55 +-
+ arch/x86/kernel/cpu/resctrl/rdtgroup.c | 284 ++++++---
+ arch/x86/kernel/crash.c | 2 +-
+ arch/x86/kernel/dumpstack_32.c | 4 +-
+ arch/x86/kernel/dumpstack_64.c | 2 +-
+ arch/x86/kernel/e820.c | 115 ++--
+ arch/x86/kernel/early_printk.c | 49 +-
+ arch/x86/kernel/fpu/core.c | 19 +-
+ arch/x86/kernel/fpu/internal.h | 2 +-
+ arch/x86/kernel/fpu/signal.c | 11 +-
+ arch/x86/kernel/fpu/xstate.c | 30 +-
+ arch/x86/kernel/fpu/xstate.h | 27 +-
+ arch/x86/kernel/ftrace.c | 30 +-
+ arch/x86/kernel/ftrace_64.S | 5 +
+ arch/x86/kernel/head64.c | 2 +-
+ arch/x86/kernel/head_64.S | 24 +-
+ arch/x86/kernel/i8259.c | 1 +
+ arch/x86/kernel/ioport.c | 2 +-
+ arch/x86/kernel/irq.c | 5 +
+ arch/x86/kernel/irq_32.c | 51 +-
+ arch/x86/kernel/irq_64.c | 8 +-
+ arch/x86/kernel/irqflags.S | 1 +
+ arch/x86/kernel/kprobes/core.c | 11 +-
+ arch/x86/kernel/kvm.c | 1 -
+ arch/x86/kernel/module.c | 83 ++-
+ arch/x86/kernel/nmi.c | 42 ++
+ arch/x86/kernel/paravirt.c | 35 +-
+ arch/x86/kernel/process.c | 17 +-
+ arch/x86/kernel/process_32.c | 11 +-
+ arch/x86/kernel/process_64.c | 31 +-
+ arch/x86/kernel/quirks.c | 2 +
+ arch/x86/kernel/reboot.c | 12 +-
+ arch/x86/kernel/relocate_kernel_64.S | 23 +
+ arch/x86/kernel/setup.c | 200 +++---
+ arch/x86/kernel/setup_percpu.c | 15 +-
+ arch/x86/kernel/signal_32.c | 62 +-
+ arch/x86/kernel/smpboot.c | 75 +--
+ arch/x86/kernel/tboot.c | 3 +-
+ arch/x86/kernel/traps.c | 132 +++-
+ arch/x86/kernel/tsc.c | 4 +-
+ arch/x86/kernel/tsc_msr.c | 2 +-
+ arch/x86/kernel/uprobes.c | 14 +-
+ arch/x86/kernel/verify_cpu.S | 4 +
+ arch/x86/kernel/vmlinux.lds.S | 43 +-
+ arch/x86/kvm/hyperv.c | 3 +-
+ arch/x86/kvm/i8254.c | 3 +-
+ arch/x86/kvm/lapic.c | 5 +-
+ arch/x86/kvm/svm/svm.c | 9 +-
+ arch/x86/kvm/vmx/nested.c | 5 +-
+ arch/x86/kvm/vmx/vmx.c | 3 +-
+ arch/x86/kvm/vmx/vmx_ops.h | 18 +-
+ arch/x86/kvm/xen.c | 4 +-
+ arch/x86/lib/Makefile | 5 +-
+ arch/x86/lib/bhi.S | 147 +++++
+ arch/x86/lib/clear_page_64.S | 9 +-
+ arch/x86/lib/cmpxchg8b_emu.S | 2 +-
+ arch/x86/lib/copy_page_64.S | 3 +-
+ arch/x86/lib/copy_user_64.S | 3 +
+ arch/x86/lib/copy_user_uncached_64.S | 2 +
+ arch/x86/lib/delay.c | 2 +-
+ arch/x86/lib/getuser.S | 16 +-
+ arch/x86/lib/hweight.S | 3 +
+ arch/x86/lib/memmove_64.S | 3 +-
+ arch/x86/lib/memset_64.S | 3 +-
+ arch/x86/lib/msr-reg.S | 3 +-
+ arch/x86/lib/msr.c | 2 +
+ arch/x86/lib/putuser.S | 9 +
+ arch/x86/lib/retpoline.S | 3 +-
+ arch/x86/lib/usercopy_64.c | 2 +-
+ arch/x86/math-emu/control_w.h | 2 +-
+ arch/x86/math-emu/exception.h | 6 +-
+ arch/x86/math-emu/fpu_emu.h | 6 +-
+ arch/x86/math-emu/status_w.h | 6 +-
+ arch/x86/mm/ident_map.c | 14 +-
+ arch/x86/mm/init.c | 9 +-
+ arch/x86/mm/init_32.c | 9 +-
+ arch/x86/mm/init_64.c | 8 -
+ arch/x86/mm/ioremap.c | 8 +
+ arch/x86/mm/kaslr.c | 10 +-
+ arch/x86/mm/mem_encrypt_boot.S | 1 +
+ arch/x86/mm/mem_encrypt_identity.c | 4 +-
+ arch/x86/mm/mmap.c | 9 +-
+ arch/x86/mm/pat/cpa-test.c | 2 +-
+ arch/x86/mm/pat/memtype.c | 68 +-
+ arch/x86/mm/pat/set_memory.c | 243 +++++++-
+ arch/x86/mm/pgtable.c | 27 +-
+ arch/x86/mm/tlb.c | 431 +++++++++++--
+ arch/x86/net/bpf_jit_comp.c | 34 +-
+ arch/x86/pci/Makefile | 2 -
+ arch/x86/pci/sta2x11-fixup.c | 233 -------
+ arch/x86/platform/olpc/olpc-xo1-sci.c | 1 -
+ arch/x86/platform/olpc/olpc_dt.c | 3 +-
+ arch/x86/platform/pvh/head.S | 14 +-
+ arch/x86/power/hibernate_asm_64.S | 2 +
+ arch/x86/realmode/rm/realmode.h | 4 +-
+ arch/x86/realmode/rm/wakeup.h | 2 +-
+ arch/x86/tools/cpufeaturemasks.awk | 88 +++
+ arch/x86/tools/relocs.c | 147 +----
+ arch/x86/virt/svm/sev.c | 1 -
+ arch/x86/xen/Kconfig | 2 +-
+ arch/x86/xen/enlighten_pv.c | 69 ++
+ arch/x86/xen/mmu_pv.c | 1 -
+ arch/x86/xen/smp_pv.c | 2 +-
+ arch/x86/xen/xen-asm.S | 5 +
+ arch/x86/xen/xen-head.S | 12 +-
+ block/bfq-iosched.c | 5 +-
+ block/blk-iocost.c | 3 +-
+ drivers/acpi/processor_idle.c | 2 +
+ drivers/ata/pata_octeon_cf.c | 5 +-
+ drivers/base/power/runtime.c | 4 +-
+ drivers/block/null_blk/main.c | 7 +-
+ drivers/char/hw_random/timeriomem-rng.c | 3 +-
+ drivers/cpufreq/intel_pstate.c | 16 +-
+ drivers/devfreq/event/rockchip-dfi.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 4 +-
+ drivers/gpu/drm/i915/gt/uc/intel_huc.c | 4 +-
+ drivers/gpu/drm/i915/gvt/display.c | 3 +-
+ drivers/gpu/drm/i915/gvt/sched_policy.c | 3 +-
+ drivers/gpu/drm/i915/i915_perf.c | 5 +-
+ drivers/gpu/drm/i915/i915_pmu.c | 3 +-
+ drivers/gpu/drm/i915/i915_request.c | 3 +-
+ drivers/gpu/drm/i915/intel_uncore.c | 3 +-
+ drivers/gpu/drm/msm/msm_fence.c | 3 +-
+ drivers/gpu/drm/msm/msm_io_utils.c | 3 +-
+ drivers/gpu/drm/vkms/vkms_crtc.c | 4 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_vkms.c | 4 +-
+ drivers/gpu/drm/xe/xe_oa.c | 4 +-
+ drivers/hwtracing/stm/heartbeat.c | 6 +-
+ drivers/i2c/busses/i2c-imx.c | 4 +-
+ drivers/idle/intel_idle.c | 14 +
+ drivers/iio/adc/ti-tsc2046.c | 4 +-
+ drivers/iio/trigger/iio-trig-hrtimer.c | 4 +-
+ drivers/infiniband/hw/hfi1/init.c | 5 +-
+ drivers/infiniband/sw/rdmavt/qp.c | 5 +-
+ drivers/irqchip/Kconfig | 20 +-
+ drivers/irqchip/Makefile | 1 +
+ drivers/irqchip/irq-davinci-cp-intc.c | 57 +-
+ drivers/irqchip/irq-gic-v2m.c | 1 +
+ drivers/irqchip/irq-gic-v3-its-msi-parent.c | 1 +
+ drivers/irqchip/irq-gic-v3-its.c | 23 +-
+ drivers/irqchip/irq-gic-v3-mbi.c | 1 +
+ drivers/irqchip/irq-imx-irqsteer.c | 14 +-
+ drivers/irqchip/irq-imx-mu-msi.c | 1 +
+ drivers/irqchip/irq-loongson-pch-msi.c | 1 +
+ drivers/irqchip/irq-msi-lib.c | 11 +-
+ drivers/irqchip/irq-mvebu-gicp.c | 1 +
+ drivers/irqchip/irq-mvebu-odmi.c | 1 +
+ drivers/irqchip/irq-mvebu-sei.c | 1 +
+ drivers/irqchip/irq-renesas-rzg2l.c | 53 +-
+ drivers/irqchip/irq-renesas-rzv2h.c | 198 ++++--
+ drivers/irqchip/irq-riscv-aplic-direct.c | 24 +-
+ drivers/irqchip/irq-riscv-imsic-early.c | 14 +-
+ drivers/irqchip/irq-riscv-imsic-platform.c | 215 ++++---
+ drivers/irqchip/irq-riscv-imsic-state.c | 151 +++--
+ drivers/irqchip/irq-riscv-imsic-state.h | 12 +-
+ drivers/irqchip/irq-sg2042-msi.c | 249 ++++++++
+ drivers/irqchip/irq-sunxi-nmi.c | 85 +--
+ drivers/leds/trigger/ledtrig-pattern.c | 4 +-
+ drivers/media/cec/core/cec-pin.c | 3 +-
+ drivers/media/pci/cx88/cx88-input.c | 3 +-
+ .../media/platform/chips-media/wave5/wave5-vpu.c | 4 +-
+ drivers/media/rc/pwm-ir-tx.c | 3 +-
+ drivers/misc/mei/Kconfig | 2 +-
+ drivers/misc/vcpu_stall_detector.c | 3 +-
+ drivers/mmc/host/dw_mmc.c | 3 +-
+ drivers/net/can/m_can/m_can.c | 9 +-
+ drivers/net/can/spi/mcp251xfd/mcp251xfd-ring.c | 8 +-
+ drivers/net/ethernet/cortina/gemini.c | 5 +-
+ drivers/net/ethernet/ec_bhf.c | 3 +-
+ drivers/net/ethernet/freescale/fec_ptp.c | 4 +-
+ drivers/net/ethernet/hisilicon/hip04_eth.c | 4 +-
+ drivers/net/ethernet/intel/igc/igc_main.c | 4 +-
+ drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 5 +-
+ drivers/net/ethernet/marvell/octeontx2/af/ptp.c | 3 +-
+ .../net/ethernet/microchip/sparx5/sparx5_packet.c | 4 +-
+ .../net/ethernet/qualcomm/rmnet/rmnet_map_data.c | 4 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 6 +-
+ drivers/net/ethernet/ti/am65-cpsw-nuss.c | 9 +-
+ drivers/net/ethernet/ti/icssg/icssg_common.c | 5 +-
+ drivers/net/ethernet/ti/icssg/icssg_prueth.c | 5 +-
+ drivers/net/ieee802154/at86rf230.c | 4 +-
+ drivers/net/usb/cdc_ncm.c | 3 +-
+ .../net/wireless/mediatek/mt76/mt76x02_usb_core.c | 4 +-
+ drivers/net/wireless/ralink/rt2x00/rt2800mmio.c | 2 +-
+ drivers/net/wireless/ralink/rt2x00/rt2800usb.c | 2 +-
+ drivers/net/wireless/ralink/rt2x00/rt2x00dev.c | 4 +-
+ drivers/net/wireless/virtual/mac80211_hwsim.c | 6 +-
+ drivers/net/wwan/iosm/iosm_ipc_imem.c | 24 +-
+ drivers/ntb/test/ntb_pingpong.c | 3 +-
+ drivers/pci/Kconfig | 6 +
+ drivers/perf/arm-ccn.c | 5 +-
+ drivers/perf/marvell_cn10k_ddr_pmu.c | 4 +-
+ drivers/perf/thunderx2_pmu.c | 5 +-
+ drivers/power/reset/ltc2952-poweroff.c | 8 +-
+ drivers/power/supply/ab8500_chargalg.c | 9 +-
+ drivers/powercap/idle_inject.c | 3 +-
+ drivers/powercap/intel_rapl_common.c | 5 +-
+ drivers/pps/generators/pps_gen_parport.c | 3 +-
+ drivers/rtc/class.c | 3 +-
+ drivers/s390/crypto/ap_bus.c | 3 +-
+ drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 4 +-
+ drivers/scsi/lpfc/lpfc_init.c | 7 +-
+ drivers/scsi/scsi_debug.c | 4 +-
+ .../media/atomisp/include/linux/atomisp_platform.h | 4 +-
+ drivers/thermal/intel/intel_tcc.c | 2 +-
+ drivers/tty/serial/8250/8250_bcm7271.c | 3 +-
+ drivers/tty/serial/8250/8250_port.c | 10 +-
+ drivers/tty/serial/amba-pl011.c | 9 +-
+ drivers/tty/serial/imx.c | 8 +-
+ drivers/tty/serial/sh-sci.c | 3 +-
+ drivers/tty/serial/xilinx_uartps.c | 8 +-
+ drivers/usb/chipidea/otg_fsm.c | 3 +-
+ drivers/usb/dwc2/hcd_queue.c | 3 +-
+ drivers/usb/fotg210/fotg210-hcd.c | 3 +-
+ drivers/usb/gadget/function/f_ncm.c | 3 +-
+ drivers/usb/gadget/udc/dummy_hcd.c | 6 +-
+ drivers/usb/host/ehci-hcd.c | 3 +-
+ drivers/usb/musb/musb_cppi41.c | 4 +-
+ drivers/usb/typec/tcpm/tcpm.c | 16 +-
+ drivers/virt/coco/sev-guest/sev-guest.c | 1 +
+ drivers/virtio/virtio_mem.c | 4 +-
+ drivers/watchdog/softdog.c | 8 +-
+ drivers/watchdog/watchdog_dev.c | 4 +-
+ drivers/watchdog/watchdog_hrtimer_pretimeout.c | 4 +-
+ fs/proc/base.c | 48 +-
+ fs/timerfd.c | 5 +-
+ fs/ubifs/io.c | 3 +-
+ include/acpi/processor.h | 5 +
+ include/asm-generic/sections.h | 2 +-
+ include/asm-generic/vdso/vsyscall.h | 2 +-
+ include/asm-generic/vmlinux.lds.h | 49 +-
+ include/linux/acpi.h | 1 -
+ include/linux/cache.h | 9 +-
+ include/linux/cfi.h | 2 +
+ include/linux/cleanup.h | 24 +-
+ include/linux/compiler.h | 10 +
+ include/linux/execmem.h | 31 +
+ include/linux/hrtimer.h | 8 +-
+ include/linux/idr.h | 17 +
+ include/linux/interrupt.h | 16 +-
+ include/linux/irq.h | 7 +-
+ include/linux/irqchip/irq-davinci-cp-intc.h | 25 -
+ include/linux/irqdomain.h | 129 ++--
+ include/linux/mod_devicetable.h | 2 +
+ include/linux/module.h | 16 -
+ include/linux/moduleloader.h | 4 -
+ include/linux/msi.h | 16 +-
+ include/linux/nmi.h | 4 -
+ include/linux/objtool.h | 4 +-
+ include/linux/percpu-defs.h | 17 +-
+ include/linux/perf_event.h | 39 +-
+ include/linux/pgtable.h | 27 +-
+ include/linux/posix-timers.h | 30 +-
+ include/linux/preempt.h | 1 +
+ include/linux/resctrl.h | 212 ++++++-
+ include/linux/resctrl_types.h | 54 ++
+ include/linux/sched/mm.h | 7 +
+ include/linux/sched/signal.h | 3 +-
+ include/linux/sizes.h | 8 +
+ include/linux/uprobes.h | 3 +
+ include/linux/vm_event_item.h | 2 +
+ include/uapi/linux/elf.h | 38 ++
+ include/uapi/linux/prctl.h | 11 +
+ include/vdso/cache.h | 15 +
+ include/vdso/datapage.h | 56 +-
+ include/vdso/helpers.h | 20 +-
+ init/Kconfig | 5 -
+ io_uring/io_uring.c | 2 +-
+ io_uring/timeout.c | 13 +-
+ kernel/bpf/helpers.c | 3 +-
+ kernel/bpf/verifier.c | 4 +-
+ kernel/cfi.c | 4 +-
+ kernel/cpu.c | 5 -
+ kernel/events/callchain.c | 38 +-
+ kernel/events/core.c | 692 +++++++++++----------
+ kernel/events/hw_breakpoint.c | 5 +-
+ kernel/events/ring_buffer.c | 1 +
+ kernel/events/uprobes.c | 12 +-
+ kernel/fork.c | 7 +-
+ kernel/futex/core.c | 21 +-
+ kernel/iomem.c | 5 +-
+ kernel/irq/chip.c | 30 +-
+ kernel/irq/internals.h | 11 +-
+ kernel/irq/irqdesc.c | 2 +-
+ kernel/irq/irqdomain.c | 5 +-
+ kernel/irq/manage.c | 7 +-
+ kernel/irq/migration.c | 20 +
+ kernel/irq/msi.c | 65 +-
+ kernel/kallsyms.c | 12 +-
+ kernel/locking/Makefile | 3 +-
+ kernel/locking/lock_events_list.h | 28 +
+ kernel/locking/lockdep.c | 17 +-
+ kernel/locking/mutex.c | 2 +
+ kernel/locking/rtmutex.c | 29 +-
+ kernel/module/main.c | 81 +--
+ kernel/module/strict_rwx.c | 9 +-
+ kernel/rseq.c | 142 +++--
+ kernel/sched/core.c | 14 +-
+ kernel/sched/deadline.c | 6 +-
+ kernel/sched/fair.c | 75 ++-
+ kernel/sched/rt.c | 5 +-
+ kernel/sched/sched.h | 42 +-
+ kernel/sched/syscalls.c | 12 +-
+ kernel/signal.c | 2 +-
+ kernel/sys.c | 5 +
+ kernel/sysctl.c | 120 ----
+ kernel/time/clocksource.c | 2 +-
+ kernel/time/hrtimer.c | 34 +-
+ kernel/time/namespace.c | 20 +-
+ kernel/time/ntp.c | 3 +-
+ kernel/time/posix-clock.c | 24 +-
+ kernel/time/posix-timers.c | 563 +++++++++--------
+ kernel/time/sched_clock.c | 3 +-
+ kernel/time/tick-broadcast-hrtimer.c | 3 +-
+ kernel/time/tick-sched.c | 6 +-
+ kernel/time/timer_list.c | 4 +-
+ kernel/time/vsyscall.c | 47 +-
+ kernel/trace/bpf_trace.c | 21 +-
+ kernel/trace/trace_osnoise.c | 6 +-
+ kernel/watchdog.c | 28 +-
+ kernel/watchdog_perf.c | 29 +-
+ lib/atomic64_test.c | 2 +-
+ lib/test_objpool.c | 3 +-
+ lib/vdso/datastore.c | 6 +-
+ lib/vdso/gettimeofday.c | 146 +++--
+ mm/execmem.c | 39 +-
+ mm/memory.c | 11 +-
+ mm/percpu.c | 4 +-
+ mm/slab_common.c | 4 +-
+ mm/vmstat.c | 2 +
+ net/can/bcm.c | 20 +-
+ net/can/isotp.c | 10 +-
+ net/can/j1939/bus.c | 4 +-
+ net/can/j1939/transport.c | 8 +-
+ net/core/dev.c | 3 +-
+ net/ipv4/tcp_timer.c | 10 +-
+ net/mac802154/main.c | 4 +-
+ net/sched/act_gate.c | 3 +-
+ net/sched/sch_api.c | 3 +-
+ net/sched/sch_taprio.c | 6 +-
+ net/xfrm/xfrm_iptfs.c | 6 +-
+ net/xfrm/xfrm_state.c | 4 +-
+ rust/helpers/helpers.c | 1 +
+ rust/helpers/sync.c | 13 +
+ rust/kernel/sync.rs | 57 +-
+ rust/kernel/sync/condvar.rs | 28 +-
+ rust/kernel/sync/lock.rs | 35 +-
+ rust/kernel/sync/lock/global.rs | 5 +-
+ rust/kernel/sync/poll.rs | 2 +-
+ rust/kernel/task.rs | 2 +
+ rust/kernel/workqueue.rs | 2 +-
+ scripts/gcc-x86_32-has-stack-protector.sh | 8 -
+ scripts/gcc-x86_64-has-stack-protector.sh | 4 -
+ scripts/gdb/linux/cpus.py | 2 +-
+ scripts/kallsyms.c | 70 +--
+ scripts/link-vmlinux.sh | 4 -
+ scripts/min-tool-version.sh | 4 +-
+ sound/soc/fsl/imx-pcm-fiq.c | 3 +-
+ tools/arch/x86/include/asm/amd-ibs.h | 3 +-
+ tools/arch/x86/include/asm/asm.h | 8 +-
+ tools/arch/x86/include/asm/cpufeatures.h | 9 -
+ tools/arch/x86/include/asm/disabled-features.h | 161 -----
+ tools/arch/x86/include/asm/msr-index.h | 2 +
+ tools/arch/x86/include/asm/nops.h | 2 +-
+ tools/arch/x86/include/asm/orc_types.h | 4 +-
+ tools/arch/x86/include/asm/pvclock-abi.h | 4 +-
+ tools/arch/x86/include/asm/required-features.h | 105 ----
+ tools/include/nolibc/Makefile | 1 +
+ tools/include/nolibc/limits.h | 7 +
+ tools/include/uapi/linux/elf.h | 524 ++++++++++++++++
+ tools/objtool/Makefile | 2 +-
+ tools/objtool/arch/loongarch/decode.c | 28 +-
+ tools/objtool/arch/loongarch/include/arch/elf.h | 7 +
+ tools/objtool/arch/loongarch/special.c | 159 ++++-
+ tools/objtool/arch/powerpc/decode.c | 14 +
+ tools/objtool/arch/x86/decode.c | 14 +
+ tools/objtool/check.c | 35 +-
+ tools/objtool/include/objtool/arch.h | 3 +
+ tools/objtool/noreturns.h | 2 +
+ tools/perf/check-headers.sh | 2 -
+ tools/power/x86/turbostat/turbostat.c | 2 +-
+ tools/testing/selftests/lib.mk | 5 +-
+ tools/testing/selftests/rseq/.gitignore | 1 +
+ tools/testing/selftests/rseq/Makefile | 9 +-
+ tools/testing/selftests/rseq/rseq.c | 27 +-
+ tools/testing/selftests/rseq/rseq.h | 5 +
+ .../selftests/rseq/run_syscall_errors_test.sh | 5 +
+ tools/testing/selftests/rseq/syscall_errors_test.c | 124 ++++
+ tools/testing/selftests/timers/posix_timers.c | 73 ++-
+ tools/testing/selftests/vDSO/Makefile | 11 +-
+ tools/testing/selftests/vDSO/parse_vdso.c | 19 +-
+ tools/testing/selftests/vDSO/parse_vdso.h | 1 -
+ .../selftests/vDSO/vdso_standalone_test_x86.c | 172 ++---
+ .../selftests/vDSO/vdso_test_gettimeofday.c | 4 +-
+ tools/testing/selftests/x86/Makefile | 6 +-
+ tools/testing/selftests/x86/amx.c | 442 +------------
+ tools/testing/selftests/x86/avx.c | 12 +
+ .../testing/selftests/x86/corrupt_xstate_header.c | 14 +-
+ tools/testing/selftests/x86/entry_from_vm86.c | 24 +-
+ tools/testing/selftests/x86/fsgsbase.c | 24 +-
+ tools/testing/selftests/x86/helpers.h | 28 +
+ tools/testing/selftests/x86/ioperm.c | 25 +-
+ tools/testing/selftests/x86/iopl.c | 25 +-
+ tools/testing/selftests/x86/lam.c | 151 ++++-
+ tools/testing/selftests/x86/ldt_gdt.c | 18 +-
+ tools/testing/selftests/x86/mov_ss_trap.c | 14 +-
+ tools/testing/selftests/x86/ptrace_syscall.c | 24 +-
+ tools/testing/selftests/x86/sigaltstack.c | 26 +-
+ tools/testing/selftests/x86/sigreturn.c | 24 +-
+ tools/testing/selftests/x86/single_step_syscall.c | 22 -
+ tools/testing/selftests/x86/syscall_arg_fault.c | 12 -
+ tools/testing/selftests/x86/syscall_nt.c | 12 -
+ tools/testing/selftests/x86/syscall_numbering.c | 3 +-
+ tools/testing/selftests/x86/sysret_rip.c | 24 +-
+ tools/testing/selftests/x86/test_vsyscall.c | 13 -
+ tools/testing/selftests/x86/unwind_vdso.c | 12 -
+ tools/testing/selftests/x86/xstate.c | 477 ++++++++++++++
+ tools/testing/selftests/x86/xstate.h | 195 ++++++
+ 686 files changed, 11169 insertions(+), 8803 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/interrupt-controller/sophgo,sg2042-msi.yaml
+ delete mode 100644 arch/sparc/vdso/checkundef.sh
+ create mode 100644 arch/x86/Kconfig.cpufeatures
+ create mode 100644 arch/x86/boot/compressed/la57toggle.S
+ delete mode 100644 arch/x86/boot/tools/.gitignore
+ delete mode 100644 arch/x86/boot/tools/build.c
+ delete mode 100644 arch/x86/entry/common.c
+ delete mode 100644 arch/x86/entry/syscall_x32.c
+ delete mode 100755 arch/x86/entry/vdso/checkundef.sh
+ delete mode 100644 arch/x86/include/asm/disabled-features.h
+ delete mode 100644 arch/x86/include/asm/required-features.h
+ delete mode 100644 arch/x86/include/asm/sta2x11.h
+ delete mode 100644 arch/x86/kernel/apic/bigsmp_32.c
+ create mode 100644 arch/x86/lib/bhi.S
+ delete mode 100644 arch/x86/pci/sta2x11-fixup.c
+ create mode 100755 arch/x86/tools/cpufeaturemasks.awk
+ create mode 100644 drivers/irqchip/irq-sg2042-msi.c
+ delete mode 100644 include/linux/irqchip/irq-davinci-cp-intc.h
+ create mode 100644 include/linux/resctrl_types.h
+ create mode 100644 include/vdso/cache.h
+ create mode 100644 rust/helpers/sync.c
+ delete mode 100755 scripts/gcc-x86_32-has-stack-protector.sh
+ delete mode 100755 scripts/gcc-x86_64-has-stack-protector.sh
+ delete mode 100644 tools/arch/x86/include/asm/disabled-features.h
+ delete mode 100644 tools/arch/x86/include/asm/required-features.h
+ create mode 100644 tools/include/nolibc/limits.h
+ create mode 100644 tools/include/uapi/linux/elf.h
+ create mode 100755 tools/testing/selftests/rseq/run_syscall_errors_test.sh
+ create mode 100644 tools/testing/selftests/rseq/syscall_errors_test.c
+ create mode 100644 tools/testing/selftests/x86/avx.c
+ create mode 100644 tools/testing/selftests/x86/xstate.c
+ create mode 100644 tools/testing/selftests/x86/xstate.h
+$ git reset --hard HEAD^
+HEAD is now at bfcbbc419fad Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git
+Merging next-20250303 version of tip
+$ git merge -m next-20250303/tip 16c52ca7545527a06e662ba6818900c4e91a4e0b
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Auto-merging Makefile
+Auto-merging arch/Kconfig
+Auto-merging arch/arm64/Kconfig
+Auto-merging arch/arm64/boot/dts/rockchip/rk356x-base.dtsi
+Auto-merging arch/arm64/kernel/vdso.c
+Auto-merging arch/loongarch/kvm/vcpu.c
+Auto-merging arch/mips/Kconfig
+Auto-merging arch/powerpc/Kconfig
+Auto-merging arch/powerpc/kernel/time.c
+Auto-merging arch/powerpc/kvm/powerpc.c
+Auto-merging arch/riscv/Kconfig
+Auto-merging arch/riscv/boot/dts/sophgo/sg2042.dtsi
+Auto-merging arch/riscv/include/asm/io.h
+CONFLICT (content): Merge conflict in arch/riscv/include/asm/io.h
+Auto-merging arch/s390/Kconfig
+Auto-merging arch/s390/kernel/time.c
+Auto-merging arch/s390/kernel/vdso.c
+Auto-merging arch/s390/kvm/interrupt.c
+Auto-merging arch/s390/kvm/kvm-s390.c
+Auto-merging arch/um/kernel/um_arch.c
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/x86/Makefile
+Auto-merging arch/x86/entry/syscalls/syscall_32.tbl
+Auto-merging arch/x86/entry/vdso/Makefile
+Auto-merging arch/x86/entry/vdso/vma.c
+Auto-merging arch/x86/events/intel/bts.c
+Auto-merging arch/x86/events/intel/core.c
+Auto-merging arch/x86/include/asm/bug.h
+Auto-merging arch/x86/include/asm/io.h
+Auto-merging arch/x86/include/asm/msr-index.h
+Auto-merging arch/x86/include/asm/nospec-branch.h
+Auto-merging arch/x86/include/asm/percpu.h
+Auto-merging arch/x86/include/asm/tlbflush.h
+Auto-merging arch/x86/kernel/callthunks.c
+Auto-merging arch/x86/kernel/cpu/intel.c
+Auto-merging arch/x86/kernel/paravirt.c
+CONFLICT (content): Merge conflict in arch/x86/kernel/paravirt.c
+Auto-merging arch/x86/kernel/setup.c
+Auto-merging arch/x86/kvm/svm/svm.c
+Auto-merging arch/x86/kvm/vmx/vmx.c
+Auto-merging arch/x86/mm/init_32.c
+Auto-merging arch/x86/mm/init_64.c
+Auto-merging arch/x86/mm/ioremap.c
+Auto-merging arch/x86/mm/pgtable.c
+CONFLICT (content): Merge conflict in arch/x86/mm/pgtable.c
+Auto-merging arch/x86/net/bpf_jit_comp.c
+Auto-merging block/blk-iocost.c
+Auto-merging drivers/base/power/runtime.c
+Auto-merging drivers/block/null_blk/main.c
+Auto-merging drivers/cpufreq/intel_pstate.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
+Auto-merging drivers/gpu/drm/i915/gt/uc/intel_huc.c
+Auto-merging drivers/gpu/drm/i915/gvt/display.c
+Auto-merging drivers/gpu/drm/i915/i915_perf.c
+Auto-merging drivers/gpu/drm/i915/i915_pmu.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_pmu.c
+Auto-merging drivers/gpu/drm/i915/i915_request.c
+Auto-merging drivers/gpu/drm/i915/intel_uncore.c
+Auto-merging drivers/gpu/drm/vkms/vkms_crtc.c
+Auto-merging drivers/gpu/drm/xe/xe_oa.c
+Auto-merging drivers/idle/intel_idle.c
+Auto-merging drivers/irqchip/Kconfig
+Auto-merging drivers/irqchip/Makefile
+Auto-merging drivers/irqchip/irq-gic-v2m.c
+Auto-merging drivers/irqchip/irq-gic-v3-its.c
+Auto-merging drivers/irqchip/irq-gic-v3-mbi.c
+Auto-merging drivers/mailbox/mailbox.c
+CONFLICT (content): Merge conflict in drivers/mailbox/mailbox.c
+Auto-merging drivers/media/cec/core/cec-pin.c
+Auto-merging drivers/media/platform/chips-media/wave5/wave5-vpu.c
+Auto-merging drivers/mmc/host/dw_mmc.c
+Auto-merging drivers/net/ethernet/cortina/gemini.c
+Auto-merging drivers/net/ethernet/intel/igc/igc_main.c
+Auto-merging drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
+Auto-merging drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+Auto-merging drivers/net/ethernet/ti/am65-cpsw-nuss.c
+Auto-merging drivers/net/ethernet/ti/icssg/icssg_common.c
+Auto-merging drivers/net/ethernet/ti/icssg/icssg_prueth.c
+Auto-merging drivers/net/wireless/virtual/mac80211_hwsim.c
+Auto-merging drivers/pci/Kconfig
+Auto-merging drivers/s390/crypto/ap_bus.c
+Auto-merging drivers/scsi/lpfc/lpfc_init.c
+Auto-merging drivers/usb/typec/tcpm/tcpm.c
+Auto-merging drivers/virt/coco/sev-guest/sev-guest.c
+Auto-merging fs/timerfd.c
+Auto-merging include/linux/compiler.h
+Auto-merging include/linux/module.h
+Auto-merging include/linux/msi.h
+Auto-merging include/linux/percpu-defs.h
+Auto-merging include/linux/perf_event.h
+Auto-merging init/Kconfig
+Auto-merging io_uring/io_uring.c
+Auto-merging io_uring/timeout.c
+Auto-merging kernel/bpf/helpers.c
+Auto-merging kernel/bpf/verifier.c
+Auto-merging kernel/cfi.c
+Auto-merging kernel/events/core.c
+Auto-merging kernel/events/uprobes.c
+Auto-merging kernel/fork.c
+Auto-merging kernel/locking/mutex.c
+Auto-merging kernel/module/main.c
+Auto-merging kernel/sched/core.c
+Auto-merging kernel/sched/deadline.c
+Auto-merging kernel/sched/fair.c
+Auto-merging kernel/time/posix-clock.c
+Auto-merging kernel/trace/bpf_trace.c
+Auto-merging lib/Makefile
+Auto-merging lib/vdso/datastore.c
+CONFLICT (add/add): Merge conflict in lib/vdso/datastore.c
+Auto-merging mm/memory.c
+Auto-merging mm/percpu.c
+Auto-merging mm/slab_common.c
+Auto-merging mm/vmstat.c
+Auto-merging net/core/dev.c
+CONFLICT (content): Merge conflict in net/core/dev.c
+Auto-merging net/ipv4/tcp_timer.c
+Auto-merging net/sched/sch_api.c
+Auto-merging net/xfrm/xfrm_state.c
+Auto-merging scripts/link-vmlinux.sh
+Resolved 'arch/riscv/include/asm/io.h' using previous resolution.
+Resolved 'arch/x86/kernel/paravirt.c' using previous resolution.
+Resolved 'arch/x86/mm/pgtable.c' using previous resolution.
+Resolved 'drivers/gpu/drm/i915/i915_pmu.c' using previous resolution.
+Resolved 'drivers/mailbox/mailbox.c' using previous resolution.
+Resolved 'lib/vdso/datastore.c' using previous resolution.
+Resolved 'net/core/dev.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 895f90f6f264] next-20250303/tip
+$ git diff -M --stat --summary HEAD^..
+ Documentation/admin-guide/hw-vuln/srso.rst | 13 +
+ Documentation/admin-guide/kdump/kdump.rst | 4 -
+ Documentation/admin-guide/kernel-parameters.txt | 11 -
+ Documentation/arch/arm64/silicon-errata.rst | 2 +
+ Documentation/arch/x86/usb-legacy-support.rst | 11 +-
+ .../interrupt-controller/renesas,rzv2h-icu.yaml | 6 +-
+ .../bindings/interrupt-controller/riscv,aplic.yaml | 8 +
+ .../interrupt-controller/sophgo,sg2042-msi.yaml | 61 ++
+ Makefile | 3 +
+ arch/arm/include/asm/io.h | 2 +-
+ arch/arm/mach-imx/mmdc.c | 5 +-
+ arch/arm/mm/cache-l2x0-pmu.c | 3 +-
+ arch/arm/mm/ioremap.c | 2 +-
+ arch/arm/mm/nommu.c | 2 +-
+ arch/arm64/Kconfig | 9 +
+ arch/arm64/boot/dts/rockchip/rk356x-base.dtsi | 14 +-
+ arch/arm64/kvm/arch_timer.c | 7 +-
+ arch/loongarch/kvm/vcpu.c | 4 +-
+ arch/mips/kvm/mips.c | 5 +-
+ arch/powerpc/kernel/watchdog.c | 3 +-
+ arch/powerpc/kvm/powerpc.c | 4 +-
+ arch/riscv/Kconfig | 1 +
+ arch/riscv/boot/dts/sophgo/sg2042.dtsi | 10 +
+ arch/riscv/include/asm/io.h | 2 +-
+ arch/riscv/kvm/vcpu_timer.c | 7 +-
+ arch/s390/kvm/interrupt.c | 3 +-
+ arch/s390/kvm/kvm-s390.c | 4 +-
+ arch/um/kernel/um_arch.c | 11 +-
+ arch/x86/Kconfig | 200 +++----
+ arch/x86/Kconfig.cpu | 101 +---
+ arch/x86/Kconfig.cpufeatures | 197 +++++++
+ arch/x86/Makefile | 53 +-
+ arch/x86/Makefile_32.cpu | 5 +-
+ arch/x86/boot/compressed/misc.c | 14 +-
+ arch/x86/boot/cpucheck.c | 3 +-
+ arch/x86/boot/cpuflags.c | 1 -
+ arch/x86/boot/cpuflags.h | 1 +
+ arch/x86/boot/genimage.sh | 5 +-
+ arch/x86/boot/mkcpustr.c | 3 +-
+ arch/x86/configs/xen.config | 2 -
+ arch/x86/crypto/aesni-intel_asm.S | 2 +
+ arch/x86/crypto/camellia-aesni-avx-asm_64.S | 7 +-
+ arch/x86/crypto/camellia-aesni-avx2-asm_64.S | 1 +
+ arch/x86/crypto/camellia-x86_64-asm_64.S | 9 +-
+ arch/x86/crypto/serpent-avx-x86_64-asm_64.S | 7 +-
+ arch/x86/crypto/twofish-x86_64-asm_64-3way.S | 5 +-
+ arch/x86/crypto/twofish-x86_64-asm_64.S | 5 +-
+ arch/x86/entry/calling.h | 1 +
+ arch/x86/entry/entry.S | 4 +-
+ arch/x86/entry/entry_64.S | 5 +-
+ arch/x86/entry/entry_64_fred.S | 1 +
+ arch/x86/entry/syscalls/syscall_32.tbl | 2 +-
+ arch/x86/entry/vdso/Makefile | 1 +
+ arch/x86/entry/vdso/vma.c | 3 +-
+ arch/x86/events/amd/ibs.c | 206 ++++++-
+ arch/x86/events/amd/iommu.c | 2 +-
+ arch/x86/events/core.c | 15 +-
+ arch/x86/events/intel/bts.c | 22 +-
+ arch/x86/events/intel/core.c | 137 +++--
+ arch/x86/events/intel/ds.c | 204 ++++++-
+ arch/x86/events/intel/uncore.c | 3 +-
+ arch/x86/events/perf_event.h | 35 +-
+ arch/x86/events/perf_event_flags.h | 2 +-
+ arch/x86/events/rapl.c | 3 +-
+ arch/x86/hyperv/mmu.c | 1 -
+ arch/x86/include/asm/Kbuild | 1 +
+ arch/x86/include/asm/alternative.h | 17 +-
+ arch/x86/include/asm/amd-ibs.h | 3 +-
+ arch/x86/include/asm/asm-prototypes.h | 2 +-
+ arch/x86/include/asm/atomic64_32.h | 2 +-
+ arch/x86/include/asm/barrier.h | 8 +-
+ arch/x86/include/asm/bug.h | 8 +-
+ arch/x86/include/asm/cfi.h | 21 +
+ arch/x86/include/asm/cmpxchg.h | 4 +-
+ arch/x86/include/asm/cmpxchg_32.h | 38 +-
+ arch/x86/include/asm/cpu.h | 14 -
+ arch/x86/include/asm/cpufeature.h | 71 +--
+ arch/x86/include/asm/cpufeatures.h | 14 +-
+ arch/x86/include/asm/desc.h | 1 -
+ arch/x86/include/asm/disabled-features.h | 161 ------
+ arch/x86/include/asm/e820/api.h | 1 -
+ arch/x86/include/asm/e820/types.h | 9 -
+ arch/x86/include/asm/edac.h | 2 +-
+ arch/x86/include/asm/elf.h | 5 +-
+ arch/x86/include/asm/ftrace.h | 16 +-
+ arch/x86/include/asm/ibt.h | 13 +-
+ arch/x86/include/asm/intel-family.h | 29 +-
+ arch/x86/include/asm/io.h | 3 +
+ arch/x86/include/asm/linkage.h | 18 +-
+ arch/x86/include/asm/mce.h | 2 -
+ arch/x86/include/asm/msr-index.h | 1 +
+ arch/x86/include/asm/nmi.h | 2 +
+ arch/x86/include/asm/nospec-branch.h | 4 +-
+ arch/x86/include/asm/page_32_types.h | 4 +-
+ arch/x86/include/asm/page_64.h | 1 +
+ arch/x86/include/asm/paravirt.h | 5 -
+ arch/x86/include/asm/paravirt_types.h | 14 +-
+ arch/x86/include/asm/percpu.h | 145 ++---
+ arch/x86/include/asm/perf_event.h | 20 +
+ arch/x86/include/asm/pgalloc.h | 5 -
+ arch/x86/include/asm/pgtable_types.h | 2 +
+ arch/x86/include/asm/processor.h | 29 +-
+ arch/x86/include/asm/proto.h | 3 +-
+ arch/x86/include/asm/required-features.h | 105 ----
+ arch/x86/include/asm/set_memory.h | 2 -
+ arch/x86/include/asm/setup.h | 1 +
+ arch/x86/include/asm/smp.h | 5 +-
+ arch/x86/include/asm/special_insns.h | 4 +-
+ arch/x86/include/asm/sta2x11.h | 13 -
+ arch/x86/include/asm/stackprotector.h | 36 +-
+ arch/x86/include/asm/string_64.h | 2 +
+ arch/x86/include/asm/sync_bitops.h | 12 +-
+ arch/x86/include/asm/tlbflush.h | 2 +-
+ arch/x86/include/asm/traps.h | 2 -
+ arch/x86/include/asm/vermagic.h | 4 -
+ arch/x86/kernel/Makefile | 2 +
+ arch/x86/kernel/acpi/cstate.c | 11 +
+ arch/x86/kernel/acpi/madt_playdead.S | 1 +
+ arch/x86/kernel/acpi/wakeup_64.S | 1 +
+ arch/x86/kernel/alternative.c | 640 ++++++++++++++++-----
+ arch/x86/kernel/apic/Makefile | 3 -
+ arch/x86/kernel/apic/apic.c | 3 -
+ arch/x86/kernel/apic/bigsmp_32.c | 105 ----
+ arch/x86/kernel/apic/ipi.c | 3 +-
+ arch/x86/kernel/apic/local.h | 13 -
+ arch/x86/kernel/apic/probe_32.c | 29 -
+ arch/x86/kernel/apic/vector.c | 231 ++++----
+ arch/x86/kernel/asm-offsets_64.c | 6 -
+ arch/x86/kernel/bootflag.c | 29 +-
+ arch/x86/kernel/callthunks.c | 13 -
+ arch/x86/kernel/cfi.c | 26 +-
+ arch/x86/kernel/cpu/amd.c | 2 +-
+ arch/x86/kernel/cpu/bugs.c | 104 ++--
+ arch/x86/kernel/cpu/common.c | 164 +++---
+ arch/x86/kernel/cpu/debugfs.c | 4 +-
+ arch/x86/kernel/cpu/intel.c | 31 -
+ arch/x86/kernel/cpu/mce/core.c | 44 +-
+ arch/x86/kernel/cpu/mce/inject.c | 1 -
+ arch/x86/kernel/cpu/mtrr/if.c | 6 +-
+ arch/x86/kernel/e820.c | 115 ++--
+ arch/x86/kernel/early_printk.c | 49 +-
+ arch/x86/kernel/fpu/core.c | 2 +-
+ arch/x86/kernel/fpu/internal.h | 2 +-
+ arch/x86/kernel/fpu/signal.c | 11 +-
+ arch/x86/kernel/fpu/xstate.c | 30 +-
+ arch/x86/kernel/ftrace.c | 30 +-
+ arch/x86/kernel/ftrace_64.S | 5 +
+ arch/x86/kernel/head64.c | 2 +-
+ arch/x86/kernel/head_64.S | 20 +-
+ arch/x86/kernel/i8259.c | 1 +
+ arch/x86/kernel/ioport.c | 2 +-
+ arch/x86/kernel/irq_64.c | 1 -
+ arch/x86/kernel/irqflags.S | 1 +
+ arch/x86/kernel/kprobes/core.c | 11 +-
+ arch/x86/kernel/kvm.c | 1 -
+ arch/x86/kernel/module.c | 83 ++-
+ arch/x86/kernel/nmi.c | 42 ++
+ arch/x86/kernel/paravirt.c | 15 +-
+ arch/x86/kernel/process.c | 12 +-
+ arch/x86/kernel/process_32.c | 5 -
+ arch/x86/kernel/process_64.c | 20 +-
+ arch/x86/kernel/quirks.c | 2 +
+ arch/x86/kernel/reboot.c | 10 +-
+ arch/x86/kernel/setup.c | 200 ++++---
+ arch/x86/kernel/setup_percpu.c | 12 +-
+ arch/x86/kernel/signal_32.c | 62 +-
+ arch/x86/kernel/smpboot.c | 47 +-
+ arch/x86/kernel/tboot.c | 3 +-
+ arch/x86/kernel/traps.c | 132 ++++-
+ arch/x86/kernel/tsc.c | 4 +-
+ arch/x86/kernel/tsc_msr.c | 2 +-
+ arch/x86/kernel/verify_cpu.S | 4 +
+ arch/x86/kernel/vmlinux.lds.S | 35 --
+ arch/x86/kvm/hyperv.c | 3 +-
+ arch/x86/kvm/i8254.c | 3 +-
+ arch/x86/kvm/lapic.c | 5 +-
+ arch/x86/kvm/svm/svm.c | 9 +-
+ arch/x86/kvm/vmx/nested.c | 5 +-
+ arch/x86/kvm/vmx/vmx.c | 3 +-
+ arch/x86/kvm/xen.c | 4 +-
+ arch/x86/lib/Makefile | 5 +-
+ arch/x86/lib/bhi.S | 147 +++++
+ arch/x86/lib/clear_page_64.S | 9 +-
+ arch/x86/lib/cmpxchg8b_emu.S | 2 +-
+ arch/x86/lib/copy_page_64.S | 3 +-
+ arch/x86/lib/copy_user_64.S | 3 +
+ arch/x86/lib/copy_user_uncached_64.S | 2 +
+ arch/x86/lib/getuser.S | 9 +
+ arch/x86/lib/hweight.S | 3 +
+ arch/x86/lib/memmove_64.S | 3 +-
+ arch/x86/lib/memset_64.S | 3 +-
+ arch/x86/lib/msr-reg.S | 3 +-
+ arch/x86/lib/msr.c | 2 +
+ arch/x86/lib/putuser.S | 9 +
+ arch/x86/lib/retpoline.S | 1 +
+ arch/x86/lib/usercopy_64.c | 2 +-
+ arch/x86/mm/init.c | 9 +-
+ arch/x86/mm/init_32.c | 9 +-
+ arch/x86/mm/init_64.c | 8 -
+ arch/x86/mm/ioremap.c | 8 +
+ arch/x86/mm/kaslr.c | 10 +-
+ arch/x86/mm/mem_encrypt_boot.S | 1 +
+ arch/x86/mm/mem_encrypt_identity.c | 4 +-
+ arch/x86/mm/mmap.c | 9 +-
+ arch/x86/mm/pat/cpa-test.c | 2 +-
+ arch/x86/mm/pat/set_memory.c | 243 +++++++-
+ arch/x86/mm/pgtable.c | 27 +-
+ arch/x86/mm/tlb.c | 5 +-
+ arch/x86/net/bpf_jit_comp.c | 34 +-
+ arch/x86/pci/Makefile | 2 -
+ arch/x86/pci/sta2x11-fixup.c | 233 --------
+ arch/x86/platform/olpc/olpc-xo1-sci.c | 1 -
+ arch/x86/platform/pvh/head.S | 14 +-
+ arch/x86/power/hibernate_asm_64.S | 2 +
+ arch/x86/tools/featuremasks.awk | 88 +++
+ arch/x86/tools/relocs.c | 147 +----
+ arch/x86/virt/svm/sev.c | 1 -
+ arch/x86/xen/mmu_pv.c | 1 -
+ arch/x86/xen/xen-asm.S | 5 +
+ arch/x86/xen/xen-head.S | 12 +-
+ block/bfq-iosched.c | 5 +-
+ block/blk-iocost.c | 3 +-
+ drivers/acpi/processor_idle.c | 2 +
+ drivers/ata/pata_octeon_cf.c | 5 +-
+ drivers/base/power/runtime.c | 4 +-
+ drivers/block/null_blk/main.c | 7 +-
+ drivers/char/hw_random/timeriomem-rng.c | 3 +-
+ drivers/cpufreq/intel_pstate.c | 16 +-
+ drivers/devfreq/event/rockchip-dfi.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 4 +-
+ drivers/gpu/drm/i915/gt/uc/intel_huc.c | 4 +-
+ drivers/gpu/drm/i915/gvt/display.c | 3 +-
+ drivers/gpu/drm/i915/gvt/sched_policy.c | 3 +-
+ drivers/gpu/drm/i915/i915_perf.c | 5 +-
+ drivers/gpu/drm/i915/i915_pmu.c | 3 +-
+ drivers/gpu/drm/i915/i915_request.c | 3 +-
+ drivers/gpu/drm/i915/intel_uncore.c | 3 +-
+ drivers/gpu/drm/msm/msm_fence.c | 3 +-
+ drivers/gpu/drm/msm/msm_io_utils.c | 3 +-
+ drivers/gpu/drm/vkms/vkms_crtc.c | 4 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_vkms.c | 4 +-
+ drivers/gpu/drm/xe/xe_oa.c | 4 +-
+ drivers/hwtracing/stm/heartbeat.c | 6 +-
+ drivers/i2c/busses/i2c-imx.c | 4 +-
+ drivers/idle/intel_idle.c | 14 +
+ drivers/iio/adc/ti-tsc2046.c | 4 +-
+ drivers/iio/trigger/iio-trig-hrtimer.c | 4 +-
+ drivers/infiniband/hw/hfi1/init.c | 5 +-
+ drivers/infiniband/sw/rdmavt/qp.c | 5 +-
+ drivers/irqchip/Kconfig | 20 +-
+ drivers/irqchip/Makefile | 1 +
+ drivers/irqchip/irq-gic-v2m.c | 1 +
+ drivers/irqchip/irq-gic-v3-its-msi-parent.c | 1 +
+ drivers/irqchip/irq-gic-v3-its.c | 23 +-
+ drivers/irqchip/irq-gic-v3-mbi.c | 1 +
+ drivers/irqchip/irq-imx-mu-msi.c | 1 +
+ drivers/irqchip/irq-loongson-pch-msi.c | 1 +
+ drivers/irqchip/irq-msi-lib.c | 11 +-
+ drivers/irqchip/irq-mvebu-gicp.c | 1 +
+ drivers/irqchip/irq-mvebu-odmi.c | 1 +
+ drivers/irqchip/irq-mvebu-sei.c | 1 +
+ drivers/irqchip/irq-renesas-rzg2l.c | 53 +-
+ drivers/irqchip/irq-renesas-rzv2h.c | 198 +++++--
+ drivers/irqchip/irq-riscv-aplic-direct.c | 24 +-
+ drivers/irqchip/irq-riscv-imsic-early.c | 14 +-
+ drivers/irqchip/irq-riscv-imsic-platform.c | 215 ++++---
+ drivers/irqchip/irq-riscv-imsic-state.c | 151 +++--
+ drivers/irqchip/irq-riscv-imsic-state.h | 12 +-
+ drivers/irqchip/irq-sg2042-msi.c | 249 ++++++++
+ drivers/leds/trigger/ledtrig-pattern.c | 4 +-
+ drivers/media/cec/core/cec-pin.c | 3 +-
+ drivers/media/pci/cx88/cx88-input.c | 3 +-
+ .../media/platform/chips-media/wave5/wave5-vpu.c | 4 +-
+ drivers/media/rc/pwm-ir-tx.c | 3 +-
+ drivers/misc/mei/Kconfig | 2 +-
+ drivers/misc/vcpu_stall_detector.c | 3 +-
+ drivers/mmc/host/dw_mmc.c | 3 +-
+ drivers/net/can/m_can/m_can.c | 9 +-
+ drivers/net/can/spi/mcp251xfd/mcp251xfd-ring.c | 8 +-
+ drivers/net/ethernet/cortina/gemini.c | 5 +-
+ drivers/net/ethernet/ec_bhf.c | 3 +-
+ drivers/net/ethernet/freescale/fec_ptp.c | 4 +-
+ drivers/net/ethernet/hisilicon/hip04_eth.c | 4 +-
+ drivers/net/ethernet/intel/igc/igc_main.c | 4 +-
+ drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 5 +-
+ drivers/net/ethernet/marvell/octeontx2/af/ptp.c | 3 +-
+ .../net/ethernet/microchip/sparx5/sparx5_packet.c | 4 +-
+ .../net/ethernet/qualcomm/rmnet/rmnet_map_data.c | 4 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 6 +-
+ drivers/net/ethernet/ti/am65-cpsw-nuss.c | 9 +-
+ drivers/net/ethernet/ti/icssg/icssg_common.c | 5 +-
+ drivers/net/ethernet/ti/icssg/icssg_prueth.c | 5 +-
+ drivers/net/ieee802154/at86rf230.c | 4 +-
+ drivers/net/usb/cdc_ncm.c | 3 +-
+ .../net/wireless/mediatek/mt76/mt76x02_usb_core.c | 4 +-
+ drivers/net/wireless/ralink/rt2x00/rt2800mmio.c | 2 +-
+ drivers/net/wireless/ralink/rt2x00/rt2800usb.c | 2 +-
+ drivers/net/wireless/ralink/rt2x00/rt2x00dev.c | 4 +-
+ drivers/net/wireless/virtual/mac80211_hwsim.c | 6 +-
+ drivers/net/wwan/iosm/iosm_ipc_imem.c | 24 +-
+ drivers/ntb/test/ntb_pingpong.c | 3 +-
+ drivers/pci/Kconfig | 6 +
+ drivers/perf/arm-ccn.c | 5 +-
+ drivers/perf/marvell_cn10k_ddr_pmu.c | 4 +-
+ drivers/perf/thunderx2_pmu.c | 5 +-
+ drivers/power/reset/ltc2952-poweroff.c | 8 +-
+ drivers/power/supply/ab8500_chargalg.c | 9 +-
+ drivers/powercap/idle_inject.c | 3 +-
+ drivers/powercap/intel_rapl_common.c | 5 +-
+ drivers/pps/generators/pps_gen_parport.c | 3 +-
+ drivers/rtc/class.c | 3 +-
+ drivers/s390/crypto/ap_bus.c | 3 +-
+ drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 4 +-
+ drivers/scsi/lpfc/lpfc_init.c | 7 +-
+ drivers/scsi/scsi_debug.c | 4 +-
+ .../media/atomisp/include/linux/atomisp_platform.h | 4 +-
+ drivers/thermal/intel/intel_tcc.c | 2 +-
+ drivers/tty/serial/8250/8250_bcm7271.c | 3 +-
+ drivers/tty/serial/8250/8250_port.c | 10 +-
+ drivers/tty/serial/amba-pl011.c | 9 +-
+ drivers/tty/serial/imx.c | 8 +-
+ drivers/tty/serial/sh-sci.c | 3 +-
+ drivers/tty/serial/xilinx_uartps.c | 8 +-
+ drivers/usb/chipidea/otg_fsm.c | 3 +-
+ drivers/usb/dwc2/hcd_queue.c | 3 +-
+ drivers/usb/fotg210/fotg210-hcd.c | 3 +-
+ drivers/usb/gadget/function/f_ncm.c | 3 +-
+ drivers/usb/gadget/udc/dummy_hcd.c | 6 +-
+ drivers/usb/host/ehci-hcd.c | 3 +-
+ drivers/usb/musb/musb_cppi41.c | 4 +-
+ drivers/usb/typec/tcpm/tcpm.c | 16 +-
+ drivers/virt/coco/sev-guest/sev-guest.c | 1 +
+ drivers/virtio/virtio_mem.c | 4 +-
+ drivers/watchdog/softdog.c | 8 +-
+ drivers/watchdog/watchdog_dev.c | 4 +-
+ drivers/watchdog/watchdog_hrtimer_pretimeout.c | 4 +-
+ fs/timerfd.c | 5 +-
+ fs/ubifs/io.c | 3 +-
+ include/acpi/processor.h | 5 +
+ include/asm-generic/sections.h | 2 +-
+ include/asm-generic/vmlinux.lds.h | 39 +-
+ include/linux/acpi.h | 1 -
+ include/linux/cfi.h | 2 +
+ include/linux/compiler.h | 10 +
+ include/linux/execmem.h | 31 +
+ include/linux/hrtimer.h | 8 +-
+ include/linux/idr.h | 17 +
+ include/linux/irq.h | 7 +-
+ include/linux/module.h | 16 -
+ include/linux/moduleloader.h | 4 -
+ include/linux/msi.h | 11 +
+ include/linux/objtool.h | 4 +-
+ include/linux/percpu-defs.h | 12 -
+ include/linux/perf_event.h | 35 +-
+ include/linux/uprobes.h | 1 +
+ include/linux/vm_event_item.h | 2 +
+ init/Kconfig | 5 -
+ io_uring/io_uring.c | 2 +-
+ io_uring/timeout.c | 13 +-
+ kernel/bpf/helpers.c | 3 +-
+ kernel/bpf/verifier.c | 2 +-
+ kernel/cfi.c | 4 +-
+ kernel/events/callchain.c | 38 +-
+ kernel/events/core.c | 563 +++++++++---------
+ kernel/events/ring_buffer.c | 1 +
+ kernel/events/uprobes.c | 10 +-
+ kernel/fork.c | 3 +-
+ kernel/futex/core.c | 21 +-
+ kernel/iomem.c | 5 +-
+ kernel/irq/internals.h | 2 +
+ kernel/irq/migration.c | 20 +
+ kernel/kallsyms.c | 12 +-
+ kernel/locking/mutex.c | 2 +
+ kernel/module/main.c | 81 +--
+ kernel/module/strict_rwx.c | 9 +-
+ kernel/rseq.c | 82 +--
+ kernel/sched/core.c | 4 +-
+ kernel/sched/deadline.c | 6 +-
+ kernel/sched/fair.c | 75 ++-
+ kernel/sched/rt.c | 5 +-
+ kernel/sched/syscalls.c | 10 +-
+ kernel/sysctl.c | 120 ----
+ kernel/time/hrtimer.c | 34 +-
+ kernel/time/ntp.c | 3 +-
+ kernel/time/posix-clock.c | 24 +-
+ kernel/time/posix-timers.c | 11 +-
+ kernel/time/sched_clock.c | 3 +-
+ kernel/time/tick-broadcast-hrtimer.c | 3 +-
+ kernel/time/tick-sched.c | 6 +-
+ kernel/trace/bpf_trace.c | 21 +-
+ kernel/trace/trace_osnoise.c | 6 +-
+ kernel/watchdog.c | 3 +-
+ lib/atomic64_test.c | 2 +-
+ lib/test_objpool.c | 3 +-
+ mm/execmem.c | 39 +-
+ mm/memory.c | 2 -
+ mm/percpu.c | 4 +-
+ mm/slab_common.c | 4 +-
+ mm/vmstat.c | 2 +
+ net/can/bcm.c | 20 +-
+ net/can/isotp.c | 10 +-
+ net/can/j1939/bus.c | 4 +-
+ net/can/j1939/transport.c | 8 +-
+ net/core/dev.c | 3 +-
+ net/ipv4/tcp_timer.c | 10 +-
+ net/mac802154/main.c | 4 +-
+ net/sched/act_gate.c | 3 +-
+ net/sched/sch_api.c | 3 +-
+ net/sched/sch_taprio.c | 6 +-
+ net/xfrm/xfrm_iptfs.c | 6 +-
+ net/xfrm/xfrm_state.c | 4 +-
+ scripts/gcc-x86_32-has-stack-protector.sh | 8 -
+ scripts/gcc-x86_64-has-stack-protector.sh | 4 -
+ scripts/kallsyms.c | 70 +--
+ scripts/link-vmlinux.sh | 4 -
+ scripts/min-tool-version.sh | 4 +-
+ sound/soc/fsl/imx-pcm-fiq.c | 3 +-
+ tools/arch/x86/include/asm/amd-ibs.h | 3 +-
+ tools/arch/x86/include/asm/cpufeatures.h | 9 -
+ tools/arch/x86/include/asm/disabled-features.h | 161 ------
+ tools/arch/x86/include/asm/required-features.h | 105 ----
+ tools/objtool/arch/x86/decode.c | 1 +
+ tools/objtool/check.c | 12 +-
+ tools/perf/check-headers.sh | 2 -
+ tools/power/x86/turbostat/turbostat.c | 2 +-
+ tools/testing/selftests/rseq/.gitignore | 1 +
+ tools/testing/selftests/rseq/Makefile | 9 +-
+ tools/testing/selftests/rseq/rseq.c | 6 +-
+ tools/testing/selftests/rseq/rseq.h | 5 +
+ .../selftests/rseq/run_syscall_errors_test.sh | 5 +
+ tools/testing/selftests/rseq/syscall_errors_test.c | 124 ++++
+ tools/testing/selftests/x86/Makefile | 6 +-
+ tools/testing/selftests/x86/amx.c | 442 +-------------
+ tools/testing/selftests/x86/avx.c | 12 +
+ .../testing/selftests/x86/corrupt_xstate_header.c | 14 +-
+ tools/testing/selftests/x86/entry_from_vm86.c | 24 +-
+ tools/testing/selftests/x86/fsgsbase.c | 24 +-
+ tools/testing/selftests/x86/helpers.h | 28 +
+ tools/testing/selftests/x86/ioperm.c | 25 +-
+ tools/testing/selftests/x86/iopl.c | 25 +-
+ tools/testing/selftests/x86/lam.c | 151 ++++-
+ tools/testing/selftests/x86/ldt_gdt.c | 18 +-
+ tools/testing/selftests/x86/mov_ss_trap.c | 14 +-
+ tools/testing/selftests/x86/ptrace_syscall.c | 24 +-
+ tools/testing/selftests/x86/sigaltstack.c | 26 +-
+ tools/testing/selftests/x86/sigreturn.c | 24 +-
+ tools/testing/selftests/x86/single_step_syscall.c | 22 -
+ tools/testing/selftests/x86/syscall_arg_fault.c | 12 -
+ tools/testing/selftests/x86/syscall_nt.c | 12 -
+ tools/testing/selftests/x86/sysret_rip.c | 24 +-
+ tools/testing/selftests/x86/test_vsyscall.c | 13 -
+ tools/testing/selftests/x86/unwind_vdso.c | 12 -
+ tools/testing/selftests/x86/xstate.c | 477 +++++++++++++++
+ tools/testing/selftests/x86/xstate.h | 195 +++++++
+ 454 files changed, 5900 insertions(+), 5203 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/interrupt-controller/sophgo,sg2042-msi.yaml
+ create mode 100644 arch/x86/Kconfig.cpufeatures
+ delete mode 100644 arch/x86/include/asm/disabled-features.h
+ delete mode 100644 arch/x86/include/asm/required-features.h
+ delete mode 100644 arch/x86/include/asm/sta2x11.h
+ delete mode 100644 arch/x86/kernel/apic/bigsmp_32.c
+ create mode 100644 arch/x86/lib/bhi.S
+ delete mode 100644 arch/x86/pci/sta2x11-fixup.c
+ create mode 100755 arch/x86/tools/featuremasks.awk
+ create mode 100644 drivers/irqchip/irq-sg2042-msi.c
+ delete mode 100755 scripts/gcc-x86_32-has-stack-protector.sh
+ delete mode 100755 scripts/gcc-x86_64-has-stack-protector.sh
+ delete mode 100644 tools/arch/x86/include/asm/disabled-features.h
+ delete mode 100644 tools/arch/x86/include/asm/required-features.h
+ create mode 100755 tools/testing/selftests/rseq/run_syscall_errors_test.sh
+ create mode 100644 tools/testing/selftests/rseq/syscall_errors_test.c
+ create mode 100644 tools/testing/selftests/x86/avx.c
+ create mode 100644 tools/testing/selftests/x86/xstate.c
+ create mode 100644 tools/testing/selftests/x86/xstate.h
+Merging clockevents/timers/drivers/next (96bf4b89a6ab clocksource/drivers/stm32-lptimer: Use wakeup capable instead of init wakeup)
+$ git merge -m Merge branch 'timers/drivers/next' of https://git.linaro.org/people/daniel.lezcano/linux.git clockevents/timers/drivers/next
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/timer/arm,twd-timer.yaml | 6 +--
+ .../devicetree/bindings/timer/renesas,cmt.yaml | 44 +++++++++++-----------
+ .../devicetree/bindings/timer/renesas,em-sti.yaml | 10 ++---
+ .../devicetree/bindings/timer/renesas,mtu2.yaml | 14 +++----
+ .../devicetree/bindings/timer/renesas,ostm.yaml | 10 ++---
+ .../devicetree/bindings/timer/renesas,tmu.yaml | 22 +++++------
+ .../devicetree/bindings/timer/renesas,tpu.yaml | 8 ++--
+ .../bindings/timer/samsung,exynos4210-mct.yaml | 4 ++
+ .../devicetree/bindings/timer/sifive,clint.yaml | 2 +-
+ drivers/clocksource/exynos_mct.c | 2 +-
+ drivers/clocksource/timer-stm32-lp.c | 36 +++++++++++++++---
+ 11 files changed, 93 insertions(+), 65 deletions(-)
+Merging edac/edac-for-next (af1a78613133 Merge branch 'edac-drivers' into edac-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
+Merge made by the 'ort' strategy.
+ Documentation/ABI/testing/sysfs-edac-ecs | 74 +++
+ Documentation/ABI/testing/sysfs-edac-memory-repair | 206 +++++++
+ Documentation/ABI/testing/sysfs-edac-scrub | 69 +++
+ Documentation/edac/features.rst | 103 ++++
+ Documentation/edac/index.rst | 12 +
+ Documentation/edac/memory_repair.rst | 121 ++++
+ Documentation/edac/scrub.rst | 266 +++++++++
+ drivers/edac/Kconfig | 30 +-
+ drivers/edac/Makefile | 3 +
+ drivers/edac/amd64_edac.c | 52 +-
+ drivers/edac/debugfs.c | 5 +-
+ drivers/edac/ecs.c | 205 +++++++
+ drivers/edac/edac_device.c | 185 ++++++
+ drivers/edac/i10nm_base.c | 2 +
+ drivers/edac/i5400_edac.c | 3 +-
+ drivers/edac/i7300_edac.c | 7 +-
+ drivers/edac/ie31200_edac.c | 647 +++++++++++++--------
+ drivers/edac/igen6_edac.c | 41 +-
+ drivers/edac/mem_repair.c | 359 ++++++++++++
+ drivers/edac/pnd2_edac.c | 4 +-
+ drivers/edac/scrub.c | 209 +++++++
+ drivers/edac/skx_common.c | 33 ++
+ drivers/edac/skx_common.h | 11 +
+ drivers/edac/xgene_edac.c | 17 +-
+ include/linux/edac.h | 215 +++++++
+ 25 files changed, 2562 insertions(+), 317 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-edac-ecs
+ create mode 100644 Documentation/ABI/testing/sysfs-edac-memory-repair
+ create mode 100644 Documentation/ABI/testing/sysfs-edac-scrub
+ create mode 100644 Documentation/edac/features.rst
+ create mode 100644 Documentation/edac/index.rst
+ create mode 100644 Documentation/edac/memory_repair.rst
+ create mode 100644 Documentation/edac/scrub.rst
+ create mode 100755 drivers/edac/ecs.c
+ create mode 100755 drivers/edac/mem_repair.c
+ create mode 100755 drivers/edac/scrub.c
+Merging ftrace/for-next (440358f4f179 Merge tools/for-next)
+$ 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 Documentation/admin-guide/kernel-parameters.txt
+Auto-merging MAINTAINERS
+Auto-merging arch/arm64/Kconfig
+Auto-merging include/linux/mm.h
+Auto-merging include/linux/module.h
+CONFLICT (content): Merge conflict in include/linux/module.h
+Auto-merging kernel/module/main.c
+Auto-merging kernel/trace/ftrace.c
+Auto-merging kernel/trace/trace_kprobe.c
+Auto-merging kernel/trace/trace_osnoise.c
+Auto-merging mm/memblock.c
+Auto-merging scripts/link-vmlinux.sh
+Auto-merging tools/scripts/Makefile.include
+Auto-merging tools/tracing/rtla/Makefile
+Resolved 'include/linux/module.h' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master d4bea0022945] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git
+$ git diff -M --stat --summary HEAD^..
+ Documentation/admin-guide/kernel-parameters.txt | 9 +
+ MAINTAINERS | 1 +
+ arch/arm64/Kconfig | 1 +
+ include/linux/ftrace_regs.h | 5 +
+ include/linux/mm.h | 1 +
+ include/linux/module.h | 6 +
+ include/linux/ring_buffer.h | 8 +-
+ include/linux/trace_events.h | 18 -
+ include/trace/define_trace.h | 7 +
+ include/trace/events/mmflags.h | 41 +-
+ include/trace/events/osnoise.h | 96 +++++
+ kernel/module/main.c | 13 +
+ kernel/trace/Kconfig | 12 +
+ kernel/trace/fgraph.c | 2 +-
+ kernel/trace/ftrace.c | 57 ++-
+ kernel/trace/ring_buffer.c | 301 +++++++++------
+ kernel/trace/rv/monitors/wip/Kconfig | 2 +
+ kernel/trace/rv/monitors/wip/wip.h | 1 +
+ kernel/trace/rv/monitors/wwnr/Kconfig | 2 +
+ kernel/trace/rv/monitors/wwnr/wwnr.h | 1 +
+ kernel/trace/trace.c | 306 +++++++++++++--
+ kernel/trace/trace.h | 21 +-
+ kernel/trace/trace_entries.h | 12 +-
+ kernel/trace/trace_eprobe.c | 2 +
+ kernel/trace/trace_events.c | 40 +-
+ kernel/trace/trace_events_user.c | 7 +-
+ kernel/trace/trace_fprobe.c | 5 +-
+ kernel/trace/trace_functions.c | 46 ++-
+ kernel/trace/trace_functions_graph.c | 172 +++++++--
+ kernel/trace/trace_irqsoff.c | 12 +-
+ kernel/trace/trace_kprobe.c | 5 +-
+ kernel/trace/trace_osnoise.c | 55 +--
+ kernel/trace/trace_output.c | 103 +++++-
+ kernel/trace/trace_output.h | 9 +
+ kernel/trace/trace_probe.c | 28 ++
+ kernel/trace/trace_probe.h | 1 +
+ kernel/trace/trace_sched_wakeup.c | 4 +-
+ kernel/trace/trace_uprobe.c | 9 +-
+ mm/memblock.c | 66 +++-
+ scripts/link-vmlinux.sh | 4 +-
+ scripts/sorttable.c | 411 ++++++++++++++++++++-
+ tools/build/Makefile.feature | 3 +-
+ tools/build/feature/Makefile | 3 +
+ tools/scripts/Makefile.include | 3 +
+ .../ftrace/test.d/dynevent/add_remove_tprobe.tc | 14 +
+ .../ftrace/test.d/dynevent/dynevent_limitations.tc | 42 +++
+ .../ftrace/test.d/dynevent/fprobe_syntax_errors.tc | 1 +
+ tools/tracing/rtla/.gitignore | 1 +
+ tools/tracing/rtla/Makefile | 20 +-
+ tools/tracing/rtla/Makefile.config | 42 +++
+ tools/tracing/rtla/src/Build | 1 +
+ tools/tracing/rtla/src/osnoise.h | 2 +
+ tools/tracing/rtla/src/osnoise_hist.c | 5 +-
+ tools/tracing/rtla/src/osnoise_top.c | 5 +-
+ tools/tracing/rtla/src/timerlat.bpf.c | 149 ++++++++
+ tools/tracing/rtla/src/timerlat.h | 54 +++
+ tools/tracing/rtla/src/timerlat_aa.c | 2 -
+ tools/tracing/rtla/src/timerlat_bpf.c | 166 +++++++++
+ tools/tracing/rtla/src/timerlat_bpf.h | 59 +++
+ tools/tracing/rtla/src/timerlat_hist.c | 236 ++++++++----
+ tools/tracing/rtla/src/timerlat_top.c | 371 +++++++++++++------
+ tools/tracing/rtla/src/trace.c | 4 +
+ tools/tracing/rtla/tests/timerlat.t | 14 +
+ tools/verification/dot2/dot2k.py | 1 +
+ tools/verification/dot2/dot2k_templates/Kconfig | 2 +
+ tools/verification/rv/Makefile.rv | 2 +-
+ 66 files changed, 2559 insertions(+), 545 deletions(-)
+ create mode 100644 tools/testing/selftests/ftrace/test.d/dynevent/dynevent_limitations.tc
+ create mode 100644 tools/tracing/rtla/src/timerlat.bpf.c
+ create mode 100644 tools/tracing/rtla/src/timerlat_bpf.c
+ create mode 100644 tools/tracing/rtla/src/timerlat_bpf.h
+Merging rcu/next (467c890f2d1a Merge branches 'docs.2025.02.04a', 'lazypreempt.2025.03.04a', 'misc.2025.03.04a', 'srcu.2025.02.05a' and 'torture.2025.02.05a')
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rcu/linux.git rcu/next
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Auto-merging kernel/printk/printk.c
+Auto-merging kernel/reboot.c
+Auto-merging kernel/sched/core.c
+Auto-merging kernel/trace/trace_osnoise.c
+Merge made by the 'ort' strategy.
+ Documentation/RCU/rcubarrier.rst | 5 +-
+ Documentation/RCU/stallwarn.rst | 7 +
+ Documentation/admin-guide/kernel-parameters.txt | 5 +
+ Documentation/core-api/this_cpu_ops.rst | 20 +-
+ include/linux/printk.h | 6 +
+ include/linux/rcupdate.h | 25 +--
+ include/linux/rcupdate_wait.h | 3 +
+ include/linux/rcutree.h | 2 +-
+ include/linux/srcu.h | 102 ++++++++--
+ include/linux/srcutiny.h | 29 ++-
+ include/linux/srcutree.h | 98 ++++++++--
+ include/linux/torture.h | 1 +
+ include/trace/events/rcu.h | 2 +-
+ init/main.c | 1 -
+ kernel/context_tracking.c | 9 +-
+ kernel/printk/printk.c | 4 +-
+ kernel/rcu/Kconfig | 35 +++-
+ kernel/rcu/Kconfig.debug | 18 +-
+ kernel/rcu/rcu.h | 13 +-
+ kernel/rcu/rcutorture.c | 124 ++++++++++--
+ kernel/rcu/refscale.c | 32 +++-
+ kernel/rcu/srcutiny.c | 20 +-
+ kernel/rcu/srcutree.c | 207 +++++++++++----------
+ kernel/rcu/tasks.h | 5 +-
+ kernel/rcu/tiny.c | 14 ++
+ kernel/rcu/tree.c | 64 +++++--
+ kernel/rcu/tree_exp.h | 6 +-
+ kernel/rcu/tree_nocb.h | 20 +-
+ kernel/rcu/tree_plugin.h | 22 ++-
+ kernel/reboot.c | 1 +
+ kernel/sched/core.c | 4 +-
+ kernel/torture.c | 12 ++
+ kernel/trace/trace_osnoise.c | 32 ++--
+ .../selftests/rcutorture/bin/srcu_lockdep.sh | 2 +-
+ .../selftests/rcutorture/configs/rcu/SRCU-P.boot | 1 +
+ .../selftests/rcutorture/configs/rcu/TREE05.boot | 6 +
+ .../selftests/rcutorture/configs/rcu/TREE07 | 3 +-
+ .../selftests/rcutorture/configs/rcu/TREE10 | 3 +-
+ 38 files changed, 717 insertions(+), 246 deletions(-)
+Merging paulmck/non-rcu/next (87d07e135725 Merge branches 'lkmm.2025.02.25a', 'nolibc.2025.03.07a' and 'stop-machine.2025.03.11a' into HEAD)
+$ git merge -m Merge branch 'non-rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git paulmck/non-rcu/next
+Merge made by the 'ort' strategy.
+ kernel/stop_machine.c | 1 +
+ tools/include/nolibc/Makefile | 1 +
+ tools/include/nolibc/arch-mips.h | 1 +
+ tools/include/nolibc/arch-s390.h | 9 +-
+ tools/include/nolibc/arch.h | 2 +-
+ tools/include/nolibc/crt.h | 2 +
+ tools/include/nolibc/dirent.h | 98 +++++++++++++
+ tools/include/nolibc/errno.h | 2 +-
+ tools/include/nolibc/nolibc.h | 4 +-
+ tools/include/nolibc/signal.h | 1 +
+ tools/include/nolibc/stackprotector.h | 2 +
+ tools/include/nolibc/stdio.h | 98 +++++++++++++
+ tools/include/nolibc/stdlib.h | 1 +
+ tools/include/nolibc/string.h | 4 +
+ tools/include/nolibc/sys.h | 83 ++++++++---
+ tools/memory-model/Documentation/glossary.txt | 32 ++---
+ .../Documentation/herd-representation.txt | 49 ++++---
+ tools/memory-model/README | 4 +-
+ tools/memory-model/linux-kernel.bell | 33 +++--
+ tools/memory-model/linux-kernel.cat | 10 ++
+ tools/memory-model/linux-kernel.cfg | 1 +
+ tools/memory-model/linux-kernel.def | 157 ++++++++++++---------
+ tools/testing/selftests/kselftest.h | 5 -
+ tools/testing/selftests/nolibc/Makefile | 30 ++--
+ .../testing/selftests/nolibc/nolibc-test-linkage.c | 6 +-
+ tools/testing/selftests/nolibc/nolibc-test.c | 138 +++++++++++++++++-
+ tools/testing/selftests/nolibc/run-tests.sh | 26 +++-
+ 27 files changed, 630 insertions(+), 170 deletions(-)
+ create mode 100644 tools/include/nolibc/dirent.h
+Merging kvm/next (ea9bd29a9c0d Merge tag 'kvm-x86-fixes-6.14-rcN.2' of https://github.com/kvm-x86/linux into HEAD)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next
+Already up to date.
+Merging kvm-arm/next (b33c5fbb042c Merge branch 'kvm-arm64/pkvm-6.15' 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/cputype.h
+Auto-merging arch/arm64/include/asm/kvm_arm.h
+Auto-merging arch/arm64/include/asm/kvm_host.h
+Auto-merging arch/arm64/include/asm/sysreg.h
+Auto-merging arch/arm64/include/uapi/asm/kvm.h
+Auto-merging arch/arm64/kernel/cpufeature.c
+CONFLICT (content): Merge conflict in arch/arm64/kernel/cpufeature.c
+Auto-merging arch/arm64/kernel/proton-pack.c
+CONFLICT (content): Merge conflict in arch/arm64/kernel/proton-pack.c
+Auto-merging arch/arm64/kvm/arm.c
+CONFLICT (content): Merge conflict in arch/arm64/kvm/arm.c
+Auto-merging arch/arm64/kvm/hypercalls.c
+CONFLICT (content): Merge conflict in arch/arm64/kvm/hypercalls.c
+Auto-merging arch/arm64/tools/sysreg
+Auto-merging drivers/perf/apple_m1_cpu_pmu.c
+CONFLICT (content): Merge conflict in drivers/perf/apple_m1_cpu_pmu.c
+Auto-merging include/linux/arm-smccc.h
+Auto-merging include/linux/perf/arm_pmu.h
+Recorded preimage for 'arch/arm64/kernel/cpufeature.c'
+Recorded preimage for 'arch/arm64/kernel/proton-pack.c'
+Resolved 'arch/arm64/kvm/arm.c' using previous resolution.
+Recorded preimage for 'arch/arm64/kvm/hypercalls.c'
+Resolved 'drivers/perf/apple_m1_cpu_pmu.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+Recorded resolution for 'arch/arm64/kernel/cpufeature.c'.
+Recorded resolution for 'arch/arm64/kernel/proton-pack.c'.
+Recorded resolution for 'arch/arm64/kvm/hypercalls.c'.
+[master ff0bbf728f3c] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git
+$ git diff -M --stat --summary HEAD^..
+ Documentation/virt/kvm/api.rst | 18 +
+ Documentation/virt/kvm/arm/fw-pseudo-registers.rst | 15 +-
+ Documentation/virt/kvm/arm/hypercalls.rst | 59 +++
+ Documentation/virt/kvm/devices/arm-vgic-its.rst | 5 +-
+ Documentation/virt/kvm/devices/arm-vgic-v3.rst | 12 +-
+ arch/arm64/include/asm/apple_m1_pmu.h | 1 +
+ arch/arm64/include/asm/cpucaps.h | 2 +
+ arch/arm64/include/asm/cpufeature.h | 28 +-
+ arch/arm64/include/asm/cputype.h | 40 +-
+ arch/arm64/include/asm/hypervisor.h | 1 +
+ arch/arm64/include/asm/kvm_arm.h | 4 +-
+ arch/arm64/include/asm/kvm_emulate.h | 37 ++
+ arch/arm64/include/asm/kvm_host.h | 65 +++-
+ arch/arm64/include/asm/kvm_hyp.h | 2 +
+ arch/arm64/include/asm/kvm_nested.h | 1 +
+ arch/arm64/include/asm/kvm_pkvm.h | 1 +
+ arch/arm64/include/asm/mmu.h | 3 +-
+ arch/arm64/include/asm/sysreg.h | 30 --
+ arch/arm64/include/uapi/asm/kvm.h | 14 +
+ arch/arm64/kernel/cpu_errata.c | 117 +++++-
+ arch/arm64/kernel/cpufeature.c | 55 ++-
+ arch/arm64/kernel/image-vars.h | 6 +-
+ arch/arm64/kernel/proton-pack.c | 20 +-
+ arch/arm64/kvm/Makefile | 2 +-
+ arch/arm64/kvm/arm.c | 53 ++-
+ arch/arm64/kvm/emulate-nested.c | 18 +-
+ arch/arm64/kvm/handle_exit.c | 6 +-
+ arch/arm64/kvm/hyp/include/hyp/switch.h | 4 +-
+ arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h | 14 +-
+ arch/arm64/kvm/hyp/include/nvhe/mem_protect.h | 2 +-
+ arch/arm64/kvm/hyp/include/nvhe/pkvm.h | 6 -
+ arch/arm64/kvm/hyp/nvhe/mem_protect.c | 2 +-
+ arch/arm64/kvm/hyp/nvhe/pkvm.c | 79 ++--
+ arch/arm64/kvm/hyp/nvhe/sysreg-sr.c | 4 +-
+ arch/arm64/kvm/hyp/vgic-v3-sr.c | 16 +-
+ arch/arm64/kvm/hyp/vhe/switch.c | 22 ++
+ arch/arm64/kvm/hyp/vhe/sysreg-sr.c | 28 +-
+ arch/arm64/kvm/hypercalls.c | 13 +
+ arch/arm64/kvm/mmu.c | 22 +-
+ arch/arm64/kvm/nested.c | 286 ++++++++------
+ arch/arm64/kvm/pkvm.c | 75 ++--
+ arch/arm64/kvm/pmu-emul.c | 138 +++++--
+ arch/arm64/kvm/pmu.c | 10 +-
+ arch/arm64/kvm/sys_regs.c | 426 ++++++++++++++-------
+ arch/arm64/kvm/sys_regs.h | 10 +
+ arch/arm64/kvm/vgic-sys-reg-v3.c | 8 +-
+ arch/arm64/kvm/vgic/vgic-init.c | 29 ++
+ arch/arm64/kvm/vgic/vgic-kvm-device.c | 29 +-
+ arch/arm64/kvm/vgic/vgic-v3-nested.c | 409 ++++++++++++++++++++
+ arch/arm64/kvm/vgic/vgic-v3.c | 46 ++-
+ arch/arm64/kvm/vgic/vgic-v4.c | 35 +-
+ arch/arm64/kvm/vgic/vgic.c | 38 ++
+ arch/arm64/kvm/vgic/vgic.h | 6 +
+ arch/arm64/tools/cpucaps | 2 +
+ arch/arm64/tools/sysreg | 48 +++
+ drivers/clocksource/arm_arch_timer.c | 2 +-
+ drivers/firmware/smccc/kvm_guest.c | 66 ++++
+ drivers/hwtracing/coresight/coresight-etm4x-core.c | 2 +-
+ drivers/irqchip/irq-apple-aic.c | 8 +-
+ drivers/perf/apple_m1_cpu_pmu.c | 101 ++++-
+ include/kvm/arm_pmu.h | 12 +-
+ include/kvm/arm_vgic.h | 10 +
+ include/linux/arm-smccc.h | 15 +
+ include/linux/perf/arm_pmu.h | 4 +
+ include/uapi/linux/kvm.h | 1 +
+ tools/arch/arm/include/uapi/asm/kvm.h | 1 +
+ tools/arch/arm64/include/asm/sysreg.h | 30 --
+ tools/arch/arm64/include/uapi/asm/kvm.h | 12 +
+ tools/testing/selftests/kvm/arm64/get-reg-list.c | 1 +
+ tools/testing/selftests/kvm/arm64/hypercalls.c | 46 ++-
+ tools/testing/selftests/kvm/arm64/set_id_regs.c | 40 +-
+ 71 files changed, 2102 insertions(+), 671 deletions(-)
+ create mode 100644 arch/arm64/kvm/vgic/vgic-v3-nested.c
+Merging kvms390/next (32239066776a KVM: s390: selftests: Streamline uc_skey test to issue iske after sske)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390/next
+Already up to date.
+Merging kvm-ppc/topic/ppc-kvm (fac04efc5c79 Linux 6.13-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 (ee4e778c5802 KVM: riscv: selftests: Allow number of interrupts to be configurable)
+$ git merge -m Merge branch 'riscv_kvm_next' of https://github.com/kvm-riscv/linux.git kvm-riscv/riscv_kvm_next
+Merge made by the 'ort' strategy.
+ arch/riscv/kvm/vcpu_pmu.c | 1 +
+ tools/testing/selftests/kvm/riscv/sbi_pmu_test.c | 81 ++++++++++++++++--------
+ 2 files changed, 57 insertions(+), 25 deletions(-)
+Merging kvm-x86/next (c9ea48bb6ee6 Merge branch 'xen')
+$ git merge -m Merge branch 'next' of https://github.com/kvm-x86/linux.git kvm-x86/next
+Auto-merging Documentation/virt/kvm/api.rst
+Auto-merging arch/x86/include/asm/cpufeatures.h
+Auto-merging arch/x86/kvm/lapic.c
+Auto-merging arch/x86/kvm/svm/svm.c
+Auto-merging arch/x86/kvm/vmx/nested.c
+Auto-merging arch/x86/kvm/vmx/vmx.c
+Auto-merging arch/x86/kvm/xen.c
+Auto-merging virt/kvm/kvm_main.c
+Merge made by the 'ort' strategy.
+ Documentation/virt/kvm/api.rst | 4 +
+ Documentation/virt/kvm/locking.rst | 4 +-
+ arch/x86/include/asm/cpufeatures.h | 1 +
+ arch/x86/include/asm/kvm_host.h | 20 +-
+ arch/x86/include/asm/sev-common.h | 12 +-
+ arch/x86/include/asm/svm.h | 5 +-
+ arch/x86/include/asm/vmx.h | 28 +-
+ arch/x86/include/uapi/asm/kvm.h | 3 +
+ arch/x86/include/uapi/asm/svm.h | 2 +
+ arch/x86/kvm/Kconfig | 1 +
+ arch/x86/kvm/cpuid.c | 68 ++-
+ arch/x86/kvm/cpuid.h | 9 +-
+ arch/x86/kvm/emulate.c | 5 +-
+ arch/x86/kvm/i8259.c | 2 +-
+ arch/x86/kvm/kvm_emulate.h | 7 +-
+ arch/x86/kvm/lapic.c | 17 +-
+ arch/x86/kvm/mmu/mmu.c | 363 ++++++++++----
+ arch/x86/kvm/mmu/paging_tmpl.h | 3 +-
+ arch/x86/kvm/mmu/spte.c | 31 +-
+ arch/x86/kvm/mmu/spte.h | 2 +-
+ arch/x86/kvm/mmu/tdp_iter.h | 34 +-
+ arch/x86/kvm/mmu/tdp_mmu.c | 45 +-
+ arch/x86/kvm/smm.c | 2 +-
+ arch/x86/kvm/svm/nested.c | 2 +-
+ arch/x86/kvm/svm/sev.c | 377 +++++++--------
+ arch/x86/kvm/svm/svm.c | 56 ++-
+ arch/x86/kvm/svm/svm.h | 39 +-
+ arch/x86/kvm/trace.h | 14 +-
+ arch/x86/kvm/vmx/nested.c | 18 +-
+ arch/x86/kvm/vmx/nested.h | 22 +-
+ arch/x86/kvm/vmx/vmx.c | 226 ++++++---
+ arch/x86/kvm/x86.c | 262 ++++++-----
+ arch/x86/kvm/x86.h | 8 +
+ arch/x86/kvm/xen.c | 121 +++--
+ arch/x86/kvm/xen.h | 30 +-
+ include/linux/kvm_host.h | 1 +
+ tools/testing/selftests/kvm/Makefile.kvm | 1 +
+ .../selftests/kvm/access_tracking_perf_test.c | 2 +-
+ tools/testing/selftests/kvm/dirty_log_test.c | 521 ++++++++++-----------
+ tools/testing/selftests/kvm/include/kvm_util.h | 33 +-
+ tools/testing/selftests/kvm/include/test_util.h | 2 +-
+ .../testing/selftests/kvm/include/x86/processor.h | 50 +-
+ tools/testing/selftests/kvm/kvm_create_max_vcpus.c | 28 +-
+ tools/testing/selftests/kvm/lib/kvm_util.c | 114 +++--
+ tools/testing/selftests/kvm/lib/userfaultfd_util.c | 2 +-
+ .../kvm/x86/dirty_log_page_splitting_test.c | 6 +-
+ tools/testing/selftests/kvm/x86/hyperv_ipi.c | 6 +-
+ .../selftests/kvm/x86/nested_emulation_test.c | 146 ++++++
+ .../testing/selftests/kvm/x86/nx_huge_pages_test.c | 4 +-
+ .../testing/selftests/kvm/x86/pmu_counters_test.c | 158 ++++---
+ tools/testing/selftests/kvm/x86/svm_int_ctl_test.c | 5 +-
+ .../selftests/kvm/x86/ucna_injection_test.c | 2 +-
+ tools/testing/selftests/kvm/x86/xapic_ipi_test.c | 16 +-
+ tools/testing/selftests/kvm/x86/xapic_state_test.c | 4 +-
+ tools/testing/selftests/kvm/x86/xen_shinfo_test.c | 5 +-
+ virt/kvm/Kconfig | 4 +
+ virt/kvm/kvm_main.c | 53 ++-
+ 57 files changed, 1835 insertions(+), 1171 deletions(-)
+ create mode 100644 tools/testing/selftests/kvm/x86/nested_emulation_test.c
+Merging xen-tip/linux-next (421d62f47b7a xen/pciback: Remove unused pcistub_get_pci_dev)
+$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next
+Merge made by the 'ort' strategy.
+ drivers/xen/platform-pci.c | 4 ++++
+ drivers/xen/xen-pciback/pci_stub.c | 20 --------------------
+ drivers/xen/xen-pciback/pciback.h | 2 --
+ drivers/xen/xenfs/xensyms.c | 4 ++--
+ include/xen/interface/xen-mca.h | 2 +-
+ 5 files changed, 7 insertions(+), 25 deletions(-)
+Merging percpu/for-next (87d6aab2389e Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git percpu/for-next
+Already up to date.
+Merging workqueues/for-next (1e5f94eb8ef7 Merge branch 'for-6.15' 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 rust/kernel/workqueue.rs
+Merge made by the 'ort' strategy.
+ rust/kernel/workqueue.rs | 18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
+Merging sched-ext/for-next (d78027174482 Merge branch 'for-6.15' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/sched_ext.git sched-ext/for-next
+Auto-merging MAINTAINERS
+Auto-merging include/linux/topology.h
+Auto-merging kernel/sched/core.c
+Auto-merging mm/mempolicy.c
+Merge made by the 'ort' strategy.
+ Documentation/scheduler/sched-ext.rst | 36 +
+ MAINTAINERS | 3 +-
+ include/linux/nodemask.h | 8 +-
+ include/linux/nodemask_types.h | 11 +-
+ include/linux/numa.h | 17 +-
+ include/linux/sched/ext.h | 1 +
+ include/linux/topology.h | 30 +
+ include/trace/events/sched_ext.h | 19 +
+ kernel/sched/build_policy.c | 1 +
+ kernel/sched/core.c | 9 +-
+ kernel/sched/ext.c | 1085 +++++++--------------
+ kernel/sched/ext.h | 10 +
+ kernel/sched/ext_idle.c | 1171 +++++++++++++++++++++++
+ kernel/sched/ext_idle.h | 35 +
+ mm/mempolicy.c | 31 +
+ tools/sched_ext/include/scx/common.bpf.h | 34 +
+ tools/sched_ext/include/scx/common.h | 1 +
+ tools/sched_ext/include/scx/compat.bpf.h | 95 ++
+ tools/sched_ext/include/scx/compat.h | 16 +-
+ tools/sched_ext/include/scx/enum_defs.autogen.h | 120 +++
+ tools/sched_ext/scx_central.c | 15 +-
+ tools/sched_ext/scx_qmap.bpf.c | 23 +-
+ tools/testing/selftests/sched_ext/Makefile | 1 +
+ tools/testing/selftests/sched_ext/numa.bpf.c | 100 ++
+ tools/testing/selftests/sched_ext/numa.c | 59 ++
+ 25 files changed, 2148 insertions(+), 783 deletions(-)
+ create mode 100644 kernel/sched/ext_idle.c
+ create mode 100644 kernel/sched/ext_idle.h
+ create mode 100644 tools/sched_ext/include/scx/enum_defs.autogen.h
+ create mode 100644 tools/testing/selftests/sched_ext/numa.bpf.c
+ create mode 100644 tools/testing/selftests/sched_ext/numa.c
+Merging drivers-x86/for-next (01db3d1ff43a platform/x86/amd/pmc: fix leak in probe())
+$ 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 MAINTAINERS
+Auto-merging drivers/platform/x86/thinkpad_acpi.c
+Merge made by the 'ort' strategy.
+ .../ABI/testing/sysfs-platform-mellanox-bootctl | 10 +
+ Documentation/admin-guide/laptops/index.rst | 1 +
+ .../admin-guide/laptops/samsung-galaxybook.rst | 174 +++
+ .../bindings/platform/huawei,gaokun-ec.yaml | 124 ++
+ Documentation/wmi/acpi-interface.rst | 3 +
+ Documentation/wmi/driver-development-guide.rst | 4 +
+ MAINTAINERS | 31 +-
+ .../boot/dts/qcom/sc8280xp-huawei-gaokun3.dts | 163 +++
+ drivers/char/sonypi.c | 11 +-
+ drivers/hwmon/hp-wmi-sensors.c | 4 +-
+ drivers/platform/arm64/Kconfig | 21 +
+ drivers/platform/arm64/Makefile | 1 +
+ drivers/platform/arm64/huawei-gaokun-ec.c | 825 ++++++++++++
+ drivers/platform/mellanox/Kconfig | 13 +
+ drivers/platform/mellanox/Makefile | 1 +
+ drivers/platform/{x86 => mellanox}/mlx-platform.c | 17 +-
+ drivers/platform/mellanox/mlxbf-bootctl.c | 20 +
+ drivers/platform/mellanox/mlxbf-bootctl.h | 5 +
+ drivers/platform/x86/Kconfig | 41 +-
+ drivers/platform/x86/Makefile | 7 +-
+ drivers/platform/x86/amd/Makefile | 2 +-
+ drivers/platform/x86/amd/hsmp/Makefile | 6 +-
+ drivers/platform/x86/amd/pmc/Makefile | 6 +-
+ drivers/platform/x86/amd/pmc/pmc.c | 113 +-
+ drivers/platform/x86/amd/pmc/pmc.h | 82 ++
+ drivers/platform/x86/amd/pmf/Makefile | 8 +-
+ drivers/platform/x86/compal-laptop.c | 1 -
+ drivers/platform/x86/dell/Kconfig | 30 +-
+ drivers/platform/x86/dell/Makefile | 45 +-
+ drivers/platform/x86/dell/alienware-wmi-base.c | 491 +++++++
+ drivers/platform/x86/dell/alienware-wmi-legacy.c | 95 ++
+ drivers/platform/x86/dell/alienware-wmi-wmax.c | 768 +++++++++++
+ drivers/platform/x86/dell/alienware-wmi.c | 1249 -----------------
+ drivers/platform/x86/dell/alienware-wmi.h | 117 ++
+ drivers/platform/x86/dell/dell-uart-backlight.c | 2 +-
+ drivers/platform/x86/dell/dell-wmi-ddv.c | 84 +-
+ drivers/platform/x86/dell/dell-wmi-sysman/Makefile | 2 +-
+ drivers/platform/x86/hp/hp-bioscfg/Makefile | 2 +-
+ drivers/platform/x86/hp/hp-bioscfg/bioscfg.c | 15 +-
+ drivers/platform/x86/ideapad-laptop.c | 23 +-
+ drivers/platform/x86/intel/ifs/Makefile | 2 +-
+ drivers/platform/x86/intel/int3472/discrete.c | 48 +-
+ drivers/platform/x86/intel/pmc/Makefile | 2 +-
+ drivers/platform/x86/intel/pmc/adl.c | 56 +-
+ drivers/platform/x86/intel/pmc/arl.c | 141 +-
+ drivers/platform/x86/intel/pmc/cnp.c | 29 +-
+ drivers/platform/x86/intel/pmc/core.c | 115 +-
+ drivers/platform/x86/intel/pmc/core.h | 193 +--
+ drivers/platform/x86/intel/pmc/icl.c | 24 +-
+ drivers/platform/x86/intel/pmc/lnl.c | 67 +-
+ drivers/platform/x86/intel/pmc/mtl.c | 109 +-
+ drivers/platform/x86/intel/pmc/ptl.c | 550 ++++++++
+ drivers/platform/x86/intel/pmc/spt.c | 45 +-
+ drivers/platform/x86/intel/pmc/tgl.c | 59 +-
+ drivers/platform/x86/lenovo-wmi-hotkey-utilities.c | 212 +++
+ .../x86/lenovo-yoga-tab2-pro-1380-fastcharger.c | 2 +-
+ drivers/platform/x86/samsung-galaxybook.c | 1425 ++++++++++++++++++++
+ drivers/platform/x86/think-lmi.c | 51 +-
+ drivers/platform/x86/think-lmi.h | 2 +
+ drivers/platform/x86/thinkpad_acpi.c | 183 ++-
+ drivers/platform/x86/wmi.c | 143 +-
+ include/linux/platform_data/huawei-gaokun-ec.h | 79 ++
+ tools/power/x86/intel-speed-select/Makefile | 2 +-
+ tools/power/x86/intel-speed-select/isst-config.c | 22 +-
+ tools/power/x86/intel-speed-select/isst-display.c | 11 +-
+ 65 files changed, 5994 insertions(+), 2195 deletions(-)
+ create mode 100644 Documentation/admin-guide/laptops/samsung-galaxybook.rst
+ create mode 100644 Documentation/devicetree/bindings/platform/huawei,gaokun-ec.yaml
+ create mode 100644 drivers/platform/arm64/huawei-gaokun-ec.c
+ rename drivers/platform/{x86 => mellanox}/mlx-platform.c (99%)
+ create mode 100644 drivers/platform/x86/dell/alienware-wmi-base.c
+ create mode 100644 drivers/platform/x86/dell/alienware-wmi-legacy.c
+ create mode 100644 drivers/platform/x86/dell/alienware-wmi-wmax.c
+ delete mode 100644 drivers/platform/x86/dell/alienware-wmi.c
+ create mode 100644 drivers/platform/x86/dell/alienware-wmi.h
+ create mode 100644 drivers/platform/x86/intel/pmc/ptl.c
+ create mode 100644 drivers/platform/x86/lenovo-wmi-hotkey-utilities.c
+ create mode 100644 drivers/platform/x86/samsung-galaxybook.c
+ create mode 100644 include/linux/platform_data/huawei-gaokun-ec.h
+Merging chrome-platform/for-next (9fc83373f0ff platform/chrome: cros_ec_typec: Add support for setting USB mode via sysfs)
+$ 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
+Auto-merging MAINTAINERS
+Auto-merging drivers/platform/chrome/cros_ec_lpc.c
+Merge made by the 'ort' strategy.
+ Documentation/ABI/testing/sysfs-class-chromeos | 20 ++++++++
+ MAINTAINERS | 9 +++-
+ drivers/platform/chrome/cros_ec_lpc.c | 22 +++++---
+ drivers/platform/chrome/cros_ec_sysfs.c | 71 ++++++++++++++++++++++++++
+ drivers/platform/chrome/cros_ec_typec.c | 28 ++++++++++
+ drivers/platform/chrome/cros_ec_typec.h | 1 +
+ 6 files changed, 141 insertions(+), 10 deletions(-)
+Merging chrome-platform-firmware/for-firmware-next (2014c95afece Linux 6.14-rc1)
+$ 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
+Already up to date.
+Merging hsi/for-next (e3f88665a780 HSI: ssi_protocol: Fix use after free vulnerability in ssi_protocol Driver Due to Race Condition)
+$ 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 | 1 +
+ 1 file changed, 1 insertion(+)
+Merging leds-lj/for-leds-next (7a3350495d9a leds: rgb: leds-qcom-lpg: Add support for 6-bit PWM resolution)
+$ 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 drivers/leds/leds-st1202.c
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/leds/leds-qcom-lpg.yaml | 4 +
+ .../devicetree/bindings/leds/leds-tlc591xx.txt | 40 ---
+ .../devicetree/bindings/leds/ti,tlc59116.yaml | 90 ++++++
+ drivers/leds/led-core.c | 22 +-
+ drivers/leds/leds-lp8860.c | 2 -
+ drivers/leds/leds-pca955x.c | 359 ++++++++++++++-------
+ drivers/leds/leds-st1202.c | 7 +-
+ drivers/leds/rgb/leds-qcom-lpg.c | 13 +-
+ drivers/leds/trigger/ledtrig-netdev.c | 16 +-
+ 9 files changed, 383 insertions(+), 170 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/leds/leds-tlc591xx.txt
+ create mode 100644 Documentation/devicetree/bindings/leds/ti,tlc59116.yaml
+Merging ipmi/for-next (d082ecbc71e9 Linux 6.14-rc4)
+$ 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 (e01968420a99 MAINTAINERS: driver core: mark Rafael and Danilo as co-maintainers)
+$ 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 MAINTAINERS
+Auto-merging drivers/base/component.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
+Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c
+Auto-merging drivers/input/touchscreen/goodix_berlin_core.c
+Auto-merging fs/kernfs/dir.c
+Auto-merging include/linux/device.h
+Auto-merging security/selinux/hooks.c
+Merge made by the 'ort' strategy.
+ MAINTAINERS | 6 +-
+ arch/powerpc/kernel/secvar-sysfs.c | 24 +--
+ arch/powerpc/perf/hv-24x7.c | 8 +-
+ arch/powerpc/platforms/powernv/opal-core.c | 10 +-
+ arch/powerpc/platforms/powernv/opal-dump.c | 4 +-
+ arch/powerpc/platforms/powernv/opal-elog.c | 4 +-
+ arch/powerpc/platforms/powernv/opal-flash.c | 4 +-
+ arch/powerpc/platforms/powernv/opal-msglog.c | 6 +-
+ arch/powerpc/platforms/powernv/ultravisor.c | 6 +-
+ arch/x86/kernel/cpu/resctrl/internal.h | 5 +
+ arch/x86/kernel/cpu/resctrl/pseudo_lock.c | 14 +-
+ arch/x86/kernel/cpu/resctrl/rdtgroup.c | 73 ++++---
+ drivers/accel/habanalabs/common/sysfs.c | 10 +-
+ drivers/base/bus.c | 2 +-
+ drivers/base/component.c | 12 +-
+ drivers/base/faux.c | 15 +-
+ drivers/base/physical_location.c | 5 +-
+ drivers/cxl/port.c | 10 +-
+ drivers/firmware/dmi-sysfs.c | 28 ++-
+ drivers/firmware/dmi_scan.c | 4 +-
+ drivers/firmware/efi/mokvar-table.c | 4 +-
+ drivers/firmware/efi/rci2-table.c | 2 +-
+ drivers/firmware/qemu_fw_cfg.c | 6 +-
+ drivers/fsi/fsi-core.c | 8 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 14 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 13 +-
+ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 8 +-
+ drivers/gpu/drm/drm_sysfs.c | 10 +-
+ drivers/gpu/drm/i915/i915_gpu_error.c | 8 +-
+ drivers/gpu/drm/i915/i915_sysfs.c | 12 +-
+ drivers/gpu/drm/lima/lima_drv.c | 8 +-
+ drivers/input/touchscreen/goodix_berlin_core.c | 10 +-
+ drivers/pcmcia/cistpl.c | 8 +-
+ drivers/rapidio/rio-sysfs.c | 14 +-
+ fs/kernfs/dir.c | 211 ++++++++++++---------
+ fs/kernfs/file.c | 6 +-
+ fs/kernfs/kernfs-internal.h | 37 +++-
+ fs/kernfs/mount.c | 46 +++--
+ fs/kernfs/symlink.c | 30 +--
+ fs/sysfs/dir.c | 2 +-
+ fs/sysfs/file.c | 24 ++-
+ include/linux/device.h | 2 +-
+ include/linux/device/class.h | 2 +-
+ include/linux/kernfs.h | 14 +-
+ kernel/Kconfig.hz | 2 +-
+ kernel/cgroup/cgroup-v1.c | 2 +-
+ kernel/cgroup/cgroup.c | 24 ++-
+ rust/kernel/devres.rs | 2 +-
+ rust/kernel/faux.rs | 16 +-
+ rust/kernel/io.rs | 66 +++----
+ samples/rust/rust_driver_faux.rs | 2 +-
+ samples/rust/rust_driver_pci.rs | 12 +-
+ security/selinux/hooks.c | 7 +-
+ tools/testing/selftests/bpf/progs/profiler.inc.h | 2 +-
+ 55 files changed, 534 insertions(+), 356 deletions(-)
+$ git am -3 ../patches/0001-fix-up-for-rust-io-rename-io-Io-accessors.patch
+Applying: fix up for "rust: io: rename `io::Io` accessors"
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/gpu/nova-core/regs.rs
+$ git add -A .
+$ git commit -v -a --amend
+[master 06e0b151025b] Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git
+ Date: Mon Mar 17 18:07:58 2025 +1100
+Merging usb/usb-next (3a85c1011540 usb: host: cdns3: forward lost power information to xhci)
+$ 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 include/uapi/linux/usb/ch9.h
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/mfd/aspeed-lpc.yaml | 2 +-
+ .../devicetree/bindings/usb/generic-xhci.yaml | 2 +
+ .../devicetree/bindings/usb/microchip,usb2514.yaml | 35 +-
+ .../devicetree/bindings/usb/parade,ps8830.yaml | 140 +++++++
+ .../devicetree/bindings/usb/qcom,dwc3.yaml | 2 +
+ .../devicetree/bindings/usb/richtek,rt1711h.yaml | 3 +
+ .../devicetree/bindings/usb/rockchip,dwc3.yaml | 19 +
+ .../bindings/usb/samsung,exynos-dwc3.yaml | 44 +-
+ .../devicetree/bindings/usb/snps,dwc3-common.yaml | 11 +
+ .../devicetree/bindings/usb/usb-device.yaml | 6 +-
+ .../driver-api/usb/writing_musb_glue_layer.rst | 2 +-
+ Documentation/usb/CREDITS | 2 +-
+ drivers/usb/cdns3/cdns3-gadget.c | 4 +-
+ drivers/usb/cdns3/cdns3-ti.c | 107 +++--
+ drivers/usb/cdns3/cdnsp-gadget.c | 2 +-
+ drivers/usb/cdns3/core.c | 5 +-
+ drivers/usb/cdns3/core.h | 2 +-
+ drivers/usb/cdns3/host.c | 11 +
+ drivers/usb/chipidea/usbmisc_imx.c | 10 +-
+ drivers/usb/common/usb-conn-gpio.c | 2 +-
+ drivers/usb/core/config.c | 51 ++-
+ drivers/usb/core/hcd.c | 4 +-
+ drivers/usb/core/hub.c | 4 +-
+ drivers/usb/core/urb.c | 2 +-
+ drivers/usb/dwc2/core.c | 1 +
+ drivers/usb/dwc2/core.h | 23 +-
+ drivers/usb/dwc2/gadget.c | 116 ++---
+ drivers/usb/dwc2/hcd.c | 99 ++---
+ drivers/usb/dwc2/platform.c | 38 ++
+ drivers/usb/dwc3/dwc3-am62.c | 12 +-
+ drivers/usb/dwc3/dwc3-exynos.c | 9 +
+ drivers/usb/dwc3/dwc3-pci.c | 10 +
+ drivers/usb/dwc3/dwc3-st.c | 2 +-
+ drivers/usb/dwc3/gadget.c | 69 ++-
+ drivers/usb/gadget/function/uvc_queue.c | 2 -
+ drivers/usb/gadget/udc/aspeed-vhub/dev.c | 3 +
+ drivers/usb/host/max3421-hcd.c | 7 +
+ drivers/usb/host/xhci-histb.c | 2 +-
+ drivers/usb/host/xhci-mem.c | 34 +-
+ drivers/usb/host/xhci-mvebu.c | 10 -
+ drivers/usb/host/xhci-mvebu.h | 6 -
+ drivers/usb/host/xhci-pci.c | 8 +-
+ drivers/usb/host/xhci-plat.c | 13 +-
+ drivers/usb/host/xhci-plat.h | 1 +
+ drivers/usb/host/xhci-ring.c | 422 ++++++++++---------
+ drivers/usb/host/xhci-tegra.c | 10 +-
+ drivers/usb/host/xhci.c | 41 +-
+ drivers/usb/host/xhci.h | 30 +-
+ drivers/usb/misc/onboard_usb_dev.h | 9 +-
+ drivers/usb/misc/usb251xb.c | 6 +-
+ drivers/usb/musb/jz4740.c | 4 +-
+ drivers/usb/musb/mediatek.c | 2 +-
+ drivers/usb/musb/mpfs.c | 2 +-
+ drivers/usb/musb/musb_core.c | 14 +-
+ drivers/usb/musb/sunxi.c | 4 +-
+ drivers/usb/phy/phy-mxs-usb.c | 8 +-
+ drivers/usb/phy/phy-ulpi.c | 23 -
+ drivers/usb/storage/alauda.c | 8 +-
+ drivers/usb/storage/datafab.c | 14 +-
+ drivers/usb/storage/initializers.c | 2 +-
+ drivers/usb/storage/jumpshot.c | 10 +-
+ drivers/usb/storage/realtek_cr.c | 6 +-
+ drivers/usb/storage/sddr09.c | 14 +-
+ drivers/usb/storage/sddr55.c | 4 +-
+ drivers/usb/storage/shuttle_usbat.c | 2 +-
+ drivers/usb/storage/transport.c | 2 +-
+ drivers/usb/typec/altmodes/thunderbolt.c | 10 +-
+ drivers/usb/typec/mux/Kconfig | 10 +
+ drivers/usb/typec/mux/Makefile | 1 +
+ drivers/usb/typec/mux/ps883x.c | 466 +++++++++++++++++++++
+ drivers/usb/typec/ucsi/cros_ec_ucsi.c | 22 +-
+ drivers/usb/typec/ucsi/debugfs.c | 6 +-
+ drivers/usb/typec/ucsi/trace.c | 2 +-
+ drivers/usb/typec/ucsi/ucsi.c | 19 +-
+ drivers/usb/typec/ucsi/ucsi.h | 10 +-
+ drivers/usb/typec/ucsi/ucsi_acpi.c | 29 +-
+ drivers/usb/typec/ucsi/ucsi_ccg.c | 97 +++--
+ include/linux/platform_data/cros_ec_commands.h | 1 +
+ include/linux/usb.h | 8 +-
+ include/linux/usb/musb.h | 2 +-
+ include/linux/usb/ulpi.h | 9 -
+ include/uapi/linux/usb/ch9.h | 15 +
+ 82 files changed, 1609 insertions(+), 672 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/usb/parade,ps8830.yaml
+ create mode 100644 drivers/usb/typec/mux/ps883x.c
+Merging thunderbolt/next (72cef52b353c thunderbolt: Make tb_tunnel_alloc_usb3() error paths consistent with the rest)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt/next
+Auto-merging MAINTAINERS
+Auto-merging drivers/thunderbolt/tunnel.c
+Merge made by the 'ort' strategy.
+ MAINTAINERS | 4 ++--
+ drivers/thunderbolt/tunnel.c | 16 ++++++++--------
+ 2 files changed, 10 insertions(+), 10 deletions(-)
+Merging usb-serial/usb-next (6a7713ec5337 USB: serial: mos7840: drop unused defines)
+$ 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
+Merge made by the 'ort' strategy.
+ drivers/usb/serial/mos7840.c | 13 -------------
+ 1 file changed, 13 deletions(-)
+Merging tty/tty-next (d2fa8e52cf91 serial: xilinx_uartps: Switch to use hrtimer_setup())
+$ 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/tty/serial/8250/8250_port.c
+Auto-merging drivers/tty/serial/amba-pl011.c
+Auto-merging drivers/tty/serial/imx.c
+Auto-merging drivers/tty/serial/sh-sci.c
+Merge made by the 'ort' strategy.
+ Documentation/devicetree/bindings/serial/8250.yaml | 2 +-
+ .../bindings/serial/nvidia,tegra264-utc.yaml | 73 +++
+ .../devicetree/bindings/serial/pl011.yaml | 3 +
+ .../devicetree/bindings/serial/sprd-uart.yaml | 9 +-
+ Documentation/driver-api/serial/driver.rst | 4 +-
+ drivers/tty/serial/8250/8250_dw.c | 40 +-
+ drivers/tty/serial/8250/8250_port.c | 2 +-
+ drivers/tty/serial/Kconfig | 42 +-
+ drivers/tty/serial/Makefile | 2 +-
+ drivers/tty/serial/amba-pl011.c | 143 +++--
+ drivers/tty/serial/atmel_serial.c | 2 +-
+ drivers/tty/serial/fsl_lpuart.c | 2 +-
+ drivers/tty/serial/imx.c | 2 +-
+ drivers/tty/serial/kgdb_nmi.c | 280 ---------
+ drivers/tty/serial/kgdboc.c | 8 -
+ drivers/tty/serial/mpc52xx_uart.c | 1 -
+ drivers/tty/serial/pch_uart.c | 1 -
+ drivers/tty/serial/serial_mctrl_gpio.c | 62 +-
+ drivers/tty/serial/serial_mctrl_gpio.h | 33 +-
+ drivers/tty/serial/sh-sci.c | 73 ++-
+ drivers/tty/serial/stm32-usart.c | 2 +-
+ drivers/tty/serial/tegra-utc.c | 625 +++++++++++++++++++++
+ drivers/tty/tty_ldsem.c | 17 -
+ include/linux/kgdb.h | 11 -
+ include/linux/tty_ldisc.h | 1 -
+ kernel/debug/debug_core.c | 14 +-
+ kernel/debug/kdb/kdb_main.c | 37 --
+ 27 files changed, 977 insertions(+), 514 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/serial/nvidia,tegra264-utc.yaml
+ delete mode 100644 drivers/tty/serial/kgdb_nmi.c
+ create mode 100644 drivers/tty/serial/tegra-utc.c
+Merging char-misc/char-misc-next (64612eb92d0e Merge tag 'w1-drv-6.15' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1 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 Documentation/devicetree/bindings/trivial-devices.yaml
+Auto-merging MAINTAINERS
+Auto-merging drivers/counter/microchip-tcb-capture.c
+Auto-merging drivers/iio/accel/adxl367.c
+Auto-merging drivers/iio/adc/rockchip_saradc.c
+Auto-merging drivers/iio/imu/bmi270/bmi270_core.c
+Auto-merging drivers/regulator/dummy.c
+CONFLICT (content): Merge conflict in drivers/regulator/dummy.c
+Auto-merging lib/Kconfig.debug
+Recorded preimage for 'drivers/regulator/dummy.c'
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+Recorded resolution for 'drivers/regulator/dummy.c'.
+[master ef28539c1d0f] Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/testing/sysfs-bus-counter | 9 +
+ Documentation/ABI/testing/sysfs-bus-iio | 12 +-
+ Documentation/ABI/testing/sysfs-bus-iio-adc-ad4130 | 20 +
+ .../ABI/testing/sysfs-driver-intel-m10-bmc | 4 +-
+ .../testing/sysfs-driver-intel-m10-bmc-sec-update | 14 +-
+ Documentation/ABI/testing/sysfs-pps-gen-tio | 6 +
+ .../devicetree/bindings/iio/adc/adi,ad4030.yaml | 110 ++
+ .../devicetree/bindings/iio/adc/adi,ad4695.yaml | 13 +
+ .../devicetree/bindings/iio/adc/adi,ad4851.yaml | 153 ++
+ .../devicetree/bindings/iio/adc/adi,ad7191.yaml | 149 ++
+ .../devicetree/bindings/iio/adc/adi,ad7380.yaml | 4 +
+ .../devicetree/bindings/iio/adc/adi,axi-adc.yaml | 72 +-
+ .../devicetree/bindings/iio/adc/nxp,imx93-adc.yaml | 9 +-
+ .../bindings/iio/adc/rockchip-saradc.yaml | 2 +
+ .../devicetree/bindings/iio/adc/ti,ads7138.yaml | 63 +
+ .../devicetree/bindings/iio/dac/adi,ad5380.yaml | 18 +-
+ .../devicetree/bindings/iio/frequency/adf4371.yaml | 5 +-
+ .../bindings/iio/humidity/sciosense,ens210.yaml | 12 +-
+ .../devicetree/bindings/iio/imu/adi,adis16550.yaml | 74 +
+ .../bindings/iio/light/brcm,apds9160.yaml | 78 +
+ .../bindings/iio/light/dynaimage,al3010.yaml | 6 +-
+ .../bindings/iio/magnetometer/silabs,si7210.yaml | 48 +
+ .../bindings/iio/temperature/maxim,max31865.yaml | 18 +-
+ .../bindings/iio/temperature/ti,tmp117.yaml | 6 +-
+ .../devicetree/bindings/trivial-devices.yaml | 2 +
+ Documentation/driver-api/pps.rst | 27 +-
+ Documentation/iio/ad4030.rst | 180 +++
+ Documentation/iio/ad4695.rst | 104 +-
+ Documentation/iio/ad7191.rst | 119 ++
+ Documentation/iio/ad7380.rst | 56 +-
+ Documentation/iio/ad7944.rst | 24 +-
+ Documentation/iio/adis16550.rst | 376 +++++
+ Documentation/iio/adxl380.rst | 2 +-
+ Documentation/iio/iio_adc.rst | 305 ++++
+ Documentation/iio/index.rst | 4 +
+ MAINTAINERS | 43 +-
+ drivers/android/binder_internal.h | 1 -
+ drivers/bus/mhi/host/main.c | 35 +-
+ drivers/bus/mhi/host/pci_generic.c | 34 +
+ drivers/bus/mhi/host/pm.c | 14 -
+ drivers/char/tlclk.c | 32 +-
+ drivers/char/virtio_console.c | 9 +-
+ drivers/counter/microchip-tcb-capture.c | 160 ++
+ drivers/counter/ti-eqep.c | 32 +
+ drivers/fpga/altera-cvp.c | 2 +-
+ drivers/fpga/versal-fpga.c | 2 +-
+ drivers/greybus/gb-beagleplay.c | 4 +-
+ drivers/iio/accel/adxl345.h | 1 -
+ drivers/iio/accel/adxl345_core.c | 78 +-
+ drivers/iio/accel/adxl367.c | 194 +--
+ drivers/iio/accel/adxl372.c | 7 +-
+ drivers/iio/accel/adxl380.c | 7 +-
+ drivers/iio/accel/bma180.c | 7 +-
+ drivers/iio/accel/bma400_core.c | 2 +-
+ drivers/iio/accel/bmi088-accel-core.c | 9 +-
+ drivers/iio/accel/fxls8962af-core.c | 21 +-
+ drivers/iio/accel/kionix-kx022a.c | 122 +-
+ drivers/iio/accel/mc3230.c | 95 +-
+ drivers/iio/accel/mma8452.c | 92 +-
+ drivers/iio/accel/msa311.c | 34 +-
+ drivers/iio/adc/Kconfig | 56 +-
+ drivers/iio/adc/Makefile | 4 +
+ drivers/iio/adc/ad4000.c | 64 +-
+ drivers/iio/adc/ad4030.c | 1230 +++++++++++++++
+ drivers/iio/adc/ad4130.c | 139 +-
+ drivers/iio/adc/ad4695.c | 1100 ++++++++++++--
+ drivers/iio/adc/ad4851.c | 1315 ++++++++++++++++
+ drivers/iio/adc/ad7091r-base.c | 1 +
+ drivers/iio/adc/ad7124.c | 343 ++++-
+ drivers/iio/adc/ad7173.c | 707 ++++++---
+ drivers/iio/adc/ad7191.c | 554 +++++++
+ drivers/iio/adc/ad7192.c | 148 +-
+ drivers/iio/adc/ad7266.c | 7 +-
+ drivers/iio/adc/ad7298.c | 7 +-
+ drivers/iio/adc/ad7380.c | 943 ++++++++++--
+ drivers/iio/adc/ad7476.c | 7 +-
+ drivers/iio/adc/ad7606.c | 174 ++-
+ drivers/iio/adc/ad7606.h | 103 +-
+ drivers/iio/adc/ad7606_bus_iface.h | 16 +
+ drivers/iio/adc/ad7606_par.c | 52 +-
+ drivers/iio/adc/ad7606_spi.c | 137 +-
+ drivers/iio/adc/ad7625.c | 13 +-
+ drivers/iio/adc/ad7768-1.c | 47 +-
+ drivers/iio/adc/ad7779.c | 103 +-
+ drivers/iio/adc/ad7791.c | 31 +-
+ drivers/iio/adc/ad7793.c | 76 +-
+ drivers/iio/adc/ad7887.c | 7 +-
+ drivers/iio/adc/ad7923.c | 7 +-
+ drivers/iio/adc/ad7944.c | 316 +++-
+ drivers/iio/adc/ad799x.c | 14 +-
+ drivers/iio/adc/ad9467.c | 23 +-
+ drivers/iio/adc/ad_sigma_delta.c | 24 +-
+ drivers/iio/adc/adi-axi-adc.c | 305 +++-
+ drivers/iio/adc/at91-sama5d2_adc.c | 54 +-
+ drivers/iio/adc/dln2-adc.c | 7 +-
+ drivers/iio/adc/max1027.c | 37 +-
+ drivers/iio/adc/max11410.c | 72 +-
+ drivers/iio/adc/max1363.c | 163 +-
+ drivers/iio/adc/max34408.c | 1 +
+ drivers/iio/adc/pac1921.c | 1 +
+ drivers/iio/adc/rockchip_saradc.c | 42 +-
+ drivers/iio/adc/rtq6056.c | 46 +-
+ drivers/iio/adc/stm32-adc-core.c | 6 +-
+ drivers/iio/adc/stm32-adc.c | 7 +-
+ drivers/iio/adc/stm32-dfsdm-adc.c | 76 +-
+ drivers/iio/adc/ti-adc084s021.c | 9 +-
+ drivers/iio/adc/ti-adc108s102.c | 7 +-
+ drivers/iio/adc/ti-adc161s626.c | 14 +-
+ drivers/iio/adc/ti-ads1119.c | 17 +-
+ drivers/iio/adc/ti-ads124s08.c | 2 +-
+ drivers/iio/adc/ti-ads1298.c | 7 +-
+ drivers/iio/adc/ti-ads131e08.c | 14 +-
+ drivers/iio/adc/ti-ads7138.c | 749 +++++++++
+ drivers/iio/adc/ti-ads7924.c | 7 +-
+ drivers/iio/adc/ti-tlc4541.c | 7 +-
+ drivers/iio/addac/ad74413r.c | 14 +-
+ drivers/iio/amplifiers/hmc425a.c | 3 +-
+ drivers/iio/buffer/industrialio-buffer-dma.c | 4 +-
+ drivers/iio/buffer/industrialio-buffer-dmaengine.c | 150 +-
+ drivers/iio/chemical/ens160_core.c | 36 +-
+ drivers/iio/chemical/scd30_core.c | 70 +-
+ drivers/iio/common/cros_ec_sensors/Makefile | 3 +-
+ .../common/cros_ec_sensors/cros_ec_sensors_core.c | 9 +-
+ .../common/cros_ec_sensors/cros_ec_sensors_trace.c | 32 +
+ .../common/cros_ec_sensors/cros_ec_sensors_trace.h | 56 +
+ drivers/iio/dac/Kconfig | 3 +
+ drivers/iio/dac/ad3552r-common.c | 50 +-
+ drivers/iio/dac/ad3552r-hs.c | 333 +++-
+ drivers/iio/dac/ad3552r-hs.h | 8 +
+ drivers/iio/dac/ad3552r.c | 36 -
+ drivers/iio/dac/ad3552r.h | 9 +-
+ drivers/iio/dac/ad5791.c | 187 ++-
+ drivers/iio/dac/ad8460.c | 18 +-
+ drivers/iio/dac/adi-axi-dac.c | 35 +-
+ drivers/iio/dummy/iio_simple_dummy.c | 119 +-
+ drivers/iio/frequency/adf4371.c | 45 +-
+ drivers/iio/gyro/bmg160_i2c.c | 1 +
+ drivers/iio/gyro/bmg160_spi.c | 10 +
+ drivers/iio/humidity/dht11.c | 3 +-
+ drivers/iio/imu/Kconfig | 13 +
+ drivers/iio/imu/Makefile | 1 +
+ drivers/iio/imu/adis.c | 35 +-
+ drivers/iio/imu/adis16550.c | 1147 ++++++++++++++
+ drivers/iio/imu/bmi270/bmi270.h | 17 +-
+ drivers/iio/imu/bmi270/bmi270_core.c | 374 ++++-
+ drivers/iio/imu/bmi323/bmi323_core.c | 44 +-
+ drivers/iio/industrialio-backend.c | 64 +-
+ drivers/iio/industrialio-core.c | 9 +-
+ drivers/iio/industrialio-event.c | 2 +
+ drivers/iio/industrialio-gts-helper.c | 293 ++--
+ drivers/iio/light/Kconfig | 22 +
+ drivers/iio/light/Makefile | 2 +
+ drivers/iio/light/adux1020.c | 1 -
+ drivers/iio/light/al3000a.c | 209 +++
+ drivers/iio/light/apds9160.c | 1594 ++++++++++++++++++++
+ drivers/iio/light/bh1745.c | 18 +-
+ drivers/iio/light/cm32181.c | 2 +-
+ drivers/iio/light/cm36651.c | 2 +-
+ drivers/iio/light/veml6030.c | 618 ++++----
+ drivers/iio/light/veml6075.c | 8 +-
+ drivers/iio/magnetometer/Kconfig | 11 +
+ drivers/iio/magnetometer/Makefile | 2 +
+ drivers/iio/magnetometer/af8133j.c | 1 -
+ drivers/iio/magnetometer/si7210.c | 446 ++++++
+ drivers/iio/pressure/zpa2326_i2c.c | 1 -
+ drivers/iio/pressure/zpa2326_spi.c | 1 -
+ drivers/iio/proximity/irsd200.c | 3 +-
+ drivers/iio/proximity/sx9310.c | 19 +-
+ drivers/iio/proximity/sx9324.c | 19 +-
+ drivers/iio/proximity/sx9360.c | 19 +-
+ drivers/iio/resolver/ad2s1210.c | 17 +-
+ drivers/iio/temperature/tmp006.c | 33 +-
+ drivers/misc/eeprom/ee1004.c | 4 +
+ drivers/misc/lis3lv02d/lis3lv02d.c | 26 +-
+ drivers/misc/lis3lv02d/lis3lv02d.h | 4 +-
+ drivers/misc/mei/bus.c | 52 -
+ drivers/misc/mei/client.c | 22 -
+ drivers/misc/mei/client.h | 2 -
+ drivers/misc/mei/hw-txe.c | 45 -
+ drivers/misc/mei/hw-txe.h | 2 -
+ drivers/pps/generators/Kconfig | 16 +
+ drivers/pps/generators/Makefile | 1 +
+ drivers/pps/generators/pps_gen-dummy.c | 2 +-
+ drivers/pps/generators/pps_gen.c | 14 +-
+ drivers/pps/generators/pps_gen_tio.c | 272 ++++
+ drivers/pps/generators/sysfs.c | 6 +-
+ drivers/regulator/dummy.c | 37 +-
+ drivers/staging/iio/accel/Kconfig | 12 -
+ drivers/staging/iio/accel/Makefile | 1 -
+ drivers/staging/iio/accel/adis16240.c | 443 ------
+ drivers/staging/iio/frequency/ad9832.c | 37 +-
+ drivers/staging/iio/frequency/ad9834.c | 22 +-
+ drivers/w1/masters/w1-uart.c | 4 +-
+ drivers/w1/slaves/w1_therm.c | 12 +-
+ include/dt-bindings/iio/adc/adi,ad4695.h | 7 +
+ include/linux/counter.h | 3 +
+ include/linux/iio/adc/ad_sigma_delta.h | 4 +-
+ include/linux/iio/backend.h | 19 +
+ include/linux/iio/buffer-dmaengine.h | 7 +-
+ include/linux/iio/iio-gts-helper.h | 1 +
+ include/linux/iio/iio.h | 41 +-
+ include/linux/iio/imu/adis.h | 34 +-
+ include/linux/mei_cl_bus.h | 5 -
+ include/linux/mhi.h | 18 -
+ include/linux/pps_gen_kernel.h | 4 +-
+ include/uapi/linux/counter.h | 2 +
+ include/uapi/linux/counter/microchip-tcb-capture.h | 40 +
+ include/uapi/linux/iio/types.h | 2 +
+ lib/Kconfig.debug | 15 +-
+ rust/kernel/miscdevice.rs | 303 ++--
+ scripts/tags.sh | 1 +
+ tools/counter/.gitignore | 1 +
+ tools/counter/counter_watch_events.c | 5 +
+ tools/iio/iio_event_monitor.c | 4 +
+ 214 files changed, 16824 insertions(+), 3568 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-adc-ad4130
+ create mode 100644 Documentation/ABI/testing/sysfs-pps-gen-tio
+ create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,ad4030.yaml
+ create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,ad4851.yaml
+ create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,ad7191.yaml
+ create mode 100644 Documentation/devicetree/bindings/iio/adc/ti,ads7138.yaml
+ create mode 100644 Documentation/devicetree/bindings/iio/imu/adi,adis16550.yaml
+ create mode 100644 Documentation/devicetree/bindings/iio/light/brcm,apds9160.yaml
+ create mode 100644 Documentation/devicetree/bindings/iio/magnetometer/silabs,si7210.yaml
+ create mode 100644 Documentation/iio/ad4030.rst
+ create mode 100644 Documentation/iio/ad7191.rst
+ create mode 100644 Documentation/iio/adis16550.rst
+ create mode 100644 Documentation/iio/iio_adc.rst
+ create mode 100644 drivers/iio/adc/ad4030.c
+ create mode 100644 drivers/iio/adc/ad4851.c
+ create mode 100644 drivers/iio/adc/ad7191.c
+ create mode 100644 drivers/iio/adc/ad7606_bus_iface.h
+ create mode 100644 drivers/iio/adc/ti-ads7138.c
+ create mode 100644 drivers/iio/common/cros_ec_sensors/cros_ec_sensors_trace.c
+ create mode 100644 drivers/iio/common/cros_ec_sensors/cros_ec_sensors_trace.h
+ create mode 100644 drivers/iio/imu/adis16550.c
+ create mode 100644 drivers/iio/light/al3000a.c
+ create mode 100644 drivers/iio/light/apds9160.c
+ create mode 100644 drivers/iio/magnetometer/si7210.c
+ create mode 100644 drivers/pps/generators/pps_gen_tio.c
+ delete mode 100644 drivers/staging/iio/accel/adis16240.c
+ create mode 100644 include/uapi/linux/counter/microchip-tcb-capture.h
+Merging accel/habanalabs-next (f03eee5fc922 Merge tag 'drm-xe-next-fixes-2024-05-02' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next)
+$ 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 (5442d22da7db Coresight: Fix a NULL vs IS_ERR() bug in probe)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git coresight/next
+Auto-merging Documentation/ABI/testing/sysfs-bus-coresight-devices-tpdm
+Auto-merging drivers/hwtracing/coresight/coresight-etm4x-core.c
+Merge made by the 'ort' strategy.
+ .../ABI/testing/sysfs-bus-coresight-devices-tpdm | 15 +
+ .../devicetree/bindings/arm/arm,coresight-tmc.yaml | 26 ++
+ .../bindings/arm/qcom,coresight-ctcu.yaml | 84 +++++
+ .../bindings/arm/qcom,coresight-tpda.yaml | 3 +-
+ .../bindings/arm/qcom,coresight-tpdm.yaml | 3 +-
+ Documentation/trace/coresight/coresight.rst | 41 +--
+ Documentation/trace/coresight/panic.rst | 362 +++++++++++++++++++++
+ Documentation/userspace-api/perf_ring_buffer.rst | 4 +-
+ drivers/hwtracing/coresight/Kconfig | 12 +
+ drivers/hwtracing/coresight/Makefile | 4 +-
+ drivers/hwtracing/coresight/coresight-catu.c | 4 +-
+ .../hwtracing/coresight/coresight-cfg-preload.c | 2 +
+ .../hwtracing/coresight/coresight-cfg-preload.h | 2 +
+ drivers/hwtracing/coresight/coresight-cfg-pstop.c | 83 +++++
+ drivers/hwtracing/coresight/coresight-config.c | 8 +-
+ drivers/hwtracing/coresight/coresight-config.h | 2 +-
+ drivers/hwtracing/coresight/coresight-core.c | 192 +++++++++--
+ drivers/hwtracing/coresight/coresight-ctcu-core.c | 326 +++++++++++++++++++
+ drivers/hwtracing/coresight/coresight-ctcu.h | 39 +++
+ drivers/hwtracing/coresight/coresight-cti-core.c | 44 +--
+ drivers/hwtracing/coresight/coresight-cti-sysfs.c | 76 ++---
+ drivers/hwtracing/coresight/coresight-cti.h | 2 +-
+ drivers/hwtracing/coresight/coresight-dummy.c | 15 +-
+ drivers/hwtracing/coresight/coresight-etb10.c | 26 +-
+ drivers/hwtracing/coresight/coresight-etm-perf.c | 27 +-
+ drivers/hwtracing/coresight/coresight-etm-perf.h | 2 +-
+ drivers/hwtracing/coresight/coresight-etm.h | 1 -
+ drivers/hwtracing/coresight/coresight-etm3x-core.c | 55 +---
+ .../hwtracing/coresight/coresight-etm3x-sysfs.c | 3 +-
+ drivers/hwtracing/coresight/coresight-etm4x-core.c | 122 +++----
+ .../hwtracing/coresight/coresight-etm4x-sysfs.c | 254 +++++++--------
+ drivers/hwtracing/coresight/coresight-etm4x.h | 3 +-
+ drivers/hwtracing/coresight/coresight-funnel.c | 12 +-
+ drivers/hwtracing/coresight/coresight-priv.h | 14 +-
+ drivers/hwtracing/coresight/coresight-replicator.c | 12 +-
+ drivers/hwtracing/coresight/coresight-stm.c | 13 +-
+ .../coresight/coresight-syscfg-configfs.c | 12 +-
+ drivers/hwtracing/coresight/coresight-syscfg.c | 26 +-
+ drivers/hwtracing/coresight/coresight-sysfs.c | 17 +-
+ drivers/hwtracing/coresight/coresight-tmc-core.c | 327 ++++++++++++++++++-
+ drivers/hwtracing/coresight/coresight-tmc-etf.c | 140 ++++++--
+ drivers/hwtracing/coresight/coresight-tmc-etr.c | 224 +++++++++++--
+ drivers/hwtracing/coresight/coresight-tmc.h | 106 +++++-
+ drivers/hwtracing/coresight/coresight-tpda.c | 20 +-
+ drivers/hwtracing/coresight/coresight-tpdm.c | 124 ++++++-
+ drivers/hwtracing/coresight/coresight-tpdm.h | 33 +-
+ drivers/hwtracing/coresight/coresight-trace-id.c | 22 +-
+ drivers/hwtracing/coresight/ultrasoc-smb.c | 12 +-
+ drivers/hwtracing/coresight/ultrasoc-smb.h | 2 +-
+ include/linux/coresight.h | 47 ++-
+ 50 files changed, 2452 insertions(+), 553 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/arm/qcom,coresight-ctcu.yaml
+ create mode 100644 Documentation/trace/coresight/panic.rst
+ create mode 100644 drivers/hwtracing/coresight/coresight-cfg-pstop.c
+ create mode 100644 drivers/hwtracing/coresight/coresight-ctcu-core.c
+ create mode 100644 drivers/hwtracing/coresight/coresight-ctcu.h
+Merging fastrpc/for-next (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/fastrpc.git fastrpc/for-next
+Already up to date.
+Merging fpga/for-next (e19890a0088b fpga: versal: remove incorrect of_match_ptr annotation)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga/for-next
+Already up to date.
+Merging icc/icc-next (4cc004716977 Merge branch 'icc-sm8750' 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
+Already up to date.
+Merging iio/togreg (8dbeb413806f doc: iio: ad7380: describe offload support)
+$ git merge -m Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg
+Already up to date.
+Merging phy-next/next (f13bff25161b phy: rockchip-naneng-combo: Support rk3562)
+$ 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 drivers/phy/freescale/phy-fsl-samsung-hdmi.c
+Auto-merging drivers/phy/rockchip/Kconfig
+Auto-merging drivers/phy/rockchip/phy-rockchip-naneng-combphy.c
+Auto-merging drivers/phy/samsung/phy-exynos5-usbdrd.c
+Merge made by the 'ort' strategy.
+ .../bindings/phy/allwinner,sun50i-a64-usb-phy.yaml | 4 +-
+ .../bindings/phy/phy-rockchip-naneng-combphy.yaml | 1 +
+ .../bindings/phy/qcom,ipq5332-uniphy-pcie-phy.yaml | 76 +
+ .../bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml | 11 +-
+ .../bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml | 2 +
+ .../bindings/phy/rockchip,rk3588-hdptx-phy.yaml | 62 +-
+ .../bindings/phy/rockchip,rk3588-mipi-dcphy.yaml | 87 +
+ .../devicetree/bindings/phy/samsung,ufs-phy.yaml | 1 +
+ .../bindings/phy/samsung,usb3-drd-phy.yaml | 21 +-
+ Documentation/driver-api/phy/phy.rst | 3 +-
+ drivers/phy/freescale/Kconfig | 1 +
+ drivers/phy/freescale/phy-fsl-imx8m-pcie.c | 23 +-
+ drivers/phy/freescale/phy-fsl-imx8mq-usb.c | 240 +++
+ drivers/phy/freescale/phy-fsl-samsung-hdmi.c | 10 +-
+ drivers/phy/mediatek/phy-mtk-tphy.c | 4 +-
+ drivers/phy/microchip/Kconfig | 1 +
+ drivers/phy/phy-can-transceiver.c | 13 +-
+ drivers/phy/phy-core.c | 31 +-
+ drivers/phy/qualcomm/Kconfig | 13 +
+ drivers/phy/qualcomm/Makefile | 1 +
+ drivers/phy/qualcomm/phy-qcom-qmp-pcie.c | 107 ++
+ drivers/phy/qualcomm/phy-qcom-qmp-qserdes-com-v6.h | 7 +
+ .../qualcomm/phy-qcom-qmp-qserdes-txrx-ufs-v7.h | 67 +
+ drivers/phy/qualcomm/phy-qcom-qmp-ufs.c | 180 +-
+ drivers/phy/qualcomm/phy-qcom-qmp-usbc.c | 3 +
+ drivers/phy/qualcomm/phy-qcom-uniphy-pcie-28lp.c | 286 ++++
+ drivers/phy/rockchip/Kconfig | 12 +
+ drivers/phy/rockchip/Makefile | 1 +
+ drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 4 +-
+ drivers/phy/rockchip/phy-rockchip-naneng-combphy.c | 152 ++
+ drivers/phy/rockchip/phy-rockchip-samsung-dcphy.c | 1719 ++++++++++++++++++++
+ drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c | 1046 +++++++++++-
+ drivers/phy/rockchip/phy-rockchip-usbdp.c | 108 +-
+ drivers/phy/samsung/Kconfig | 1 +
+ drivers/phy/samsung/Makefile | 1 +
+ drivers/phy/samsung/phy-exynos5-usbdrd.c | 202 ++-
+ drivers/phy/samsung/phy-exynosautov920-ufs.c | 168 ++
+ drivers/phy/samsung/phy-samsung-ufs.c | 9 +-
+ drivers/phy/samsung/phy-samsung-ufs.h | 4 +
+ drivers/phy/st/phy-stih407-usb.c | 24 +-
+ include/linux/phy/phy.h | 12 -
+ 41 files changed, 4439 insertions(+), 279 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/phy/qcom,ipq5332-uniphy-pcie-phy.yaml
+ create mode 100644 Documentation/devicetree/bindings/phy/rockchip,rk3588-mipi-dcphy.yaml
+ create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-qserdes-txrx-ufs-v7.h
+ create mode 100644 drivers/phy/qualcomm/phy-qcom-uniphy-pcie-28lp.c
+ create mode 100644 drivers/phy/rockchip/phy-rockchip-samsung-dcphy.c
+ create mode 100644 drivers/phy/samsung/phy-exynosautov920-ufs.c
+Merging soundwire/next (08ae0d61c3d7 soundwire: take in count the bandwidth of a prepared stream)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next
+Auto-merging sound/soc/qcom/sdw.c
+Auto-merging sound/soc/sof/intel/Makefile
+Merge made by the 'ort' strategy.
+ Documentation/driver-api/soundwire/bra.rst | 336 +++++++++++
+ Documentation/driver-api/soundwire/bra_cadence.rst | 66 ++
+ Documentation/driver-api/soundwire/index.rst | 2 +
+ Documentation/driver-api/soundwire/stream.rst | 2 +-
+ Documentation/driver-api/soundwire/summary.rst | 8 -
+ drivers/soundwire/Kconfig | 1 +
+ drivers/soundwire/amd_manager.c | 153 ++++-
+ drivers/soundwire/amd_manager.h | 26 +
+ drivers/soundwire/bus.c | 48 +-
+ drivers/soundwire/bus.h | 18 +
+ drivers/soundwire/cadence_master.c | 668 ++++++++++++++++++++-
+ drivers/soundwire/cadence_master.h | 20 +
+ drivers/soundwire/debugfs.c | 91 ++-
+ drivers/soundwire/generic_bandwidth_allocation.c | 53 +-
+ drivers/soundwire/intel.h | 23 +
+ drivers/soundwire/intel_ace2x.c | 312 ++++++++++
+ drivers/soundwire/intel_auxdevice.c | 45 +-
+ drivers/soundwire/slave.c | 1 +
+ drivers/soundwire/stream.c | 143 +++--
+ include/linux/soundwire/sdw.h | 33 +-
+ include/linux/soundwire/sdw_amd.h | 2 +
+ include/linux/soundwire/sdw_intel.h | 4 +
+ include/sound/hda-sdw-bpt.h | 69 +++
+ sound/soc/codecs/rt711-sdca-sdw.c | 8 +
+ sound/soc/qcom/sdw.c | 2 +-
+ sound/soc/sof/intel/Kconfig | 7 +
+ sound/soc/sof/intel/Makefile | 4 +
+ sound/soc/sof/intel/hda-sdw-bpt.c | 445 ++++++++++++++
+ 28 files changed, 2487 insertions(+), 103 deletions(-)
+ create mode 100644 Documentation/driver-api/soundwire/bra.rst
+ create mode 100644 Documentation/driver-api/soundwire/bra_cadence.rst
+ create mode 100644 include/sound/hda-sdw-bpt.h
+ create mode 100644 sound/soc/sof/intel/hda-sdw-bpt.c
+Merging extcon/extcon-next (7041ed0dde83 extcon: Drop explicit initialization of struct i2c_device_id::driver_data to 0)
+$ git merge -m Merge branch 'extcon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon/extcon-next
+Already up to date.
+Merging gnss/gnss-next (0ad2507d5d93 Linux 6.14-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 (384a530111c6 vfio/virtio: Enable support for virtio-block live migration)
+$ git merge -m Merge branch 'next' of git://github.com/awilliam/linux-vfio.git vfio/next
+Auto-merging include/linux/mm.h
+Auto-merging mm/memory.c
+Merge made by the 'ort' strategy.
+ drivers/vfio/pci/vfio_pci.c | 4 +-
+ drivers/vfio/pci/vfio_pci_igd.c | 6 ++
+ drivers/vfio/pci/vfio_pci_priv.h | 6 ++
+ drivers/vfio/pci/virtio/Kconfig | 6 +-
+ drivers/vfio/pci/virtio/legacy_io.c | 4 +-
+ drivers/vfio/pci/virtio/main.c | 5 +-
+ drivers/vfio/vfio_iommu_type1.c | 123 ++++++++++++++++++++++--------------
+ include/linux/mm.h | 2 +
+ mm/memory.c | 1 +
+ 9 files changed, 102 insertions(+), 55 deletions(-)
+Merging w1/for-next (33c145297840 w1: w1_therm: w1: Use HWMON_CHANNEL_INFO macro to simplify code)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git w1/for-next
+Already up to date.
+Merging spmi/spmi-next (092c49673431 spmi: Only use Hikey 970 SPMI controller driver when ARM64)
+$ git merge -m Merge branch 'spmi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git spmi/spmi-next
+Merge made by the 'ort' strategy.
+ drivers/spmi/Kconfig | 1 +
+ 1 file changed, 1 insertion(+)
+Merging staging/staging-next (20a351c36afc staging: gpib: tnt4882 console messaging cleanup)
+$ 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/pnp/isapnp/core.c | 1 +
+ drivers/staging/gpib/Kconfig | 5 -
+ .../staging/gpib/agilent_82350b/agilent_82350b.c | 238 ++-
+ .../staging/gpib/agilent_82350b/agilent_82350b.h | 50 -
+ .../staging/gpib/agilent_82357a/agilent_82357a.c | 359 ++---
+ drivers/staging/gpib/cb7210/Makefile | 1 -
+ drivers/staging/gpib/cb7210/cb7210.c | 236 ++-
+ drivers/staging/gpib/cb7210/cb7210.h | 45 -
+ drivers/staging/gpib/cec/cec.h | 29 -
+ drivers/staging/gpib/cec/cec_gpib.c | 83 +-
+ drivers/staging/gpib/common/gpib_os.c | 127 +-
+ drivers/staging/gpib/common/iblib.c | 109 +-
+ drivers/staging/gpib/eastwood/fluke_gpib.c | 93 +-
+ drivers/staging/gpib/fmh_gpib/fmh_gpib.c | 140 +-
+ drivers/staging/gpib/gpio/gpib_bitbang.c | 56 +-
+ drivers/staging/gpib/hp_82335/hp82335.c | 71 +-
+ drivers/staging/gpib/hp_82335/hp82335.h | 30 -
+ drivers/staging/gpib/hp_82341/hp_82341.c | 145 +-
+ drivers/staging/gpib/hp_82341/hp_82341.h | 40 -
+ drivers/staging/gpib/ines/Makefile | 1 -
+ drivers/staging/gpib/ines/ines_gpib.c | 111 +-
+ drivers/staging/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c | 255 +--
+ drivers/staging/gpib/nec7210/nec7210.c | 69 +-
+ drivers/staging/gpib/ni_usb/ni_usb_gpib.c | 428 +++--
+ drivers/staging/gpib/pc2/pc2_gpib.c | 588 ++++---
+ drivers/staging/gpib/tms9914/tms9914.c | 33 +-
+ drivers/staging/gpib/tnt4882/Makefile | 1 -
+ drivers/staging/gpib/tnt4882/mite.c | 17 -
+ drivers/staging/gpib/tnt4882/tnt4882_gpib.c | 1662 +++++++++-----------
+ drivers/staging/sm750fb/ddk750_chip.c | 2 +-
+ .../vc04_services/bcm2835-camera/bcm2835-camera.c | 2 -
+ 31 files changed, 2094 insertions(+), 2933 deletions(-)
+Merging counter-next/counter-next (ba27a0247b71 counter: microchip-tcb-capture: Add support for RC Compare)
+$ git merge -m Merge branch 'counter-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-next/counter-next
+Already up to date.
+Merging siox/siox/for-next (db418d5f1ca5 siox: bus-gpio: Simplify using devm_siox_* functions)
+$ git merge -m Merge branch 'siox/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git siox/siox/for-next
+Already up to date.
+Merging mux/for-next (59b723cd2adb Linux 6.12-rc6)
+$ 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 (656543989457 dmaengine: ptdma: Utilize the AE4DMA engine's multi-queue functionality)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next
+CONFLICT (modify/delete): Documentation/devicetree/bindings/misc/atmel-ssc.txt deleted in HEAD and modified in dmaengine/next. Version dmaengine/next of Documentation/devicetree/bindings/misc/atmel-ssc.txt left in tree.
+Auto-merging MAINTAINERS
+Auto-merging drivers/net/ethernet/ti/am65-cpsw-nuss.c
+Auto-merging drivers/net/ethernet/ti/icssg/icssg_common.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f Documentation/devicetree/bindings/misc/atmel-ssc.txt
+rm 'Documentation/devicetree/bindings/misc/atmel-ssc.txt'
+$ git commit --no-edit -v -a
+[master bcafeff85b85] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git
+$ git diff -M --stat --summary HEAD^..
+ .../bindings/dma/atmel,at91sam9g45-dma.yaml | 68 +++++++
+ .../devicetree/bindings/dma/atmel,sama5d4-dma.yaml | 3 +
+ .../devicetree/bindings/dma/atmel-dma.txt | 42 -----
+ .../devicetree/bindings/dma/fsl,edma.yaml | 8 +
+ .../devicetree/bindings/dma/fsl,elo-dma.yaml | 137 ++++++++++++++
+ .../devicetree/bindings/dma/fsl,elo3-dma.yaml | 125 +++++++++++++
+ .../devicetree/bindings/dma/fsl,eloplus-dma.yaml | 132 +++++++++++++
+ .../devicetree/bindings/dma/fsl,mxs-dma.yaml | 6 +
+ .../devicetree/bindings/dma/snps,dw-axi-dmac.yaml | 2 +
+ .../devicetree/bindings/powerpc/fsl/dma.txt | 204 ---------------------
+ MAINTAINERS | 4 +-
+ drivers/dma/Kconfig | 2 +-
+ drivers/dma/amd/ae4dma/ae4dma-pci.c | 6 +-
+ drivers/dma/amd/ae4dma/ae4dma.h | 2 +
+ drivers/dma/amd/ptdma/ptdma-dmaengine.c | 90 ++++++++-
+ drivers/dma/bcm2835-dma.c | 2 +-
+ drivers/dma/dmaengine.c | 16 +-
+ drivers/dma/dmatest.c | 6 +-
+ drivers/dma/dw-edma/dw-edma-core.c | 6 +-
+ drivers/dma/dw/pci.c | 8 +-
+ drivers/dma/dw/platform.c | 8 +-
+ drivers/dma/fsl-edma-main.c | 18 +-
+ drivers/dma/idxd/init.c | 3 +-
+ drivers/dma/img-mdc-dma.c | 2 +-
+ drivers/dma/imx-dma.c | 3 +-
+ drivers/dma/imx-sdma.c | 5 +-
+ drivers/dma/pxa_dma.c | 4 +-
+ drivers/dma/sh/shdma-base.c | 2 +-
+ drivers/dma/sun6i-dma.c | 3 +-
+ drivers/dma/ti/edma.c | 11 +-
+ drivers/dma/ti/k3-udma-glue.c | 15 +-
+ drivers/dma/ti/k3-udma.c | 36 ++++
+ drivers/dma/xilinx/xilinx_dma.c | 3 +-
+ drivers/net/ethernet/ti/am65-cpsw-nuss.c | 4 +-
+ drivers/net/ethernet/ti/icssg/icssg_common.c | 2 +-
+ include/linux/dma/k3-udma-glue.h | 3 +-
+ include/linux/dmaengine.h | 10 +-
+ 37 files changed, 682 insertions(+), 319 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/dma/atmel,at91sam9g45-dma.yaml
+ delete mode 100644 Documentation/devicetree/bindings/dma/atmel-dma.txt
+ create mode 100644 Documentation/devicetree/bindings/dma/fsl,elo-dma.yaml
+ create mode 100644 Documentation/devicetree/bindings/dma/fsl,elo3-dma.yaml
+ create mode 100644 Documentation/devicetree/bindings/dma/fsl,eloplus-dma.yaml
+ delete mode 100644 Documentation/devicetree/bindings/powerpc/fsl/dma.txt
+Merging cgroup/for-next (6ebc743512cc Merge branch 'for-6.15' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git cgroup/for-next
+Auto-merging Documentation/admin-guide/cgroup-v1/memory.rst
+Auto-merging Documentation/admin-guide/cgroup-v2.rst
+Auto-merging init/Kconfig
+Auto-merging kernel/cgroup/cgroup-v1.c
+Auto-merging kernel/cgroup/cgroup.c
+Auto-merging mm/memcontrol-v1.c
+Merge made by the 'ort' strategy.
+ .../admin-guide/cgroup-v1/freezer-subsystem.rst | 4 ++
+ Documentation/admin-guide/cgroup-v1/memory.rst | 1 +
+ Documentation/admin-guide/cgroup-v2.rst | 23 ++++++----
+ block/blk-cgroup.c | 8 +++-
+ block/blk-ioprio.c | 23 ++++------
+ include/linux/cgroup-defs.h | 5 +--
+ include/linux/cgroup.h | 1 +
+ include/linux/misc_cgroup.h | 6 ---
+ init/Kconfig | 5 ++-
+ kernel/cgroup/cgroup-internal.h | 1 +
+ kernel/cgroup/cgroup-v1.c | 7 ++++
+ kernel/cgroup/cgroup.c | 6 +--
+ kernel/cgroup/cpuset-v1.c | 49 ++++++++++++++++++++++
+ kernel/cgroup/cpuset.c | 45 --------------------
+ kernel/cgroup/legacy_freezer.c | 6 ++-
+ kernel/cgroup/misc.c | 16 -------
+ kernel/cgroup/rstat.c | 29 ++++++-------
+ mm/memcontrol-v1.c | 6 ++-
+ 18 files changed, 119 insertions(+), 122 deletions(-)
+Merging scsi/for-next (6888bc9da224 Merge branch 'misc' 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 Documentation/userspace-api/ioctl/ioctl-number.rst
+Auto-merging MAINTAINERS
+Auto-merging arch/arm64/boot/dts/rockchip/rk3576.dtsi
+CONFLICT (content): Merge conflict in arch/arm64/boot/dts/rockchip/rk3576.dtsi
+Auto-merging drivers/scsi/lpfc/lpfc_els.c
+Auto-merging drivers/scsi/lpfc/lpfc_hbadisc.c
+Auto-merging drivers/scsi/lpfc/lpfc_init.c
+Auto-merging drivers/scsi/scsi_debug.c
+CONFLICT (content): Merge conflict in drivers/scsi/scsi_debug.c
+Auto-merging drivers/ufs/host/ufs-exynos.c
+Auto-merging drivers/ufs/host/ufs-qcom.c
+Resolved 'arch/arm64/boot/dts/rockchip/rk3576.dtsi' using previous resolution.
+Resolved 'drivers/scsi/scsi_debug.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 3e69e83d172b] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/testing/sysfs-driver-ufs | 45 +
+ Documentation/arch/powerpc/cxlflash.rst | 433 ---
+ Documentation/arch/powerpc/index.rst | 1 -
+ .../bindings/ufs/rockchip,rk3576-ufshc.yaml | 105 +
+ Documentation/scsi/st.rst | 5 +
+ Documentation/userspace-api/ioctl/ioctl-number.rst | 2 +-
+ MAINTAINERS | 9 -
+ arch/arm64/boot/dts/rockchip/rk3576.dtsi | 24 +
+ drivers/message/fusion/mptscsih.c | 64 +-
+ drivers/message/fusion/mptscsih.h | 1 -
+ drivers/scsi/Kconfig | 3 +-
+ drivers/scsi/Makefile | 1 -
+ drivers/scsi/aacraid/aachba.c | 4 +-
+ drivers/scsi/aacraid/linit.c | 2 +-
+ drivers/scsi/arm/acornscsi.c | 2 +-
+ drivers/scsi/be2iscsi/be_main.c | 2 +-
+ drivers/scsi/bfa/bfad.c | 2 +-
+ drivers/scsi/csiostor/csio_init.c | 2 +-
+ drivers/scsi/cxlflash/Kconfig | 15 -
+ drivers/scsi/cxlflash/Makefile | 5 -
+ drivers/scsi/cxlflash/backend.h | 48 -
+ drivers/scsi/cxlflash/common.h | 340 --
+ drivers/scsi/cxlflash/cxl_hw.c | 177 -
+ drivers/scsi/cxlflash/lunmgt.c | 278 --
+ drivers/scsi/cxlflash/main.c | 3970 --------------------
+ drivers/scsi/cxlflash/main.h | 129 -
+ drivers/scsi/cxlflash/ocxl_hw.c | 1399 -------
+ drivers/scsi/cxlflash/ocxl_hw.h | 72 -
+ drivers/scsi/cxlflash/sislite.h | 560 ---
+ drivers/scsi/cxlflash/superpipe.c | 2218 -----------
+ drivers/scsi/cxlflash/superpipe.h | 150 -
+ drivers/scsi/cxlflash/vlun.c | 1336 -------
+ drivers/scsi/cxlflash/vlun.h | 82 -
+ drivers/scsi/elx/efct/efct_driver.c | 2 +-
+ drivers/scsi/fnic/fdls_disc.c | 54 +-
+ drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 2 +-
+ drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 2 +-
+ drivers/scsi/hpsa.c | 19 +-
+ drivers/scsi/ips.c | 8 +-
+ drivers/scsi/isci/remote_device.h | 2 +-
+ drivers/scsi/iscsi_tcp.c | 60 +-
+ drivers/scsi/iscsi_tcp.h | 4 +-
+ drivers/scsi/libiscsi_tcp.c | 89 +-
+ drivers/scsi/lpfc/lpfc_els.c | 18 +-
+ drivers/scsi/lpfc/lpfc_hbadisc.c | 33 +-
+ drivers/scsi/lpfc/lpfc_init.c | 4 +-
+ drivers/scsi/lpfc/lpfc_version.h | 6 +-
+ drivers/scsi/megaraid.c | 10 +-
+ drivers/scsi/megaraid/megaraid_mbox.c | 10 +-
+ drivers/scsi/mpi3mr/mpi/mpi30_cnfg.h | 4 +
+ drivers/scsi/mpi3mr/mpi/mpi30_image.h | 8 +
+ drivers/scsi/mpi3mr/mpi/mpi30_init.h | 11 +-
+ drivers/scsi/mpi3mr/mpi/mpi30_ioc.h | 21 +
+ drivers/scsi/mpi3mr/mpi/mpi30_tool.h | 1 +
+ drivers/scsi/mpi3mr/mpi/mpi30_transport.h | 20 +-
+ drivers/scsi/mpi3mr/mpi3mr.h | 34 +-
+ drivers/scsi/mpi3mr/mpi3mr_app.c | 129 +-
+ drivers/scsi/mpi3mr/mpi3mr_fw.c | 159 +-
+ drivers/scsi/mpi3mr/mpi3mr_os.c | 2 +-
+ drivers/scsi/mpt3sas/mpi/mpi2.h | 9 +-
+ drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h | 5 +
+ drivers/scsi/mpt3sas/mpi/mpi2_ioc.h | 54 +
+ drivers/scsi/mpt3sas/mpt3sas_base.c | 23 +-
+ drivers/scsi/mpt3sas/mpt3sas_base.h | 10 +-
+ drivers/scsi/mpt3sas/mpt3sas_config.c | 79 -
+ drivers/scsi/mpt3sas/mpt3sas_ctl.c | 279 +-
+ drivers/scsi/mpt3sas/mpt3sas_ctl.h | 49 +-
+ drivers/scsi/mpt3sas/mpt3sas_scsih.c | 4 +-
+ drivers/scsi/mvsas/mv_sas.c | 10 -
+ drivers/scsi/mvsas/mv_sas.h | 1 -
+ drivers/scsi/qedi/qedi_main.c | 2 +-
+ drivers/scsi/qla2xxx/qla_sup.c | 4 +-
+ drivers/scsi/scsi_debug.c | 928 ++++-
+ drivers/scsi/scsi_error.c | 19 +
+ drivers/scsi/scsi_scan.c | 5 +-
+ drivers/scsi/scsi_sysctl.c | 4 +-
+ drivers/scsi/st.c | 73 +-
+ drivers/scsi/st.h | 6 +
+ drivers/target/iscsi/iscsi_target_nego.c | 6 +-
+ drivers/target/target_core_configfs.c | 6 +-
+ drivers/target/target_core_device.c | 8 +-
+ drivers/target/target_core_pr.c | 6 +-
+ drivers/target/target_core_spc.c | 36 +-
+ drivers/ufs/core/ufs-sysfs.c | 10 +
+ drivers/ufs/core/ufs_trace.h | 135 +-
+ drivers/ufs/core/ufshcd-priv.h | 21 +-
+ drivers/ufs/core/ufshcd.c | 148 +-
+ drivers/ufs/host/Kconfig | 12 +
+ drivers/ufs/host/Makefile | 1 +
+ drivers/ufs/host/ufs-exynos.c | 10 +-
+ drivers/ufs/host/ufs-exynos.h | 2 +-
+ drivers/ufs/host/ufs-hisi.c | 6 +-
+ drivers/ufs/host/ufs-mediatek.c | 11 +-
+ drivers/ufs/host/ufs-qcom.c | 126 +-
+ drivers/ufs/host/ufs-qcom.h | 39 +-
+ drivers/ufs/host/ufs-rockchip.c | 354 ++
+ drivers/ufs/host/ufs-rockchip.h | 90 +
+ drivers/ufs/host/ufs-sprd.c | 6 +-
+ drivers/ufs/host/ufshcd-pci.c | 2 +-
+ drivers/usb/gadget/function/f_mass_storage.c | 4 +-
+ drivers/usb/storage/debug.c | 4 +-
+ include/scsi/libiscsi_tcp.h | 16 +-
+ include/scsi/scsi_device.h | 9 +
+ include/scsi/scsi_proto.h | 4 +-
+ include/trace/events/scsi.h | 4 +-
+ include/trace/events/target.h | 4 +-
+ include/uapi/scsi/cxlflash_ioctl.h | 276 --
+ include/ufs/ufs.h | 1 +
+ include/ufs/ufshcd.h | 22 +-
+ .../filesystems/statmount/statmount_test.c | 13 +-
+ 110 files changed, 2860 insertions(+), 12294 deletions(-)
+ delete mode 100644 Documentation/arch/powerpc/cxlflash.rst
+ create mode 100644 Documentation/devicetree/bindings/ufs/rockchip,rk3576-ufshc.yaml
+ delete mode 100644 drivers/scsi/cxlflash/Kconfig
+ delete mode 100644 drivers/scsi/cxlflash/Makefile
+ delete mode 100644 drivers/scsi/cxlflash/backend.h
+ delete mode 100644 drivers/scsi/cxlflash/common.h
+ delete mode 100644 drivers/scsi/cxlflash/cxl_hw.c
+ delete mode 100644 drivers/scsi/cxlflash/lunmgt.c
+ delete mode 100644 drivers/scsi/cxlflash/main.c
+ delete mode 100644 drivers/scsi/cxlflash/main.h
+ delete mode 100644 drivers/scsi/cxlflash/ocxl_hw.c
+ delete mode 100644 drivers/scsi/cxlflash/ocxl_hw.h
+ delete mode 100644 drivers/scsi/cxlflash/sislite.h
+ delete mode 100644 drivers/scsi/cxlflash/superpipe.c
+ delete mode 100644 drivers/scsi/cxlflash/superpipe.h
+ delete mode 100644 drivers/scsi/cxlflash/vlun.c
+ delete mode 100644 drivers/scsi/cxlflash/vlun.h
+ create mode 100644 drivers/ufs/host/ufs-rockchip.c
+ create mode 100644 drivers/ufs/host/ufs-rockchip.h
+ delete mode 100644 include/uapi/scsi/cxlflash_ioctl.h
+Merging scsi-mkp/for-next (e402ee093f74 scsi: core: Use a switch statement when attaching VPD pages)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-mkp/for-next
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/ufs/renesas,ufs.yaml | 12 +
+ drivers/scsi/isci/init.c | 14 +-
+ drivers/scsi/isci/isci.h | 7 -
+ drivers/scsi/megaraid/megaraid_sas_base.c | 10 +-
+ drivers/scsi/mpi3mr/mpi3mr_os.c | 99 +++
+ drivers/scsi/scsi.c | 28 +-
+ drivers/scsi/storvsc_drv.c | 4 +-
+ drivers/ufs/host/ufs-renesas.c | 727 ++++++++++++---------
+ 8 files changed, 580 insertions(+), 321 deletions(-)
+Merging vhost/linux-next (9d8960672d63 vhost-scsi: Reduce response iov mem use)
+$ 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.
+ drivers/vdpa/mlx5/core/mr.c | 7 +-
+ drivers/vdpa/mlx5/net/mlx5_vnet.c | 3 +
+ drivers/vdpa/vdpa_user/vduse_dev.c | 1 +
+ drivers/vhost/Kconfig | 1 +
+ drivers/vhost/scsi.c | 549 +++++++++++++++++++++++--------------
+ drivers/virtio/virtio.c | 29 ++
+ sound/virtio/virtio_pcm.c | 21 +-
+ tools/virtio/linux/compiler.h | 25 ++
+ tools/virtio/linux/dma-mapping.h | 13 +
+ tools/virtio/linux/module.h | 7 +
+ 10 files changed, 439 insertions(+), 217 deletions(-)
+Merging rpmsg/for-next (340bec0b725c Merge branch '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
+Merge made by the 'ort' strategy.
+ Documentation/devicetree/bindings/dsp/fsl,dsp.yaml | 24 ++-
+ .../bindings/remoteproc/qcom,msm8916-mss-pil.yaml | 64 ++++++-
+ .../bindings/remoteproc/qcom,sm6115-pas.yaml | 2 +-
+ .../bindings/remoteproc/qcom,sm8550-pas.yaml | 46 ++++-
+ .../bindings/remoteproc/qcom,wcnss-pil.yaml | 45 ++++-
+ drivers/remoteproc/imx_dsp_rproc.c | 25 ++-
+ drivers/remoteproc/imx_rproc.h | 2 +
+ drivers/remoteproc/omap_remoteproc.c | 1 +
+ drivers/remoteproc/qcom_q6v5_mss.c | 186 ++++++++++++++++++++-
+ drivers/remoteproc/qcom_q6v5_pas.c | 26 +++
+ drivers/remoteproc/qcom_wcnss.c | 33 +++-
+ drivers/reset/reset-imx8mp-audiomix.c | 78 ++++++---
+ include/dt-bindings/reset/imx8mp-reset-audiomix.h | 13 ++
+ 13 files changed, 483 insertions(+), 62 deletions(-)
+ create mode 100644 include/dt-bindings/reset/imx8mp-reset-audiomix.h
+Merging gpio-brgl/gpio/for-next (2eb5dc9a4b0d gpio: da9055: use new line value setter callbacks)
+$ 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 Makefile
+Auto-merging drivers/gpio/gpiolib-of.c
+Merge made by the 'ort' strategy.
+ .../bindings/gpio/aspeed,ast2400-gpio.yaml | 6 +
+ .../devicetree/bindings/gpio/gpio-mvebu.yaml | 10 +
+ .../devicetree/bindings/gpio/gpio-vf610.yaml | 1 +
+ .../devicetree/bindings/gpio/loongson,ls-gpio.yaml | 3 +
+ .../devicetree/bindings/gpio/nxp,pcf8575.yaml | 37 +++
+ Makefile | 2 +-
+ drivers/gpio/Kconfig | 9 +-
+ drivers/gpio/Makefile | 3 +
+ drivers/gpio/dev-sync-probe.c | 97 ++++++
+ drivers/gpio/dev-sync-probe.h | 25 ++
+ drivers/gpio/gpio-74x164.c | 96 +++---
+ drivers/gpio/gpio-adnp.c | 140 ++++----
+ drivers/gpio/gpio-adp5520.c | 12 +-
+ drivers/gpio/gpio-adp5585.c | 10 +-
+ drivers/gpio/gpio-aggregator.c | 38 ++-
+ drivers/gpio/gpio-altera-a10sr.c | 14 +-
+ drivers/gpio/gpio-altera.c | 6 +-
+ drivers/gpio/gpio-amd-fch.c | 7 +-
+ drivers/gpio/gpio-amd8111.c | 6 +-
+ drivers/gpio/gpio-arizona.c | 9 +-
+ drivers/gpio/gpio-aspeed-sgpio.c | 82 ++---
+ drivers/gpio/gpio-aspeed.c | 108 +++---
+ drivers/gpio/gpio-bcm-kona.c | 69 ++--
+ drivers/gpio/gpio-bd71815.c | 15 +-
+ drivers/gpio/gpio-bd71828.c | 15 +-
+ drivers/gpio/gpio-bd9571mwv.c | 8 +-
+ drivers/gpio/gpio-brcmstb.c | 3 +-
+ drivers/gpio/gpio-bt8xx.c | 48 +--
+ drivers/gpio/gpio-cgbc.c | 24 +-
+ drivers/gpio/gpio-creg-snps.c | 10 +-
+ drivers/gpio/gpio-cros-ec.c | 13 +-
+ drivers/gpio/gpio-crystalcove.c | 15 +-
+ drivers/gpio/gpio-cs5535.c | 6 +-
+ drivers/gpio/gpio-da9052.c | 34 +-
+ drivers/gpio/gpio-da9055.c | 14 +-
+ drivers/gpio/gpio-davinci.c | 6 +-
+ drivers/gpio/gpio-grgpio.c | 3 +-
+ drivers/gpio/gpio-latch.c | 78 ++---
+ drivers/gpio/gpio-loongson-64bit.c | 55 ++-
+ drivers/gpio/gpio-max3191x.c | 18 +-
+ drivers/gpio/gpio-max77650.c | 14 +-
+ drivers/gpio/gpio-mmio.c | 37 ++-
+ drivers/gpio/gpio-mockup.c | 14 +-
+ drivers/gpio/gpio-mvebu.c | 15 +-
+ drivers/gpio/gpio-nomadik.c | 3 +-
+ drivers/gpio/gpio-pca953x.c | 17 +-
+ drivers/gpio/gpio-pcf857x.c | 29 +-
+ drivers/gpio/gpio-rcar.c | 13 +-
+ drivers/gpio/gpio-regmap.c | 73 ++--
+ drivers/gpio/gpio-sim.c | 98 ++----
+ drivers/gpio/gpio-stmpe.c | 6 +-
+ drivers/gpio/gpio-vf610.c | 105 +-----
+ drivers/gpio/gpio-virtio.c | 29 +-
+ drivers/gpio/gpio-virtuser.c | 73 +---
+ drivers/gpio/gpio-wcove.c | 3 +-
+ drivers/gpio/gpio-wm831x.c | 3 +-
+ drivers/gpio/gpio-xilinx.c | 102 +++---
+ drivers/gpio/gpio-xra1403.c | 3 +-
+ drivers/gpio/gpiolib-acpi.c | 2 +-
+ drivers/gpio/gpiolib-of.c | 132 ++++++--
+ drivers/gpio/gpiolib.c | 367 +++++++++++++++------
+ drivers/gpio/gpiolib.h | 39 ++-
+ drivers/leds/leds-aw200xx.c | 2 +-
+ drivers/mmc/core/pwrseq_simple.c | 3 +-
+ drivers/mux/gpio.c | 4 +-
+ drivers/phy/motorola/phy-mapphone-mdm6600.c | 4 +-
+ include/drm/drm_util.h | 16 +-
+ include/linux/gpio.h | 4 +-
+ include/linux/gpio/consumer.h | 69 ++--
+ include/linux/gpio/driver.h | 92 ++++--
+ include/linux/gpio/regmap.h | 4 +-
+ include/linux/util_macros.h | 15 +
+ 72 files changed, 1422 insertions(+), 1123 deletions(-)
+ create mode 100644 drivers/gpio/dev-sync-probe.c
+ create mode 100644 drivers/gpio/dev-sync-probe.h
+Merging gpio-intel/for-next (e646f0dae7b0 gpiolib-acpi: Drop unneeded ERR_CAST() in __acpi_find_gpio())
+$ 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 (fde88c7bdbd6 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
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ .../bindings/pinctrl/airoha,en7581-pinctrl.yaml | 3 +
+ .../pinctrl/allwinner,sun55i-a523-pinctrl.yaml | 175 +++++
+ .../bindings/pinctrl/atmel,at91-pio4-pinctrl.txt | 1 +
+ .../bindings/pinctrl/brcm,bcm21664-pinctrl.yaml | 152 ++++
+ .../bindings/pinctrl/ingenic,pinctrl.yaml | 2 +
+ .../bindings/pinctrl/qcom,sa8775p-tlmm.yaml | 2 +-
+ .../bindings/pinctrl/rockchip,pinctrl.yaml | 1 +
+ .../bindings/pinctrl/sophgo,sg2042-pinctrl.yaml | 129 ++++
+ MAINTAINERS | 7 +
+ drivers/pinctrl/Kconfig | 13 +
+ drivers/pinctrl/Makefile | 1 +
+ drivers/pinctrl/bcm/pinctrl-bcm281xx.c | 851 +++++++++++++++++++--
+ drivers/pinctrl/bcm/pinctrl-bcm2835.c | 14 +-
+ drivers/pinctrl/devicetree.c | 10 +-
+ drivers/pinctrl/intel/Kconfig | 2 -
+ drivers/pinctrl/intel/pinctrl-baytrail.c | 5 +-
+ drivers/pinctrl/intel/pinctrl-intel.c | 2 +-
+ drivers/pinctrl/intel/pinctrl-lynxpoint.c | 5 +-
+ drivers/pinctrl/meson/pinctrl-amlogic-a4.c | 6 +-
+ drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c | 4 +-
+ drivers/pinctrl/nuvoton/pinctrl-wpcm450.c | 7 +-
+ drivers/pinctrl/pinconf-generic.c | 2 +-
+ drivers/pinctrl/pinctrl-amdisp.c | 231 ++++++
+ drivers/pinctrl/pinctrl-amdisp.h | 95 +++
+ drivers/pinctrl/pinctrl-cy8c95x0.c | 191 +++--
+ drivers/pinctrl/pinctrl-ingenic.c | 262 ++++++-
+ drivers/pinctrl/pinctrl-mcp23s08.c | 23 +-
+ drivers/pinctrl/pinctrl-pistachio.c | 6 -
+ drivers/pinctrl/pinctrl-rockchip.c | 160 +++-
+ drivers/pinctrl/pinctrl-rockchip.h | 1 +
+ drivers/pinctrl/qcom/Kconfig.msm | 14 +-
+ drivers/pinctrl/qcom/Makefile | 1 +
+ drivers/pinctrl/qcom/pinctrl-msm.c | 12 +-
+ drivers/pinctrl/qcom/pinctrl-msm8917.c | 8 +-
+ drivers/pinctrl/qcom/pinctrl-sa8775p.c | 58 +-
+ drivers/pinctrl/qcom/tlmm-test.c | 663 ++++++++++++++++
+ drivers/pinctrl/renesas/pinctrl-rza2.c | 5 +
+ drivers/pinctrl/renesas/pinctrl-rzg2l.c | 22 +-
+ drivers/pinctrl/renesas/pinctrl-rzv2m.c | 2 +
+ drivers/pinctrl/sophgo/Kconfig | 46 +-
+ drivers/pinctrl/sophgo/Makefile | 8 +-
+ drivers/pinctrl/sophgo/pinctrl-cv1800b.c | 27 +-
+ drivers/pinctrl/sophgo/pinctrl-cv1812h.c | 27 +-
+ drivers/pinctrl/sophgo/pinctrl-cv18xx.c | 598 ++++-----------
+ drivers/pinctrl/sophgo/pinctrl-cv18xx.h | 66 +-
+ drivers/pinctrl/sophgo/pinctrl-sg2000.c | 27 +-
+ drivers/pinctrl/sophgo/pinctrl-sg2002.c | 27 +-
+ drivers/pinctrl/sophgo/pinctrl-sg2042-ops.c | 296 +++++++
+ drivers/pinctrl/sophgo/pinctrl-sg2042.c | 655 ++++++++++++++++
+ drivers/pinctrl/sophgo/pinctrl-sg2042.h | 49 ++
+ drivers/pinctrl/sophgo/pinctrl-sg2044.c | 718 +++++++++++++++++
+ drivers/pinctrl/sophgo/pinctrl-sophgo-common.c | 451 +++++++++++
+ drivers/pinctrl/sophgo/pinctrl-sophgo.h | 136 ++++
+ drivers/pinctrl/spacemit/pinctrl-k1.c | 6 +-
+ drivers/pinctrl/sunxi/Kconfig | 10 +
+ drivers/pinctrl/sunxi/Makefile | 3 +
+ drivers/pinctrl/sunxi/pinctrl-sun20i-d1.c | 6 +-
+ drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c | 8 +-
+ drivers/pinctrl/sunxi/pinctrl-sun55i-a523-r.c | 54 ++
+ drivers/pinctrl/sunxi/pinctrl-sun55i-a523.c | 54 ++
+ drivers/pinctrl/sunxi/pinctrl-sun5i.c | 8 +-
+ drivers/pinctrl/sunxi/pinctrl-sun6i-a31.c | 8 +-
+ drivers/pinctrl/sunxi/pinctrl-sun8i-v3s.c | 7 +-
+ drivers/pinctrl/sunxi/pinctrl-sunxi-dt.c | 374 +++++++++
+ drivers/pinctrl/sunxi/pinctrl-sunxi.c | 54 +-
+ drivers/pinctrl/sunxi/pinctrl-sunxi.h | 45 +-
+ drivers/pinctrl/tegra/pinctrl-tegra.c | 73 +-
+ drivers/pinctrl/tegra/pinctrl-tegra.h | 34 +-
+ drivers/pwm/pwm-lpss.c | 4 +-
+ include/dt-bindings/pinctrl/pinctrl-sg2042.h | 196 +++++
+ include/dt-bindings/pinctrl/pinctrl-sg2044.h | 221 ++++++
+ include/linux/platform_data/x86/pwm-lpss.h | 33 +-
+ 72 files changed, 6625 insertions(+), 852 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/allwinner,sun55i-a523-pinctrl.yaml
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/brcm,bcm21664-pinctrl.yaml
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/sophgo,sg2042-pinctrl.yaml
+ create mode 100644 drivers/pinctrl/pinctrl-amdisp.c
+ create mode 100644 drivers/pinctrl/pinctrl-amdisp.h
+ create mode 100644 drivers/pinctrl/qcom/tlmm-test.c
+ create mode 100644 drivers/pinctrl/sophgo/pinctrl-sg2042-ops.c
+ create mode 100644 drivers/pinctrl/sophgo/pinctrl-sg2042.c
+ create mode 100644 drivers/pinctrl/sophgo/pinctrl-sg2042.h
+ create mode 100644 drivers/pinctrl/sophgo/pinctrl-sg2044.c
+ create mode 100644 drivers/pinctrl/sophgo/pinctrl-sophgo-common.c
+ create mode 100644 drivers/pinctrl/sophgo/pinctrl-sophgo.h
+ create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun55i-a523-r.c
+ create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun55i-a523.c
+ create mode 100644 drivers/pinctrl/sunxi/pinctrl-sunxi-dt.c
+ create mode 100644 include/dt-bindings/pinctrl/pinctrl-sg2042.h
+ create mode 100644 include/dt-bindings/pinctrl/pinctrl-sg2044.h
+Merging pinctrl-intel/for-next (0ee2261d08aa pinctrl: intel: drop repeated config dependency)
+$ 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 (abcdeb4e299a pinctrl: renesas: rza2: Fix missing of_node_put() call)
+$ 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 (701d0e910955 pinctrl: samsung: add support for eint_fltcon_offset)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung/for-next
+Merge made by the 'ort' strategy.
+ .../pinctrl/samsung,pinctrl-wakeup-interrupt.yaml | 3 +
+ .../bindings/pinctrl/samsung,pinctrl.yaml | 2 +
+ drivers/pinctrl/samsung/pinctrl-exynos-arm64.c | 405 ++++++++++++++++++---
+ drivers/pinctrl/samsung/pinctrl-exynos.h | 41 +++
+ drivers/pinctrl/samsung/pinctrl-samsung.c | 5 +
+ drivers/pinctrl/samsung/pinctrl-samsung.h | 6 +
+ 6 files changed, 413 insertions(+), 49 deletions(-)
+Merging pwm/pwm/for-next (6df320abbb40 dt-bindings: pwm: imx: Add i.MX93, i.MX94 and i.MX95 support)
+$ 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 drivers/pwm/pwm-lpss.c
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/pwm/imx-tpm-pwm.yaml | 11 +-
+ .../devicetree/bindings/pwm/pwm-nexus-node.yaml | 65 +++++++
+ .../devicetree/bindings/pwm/pwm-rockchip.yaml | 2 +
+ .../devicetree/bindings/pwm/sophgo,sg2042-pwm.yaml | 58 ++++++
+ drivers/pwm/Kconfig | 14 +-
+ drivers/pwm/Makefile | 1 +
+ drivers/pwm/core.c | 19 +-
+ drivers/pwm/pwm-clps711x.c | 4 +-
+ drivers/pwm/pwm-gpio.c | 5 +-
+ drivers/pwm/pwm-lpss.c | 1 +
+ drivers/pwm/pwm-lpss.h | 1 -
+ drivers/pwm/pwm-pca9685.c | 9 +-
+ drivers/pwm/pwm-sophgo-sg2042.c | 194 +++++++++++++++++++++
+ drivers/pwm/pwm-stmpe.c | 25 ++-
+ include/linux/pwm.h | 4 +-
+ 15 files changed, 390 insertions(+), 23 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/pwm/pwm-nexus-node.yaml
+ create mode 100644 Documentation/devicetree/bindings/pwm/sophgo,sg2042-pwm.yaml
+ create mode 100644 drivers/pwm/pwm-sophgo-sg2042.c
+Merging ktest/for-next (f3a30016e4b5 ktest.pl: Fix typo "accesing")
+$ 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 (82ef781f24ac selftests/ftrace: add 'poll' binary to gitignore)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next
+Merge made by the 'ort' strategy.
+ tools/testing/selftests/ftrace/.gitignore | 1 +
+ .../selftests/ftrace/test.d/dynevent/add_remove_uprobe.tc | 10 +++++++---
+ tools/testing/selftests/ftrace/test.d/functions | 8 +++++++-
+ .../test.d/trigger/inter-event/trigger-action-hist-xfail.tc | 1 +
+ .../test.d/trigger/inter-event/trigger-onchange-action-hist.tc | 3 +++
+ .../test.d/trigger/inter-event/trigger-snapshot-action-hist.tc | 3 +++
+ .../ftrace/test.d/trigger/trigger-hist-expressions.tc | 1 +
+ tools/testing/selftests/user_events/dyn_test.c | 2 ++
+ 8 files changed, 25 insertions(+), 4 deletions(-)
+Merging kunit/test (a64dcfb451e2 Linux 6.14-rc2)
+$ 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 (2e0cf2b32f72 kunit: tool: add test to check parsing late test plan)
+$ 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 include/kunit/test.h
+Auto-merging lib/Kconfig.debug
+Auto-merging lib/Makefile
+CONFLICT (content): Merge conflict in lib/Makefile
+Recorded preimage for 'lib/Makefile'
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+Recorded resolution for 'lib/Makefile'.
+[master 2a3d0507ba7f] Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git
+$ git diff -M --stat --summary HEAD^..
+ arch/x86/tools/insn_decoder_test.c | 3 +-
+ include/kunit/test.h | 20 ++++----
+ lib/Kconfig.debug | 9 ++++
+ lib/Makefile | 2 +
+ lib/longest_symbol_kunit.c | 82 ++++++++++++++++++++++++++++++
+ tools/testing/kunit/kunit_kernel.py | 4 +-
+ tools/testing/kunit/kunit_parser.py | 9 ++--
+ tools/testing/kunit/kunit_tool_test.py | 11 ++++
+ tools/testing/kunit/qemu_configs/sparc.py | 5 +-
+ tools/testing/kunit/qemu_configs/x86_64.py | 4 +-
+ 10 files changed, 128 insertions(+), 21 deletions(-)
+ create mode 100644 lib/longest_symbol_kunit.c
+Merging livepatching/for-next (8bd10336f1af Merge branch 'for-6.15/trivial' 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
+Auto-merging kernel/livepatch/core.c
+Merge made by the 'ort' strategy.
+ Documentation/livepatch/module-elf-format.rst | 13 ++++++++-----
+ kernel/livepatch/core.c | 9 ++++++---
+ 2 files changed, 14 insertions(+), 8 deletions(-)
+Merging rtc/rtc-next (8a9b1751b26c rtc: pl031: document struct pl031_vendor_data members)
+$ git merge -m Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next
+Merge made by the 'ort' strategy.
+ drivers/rtc/rtc-ab-eoz9.c | 24 +-----------
+ drivers/rtc/rtc-ab8500.c | 11 +-----
+ drivers/rtc/rtc-aspeed.c | 16 ++++----
+ drivers/rtc/rtc-ds1307.c | 4 +-
+ drivers/rtc/rtc-ds1343.c | 8 +---
+ drivers/rtc/rtc-ds2404.c | 14 +++----
+ drivers/rtc/rtc-ds3232.c | 24 +-----------
+ drivers/rtc/rtc-ep93xx.c | 16 ++++----
+ drivers/rtc/rtc-fsl-ftm-alarm.c | 2 +-
+ drivers/rtc/rtc-ftrtc010.c | 17 ++++-----
+ drivers/rtc/rtc-m48t86.c | 14 +++----
+ drivers/rtc/rtc-max77686.c | 37 ++++++++----------
+ drivers/rtc/rtc-meson-vrtc.c | 12 +++---
+ drivers/rtc/rtc-meson.c | 16 ++++----
+ drivers/rtc/rtc-mpfs.c | 8 +---
+ drivers/rtc/rtc-nxp-bbnsm.c | 29 +++++---------
+ drivers/rtc/rtc-pl030.c | 16 ++++----
+ drivers/rtc/rtc-pl031.c | 8 ++--
+ drivers/rtc/rtc-pm8xxx.c | 12 +-----
+ drivers/rtc/rtc-rx8581.c | 85 +++++++++++++++++------------------------
+ drivers/rtc/rtc-s35390a.c | 22 +++++------
+ drivers/rtc/rtc-s5m.c | 58 ++++++++++++----------------
+ drivers/rtc/rtc-sd2405al.c | 16 ++++----
+ drivers/rtc/rtc-sd3078.c | 71 ++++++++++++++--------------------
+ drivers/rtc/rtc-stm32.c | 10 +----
+ 25 files changed, 210 insertions(+), 340 deletions(-)
+Merging nvdimm/libnvdimm-for-next (2318fa87f808 libnvdimm: Remove unused nd_attach_ndns)
+$ 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
+Merge made by the 'ort' strategy.
+ drivers/acpi/nfit/core.c | 2 +-
+ drivers/nvdimm/claim.c | 11 -----------
+ drivers/nvdimm/nd-core.h | 4 ----
+ drivers/nvdimm/region_devs.c | 41 -----------------------------------------
+ 4 files changed, 1 insertion(+), 57 deletions(-)
+Merging at24/at24/for-next (f25f405d250f eeprom: at24: Drop of_match_ptr() and ACPI_PTR() protections)
+$ 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 (c620f56c70eb MAINTAINERS: Update AMD NTB maintainers)
+$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ MAINTAINERS | 1 -
+ drivers/ntb/hw/intel/ntb_hw_gen3.c | 3 +++
+ drivers/ntb/hw/mscc/ntb_hw_switchtec.c | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+Merging seccomp/for-next/seccomp (8f19331384e6 seccomp: avoid the lock trip seccomp_filter_release in common case)
+$ 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
+Merge made by the 'ort' strategy.
+ arch/mips/kernel/ptrace.c | 20 ++---------
+ arch/powerpc/kernel/ptrace/ptrace.c | 2 +-
+ include/linux/seccomp.h | 12 +++----
+ kernel/entry/common.c | 2 +-
+ kernel/seccomp.c | 49 ++++++++++++++++-----------
+ tools/testing/selftests/seccomp/seccomp_bpf.c | 6 ++++
+ 6 files changed, 43 insertions(+), 48 deletions(-)
+Merging slimbus/for-next (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git slimbus/for-next
+Already up to date.
+Merging nvmem/for-next (accd056fc20b dt-bindings: nvmem: Add compatible for MSM8960)
+$ 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 Documentation/devicetree/bindings/nvmem/qcom,qfprom.yaml
+Merge made by the 'ort' strategy.
+ .../bindings/nvmem/layouts/fixed-cell.yaml | 2 +-
+ .../devicetree/bindings/nvmem/qcom,qfprom.yaml | 4 +++
+ .../devicetree/bindings/nvmem/rockchip,otp.yaml | 25 ++++++++++++++
+ drivers/nvmem/core.c | 40 +++++++++++++++++-----
+ drivers/nvmem/qfprom.c | 26 ++++++++++----
+ drivers/nvmem/rockchip-otp.c | 17 +++++++--
+ 6 files changed, 97 insertions(+), 17 deletions(-)
+Merging xarray/main (6684aba0780d XArray: Add extra debugging check to xas_lock and friends)
+$ git merge -m Merge branch 'main' of git://git.infradead.org/users/willy/xarray.git xarray/main
+Auto-merging include/linux/xarray.h
+Auto-merging lib/xarray.c
+Merge made by the 'ort' strategy.
+ include/linux/xarray.h | 60 +++++++++++++++++++++++++++-----------------------
+ lib/xarray.c | 3 +--
+ 2 files changed, 34 insertions(+), 29 deletions(-)
+Merging hyperv/hyperv-next (302580630301 hyperv: Add definitions for root partition driver to hv headers)
+$ git merge -m Merge branch 'hyperv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv/hyperv-next
+Auto-merging arch/x86/hyperv/hv_vtl.c
+Auto-merging arch/x86/hyperv/ivm.c
+Auto-merging drivers/hv/vmbus_drv.c
+Merge made by the 'ort' strategy.
+ arch/arm64/hyperv/hv_core.c | 17 +++
+ arch/arm64/hyperv/mshyperv.c | 6 +
+ arch/arm64/include/asm/mshyperv.h | 13 ++
+ arch/x86/hyperv/Makefile | 2 +-
+ arch/x86/hyperv/hv_init.c | 35 +-----
+ arch/x86/hyperv/hv_vtl.c | 34 +++++
+ arch/x86/hyperv/irqdomain.c | 6 +-
+ arch/x86/hyperv/ivm.c | 2 +-
+ arch/x86/include/asm/mshyperv.h | 6 -
+ arch/x86/kernel/cpu/mshyperv.c | 40 +++---
+ drivers/acpi/numa/srat.c | 1 +
+ drivers/clocksource/hyperv_timer.c | 4 +-
+ drivers/hv/Kconfig | 16 +++
+ drivers/hv/Makefile | 1 +
+ drivers/hv/hv.c | 94 ++++++++------
+ drivers/hv/hv_common.c | 198 ++++++++++++++++++++++++++++--
+ {arch/x86/hyperv => drivers/hv}/hv_proc.c | 27 ++--
+ drivers/hv/vmbus_drv.c | 54 ++++----
+ drivers/iommu/hyperv-iommu.c | 8 +-
+ include/asm-generic/mshyperv.h | 72 ++++++++++-
+ include/hyperv/hvgdk_mini.h | 74 ++++++++++-
+ include/hyperv/hvhdk.h | 132 +++++++++++++++++++-
+ include/hyperv/hvhdk_mini.h | 91 ++++++++++++++
+ include/linux/hyperv.h | 57 +--------
+ kernel/cpu.c | 1 +
+ 25 files changed, 765 insertions(+), 226 deletions(-)
+ rename {arch/x86/hyperv => drivers/hv}/hv_proc.c (90%)
+Merging auxdisplay/for-next (67200d70e459 Merge patch series "auxdisplay: charlcd: Refactor memory allocation")
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git auxdisplay/for-next
+Merge made by the 'ort' strategy.
+ drivers/auxdisplay/Kconfig | 1 +
+ drivers/auxdisplay/charlcd.c | 5 +++--
+ drivers/auxdisplay/charlcd.h | 5 +++--
+ drivers/auxdisplay/hd44780.c | 19 ++++++-------------
+ drivers/auxdisplay/hd44780_common.c | 24 ++++++++++++++++--------
+ drivers/auxdisplay/hd44780_common.h | 4 +++-
+ drivers/auxdisplay/lcd2s.c | 12 ++++--------
+ drivers/auxdisplay/panel.c | 17 +++++------------
+ drivers/auxdisplay/seg-led-gpio.c | 3 +--
+ 9 files changed, 42 insertions(+), 48 deletions(-)
+Merging kgdb/kgdb/for-next (6beaa75cd24d kdb: Remove unused flags stack)
+$ 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 (d05c69b64a3a debug)
+$ git merge -m Merge branch 'hmm' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git hmm/hmm
+Auto-merging Documentation/userspace-api/index.rst
+Auto-merging Documentation/userspace-api/ioctl/ioctl-number.rst
+Auto-merging MAINTAINERS
+Auto-merging drivers/net/ethernet/broadcom/bnxt/bnxt.c
+Auto-merging drivers/net/ethernet/broadcom/bnxt/bnxt.h
+Auto-merging drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c
+Merge made by the 'ort' strategy.
+ Documentation/admin-guide/tainted-kernels.rst | 5 +
+ Documentation/userspace-api/fwctl/fwctl.rst | 285 ++++++++++++++
+ Documentation/userspace-api/fwctl/index.rst | 12 +
+ Documentation/userspace-api/index.rst | 1 +
+ Documentation/userspace-api/ioctl/ioctl-number.rst | 1 +
+ MAINTAINERS | 18 +
+ drivers/Kconfig | 2 +
+ drivers/Makefile | 1 +
+ drivers/fwctl/Kconfig | 32 ++
+ drivers/fwctl/Makefile | 6 +
+ drivers/fwctl/bnxt/Makefile | 4 +
+ drivers/fwctl/bnxt/bnxt.c | 265 +++++++++++++
+ drivers/fwctl/main.c | 421 +++++++++++++++++++++
+ drivers/fwctl/mlx5/Makefile | 4 +
+ drivers/fwctl/mlx5/main.c | 412 ++++++++++++++++++++
+ drivers/net/ethernet/broadcom/bnxt/bnxt.c | 3 +
+ drivers/net/ethernet/broadcom/bnxt/bnxt.h | 3 +
+ drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c | 126 +++++-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h | 4 +
+ drivers/net/ethernet/mellanox/mlx5/core/dev.c | 9 +
+ include/linux/fwctl.h | 135 +++++++
+ include/linux/panic.h | 3 +-
+ include/uapi/fwctl/bnxt.h | 27 ++
+ include/uapi/fwctl/fwctl.h | 140 +++++++
+ include/uapi/fwctl/mlx5.h | 36 ++
+ kernel/panic.c | 1 +
+ tools/debugging/kernel-chktaint | 8 +
+ 27 files changed, 1959 insertions(+), 5 deletions(-)
+ create mode 100644 Documentation/userspace-api/fwctl/fwctl.rst
+ create mode 100644 Documentation/userspace-api/fwctl/index.rst
+ create mode 100644 drivers/fwctl/Kconfig
+ create mode 100644 drivers/fwctl/Makefile
+ create mode 100644 drivers/fwctl/bnxt/Makefile
+ create mode 100644 drivers/fwctl/bnxt/bnxt.c
+ create mode 100644 drivers/fwctl/main.c
+ create mode 100644 drivers/fwctl/mlx5/Makefile
+ create mode 100644 drivers/fwctl/mlx5/main.c
+ create mode 100644 include/linux/fwctl.h
+ create mode 100644 include/uapi/fwctl/bnxt.h
+ create mode 100644 include/uapi/fwctl/fwctl.h
+ create mode 100644 include/uapi/fwctl/mlx5.h
+Merging cfi/cfi/next (2014c95afece Linux 6.14-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 (0686a818d77a bus: mhi: host: Fix race between unprepare and queue_buf)
+$ git merge -m Merge branch 'mhi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git mhi/mhi-next
+Already up to date.
+Merging memblock/for-next (98b7beba1ee6 memblock: uniformly initialize all reserved pages to MIGRATE_MOVABLE)
+$ 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 (74d9c59658e4 cxl/region: Quiet some dev_warn()s in extended linear cache setup)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl/next
+Auto-merging arch/x86/mm/pat/set_memory.c
+Auto-merging include/linux/acpi.h
+Merge made by the 'ort' strategy.
+ Documentation/ABI/stable/sysfs-devices-node | 6 +
+ Documentation/ABI/testing/sysfs-bus-cxl | 53 +++-
+ Documentation/driver-api/cxl/maturity-map.rst | 2 +-
+ arch/x86/mm/pat/set_memory.c | 1 +
+ drivers/acpi/apei/ghes.c | 103 +++++++
+ drivers/acpi/numa/hmat.c | 44 +++
+ drivers/base/node.c | 2 +
+ drivers/cxl/Kconfig | 4 +
+ drivers/cxl/core/Makefile | 3 +
+ drivers/cxl/core/acpi.c | 11 +
+ drivers/cxl/core/cdat.c | 100 +++----
+ drivers/cxl/core/core.h | 10 +-
+ drivers/cxl/core/hdm.c | 382 ++++++++++++++++++--------
+ drivers/cxl/core/mbox.c | 141 ++++++----
+ drivers/cxl/core/mce.c | 65 +++++
+ drivers/cxl/core/mce.h | 20 ++
+ drivers/cxl/core/memdev.c | 83 +++---
+ drivers/cxl/core/pci.c | 97 +++++++
+ drivers/cxl/core/port.c | 38 ++-
+ drivers/cxl/core/ras.c | 119 ++++++++
+ drivers/cxl/core/region.c | 342 ++++++++++++++---------
+ drivers/cxl/core/trace.h | 81 +++++-
+ drivers/cxl/cxl.h | 52 ++--
+ drivers/cxl/cxlmem.h | 77 +++++-
+ drivers/cxl/cxlpci.h | 6 +
+ drivers/cxl/mem.c | 2 +-
+ drivers/cxl/pci.c | 7 +-
+ drivers/cxl/pmem.c | 81 +++++-
+ drivers/firmware/efi/cper.c | 6 +-
+ drivers/firmware/efi/cper_cxl.c | 39 +--
+ drivers/firmware/efi/cper_cxl.h | 66 -----
+ include/cxl/event.h | 101 +++++++
+ include/linux/acpi.h | 11 +
+ include/linux/cper.h | 8 +
+ include/linux/node.h | 7 +
+ tools/testing/cxl/Kbuild | 3 +
+ tools/testing/cxl/test/cxl.c | 32 +--
+ tools/testing/cxl/test/mem.c | 32 ++-
+ 38 files changed, 1647 insertions(+), 590 deletions(-)
+ create mode 100644 drivers/cxl/core/acpi.c
+ create mode 100644 drivers/cxl/core/mce.c
+ create mode 100644 drivers/cxl/core/mce.h
+ create mode 100644 drivers/cxl/core/ras.c
+ delete mode 100644 drivers/firmware/efi/cper_cxl.h
+Merging zstd/zstd-next (7eb172143d55 Linux 6.14-rc5)
+$ git merge -m Merge branch 'zstd-next' of https://github.com/terrelln/linux.git zstd/zstd-next
+Already up to date.
+Merging efi/next (0dc1754e16b4 efi/libstub: Avoid legacy decompressor zlib/zstd wrappers)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next
+Auto-merging arch/x86/boot/compressed/Makefile
+Merge made by the 'ort' strategy.
+ arch/x86/boot/compressed/Makefile | 1 -
+ arch/x86/boot/compressed/efi_mixed.S | 341 ---------------------
+ arch/x86/boot/compressed/head_64.S | 7 -
+ drivers/firmware/efi/efibc.c | 2 +-
+ drivers/firmware/efi/libstub/Makefile | 10 +-
+ drivers/firmware/efi/libstub/efistub.h | 3 +
+ drivers/firmware/efi/libstub/intrinsics.c | 26 ++
+ drivers/firmware/efi/libstub/x86-mixed.S | 253 +++++++++++++++
+ drivers/firmware/efi/libstub/x86-stub.c | 52 ++--
+ .../firmware/efi/libstub/zboot-decompress-gzip.c | 68 ++++
+ .../firmware/efi/libstub/zboot-decompress-zstd.c | 49 +++
+ drivers/firmware/efi/libstub/zboot.c | 65 +---
+ drivers/firmware/efi/libstub/zboot.lds | 1 +
+ fs/efivarfs/file.c | 10 +-
+ 14 files changed, 452 insertions(+), 436 deletions(-)
+ delete mode 100644 arch/x86/boot/compressed/efi_mixed.S
+ create mode 100644 drivers/firmware/efi/libstub/x86-mixed.S
+ create mode 100644 drivers/firmware/efi/libstub/zboot-decompress-gzip.c
+ create mode 100644 drivers/firmware/efi/libstub/zboot-decompress-zstd.c
+Merging unicode/for-next (6b56a63d286f MAINTAINERS: Add Unicode tree)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git unicode/for-next
+Already up to date.
+Merging slab/slab/for-next (541702a66640 Merge branch 'slab/for-6.15/kfree_rcu_tiny' 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 include/linux/page-flags.h
+Auto-merging include/linux/rcupdate.h
+Auto-merging include/linux/rcutree.h
+Auto-merging include/linux/slab.h
+Auto-merging include/trace/events/rcu.h
+Auto-merging kernel/rcu/tiny.c
+CONFLICT (content): Merge conflict in kernel/rcu/tiny.c
+Auto-merging kernel/rcu/tree.c
+Auto-merging mm/Kconfig
+Auto-merging mm/slab_common.c
+Auto-merging mm/slub.c
+Auto-merging mm/util.c
+Resolved 'kernel/rcu/tiny.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 3af9960d20ca] Merge branch 'slab/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git
+$ git diff -M --stat --summary HEAD^..
+ include/linux/page-flags.h | 18 +--
+ include/linux/rcupdate.h | 33 +++--
+ include/linux/rcutiny.h | 36 -----
+ include/linux/rcutree.h | 3 -
+ include/linux/slab.h | 16 ++-
+ include/trace/events/rcu.h | 34 -----
+ kernel/rcu/tiny.c | 25 ----
+ kernel/rcu/tree.c | 9 +-
+ lib/slub_kunit.c | 59 ++++++++
+ mm/Kconfig | 4 +
+ mm/slab.h | 34 +----
+ mm/slab_common.c | 44 ++++--
+ mm/slub.c | 336 ++++++++++++++++++++++++++++++++++++++-------
+ mm/util.c | 162 ----------------------
+ 14 files changed, 430 insertions(+), 383 deletions(-)
+Merging random/master (93354d866ac4 prandom: remove next_pseudo_random32)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git random/master
+Auto-merging drivers/gpu/drm/i915/selftests/i915_gem.c
+Merge made by the 'ort' strategy.
+ drivers/media/test-drivers/vivid/vivid-vid-cap.c | 4 +++-
+ include/linux/prandom.h | 6 ------
+ 2 files changed, 3 insertions(+), 7 deletions(-)
+Merging landlock/next (d9dfd31d6c22 landlock: Add audit documentation)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git landlock/next
+Auto-merging MAINTAINERS
+Auto-merging include/linux/lsm_audit.h
+Auto-merging security/landlock/fs.c
+Auto-merging security/lsm_audit.c
+Merge made by the 'ort' strategy.
+ Documentation/admin-guide/LSM/index.rst | 1 +
+ Documentation/admin-guide/LSM/landlock.rst | 158 +++++++
+ Documentation/security/landlock.rst | 13 +-
+ Documentation/userspace-api/landlock.rst | 54 ++-
+ MAINTAINERS | 1 +
+ include/linux/lsm_audit.h | 8 +
+ include/uapi/linux/audit.h | 4 +-
+ include/uapi/linux/landlock.h | 33 ++
+ samples/landlock/sandboxer.c | 37 +-
+ security/landlock/.kunitconfig | 2 +
+ security/landlock/Makefile | 5 +
+ security/landlock/access.h | 23 +
+ security/landlock/audit.c | 519 +++++++++++++++++++++
+ security/landlock/audit.h | 77 +++
+ security/landlock/cred.c | 26 +-
+ security/landlock/cred.h | 89 +++-
+ security/landlock/domain.c | 264 +++++++++++
+ security/landlock/domain.h | 157 +++++++
+ security/landlock/fs.c | 279 +++++++++--
+ security/landlock/fs.h | 35 +-
+ security/landlock/id.c | 251 ++++++++++
+ security/landlock/id.h | 25 +
+ security/landlock/limits.h | 4 +
+ security/landlock/net.c | 74 ++-
+ security/landlock/ruleset.c | 33 +-
+ security/landlock/ruleset.h | 47 +-
+ security/landlock/setup.c | 2 +
+ security/landlock/syscalls.c | 72 ++-
+ security/landlock/task.c | 241 +++++++---
+ security/lsm_audit.c | 27 +-
+ tools/testing/kunit/configs/all_tests.config | 2 +
+ tools/testing/selftests/landlock/Makefile | 6 +-
+ tools/testing/selftests/landlock/audit.h | 425 +++++++++++++++++
+ tools/testing/selftests/landlock/audit_test.c | 460 ++++++++++++++++++
+ tools/testing/selftests/landlock/base_test.c | 84 +++-
+ tools/testing/selftests/landlock/common.h | 19 +
+ tools/testing/selftests/landlock/config | 1 +
+ tools/testing/selftests/landlock/fs_test.c | 455 ++++++++++++++++++
+ tools/testing/selftests/landlock/ptrace_test.c | 140 ++++++
+ .../selftests/landlock/scoped_abstract_unix_test.c | 121 +++++
+ .../testing/selftests/landlock/wait-pipe-sandbox.c | 131 ++++++
+ 41 files changed, 4151 insertions(+), 254 deletions(-)
+ create mode 100644 Documentation/admin-guide/LSM/landlock.rst
+ create mode 100644 security/landlock/audit.c
+ create mode 100644 security/landlock/audit.h
+ create mode 100644 security/landlock/domain.c
+ create mode 100644 security/landlock/domain.h
+ create mode 100644 security/landlock/id.c
+ create mode 100644 security/landlock/id.h
+ create mode 100644 tools/testing/selftests/landlock/audit.h
+ create mode 100644 tools/testing/selftests/landlock/audit_test.c
+ create mode 100644 tools/testing/selftests/landlock/wait-pipe-sandbox.c
+Merging rust/rust-next (cf25bc61f8ae MAINTAINERS: add entry for the `pin-init` crate)
+$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next
+Auto-merging Documentation/rust/testing.rst
+Auto-merging MAINTAINERS
+Auto-merging drivers/gpu/drm/drm_panic.c
+Auto-merging drivers/gpu/drm/drm_panic_qr.rs
+CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_panic_qr.rs
+Auto-merging drivers/net/phy/qt2025.rs
+Auto-merging lib/vsprintf.c
+Auto-merging rust/Makefile
+CONFLICT (content): Merge conflict in rust/Makefile
+Auto-merging rust/kernel/error.rs
+Auto-merging rust/kernel/init.rs
+CONFLICT (content): Merge conflict in rust/kernel/init.rs
+Auto-merging rust/kernel/lib.rs
+Auto-merging rust/kernel/task.rs
+Auto-merging rust/macros/module.rs
+Auto-merging rust/pin-init/src/macros.rs
+CONFLICT (content): Merge conflict in rust/pin-init/src/macros.rs
+Auto-merging samples/rust/rust_driver_faux.rs
+Auto-merging samples/rust/rust_driver_pci.rs
+Auto-merging scripts/Makefile.build
+Auto-merging scripts/generate_rust_analyzer.py
+CONFLICT (content): Merge conflict in scripts/generate_rust_analyzer.py
+Auto-merging scripts/rustdoc_test_gen.rs
+Resolved 'drivers/gpu/drm/drm_panic_qr.rs' using previous resolution.
+Recorded preimage for 'rust/Makefile'
+Recorded preimage for 'rust/kernel/init.rs'
+Recorded preimage for 'rust/pin-init/src/macros.rs'
+Recorded preimage for 'scripts/generate_rust_analyzer.py'
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+Recorded resolution for 'rust/Makefile'.
+Recorded resolution for 'rust/kernel/init.rs'.
+Recorded resolution for 'rust/pin-init/src/macros.rs'.
+Recorded resolution for 'scripts/generate_rust_analyzer.py'.
+[master 78e50241e00a] Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git
+$ git diff -M --stat --summary HEAD^..
+ Documentation/rust/coding-guidelines.rst | 8 +
+ Documentation/rust/testing.rst | 7 +
+ MAINTAINERS | 15 +
+ drivers/block/rnull.rs | 2 +-
+ drivers/gpu/drm/drm_panic.c | 5 -
+ drivers/gpu/drm/drm_panic_qr.rs | 13 +-
+ drivers/net/phy/ax88796b_rust.rs | 2 +-
+ drivers/net/phy/qt2025.rs | 2 +-
+ include/drm/drm_panic.h | 7 +
+ include/linux/sprintf.h | 3 +
+ lib/vsprintf.c | 3 -
+ rust/Makefile | 75 +-
+ rust/bindings/bindings_helper.h | 5 +
+ rust/kernel/alloc/allocator.rs | 1 +
+ rust/kernel/alloc/kbox.rs | 9 +-
+ rust/kernel/block/mq/tag_set.rs | 5 +-
+ rust/kernel/driver.rs | 6 +-
+ rust/kernel/error.rs | 123 +-
+ rust/kernel/fs/file.rs | 4 +-
+ rust/kernel/init.rs | 1461 ++-----------------
+ rust/kernel/lib.rs | 6 +-
+ rust/kernel/list.rs | 477 +++++--
+ rust/kernel/net/phy.rs | 4 +-
+ rust/kernel/pci.rs | 2 +-
+ rust/kernel/platform.rs | 2 +-
+ rust/kernel/prelude.rs | 8 +-
+ rust/kernel/print.rs | 10 +-
+ rust/kernel/rbtree.rs | 6 +-
+ rust/kernel/seq_file.rs | 2 +-
+ rust/kernel/sync/arc.rs | 68 +-
+ rust/kernel/sync/condvar.rs | 6 +-
+ rust/kernel/sync/lock.rs | 4 +-
+ rust/kernel/sync/lock/mutex.rs | 2 +-
+ rust/kernel/sync/lock/spinlock.rs | 2 +-
+ rust/kernel/sync/poll.rs | 4 +-
+ rust/kernel/task.rs | 2 +-
+ rust/kernel/types.rs | 23 +-
+ rust/macros/export.rs | 29 +
+ rust/macros/helpers.rs | 153 +-
+ rust/macros/lib.rs | 154 +-
+ rust/macros/module.rs | 10 +-
+ rust/macros/quote.rs | 28 +-
+ rust/pin-init/CONTRIBUTING.md | 72 +
+ rust/pin-init/README.md | 228 +++
+ rust/pin-init/examples/big_struct_in_place.rs | 39 +
+ rust/pin-init/examples/error.rs | 27 +
+ rust/pin-init/examples/linked_list.rs | 161 +++
+ rust/pin-init/examples/mutex.rs | 209 +++
+ rust/pin-init/examples/pthread_mutex.rs | 178 +++
+ rust/pin-init/examples/static_init.rs | 122 ++
+ rust/pin-init/internal/src/helpers.rs | 152 ++
+ rust/pin-init/internal/src/lib.rs | 48 +
+ rust/{macros => pin-init/internal/src}/pin_data.rs | 7 +-
+ .../internal/src}/pinned_drop.rs | 7 +-
+ rust/{macros => pin-init/internal/src}/zeroable.rs | 11 +-
+ rust/{kernel/init => pin-init/src}/__internal.rs | 46 +-
+ rust/pin-init/src/alloc.rs | 158 +++
+ rust/pin-init/src/lib.rs | 1486 ++++++++++++++++++++
+ rust/{kernel/init => pin-init/src}/macros.rs | 129 +-
+ samples/rust/rust_driver_faux.rs | 2 +-
+ samples/rust/rust_driver_pci.rs | 2 +-
+ samples/rust/rust_driver_platform.rs | 2 +-
+ samples/rust/rust_minimal.rs | 2 +-
+ samples/rust/rust_misc_device.rs | 2 +-
+ samples/rust/rust_print_main.rs | 2 +-
+ scripts/Makefile.build | 2 +-
+ scripts/generate_rust_analyzer.py | 15 +
+ scripts/rustdoc_test_gen.rs | 8 +-
+ 68 files changed, 4027 insertions(+), 1848 deletions(-)
+ create mode 100644 rust/macros/export.rs
+ create mode 100644 rust/pin-init/CONTRIBUTING.md
+ create mode 100644 rust/pin-init/README.md
+ create mode 100644 rust/pin-init/examples/big_struct_in_place.rs
+ create mode 100644 rust/pin-init/examples/error.rs
+ create mode 100644 rust/pin-init/examples/linked_list.rs
+ create mode 100644 rust/pin-init/examples/mutex.rs
+ create mode 100644 rust/pin-init/examples/pthread_mutex.rs
+ create mode 100644 rust/pin-init/examples/static_init.rs
+ create mode 100644 rust/pin-init/internal/src/helpers.rs
+ create mode 100644 rust/pin-init/internal/src/lib.rs
+ rename rust/{macros => pin-init/internal/src}/pin_data.rs (97%)
+ rename rust/{macros => pin-init/internal/src}/pinned_drop.rs (92%)
+ rename rust/{macros => pin-init/internal/src}/zeroable.rs (88%)
+ rename rust/{kernel/init => pin-init/src}/__internal.rs (84%)
+ create mode 100644 rust/pin-init/src/alloc.rs
+ create mode 100644 rust/pin-init/src/lib.rs
+ rename rust/{kernel/init => pin-init/src}/macros.rs (92%)
+$ git am -3 ../patches/0001-fix-up-for-rust-init-fix-Zeroable-implementation-for.patch
+Applying: fix up for "rust: init: fix `Zeroable` implementation for `Option<NonNull<T>>` and `Option<KBox<T>>`"
+$ git reset HEAD^
+Unstaged changes after reset:
+M rust/pin-init/src/lib.rs
+$ git add -A .
+$ git commit -v -a --amend
+[master e8c1764b0776] Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git
+ Date: Mon Mar 17 21:10:08 2025 +1100
+$ git reset --hard HEAD^
+HEAD is now at fc541ffd9c83 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git
+Merging next-20250314 version of rust
+$ git merge -m next-20250314/rust ab2ebb7bc9d9af2f50b0ad54deb65e1d0b01bc70
+Auto-merging Documentation/rust/testing.rst
+Auto-merging MAINTAINERS
+Auto-merging drivers/gpu/drm/drm_panic.c
+Auto-merging drivers/gpu/drm/drm_panic_qr.rs
+CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_panic_qr.rs
+Auto-merging drivers/net/phy/qt2025.rs
+Auto-merging lib/vsprintf.c
+Auto-merging rust/kernel/task.rs
+Auto-merging rust/macros/module.rs
+Auto-merging samples/rust/rust_driver_faux.rs
+Auto-merging samples/rust/rust_driver_pci.rs
+Auto-merging scripts/rustdoc_test_gen.rs
+Resolved 'drivers/gpu/drm/drm_panic_qr.rs' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 03cc8b457d88] next-20250314/rust
+$ git diff -M --stat --summary HEAD^..
+ Documentation/rust/coding-guidelines.rst | 8 +
+ Documentation/rust/testing.rst | 7 +
+ MAINTAINERS | 2 +
+ drivers/block/rnull.rs | 2 +-
+ drivers/gpu/drm/drm_panic.c | 5 -
+ drivers/gpu/drm/drm_panic_qr.rs | 13 +-
+ drivers/net/phy/ax88796b_rust.rs | 2 +-
+ drivers/net/phy/qt2025.rs | 2 +-
+ include/drm/drm_panic.h | 7 +
+ include/linux/sprintf.h | 3 +
+ lib/vsprintf.c | 3 -
+ rust/bindings/bindings_helper.h | 5 +
+ rust/kernel/alloc/allocator.rs | 1 +
+ rust/kernel/fs/file.rs | 4 +-
+ rust/kernel/list.rs | 475 +++++++++++++++++++++++++------
+ rust/kernel/net/phy.rs | 4 +-
+ rust/kernel/pci.rs | 2 +-
+ rust/kernel/platform.rs | 2 +-
+ rust/kernel/prelude.rs | 2 +-
+ rust/kernel/print.rs | 10 +-
+ rust/kernel/rbtree.rs | 6 +-
+ rust/kernel/seq_file.rs | 2 +-
+ rust/kernel/sync/poll.rs | 4 +-
+ rust/kernel/task.rs | 2 +-
+ rust/kernel/types.rs | 10 +-
+ rust/macros/export.rs | 29 ++
+ rust/macros/helpers.rs | 19 +-
+ rust/macros/lib.rs | 30 +-
+ rust/macros/module.rs | 8 +
+ rust/macros/quote.rs | 27 +-
+ samples/rust/rust_driver_faux.rs | 2 +-
+ samples/rust/rust_driver_pci.rs | 2 +-
+ samples/rust/rust_driver_platform.rs | 2 +-
+ samples/rust/rust_minimal.rs | 2 +-
+ samples/rust/rust_misc_device.rs | 2 +-
+ samples/rust/rust_print_main.rs | 2 +-
+ scripts/rustdoc_test_gen.rs | 8 +-
+ 37 files changed, 567 insertions(+), 149 deletions(-)
+ create mode 100644 rust/macros/export.rs
+Merging rust-alloc/alloc-next (80e54e84911a Linux 6.14-rc6)
+$ git merge -m Merge branch 'alloc-next' of https://github.com/Rust-for-Linux/linux.git rust-alloc/alloc-next
+Already up to date.
+Merging rust-hrtimer/hrtimer-next (15a3c03ca02b rust: hrtimer: add maintainer entry)
+$ git merge -m Merge branch 'hrtimer-next' of https://github.com/Rust-for-Linux/linux.git rust-hrtimer/hrtimer-next
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ MAINTAINERS | 15 ++
+ rust/kernel/alloc/kbox.rs | 6 +
+ rust/kernel/sync/arc.rs | 13 +-
+ rust/kernel/time.rs | 68 +++++
+ rust/kernel/time/hrtimer.rs | 517 ++++++++++++++++++++++++++++++++++++
+ rust/kernel/time/hrtimer/arc.rs | 100 +++++++
+ rust/kernel/time/hrtimer/pin.rs | 104 ++++++++
+ rust/kernel/time/hrtimer/pin_mut.rs | 108 ++++++++
+ rust/kernel/time/hrtimer/tbox.rs | 120 +++++++++
+ 9 files changed, 1049 insertions(+), 2 deletions(-)
+ create mode 100644 rust/kernel/time/hrtimer.rs
+ create mode 100644 rust/kernel/time/hrtimer/arc.rs
+ create mode 100644 rust/kernel/time/hrtimer/pin.rs
+ create mode 100644 rust/kernel/time/hrtimer/pin_mut.rs
+ create mode 100644 rust/kernel/time/hrtimer/tbox.rs
+Merging rust-pin-init/pin-init-next (7eb172143d55 Linux 6.14-rc5)
+$ git merge -m Merge branch 'pin-init-next' of https://github.com/Rust-for-Linux/linux.git rust-pin-init/pin-init-next
+Already up to date.
+Merging sysctl/sysctl-next (29fa7d793421 selftests/sysctl: fix wording of help messages)
+$ 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 fs/coredump.c
+Auto-merging fs/dcache.c
+Auto-merging fs/drop_caches.c
+Auto-merging include/linux/dcache.h
+Auto-merging include/linux/mm.h
+CONFLICT (content): Merge conflict in include/linux/mm.h
+Auto-merging include/linux/swap.h
+Auto-merging include/linux/vmstat.h
+Auto-merging include/linux/writeback.h
+Auto-merging kernel/sysctl.c
+CONFLICT (content): Merge conflict in kernel/sysctl.c
+Auto-merging mm/filemap.c
+CONFLICT (content): Merge conflict in mm/filemap.c
+Auto-merging mm/internal.h
+Auto-merging mm/mmap.c
+Auto-merging mm/nommu.c
+Auto-merging mm/swap.c
+Auto-merging mm/swap.h
+Auto-merging mm/util.c
+Auto-merging mm/vmscan.c
+Auto-merging mm/vmstat.c
+Resolved 'include/linux/mm.h' using previous resolution.
+Resolved 'kernel/sysctl.c' using previous resolution.
+Resolved 'mm/filemap.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master d5c9dc1171aa] Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl.git
+$ git diff -M --stat --summary HEAD^..
+ MAINTAINERS | 7 +-
+ arch/csky/abiv1/alignment.c | 2 +-
+ arch/sh/kernel/vsyscall/vsyscall.c | 21 +++
+ arch/x86/entry/vdso/vdso32-setup.c | 16 ++-
+ fs/coredump.c | 4 +-
+ fs/dcache.c | 21 ++-
+ fs/drop_caches.c | 23 +++-
+ fs/fs-writeback.c | 30 +++--
+ include/linux/dcache.h | 7 +-
+ include/linux/mm.h | 23 ----
+ include/linux/mman.h | 2 -
+ include/linux/swap.h | 9 --
+ include/linux/vmstat.h | 11 --
+ include/linux/writeback.h | 4 -
+ kernel/sysctl.c | 221 -------------------------------
+ mm/filemap.c | 18 ++-
+ mm/internal.h | 10 ++
+ mm/mmap.c | 54 ++++++++
+ mm/nommu.c | 15 ++-
+ mm/swap.c | 16 ++-
+ mm/swap.h | 1 +
+ mm/util.c | 67 ++++++++--
+ mm/vmscan.c | 23 ++++
+ mm/vmstat.c | 44 +++++-
+ net/sunrpc/auth.c | 2 +-
+ security/min_addr.c | 11 ++
+ tools/testing/selftests/sysctl/sysctl.sh | 10 +-
+ 27 files changed, 350 insertions(+), 322 deletions(-)
+Merging execve/for-next/execve (8d68cabeb1ff binfmt_elf_fdpic: fix variable set but not used warning)
+$ 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 arch/powerpc/kernel/fadump.c
+Auto-merging arch/powerpc/platforms/powernv/opal-core.c
+Auto-merging include/linux/kexec.h
+Merge made by the 'ort' strategy.
+ arch/powerpc/kernel/fadump.c | 2 +-
+ arch/powerpc/platforms/powernv/opal-core.c | 8 +--
+ arch/s390/kernel/crash_dump.c | 62 +++++++------------
+ fs/binfmt_elf.c | 21 +++----
+ fs/binfmt_elf_fdpic.c | 13 ++--
+ fs/exec.c | 2 -
+ fs/proc/kcore.c | 12 ++--
+ include/linux/binfmts.h | 2 +-
+ include/linux/kexec.h | 2 -
+ include/linux/vmcore_info.h | 3 +-
+ include/uapi/linux/elf.h | 99 ++++++++++++++++++++++++++++--
+ kernel/crash_core.c | 2 +-
+ 12 files changed, 148 insertions(+), 80 deletions(-)
+Merging bitmap/bitmap-for-next (e3f42c436d7e riscv: fix test_and_{set,clear}_bit ordering documentation)
+$ git merge -m Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git bitmap/bitmap-for-next
+Auto-merging MAINTAINERS
+Auto-merging arch/powerpc/xmon/xmon.c
+Auto-merging arch/s390/kernel/processor.c
+Auto-merging drivers/net/ethernet/ibm/ibmvnic.c
+Auto-merging drivers/net/virtio_net.c
+Auto-merging drivers/pci/controller/pci-hyperv.c
+Auto-merging drivers/scsi/lpfc/lpfc.h
+Auto-merging drivers/scsi/lpfc/lpfc_init.c
+Auto-merging rust/bindings/bindings_helper.h
+Merge made by the 'ort' strategy.
+ MAINTAINERS | 5 +++
+ arch/powerpc/xmon/xmon.c | 6 +---
+ arch/riscv/include/asm/bitops.h | 4 +--
+ arch/s390/kernel/processor.c | 2 +-
+ drivers/net/ethernet/ibm/ibmvnic.c | 18 ++++++----
+ drivers/net/virtio_net.c | 12 ++++---
+ drivers/pci/controller/pci-hyperv.c | 3 +-
+ drivers/scsi/lpfc/lpfc.h | 23 +++----------
+ drivers/scsi/lpfc/lpfc_init.c | 2 +-
+ include/linux/bitmap.h | 8 +++--
+ include/linux/bits.h | 2 +-
+ include/linux/cpumask.h | 69 ++++++++++++++++++++++++++-----------
+ include/linux/objpool.h | 7 ++--
+ include/uapi/linux/bits.h | 8 ++---
+ include/uapi/linux/const.h | 2 +-
+ kernel/padata.c | 2 +-
+ lib/cpumask.c | 37 ++------------------
+ lib/test_bitmap.c | 28 ---------------
+ rust/bindings/bindings_helper.h | 1 +
+ rust/helpers/cpumask.c | 45 ++++++++++++++++++++++++
+ rust/helpers/helpers.c | 1 +
+ tools/include/linux/bits.h | 2 +-
+ tools/include/uapi/linux/const.h | 2 +-
+ 23 files changed, 146 insertions(+), 143 deletions(-)
+ create mode 100644 rust/helpers/cpumask.c
+Merging hte/for-next (9e4259716f60 hte: tegra-194: add missing MODULE_DESCRIPTION() macro)
+$ 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 (78ab93c78fb3 Merge branch 'for-next/hardening' into for-next/kspp)
+$ 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 Documentation/admin-guide/kernel-parameters.txt
+Auto-merging MAINTAINERS
+Auto-merging arch/x86/Makefile
+Auto-merging drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h
+Auto-merging include/linux/compiler.h
+Auto-merging include/linux/compiler_types.h
+Auto-merging init/Kconfig
+Auto-merging lib/Kconfig.debug
+Auto-merging lib/Makefile
+CONFLICT (content): Merge conflict in lib/Makefile
+Auto-merging scripts/Makefile.lib
+Auto-merging security/Kconfig
+Resolved 'lib/Makefile' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 234accbb9be0] 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/admin-guide/kernel-parameters.txt | 4 +-
+ Documentation/core-api/printk-formats.rst | 4 +-
+ Documentation/dev-tools/kselftest.rst | 2 +-
+ MAINTAINERS | 25 +-
+ arch/x86/Makefile | 4 +-
+ arch/x86/coco/tdx/tdx.c | 4 +-
+ drivers/message/fusion/mptsas.c | 8 +-
+ drivers/scsi/mpi3mr/mpi3mr_transport.c | 8 +-
+ drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h | 2 +-
+ drivers/scsi/mpt3sas/mpt3sas_transport.c | 8 +-
+ drivers/scsi/qla2xxx/qla_mr.h | 4 +-
+ fs/unicode/Kconfig | 5 +-
+ fs/unicode/Makefile | 2 +-
+ fs/unicode/tests/.kunitconfig | 3 +
+ fs/unicode/{utf8-selftest.c => tests/utf8_kunit.c} | 151 ++++---
+ fs/unicode/utf8-norm.c | 2 +-
+ include/linux/compiler.h | 18 +-
+ include/linux/compiler_types.h | 23 +-
+ include/linux/string.h | 16 +-
+ include/linux/string_choices.h | 24 +-
+ include/linux/thread_info.h | 48 ---
+ include/linux/uaccess.h | 2 +-
+ include/linux/ucopysize.h | 63 +++
+ include/linux/uio.h | 2 +-
+ include/uapi/linux/nilfs2_ondisk.h | 3 +-
+ include/uapi/linux/stddef.h | 6 +
+ init/Kconfig | 3 +
+ kernel/configs/hardening.config | 2 +-
+ lib/Kconfig.debug | 78 +++-
+ lib/Kconfig.ubsan | 23 +-
+ lib/Makefile | 44 +-
+ lib/math/Makefile | 5 +-
+ lib/math/prime_numbers.c | 91 +----
+ lib/math/prime_numbers_private.h | 16 +
+ lib/math/tests/Makefile | 8 +-
+ lib/math/tests/gcd_kunit.c | 56 +++
+ lib/math/tests/int_log_kunit.c | 74 ++++
+ lib/math/tests/prime_numbers_kunit.c | 59 +++
+ .../{rational-test.c => tests/rational_kunit.c} | 0
+ lib/test_ubsan.c | 18 +-
+ lib/tests/Makefile | 43 ++
+ lib/{ => tests}/bitfield_kunit.c | 0
+ lib/{ => tests}/checksum_kunit.c | 0
+ lib/{ => tests}/cmdline_kunit.c | 0
+ lib/{ => tests}/cpumask_kunit.c | 0
+ lib/{ => tests}/crc_kunit.c | 0
+ lib/{ => tests}/fortify_kunit.c | 156 ++++---
+ lib/{ => tests}/hashtable_test.c | 0
+ lib/{ => tests}/is_signed_type_kunit.c | 0
+ lib/tests/kfifo_kunit.c | 224 ++++++++++
+ lib/{ => tests}/kunit_iov_iter.c | 0
+ lib/{ => tests}/list-test.c | 0
+ lib/{ => tests}/memcpy_kunit.c | 0
+ lib/{ => tests}/overflow_kunit.c | 38 +-
+ lib/{test_printf.c => tests/printf_kunit.c} | 450 +++++++++------------
+ lib/{test_scanf.c => tests/scanf_kunit.c} | 301 +++++++-------
+ lib/{ => tests}/siphash_kunit.c | 0
+ lib/{ => tests}/slub_kunit.c | 0
+ lib/{ => tests}/stackinit_kunit.c | 30 +-
+ lib/{ => tests}/string_helpers_kunit.c | 0
+ lib/{ => tests}/string_kunit.c | 4 +-
+ lib/{ => tests}/test_bits.c | 0
+ lib/{ => tests}/test_fprobe.c | 0
+ lib/{ => tests}/test_hash.c | 0
+ lib/{ => tests}/test_kprobes.c | 0
+ lib/{ => tests}/test_linear_ranges.c | 0
+ lib/{ => tests}/test_list_sort.c | 0
+ lib/{ => tests}/test_sort.c | 0
+ lib/{ => tests}/usercopy_kunit.c | 0
+ lib/{ => tests}/util_macros_kunit.c | 0
+ lib/ubsan.c | 28 +-
+ lib/ubsan.h | 8 +
+ mm/usercopy.c | 18 +-
+ .../{run-script-ask.inc => run-script-ask.sh} | 0
+ scripts/Makefile.clang | 2 +
+ scripts/Makefile.lib | 4 +-
+ scripts/Makefile.ubsan | 10 +-
+ scripts/integer-wrap-ignore.scl | 3 +
+ security/Kconfig | 21 -
+ security/Kconfig.hardening | 33 ++
+ security/loadpin/Kconfig | 2 +-
+ security/yama/yama_lsm.c | 9 +-
+ tools/testing/selftests/kselftest/module.sh | 2 +-
+ tools/testing/selftests/lib/Makefile | 2 +-
+ tools/testing/selftests/lib/config | 3 -
+ tools/testing/selftests/lib/prime_numbers.sh | 4 -
+ tools/testing/selftests/lib/printf.sh | 4 -
+ tools/testing/selftests/lib/scanf.sh | 4 -
+ 88 files changed, 1438 insertions(+), 883 deletions(-)
+ create mode 100644 fs/unicode/tests/.kunitconfig
+ rename fs/unicode/{utf8-selftest.c => tests/utf8_kunit.c} (63%)
+ create mode 100644 include/linux/ucopysize.h
+ create mode 100644 lib/math/prime_numbers_private.h
+ create mode 100644 lib/math/tests/gcd_kunit.c
+ create mode 100644 lib/math/tests/int_log_kunit.c
+ create mode 100644 lib/math/tests/prime_numbers_kunit.c
+ rename lib/math/{rational-test.c => tests/rational_kunit.c} (100%)
+ rename lib/{ => tests}/bitfield_kunit.c (100%)
+ rename lib/{ => tests}/checksum_kunit.c (100%)
+ rename lib/{ => tests}/cmdline_kunit.c (100%)
+ rename lib/{ => tests}/cpumask_kunit.c (100%)
+ rename lib/{ => tests}/crc_kunit.c (100%)
+ rename lib/{ => tests}/fortify_kunit.c (90%)
+ rename lib/{ => tests}/hashtable_test.c (100%)
+ rename lib/{ => tests}/is_signed_type_kunit.c (100%)
+ create mode 100644 lib/tests/kfifo_kunit.c
+ rename lib/{ => tests}/kunit_iov_iter.c (100%)
+ rename lib/{ => tests}/list-test.c (100%)
+ rename lib/{ => tests}/memcpy_kunit.c (100%)
+ rename lib/{ => tests}/overflow_kunit.c (96%)
+ rename lib/{test_printf.c => tests/printf_kunit.c} (71%)
+ rename lib/{test_scanf.c => tests/scanf_kunit.c} (76%)
+ rename lib/{ => tests}/siphash_kunit.c (100%)
+ rename lib/{ => tests}/slub_kunit.c (100%)
+ rename lib/{ => tests}/stackinit_kunit.c (95%)
+ rename lib/{ => tests}/string_helpers_kunit.c (100%)
+ rename lib/{ => tests}/string_kunit.c (99%)
+ rename lib/{ => tests}/test_bits.c (100%)
+ rename lib/{ => tests}/test_fprobe.c (100%)
+ rename lib/{ => tests}/test_hash.c (100%)
+ rename lib/{ => tests}/test_kprobes.c (100%)
+ rename lib/{ => tests}/test_linear_ranges.c (100%)
+ rename lib/{ => tests}/test_list_sort.c (100%)
+ rename lib/{ => tests}/test_sort.c (100%)
+ rename lib/{ => tests}/usercopy_kunit.c (100%)
+ rename lib/{ => tests}/util_macros_kunit.c (100%)
+ rename samples/check-exec/{run-script-ask.inc => run-script-ask.sh} (100%)
+ create mode 100644 scripts/integer-wrap-ignore.scl
+ delete mode 100755 tools/testing/selftests/lib/prime_numbers.sh
+ delete mode 100755 tools/testing/selftests/lib/printf.sh
+ delete mode 100755 tools/testing/selftests/lib/scanf.sh
+$ git am -3 ../patches/0001-fix-up-for-lib-Move-KUnit-tests-into-tests-subdirect.patch
+Applying: fix up for "lib: Move KUnit tests into tests/ subdirectory"
+$ git reset HEAD^
+Unstaged changes after reset:
+D lib/blackhole_dev_kunit.c
+M lib/tests/Makefile
+$ git add -A .
+$ git commit -v -a --amend
+[master 3c05da0690bb] Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git
+ Date: Mon Mar 17 22:22:03 2025 +1100
+$ git am -3 ../patches/0001-fix-up-2-for-lib-Move-KUnit-tests-into-tests-subdire.patch
+Applying: fix up 2 for "lib: Move KUnit tests into tests/ subdirectory"
+$ git reset HEAD^
+Unstaged changes after reset:
+D lib/longest_symbol_kunit.c
+M lib/tests/Makefile
+$ git add -A .
+$ git commit -v -a --amend
+[master 8d483b174d31] Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git
+ Date: Mon Mar 17 22:22:03 2025 +1100
+Merging nolibc/nolibc (a64dcfb451e2 Linux 6.14-rc2)
+$ 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 iommufd/for-next (a05df03a88bc iommufd: Fix uninitialized rc in iommufd_access_rw())
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd/for-next
+Merge made by the 'ort' strategy.
+ drivers/iommu/iommufd/device.c | 2 +-
+ drivers/iommu/iommufd/hw_pagetable.c | 3 +++
+ tools/testing/selftests/iommu/iommufd.c | 4 ++++
+ 3 files changed, 8 insertions(+), 1 deletion(-)
+Merging turbostat/next (447c98c1ca4a tools/power turbostat: Add idle governor statistics reporting)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git turbostat/next
+Auto-merging tools/power/x86/turbostat/turbostat.c
+Merge made by the 'ort' strategy.
+ tools/power/x86/turbostat/turbostat.8 | 5 ++
+ tools/power/x86/turbostat/turbostat.c | 92 +++++++++++++++++++++++++++--------
+ 2 files changed, 77 insertions(+), 20 deletions(-)
+Merging pwrseq/pwrseq/for-next (2014c95afece Linux 6.14-rc1)
+$ git merge -m Merge branch 'pwrseq/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git pwrseq/pwrseq/for-next
+Already up to date.
+Merging capabilities-next/caps-next (4ae89b1fe7c2 capability: Remove unused has_capability)
+$ git merge -m Merge branch 'caps-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sergeh/linux.git capabilities-next/caps-next
+Merge made by the 'ort' strategy.
+ include/linux/capability.h | 5 -----
+ kernel/capability.c | 16 ----------------
+ security/commoncap.c | 9 +++++----
+ 3 files changed, 5 insertions(+), 25 deletions(-)
+Merging ipe/next (aefadf03b3e3 ipe: policy_fs: fix kernel-doc warnings)
+$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/wufan/ipe.git ipe/next
+Merge made by the 'ort' strategy.
+ security/ipe/policy_fs.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+Merging kcsan/next (9d89551994a4 Linux 6.13-rc6)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/melver/linux.git kcsan/next
+Already up to date.
+Merging crc/crc-next (981b39dc6da6 lib/crc: remove unnecessary prompt for CONFIG_CRC64)
+$ git merge -m Merge branch 'crc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git crc/crc-next
+Auto-merging MAINTAINERS
+Auto-merging arch/parisc/configs/generic-64bit_defconfig
+Auto-merging arch/powerpc/configs/mpc885_ads_defconfig
+Auto-merging arch/riscv/Kconfig
+Auto-merging arch/s390/configs/debug_defconfig
+Auto-merging arch/s390/configs/defconfig
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/x86/crypto/aesni-intel_glue.c
+Auto-merging arch/x86/include/asm/cpufeatures.h
+Auto-merging arch/x86/kernel/cpu/intel.c
+Auto-merging arch/x86/lib/Makefile
+Auto-merging block/t10-pi.c
+Auto-merging crypto/Kconfig
+Auto-merging crypto/Makefile
+Auto-merging crypto/tcrypt.c
+Auto-merging crypto/testmgr.c
+Auto-merging crypto/testmgr.h
+Auto-merging drivers/infiniband/sw/siw/siw.h
+Auto-merging lib/Kconfig.debug
+Auto-merging lib/Makefile
+Merge made by the 'ort' strategy.
+ MAINTAINERS | 1 +
+ arch/arm/configs/dove_defconfig | 1 -
+ arch/arm/configs/ep93xx_defconfig | 1 -
+ arch/arm/configs/imx_v6_v7_defconfig | 2 -
+ arch/arm/configs/lpc18xx_defconfig | 1 -
+ arch/arm/configs/moxart_defconfig | 1 -
+ arch/arm/configs/multi_v5_defconfig | 1 -
+ arch/arm/configs/mvebu_v5_defconfig | 1 -
+ arch/arm/configs/mxs_defconfig | 1 -
+ arch/arm/configs/omap1_defconfig | 1 -
+ arch/arm/configs/omap2plus_defconfig | 2 -
+ arch/arm/configs/spitz_defconfig | 1 -
+ arch/arm/configs/stm32_defconfig | 1 -
+ arch/arm/configs/wpcm450_defconfig | 1 -
+ arch/arm/lib/crc-t10dif-glue.c | 6 -
+ arch/arm/lib/crc32-glue.c | 12 +-
+ arch/arm64/lib/crc-t10dif-glue.c | 6 -
+ arch/arm64/lib/crc32-glue.c | 10 +-
+ arch/hexagon/configs/comet_defconfig | 1 -
+ arch/loongarch/lib/crc32-loongarch.c | 6 +-
+ arch/mips/configs/bcm47xx_defconfig | 1 -
+ arch/mips/configs/bigsur_defconfig | 1 -
+ arch/mips/configs/cobalt_defconfig | 1 -
+ arch/mips/configs/db1xxx_defconfig | 1 -
+ arch/mips/configs/decstation_64_defconfig | 1 -
+ arch/mips/configs/decstation_defconfig | 1 -
+ arch/mips/configs/decstation_r4k_defconfig | 1 -
+ arch/mips/configs/fuloong2e_defconfig | 1 -
+ arch/mips/configs/ip32_defconfig | 1 -
+ arch/mips/configs/rt305x_defconfig | 1 -
+ arch/mips/configs/xway_defconfig | 1 -
+ arch/mips/lib/crc32-mips.c | 15 +-
+ arch/parisc/configs/generic-64bit_defconfig | 1 -
+ arch/powerpc/configs/85xx/ge_imp3a_defconfig | 1 -
+ arch/powerpc/configs/adder875_defconfig | 1 -
+ arch/powerpc/configs/ep88xc_defconfig | 1 -
+ arch/powerpc/configs/mpc866_ads_defconfig | 1 -
+ arch/powerpc/configs/mpc885_ads_defconfig | 1 -
+ arch/powerpc/configs/skiroot_defconfig | 1 -
+ arch/powerpc/configs/tqm8xx_defconfig | 1 -
+ arch/powerpc/lib/crc-t10dif-glue.c | 6 -
+ arch/powerpc/lib/crc32-glue.c | 10 +-
+ arch/riscv/Kconfig | 2 +
+ arch/riscv/lib/Makefile | 5 +
+ arch/riscv/lib/crc-clmul-consts.h | 122 +++++
+ arch/riscv/lib/crc-clmul-template.h | 265 +++++++++++
+ arch/riscv/lib/crc-clmul.h | 23 +
+ arch/riscv/lib/crc-t10dif.c | 24 +
+ arch/riscv/lib/crc16_msb.c | 18 +
+ arch/riscv/lib/crc32-riscv.c | 311 -------------
+ arch/riscv/lib/crc32.c | 53 +++
+ arch/riscv/lib/crc32_lsb.c | 18 +
+ arch/riscv/lib/crc32_msb.c | 18 +
+ arch/riscv/lib/crc64.c | 34 ++
+ arch/riscv/lib/crc64_lsb.c | 18 +
+ arch/riscv/lib/crc64_msb.c | 18 +
+ arch/s390/configs/debug_defconfig | 3 -
+ arch/s390/configs/defconfig | 3 -
+ arch/s390/lib/crc32-glue.c | 2 +-
+ arch/sh/configs/se7206_defconfig | 2 -
+ arch/sh/configs/sh2007_defconfig | 1 -
+ arch/sh/configs/titan_defconfig | 1 -
+ arch/sparc/configs/sparc32_defconfig | 1 -
+ arch/sparc/configs/sparc64_defconfig | 1 -
+ arch/sparc/lib/crc32_glue.c | 10 +-
+ arch/x86/Kconfig | 3 +-
+ arch/x86/crypto/aesni-intel_glue.c | 22 +-
+ arch/x86/include/asm/cpufeatures.h | 1 +
+ arch/x86/kernel/cpu/intel.c | 22 +
+ arch/x86/lib/Makefile | 5 +-
+ arch/x86/lib/crc-pclmul-consts.h | 195 ++++++++
+ arch/x86/lib/crc-pclmul-template.S | 589 +++++++++++++++++++++++++
+ arch/x86/lib/crc-pclmul-template.h | 81 ++++
+ arch/x86/lib/crc-t10dif-glue.c | 29 +-
+ arch/x86/lib/crc16-msb-pclmul.S | 6 +
+ arch/x86/lib/crc32-glue.c | 57 +--
+ arch/x86/lib/crc32-pclmul.S | 219 +--------
+ arch/x86/lib/crc64-glue.c | 50 +++
+ arch/x86/lib/crc64-pclmul.S | 7 +
+ arch/x86/lib/crct10dif-pcl-asm_64.S | 332 --------------
+ block/Kconfig | 2 +-
+ block/t10-pi.c | 2 +-
+ crypto/Kconfig | 20 -
+ crypto/Makefile | 3 -
+ crypto/crc32c_generic.c | 8 +-
+ crypto/crc64_rocksoft_generic.c | 89 ----
+ crypto/crct10dif_generic.c | 168 -------
+ crypto/tcrypt.c | 8 -
+ crypto/testmgr.c | 14 -
+ crypto/testmgr.h | 303 -------------
+ drivers/crypto/stm32/stm32-crc32.c | 2 +-
+ drivers/infiniband/sw/siw/siw.h | 4 +-
+ drivers/md/raid5-cache.c | 31 +-
+ drivers/md/raid5-ppl.c | 16 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c | 2 +-
+ drivers/thunderbolt/ctl.c | 2 +-
+ drivers/thunderbolt/eeprom.c | 2 +-
+ include/linux/crc-t10dif.h | 12 -
+ include/linux/crc32.h | 55 ++-
+ include/linux/crc32c.h | 8 -
+ include/linux/crc64.h | 38 +-
+ include/linux/crc7.h | 7 -
+ include/net/sctp/checksum.h | 7 +-
+ lib/Kconfig | 45 +-
+ lib/Kconfig.debug | 1 +
+ lib/Makefile | 1 -
+ lib/crc32.c | 21 +-
+ lib/crc64-rocksoft.c | 126 ------
+ lib/crc64.c | 49 +-
+ lib/crc7.c | 6 +-
+ lib/gen_crc64table.c | 10 +-
+ lib/tests/crc_kunit.c | 68 ++-
+ scripts/gen-crc-consts.py | 291 ++++++++++++
+ sound/soc/codecs/aw88395/aw88395_device.c | 2 +-
+ tools/testing/selftests/arm64/fp/kernel-test.c | 1 -
+ 115 files changed, 2133 insertions(+), 1969 deletions(-)
+ create mode 100644 arch/riscv/lib/crc-clmul-consts.h
+ create mode 100644 arch/riscv/lib/crc-clmul-template.h
+ create mode 100644 arch/riscv/lib/crc-clmul.h
+ create mode 100644 arch/riscv/lib/crc-t10dif.c
+ create mode 100644 arch/riscv/lib/crc16_msb.c
+ delete mode 100644 arch/riscv/lib/crc32-riscv.c
+ create mode 100644 arch/riscv/lib/crc32.c
+ create mode 100644 arch/riscv/lib/crc32_lsb.c
+ create mode 100644 arch/riscv/lib/crc32_msb.c
+ create mode 100644 arch/riscv/lib/crc64.c
+ create mode 100644 arch/riscv/lib/crc64_lsb.c
+ create mode 100644 arch/riscv/lib/crc64_msb.c
+ create mode 100644 arch/x86/lib/crc-pclmul-consts.h
+ create mode 100644 arch/x86/lib/crc-pclmul-template.S
+ create mode 100644 arch/x86/lib/crc-pclmul-template.h
+ create mode 100644 arch/x86/lib/crc16-msb-pclmul.S
+ create mode 100644 arch/x86/lib/crc64-glue.c
+ create mode 100644 arch/x86/lib/crc64-pclmul.S
+ delete mode 100644 arch/x86/lib/crct10dif-pcl-asm_64.S
+ delete mode 100644 crypto/crc64_rocksoft_generic.c
+ delete mode 100644 crypto/crct10dif_generic.c
+ delete mode 100644 lib/crc64-rocksoft.c
+ create mode 100755 scripts/gen-crc-consts.py
+Merging kthread/for-next (d8b4bf4ea04d kthread: modify kernel-doc function name to match code)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks.git kthread/for-next
+Already up to date.
+$ git am -3 ../patches/0001-Revert-pidfs-ensure-that-PIDFS_INFO_EXIT-is-availabl.patch
+Applying: Revert "pidfs: ensure that PIDFS_INFO_EXIT is available"
diff --git a/localversion-next b/localversion-next
new file mode 100644
index 0000000000000..c640d65be2bf7
--- /dev/null
+++ b/localversion-next
@@ -0,0 +1 @@
+-next-20250317
--
GitLab