diff options
| author | Mark Brown <broonie@kernel.org> | 2023-04-27 16:07:10 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-04-27 16:07:10 +0100 |
| commit | 84e2893b4573da3bc0c9f24e2005442e420e3831 (patch) | |
| tree | 190356bfd30b4e178cc9c2580143b4ad99e58890 | |
| parent | 8212e02c7ff65fd11f0dd2b879551f8e2b2bd126 (diff) | |
| download | linux-next-20230427.tar.gz linux-next-20230427.tar.xz | |
Add linux-next specific files for 20230427next-20230427
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | Next/SHA1s | 360 | ||||
| -rw-r--r-- | Next/Trees | 362 | ||||
| -rw-r--r-- | Next/merge.log | 12770 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 13493 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..22682c341407 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,360 @@ +Name SHA1 +---- ---- +origin 6e98b09da931a00bf4e0477d0fa52748bf28fcce +fixes 1c23f9e627a7b412978b4e852793c5e3c3efc555 +mm-hotfixes f9b0a629ef58ac5b993100d65cfe664ff9e31b0e +kbuild-current 9cedc5e89a59da72bfecdb76bfaa5a28a273029d +arc-current 30a0b95b1335e12efef89dd78518ed3e4a71a763 +arm-current c76c6c4ecbec0deb56a4f9e932b26866024a508f +arm64-fixes 32d85999680601d01b2a36713c9ffd7397c8688b +arm-soc-fixes d75eecc3d170d8963ae554a774b8af1f4e1246da +davinci-current fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +drivers-memory-fixes fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +tee-fixes ceaa837f96adb69c0df0397937cd74991d5d821a +m68k-current aaee8c7f2a17d2dd015dc97c113c9ea0cc97272a +powerpc-fixes b277fc793daf258877b4c0744b52f69d6e6ba22e +s390-fixes f9bbf25e7b2b74b52b2f269216a92657774f239c +sparc 2d2b17d08bfc3d98cf93622e8c6543eaaf02dabe +fscrypt-current 4bcf6f827a79c59806c695dc280e763c5b6a6813 +fsverity-current a075bacde257f755bea0e53400c9f1cdd1b8e8e6 +net 075cafffce2429dfa0085c98162657e88d11aa1d +bpf 2b5fdc0f5caa505afe34d608e2eefadadf2ee67a +ipsec ec8f32ad9a65a8cbb465b69e154aaec9d2fe45c4 +netfilter 7fb0269720d7d5359bc8349eef908a1c96866b65 +ipvs 73db1b8f2bb6725b7391e85aab41fdf592b3c0c1 +wireless 50749f2dd6854a41830996ad302aef2ffaf011d8 +wpan bd4e3d82f4ccb422672029b099e402e5b3acd5ee +rdma-fixes aca3b0fa3d04b40c96934d86cc224cccfa7ea8e0 +sound-current 2ae147d643d326f74d93ba4f72a405f25f2677ea +sound-asoc-fixes 377171af728ed66c5f116a27dd59834275f4e3a2 +regmap-fixes eeac8ede17557680855031c6f305ece2378af326 +regulator-fixes 7c7504067c709905fc188c61ac3072d6022d1209 +spi-fixes cb1499966178ee8987dfba8258ba67c062186b2d +pci-current 0d21e71a91debc87e88437a2cf9c6f34f8bf012f +driver-core.current 7e364e56293bb98cae1b55fd835f5991c4e96e7d +tty.current 09a9639e56c01c7a00d6c0ca63f4c7c41abe075d +usb.current 09a9639e56c01c7a00d6c0ca63f4c7c41abe075d +usb-serial-fixes 09a9639e56c01c7a00d6c0ca63f4c7c41abe075d +phy fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +staging.current eeac8ede17557680855031c6f305ece2378af326 +iio-fixes abfb5b9bedb49fa73a67c7a9f360ad4e3d3d21fd +counter-current 6a8f57ae2eb07ab39a6f0ccad60c760743051026 +char-misc.current a042d7feae7eff98a9ad5a9de5004e60883a96d3 +soundwire-fixes fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +thunderbolt-fixes 457391b0380335d5e9a5babdec90ac53928b23b4 +input-current 5dc63e56a9cf8df0b59c234a505a1653f1bdf885 +crypto-current 482c84e906e535072c55395acabd3a58e9443d12 +vfio-fixes 4928f67bc911e46a43004251a4d7eb2259ba6077 +kselftest-fixes f1594bc676579133a3cd906d7d27733289edfb86 +modules-fixes f412eef03938d3a40d4f6f5a79d0f98ed89b596d +dmaengine-fixes d9503be5a100c553731c0e8a82c7b4201e8a970c +backlight-fixes 88603b6dc419445847923fcb7fe5080067a30f98 +mtd-fixes 93942b70461574ca7fc3d91494ca89b16a4c64c7 +mfd-fixes 88603b6dc419445847923fcb7fe5080067a30f98 +v4l-dvb-fixes 8df08ba4a331ec1e6ecca584baffe96de9781be1 +reset-fixes 3a2390c6777e3f6662980c6cfc25cafe9e4fef98 +mips-fixes 6dcbd0a69c84a8ae7a442840a8cf6b1379dc8f16 +at91-fixes fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +omap-fixes 2a906db2824b75444982f5e9df870106982afca8 +kvm-fixes 265b97cbc22e0f67f79a71443b60dc1237ca5ee6 +kvms390-fixes 21f27df854008b86349a203bf97fef79bb11f53e +hwmon-fixes 0c072385348e3ac5229145644055d3e2afb5b3db +nvdimm-fixes c91d713630848460de8669e6570307b7e559863b +cxl-fixes c841ecd8277154c9297dd9ac959494f6deb61e76 +btrfs-fixes 5025cc87462ef0475fc4259a1b107566512eea2f +vfs-fixes 609d54441493c99f21c1823dfd66fa7f4c512ff4 +dma-mapping-fixes bbb73a103fbbed6f63cb738d3783261c4241b4b2 +drivers-x86-fixes 9a469c6dfab38326f99f105386db84230be09ee3 +samsung-krzk-fixes fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +pinctrl-samsung-fixes fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +devicetree-fixes 1a50d9403fb90cbe4dea0ec9fd0351d2ecbd8924 +dt-krzk-fixes fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +scsi-fixes c8e22b7a1694bb8d025ea636816472739d859145 +drm-fixes 00a4bd000e78a3a898e60bdc13e2852c8044a38c +drm-intel-fixes 457391b0380335d5e9a5babdec90ac53928b23b4 +mmc-fixes 4b6d621c9d859ff89e68cebf6178652592676013 +rtc-fixes 08279468a294d8c996a657ecc9e51bd5c084c75d +gnss-fixes 1b929c02afd37871d5afb9d498426f83432e71c2 +hyperv-fixes f8acb24aaf89fc46cd953229462ea8abe31b395f +soc-fsl-fixes 4b0986a3613c92f4ec1bdc7f60ec66fea135991f +risc-v-fixes 1b50f956c8fe9082bdee4a9cfd798149c52f7043 +riscv-dt-fixes 8056dc043d7f74d7675d413cb3dc4fa290609922 +riscv-soc-fixes fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +fpga-fixes dc70eb868b9cd2ca01313e5a394e6ea001d513e9 +spdx fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +gpio-brgl-fixes 2ce987d7eeb168b749494694ae3666de87fc356e +gpio-intel-fixes fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +pinctrl-intel-fixes fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +erofs-fixes 3993f4f456309580445bb515fbc609d995b6a3ae +kunit-fixes fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +ubifs-fixes 2241ab53cbb5cdb08a6b2d4688feb13971058f65 +memblock-fixes 647037adcad00f2bab8828d3d41cd0553d41f3bd +nfsd-fixes d51425190805d47aecc1910b272e65476dd3b937 +irqchip-fixes 6c9f7434159b96231f5b27ab938f4766e3586b48 +renesas-fixes ab2866f12ca18747413ba41409231d44e0c6149b +broadcom-fixes 9abf2313adc1ca1b6180c508c25f22f9395cc780 +perf-current 5b201a82cd9d0945d70562974ea6ad8e3b1861b5 +efi-fixes 0b1d9debe30304f35c1211e6dcdca1935ce67240 +zstd-fixes 6906598f1ce93761716d780b6e3f171e13f0f4ce +battery-fixes 06615d11cc78162dfd5116efb71f29eb29502d37 +uml-fixes a3046a618a284579d1189af8711765f553eed707 +asahi-soc-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +iommufd-fixes 13a0d1ae7ee6b438f5537711a8c60cba00554943 +rust-fixes d966c3cab924fb750fefef11e77a6fa07dd5420e +v9fs-fixes ccd58b45e607eee3caa689bae9c1971c7403ce31 +drm-misc-fixes 0d68683838f2850dd8ff31f1121e05bfb7a2def0 +mm-stable f0ca8c25256dd22737db5780e33e2809ce297625 +mm-nonmm-stable 22ba509dd4dad053ad88fc387b5a74c2a9296a01 +mm 25aab2ea365fe6a262d3ac5b3d8c79e69159afc6 +kbuild 9892bd72efdc9daa7c07ca9f427ac7e5928c7704 +clang-format 781121a7f6d11d7cae44982f174ea82adeec7db0 +perf d1efa4a0a696e487f349f837f53a0db88f8f0d74 +compiler-attributes eeac8ede17557680855031c6f305ece2378af326 +dma-mapping ec274aff21b6a94c7973384ca80a503c1bc3b173 +asm-generic 5e98654e30e18bb33d21b773b75fd68fcf673bae +arc f2906aa863381afb0015a9eb7fefad885d4e5a56 +arm 60261442c1b91d9e0cdc611222034286aeb18946 +arm64 4e8f6e44bce8da3b0e2df37b12839f4bc9c9cabe +arm-perf 257aedb72e731082ab514058e57b132f0b29d707 +arm-soc 8ecfe9a0e657e78ad5187f7142418f7631458ded +amlogic ae68fb187b59bc8645974320808ab2d7c41b1833 +asahi-soc f41aba1578192bf08a82d741e001a7c01907c9cb +aspeed 7d4f0b0df7c5ec0cec834f87591423a7bbd1bab2 +at91 ad5125686a4f16ecf73cb8795329e195efd0d2b7 +broadcom 89ec1caa5e4a144a78c57b35e3c6fae8291b3454 +davinci fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +drivers-memory 3ec0e1ea4770e40575bfb2bb4e9ebbbaa3c80d3f +imx-mxs 159d28f66699094d3b9dd65a621ae7834d3f8134 +mediatek e586dd4471725f33b002316c9bc2d88b283f028e +mvebu 12845aa04754ae39a40b730b7f58bc11ac98e8fa +omap c45167f4f5cfdfaddbae941545187906e8658c5f +qcom 8358703a007eacc48b007284f29c0df2b694b513 +renesas 6f03a6e4e947dd4a5bc4ed681fc586098fd389f3 +reset 1b929c02afd37871d5afb9d498426f83432e71c2 +rockchip fcda20d5c0d00e4ffd4cf54b07e32a03e5a448a3 +samsung-krzk f5391a4705ef361309e2e6b8abc568b11d344bb9 +scmi ed0a3b4a31ee672aaf88afb7af082052b4636250 +stm32 49f1d0b65f87692a11386a8b8cd3a4aa3a1d0daa +sunxi 7081db38231a48b1ff590d9d16dfa06c1f8d148f +tee cf1773f935d8f32938ede6a4fdf54c75dd7d534a +tegra 7947eeb21f00599b19b4fcf9c280c71f3b4a2c12 +ti a8fccb83f3e25d2412c6a6557b146ac9a6dce770 +xilinx ec1696c3440f1abb40f87ef998405515464188af +clk a9863979fbc25838bbe7c5badf538cedfc802f60 +clk-imx 8a05f5cccdbe851265bf513643ada48c26b1267f +clk-renesas 5e96c2e0e88d3617477313b071cf199bfc29d794 +clk-samsung b35f27fe73d8c86fe40125e063b28007e961b862 +csky 1f62ed00a56bf01becaccd81bf30f2fcb0322fd2 +loongarch b5533e990dd1de5872a34cba2f4f7f508c9b2ec3 +m68k aaee8c7f2a17d2dd015dc97c113c9ea0cc97272a +m68knommu 8ab89e9563161921ffc86724eb3217d228eaad57 +microblaze fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +mips 46e614cc91f7bd6f7872e434e6bcfda44454aac3 +openrisc c91b4a07655d5ba67962a08dfac8bd7f45ad049c +parisc-hd 9520b7fc7e14bec3dc60f3248de5c73c40ec9db9 +powerpc 169f8997968ab620d750d9a45e15c5288d498356 +soc-fsl 4b0986a3613c92f4ec1bdc7f60ec66fea135991f +risc-v b09313dd2e726fe5e1fa574cd73f5e326c6030a4 +riscv-dt 4cd4beb98fe5ac2c4bcb995ba6e82322be174abb +riscv-soc 4dd472bdafcb660bea17bc63a97d06e24fcb36ed +s390 de12921a166538a34801fd18fca166c4aeb76fa8 +sh e5c23bec0f121b4160dc8ca61e751e734652bd05 +uml 6032aca0deb9c138df122192f8ef02de1fdccf25 +xtensa e313de5b5b04176f28384b45ebebd552c0c7dae3 +pidfd 7bcf0b65b84af5e932f4f750f839ec7426f5e4ed +vfs-idmapping 4582b273464e41945b7a686f075bff3188178879 +fscrypt 83e57e47906ce0e99bd61c70fae514e69960d274 +fscache 0885eacdc81f920c3e0554d5615e69a66504a28d +afs 0a278bc196e784b4849c1581266421adbca1989f +btrfs 343d006c1aa06000f9c0b6d69aa9086b1b1862ce +ceph f7c4d9b133c7a04ca619355574e96b6abf209fba +cifs 390c90c2928a33f2632e9d668cd3b5b769c9b1e9 +configfs 77992f896745c63ae64bfccfdc429ab7b3d88da5 +ecryptfs a3d78fe3e1ae8c6a1901635c54a1a799656f72c8 +erofs 745ed7d77834048879bf24088c94e5a6462b613f +exfat fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +ext3 915f8bcf453030f4d6e271a76bb4f28697a668bc +ext4 519fe1bae7e20fc4e7f179d50b6102b49980e85d +f2fs b68ee1c6131c540a62ecd443be89c406401df091 +fsverity 04839139213cf60d4c5fc792214a08830e294ff8 +fuse c68ea140050e631d24d61b6e399ca8224a4a2219 +gfs2 644f6bf762fa903f64c59c2ec0f4d0d753527053 +jfs fad376fce0af58deebc5075b8539dc05bf639af3 +ksmbd 74d7970febf7e9005375aeda0df821d2edffc9f7 +nfs e8d018dd0257f744ca50a729e3d042cf2ec9da65 +nfs-anna e025f0a73f6acb920d86549b2177a5883535421d +nfsd aac77b7eb95a0730919d2ac697d69b32f7bcff2b +ntfs3 788ee1605c2e9feed39c3a749fb3e47c6e15c1b9 +orangefs 31720a2b109b3080eb77e97b8f6f50a27b4ae599 +overlayfs 4f11ada10d0ad3fd53e2bd67806351de63a4f9c3 +ubifs b5fda08ef213352ac2df7447611eb4d383cce929 +v9fs 4ec5183ec48656cec489c49f989c508b68b518e3 +v9fs-ericvh 4eb3117888a923f6b9b1ad2dd093641c49a63ae5 +xfs 9419092fb2630c30e4ffeb9ef61007ef0c61827a +zonefs 2b188a2cfc4d8f319ad23832ec1390bdae52daf6 +iomap 3fd41721cd5c30af37c860e6201c98db0a568fd2 +djw-vfs a79168a0c00d710420c1758f6c38df89e12f0763 +file-locks 63355b9884b3d1677de6bd1517cd2b8a9bf53978 +iversion 63355b9884b3d1677de6bd1517cd2b8a9bf53978 +vfs cff4b23c731a1cbdf39d5ce180196b8dffb6c411 +printk 16bff6f075a1055a0084c8a05fd4a0c4ab4b3607 +pci 09a8e5f01dfb30667a8f05e35c1cc073cb4fd134 +pstore 5239a89b06d6b199f133bf0ffea421683187f257 +hid d777b19c63562199b640fd5129e7916a5b7cd240 +i2c 08b891569dffcb7a9de977d5fe9784e299e13eb3 +i3c 2810f1de814adb7728b1068586bebcf733cf1992 +dmi 13a0ac816d22aa47d6c393f14a99f39e49b960df +hwmon-staging 1c19ac768b8eeb0304c4ed7db66c2bb89c6ad226 +jc_docs 0b656310bfc33c5e044df9cf6013df8280ec69cc +v4l-dvb 20af6be6bee4c3af80aac9b44b3d32d89824dde7 +v4l-dvb-next 423f331364bfbcd1212b78ac9052894ff5213ac9 +pm 704d7a52a540b6ab2f6cc6a0c10d3b9fe851a459 +cpufreq-arm cde3bb62bf56f34781c3a0e062630f1b7fe6d8c2 +cpupower 9f8acaf033b38f9b0784ae9bfaae2230114fe680 +devfreq 376b1446153ca67e7028e6b9555d9b17477f568b +opp 528f2d8d540a3c374d6b765c769620d91536b176 +thermal 2afa82d1fc648c8d4c2ef9e876626abb1089f9ab +dlm 7a40f1f18a88c6d43c8725d7f45146480a79fde1 +rdma 3e358ea8614ddfbc59ca7a3f5dff5dde2b350b2c +net-next 6e98b09da931a00bf4e0477d0fa52748bf28fcce +bpf-next 6e98b09da931a00bf4e0477d0fa52748bf28fcce +ipsec-next f4796398f21b9844017a2dac883b1dd6ad6edd60 +mlx5-next 77f7eb9f3416aace703971156133926e44e2195b +netfilter-next 677fb7525331375ba2f90f4bc94a80b9b6e697a3 +ipvs-next 4774ad841bef97cc51df90195338c5b2573dd4cb +bluetooth d883a4669a1def6d121ccf5e64ad28260d1c9531 +wireless-next 3288ee5844b74cebb94ed15bc9b5b9d3223ae038 +wpan-next 1af3de62f03f651c5e50c0e00f8fed34d07b9df3 +mtd 7227aacb62aeb59b007a6d3489b11f78fa332696 +nand ec185b18c22323cb0cde0319fa90b3e467b1ed2d +spi-nor df6def86b9dcbc3e8ed4964c7b79b70c9b0c3040 +crypto 482c84e906e535072c55395acabd3a58e9443d12 +drm cf03e2956af307dc25e8c41fd4cffe44482a6ec1 +drm-misc a50be876f4fe2349dc8b056a49d87f69c944570f +amdgpu ef1543899a9cb6b13b887f5a5082c4e6f1a4cf78 +drm-intel d944eafed618a8507270b324ad9d5405bb7f0b3e +drm-tegra 2429b3c529da29d4277d519bd66d034842dcd70c +drm-msm ac7e7c9c65ecfb1fcc99de91cfd6b17a8d4cb9c1 +drm-msm-lumag ac7e7c9c65ecfb1fcc99de91cfd6b17a8d4cb9c1 +imx-drm 927d8fd465adbaaad6cce82f840d489d7c378f29 +etnaviv 4c22c61e429f004d84eba72d7195bccef33ea0ec +fbdev 60ed3cd85b95184936bce70ed7f9e76a6a54a5e1 +regmap 4a670ac3e75e517c96cbd01ef870dbd598c3ce71 +sound c51e431052e2eacfb23fbf6b39bc6c8770d9827a +ieee1394 02dc51a0a07a379539b4661ecb56eeb5b19b3928 +sound-asoc 377171af728ed66c5f116a27dd59834275f4e3a2 +modules 8660484ed1cf3261e89e0bad94c6395597e87599 +input c55d84fb2bd89fe2ad56768ead90eb1050581d29 +block d728076bbfacc67d1491a5387eb7d32f99d4d171 +device-mapper 38d11da522aacaa05898c734a1cec86f1e611129 +libata 140b26035b2d379d94e6e3936ab2e0adf94efe46 +pcmcia 15e74c6c1ce2d388e967f32cdaa83ca034fa6452 +mmc 22a4455e75be443fb80784175bb70f40ba6d0c52 +mfd 9e9ff39243ea8795a4833708613f884b39dc91f9 +backlight fb200218b40b7864f64f1a47de61e035d8934e92 +battery baba1315a74d12772d4940a05d58dc03e6ec0635 +regulator 43c75e470e5b56a992acb08474810e6822f0989c +security d82dcd9e21b77d338dc4875f3d4111f0db314a7c +apparmor 0bb84cff96af29d8531a1a2bee04e521cdfe35ce +integrity 644f17412f5acf01a19af9d04a921937a2bc86c6 +safesetid 64b634830c919979de4b18163e15d30df66e64a8 +selinux 4ce1f694eb5d8ca607fed8542d32a33b4f1217a5 +smack de93e515db306767549bb29a926f523ca2a601ab +tomoyo ecbb4441980e4315ded5f10d761909a5895e823a +tpmdd bd8621ca1510e6e802df9855bdc35a04a3cfa932 +watchdog 66efce1d099a67d9d0bf635a9815ec478bfbc8a2 +iommu e51b4198396cd715b140c0e8b259680429ff0cfb +audit fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +devicetree c50eb01940c75b848e0257cea3b521a6d4150c5d +dt-krzk 936f3b6478b7b044b3ac870bc125faa8a82d3c3b +mailbox 2a61e7b7bd92f4745457c60c86d8bf045d185bda +spi cb1499966178ee8987dfba8258ba67c062186b2d +tip 01cbd032298654fe4c85e153dd9a224e5bc10194 +clockevents 62a9488edfd7be490102ac6e5be3e8fcd7b0bde8 +edac d6c5e688899b09dc8c17c665c403cdc23de220f3 +irqchip 2ff1b0839ddd514be4752c64c1c6facf91ff3a56 +ftrace 3862f86c1529fa0016de6344eb974877b4cd3838 +rcu 523c1335f23e46be1df402cced7f62fb8fb9a480 +kvm 4f382a79a66b1a926e30f6d89295fc8fe2c4a86e +kvm-arm 74819ee73f1f33ac75ae955ce0397a25ab1ec2f8 +kvms390 8a46df7cd135fe576c18efa418cd1549e51f2732 +kvm-x86 5c291b93e5d665380dbecc6944973583f9565ee5 +xen-tip cbfac7707ba16619006a4fd60faac46303fd2f3e +percpu b9819165bb455bfdce37086c622a18cce2dd2f5e +workqueues 704bc669e1dda3eb8f6d5cb462b21e85558a3912 +drivers-x86 e578c943e363ff47d08e7b4f5648f3da9db325d8 +chrome-platform d184d60aa301e424cd0cf7de90b40744710a2417 +hsi 1b929c02afd37871d5afb9d498426f83432e71c2 +leds 1b929c02afd37871d5afb9d498426f83432e71c2 +leds-lj 36cd9fb5344675e9b9d9f96eabcb3cdfdbacc841 +ipmi d08076678ce72140a40553d226f90d189fbe06d1 +driver-core 046b6a171009e1ed9ede02194025e9ccd709beb2 +usb 8f40fc0808137c157dd408d2632e63bfca2aecdb +thunderbolt 1f15af76784cc902a1fe85e864c7ddf3d74b4130 +usb-serial a095edfc15f0832e046ae23964e249ef5c95af87 +tty 2b3174c96696cde676393474f0e01d0d108462f5 +char-misc 2025b2ca8004c04861903d076c67a73a0ec6dfca +accel afa351a15d80993f8ba6ae28652cc23127237e37 +coresight 18996a113f2567aef3057e300e3193ce2df1684c +fpga fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +icc b7590f3841f47d5c6732db9a6d6474162109f487 +iio 52cc189b4fc6af6accc45fe7b7053d76d8724059 +phy-next a0106132372120dd0abf5ad7636614e5aeb5da08 +soundwire 67572c8dc64412880b81d4bbc2f354dd5eddaa7d +extcon 4e30418def07f8359c7927d5815788043afbb482 +gnss 1b929c02afd37871d5afb9d498426f83432e71c2 +vfio 705b004ee377b789e39ae237519bab714297ac83 +staging 3fac2397f562eb669ddc2f45867a253f3fc26184 +counter-next cf3600f2913605052a37ef3e9917046ae13c41f9 +mux ea327624ae52936b2c0eccffd9369983ca2d08e3 +dmaengine f2dc327131b5cbb2cbb467cec23836f2e9d4cf46 +cgroup 5199604d1ee5513e1357e8cfe7243a36129b4ffb +scsi 6d010c8434271818494fa33fdc28368746520024 +scsi-mkp c5749639f2d0a1f6cbe187d05f70c2e7c544d748 +vhost c82729e06644f4e087f5ff0f91b8fb15e03b8890 +rpmsg fb967507b799cf9daa686bb4e0d8f6edef14bf96 +gpio e73f0f0ee7541171d89f2e2491130c7771ba58d3 +gpio-brgl 8a4adcf67a39b3f308bb8cf686e41c0e26aa12e8 +gpio-intel 782eea0c89f7d071d6b56ecfa1b8b0c81164b9be +pinctrl 79debe43aa8b118e9a95d36c984bf3c0863b7289 +pinctrl-intel fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +pinctrl-renesas 45e6cc8ef1cd8576707506a4eeffef858e4a1a83 +pinctrl-samsung fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +pwm 247ee6c780406513c6031a7f4ea41f1648b03295 +userns 05bd6e0242b4c059ec6797e3d721ecca6d15ff8d +ktest 7dc8e24f0e09834341f84d37433840b353d64bc8 +kselftest 50ad2fb7ec2b18186b8a4fa1c0e00f78b3de5119 +kunit fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +kunit-next a42077b787680cbc365a96446b30f32399fa3f6f +livepatching 5e36be5973b6ac66198220365bffb7a3641038f9 +rtc 0e6255fa3f649170da6bd1a544680589cfae1131 +nvdimm 305a72efa791c826fe84768ca55e31adc4113ea8 +at24 fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +ntb 942cc9ceccb6178b56bf712b94d76190d8759823 +seccomp 0fb0624b15d21622c214617fda5c05a203b04564 +fsi 35af9fb49bc5c6d61ef70b501c3a56fe161cce3e +slimbus fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +nvmem 3d1431431ce29536fe1ea174123e433fbfbb2323 +xarray 69cb69ea55420388b444ee30b1530ec15ab584f7 +hyperv a494aef23dfc732945cb42e22246a5c31174e4a5 +auxdisplay ddf75a86aba2cfb7ec4497e8692b60c8c8fe0ee7 +kgdb c1cb81429df462eca1b6ba615cddd21dd3103c46 +hmm fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +cfi 3123109284176b1532874591f7c81f3837bbdc17 +mhi 1d1493bdc25f498468a606a4ece947d155cfa3a9 +memblock 34875d6fc52d6dfafe2fc8840e1294bb118ea745 +cxl bfe58458fd2557c9a81b89bc0ff10eb03d6c0745 +zstd 2aa14b1ab2c41a4fe41efae80d58bb77da91f19f +efi 026b85796ab4d52af56f8a1c60d2613983ecd845 +unicode b500d6d7243d2e0807a39a09c52fbe668b59b2c1 +slab ed4cdfbeb8735c36a2e31009866dfc2dfa26db3f +random 512dee0c00ad9e9c7ae9f11fc6743702ea40caff +landlock ed35e2f2f0ded15df313ae6f8da21e85c8e1e493 +rust ea76e08f4d901a450619831a255e9e0a4c0ed162 +sysctl e3184de9d46c2eebdb776face2e2662c6733331d +execve 88603b6dc419445847923fcb7fe5080067a30f98 +bitmap 714f3af11b21b15d4bab91045928a8498bbbffa1 +hte ca3d1a4b419acad3fca6828884acb03614f7558b +kspp 78f7a3fd6dc66cb788c21d7705977ed13c879351 +kspp-gustavo 00168b415a60cec7558608efb4fc50f2a73daae2 +iommufd 62e37c86bf0718e1ec0156c7a88a43ced6cdf201 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..9ffd9d6126c9 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,362 @@ +Trees included into this release: + +Name Type Url +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master +fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#fixes +mm-hotfixes git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-hotfixes-unstable +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#fixes +arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current git git://git.armlinux.org.uk/~rmk/linux-arm.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 +tee-fixes git https://git.linaro.org/people/jens.wiklander/linux-tee.git#fixes +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +powerpc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes +s390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#fixes +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master +fscrypt-current git git://git.kernel.org/pub/scm/fs/fscrypt/linux.git#for-current +fsverity-current git git://git.kernel.org/pub/scm/fs/fsverity/linux.git#for-current +net git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git#main +bpf git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git#master +ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master +netfilter git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git#master +ipvs git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git#main +wireless git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git#for-next +wpan git git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan.git#master +rdma-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-rc +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus +sound-asoc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-linus +regmap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-linus +regulator-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-linus +spi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git#for-linus +driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-linus +tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus +usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus +usb-serial-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-linus +phy git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#fixes +staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus +iio-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#fixes-togreg +counter-current git git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git#counter-current +char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus +soundwire-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#fixes +thunderbolt-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#fixes +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master +vfio-fixes git git://github.com/awilliam/linux-vfio.git#for-linus +kselftest-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes +modules-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#modules-linus +dmaengine-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#fixes +backlight-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-fixes +mtd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/fixes +mfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-fixes +v4l-dvb-fixes git git://linuxtv.org/mchehab/media-next.git#fixes +reset-fixes git https://git.pengutronix.de/git/pza/linux#reset/fixes +mips-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-fixes +at91-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-fixes +omap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#fixes +kvm-fixes git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#master +kvms390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#master +hwmon-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon +nvdimm-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-fixes +cxl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#fixes +btrfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#next-fixes +vfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#fixes +dma-mapping-fixes git git://git.infradead.org/users/hch/dma-mapping.git#for-linus +drivers-x86-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#fixes +samsung-krzk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#fixes +pinctrl-samsung-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#fixes +devicetree-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#dt/linus +dt-krzk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git#fixes +scsi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#fixes +drm-fixes git git://git.freedesktop.org/git/drm/drm.git#drm-fixes +drm-intel-fixes git git://anongit.freedesktop.org/drm-intel#for-linux-next-fixes +mmc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#fixes +rtc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-fixes +gnss-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-linus +hyperv-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-fixes +soc-fsl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#fix +risc-v-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#fixes +riscv-dt-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-dt-fixes +riscv-soc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-soc-fixes +fpga-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git#fixes +spdx git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git#spdx-linus +gpio-brgl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-current +gpio-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#fixes +pinctrl-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#fixes +erofs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#fixes +kunit-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit-fixes +ubifs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#fixes +memblock-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#fixes +nfsd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#nfsd-fixes +irqchip-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-fixes +renesas-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#fixes +broadcom-fixes git https://github.com/Broadcom/stblinux.git#fixes +perf-current git git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git#perf/urgent +efi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#urgent +zstd-fixes git https://github.com/terrelln/linux.git#zstd-linus +battery-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#fixes +uml-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git#fixes +asahi-soc-fixes git https://github.com/AsahiLinux/linux.git#asahi-soc/fixes +iommufd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git#for-rc +rust-fixes git https://github.com/Rust-for-Linux/linux.git#rust-fixes +v9fs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#fixes/next +drm-misc-fixes git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next-fixes +mm-stable git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-stable +mm-nonmm-stable git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-nonmm-stable +mm git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-everything +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#for-next +clang-format git https://github.com/ojeda/linux.git#clang-format +perf git git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git#perf-tools-next +compiler-attributes git https://github.com/ojeda/linux.git#compiler-attributes +dma-mapping git git://git.infradead.org/users/hch/dma-mapping.git#for-next +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master +arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next +arm git git://git.armlinux.org.uk/~rmk/linux-arm.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/matthias.bgg/linux.git#for-next +mvebu git git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git#for-next +omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#for-next +qcom git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git#for-next +renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#next +reset git https://git.pengutronix.de/git/pza/linux#reset/next +rockchip git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next +samsung-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next +scmi git git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git#for-linux-next +stm32 git git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git#stm32-next +sunxi git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git#sunxi/for-next +tee git https://git.linaro.org/people/jens.wiklander/linux-tee.git#next +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next +ti git git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git#ti-next +xilinx git git://github.com/Xilinx/linux-xlnx.git#for-next +clk git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next +clk-imx git git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git#for-next +clk-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-clk +clk-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git#for-next +csky git git://github.com/c-sky/csky-linux.git#linux-next +loongarch git git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git#loongarch-next +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-next +openrisc git git://github.com/openrisc/linux.git#for-next +parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next +soc-fsl git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#next +risc-v git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#for-next +riscv-dt git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-dt-for-next +riscv-soc git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-soc-for-next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#for-next +sh git git:git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux.git#for-next +uml git git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git#next +xtensa git git://github.com/jcmvbkbc/linux-xtensa.git#xtensa-for-next +pidfd git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#for-next +vfs-idmapping git git://git.kernel.org/pub/scm/linux/kernel/git/vfs/idmapping.git#for-next +fscrypt git git://git.kernel.org/pub/scm/fs/fscrypt/linux.git#for-next +fscache git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#fscache-next +afs git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#afs-next +btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next +ceph git git://github.com/ceph/ceph-client.git#master +cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next +configfs git git://git.infradead.org/users/hch/configfs.git#for-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next +erofs git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#dev +exfat git git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git#dev +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/mszeredi/vfs.git#overlayfs-next +ubifs git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#next +v9fs git git://github.com/martinetd/linux#9p-next +v9fs-ericvh git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#ericvh/for-next +xfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#for-next +zonefs git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git#for-next +iomap git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#iomap-for-next +djw-vfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#vfs-for-next +file-locks git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#locks-next +iversion git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#iversion-next +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#for-next +printk git git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git#next +pstore git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/pstore +hid git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git#for-next +i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next +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_tree.git#master +v4l-dvb-next git git://linuxtv.org/mchehab/media-next.git#master +pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +cpufreq-arm git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#cpufreq/arm/linux-next +cpupower git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#cpupower +devfreq git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git#devfreq-next +opp git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#opp/linux-next +thermal git git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git#thermal/linux-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +rdma git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git#main +bpf-next git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git#for-next +ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master +mlx5-next git git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git#mlx5-next +netfilter-next git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git#master +ipvs-next git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#main +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +wireless-next git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git#for-next +wpan-next git git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git#master +mtd git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/next +nand git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#nand/next +spi-nor git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#spi-nor/next +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +drm git git://git.freedesktop.org/git/drm/drm.git#drm-next +drm-misc git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next +amdgpu git https://gitlab.freedesktop.org/agd5f/linux#drm-next +drm-intel git git://anongit.freedesktop.org/drm-intel#for-linux-next +drm-tegra git https://gitlab.freedesktop.org/drm/tegra.git#for-next +drm-msm git https://gitlab.freedesktop.org/drm/msm.git#msm-next +drm-msm-lumag git https://gitlab.freedesktop.org/lumag/msm.git#msm-next-lumag +imx-drm git https://git.pengutronix.de/git/pza/linux#imx-drm/next +etnaviv git https://git.pengutronix.de/git/lst/linux#etnaviv/next +fbdev git git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git#for-next +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +ieee1394 git https://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#modules-next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +block git git://git.kernel.dk/linux-block.git#for-next +device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +libata git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git#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 +safesetid git https://github.com/micah-morton/linux.git#safesetid-next +selinux git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#next +smack git git://github.com/cschaufler/smack-next#next +tomoyo git https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git#master +tpmdd git git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git#next +watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next +audit git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git#next +devicetree git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next +dt-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git#for-next +mailbox git git://git.linaro.org/landing-teams/working/fujitsu/integration.git#mailbox-for-next +spi git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#master +clockevents git git://git.linaro.org/people/daniel.lezcano/linux.git#timers/drivers/next +edac git git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git#edac-for-next +irqchip git git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#for-next +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next +kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#next +kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next +kvms390 git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#next +kvm-x86 git https://github.com/kvm-x86/linux.git#next +xen-tip git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +drivers-x86 git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#for-next +chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git#for-next +hsi git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next +leds git git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.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 +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 +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +counter-next git git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git#counter-next +mux git https://gitlab.com/peda-linux/mux.git#for-next +dmaengine git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#next +cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next +scsi-mkp git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +rpmsg git git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git#for-next +gpio git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next +gpio-brgl git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-next +gpio-intel git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#for-next +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +pinctrl-intel git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#for-next +pinctrl-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-pinctrl +pinctrl-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#for-next +pwm git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git#for-next +userns git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git#for-next +ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next +kunit git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#test +kunit-next git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit +livepatching git git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching#for-next +rtc git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next +nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +at24 git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#at24/for-next +ntb git https://github.com/jonmason/ntb.git#ntb-next +seccomp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/seccomp +fsi git git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git#next +slimbus git git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git#for-next +nvmem git git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git#for-next +xarray git git://git.infradead.org/users/willy/xarray.git#main +hyperv git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-next +auxdisplay git https://github.com/ojeda/linux.git#auxdisplay +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#for-next +random git git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git#master +landlock git git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git#next +rust git https://github.com/Rust-for-Linux/linux.git#rust-next +sysctl git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#sysctl-next +execve git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/execve +bitmap git https://github.com/norov/linux.git#bitmap-for-next +hte git git://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git#for-next +kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +kspp-gustavo git git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git#for-next/kspp +iommufd git git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git#for-next diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..58b727b8fe85 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,12770 @@ +$ date -R +Thu, 27 Apr 2023 12:18:09 +0100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +Updating files: 57% (5106/8931)
Updating files: 58% (5180/8931)
Updating files: 59% (5270/8931)
Updating files: 60% (5359/8931)
Updating files: 61% (5448/8931)
Updating files: 62% (5538/8931)
Updating files: 63% (5627/8931)
Updating files: 64% (5716/8931)
Updating files: 65% (5806/8931)
Updating files: 66% (5895/8931)
Updating files: 67% (5984/8931)
Updating files: 68% (6074/8931)
Updating files: 69% (6163/8931)
Updating files: 70% (6252/8931)
Updating files: 71% (6342/8931)
Updating files: 72% (6431/8931)
Updating files: 73% (6520/8931)
Updating files: 74% (6609/8931)
Updating files: 75% (6699/8931)
Updating files: 76% (6788/8931)
Updating files: 77% (6877/8931)
Updating files: 78% (6967/8931)
Updating files: 79% (7056/8931)
Updating files: 80% (7145/8931)
Updating files: 81% (7235/8931)
Updating files: 82% (7324/8931)
Updating files: 83% (7413/8931)
Updating files: 84% (7503/8931)
Updating files: 85% (7592/8931)
Updating files: 86% (7681/8931)
Updating files: 87% (7770/8931)
Updating files: 88% (7860/8931)
Updating files: 89% (7949/8931)
Updating files: 90% (8038/8931)
Updating files: 91% (8128/8931)
Updating files: 92% (8217/8931)
Updating files: 93% (8306/8931)
Updating files: 94% (8396/8931)
Updating files: 95% (8485/8931)
Updating files: 96% (8574/8931)
Updating files: 97% (8664/8931)
Updating files: 98% (8753/8931)
Updating files: 99% (8842/8931)
Updating files: 100% (8931/8931)
Updating files: 100% (8931/8931), done. +HEAD is now at 0cfd8703e7da6 Merge tag 'pm-6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm +Merging origin/master (6e98b09da931a Merge tag 'net-next-6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating 0cfd8703e7da6..6e98b09da931a +Fast-forward (no commit created; -m option ignored) + Documentation/ABI/stable/sysfs-block | 15 +- + Documentation/ABI/testing/sysfs-fs-f2fs | 23 +- + Documentation/PCI/pci-error-recovery.rst | 1 - + .../admin-guide/device-mapper/dm-flakey.rst | 4 + + Documentation/admin-guide/ext4.rst | 3 - + Documentation/block/inline-encryption.rst | 3 +- + Documentation/bpf/bpf_design_QA.rst | 4 +- + Documentation/bpf/bpf_devel_QA.rst | 20 +- + Documentation/bpf/clang-notes.rst | 6 + + Documentation/bpf/cpumasks.rst | 34 +- + Documentation/bpf/instruction-set.rst | 169 +- + Documentation/bpf/kfuncs.rst | 182 +- + Documentation/bpf/libbpf/index.rst | 25 +- + Documentation/bpf/libbpf/libbpf_overview.rst | 228 + + Documentation/bpf/linux-notes.rst | 30 + + Documentation/bpf/maps.rst | 7 +- + .../bindings/arm/mediatek/mediatek,mt7622-wed.yaml | 1 + + .../bindings/arm/mediatek/mediatek,sgmiisys.txt | 27 - + .../bindings/arm/stm32/st,stm32-syscon.yaml | 2 + + .../devicetree/bindings/ata/ahci-platform.yaml | 49 +- + .../devicetree/bindings/crypto/qcom-qce.txt | 25 - + .../devicetree/bindings/crypto/qcom-qce.yaml | 123 + + .../devicetree/bindings/net/actions,owl-emac.yaml | 2 +- + .../bindings/net/allwinner,sun4i-a10-emac.yaml | 2 +- + .../bindings/net/allwinner,sun4i-a10-mdio.yaml | 2 +- + .../devicetree/bindings/net/altr,tse.yaml | 2 +- + .../bindings/net/amlogic,meson-dwmac.yaml | 4 +- + .../bindings/net/aspeed,ast2600-mdio.yaml | 2 +- + .../bindings/net/bluetooth/nxp,88w8987-bt.yaml | 45 + + .../bindings/net/bluetooth/qualcomm-bluetooth.yaml | 17 + + .../devicetree/bindings/net/brcm,amac.yaml | 2 +- + .../devicetree/bindings/net/brcm,systemport.yaml | 2 +- + .../bindings/net/broadcom-bluetooth.yaml | 2 +- + .../devicetree/bindings/net/can/fsl,flexcan.yaml | 3 + + .../bindings/net/can/st,stm32-bxcan.yaml | 85 + + .../devicetree/bindings/net/can/xilinx,can.yaml | 6 +- + .../devicetree/bindings/net/dsa/brcm,b53.yaml | 4 + + .../devicetree/bindings/net/dsa/brcm,sf2.yaml | 12 +- + .../bindings/net/dsa/mediatek,mt7530.yaml | 32 +- + .../devicetree/bindings/net/dsa/qca8k.yaml | 24 +- + .../devicetree/bindings/net/engleder,tsnep.yaml | 2 +- + .../bindings/net/ethernet-controller.yaml | 37 +- + .../devicetree/bindings/net/ethernet-phy.yaml | 45 +- + .../devicetree/bindings/net/ethernet-switch.yaml | 6 +- + Documentation/devicetree/bindings/net/fsl,fec.yaml | 3 + + .../bindings/net/fsl,qoriq-mc-dpmac.yaml | 2 +- + .../bindings/net/intel,ixp46x-ptp-timer.yaml | 4 +- + .../bindings/net/intel,ixp4xx-ethernet.yaml | 12 +- + .../devicetree/bindings/net/intel,ixp4xx-hss.yaml | 18 +- + .../devicetree/bindings/net/marvell,mvusb.yaml | 2 +- + .../devicetree/bindings/net/marvell-bluetooth.yaml | 24 +- + .../devicetree/bindings/net/mdio-gpio.yaml | 2 +- + .../devicetree/bindings/net/mediatek,net.yaml | 55 +- + .../bindings/net/mediatek,star-emac.yaml | 2 +- + .../bindings/net/microchip,lan966x-switch.yaml | 2 +- + .../bindings/net/microchip,sparx5-switch.yaml | 4 +- + .../devicetree/bindings/net/mscc,miim.yaml | 2 +- + .../devicetree/bindings/net/nfc/marvell,nci.yaml | 2 +- + .../devicetree/bindings/net/nfc/nxp,pn532.yaml | 2 +- + .../bindings/net/pcs/mediatek,sgmiisys.yaml | 55 + + .../bindings/net/pse-pd/podl-pse-regulator.yaml | 2 +- + .../devicetree/bindings/net/qcom,ethqos.txt | 66 - + .../devicetree/bindings/net/qcom,ethqos.yaml | 111 + + .../devicetree/bindings/net/qcom,ipa.yaml | 1 + + .../devicetree/bindings/net/qcom,ipq4019-mdio.yaml | 2 +- + .../devicetree/bindings/net/qcom,ipq8064-mdio.yaml | 6 +- + .../devicetree/bindings/net/realtek-bluetooth.yaml | 24 +- + .../devicetree/bindings/net/rockchip,emac.yaml | 2 +- + .../devicetree/bindings/net/rockchip-dwmac.yaml | 4 +- + Documentation/devicetree/bindings/net/sff,sfp.yaml | 4 +- + .../devicetree/bindings/net/snps,dwmac.yaml | 28 +- + .../bindings/net/starfive,jh7110-dwmac.yaml | 144 + + .../devicetree/bindings/net/stm32-dwmac.yaml | 8 +- + .../devicetree/bindings/net/ti,cpsw-switch.yaml | 10 +- + .../devicetree/bindings/net/ti,davinci-mdio.yaml | 2 +- + .../devicetree/bindings/net/ti,dp83822.yaml | 6 +- + .../devicetree/bindings/net/ti,dp83867.yaml | 6 +- + .../devicetree/bindings/net/ti,dp83869.yaml | 6 +- + .../bindings/net/ti,k3-am654-cpsw-nuss.yaml | 24 +- + .../bindings/net/toshiba,visconti-dwmac.yaml | 4 +- + .../devicetree/bindings/net/vertexcom-mse102x.yaml | 4 +- + .../bindings/net/wireless/mediatek,mt76.yaml | 5 + + .../bindings/net/wireless/qcom,ath10k.txt | 215 - + .../bindings/net/wireless/qcom,ath10k.yaml | 358 + + .../bindings/net/wireless/qcom,ath11k-pci.yaml | 58 + + Documentation/fault-injection/fault-injection.rst | 8 + + Documentation/filesystems/f2fs.rst | 2 +- + Documentation/leds/well-known-leds.txt | 30 + + Documentation/netlink/genetlink-c.yaml | 2 +- + Documentation/netlink/genetlink-legacy.yaml | 18 +- + Documentation/netlink/genetlink.yaml | 3 + + Documentation/netlink/specs/devlink.yaml | 198 + + Documentation/netlink/specs/ethtool.yaml | 1484 +- + Documentation/netlink/specs/handshake.yaml | 124 + + Documentation/netlink/specs/ovs_datapath.yaml | 153 + + Documentation/netlink/specs/ovs_vport.yaml | 139 + + .../device_drivers/can/ctu/ctucanfd-driver.rst | 3 +- + .../device_drivers/ethernet/amd/pds_core.rst | 139 + + .../networking/device_drivers/ethernet/index.rst | 2 +- + .../device_drivers/ethernet/intel/e100.rst | 7 +- + .../device_drivers/ethernet/intel/e1000.rst | 9 +- + .../device_drivers/ethernet/intel/e1000e.rst | 7 +- + .../device_drivers/ethernet/intel/fm10k.rst | 7 +- + .../device_drivers/ethernet/intel/i40e.rst | 11 +- + .../device_drivers/ethernet/intel/iavf.rst | 7 +- + .../device_drivers/ethernet/intel/ice.rst | 9 +- + .../device_drivers/ethernet/intel/igb.rst | 7 +- + .../device_drivers/ethernet/intel/igbvf.rst | 7 +- + .../device_drivers/ethernet/intel/ixgb.rst | 468 - + .../device_drivers/ethernet/intel/ixgbe.rst | 7 +- + .../device_drivers/ethernet/intel/ixgbevf.rst | 7 +- + .../ethernet/mellanox/mlx5/counters.rst | 26 - + .../ethernet/mellanox/mlx5/devlink.rst | 68 + + Documentation/networking/devlink/mlx5.rst | 12 + + Documentation/networking/driver.rst | 156 +- + Documentation/networking/ethtool-netlink.rst | 51 +- + Documentation/networking/index.rst | 2 + + Documentation/networking/ip-sysctl.rst | 7 + + Documentation/networking/napi.rst | 254 + + Documentation/networking/page_pool.rst | 1 + + Documentation/networking/rxrpc.rst | 17 +- + Documentation/networking/tls-handshake.rst | 217 + + Documentation/process/maintainer-netdev.rst | 38 +- + Documentation/scsi/scsi_mid_low_api.rst | 2 +- + .../userspace-api/netlink/genetlink-legacy.rst | 88 +- + Documentation/userspace-api/netlink/specs.rst | 10 + + MAINTAINERS | 113 +- + arch/arm/boot/dts/armada-370-rd.dts | 12 + + arch/arm/boot/dts/qcom-ipq8064-rb3011.dts | 124 +- + arch/arm/boot/dts/stm32f4-pinctrl.dtsi | 30 + + arch/arm/boot/dts/stm32f429.dtsi | 29 + + arch/arm64/boot/dts/qcom/sm8550.dtsi | 2 +- + .../boot/dts/rockchip/rk3566-anbernic-rgxx3.dtsi | 2 +- + arch/arm64/crypto/aes-neonbs-core.S | 9 +- + arch/loongarch/configs/loongson3_defconfig | 1 - + arch/loongarch/net/bpf_jit.c | 6 + + arch/mips/Kconfig | 5 +- + arch/mips/configs/loongson2k_defconfig | 1 - + arch/mips/configs/loongson3_defconfig | 1 - + arch/mips/configs/mtx1_defconfig | 1 - + arch/mips/net/bpf_jit_comp.c | 4 + + arch/mips/net/bpf_jit_comp64.c | 3 + + arch/powerpc/configs/powernv_defconfig | 1 - + arch/powerpc/configs/ppc64_defconfig | 1 - + arch/powerpc/configs/ppc64e_defconfig | 1 - + arch/powerpc/configs/ppc6xx_defconfig | 1 - + arch/powerpc/configs/pseries_defconfig | 1 - + arch/powerpc/configs/skiroot_defconfig | 1 - + arch/powerpc/crypto/Kconfig | 17 + + arch/powerpc/crypto/Makefile | 13 + + arch/powerpc/crypto/aes-gcm-p10-glue.c | 343 + + arch/powerpc/crypto/aes-gcm-p10.S | 1521 ++ + arch/powerpc/crypto/aesp8-ppc.pl | 585 + + arch/powerpc/crypto/ghashp8-ppc.pl | 370 + + arch/powerpc/crypto/ppc-xlate.pl | 229 + + arch/powerpc/include/asm/cpufeature.h | 1 + + arch/riscv/net/bpf_jit_comp64.c | 5 + + arch/s390/include/uapi/asm/dasd.h | 2 + + arch/s390/net/bpf_jit_comp.c | 5 + + arch/x86/crypto/aegis128-aesni-asm.S | 6 +- + arch/x86/crypto/aesni-intel_asm.S | 198 +- + arch/x86/crypto/aesni-intel_avx-x86_64.S | 254 +- + arch/x86/crypto/aria-aesni-avx-asm_64.S | 28 +- + arch/x86/crypto/aria-aesni-avx2-asm_64.S | 28 +- + arch/x86/crypto/aria-gfni-avx512-asm_64.S | 24 +- + arch/x86/crypto/camellia-aesni-avx-asm_64.S | 30 +- + arch/x86/crypto/camellia-aesni-avx2-asm_64.S | 30 +- + arch/x86/crypto/camellia-x86_64-asm_64.S | 6 +- + arch/x86/crypto/cast5-avx-x86_64-asm_64.S | 38 +- + arch/x86/crypto/cast6-avx-x86_64-asm_64.S | 32 +- + arch/x86/crypto/crc32-pclmul_asm.S | 16 +- + arch/x86/crypto/crc32c-pcl-intel-asm_64.S | 70 +- + arch/x86/crypto/des3_ede-asm_64.S | 96 +- + arch/x86/crypto/ghash-clmulni-intel_asm.S | 4 +- + arch/x86/crypto/sha1_avx2_x86_64_asm.S | 25 +- + arch/x86/crypto/sha256-avx-asm.S | 16 +- + arch/x86/crypto/sha256-avx2-asm.S | 54 +- + arch/x86/crypto/sha256-ssse3-asm.S | 16 +- + arch/x86/crypto/sha512-avx-asm.S | 8 +- + arch/x86/crypto/sha512-avx2-asm.S | 16 +- + arch/x86/crypto/sha512-ssse3-asm.S | 8 +- + arch/x86/kvm/svm/sev.c | 1 + + block/Kconfig | 8 +- + block/Makefile | 1 - + block/bdev.c | 1 + + block/bfq-cgroup.c | 20 +- + block/bfq-iosched.c | 19 +- + block/bfq-iosched.h | 1 - + block/bio.c | 1 + + block/blk-cgroup.c | 225 +- + block/blk-cgroup.h | 27 +- + block/blk-core.c | 17 +- + block/blk-crypto-internal.h | 38 +- + block/blk-crypto-profile.c | 60 +- + block/blk-crypto.c | 66 +- + block/blk-flush.c | 17 +- + block/blk-iocost.c | 58 +- + block/blk-iolatency.c | 39 +- + block/blk-merge.c | 2 + + block/blk-mq-cpumap.c | 1 - + block/blk-mq-debugfs.c | 28 - + block/blk-mq-pci.c | 1 - + block/blk-mq-rdma.c | 44 - + block/blk-mq-sched.c | 143 +- + block/blk-mq-sched.h | 7 - + block/blk-mq-sysfs.c | 2 - + block/blk-mq-tag.c | 2 - + block/blk-mq-tag.h | 73 - + block/blk-mq-virtio.c | 1 - + block/blk-mq.c | 665 +- + block/blk-mq.h | 77 +- + block/blk-pm.c | 2 - + block/blk-rq-qos.h | 2 +- + block/blk-stat.c | 23 +- + block/blk-sysfs.c | 26 +- + block/blk-throttle.c | 19 +- + block/blk.h | 6 - + block/elevator.h | 4 +- + block/genhd.c | 3 + + block/kyber-iosched.c | 7 +- + block/mq-deadline.c | 13 +- + block/opal_proto.h | 10 + + block/sed-opal.c | 330 +- + crypto/acompress.c | 81 +- + crypto/aead.c | 98 +- + crypto/ahash.c | 144 +- + crypto/akcipher.c | 52 +- + crypto/algapi.c | 219 +- + crypto/algif_hash.c | 19 +- + crypto/api.c | 63 +- + crypto/async_tx/async_pq.c | 10 +- + crypto/async_tx/async_tx.c | 4 +- + crypto/compress.h | 26 + + crypto/cryptd.c | 34 +- + crypto/crypto_user_stat.c | 183 +- + crypto/drbg.c | 2 +- + crypto/fips.c | 11 +- + crypto/hash.h | 40 + + crypto/hmac.c | 15 + + crypto/internal.h | 10 + + crypto/jitterentropy-kcapi.c | 51 +- + crypto/jitterentropy.c | 144 +- + crypto/jitterentropy.h | 1 - + crypto/kpp.c | 53 +- + crypto/rng.c | 65 +- + crypto/scompress.c | 39 +- + crypto/shash.c | 181 +- + crypto/skcipher.c | 113 +- + crypto/tcrypt.c | 11 +- + crypto/testmgr.c | 272 +- + crypto/testmgr.h | 47 + + drivers/ata/Kconfig | 1 + + drivers/ata/acard-ahci.c | 2 +- + drivers/ata/ahci.c | 2 +- + drivers/ata/ahci.h | 2 +- + drivers/ata/ahci_brcm.c | 2 +- + drivers/ata/ahci_ceva.c | 2 +- + drivers/ata/ahci_da850.c | 2 +- + drivers/ata/ahci_dm816.c | 2 +- + drivers/ata/ahci_dwc.c | 2 +- + drivers/ata/ahci_imx.c | 2 +- + drivers/ata/ahci_mtk.c | 4 +- + drivers/ata/ahci_mvebu.c | 2 +- + drivers/ata/ahci_platform.c | 2 +- + drivers/ata/ahci_qoriq.c | 2 +- + drivers/ata/ahci_seattle.c | 2 +- + drivers/ata/ahci_st.c | 2 +- + drivers/ata/ahci_sunxi.c | 2 +- + drivers/ata/ahci_tegra.c | 2 +- + drivers/ata/ahci_xgene.c | 2 +- + drivers/ata/ata_generic.c | 2 +- + drivers/ata/ata_piix.c | 6 +- + drivers/ata/libahci.c | 4 +- + drivers/ata/libahci_platform.c | 4 +- + drivers/ata/libata-core.c | 4 +- + drivers/ata/libata-scsi.c | 2 +- + drivers/ata/libata-sff.c | 8 +- + drivers/ata/libata.h | 2 +- + drivers/ata/pata_acpi.c | 2 +- + drivers/ata/pata_ali.c | 2 +- + drivers/ata/pata_amd.c | 2 +- + drivers/ata/pata_arasan_cf.c | 2 +- + drivers/ata/pata_artop.c | 2 +- + drivers/ata/pata_atiixp.c | 2 +- + drivers/ata/pata_atp867x.c | 2 +- + drivers/ata/pata_buddha.c | 2 +- + drivers/ata/pata_cmd640.c | 2 +- + drivers/ata/pata_cmd64x.c | 2 +- + drivers/ata/pata_cs5520.c | 2 +- + drivers/ata/pata_cs5530.c | 2 +- + drivers/ata/pata_cs5535.c | 2 +- + drivers/ata/pata_cs5536.c | 2 +- + drivers/ata/pata_cypress.c | 2 +- + drivers/ata/pata_efar.c | 2 +- + drivers/ata/pata_ep93xx.c | 2 +- + drivers/ata/pata_falcon.c | 2 +- + drivers/ata/pata_ftide010.c | 2 +- + drivers/ata/pata_gayle.c | 2 +- + drivers/ata/pata_hpt366.c | 2 +- + drivers/ata/pata_hpt37x.c | 2 +- + drivers/ata/pata_hpt3x2n.c | 2 +- + drivers/ata/pata_hpt3x3.c | 2 +- + drivers/ata/pata_icside.c | 2 +- + drivers/ata/pata_imx.c | 2 +- + drivers/ata/pata_isapnp.c | 2 +- + drivers/ata/pata_it8213.c | 2 +- + drivers/ata/pata_it821x.c | 2 +- + drivers/ata/pata_ixp4xx_cf.c | 2 +- + drivers/ata/pata_jmicron.c | 2 +- + drivers/ata/pata_legacy.c | 2 +- + drivers/ata/pata_macio.c | 2 +- + drivers/ata/pata_marvell.c | 2 +- + drivers/ata/pata_mpc52xx.c | 2 +- + drivers/ata/pata_mpiix.c | 2 +- + drivers/ata/pata_netcell.c | 2 +- + drivers/ata/pata_ninja32.c | 2 +- + drivers/ata/pata_ns87410.c | 2 +- + drivers/ata/pata_ns87415.c | 2 +- + drivers/ata/pata_octeon_cf.c | 2 +- + drivers/ata/pata_of_platform.c | 2 +- + drivers/ata/pata_oldpiix.c | 2 +- + drivers/ata/pata_opti.c | 2 +- + drivers/ata/pata_optidma.c | 2 +- + drivers/ata/pata_parport/Kconfig | 2 +- + drivers/ata/pata_parport/aten.c | 45 +- + drivers/ata/pata_parport/bpck.c | 86 +- + drivers/ata/pata_parport/bpck6.c | 541 +- + drivers/ata/pata_parport/comm.c | 52 +- + drivers/ata/pata_parport/dstr.c | 45 +- + drivers/ata/pata_parport/epat.c | 48 +- + drivers/ata/pata_parport/epia.c | 55 +- + drivers/ata/pata_parport/fit2.c | 37 +- + drivers/ata/pata_parport/fit3.c | 39 +- + drivers/ata/pata_parport/friq.c | 56 +- + drivers/ata/pata_parport/frpw.c | 71 +- + drivers/ata/pata_parport/kbic.c | 66 +- + drivers/ata/pata_parport/ktti.c | 38 +- + drivers/ata/pata_parport/on20.c | 45 +- + drivers/ata/pata_parport/on26.c | 52 +- + drivers/ata/pata_parport/pata_parport.c | 33 +- + .../ata/pata_parport}/pata_parport.h | 41 +- + drivers/ata/pata_parport/ppc6lnx.c | 726 - + drivers/ata/pata_pcmcia.c | 2 +- + drivers/ata/pata_pdc2027x.c | 2 +- + drivers/ata/pata_pdc202xx_old.c | 2 +- + drivers/ata/pata_piccolo.c | 2 +- + drivers/ata/pata_platform.c | 4 +- + drivers/ata/pata_pxa.c | 2 +- + drivers/ata/pata_radisys.c | 2 +- + drivers/ata/pata_rb532_cf.c | 2 +- + drivers/ata/pata_rdc.c | 2 +- + drivers/ata/pata_rz1000.c | 2 +- + drivers/ata/pata_sc1200.c | 2 +- + drivers/ata/pata_sch.c | 2 +- + drivers/ata/pata_serverworks.c | 6 +- + drivers/ata/pata_sil680.c | 2 +- + drivers/ata/pata_sis.c | 2 +- + drivers/ata/pata_sl82c105.c | 2 +- + drivers/ata/pata_triflex.c | 2 +- + drivers/ata/pata_via.c | 2 +- + drivers/ata/pdc_adma.c | 2 +- + drivers/ata/sata_dwc_460ex.c | 6 +- + drivers/ata/sata_fsl.c | 2 +- + drivers/ata/sata_highbank.c | 2 +- + drivers/ata/sata_inic162x.c | 2 +- + drivers/ata/sata_mv.c | 4 +- + drivers/ata/sata_nv.c | 8 +- + drivers/ata/sata_promise.c | 2 +- + drivers/ata/sata_qstor.c | 2 +- + drivers/ata/sata_rcar.c | 2 +- + drivers/ata/sata_sil.c | 2 +- + drivers/ata/sata_sil24.c | 2 +- + drivers/ata/sata_sis.c | 2 +- + drivers/ata/sata_svw.c | 2 +- + drivers/ata/sata_sx4.c | 2 +- + drivers/ata/sata_uli.c | 2 +- + drivers/ata/sata_via.c | 2 +- + drivers/ata/sata_vsc.c | 2 +- + drivers/bcma/driver_mips.c | 6 - + drivers/bcma/main.c | 11 +- + drivers/block/Kconfig | 17 + + drivers/block/drbd/drbd_actlog.c | 13 +- + drivers/block/drbd/drbd_bitmap.c | 13 +- + drivers/block/drbd/drbd_int.h | 120 +- + drivers/block/drbd/drbd_main.c | 72 +- + drivers/block/drbd/drbd_nl.c | 19 +- + drivers/block/drbd/drbd_receiver.c | 102 +- + drivers/block/drbd/drbd_req.c | 30 +- + drivers/block/drbd/drbd_req.h | 11 +- + drivers/block/drbd/drbd_state.c | 29 +- + drivers/block/drbd/drbd_worker.c | 114 +- + drivers/block/nbd.c | 15 +- + drivers/block/null_blk/Kconfig | 2 +- + drivers/block/null_blk/main.c | 135 +- + drivers/block/null_blk/null_blk.h | 7 +- + drivers/block/ublk_drv.c | 133 +- + drivers/bluetooth/Kconfig | 14 + + drivers/bluetooth/Makefile | 1 + + drivers/bluetooth/btbcm.c | 47 +- + drivers/bluetooth/btintel.c | 77 +- + drivers/bluetooth/btintel.h | 12 +- + drivers/bluetooth/btmrvl_sdio.c | 2 +- + drivers/bluetooth/btmtkuart.c | 6 +- + drivers/bluetooth/btnxpuart.c | 1352 ++ + drivers/bluetooth/btqca.c | 14 +- + drivers/bluetooth/btqca.h | 10 + + drivers/bluetooth/btrtl.c | 502 +- + drivers/bluetooth/btrtl.h | 58 +- + drivers/bluetooth/btsdio.c | 1 - + drivers/bluetooth/btusb.c | 318 +- + drivers/bluetooth/hci_bcm.c | 60 +- + drivers/bluetooth/hci_h5.c | 6 + + drivers/bluetooth/hci_ldisc.c | 8 +- + drivers/bluetooth/hci_ll.c | 2 +- + drivers/bluetooth/hci_mrvl.c | 90 +- + drivers/bluetooth/hci_qca.c | 67 +- + drivers/bluetooth/hci_vhci.c | 101 + + drivers/char/hw_random/meson-rng.c | 29 +- + drivers/char/hw_random/xgene-rng.c | 46 +- + drivers/crypto/Kconfig | 21 +- + drivers/crypto/Makefile | 4 +- + drivers/crypto/amcc/crypto4xx_core.c | 2 +- + drivers/crypto/aspeed/aspeed-acry.c | 14 +- + drivers/crypto/atmel-aes.c | 16 +- + drivers/crypto/atmel-sha.c | 34 +- + drivers/crypto/atmel-sha204a.c | 2 +- + drivers/crypto/atmel-tdes.c | 15 +- + drivers/crypto/caam/caamalg.c | 21 +- + drivers/crypto/caam/caamhash.c | 10 +- + drivers/crypto/caam/caampkc.c | 6 +- + drivers/crypto/caam/caamrng.c | 6 +- + drivers/crypto/caam/ctrl.c | 112 +- + drivers/crypto/caam/debugfs.c | 12 +- + drivers/crypto/caam/debugfs.h | 7 +- + drivers/crypto/caam/dpseci-debugfs.c | 2 +- + drivers/crypto/caam/intern.h | 1 + + drivers/crypto/caam/jr.c | 61 +- + drivers/crypto/cavium/nitrox/nitrox_main.c | 1 - + drivers/crypto/ccp/Makefile | 3 +- + drivers/crypto/ccp/platform-access.c | 215 + + drivers/crypto/ccp/platform-access.h | 35 + + drivers/crypto/ccp/psp-dev.c | 38 +- + drivers/crypto/ccp/psp-dev.h | 11 +- + drivers/crypto/ccp/sev-dev.c | 16 +- + drivers/crypto/ccp/sev-dev.h | 2 +- + drivers/crypto/ccp/sp-dev.h | 10 + + drivers/crypto/ccp/sp-pci.c | 11 +- + drivers/crypto/ccp/tee-dev.c | 17 +- + drivers/crypto/ccree/cc_driver.c | 4 +- + drivers/crypto/hifn_795x.c | 24 +- + drivers/crypto/hisilicon/Kconfig | 7 + + drivers/crypto/hisilicon/Makefile | 2 +- + drivers/crypto/hisilicon/hpre/hpre_main.c | 1 - + drivers/crypto/hisilicon/qm.c | 1 - + drivers/crypto/hisilicon/sec2/sec_main.c | 1 - + drivers/crypto/hisilicon/trng/Makefile | 3 + + drivers/crypto/hisilicon/trng/trng-stb.c | 176 + + drivers/crypto/hisilicon/zip/zip_main.c | 1 - + drivers/crypto/img-hash.c | 7 +- + drivers/crypto/inside-secure/safexcel.c | 39 +- + drivers/crypto/intel/Kconfig | 5 + + drivers/crypto/intel/Makefile | 5 + + drivers/crypto/intel/ixp4xx/Kconfig | 14 + + drivers/crypto/intel/ixp4xx/Makefile | 2 + + drivers/crypto/{ => intel/ixp4xx}/ixp4xx_crypto.c | 15 +- + drivers/crypto/{ => intel}/keembay/Kconfig | 0 + drivers/crypto/{ => intel}/keembay/Makefile | 0 + .../{ => intel}/keembay/keembay-ocs-aes-core.c | 2 - + .../crypto/{ => intel}/keembay/keembay-ocs-ecc.c | 0 + .../{ => intel}/keembay/keembay-ocs-hcu-core.c | 0 + drivers/crypto/{ => intel}/keembay/ocs-aes.c | 0 + drivers/crypto/{ => intel}/keembay/ocs-aes.h | 0 + drivers/crypto/{ => intel}/keembay/ocs-hcu.c | 0 + drivers/crypto/{ => intel}/keembay/ocs-hcu.h | 0 + drivers/crypto/{ => intel}/qat/Kconfig | 0 + drivers/crypto/{ => intel}/qat/Makefile | 0 + drivers/crypto/{ => intel}/qat/qat_4xxx/Makefile | 0 + .../{ => intel}/qat/qat_4xxx/adf_4xxx_hw_data.c | 62 +- + .../{ => intel}/qat/qat_4xxx/adf_4xxx_hw_data.h | 9 +- + drivers/crypto/{ => intel}/qat/qat_4xxx/adf_drv.c | 31 +- + drivers/crypto/{ => intel}/qat/qat_c3xxx/Makefile | 0 + .../{ => intel}/qat/qat_c3xxx/adf_c3xxx_hw_data.c | 2 +- + .../{ => intel}/qat/qat_c3xxx/adf_c3xxx_hw_data.h | 0 + drivers/crypto/{ => intel}/qat/qat_c3xxx/adf_drv.c | 24 +- + .../crypto/{ => intel}/qat/qat_c3xxxvf/Makefile | 0 + .../qat/qat_c3xxxvf/adf_c3xxxvf_hw_data.c | 0 + .../qat/qat_c3xxxvf/adf_c3xxxvf_hw_data.h | 0 + .../crypto/{ => intel}/qat/qat_c3xxxvf/adf_drv.c | 13 +- + drivers/crypto/{ => intel}/qat/qat_c62x/Makefile | 0 + .../{ => intel}/qat/qat_c62x/adf_c62x_hw_data.c | 2 +- + .../{ => intel}/qat/qat_c62x/adf_c62x_hw_data.h | 0 + drivers/crypto/{ => intel}/qat/qat_c62x/adf_drv.c | 24 +- + drivers/crypto/{ => intel}/qat/qat_c62xvf/Makefile | 0 + .../qat/qat_c62xvf/adf_c62xvf_hw_data.c | 0 + .../qat/qat_c62xvf/adf_c62xvf_hw_data.h | 0 + .../crypto/{ => intel}/qat/qat_c62xvf/adf_drv.c | 13 +- + drivers/crypto/{ => intel}/qat/qat_common/Makefile | 0 + .../{ => intel}/qat/qat_common/adf_accel_devices.h | 5 +- + .../{ => intel}/qat/qat_common/adf_accel_engine.c | 0 + .../crypto/{ => intel}/qat/qat_common/adf_admin.c | 0 + .../crypto/{ => intel}/qat/qat_common/adf_aer.c | 39 +- + .../crypto/{ => intel}/qat/qat_common/adf_cfg.c | 0 + .../crypto/{ => intel}/qat/qat_common/adf_cfg.h | 0 + .../{ => intel}/qat/qat_common/adf_cfg_common.h | 0 + .../{ => intel}/qat/qat_common/adf_cfg_strings.h | 0 + .../{ => intel}/qat/qat_common/adf_cfg_user.h | 0 + .../{ => intel}/qat/qat_common/adf_common_drv.h | 10 +- + .../{ => intel}/qat/qat_common/adf_ctl_drv.c | 30 +- + .../{ => intel}/qat/qat_common/adf_dev_mgr.c | 2 + + .../{ => intel}/qat/qat_common/adf_gen2_config.c | 0 + .../{ => intel}/qat/qat_common/adf_gen2_config.h | 0 + .../{ => intel}/qat/qat_common/adf_gen2_dc.c | 0 + .../{ => intel}/qat/qat_common/adf_gen2_dc.h | 0 + .../{ => intel}/qat/qat_common/adf_gen2_hw_data.c | 0 + .../{ => intel}/qat/qat_common/adf_gen2_hw_data.h | 0 + .../{ => intel}/qat/qat_common/adf_gen2_pfvf.c | 0 + .../{ => intel}/qat/qat_common/adf_gen2_pfvf.h | 0 + .../{ => intel}/qat/qat_common/adf_gen4_dc.c | 0 + .../{ => intel}/qat/qat_common/adf_gen4_dc.h | 0 + .../{ => intel}/qat/qat_common/adf_gen4_hw_data.c | 0 + .../{ => intel}/qat/qat_common/adf_gen4_hw_data.h | 0 + .../{ => intel}/qat/qat_common/adf_gen4_pfvf.c | 0 + .../{ => intel}/qat/qat_common/adf_gen4_pfvf.h | 0 + .../{ => intel}/qat/qat_common/adf_gen4_pm.c | 0 + .../{ => intel}/qat/qat_common/adf_gen4_pm.h | 0 + .../{ => intel}/qat/qat_common/adf_hw_arbiter.c | 2 +- + .../crypto/{ => intel}/qat/qat_common/adf_init.c | 96 +- + .../crypto/{ => intel}/qat/qat_common/adf_isr.c | 0 + .../{ => intel}/qat/qat_common/adf_pfvf_msg.h | 0 + .../{ => intel}/qat/qat_common/adf_pfvf_pf_msg.c | 0 + .../{ => intel}/qat/qat_common/adf_pfvf_pf_msg.h | 0 + .../{ => intel}/qat/qat_common/adf_pfvf_pf_proto.c | 0 + .../{ => intel}/qat/qat_common/adf_pfvf_pf_proto.h | 0 + .../{ => intel}/qat/qat_common/adf_pfvf_utils.c | 0 + .../{ => intel}/qat/qat_common/adf_pfvf_utils.h | 0 + .../{ => intel}/qat/qat_common/adf_pfvf_vf_msg.c | 0 + .../{ => intel}/qat/qat_common/adf_pfvf_vf_msg.h | 0 + .../{ => intel}/qat/qat_common/adf_pfvf_vf_proto.c | 0 + .../{ => intel}/qat/qat_common/adf_pfvf_vf_proto.h | 0 + .../crypto/{ => intel}/qat/qat_common/adf_sriov.c | 10 +- + .../crypto/{ => intel}/qat/qat_common/adf_sysfs.c | 23 +- + .../{ => intel}/qat/qat_common/adf_transport.c | 0 + .../{ => intel}/qat/qat_common/adf_transport.h | 0 + .../qat/qat_common/adf_transport_access_macros.h | 0 + .../qat/qat_common/adf_transport_debug.c | 0 + .../qat/qat_common/adf_transport_internal.h | 0 + .../crypto/{ => intel}/qat/qat_common/adf_vf_isr.c | 3 +- + .../crypto/{ => intel}/qat/qat_common/icp_qat_fw.h | 0 + .../{ => intel}/qat/qat_common/icp_qat_fw_comp.h | 0 + .../qat/qat_common/icp_qat_fw_init_admin.h | 0 + .../{ => intel}/qat/qat_common/icp_qat_fw_la.h | 0 + .../qat/qat_common/icp_qat_fw_loader_handle.h | 0 + .../{ => intel}/qat/qat_common/icp_qat_fw_pke.h | 0 + .../{ => intel}/qat/qat_common/icp_qat_hal.h | 0 + .../crypto/{ => intel}/qat/qat_common/icp_qat_hw.h | 0 + .../qat/qat_common/icp_qat_hw_20_comp.h | 0 + .../qat/qat_common/icp_qat_hw_20_comp_defs.h | 0 + .../{ => intel}/qat/qat_common/icp_qat_uclo.h | 0 + .../crypto/{ => intel}/qat/qat_common/qat_algs.c | 0 + .../{ => intel}/qat/qat_common/qat_algs_send.c | 0 + .../{ => intel}/qat/qat_common/qat_algs_send.h | 0 + .../{ => intel}/qat/qat_common/qat_asym_algs.c | 0 + drivers/crypto/{ => intel}/qat/qat_common/qat_bl.c | 0 + drivers/crypto/{ => intel}/qat/qat_common/qat_bl.h | 0 + .../{ => intel}/qat/qat_common/qat_comp_algs.c | 0 + .../{ => intel}/qat/qat_common/qat_comp_req.h | 0 + .../{ => intel}/qat/qat_common/qat_compression.c | 0 + .../{ => intel}/qat/qat_common/qat_compression.h | 0 + .../crypto/{ => intel}/qat/qat_common/qat_crypto.c | 0 + .../crypto/{ => intel}/qat/qat_common/qat_crypto.h | 0 + .../crypto/{ => intel}/qat/qat_common/qat_hal.c | 1 + + .../crypto/{ => intel}/qat/qat_common/qat_uclo.c | 1 + + .../crypto/{ => intel}/qat/qat_dh895xcc/Makefile | 0 + .../qat/qat_dh895xcc/adf_dh895xcc_hw_data.c | 2 +- + .../qat/qat_dh895xcc/adf_dh895xcc_hw_data.h | 0 + .../crypto/{ => intel}/qat/qat_dh895xcc/adf_drv.c | 24 +- + .../crypto/{ => intel}/qat/qat_dh895xccvf/Makefile | 0 + .../qat/qat_dh895xccvf/adf_dh895xccvf_hw_data.c | 0 + .../qat/qat_dh895xccvf/adf_dh895xccvf_hw_data.h | 0 + .../{ => intel}/qat/qat_dh895xccvf/adf_drv.c | 13 +- + drivers/crypto/mxs-dcp.c | 21 +- + drivers/crypto/qce/core.c | 23 +- + drivers/crypto/qce/core.h | 1 + + drivers/crypto/sa2ul.c | 6 +- + drivers/crypto/sahara.c | 4 +- + drivers/crypto/stm32/stm32-hash.c | 361 +- + drivers/firewire/sbp2.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_so.c | 2 +- + drivers/hid/bpf/hid_bpf_dispatch.c | 3 - + drivers/i2c/busses/Kconfig | 5 +- + drivers/i2c/busses/i2c-designware-amdpsp.c | 205 +- + drivers/i2c/busses/i2c-designware-core.h | 1 - + drivers/i2c/busses/i2c-designware-platdrv.c | 1 - + drivers/infiniband/ulp/iser/iscsi_iser.c | 4 +- + drivers/infiniband/ulp/isert/ib_isert.c | 4 +- + drivers/infiniband/ulp/srp/ib_srp.c | 2 +- + drivers/infiniband/ulp/srpt/ib_srpt.c | 33 - + drivers/isdn/hardware/mISDN/hfcmulti.c | 31 - + drivers/isdn/hardware/mISDN/netjet.c | 1 - + drivers/md/dm-bio-prison-v1.c | 94 +- + drivers/md/dm-bio-prison-v1.h | 15 + + drivers/md/dm-bufio.c | 1980 ++- + drivers/md/dm-cache-target.c | 1 - + drivers/md/dm-clone-target.c | 2 +- + drivers/md/dm-crypt.c | 20 +- + drivers/md/dm-delay.c | 26 +- + drivers/md/dm-dust.c | 19 +- + drivers/md/dm-ebs-target.c | 19 +- + drivers/md/dm-era-target.c | 22 +- + drivers/md/dm-flakey.c | 71 +- + drivers/md/dm-integrity.c | 15 +- + drivers/md/dm-io.c | 4 +- + drivers/md/dm-ioctl.c | 12 +- + drivers/md/dm-kcopyd.c | 4 +- + drivers/md/dm-linear.c | 6 +- + drivers/md/dm-log-writes.c | 21 +- + drivers/md/dm-log.c | 24 +- + drivers/md/dm-mpath.c | 5 +- + drivers/md/dm-raid.c | 22 +- + drivers/md/dm-raid1.c | 24 +- + drivers/md/dm-snap-persistent.c | 2 +- + drivers/md/dm-snap.c | 12 +- + drivers/md/dm-stripe.c | 4 +- + drivers/md/dm-switch.c | 20 +- + drivers/md/dm-table.c | 25 +- + drivers/md/dm-target.c | 20 +- + drivers/md/dm-thin.c | 125 +- + drivers/md/dm-unstripe.c | 14 +- + drivers/md/dm-verity-fec.c | 4 +- + drivers/md/dm-verity-target.c | 42 +- + drivers/md/dm-writecache.c | 22 +- + drivers/md/dm-zero.c | 31 +- + drivers/md/dm-zoned-metadata.c | 6 +- + drivers/md/dm-zoned-target.c | 16 +- + drivers/md/dm.c | 47 +- + drivers/md/dm.h | 22 + + drivers/md/md-bitmap.c | 143 +- + drivers/md/md-linear.c | 14 +- + drivers/md/md.c | 27 +- + drivers/md/md.h | 10 +- + drivers/md/raid0.c | 14 +- + drivers/md/raid10.c | 102 +- + drivers/md/raid5.c | 5 +- + drivers/message/fusion/mptbase.h | 1 - + drivers/message/fusion/mptfc.c | 2 +- + drivers/message/fusion/mptlan.c | 2 + + drivers/message/fusion/mptsas.c | 2 +- + drivers/message/fusion/mptscsih.c | 1 - + drivers/message/fusion/mptspi.c | 2 +- + drivers/mfd/ocelot-core.c | 13 + + drivers/net/Kconfig | 2 + + drivers/net/bonding/bond_main.c | 30 + + drivers/net/can/Kconfig | 12 + + drivers/net/can/Makefile | 1 + + drivers/net/can/bxcan.c | 1098 ++ + drivers/net/can/c_can/c_can_pci.c | 2 - + drivers/net/can/ctucanfd/ctucanfd_pci.c | 8 +- + drivers/net/can/kvaser_pciefd.c | 1 - + drivers/net/can/m_can/m_can.c | 37 +- + drivers/net/can/rcar/rcar_canfd.c | 71 +- + drivers/net/can/usb/esd_usb.c | 195 +- + drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c | 102 +- + drivers/net/dsa/Kconfig | 26 +- + drivers/net/dsa/Makefile | 2 + + drivers/net/dsa/b53/b53_common.c | 78 + + drivers/net/dsa/b53/b53_mdio.c | 5 +- + drivers/net/dsa/b53/b53_mmap.c | 29 +- + drivers/net/dsa/b53/b53_priv.h | 17 +- + drivers/net/dsa/b53/b53_regs.h | 1 + + drivers/net/dsa/hirschmann/hellcreek_ptp.c | 45 +- + drivers/net/dsa/lan9303_i2c.c | 2 +- + drivers/net/dsa/lan9303_mdio.c | 2 +- + drivers/net/dsa/lantiq_gswip.c | 2 +- + drivers/net/dsa/microchip/ksz8.h | 8 +- + drivers/net/dsa/microchip/ksz8795.c | 179 +- + drivers/net/dsa/microchip/ksz9477_i2c.c | 2 +- + drivers/net/dsa/microchip/ksz_common.c | 240 +- + drivers/net/dsa/microchip/ksz_common.h | 18 +- + drivers/net/dsa/mt7530-mdio.c | 271 + + drivers/net/dsa/mt7530-mmio.c | 101 + + drivers/net/dsa/mt7530.c | 720 +- + drivers/net/dsa/mt7530.h | 89 +- + drivers/net/dsa/mv88e6xxx/chip.c | 387 +- + drivers/net/dsa/mv88e6xxx/global2.c | 20 +- + drivers/net/dsa/ocelot/felix.c | 24 +- + drivers/net/dsa/ocelot/felix.h | 7 + + drivers/net/dsa/ocelot/felix_vsc9959.c | 43 +- + drivers/net/dsa/ocelot/ocelot_ext.c | 18 +- + drivers/net/dsa/ocelot/seville_vsc9953.c | 2 +- + drivers/net/dsa/qca/Kconfig | 8 + + drivers/net/dsa/qca/Makefile | 3 + + drivers/net/dsa/qca/qca8k-8xxx.c | 21 +- + drivers/net/dsa/qca/qca8k-leds.c | 277 + + drivers/net/dsa/qca/qca8k.h | 74 + + drivers/net/dsa/qca/qca8k_leds.h | 16 + + drivers/net/dsa/realtek/rtl8365mb.c | 40 +- + drivers/net/ethernet/8390/axnet_cs.c | 3 - + drivers/net/ethernet/Kconfig | 2 +- + drivers/net/ethernet/alteon/acenic.c | 3 +- + drivers/net/ethernet/amazon/ena/ena_eth_com.h | 4 + + drivers/net/ethernet/amazon/ena/ena_ethtool.c | 66 +- + drivers/net/ethernet/amazon/ena/ena_netdev.c | 261 +- + drivers/net/ethernet/amazon/ena/ena_netdev.h | 15 +- + drivers/net/ethernet/amd/Kconfig | 12 + + drivers/net/ethernet/amd/Makefile | 1 + + drivers/net/ethernet/amd/nmclan_cs.c | 2 +- + drivers/net/ethernet/amd/pds_core/Makefile | 14 + + drivers/net/ethernet/amd/pds_core/adminq.c | 290 + + drivers/net/ethernet/amd/pds_core/auxbus.c | 264 + + drivers/net/ethernet/amd/pds_core/core.c | 597 + + drivers/net/ethernet/amd/pds_core/core.h | 312 + + drivers/net/ethernet/amd/pds_core/debugfs.c | 170 + + drivers/net/ethernet/amd/pds_core/dev.c | 351 + + drivers/net/ethernet/amd/pds_core/devlink.c | 183 + + drivers/net/ethernet/amd/pds_core/fw.c | 194 + + drivers/net/ethernet/amd/pds_core/main.c | 475 + + .../net/ethernet/aquantia/atlantic/aq_drvinfo.c | 2 +- + drivers/net/ethernet/atheros/alx/main.c | 4 - + drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 10 - + drivers/net/ethernet/broadcom/bnx2.c | 52 +- + drivers/net/ethernet/broadcom/bnx2.h | 1 - + drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 1 - + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 3 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 19 - + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 57 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 66 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 2 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c | 14 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c | 16 + + drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c | 29 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.h | 6 + + drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c | 6 +- + drivers/net/ethernet/broadcom/sb1250-mac.c | 6 +- + drivers/net/ethernet/cadence/macb.h | 8 +- + drivers/net/ethernet/cadence/macb_main.c | 41 +- + drivers/net/ethernet/cadence/macb_ptp.c | 4 +- + drivers/net/ethernet/cavium/liquidio/lio_main.c | 1 - + drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 1 - + .../net/ethernet/cavium/liquidio/request_manager.c | 9 - + drivers/net/ethernet/chelsio/cxgb3/sge.c | 5 - + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 4 - + .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 2 - + drivers/net/ethernet/ec_bhf.c | 2 - + drivers/net/ethernet/emulex/benet/be_cmds.c | 27 +- + drivers/net/ethernet/emulex/benet/be_main.c | 10 +- + drivers/net/ethernet/engleder/tsnep.h | 16 +- + drivers/net/ethernet/engleder/tsnep_main.c | 864 +- + drivers/net/ethernet/engleder/tsnep_xdp.c | 66 + + drivers/net/ethernet/freescale/Kconfig | 1 + + drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 12 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c | 3 +- + drivers/net/ethernet/freescale/enetc/Kconfig | 1 + + drivers/net/ethernet/freescale/enetc/enetc.c | 20 +- + drivers/net/ethernet/freescale/enetc/enetc.h | 4 + + .../net/ethernet/freescale/enetc/enetc_ethtool.c | 94 +- + drivers/net/ethernet/freescale/enetc/enetc_hw.h | 7 + + drivers/net/ethernet/fungible/funcore/fun_dev.c | 7 - + drivers/net/ethernet/google/gve/gve.h | 110 +- + drivers/net/ethernet/google/gve/gve_adminq.c | 8 +- + drivers/net/ethernet/google/gve/gve_adminq.h | 4 +- + drivers/net/ethernet/google/gve/gve_ethtool.c | 91 +- + drivers/net/ethernet/google/gve/gve_main.c | 719 +- + drivers/net/ethernet/google/gve/gve_rx.c | 147 +- + drivers/net/ethernet/google/gve/gve_rx_dqo.c | 2 +- + drivers/net/ethernet/google/gve/gve_tx.c | 298 +- + drivers/net/ethernet/google/gve/gve_utils.c | 6 +- + drivers/net/ethernet/google/gve/gve_utils.h | 3 +- + drivers/net/ethernet/hisilicon/hns3/hnae3.h | 12 + + .../hisilicon/hns3/hns3_common/hclge_comm_cmd.c | 1 + + .../hisilicon/hns3/hns3_common/hclge_comm_cmd.h | 3 + + drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c | 3 + + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 3 +- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 6 + + drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 27 + + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 12 + + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 137 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 8 + + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 6 +- + drivers/net/ethernet/intel/Kconfig | 17 - + drivers/net/ethernet/intel/Makefile | 1 - + drivers/net/ethernet/intel/e1000e/netdev.c | 1 - + drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 1 - + drivers/net/ethernet/intel/i40e/i40e.h | 1 - + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 7 + + drivers/net/ethernet/intel/i40e/i40e_main.c | 88 +- + drivers/net/ethernet/intel/i40e/i40e_trace.h | 20 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 422 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.h | 20 +- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 74 +- + drivers/net/ethernet/intel/iavf/iavf.h | 1 - + drivers/net/ethernet/intel/ice/ice.h | 1 - + drivers/net/ethernet/intel/ice/ice_common.c | 29 +- + drivers/net/ethernet/intel/ice/ice_controlq.c | 12 +- + drivers/net/ethernet/intel/ice/ice_controlq.h | 3 +- + drivers/net/ethernet/intel/ice/ice_devlink.c | 1 - + drivers/net/ethernet/intel/ice/ice_gnss.c | 42 +- + drivers/net/ethernet/intel/ice/ice_gnss.h | 3 +- + drivers/net/ethernet/intel/ice/ice_main.c | 12 +- + drivers/net/ethernet/intel/ice/ice_sriov.c | 77 +- + drivers/net/ethernet/intel/ice/ice_sriov.h | 15 - + drivers/net/ethernet/intel/ice/ice_type.h | 17 +- + drivers/net/ethernet/intel/ice/ice_vf_lib.c | 15 +- + drivers/net/ethernet/intel/ice/ice_vf_lib.h | 2 +- + drivers/net/ethernet/intel/ice/ice_vf_mbx.c | 249 +- + drivers/net/ethernet/intel/ice/ice_vf_mbx.h | 17 +- + drivers/net/ethernet/intel/ice/ice_virtchnl.c | 49 +- + drivers/net/ethernet/intel/ice/ice_virtchnl.h | 8 + + drivers/net/ethernet/intel/igb/igb_main.c | 1 - + drivers/net/ethernet/intel/igb/igb_ptp.c | 11 +- + drivers/net/ethernet/intel/igbvf/netdev.c | 29 + + drivers/net/ethernet/intel/igc/igc.h | 4 +- + drivers/net/ethernet/intel/igc/igc_defines.h | 3 - + drivers/net/ethernet/intel/igc/igc_ethtool.c | 1 + + drivers/net/ethernet/intel/igc/igc_hw.h | 1 + + drivers/net/ethernet/intel/igc/igc_i225.c | 19 +- + drivers/net/ethernet/intel/igc/igc_main.c | 52 +- + drivers/net/ethernet/intel/igc/igc_regs.h | 1 - + drivers/net/ethernet/intel/igc/igc_tsn.c | 12 + + drivers/net/ethernet/intel/ixgb/Makefile | 9 - + drivers/net/ethernet/intel/ixgb/ixgb.h | 179 - + drivers/net/ethernet/intel/ixgb/ixgb_ee.c | 580 - + drivers/net/ethernet/intel/ixgb/ixgb_ee.h | 79 - + drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c | 642 - + drivers/net/ethernet/intel/ixgb/ixgb_hw.c | 1229 -- + drivers/net/ethernet/intel/ixgb/ixgb_hw.h | 767 - + drivers/net/ethernet/intel/ixgb/ixgb_ids.h | 23 - + drivers/net/ethernet/intel/ixgb/ixgb_main.c | 2285 --- + drivers/net/ethernet/intel/ixgb/ixgb_osdep.h | 39 - + drivers/net/ethernet/intel/ixgb/ixgb_param.c | 442 - + drivers/net/ethernet/intel/ixgbe/ixgbe.h | 1 - + drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 23 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 44 +- + drivers/net/ethernet/marvell/Kconfig | 1 + + drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 24 +- + .../net/ethernet/marvell/octeon_ep/octep_cn9k_pf.c | 72 +- + .../net/ethernet/marvell/octeon_ep/octep_config.h | 6 + + .../ethernet/marvell/octeon_ep/octep_ctrl_mbox.c | 276 +- + .../ethernet/marvell/octeon_ep/octep_ctrl_mbox.h | 88 +- + .../ethernet/marvell/octeon_ep/octep_ctrl_net.c | 387 +- + .../ethernet/marvell/octeon_ep/octep_ctrl_net.h | 196 +- + .../net/ethernet/marvell/octeon_ep/octep_ethtool.c | 12 +- + .../net/ethernet/marvell/octeon_ep/octep_main.c | 184 +- + .../net/ethernet/marvell/octeon_ep/octep_main.h | 18 +- + .../marvell/octeon_ep/octep_regs_cn9k_pf.h | 6 + + drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 4 +- + drivers/net/ethernet/marvell/pxa168_eth.c | 2 +- + drivers/net/ethernet/mediatek/Kconfig | 2 + + drivers/net/ethernet/mediatek/Makefile | 2 +- + drivers/net/ethernet/mediatek/mtk_eth_path.c | 14 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 192 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.h | 121 +- + drivers/net/ethernet/mediatek/mtk_ppe.c | 135 +- + drivers/net/ethernet/mediatek/mtk_ppe.h | 26 +- + drivers/net/ethernet/mediatek/mtk_ppe_debugfs.c | 11 +- + drivers/net/ethernet/mediatek/mtk_ppe_offload.c | 48 +- + drivers/net/ethernet/mediatek/mtk_ppe_regs.h | 14 + + drivers/net/ethernet/mediatek/mtk_sgmii.c | 207 - + drivers/net/ethernet/mediatek/mtk_wed.c | 101 + + drivers/net/ethernet/mediatek/mtk_wed_debugfs.c | 2 - + drivers/net/ethernet/mediatek/mtk_wed_mcu.c | 7 +- + drivers/net/ethernet/mediatek/mtk_wed_wo.h | 1 + + drivers/net/ethernet/mellanox/mlx4/en_tx.c | 8 +- + drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/Makefile | 11 +- + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/dev.c | 14 +- + drivers/net/ethernet/mellanox/mlx5/core/devlink.c | 73 +- + drivers/net/ethernet/mellanox/mlx5/core/devlink.h | 13 + + .../mellanox/mlx5/core/diag/reporter_vnic.c | 125 + + .../mellanox/mlx5/core/diag/reporter_vnic.h | 16 + + drivers/net/ethernet/mellanox/mlx5/core/en.h | 114 +- + .../net/ethernet/mellanox/mlx5/core/en/params.c | 87 +- + .../net/ethernet/mellanox/mlx5/core/en/params.h | 3 + + drivers/net/ethernet/mellanox/mlx5/core/en/port.c | 157 +- + drivers/net/ethernet/mellanox/mlx5/core/en/port.h | 14 - + drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c | 22 +- + .../ethernet/mellanox/mlx5/core/en/rep/bridge.c | 16 + + .../net/ethernet/mellanox/mlx5/core/en/rep/tc.c | 64 +- + .../ethernet/mellanox/mlx5/core/en/reporter_rx.c | 46 +- + .../ethernet/mellanox/mlx5/core/en/reporter_tx.c | 38 + + .../ethernet/mellanox/mlx5/core/en/tc/act/accept.c | 10 - + .../ethernet/mellanox/mlx5/core/en/tc/act/act.c | 20 - + .../ethernet/mellanox/mlx5/core/en/tc/act/act.h | 8 +- + .../net/ethernet/mellanox/mlx5/core/en/tc/act/ct.c | 66 +- + .../ethernet/mellanox/mlx5/core/en/tc/act/drop.c | 10 - + .../ethernet/mellanox/mlx5/core/en/tc/act/mirred.c | 6 +- + .../ethernet/mellanox/mlx5/core/en/tc/act/pedit.c | 10 - + .../ethernet/mellanox/mlx5/core/en/tc/act/ptype.c | 10 - + .../ethernet/mellanox/mlx5/core/en/tc/act/sample.c | 20 - + .../ethernet/mellanox/mlx5/core/en/tc/act/trap.c | 10 - + .../ethernet/mellanox/mlx5/core/en/tc/act/tun.c | 10 - + .../ethernet/mellanox/mlx5/core/en/tc/act/vlan.c | 10 - + .../mellanox/mlx5/core/en/tc/act/vlan_mangle.c | 10 - + .../ethernet/mellanox/mlx5/core/en/tc/post_act.c | 11 +- + .../ethernet/mellanox/mlx5/core/en/tc/post_act.h | 2 +- + .../net/ethernet/mellanox/mlx5/core/en/tc/sample.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c | 170 +- + drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.h | 31 +- + .../net/ethernet/mellanox/mlx5/core/en/tc_priv.h | 11 +- + .../net/ethernet/mellanox/mlx5/core/en/tc_tun.h | 3 + + .../ethernet/mellanox/mlx5/core/en/tc_tun_encap.c | 37 +- + .../ethernet/mellanox/mlx5/core/en/tc_tun_geneve.c | 24 +- + .../ethernet/mellanox/mlx5/core/en/tc_tun_vxlan.c | 72 +- + drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h | 21 +- + drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c | 311 +- + drivers/net/ethernet/mellanox/mlx5/core/en/xdp.h | 55 +- + .../net/ethernet/mellanox/mlx5/core/en/xsk/rx.c | 54 +- + .../net/ethernet/mellanox/mlx5/core/en/xsk/setup.c | 10 +- + .../net/ethernet/mellanox/mlx5/core/en/xsk/tx.c | 12 +- + .../ethernet/mellanox/mlx5/core/en_accel/ipsec.c | 593 +- + .../ethernet/mellanox/mlx5/core/en_accel/ipsec.h | 71 +- + .../mellanox/mlx5/core/en_accel/ipsec_fs.c | 790 +- + .../mellanox/mlx5/core/en_accel/ipsec_offload.c | 236 +- + .../ethernet/mellanox/mlx5/core/en_accel/macsec.c | 42 +- + .../mellanox/mlx5/core/en_accel/macsec_fs.c | 12 +- + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 12 +- + drivers/net/ethernet/mellanox/mlx5/core/en_fs.c | 5 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 270 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 54 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.h | 1 + + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 660 +- + drivers/net/ethernet/mellanox/mlx5/core/en_stats.c | 20 - + drivers/net/ethernet/mellanox/mlx5/core/en_stats.h | 10 - + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 357 +- + drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/eq.c | 225 +- + .../net/ethernet/mellanox/mlx5/core/esw/bridge.c | 287 +- + .../net/ethernet/mellanox/mlx5/core/esw/bridge.h | 17 + + .../ethernet/mellanox/mlx5/core/esw/bridge_mcast.c | 1126 ++ + .../ethernet/mellanox/mlx5/core/esw/bridge_priv.h | 181 + + .../net/ethernet/mellanox/mlx5/core/esw/debugfs.c | 198 - + .../mlx5/core/esw/diag/bridge_tracepoint.h | 35 + + drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c | 2 +- + .../net/ethernet/mellanox/mlx5/core/esw/vporttbl.c | 12 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 20 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 22 +- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 83 +- + .../mellanox/mlx5/core/eswitch_offloads_termtbl.c | 32 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 7 +- + drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/health.c | 8 + + .../net/ethernet/mellanox/mlx5/core/irq_affinity.c | 42 +- + .../net/ethernet/mellanox/mlx5/core/lib/clock.c | 2 +- + .../ethernet/mellanox/mlx5/core/lib/fs_chains.c | 89 +- + .../ethernet/mellanox/mlx5/core/lib/fs_chains.h | 9 +- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 47 +- + .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/mlx5_irq.h | 10 +- + drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c | 249 +- + drivers/net/ethernet/mellanox/mlx5/core/pci_irq.h | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/port.c | 151 + + .../ethernet/mellanox/mlx5/core/sf/dev/driver.c | 2 +- + .../mellanox/mlx5/core/steering/dr_action.c | 92 +- + .../ethernet/mellanox/mlx5/core/steering/dr_arg.c | 273 + + .../ethernet/mellanox/mlx5/core/steering/dr_cmd.c | 60 + + .../ethernet/mellanox/mlx5/core/steering/dr_dbg.c | 46 +- + .../mellanox/mlx5/core/steering/dr_domain.c | 58 +- + .../mellanox/mlx5/core/steering/dr_icm_pool.c | 82 +- + .../ethernet/mellanox/mlx5/core/steering/dr_ptrn.c | 241 + + .../ethernet/mellanox/mlx5/core/steering/dr_send.c | 270 +- + .../ethernet/mellanox/mlx5/core/steering/dr_ste.c | 57 + + .../ethernet/mellanox/mlx5/core/steering/dr_ste.h | 2 + + .../mellanox/mlx5/core/steering/dr_ste_v1.c | 120 +- + .../mellanox/mlx5/core/steering/dr_ste_v1.h | 2 + + .../mellanox/mlx5/core/steering/dr_ste_v2.c | 2 + + .../mellanox/mlx5/core/steering/dr_types.h | 76 +- + .../mlx5/core/steering/mlx5_ifc_dr_ste_v1.h | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/thermal.c | 108 + + drivers/net/ethernet/mellanox/mlx5/core/thermal.h | 20 + + drivers/net/ethernet/mellanox/mlxsw/core_thermal.c | 165 +- + drivers/net/ethernet/micrel/ksz884x.c | 304 +- + drivers/net/ethernet/microchip/lan743x_main.c | 1 - + drivers/net/ethernet/microchip/lan966x/Kconfig | 1 - + .../net/ethernet/microchip/lan966x/lan966x_fdma.c | 37 +- + .../net/ethernet/microchip/lan966x/lan966x_main.c | 76 +- + .../net/ethernet/microchip/lan966x/lan966x_main.h | 49 +- + .../ethernet/microchip/lan966x/lan966x_police.c | 13 +- + .../net/ethernet/microchip/lan966x/lan966x_ptp.c | 20 +- + .../net/ethernet/microchip/lan966x/lan966x_regs.h | 36 + + .../ethernet/microchip/lan966x/lan966x_tc_flower.c | 221 +- + .../microchip/lan966x/lan966x_vcap_ag_api.c | 1402 +- + .../microchip/lan966x/lan966x_vcap_debugfs.c | 133 +- + .../ethernet/microchip/lan966x/lan966x_vcap_impl.c | 192 +- + .../net/ethernet/microchip/lan966x/lan966x_xdp.c | 10 +- + .../net/ethernet/microchip/sparx5/sparx5_main.c | 1 + + .../net/ethernet/microchip/sparx5/sparx5_main.h | 1 + + .../ethernet/microchip/sparx5/sparx5_tc_flower.c | 209 +- + .../microchip/sparx5/sparx5_vcap_debugfs.c | 2 +- + .../ethernet/microchip/sparx5/sparx5_vcap_impl.c | 270 + + .../ethernet/microchip/sparx5/sparx5_vcap_impl.h | 6 + + drivers/net/ethernet/microchip/vcap/vcap_ag_api.h | 217 +- + drivers/net/ethernet/microchip/vcap/vcap_api.c | 61 + + .../net/ethernet/microchip/vcap/vcap_api_client.h | 11 + + .../microchip/vcap/vcap_api_debugfs_kunit.c | 4 +- + drivers/net/ethernet/microsoft/mana/gdma_main.c | 2 - + drivers/net/ethernet/microsoft/mana/mana_bpf.c | 22 +- + drivers/net/ethernet/microsoft/mana/mana_en.c | 457 +- + drivers/net/ethernet/microsoft/mana/mana_ethtool.c | 52 +- + drivers/net/ethernet/mscc/ocelot.c | 157 +- + drivers/net/ethernet/mscc/ocelot.h | 15 +- + drivers/net/ethernet/mscc/ocelot_io.c | 50 +- + drivers/net/ethernet/mscc/ocelot_mm.c | 107 +- + drivers/net/ethernet/mscc/ocelot_net.c | 50 +- + drivers/net/ethernet/mscc/ocelot_stats.c | 42 +- + drivers/net/ethernet/mscc/ocelot_vsc7514.c | 30 - + drivers/net/ethernet/netronome/nfp/crypto/ipsec.c | 4 +- + .../net/ethernet/netronome/nfp/flower/conntrack.c | 260 +- + .../net/ethernet/netronome/nfp/flower/conntrack.h | 32 +- + .../net/ethernet/netronome/nfp/flower/offload.c | 2 +- + drivers/net/ethernet/netronome/nfp/nfp_hwmon.c | 2 +- + drivers/net/ethernet/netronome/nfp/nfp_port.c | 1 + + drivers/net/ethernet/ni/nixge.c | 2 +- + drivers/net/ethernet/pasemi/pasemi_mac.c | 2 +- + .../net/ethernet/pensando/ionic/ionic_bus_pci.c | 1 - + drivers/net/ethernet/pensando/ionic/ionic_phc.c | 5 +- + drivers/net/ethernet/qlogic/netxen/netxen_nic.h | 2 +- + .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 12 +- + drivers/net/ethernet/qlogic/qed/qed_ll2.c | 3 +- + drivers/net/ethernet/qlogic/qed/qed_main.c | 9 - + drivers/net/ethernet/qlogic/qede/qede.h | 2 - + drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 1 - + drivers/net/ethernet/qlogic/qede/qede_main.c | 1 - + .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 1 - + drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | 4 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 4 - + drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c | 1 - + drivers/net/ethernet/qualcomm/Kconfig | 1 + + drivers/net/ethernet/realtek/r8169_main.c | 238 +- + drivers/net/ethernet/renesas/ravb_main.c | 15 - + drivers/net/ethernet/renesas/rswitch.c | 4 +- + .../net/ethernet/samsung/sxgbe/sxgbe_platform.c | 2 +- + drivers/net/ethernet/sfc/ef100.c | 3 - + drivers/net/ethernet/sfc/efx.c | 5 - + drivers/net/ethernet/sfc/falcon/efx.c | 9 - + drivers/net/ethernet/sfc/mae.c | 239 +- + drivers/net/ethernet/sfc/mae.h | 11 + + drivers/net/ethernet/sfc/mcdi.h | 5 + + drivers/net/ethernet/sfc/ptp.c | 274 +- + drivers/net/ethernet/sfc/siena/efx.c | 5 - + drivers/net/ethernet/sfc/tc.c | 642 +- + drivers/net/ethernet/sfc/tc.h | 41 + + drivers/net/ethernet/sfc/tx_tso.c | 2 +- + drivers/net/ethernet/smsc/smc91x.c | 2 +- + drivers/net/ethernet/smsc/smsc911x.c | 4 +- + drivers/net/ethernet/stmicro/stmmac/Kconfig | 12 + + drivers/net/ethernet/stmicro/stmmac/Makefile | 1 + + drivers/net/ethernet/stmicro/stmmac/chain_mode.c | 10 +- + drivers/net/ethernet/stmicro/stmmac/common.h | 2 +- + .../net/ethernet/stmicro/stmmac/dwmac-anarion.c | 14 +- + .../net/ethernet/stmicro/stmmac/dwmac-generic.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c | 27 + + .../net/ethernet/stmicro/stmmac/dwmac-meson8b.c | 8 +- + .../ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 180 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 197 +- + .../net/ethernet/stmicro/stmmac/dwmac-starfive.c | 171 + + drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c | 60 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 36 +- + .../net/ethernet/stmicro/stmmac/dwmac1000_core.c | 3 +- + .../net/ethernet/stmicro/stmmac/dwmac1000_dma.c | 19 +- + drivers/net/ethernet/stmicro/stmmac/dwmac100_dma.c | 14 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 101 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 50 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c | 8 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c | 201 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.h | 92 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c | 105 +- + drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h | 22 +- + drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c | 18 +- + .../net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 9 +- + .../net/ethernet/stmicro/stmmac/dwxgmac2_descs.c | 6 +- + drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c | 71 +- + drivers/net/ethernet/stmicro/stmmac/enh_desc.c | 11 +- + drivers/net/ethernet/stmicro/stmmac/hwif.c | 13 + + drivers/net/ethernet/stmicro/stmmac/hwif.h | 179 +- + drivers/net/ethernet/stmicro/stmmac/norm_desc.c | 8 +- + drivers/net/ethernet/stmicro/stmmac/ring_mode.c | 10 +- + drivers/net/ethernet/stmicro/stmmac/stmmac.h | 7 + + .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 9 - + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 105 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 3 +- + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 3 +- + drivers/net/ethernet/sun/sunhme.c | 1190 +- + drivers/net/ethernet/sun/sunhme.h | 6 +- + drivers/net/ethernet/sunplus/spl2sw_phy.c | 4 +- + drivers/net/ethernet/ti/am65-cpsw-nuss.c | 105 +- + drivers/net/ethernet/ti/am65-cpsw-nuss.h | 2 + + drivers/net/ethernet/ti/am65-cpsw-qos.c | 113 + + drivers/net/ethernet/ti/am65-cpsw-qos.h | 4 + + drivers/net/ethernet/ti/am65-cpts.c | 34 +- + drivers/net/ethernet/ti/netcp_core.c | 4 +- + drivers/net/ethernet/wangxun/libwx/wx_hw.c | 21 +- + drivers/net/ethernet/wangxun/libwx/wx_hw.h | 1 + + drivers/net/ethernet/wangxun/libwx/wx_lib.c | 5 +- + drivers/net/ethernet/wangxun/libwx/wx_type.h | 7 +- + drivers/net/ethernet/wangxun/ngbe/ngbe_main.c | 9 +- + drivers/net/ethernet/wangxun/ngbe/ngbe_type.h | 1 - + drivers/net/ethernet/wangxun/txgbe/txgbe_main.c | 10 +- + drivers/net/ethernet/wangxun/txgbe/txgbe_type.h | 1 - + drivers/net/fddi/skfp/rmt.c | 6 +- + drivers/net/geneve.c | 11 +- + drivers/net/ieee802154/adf7242.c | 3 +- + drivers/net/ieee802154/at86rf230.c | 2 +- + drivers/net/ieee802154/ca8210.c | 3 +- + drivers/net/ieee802154/mcr20a.c | 2 +- + drivers/net/ipa/Makefile | 12 +- + drivers/net/ipa/data/ipa_data-v5.0.c | 481 + + drivers/net/ipa/gsi.h | 4 +- + drivers/net/ipa/gsi_reg.c | 3 + + drivers/net/ipa/gsi_reg.h | 1 + + drivers/net/ipa/ipa_data.h | 3 +- + drivers/net/ipa/ipa_main.c | 6 +- + drivers/net/ipa/ipa_reg.c | 2 + + drivers/net/ipa/ipa_reg.h | 1 + + drivers/net/ipa/ipa_sysfs.c | 2 + + drivers/net/ipa/reg/gsi_reg-v5.0.c | 317 + + drivers/net/ipa/reg/ipa_reg-v5.0.c | 564 + + drivers/net/macsec.c | 14 +- + drivers/net/macvlan.c | 98 +- + drivers/net/mdio/Kconfig | 3 + + drivers/net/mdio/of_mdio.c | 4 +- + drivers/net/pcs/Kconfig | 7 + + drivers/net/pcs/Makefile | 1 + + drivers/net/pcs/pcs-lynx.c | 4 +- + drivers/net/pcs/pcs-mtk-lynxi.c | 305 + + drivers/net/pcs/pcs-xpcs.c | 23 +- + drivers/net/phy/Kconfig | 18 + + drivers/net/phy/Makefile | 2 + + drivers/net/phy/aquantia_hwmon.c | 2 +- + drivers/net/phy/at803x.c | 3 +- + drivers/net/phy/bcm54140.c | 2 +- + drivers/net/phy/bcm7xxx.c | 22 +- + drivers/net/phy/dp83867.c | 62 +- + drivers/net/phy/marvell-88x2222.c | 4 +- + drivers/net/phy/marvell.c | 83 +- + drivers/net/phy/marvell10g.c | 2 +- + drivers/net/phy/meson-gxl.c | 81 +- + drivers/net/phy/micrel.c | 563 +- + drivers/net/phy/microchip_t1s.c | 138 + + drivers/net/phy/mxl-gpy.c | 37 +- + drivers/net/phy/nxp-cbtx.c | 227 + + drivers/net/phy/nxp-tja11xx.c | 2 +- + drivers/net/phy/phy.c | 33 +- + drivers/net/phy/phy_device.c | 112 +- + drivers/net/phy/phylink.c | 37 +- + drivers/net/phy/sfp-bus.c | 8 +- + drivers/net/phy/sfp.c | 68 +- + drivers/net/phy/smsc.c | 170 +- + drivers/net/phy/spi_ks8995.c | 2 +- + drivers/net/tap.c | 15 +- + drivers/net/thunderbolt/main.c | 25 +- + drivers/net/tun.c | 2 + + drivers/net/veth.c | 68 +- + drivers/net/virtio_net.c | 6 +- + drivers/net/vxlan/Makefile | 2 +- + drivers/net/vxlan/vxlan_core.c | 109 +- + drivers/net/vxlan/vxlan_mdb.c | 1462 ++ + drivers/net/vxlan/vxlan_private.h | 84 + + drivers/net/wireless/Kconfig | 75 +- + drivers/net/wireless/Makefile | 11 +- + drivers/net/wireless/ath/ath.h | 12 +- + drivers/net/wireless/ath/ath10k/ce.c | 59 - + drivers/net/wireless/ath/ath10k/mac.c | 1 - + drivers/net/wireless/ath/ath10k/pci.c | 6 +- + drivers/net/wireless/ath/ath10k/snoc.c | 1 + + drivers/net/wireless/ath/ath11k/ahb.c | 16 +- + drivers/net/wireless/ath/ath11k/core.c | 10 +- + drivers/net/wireless/ath/ath11k/dbring.c | 12 +- + .../net/wireless/ath/ath11k/debugfs_htt_stats.h | 73 +- + drivers/net/wireless/ath/ath11k/dp.c | 4 +- + drivers/net/wireless/ath/ath11k/dp.h | 6 +- + drivers/net/wireless/ath/ath11k/dp_rx.c | 140 +- + drivers/net/wireless/ath/ath11k/dp_tx.c | 33 +- + drivers/net/wireless/ath/ath11k/dp_tx.h | 1 + + drivers/net/wireless/ath/ath11k/hal_rx.c | 14 +- + drivers/net/wireless/ath/ath11k/hal_rx.h | 20 +- + drivers/net/wireless/ath/ath11k/hw.c | 29 +- + drivers/net/wireless/ath/ath11k/hw.h | 3 +- + drivers/net/wireless/ath/ath11k/mac.c | 297 +- + drivers/net/wireless/ath/ath11k/pci.c | 14 +- + drivers/net/wireless/ath/ath11k/peer.c | 5 +- + drivers/net/wireless/ath/ath11k/peer.h | 1 + + drivers/net/wireless/ath/ath11k/reg.c | 59 +- + drivers/net/wireless/ath/ath11k/wmi.c | 654 +- + drivers/net/wireless/ath/ath11k/wmi.h | 371 +- + drivers/net/wireless/ath/ath12k/ce.c | 2 +- + drivers/net/wireless/ath/ath12k/core.h | 3 +- + drivers/net/wireless/ath/ath12k/dp.c | 7 +- + drivers/net/wireless/ath/ath12k/dp.h | 6 +- + drivers/net/wireless/ath/ath12k/dp_mon.c | 19 +- + drivers/net/wireless/ath/ath12k/dp_rx.c | 26 +- + drivers/net/wireless/ath/ath12k/dp_tx.c | 6 +- + drivers/net/wireless/ath/ath12k/hal.c | 2 +- + drivers/net/wireless/ath/ath12k/hal.h | 12 +- + drivers/net/wireless/ath/ath12k/hal_desc.h | 10 +- + drivers/net/wireless/ath/ath12k/hw.c | 2 +- + drivers/net/wireless/ath/ath12k/mac.c | 117 +- + drivers/net/wireless/ath/ath12k/pci.c | 55 +- + drivers/net/wireless/ath/ath12k/pci.h | 6 + + drivers/net/wireless/ath/ath12k/qmi.c | 4 +- + drivers/net/wireless/ath/ath12k/rx_desc.h | 2 +- + drivers/net/wireless/ath/ath12k/wmi.c | 12 +- + drivers/net/wireless/ath/ath12k/wmi.h | 4 +- + drivers/net/wireless/ath/ath5k/ahb.c | 10 +- + drivers/net/wireless/ath/ath5k/eeprom.c | 2 +- + drivers/net/wireless/ath/ath6kl/bmi.c | 2 +- + drivers/net/wireless/ath/ath6kl/htc_pipe.c | 4 +- + drivers/net/wireless/ath/ath9k/hif_usb.c | 21 +- + drivers/net/wireless/ath/ath9k/xmit.c | 30 +- + drivers/net/wireless/ath/carl9170/cmd.c | 2 +- + drivers/net/wireless/ath/carl9170/fwcmd.h | 4 +- + drivers/net/wireless/ath/key.c | 2 +- + drivers/net/wireless/ath/wcn36xx/dxe.c | 23 +- + drivers/net/wireless/ath/wcn36xx/dxe.h | 4 +- + drivers/net/wireless/ath/wcn36xx/main.c | 1 + + drivers/net/wireless/ath/wcn36xx/smd.c | 4 +- + drivers/net/wireless/ath/wcn36xx/wcn36xx.h | 1 + + drivers/net/wireless/broadcom/b43legacy/dma.c | 8 - + drivers/net/wireless/broadcom/b43legacy/radio.c | 17 - + .../wireless/broadcom/brcm80211/brcmfmac/Makefile | 2 + + .../wireless/broadcom/brcm80211/brcmfmac/acpi.c | 51 + + .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 9 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/bus.h | 1 + + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 330 +- + .../wireless/broadcom/brcm80211/brcmfmac/chip.c | 25 +- + .../wireless/broadcom/brcm80211/brcmfmac/common.c | 118 +- + .../wireless/broadcom/brcm80211/brcmfmac/common.h | 11 + + .../wireless/broadcom/brcm80211/brcmfmac/feature.c | 49 + + .../wireless/broadcom/brcm80211/brcmfmac/feature.h | 6 +- + .../broadcom/brcm80211/brcmfmac/fwil_types.h | 157 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/of.c | 9 +- + .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 61 +- + .../wireless/broadcom/brcm80211/brcmsmac/ampdu.c | 3 +- + .../broadcom/brcm80211/brcmsmac/mac80211_if.c | 2 - + .../broadcom/brcm80211/include/brcm_hw_ids.h | 2 + + drivers/net/wireless/cisco/Kconfig | 2 +- + drivers/net/wireless/intel/ipw2x00/ipw2200.c | 20 +- + drivers/net/wireless/intel/ipw2x00/ipw2200.h | 3 +- + drivers/net/wireless/intel/iwlwifi/cfg/22000.c | 174 +- + drivers/net/wireless/intel/iwlwifi/dvm/sta.c | 5 +- + drivers/net/wireless/intel/iwlwifi/fw/acpi.c | 41 +- + .../net/wireless/intel/iwlwifi/fw/api/commands.h | 18 + + drivers/net/wireless/intel/iwlwifi/fw/api/d3.h | 37 +- + .../net/wireless/intel/iwlwifi/fw/api/datapath.h | 184 +- + drivers/net/wireless/intel/iwlwifi/fw/api/debug.h | 96 + + .../net/wireless/intel/iwlwifi/fw/api/mac-cfg.h | 418 +- + drivers/net/wireless/intel/iwlwifi/fw/api/rs.h | 27 +- + drivers/net/wireless/intel/iwlwifi/fw/api/rx.h | 86 +- + drivers/net/wireless/intel/iwlwifi/fw/api/scan.h | 3 + + drivers/net/wireless/intel/iwlwifi/fw/api/tx.h | 10 +- + drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 42 +- + drivers/net/wireless/intel/iwlwifi/fw/debugfs.c | 4 +- + drivers/net/wireless/intel/iwlwifi/fw/dump.c | 69 +- + drivers/net/wireless/intel/iwlwifi/fw/error-dump.h | 17 +- + drivers/net/wireless/intel/iwlwifi/fw/file.h | 7 + + drivers/net/wireless/intel/iwlwifi/fw/img.h | 5 +- + drivers/net/wireless/intel/iwlwifi/fw/pnvm.c | 20 +- + drivers/net/wireless/intel/iwlwifi/fw/rs.c | 4 +- + drivers/net/wireless/intel/iwlwifi/fw/runtime.h | 5 + + drivers/net/wireless/intel/iwlwifi/fw/uefi.c | 2 +- + drivers/net/wireless/intel/iwlwifi/iwl-config.h | 15 + + drivers/net/wireless/intel/iwlwifi/iwl-csr.h | 5 + + drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c | 34 +- + drivers/net/wireless/intel/iwlwifi/iwl-debug.c | 3 +- + drivers/net/wireless/intel/iwlwifi/iwl-devtrace.c | 3 + + drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 18 +- + .../net/wireless/intel/iwlwifi/iwl-eeprom-parse.h | 5 +- + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 27 +- + drivers/net/wireless/intel/iwlwifi/iwl-prph.h | 7 + + drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 25 +- + drivers/net/wireless/intel/iwlwifi/mei/iwl-mei.h | 4 +- + drivers/net/wireless/intel/iwlwifi/mei/main.c | 40 +- + drivers/net/wireless/intel/iwlwifi/mvm/Makefile | 4 +- + drivers/net/wireless/intel/iwlwifi/mvm/binding.c | 13 +- + drivers/net/wireless/intel/iwlwifi/mvm/coex.c | 104 +- + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 75 +- + .../net/wireless/intel/iwlwifi/mvm/debugfs-vif.c | 14 +- + drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 258 +- + .../net/wireless/intel/iwlwifi/mvm/ftm-initiator.c | 31 +- + .../net/wireless/intel/iwlwifi/mvm/ftm-responder.c | 21 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 278 +- + drivers/net/wireless/intel/iwlwifi/mvm/link.c | 294 + + drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 494 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 2154 ++- + drivers/net/wireless/intel/iwlwifi/mvm/mld-key.c | 129 +- + drivers/net/wireless/intel/iwlwifi/mvm/mld-mac.c | 309 + + .../net/wireless/intel/iwlwifi/mvm/mld-mac80211.c | 1101 ++ + drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c | 1167 ++ + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 557 +- + drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 58 +- + drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c | 4 +- + drivers/net/wireless/intel/iwlwifi/mvm/power.c | 45 +- + drivers/net/wireless/intel/iwlwifi/mvm/ptp.c | 326 + + drivers/net/wireless/intel/iwlwifi/mvm/quota.c | 11 +- + drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c | 207 +- + drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 90 +- + drivers/net/wireless/intel/iwlwifi/mvm/rs.h | 31 +- + drivers/net/wireless/intel/iwlwifi/mvm/rx.c | 43 +- + drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 700 +- + drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 140 +- + drivers/net/wireless/intel/iwlwifi/mvm/sf.c | 57 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 713 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.h | 136 +- + drivers/net/wireless/intel/iwlwifi/mvm/tdls.c | 8 +- + .../net/wireless/intel/iwlwifi/mvm/time-event.c | 12 +- + drivers/net/wireless/intel/iwlwifi/mvm/time-sync.c | 173 + + drivers/net/wireless/intel/iwlwifi/mvm/time-sync.h | 30 + + drivers/net/wireless/intel/iwlwifi/mvm/tt.c | 4 +- + drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 162 +- + drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 91 +- + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 436 +- + drivers/net/wireless/intel/iwlwifi/pcie/internal.h | 1 + + drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 18 +- + .../net/wireless/intel/iwlwifi/pcie/trans-gen2.c | 78 +- + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 15 +- + drivers/net/wireless/intel/iwlwifi/queue/tx.c | 10 +- + drivers/net/wireless/legacy/Kconfig | 55 + + drivers/net/wireless/legacy/Makefile | 6 + + drivers/net/wireless/{ => legacy}/ray_cs.c | 0 + drivers/net/wireless/{ => legacy}/ray_cs.h | 0 + drivers/net/wireless/{ => legacy}/rayctl.h | 0 + drivers/net/wireless/{ => legacy}/rndis_wlan.c | 8 +- + drivers/net/wireless/{ => legacy}/wl3501.h | 0 + drivers/net/wireless/{ => legacy}/wl3501_cs.c | 0 + drivers/net/wireless/marvell/mwifiex/11h.c | 4 - + drivers/net/wireless/mediatek/mt76/dma.c | 10 +- + drivers/net/wireless/mediatek/mt76/dma.h | 1 + + drivers/net/wireless/mediatek/mt76/mac80211.c | 17 +- + drivers/net/wireless/mediatek/mt76/mt76.h | 19 +- + drivers/net/wireless/mediatek/mt76/mt7603/mac.c | 5 +- + drivers/net/wireless/mediatek/mt76/mt7615/dma.c | 5 +- + drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c | 7 +- + drivers/net/wireless/mediatek/mt76/mt7615/eeprom.h | 2 +- + drivers/net/wireless/mediatek/mt76/mt7615/init.c | 1 + + drivers/net/wireless/mediatek/mt76/mt7615/mac.c | 18 +- + drivers/net/wireless/mediatek/mt76/mt7615/mac.h | 12 - + drivers/net/wireless/mediatek/mt76/mt7615/mcu.c | 11 +- + drivers/net/wireless/mediatek/mt76/mt7615/mcu.h | 11 - + drivers/net/wireless/mediatek/mt76/mt7615/mmio.c | 11 +- + drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h | 11 +- + drivers/net/wireless/mediatek/mt76/mt7615/pci.c | 2 +- + .../net/wireless/mediatek/mt76/mt7615/pci_init.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7615/sdio.c | 1 - + drivers/net/wireless/mediatek/mt76/mt7615/usb.c | 1 - + drivers/net/wireless/mediatek/mt76/mt76_connac.h | 21 + + .../net/wireless/mediatek/mt76/mt76_connac2_mac.h | 22 + + .../net/wireless/mediatek/mt76/mt76_connac_mac.c | 78 +- + .../net/wireless/mediatek/mt76/mt76_connac_mcu.c | 21 +- + .../net/wireless/mediatek/mt76/mt76_connac_mcu.h | 19 +- + drivers/net/wireless/mediatek/mt76/mt76x02_mac.c | 5 +- + .../net/wireless/mediatek/mt76/mt7915/debugfs.c | 36 +- + drivers/net/wireless/mediatek/mt76/mt7915/dma.c | 10 +- + drivers/net/wireless/mediatek/mt76/mt7915/init.c | 35 +- + drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 6 +- + drivers/net/wireless/mediatek/mt76/mt7915/mac.h | 33 +- + drivers/net/wireless/mediatek/mt76/mt7915/main.c | 1 - + drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 115 +- + drivers/net/wireless/mediatek/mt76/mt7915/mmio.c | 17 +- + drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h | 18 +- + drivers/net/wireless/mediatek/mt76/mt7915/soc.c | 2 + + .../net/wireless/mediatek/mt76/mt7921/acpi_sar.h | 10 +- + .../net/wireless/mediatek/mt76/mt7921/debugfs.c | 1 - + drivers/net/wireless/mediatek/mt76/mt7921/dma.c | 50 +- + drivers/net/wireless/mediatek/mt76/mt7921/eeprom.h | 30 - + drivers/net/wireless/mediatek/mt76/mt7921/init.c | 43 +- + drivers/net/wireless/mediatek/mt76/mt7921/mac.c | 18 +- + drivers/net/wireless/mediatek/mt76/mt7921/mac.h | 53 - + drivers/net/wireless/mediatek/mt76/mt7921/main.c | 42 +- + drivers/net/wireless/mediatek/mt76/mt7921/mcu.c | 31 +- + drivers/net/wireless/mediatek/mt76/mt7921/mcu.h | 11 - + drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h | 23 +- + drivers/net/wireless/mediatek/mt76/mt7921/pci.c | 64 +- + .../net/wireless/mediatek/mt76/mt7921/pci_mac.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7921/sdio.c | 23 +- + .../net/wireless/mediatek/mt76/mt7921/sdio_mac.c | 2 +- + .../net/wireless/mediatek/mt76/mt7921/sdio_mcu.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7921/usb.c | 27 +- + .../net/wireless/mediatek/mt76/mt7921/usb_mac.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7996/Kconfig | 1 + + drivers/net/wireless/mediatek/mt76/mt7996/Makefile | 2 + + .../net/wireless/mediatek/mt76/mt7996/coredump.c | 268 + + .../net/wireless/mediatek/mt76/mt7996/coredump.h | 97 + + .../net/wireless/mediatek/mt76/mt7996/debugfs.c | 149 +- + drivers/net/wireless/mediatek/mt76/mt7996/dma.c | 64 + + drivers/net/wireless/mediatek/mt76/mt7996/eeprom.c | 4 - + drivers/net/wireless/mediatek/mt76/mt7996/eeprom.h | 9 +- + drivers/net/wireless/mediatek/mt76/mt7996/init.c | 72 +- + drivers/net/wireless/mediatek/mt76/mt7996/mac.c | 501 +- + drivers/net/wireless/mediatek/mt76/mt7996/mac.h | 62 +- + drivers/net/wireless/mediatek/mt76/mt7996/main.c | 78 +- + drivers/net/wireless/mediatek/mt76/mt7996/mcu.c | 222 +- + drivers/net/wireless/mediatek/mt76/mt7996/mcu.h | 30 +- + drivers/net/wireless/mediatek/mt76/mt7996/mmio.c | 23 +- + drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h | 76 +- + drivers/net/wireless/mediatek/mt76/mt7996/regs.h | 51 +- + drivers/net/wireless/mediatek/mt76/tx.c | 6 +- + drivers/net/wireless/quantenna/qtnfmac/commands.c | 7 +- + drivers/net/wireless/ralink/rt2x00/rt2x00dev.c | 1 + + drivers/net/wireless/realtek/rtl8xxxu/Kconfig | 2 +- + drivers/net/wireless/realtek/rtl8xxxu/Makefile | 2 +- + drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 332 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c | 22 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188f.c | 15 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192c.c | 7 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c | 60 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8710b.c | 1887 +++ + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723a.c | 9 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c | 11 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 396 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h | 44 + + drivers/net/wireless/realtek/rtlwifi/debug.c | 12 +- + .../net/wireless/realtek/rtlwifi/rtl8192ce/hw.c | 25 +- + .../net/wireless/realtek/rtlwifi/rtl8192de/hw.c | 6 - + .../net/wireless/realtek/rtlwifi/rtl8192se/hw.c | 9 - + drivers/net/wireless/realtek/rtlwifi/wifi.h | 2 +- + drivers/net/wireless/realtek/rtw88/Kconfig | 36 + + drivers/net/wireless/realtek/rtw88/Makefile | 12 + + drivers/net/wireless/realtek/rtw88/debug.h | 1 + + drivers/net/wireless/realtek/rtw88/fw.c | 20 +- + drivers/net/wireless/realtek/rtw88/fw.h | 2 +- + drivers/net/wireless/realtek/rtw88/mac.c | 68 +- + drivers/net/wireless/realtek/rtw88/mac.h | 1 - + drivers/net/wireless/realtek/rtw88/mac80211.c | 40 +- + drivers/net/wireless/realtek/rtw88/main.c | 157 +- + drivers/net/wireless/realtek/rtw88/main.h | 23 +- + drivers/net/wireless/realtek/rtw88/pci.c | 8 - + drivers/net/wireless/realtek/rtw88/reg.h | 12 + + drivers/net/wireless/realtek/rtw88/rtw8723d.c | 1 + + drivers/net/wireless/realtek/rtw88/rtw8821c.c | 35 +- + drivers/net/wireless/realtek/rtw88/rtw8821c.h | 6 + + drivers/net/wireless/realtek/rtw88/rtw8821cs.c | 36 + + drivers/net/wireless/realtek/rtw88/rtw8822b.c | 10 + + drivers/net/wireless/realtek/rtw88/rtw8822b.h | 8 +- + drivers/net/wireless/realtek/rtw88/rtw8822bs.c | 36 + + drivers/net/wireless/realtek/rtw88/rtw8822c.c | 10 + + drivers/net/wireless/realtek/rtw88/rtw8822c.h | 8 +- + drivers/net/wireless/realtek/rtw88/rtw8822cs.c | 36 + + drivers/net/wireless/realtek/rtw88/sdio.c | 1394 ++ + drivers/net/wireless/realtek/rtw88/sdio.h | 178 + + drivers/net/wireless/realtek/rtw88/usb.c | 73 +- + drivers/net/wireless/realtek/rtw89/chan.c | 35 + + drivers/net/wireless/realtek/rtw89/chan.h | 3 + + drivers/net/wireless/realtek/rtw89/coex.c | 1268 +- + drivers/net/wireless/realtek/rtw89/coex.h | 6 + + drivers/net/wireless/realtek/rtw89/core.c | 452 +- + drivers/net/wireless/realtek/rtw89/core.h | 429 +- + drivers/net/wireless/realtek/rtw89/debug.c | 13 +- + drivers/net/wireless/realtek/rtw89/fw.c | 752 +- + drivers/net/wireless/realtek/rtw89/fw.h | 456 +- + drivers/net/wireless/realtek/rtw89/mac.c | 183 +- + drivers/net/wireless/realtek/rtw89/mac.h | 5 +- + drivers/net/wireless/realtek/rtw89/mac80211.c | 94 +- + drivers/net/wireless/realtek/rtw89/pci.c | 58 +- + drivers/net/wireless/realtek/rtw89/pci.h | 4 +- + drivers/net/wireless/realtek/rtw89/phy.c | 183 +- + drivers/net/wireless/realtek/rtw89/phy.h | 4 + + drivers/net/wireless/realtek/rtw89/ps.c | 12 +- + drivers/net/wireless/realtek/rtw89/ps.h | 19 +- + drivers/net/wireless/realtek/rtw89/reg.h | 15 + + .../wireless/realtek/rtw89/rtw8851b_rfk_table.c | 534 + + .../wireless/realtek/rtw89/rtw8851b_rfk_table.h | 38 + + .../net/wireless/realtek/rtw89/rtw8851b_table.c | 14824 +++++++++++++++++++ + .../net/wireless/realtek/rtw89/rtw8851b_table.h | 21 + + drivers/net/wireless/realtek/rtw89/rtw8852a.c | 36 +- + .../net/wireless/realtek/rtw89/rtw8852a_table.c | 15 + + .../net/wireless/realtek/rtw89/rtw8852a_table.h | 11 +- + drivers/net/wireless/realtek/rtw89/rtw8852b.c | 121 +- + .../net/wireless/realtek/rtw89/rtw8852b_table.c | 15 + + .../net/wireless/realtek/rtw89/rtw8852b_table.h | 11 +- + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 128 +- + .../net/wireless/realtek/rtw89/rtw8852c_table.c | 21 + + .../net/wireless/realtek/rtw89/rtw8852c_table.h | 16 +- + drivers/net/wireless/realtek/rtw89/ser.c | 5 + + drivers/net/wireless/realtek/rtw89/wow.c | 11 +- + drivers/net/wireless/rsi/rsi_91x_mgmt.c | 7 +- + drivers/net/wireless/silabs/wfx/main.c | 10 +- + drivers/net/wireless/virtual/Kconfig | 20 + + drivers/net/wireless/virtual/Makefile | 3 + + .../net/wireless/{ => virtual}/mac80211_hwsim.c | 928 +- + .../net/wireless/{ => virtual}/mac80211_hwsim.h | 58 + + drivers/net/wireless/{ => virtual}/virt_wifi.c | 0 + drivers/net/wwan/iosm/iosm_ipc_port.c | 3 +- + drivers/net/wwan/mhi_wwan_ctrl.c | 2 +- + drivers/net/wwan/rpmsg_wwan_ctrl.c | 3 +- + drivers/net/wwan/t7xx/t7xx_port_wwan.c | 36 +- + drivers/net/wwan/wwan_core.c | 61 +- + drivers/net/wwan/wwan_hwsim.c | 2 +- + drivers/nfc/nfcmrvl/i2c.c | 2 +- + drivers/nfc/nfcmrvl/main.c | 6 +- + drivers/nfc/nfcmrvl/nfcmrvl.h | 30 +- + drivers/nfc/nfcmrvl/uart.c | 11 +- + drivers/nfc/nfcsim.c | 5 - + drivers/nfc/trf7970a.c | 2 +- + drivers/nvme/host/apple.c | 8 +- + drivers/nvme/host/core.c | 9 +- + drivers/nvme/host/pci.c | 6 +- + drivers/nvme/host/rdma.c | 19 +- + drivers/nvme/host/tcp.c | 3 + + drivers/nvme/host/trace.h | 15 +- + drivers/nvme/target/admin-cmd.c | 81 +- + drivers/nvme/target/fcloop.c | 48 +- + drivers/nvme/target/nvmet.h | 12 +- + drivers/nvme/target/tcp.c | 34 +- + drivers/nvme/target/zns.c | 20 +- + drivers/parport/parport_pc.c | 20 +- + drivers/phy/mscc/phy-ocelot-serdes.c | 9 + + drivers/ptp/Kconfig | 14 + + drivers/ptp/Makefile | 1 + + drivers/ptp/ptp_dfl_tod.c | 332 + + drivers/ptp/ptp_ines.c | 2 +- + drivers/ptp/ptp_kvm_arm.c | 4 + + drivers/ptp/ptp_kvm_common.c | 1 + + drivers/ptp/ptp_kvm_x86.c | 59 +- + drivers/ptp/ptp_ocp.c | 1 + + drivers/s390/block/dasd.c | 75 +- + drivers/s390/block/dasd_devmap.c | 126 + + drivers/s390/block/dasd_eckd.c | 1 + + drivers/s390/block/dasd_eer.c | 1 + + drivers/s390/block/dasd_int.h | 32 +- + drivers/s390/net/ism_drv.c | 10 +- + drivers/s390/scsi/zfcp_scsi.c | 2 +- + drivers/scsi/3w-9xxx.c | 3 +- + drivers/scsi/3w-sas.c | 3 +- + drivers/scsi/3w-xxxx.c | 2 +- + drivers/scsi/BusLogic.c | 4 +- + drivers/scsi/a100u2w.c | 2 +- + drivers/scsi/a2091.c | 2 +- + drivers/scsi/a3000.c | 2 +- + drivers/scsi/aacraid/linit.c | 5 +- + drivers/scsi/advansys.c | 2 +- + drivers/scsi/aha152x.c | 4 +- + drivers/scsi/aha1542.c | 5 +- + drivers/scsi/aha1740.c | 2 +- + drivers/scsi/aic94xx/aic94xx_init.c | 2 +- + drivers/scsi/am53c974.c | 2 +- + drivers/scsi/arcmsr/arcmsr.h | 3 +- + drivers/scsi/arcmsr/arcmsr_hba.c | 24 +- + drivers/scsi/arm/acornscsi.c | 2 +- + drivers/scsi/arm/arxescsi.c | 2 +- + drivers/scsi/arm/cumana_1.c | 2 +- + drivers/scsi/arm/cumana_2.c | 2 +- + drivers/scsi/arm/eesox.c | 2 +- + drivers/scsi/arm/oak.c | 2 +- + drivers/scsi/arm/powertec.c | 2 +- + drivers/scsi/atp870u.c | 4 +- + drivers/scsi/be2iscsi/be_cmds.c | 2 - + drivers/scsi/be2iscsi/be_main.c | 29 +- + drivers/scsi/be2iscsi/be_main.h | 1 - + drivers/scsi/bfa/bfad.c | 6 - + drivers/scsi/bfa/bfad_drv.h | 1 - + drivers/scsi/bnx2i/bnx2i_iscsi.c | 4 +- + drivers/scsi/csiostor/csio_init.c | 1 - + drivers/scsi/cxgbi/cxgb3i/cxgb3i.c | 2 +- + drivers/scsi/cxgbi/libcxgbi.c | 6 +- + drivers/scsi/cxgbi/libcxgbi.h | 2 +- + drivers/scsi/cxlflash/superpipe.c | 2 +- + drivers/scsi/cxlflash/vlun.c | 2 +- + drivers/scsi/dc395x.c | 2 +- + drivers/scsi/dmx3191d.c | 2 +- + drivers/scsi/elx/efct/efct_lio.c | 20 - + drivers/scsi/elx/efct/efct_xport.c | 2 +- + drivers/scsi/esas2r/esas2r_main.c | 2 +- + drivers/scsi/esp_scsi.c | 2 +- + drivers/scsi/esp_scsi.h | 2 +- + drivers/scsi/fcoe/fcoe.c | 2 +- + drivers/scsi/fdomain.c | 2 +- + drivers/scsi/fnic/fnic_main.c | 2 +- + drivers/scsi/fnic/fnic_trace.c | 17 +- + drivers/scsi/g_NCR5380.c | 4 +- + drivers/scsi/gvp11.c | 2 +- + drivers/scsi/hisi_sas/hisi_sas.h | 11 +- + drivers/scsi/hisi_sas/hisi_sas_main.c | 152 +- + drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 10 +- + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 10 +- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 191 +- + drivers/scsi/hosts.c | 4 +- + drivers/scsi/hpsa.c | 9 +- + drivers/scsi/hptiop.c | 2 +- + drivers/scsi/ibmvscsi/ibmvfc.c | 2 +- + drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 30 - + drivers/scsi/imm.c | 2 +- + drivers/scsi/initio.c | 2 +- + drivers/scsi/ipr.c | 2 +- + drivers/scsi/isci/init.c | 2 +- + drivers/scsi/iscsi_tcp.c | 4 +- + drivers/scsi/jazz_esp.c | 2 +- + drivers/scsi/libiscsi.c | 2 +- + drivers/scsi/libsas/sas_discover.c | 29 + + drivers/scsi/lpfc/lpfc.h | 2 - + drivers/scsi/lpfc/lpfc_attr.c | 102 +- + drivers/scsi/lpfc/lpfc_bsg.c | 4 +- + drivers/scsi/lpfc/lpfc_crtn.h | 2 + + drivers/scsi/lpfc/lpfc_ct.c | 8 +- + drivers/scsi/lpfc/lpfc_debugfs.c | 9 +- + drivers/scsi/lpfc/lpfc_els.c | 50 +- + drivers/scsi/lpfc/lpfc_hbadisc.c | 39 +- + drivers/scsi/lpfc/lpfc_hw.h | 14 +- + drivers/scsi/lpfc/lpfc_init.c | 17 +- + drivers/scsi/lpfc/lpfc_nvme.c | 6 +- + drivers/scsi/lpfc/lpfc_sli.c | 83 +- + drivers/scsi/lpfc/lpfc_sli4.h | 19 + + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/mac53c94.c | 2 +- + drivers/scsi/mac_esp.c | 2 +- + drivers/scsi/megaraid.c | 3 +- + drivers/scsi/megaraid/megaraid_mbox.c | 2 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 2 +- + drivers/scsi/mesh.c | 2 +- + drivers/scsi/mpi3mr/mpi/mpi30_cnfg.h | 112 +- + drivers/scsi/mpi3mr/mpi/mpi30_image.h | 2 +- + drivers/scsi/mpi3mr/mpi/mpi30_init.h | 23 +- + drivers/scsi/mpi3mr/mpi/mpi30_ioc.h | 2 +- + drivers/scsi/mpi3mr/mpi/mpi30_pci.h | 6 +- + drivers/scsi/mpi3mr/mpi/mpi30_sas.h | 2 +- + drivers/scsi/mpi3mr/mpi/mpi30_transport.h | 4 +- + drivers/scsi/mpi3mr/mpi3mr.h | 15 +- + drivers/scsi/mpi3mr/mpi3mr_app.c | 5 +- + drivers/scsi/mpi3mr/mpi3mr_debug.h | 2 +- + drivers/scsi/mpi3mr/mpi3mr_fw.c | 6 +- + drivers/scsi/mpi3mr/mpi3mr_os.c | 86 +- + drivers/scsi/mpi3mr/mpi3mr_transport.c | 2 +- + drivers/scsi/mpt3sas/mpt3sas_base.c | 15 +- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 9 +- + drivers/scsi/mvme147.c | 2 +- + drivers/scsi/mvsas/mv_init.c | 2 +- + drivers/scsi/mvumi.c | 2 +- + drivers/scsi/myrb.c | 2 +- + drivers/scsi/myrs.c | 2 +- + drivers/scsi/nsp32.c | 2 +- + drivers/scsi/pcmcia/sym53c500_cs.c | 4 +- + drivers/scsi/pm8001/pm8001_init.c | 2 +- + drivers/scsi/pmcraid.c | 2 +- + drivers/scsi/ppa.c | 2 +- + drivers/scsi/ps3rom.c | 2 +- + drivers/scsi/qedf/qedf_main.c | 4 +- + drivers/scsi/qedi/qedi_gbl.h | 2 +- + drivers/scsi/qedi/qedi_iscsi.c | 2 +- + drivers/scsi/qla1280.c | 2 +- + drivers/scsi/qla2xxx/qla_def.h | 1 - + drivers/scsi/qla2xxx/qla_gbl.h | 2 +- + drivers/scsi/qla2xxx/qla_mid.c | 2 +- + drivers/scsi/qla2xxx/qla_os.c | 10 +- + drivers/scsi/qla2xxx/qla_target.c | 3 +- + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 14 - + drivers/scsi/qla4xxx/ql4_def.h | 1 - + drivers/scsi/qla4xxx/ql4_isr.c | 2 - + drivers/scsi/qla4xxx/ql4_os.c | 4 - + drivers/scsi/qlogicpti.c | 13 +- + drivers/scsi/scsi_debug.c | 983 +- + drivers/scsi/scsi_error.c | 16 +- + drivers/scsi/scsi_sysfs.c | 6 +- + drivers/scsi/scsi_transport_fc.c | 3 +- + drivers/scsi/sgiwd93.c | 2 +- + drivers/scsi/smartpqi/smartpqi_init.c | 2 +- + drivers/scsi/snic/snic_main.c | 2 +- + drivers/scsi/snic/snic_scsi.c | 7 +- + drivers/scsi/sr.c | 7 +- + drivers/scsi/stex.c | 2 +- + drivers/scsi/sun3x_esp.c | 2 +- + drivers/scsi/sun_esp.c | 4 +- + drivers/scsi/sym53c8xx_2/sym_glue.c | 4 +- + drivers/scsi/virtio_scsi.c | 2 +- + drivers/scsi/wd719x.c | 2 +- + drivers/scsi/xen-scsifront.c | 2 +- + drivers/scsi/zorro_esp.c | 2 +- + drivers/staging/gdm724x/gdm_lte.c | 4 +- + drivers/staging/rts5208/rtsx.c | 2 +- + drivers/target/Kconfig | 1 + + drivers/target/Makefile | 1 + + drivers/target/iscsi/iscsi_target.c | 51 +- + drivers/target/iscsi/iscsi_target_login.c | 7 + + drivers/target/loopback/tcm_loop.c | 50 +- + drivers/target/sbp/sbp_target.c | 31 - + drivers/target/target_core_alua.c | 4 +- + drivers/target/target_core_configfs.c | 94 +- + drivers/target/target_core_device.c | 44 +- + drivers/target/target_core_fabric_configfs.c | 47 +- + drivers/target/target_core_internal.h | 4 +- + drivers/target/target_core_pr.c | 8 +- + drivers/target/target_core_spc.c | 7 +- + drivers/target/target_core_stat.c | 6 +- + drivers/target/target_core_tmr.c | 26 +- + drivers/target/target_core_tpg.c | 73 +- + drivers/target/target_core_transport.c | 199 +- + drivers/target/target_core_xcopy.c | 23 +- + drivers/target/tcm_fc/tcm_fc.h | 1 - + drivers/target/tcm_fc/tfc_cmd.c | 5 - + drivers/target/tcm_fc/tfc_conf.c | 15 - + drivers/target/tcm_remote/Kconfig | 8 + + drivers/target/tcm_remote/Makefile | 2 + + drivers/target/tcm_remote/tcm_remote.c | 268 + + drivers/target/tcm_remote/tcm_remote.h | 20 + + drivers/tee/amdtee/call.c | 2 +- + drivers/tee/amdtee/shm_pool.c | 2 +- + drivers/tty/serdev/core.c | 17 +- + drivers/tty/serdev/serdev-ttyport.c | 16 +- + drivers/ufs/core/ufshcd-priv.h | 1 + + drivers/ufs/core/ufshcd.c | 129 +- + drivers/ufs/host/ufs-exynos.c | 2 +- + drivers/ufs/host/ufs-hisi.c | 2 +- + drivers/ufs/host/ufs-qcom.c | 2 +- + drivers/ufs/host/ufshcd-pci.c | 1 + + drivers/usb/class/cdc-wdm.c | 3 +- + drivers/usb/gadget/function/f_tcm.c | 35 +- + drivers/usb/image/microtek.c | 2 +- + drivers/usb/storage/uas.c | 2 +- + drivers/usb/storage/usb.c | 2 +- + drivers/usb/storage/usb.h | 2 +- + drivers/vhost/scsi.c | 31 - + drivers/vhost/vsock.c | 1 + + drivers/xen/xen-scsiback.c | 30 - + fs/afs/rxrpc.c | 9 +- + fs/btrfs/Kconfig | 1 + + fs/btrfs/bio.c | 211 +- + fs/btrfs/bio.h | 22 +- + fs/btrfs/block-group.c | 40 +- + fs/btrfs/block-group.h | 13 +- + fs/btrfs/block-rsv.c | 21 +- + fs/btrfs/block-rsv.h | 2 +- + fs/btrfs/btrfs_inode.h | 35 +- + fs/btrfs/compression.c | 299 +- + fs/btrfs/compression.h | 20 +- + fs/btrfs/ctree.c | 91 +- + fs/btrfs/ctree.h | 17 +- + fs/btrfs/delalloc-space.c | 2 +- + fs/btrfs/delayed-ref.c | 49 +- + fs/btrfs/delayed-ref.h | 22 +- + fs/btrfs/disk-io.c | 147 +- + fs/btrfs/extent-tree.c | 37 +- + fs/btrfs/extent_io.c | 550 +- + fs/btrfs/file-item.c | 93 +- + fs/btrfs/file-item.h | 3 +- + fs/btrfs/fs.h | 53 +- + fs/btrfs/inode-item.c | 15 +- + fs/btrfs/inode.c | 375 +- + fs/btrfs/ioctl.c | 5 + + fs/btrfs/locking.c | 25 +- + fs/btrfs/locking.h | 5 +- + fs/btrfs/lru_cache.h | 5 - + fs/btrfs/lzo.c | 17 +- + fs/btrfs/messages.c | 2 +- + fs/btrfs/messages.h | 2 +- + fs/btrfs/ordered-data.c | 120 +- + fs/btrfs/ordered-data.h | 10 +- + fs/btrfs/raid56.c | 162 +- + fs/btrfs/raid56.h | 12 +- + fs/btrfs/relocation.c | 6 +- + fs/btrfs/scrub.c | 4142 ++---- + fs/btrfs/send.c | 2 +- + fs/btrfs/space-info.c | 32 +- + fs/btrfs/space-info.h | 1 + + fs/btrfs/super.c | 3 +- + fs/btrfs/sysfs.c | 5 + + fs/btrfs/tests/extent-map-tests.c | 1 - + fs/btrfs/transaction.c | 28 +- + fs/btrfs/tree-checker.c | 14 + + fs/btrfs/tree-log.c | 171 +- + fs/btrfs/volumes.c | 593 +- + fs/btrfs/volumes.h | 85 +- + fs/btrfs/zlib.c | 2 - + fs/btrfs/zoned.c | 4 +- + fs/btrfs/zstd.c | 1 - + fs/buffer.c | 13 +- + fs/crypto/bio.c | 6 +- + fs/crypto/crypto.c | 19 +- + fs/crypto/fname.c | 4 +- + fs/crypto/fscrypt_private.h | 6 +- + fs/crypto/hkdf.c | 4 +- + fs/crypto/hooks.c | 32 +- + fs/crypto/keyring.c | 14 +- + fs/crypto/keysetup.c | 14 +- + fs/crypto/policy.c | 4 +- + fs/dlm/Kconfig | 9 - + fs/dlm/Makefile | 1 - + fs/dlm/ast.c | 11 +- + fs/dlm/config.c | 21 - + fs/dlm/config.h | 3 - + fs/dlm/debug_fs.c | 8 +- + fs/dlm/dlm_internal.h | 154 +- + fs/dlm/lock.c | 533 +- + fs/dlm/lock.h | 17 - + fs/dlm/lockspace.c | 29 +- + fs/dlm/lowcomms.c | 13 +- + fs/dlm/main.c | 9 +- + fs/dlm/memory.c | 2 +- + fs/dlm/netlink.c | 139 - + fs/dlm/rcom.c | 2 +- + fs/dlm/recover.c | 2 +- + fs/dlm/recoverd.c | 2 - + fs/dlm/user.c | 34 +- + fs/ext2/ext2.h | 3 +- + fs/ext2/super.c | 7 + + fs/ext2/xattr.c | 1 - + fs/ext4/balloc.c | 124 +- + fs/ext4/bitmap.c | 13 +- + fs/ext4/ext4.h | 114 +- + fs/ext4/extents.c | 35 +- + fs/ext4/file.c | 3 +- + fs/ext4/fsync.c | 11 - + fs/ext4/ialloc.c | 14 +- + fs/ext4/inline.c | 171 +- + fs/ext4/inode.c | 810 +- + fs/ext4/mballoc.c | 691 +- + fs/ext4/mballoc.h | 17 +- + fs/ext4/move_extent.c | 33 +- + fs/ext4/page-io.c | 116 +- + fs/ext4/readpage.c | 72 +- + fs/ext4/resize.c | 7 +- + fs/ext4/super.c | 413 +- + fs/ext4/sysfs.c | 2 - + fs/ext4/verity.c | 30 +- + fs/f2fs/checkpoint.c | 52 +- + fs/f2fs/compress.c | 47 +- + fs/f2fs/data.c | 71 +- + fs/f2fs/debug.c | 37 +- + fs/f2fs/dir.c | 47 +- + fs/f2fs/extent_cache.c | 264 +- + fs/f2fs/f2fs.h | 252 +- + fs/f2fs/file.c | 76 +- + fs/f2fs/gc.c | 205 +- + fs/f2fs/gc.h | 16 +- + fs/f2fs/inline.c | 2 +- + fs/f2fs/inode.c | 5 +- + fs/f2fs/namei.c | 28 +- + fs/f2fs/node.h | 20 +- + fs/f2fs/recovery.c | 17 +- + fs/f2fs/segment.c | 390 +- + fs/f2fs/segment.h | 57 +- + fs/f2fs/super.c | 111 +- + fs/f2fs/sysfs.c | 50 +- + fs/gfs2/bmap.c | 8 - + fs/gfs2/bmap.h | 1 - + fs/gfs2/glops.c | 23 +- + fs/gfs2/inode.c | 47 +- + fs/gfs2/ops_fstype.c | 9 +- + fs/gfs2/super.c | 9 + + fs/iomap/buffered-io.c | 2 +- + fs/jbd2/transaction.c | 3 + + fs/netfs/buffered_read.c | 3 +- + fs/nfs/file.c | 12 +- + fs/quota/Kconfig | 4 +- + fs/quota/dquot.c | 24 +- + fs/quota/quota_v1.c | 2 +- + fs/quota/quota_v2.c | 2 +- + fs/reiserfs/journal.c | 2 - + fs/reiserfs/stree.c | 2 - + fs/udf/inode.c | 10 +- + fs/udf/truncate.c | 4 +- + fs/verity/enable.c | 21 +- + fs/verity/hash_algs.c | 4 +- + fs/verity/open.c | 2 +- + fs/verity/signature.c | 9 +- + fs/xfs/xfs_file.c | 3 +- + include/crypto/acompress.h | 132 +- + include/crypto/aead.h | 22 + + include/crypto/akcipher.h | 102 +- + include/crypto/algapi.h | 93 +- + include/crypto/hash.h | 95 +- + include/crypto/internal/acompress.h | 43 +- + include/crypto/internal/hash.h | 2 - + include/crypto/internal/scompress.h | 15 +- + include/crypto/kpp.h | 73 +- + include/crypto/rng.h | 65 +- + include/crypto/skcipher.h | 22 + + include/crypto/utils.h | 73 + + include/linux/ahci_platform.h | 2 +- + include/linux/ata.h | 71 - + include/linux/ata_platform.h | 2 +- + include/linux/atomic/atomic-arch-fallback.h | 208 +- + include/linux/atomic/atomic-instrumented.h | 68 +- + include/linux/atomic/atomic-long.h | 38 +- + include/linux/bio.h | 5 + + include/linux/blk-crypto.h | 4 +- + include/linux/blk-mq-rdma.h | 11 - + include/linux/blk-mq.h | 2 - + include/linux/blk_types.h | 39 +- + include/linux/blkdev.h | 12 - + include/linux/bpf.h | 250 +- + include/linux/bpf_local_storage.h | 20 +- + include/linux/bpf_mem_alloc.h | 9 + + include/linux/bpf_types.h | 4 + + include/linux/bpf_verifier.h | 83 +- + include/linux/btf.h | 13 +- + include/linux/btf_ids.h | 2 +- + include/linux/cpu_rmap.h | 4 +- + include/linux/crc32c.h | 1 - + include/linux/crypto.h | 236 +- + include/linux/dccp.h | 6 +- + include/linux/device-mapper.h | 40 +- + include/linux/dlm.h | 3 - + include/linux/dm-bufio.h | 6 - + include/linux/ethtool.h | 15 +- + include/linux/ethtool_netlink.h | 6 + + include/linux/f2fs_fs.h | 24 +- + include/linux/fault-inject.h | 22 + + include/linux/filter.h | 56 +- + include/linux/fs.h | 3 + + include/linux/fscrypt.h | 28 + + include/linux/fsverity.h | 6 +- + include/linux/genl_magic_func.h | 2 +- + include/linux/ieee80211.h | 63 +- + include/linux/if_bridge.h | 1 + + include/linux/if_vlan.h | 36 +- + include/linux/igmp.h | 2 +- + include/linux/io_uring_types.h | 24 +- + include/linux/ipv6.h | 5 +- + include/linux/leds.h | 18 + + include/linux/libata.h | 10 +- + include/linux/mlx5/device.h | 8 + + include/linux/mlx5/driver.h | 11 + + include/linux/mlx5/mlx5_ifc.h | 84 +- + include/linux/mlx5/port.h | 16 + + include/linux/mlx5/qp.h | 10 + + include/linux/mmc/sdio_ids.h | 14 +- + include/linux/module.h | 127 +- + include/linux/net_tstamp.h | 33 + + include/linux/netdevice.h | 71 +- + include/linux/netfilter.h | 1 + + include/linux/netfilter/nfnetlink.h | 1 - + include/linux/netfilter_ipv6.h | 2 + + include/linux/netlink.h | 23 +- + include/linux/page-flags.h | 5 - + include/linux/pagemap.h | 2 + + include/linux/pcs/pcs-mtk-lynxi.h | 13 + + include/linux/pds/pds_adminq.h | 647 + + include/linux/pds/pds_auxbus.h | 20 + + include/linux/pds/pds_common.h | 68 + + include/linux/pds/pds_core_if.h | 571 + + include/linux/pds/pds_intr.h | 163 + + include/linux/phy.h | 46 +- + include/linux/phylink.h | 2 - + include/linux/platform_data/nfcmrvl.h | 48 - + include/linux/psp-platform-access.h | 65 + + include/linux/psp-sev.h | 8 - + include/linux/psp.h | 29 + + include/linux/ptp_kvm.h | 1 + + include/linux/raid_class.h | 2 +- + include/linux/rcuref.h | 155 + + include/linux/rtnetlink.h | 10 - + include/linux/sched.h | 7 +- + include/linux/sctp.h | 18 +- + include/linux/sed-opal.h | 2 + + include/linux/serdev.h | 10 +- + include/linux/skbuff.h | 127 +- + include/linux/smscphy.h | 10 + + include/linux/soc/mediatek/mtk_wed.h | 6 + + include/linux/stmmac.h | 20 + + include/linux/tcp.h | 10 +- + include/linux/types.h | 6 + + include/linux/udp.h | 5 +- + include/linux/virtio_vsock.h | 1 + + include/linux/writeback.h | 5 - + include/linux/wwan.h | 11 + + include/net/addrconf.h | 2 +- + include/net/af_rxrpc.h | 3 +- + include/net/af_unix.h | 6 +- + include/net/af_vsock.h | 17 + + include/net/arp.h | 8 +- + include/net/ax25.h | 5 +- + include/net/bluetooth/bluetooth.h | 43 +- + include/net/bluetooth/coredump.h | 116 + + include/net/bluetooth/hci.h | 15 + + include/net/bluetooth/hci_core.h | 55 +- + include/net/bluetooth/hci_sync.h | 4 + + include/net/bluetooth/l2cap.h | 2 +- + include/net/bluetooth/mgmt.h | 80 +- + include/net/cfg80211.h | 75 +- + include/net/dropreason-core.h | 370 + + include/net/dropreason.h | 374 +- + include/net/dsa.h | 51 - + include/net/dsa_stubs.h | 48 + + include/net/dst.h | 30 +- + include/net/flow_dissector.h | 38 +- + include/net/fou.h | 2 + + include/net/handshake.h | 43 + + include/net/ieee80211_radiotap.h | 215 +- + include/net/inet_frag.h | 2 +- + include/net/inet_sock.h | 5 +- + include/net/ip6_fib.h | 12 +- + include/net/ip6_route.h | 2 +- + include/net/ip_tunnels.h | 38 +- + include/net/ip_vs.h | 32 +- + include/net/mac80211.h | 195 +- + include/net/mana/gdma.h | 4 + + include/net/mana/mana.h | 45 +- + include/net/ndisc.h | 12 +- + include/net/neighbour.h | 10 +- + include/net/netdev_queues.h | 173 + + include/net/netfilter/nf_bpf_link.h | 15 + + include/net/netfilter/nf_conntrack_core.h | 6 +- + include/net/netfilter/nf_nat_redirect.h | 3 +- + include/net/netfilter/nf_tables.h | 35 +- + include/net/netns/ipv6.h | 1 + + include/net/nexthop.h | 6 +- + include/net/page_pool.h | 8 +- + include/net/pkt_sched.h | 4 +- + include/net/raw.h | 7 +- + include/net/rawv6.h | 2 +- + include/net/route.h | 3 - + include/net/scm.h | 13 +- + include/net/sctp/sctp.h | 12 +- + include/net/sctp/stream_sched.h | 2 + + include/net/sctp/structs.h | 11 +- + include/net/smc.h | 1 + + include/net/sock.h | 4 +- + include/net/tcp.h | 5 +- + include/net/vxlan.h | 25 + + include/net/x25.h | 5 +- + include/net/xdp.h | 29 - + include/net/xdp_sock.h | 1 + + include/net/xfrm.h | 5 + + include/net/xsk_buff_pool.h | 9 +- + include/scsi/libfc.h | 2 +- + include/scsi/libiscsi.h | 2 +- + include/scsi/scsi_host.h | 4 +- + include/soc/mscc/ocelot.h | 40 +- + include/target/iscsi/iscsi_target_core.h | 1 + + include/target/target_core_base.h | 21 +- + include/target/target_core_fabric.h | 15 +- + include/trace/events/btrfs.h | 2 +- + include/trace/events/dlm.h | 12 +- + include/trace/events/ext4.h | 7 - + include/trace/events/fib.h | 5 +- + include/trace/events/fib6.h | 5 +- + include/trace/events/handshake.h | 159 + + include/trace/events/io_uring.h | 15 +- + include/trace/events/qrtr.h | 33 +- + include/trace/events/sock.h | 4 +- + include/trace/events/tcp.h | 2 +- + include/trace/events/ufs.h | 22 +- + include/uapi/linux/bpf.h | 112 +- + include/uapi/linux/btrfs.h | 1 + + include/uapi/linux/dlm.h | 1 + + include/uapi/linux/dlm_netlink.h | 60 - + include/uapi/linux/dlmconstants.h | 5 +- + include/uapi/linux/dm-ioctl.h | 4 +- + include/uapi/linux/ethtool_netlink.h | 2 + + include/uapi/linux/ext4.h | 117 + + include/uapi/linux/handshake.h | 73 + + include/uapi/linux/if_bridge.h | 11 + + include/uapi/linux/if_link.h | 2 + + include/uapi/linux/if_packet.h | 1 + + include/uapi/linux/io_uring.h | 33 +- + include/uapi/linux/ipv6.h | 2 +- + include/uapi/linux/netfilter/nf_tables.h | 10 +- + include/uapi/linux/netfilter/nfnetlink_hook.h | 24 +- + include/uapi/linux/netfilter/nfnetlink_queue.h | 1 + + include/uapi/linux/nl80211.h | 59 +- + include/uapi/linux/parport.h | 3 + + include/uapi/linux/pkt_sched.h | 17 + + include/uapi/linux/sctp.h | 4 +- + include/uapi/linux/sed-opal.h | 24 + + include/uapi/linux/target_core_user.h | 2 +- + include/uapi/linux/tc_act/tc_tunnel_key.h | 1 + + include/uapi/linux/ublk_cmd.h | 43 + + include/uapi/linux/virtio_net.h | 1 + + include/uapi/sound/asoc.h | 6 +- + include/ufs/ufshcd.h | 9 +- + io_uring/alloc_cache.h | 39 +- + io_uring/filetable.c | 21 +- + io_uring/io-wq.c | 524 +- + io_uring/io_uring.c | 348 +- + io_uring/io_uring.h | 49 +- + io_uring/kbuf.c | 160 +- + io_uring/kbuf.h | 7 + + io_uring/net.h | 5 +- + io_uring/notif.c | 8 +- + io_uring/notif.h | 3 +- + io_uring/poll.c | 32 +- + io_uring/rsrc.c | 353 +- + io_uring/rsrc.h | 72 +- + io_uring/rw.c | 10 +- + io_uring/timeout.c | 71 +- + io_uring/uring_cmd.c | 18 +- + kernel/bpf/Makefile | 3 +- + kernel/bpf/arraymap.c | 40 +- + kernel/bpf/bloom_filter.c | 41 +- + kernel/bpf/bpf_cgrp_storage.c | 24 +- + kernel/bpf/bpf_inode_storage.c | 23 +- + kernel/bpf/bpf_iter.c | 70 + + kernel/bpf/bpf_local_storage.c | 371 +- + kernel/bpf/bpf_struct_ops.c | 276 +- + kernel/bpf/bpf_task_storage.c | 28 +- + kernel/bpf/btf.c | 467 +- + kernel/bpf/cgroup.c | 62 +- + kernel/bpf/core.c | 11 + + kernel/bpf/cpumap.c | 18 +- + kernel/bpf/cpumask.c | 87 +- + kernel/bpf/devmap.c | 50 +- + kernel/bpf/hashtab.c | 140 +- + kernel/bpf/helpers.c | 509 +- + kernel/bpf/local_storage.c | 13 +- + kernel/bpf/log.c | 330 + + kernel/bpf/lpm_trie.c | 17 +- + kernel/bpf/map_in_map.c | 15 - + kernel/bpf/memalloc.c | 59 +- + kernel/bpf/offload.c | 6 + + kernel/bpf/queue_stack_maps.c | 32 +- + kernel/bpf/reuseport_array.c | 10 +- + kernel/bpf/ringbuf.c | 26 +- + kernel/bpf/stackmap.c | 20 +- + kernel/bpf/syscall.c | 170 +- + kernel/bpf/trampoline.c | 28 - + kernel/bpf/verifier.c | 2369 ++- + kernel/cgroup/cgroup.c | 14 +- + kernel/module/internal.h | 1 - + kernel/module/kallsyms.c | 16 +- + kernel/padata.c | 4 +- + kernel/trace/bpf_trace.c | 4 - + lib/Kconfig.debug | 14 +- + lib/Makefile | 2 +- + lib/cpu_rmap.c | 57 +- + lib/crypto/utils.c | 2 +- + lib/fault-inject.c | 191 + + lib/libcrc32c.c | 6 - + lib/packing.c | 1 - + lib/rcuref.c | 281 + + mm/folio-compat.c | 4 +- + mm/maccess.c | 16 +- + mm/usercopy.c | 2 +- + net/6lowpan/iphc.c | 2 +- + net/8021q/vlan_dev.c | 244 +- + net/Kconfig | 32 + + net/Makefile | 3 +- + net/atm/signaling.c | 2 +- + net/batman-adv/soft-interface.c | 2 +- + net/bluetooth/Makefile | 2 + + net/bluetooth/coredump.c | 536 + + net/bluetooth/hci_conn.c | 365 +- + net/bluetooth/hci_core.c | 4 + + net/bluetooth/hci_debugfs.c | 2 +- + net/bluetooth/hci_event.c | 132 +- + net/bluetooth/hci_sock.c | 37 +- + net/bluetooth/hci_sync.c | 137 +- + net/bluetooth/iso.c | 133 +- + net/bluetooth/l2cap_core.c | 8 +- + net/bluetooth/mgmt.c | 16 +- + net/bluetooth/msft.c | 36 +- + net/bluetooth/smp.c | 9 +- + net/bpf/bpf_dummy_struct_ops.c | 14 +- + net/bpf/test_run.c | 207 +- + net/bridge/br_arp_nd_proxy.c | 37 +- + net/bridge/br_device.c | 11 +- + net/bridge/br_forward.c | 8 +- + net/bridge/br_if.c | 2 +- + net/bridge/br_input.c | 2 +- + net/bridge/br_mdb.c | 219 +- + net/bridge/br_netfilter_hooks.c | 3 +- + net/bridge/br_netfilter_ipv6.c | 79 +- + net/bridge/br_netlink.c | 11 +- + net/bridge/br_nf_core.c | 2 +- + net/bridge/br_private.h | 27 +- + net/bridge/br_vlan.c | 1 + + net/bridge/br_vlan_options.c | 20 +- + net/bridge/netfilter/nft_meta_bridge.c | 71 +- + net/can/isotp.c | 65 +- + net/compat.c | 13 +- + net/core/bpf_sk_storage.c | 25 +- + net/core/datagram.c | 14 +- + net/core/dev.c | 144 +- + net/core/dev_ioctl.c | 105 +- + net/core/drop_monitor.c | 33 +- + net/core/dst.c | 27 +- + net/core/filter.c | 244 +- + net/core/gro.c | 2 +- + net/core/neighbour.c | 123 +- + net/core/net-procfs.c | 18 +- + net/core/netdev-genl-gen.c | 2 +- + net/core/page_pool.c | 36 +- + net/core/rtnetlink.c | 222 +- + net/core/scm.c | 9 +- + net/core/skbuff.c | 132 +- + net/core/sock.c | 13 +- + net/core/sock_map.c | 28 +- + net/core/xdp.c | 19 +- + net/dccp/ipv4.c | 12 +- + net/dccp/ipv6.c | 12 +- + net/dccp/timer.c | 2 +- + net/dsa/Makefile | 12 +- + net/dsa/dsa.c | 19 + + net/dsa/master.c | 50 +- + net/dsa/master.h | 3 + + net/dsa/port.c | 34 +- + net/dsa/port.h | 2 +- + net/dsa/stubs.c | 10 + + net/dsa/switch.c | 85 +- + net/dsa/tag.h | 2 +- + net/dsa/tag_8021q.c | 4 +- + net/dsa/tag_ksz.c | 18 +- + net/dsa/tag_ocelot.c | 4 +- + net/dsa/tag_sja1105.c | 4 +- + net/dsa/trace.c | 39 + + net/dsa/trace.h | 447 + + net/ethtool/coalesce.c | 54 +- + net/ethtool/ioctl.c | 10 +- + net/ethtool/mm.c | 33 + + net/ethtool/netlink.h | 2 +- + net/ethtool/rings.c | 34 +- + net/handshake/.kunitconfig | 11 + + net/handshake/Makefile | 13 + + net/handshake/genl.c | 58 + + net/handshake/genl.h | 24 + + net/handshake/handshake-test.c | 523 + + net/handshake/handshake.h | 87 + + net/handshake/netlink.c | 319 + + net/handshake/request.c | 344 + + net/handshake/tlshd.c | 418 + + net/handshake/trace.c | 20 + + net/ipv4/Makefile | 2 +- + net/ipv4/af_inet.c | 2 +- + net/ipv4/arp.c | 8 +- + net/ipv4/bpf_tcp_ca.c | 23 +- + net/ipv4/devinet.c | 3 + + net/ipv4/fib_semantics.c | 8 +- + net/ipv4/fou_bpf.c | 119 + + net/ipv4/fou_core.c | 5 + + net/ipv4/igmp.c | 4 +- + net/ipv4/inet_hashtables.c | 11 +- + net/ipv4/ip_output.c | 29 +- + net/ipv4/ip_tunnel.c | 22 +- + net/ipv4/ipip.c | 1 + + net/ipv4/netfilter/ip_tables.c | 68 +- + net/ipv4/nexthop.c | 12 +- + net/ipv4/raw.c | 4 +- + net/ipv4/raw_diag.c | 2 +- + net/ipv4/route.c | 24 +- + net/ipv4/tcp.c | 17 +- + net/ipv4/tcp_cong.c | 66 +- + net/ipv4/tcp_input.c | 14 +- + net/ipv4/tcp_ipv4.c | 10 +- + net/ipv4/tcp_minisocks.c | 5 +- + net/ipv4/tcp_output.c | 11 +- + net/ipv4/tcp_recovery.c | 2 +- + net/ipv4/tcp_timer.c | 6 +- + net/ipv4/udp.c | 31 +- + net/ipv4/xfrm4_policy.c | 4 +- + net/ipv6/addrconf.c | 17 +- + net/ipv6/af_inet6.c | 3 +- + net/ipv6/icmp.c | 15 +- + net/ipv6/inet6_connection_sock.c | 2 +- + net/ipv6/ip6_flowlabel.c | 51 +- + net/ipv6/ip6_input.c | 14 +- + net/ipv6/ip6_output.c | 14 +- + net/ipv6/ipv6_sockglue.c | 1 + + net/ipv6/mcast.c | 8 +- + net/ipv6/ndisc.c | 4 +- + net/ipv6/netfilter/ip6_tables.c | 68 +- + net/ipv6/ping.c | 2 +- + net/ipv6/raw.c | 7 +- + net/ipv6/route.c | 53 +- + net/ipv6/sit.c | 2 +- + net/ipv6/tcp_ipv6.c | 17 +- + net/ipv6/udp.c | 8 +- + net/ipv6/xfrm6_policy.c | 4 +- + net/mac80211/agg-tx.c | 17 + + net/mac80211/cfg.c | 120 +- + net/mac80211/debugfs.c | 4 - + net/mac80211/debugfs_netdev.c | 223 +- + net/mac80211/debugfs_netdev.h | 16 + + net/mac80211/driver-ops.c | 25 +- + net/mac80211/driver-ops.h | 48 + + net/mac80211/drop.h | 56 + + net/mac80211/ieee80211_i.h | 67 +- + net/mac80211/iface.c | 11 + + net/mac80211/link.c | 5 + + net/mac80211/main.c | 31 + + net/mac80211/mesh.c | 171 +- + net/mac80211/mesh.h | 48 + + net/mac80211/mesh_hwmp.c | 37 +- + net/mac80211/mesh_pathtbl.c | 282 + + net/mac80211/mesh_plink.c | 16 +- + net/mac80211/mlme.c | 6 +- + net/mac80211/rc80211_minstrel_ht.c | 6 - + net/mac80211/rx.c | 279 +- + net/mac80211/scan.c | 8 +- + net/mac80211/sta_info.c | 12 + + net/mac80211/sta_info.h | 9 +- + net/mac80211/status.c | 24 - + net/mac80211/trace.h | 32 + + net/mac80211/tx.c | 211 +- + net/mac80211/util.c | 94 + + net/mac80211/wpa.c | 24 +- + net/mctp/af_mctp.c | 1 - + net/mptcp/options.c | 9 +- + net/mptcp/pm.c | 4 +- + net/mptcp/pm_netlink.c | 6 +- + net/mptcp/pm_userspace.c | 4 +- + net/mptcp/protocol.c | 107 +- + net/mptcp/protocol.h | 15 +- + net/mptcp/sockopt.c | 46 +- + net/mptcp/subflow.c | 49 +- + net/netfilter/Kconfig | 4 +- + net/netfilter/Makefile | 1 + + net/netfilter/core.c | 12 + + net/netfilter/ipvs/ip_vs_conn.c | 12 +- + net/netfilter/ipvs/ip_vs_core.c | 8 - + net/netfilter/ipvs/ip_vs_ctl.c | 26 +- + net/netfilter/ipvs/ip_vs_sync.c | 7 +- + net/netfilter/ipvs/ip_vs_xmit.c | 66 +- + net/netfilter/nf_bpf_link.c | 228 + + net/netfilter/nf_conntrack_bpf.c | 6 +- + net/netfilter/nf_conntrack_core.c | 3 +- + net/netfilter/nf_conntrack_netlink.c | 24 +- + net/netfilter/nf_conntrack_ovs.c | 11 +- + net/netfilter/nf_nat_core.c | 4 +- + net/netfilter/nf_nat_redirect.c | 71 +- + net/netfilter/nf_tables_api.c | 539 +- + net/netfilter/nf_tables_core.c | 59 +- + net/netfilter/nf_tables_trace.c | 62 +- + net/netfilter/nfnetlink.c | 2 - + net/netfilter/nfnetlink_hook.c | 81 +- + net/netfilter/nfnetlink_log.c | 36 +- + net/netfilter/nfnetlink_queue.c | 20 + + net/netfilter/nft_masq.c | 75 +- + net/netfilter/nft_redir.c | 84 +- + net/netfilter/utils.c | 52 + + net/netfilter/xt_REDIRECT.c | 10 +- + net/netfilter/xt_tcpudp.c | 110 + + net/netlink/af_netlink.c | 77 +- + net/netlink/af_netlink.h | 1 - + net/packet/af_packet.c | 191 +- + net/packet/diag.c | 12 +- + net/packet/internal.h | 37 +- + net/rxrpc/af_rxrpc.c | 37 +- + net/rxrpc/key.c | 2 +- + net/rxrpc/protocol.h | 2 +- + net/rxrpc/rxperf.c | 3 +- + net/sched/act_api.c | 8 +- + net/sched/act_csum.c | 3 +- + net/sched/act_mirred.c | 2 +- + net/sched/act_mpls.c | 2 +- + net/sched/act_pedit.c | 85 +- + net/sched/act_tunnel_key.c | 5 + + net/sched/cls_api.c | 1 + + net/sched/cls_flower.c | 2 +- + net/sched/em_meta.c | 2 +- + net/sched/sch_api.c | 6 +- + net/sched/sch_cake.c | 6 +- + net/sched/sch_fq.c | 6 +- + net/sched/sch_generic.c | 10 +- + net/sched/sch_htb.c | 17 +- + net/sched/sch_mqprio.c | 196 +- + net/sched/sch_mqprio_lib.c | 14 + + net/sched/sch_mqprio_lib.h | 2 + + net/sched/sch_pie.c | 2 +- + net/sched/sch_qfq.c | 34 +- + net/sched/sch_taprio.c | 77 +- + net/sctp/Makefile | 3 +- + net/sctp/associola.c | 5 +- + net/sctp/auth.c | 2 +- + net/sctp/input.c | 4 +- + net/sctp/ipv6.c | 2 +- + net/sctp/outqueue.c | 11 +- + net/sctp/sm_make_chunk.c | 32 +- + net/sctp/sm_sideeffect.c | 3 +- + net/sctp/sm_statefuns.c | 14 +- + net/sctp/socket.c | 5 +- + net/sctp/stream.c | 2 +- + net/sctp/stream_interleave.c | 4 +- + net/sctp/stream_sched.c | 2 + + net/sctp/stream_sched_fc.c | 225 + + net/smc/smc.h | 5 +- + net/smc/smc_core.h | 10 +- + net/smc/smc_ism.c | 2 +- + net/smc/smc_wr.c | 35 +- + net/smc/smc_wr.h | 5 +- + net/socket.c | 4 +- + net/unix/af_unix.c | 9 +- + net/unix/garbage.c | 2 +- + net/unix/scm.c | 6 + + net/vmw_vsock/Makefile | 1 + + net/vmw_vsock/af_vsock.c | 68 +- + net/vmw_vsock/virtio_transport.c | 2 + + net/vmw_vsock/virtio_transport_common.c | 96 +- + net/vmw_vsock/vmci_transport.c | 11 +- + net/vmw_vsock/vsock_bpf.c | 174 + + net/vmw_vsock/vsock_loopback.c | 5 +- + net/wireless/mlme.c | 55 +- + net/wireless/nl80211.c | 171 +- + net/wireless/rdev-ops.h | 17 + + net/wireless/scan.c | 38 +- + net/wireless/trace.h | 36 +- + net/wireless/util.c | 36 +- + net/xdp/xsk.c | 9 +- + net/xdp/xsk_queue.h | 19 +- + net/xdp/xskmap.c | 21 +- + net/xfrm/xfrm_device.c | 2 +- + net/xfrm/xfrm_input.c | 66 +- + net/xfrm/xfrm_output.c | 33 +- + net/xfrm/xfrm_state.c | 1 + + net/xfrm/xfrm_user.c | 2 + + samples/bpf/cpustat_kern.c | 4 +- + samples/bpf/hbm.c | 5 +- + samples/bpf/ibumad_kern.c | 4 +- + samples/bpf/lwt_len_hist.sh | 2 +- + samples/bpf/offwaketime_kern.c | 2 +- + samples/bpf/sampleip_user.c | 11 +- + samples/bpf/task_fd_query_user.c | 4 +- + samples/bpf/test_lwt_bpf.sh | 2 +- + samples/bpf/test_overhead_tp.bpf.c | 4 +- + scripts/atomic/atomics.tbl | 2 +- + scripts/atomic/fallbacks/add_negative | 11 +- + scripts/bpf_doc.py | 2 +- + security/lsm_audit.c | 6 +- + tools/arch/arm64/include/uapi/asm/bpf_perf_event.h | 9 - + tools/arch/s390/include/uapi/asm/bpf_perf_event.h | 9 - + tools/arch/s390/include/uapi/asm/ptrace.h | 458 - + tools/bpf/bpftool/Documentation/bpftool-prog.rst | 18 +- + .../bpftool/Documentation/bpftool-struct_ops.rst | 12 +- + tools/bpf/bpftool/bash-completion/bpftool | 42 +- + tools/bpf/bpftool/btf_dumper.c | 83 + + tools/bpf/bpftool/cfg.c | 29 +- + tools/bpf/bpftool/cfg.h | 5 +- + tools/bpf/bpftool/common.c | 14 + + tools/bpf/bpftool/json_writer.c | 5 +- + tools/bpf/bpftool/json_writer.h | 1 + + tools/bpf/bpftool/link.c | 83 + + tools/bpf/bpftool/main.h | 8 + + tools/bpf/bpftool/net.c | 106 + + tools/bpf/bpftool/prog.c | 94 +- + tools/bpf/bpftool/struct_ops.c | 70 +- + tools/bpf/bpftool/xlated_dumper.c | 54 +- + tools/bpf/bpftool/xlated_dumper.h | 3 +- + tools/bpf/resolve_btfids/.gitignore | 1 + + tools/include/uapi/linux/bpf.h | 112 +- + tools/include/uapi/linux/if_link.h | 1 + + tools/lib/bpf/Build | 2 +- + tools/lib/bpf/bpf.c | 25 +- + tools/lib/bpf/bpf.h | 94 +- + tools/lib/bpf/bpf_gen_internal.h | 4 +- + tools/lib/bpf/bpf_helpers.h | 110 +- + tools/lib/bpf/bpf_tracing.h | 3 + + tools/lib/bpf/btf.c | 2 - + tools/lib/bpf/gen_loader.c | 48 +- + tools/lib/bpf/libbpf.c | 552 +- + tools/lib/bpf/libbpf.h | 53 +- + tools/lib/bpf/libbpf.map | 1 + + tools/lib/bpf/libbpf_probes.c | 1 + + tools/lib/bpf/linker.c | 25 +- + tools/lib/bpf/netlink.c | 8 +- + tools/lib/bpf/relo_core.c | 3 - + tools/lib/bpf/usdt.c | 196 +- + tools/lib/bpf/zip.c | 333 + + tools/lib/bpf/zip.h | 47 + + tools/net/ynl/ethtool.py | 424 + + tools/net/ynl/lib/nlspec.py | 91 +- + tools/net/ynl/lib/ynl.py | 120 +- + tools/net/ynl/requirements.txt | 2 + + tools/net/ynl/ynl-gen-c.py | 7 +- + tools/objtool/check.c | 1 + + tools/scripts/Makefile.include | 2 + + tools/testing/selftests/bpf/DENYLIST.aarch64 | 1 + + tools/testing/selftests/bpf/DENYLIST.s390x | 4 + + tools/testing/selftests/bpf/Makefile | 23 +- + tools/testing/selftests/bpf/autoconf_helper.h | 9 + + tools/testing/selftests/bpf/bench.c | 4 + + .../bpf/benchs/bench_local_storage_create.c | 264 + + tools/testing/selftests/bpf/bpf_experimental.h | 60 +- + tools/testing/selftests/bpf/bpf_kfuncs.h | 38 + + .../selftests/bpf/bpf_testmod/bpf_testmod.c | 80 +- + .../selftests/bpf/bpf_testmod/bpf_testmod.h | 6 + + tools/testing/selftests/bpf/config.aarch64 | 2 + + tools/testing/selftests/bpf/config.s390x | 3 + + tools/testing/selftests/bpf/config.x86_64 | 3 + + tools/testing/selftests/bpf/disasm.c | 1 + + tools/testing/selftests/bpf/disasm.h | 1 + + tools/testing/selftests/bpf/get_cgroup_id_user.c | 9 +- + tools/testing/selftests/bpf/json_writer.c | 1 + + tools/testing/selftests/bpf/json_writer.h | 1 + + tools/testing/selftests/bpf/network_helpers.c | 2 +- + .../bpf/prog_tests/access_variable_array.c | 16 + + tools/testing/selftests/bpf/prog_tests/align.c | 22 +- + .../selftests/bpf/prog_tests/attach_probe.c | 291 +- + .../testing/selftests/bpf/prog_tests/bpf_tcp_ca.c | 160 + + .../selftests/bpf/prog_tests/bpf_verif_scale.c | 6 + + .../selftests/bpf/prog_tests/cg_storage_multi.c | 8 +- + .../testing/selftests/bpf/prog_tests/cgrp_kfunc.c | 1 + + .../selftests/bpf/prog_tests/cgrp_local_storage.c | 14 +- + .../selftests/bpf/prog_tests/cls_redirect.c | 25 + + tools/testing/selftests/bpf/prog_tests/cpumask.c | 2 +- + .../testing/selftests/bpf/prog_tests/ctx_rewrite.c | 917 ++ + .../selftests/bpf/prog_tests/decap_sanity.c | 16 +- + tools/testing/selftests/bpf/prog_tests/dynptr.c | 74 +- + tools/testing/selftests/bpf/prog_tests/empty_skb.c | 25 +- + .../testing/selftests/bpf/prog_tests/fib_lookup.c | 38 +- + .../selftests/bpf/prog_tests/flow_dissector.c | 24 + + .../selftests/bpf/prog_tests/get_branch_snapshot.c | 4 +- + .../bpf/prog_tests/get_stackid_cannot_attach.c | 1 + + tools/testing/selftests/bpf/prog_tests/iters.c | 106 + + .../selftests/bpf/prog_tests/kprobe_multi_test.c | 11 +- + tools/testing/selftests/bpf/prog_tests/l4lb_all.c | 2 + + .../testing/selftests/bpf/prog_tests/linked_list.c | 96 +- + .../selftests/bpf/prog_tests/local_kptr_stash.c | 60 + + tools/testing/selftests/bpf/prog_tests/log_fixup.c | 34 +- + tools/testing/selftests/bpf/prog_tests/map_kptr.c | 136 +- + tools/testing/selftests/bpf/prog_tests/map_ops.c | 162 + + .../bpf/prog_tests/module_fentry_shadow.c | 128 + + tools/testing/selftests/bpf/prog_tests/mptcp.c | 19 +- + .../selftests/bpf/prog_tests/parse_tcp_hdr_opt.c | 93 + + .../selftests/bpf/prog_tests/perf_event_stackmap.c | 3 +- + tools/testing/selftests/bpf/prog_tests/rbtree.c | 25 + + .../selftests/bpf/prog_tests/rcu_read_lock.c | 16 +- + .../selftests/bpf/prog_tests/refcounted_kptr.c | 16 + + .../testing/selftests/bpf/prog_tests/send_signal.c | 6 +- + .../selftests/bpf/prog_tests/sockmap_listen.c | 168 + + .../testing/selftests/bpf/prog_tests/sockopt_sk.c | 28 + + .../selftests/bpf/prog_tests/stacktrace_build_id.c | 19 +- + .../bpf/prog_tests/stacktrace_build_id_nmi.c | 32 +- + .../selftests/bpf/prog_tests/task_fd_query_tp.c | 9 +- + .../testing/selftests/bpf/prog_tests/task_kfunc.c | 3 +- + .../testing/selftests/bpf/prog_tests/tc_redirect.c | 100 +- + .../selftests/bpf/prog_tests/tcp_hdr_options.c | 4 +- + tools/testing/selftests/bpf/prog_tests/test_ima.c | 29 +- + .../selftests/bpf/prog_tests/test_local_storage.c | 54 +- + .../testing/selftests/bpf/prog_tests/test_tunnel.c | 224 +- + tools/testing/selftests/bpf/prog_tests/timer.c | 3 + + .../selftests/bpf/prog_tests/tp_attach_query.c | 9 +- + .../selftests/bpf/prog_tests/trace_printk.c | 10 +- + .../selftests/bpf/prog_tests/trace_vprintk.c | 10 +- + .../selftests/bpf/prog_tests/tracing_struct.c | 2 + + .../selftests/bpf/prog_tests/uprobe_autoattach.c | 1 - + .../selftests/bpf/prog_tests/user_ringbuf.c | 2 +- + tools/testing/selftests/bpf/prog_tests/verifier.c | 216 + + .../selftests/bpf/prog_tests/verifier_log.c | 450 + + .../testing/selftests/bpf/prog_tests/xdp_attach.c | 11 +- + .../testing/selftests/bpf/prog_tests/xdp_bonding.c | 40 +- + .../selftests/bpf/prog_tests/xdp_do_redirect.c | 41 +- + .../selftests/bpf/prog_tests/xdp_metadata.c | 23 +- + .../selftests/bpf/prog_tests/xdp_synproxy.c | 41 +- + tools/testing/selftests/bpf/prog_tests/xfrm_info.c | 67 +- + .../bpf/progs/bench_local_storage_create.c | 82 + + tools/testing/selftests/bpf/progs/bpf_flow.c | 2 +- + tools/testing/selftests/bpf/progs/bpf_iter_ksym.c | 1 - + .../selftests/bpf/progs/bpf_iter_setsockopt.c | 1 - + tools/testing/selftests/bpf/progs/bpf_loop.c | 2 - + tools/testing/selftests/bpf/progs/bpf_misc.h | 74 + + tools/testing/selftests/bpf/progs/cb_refs.c | 3 +- + .../bpf/progs/cgroup_skb_sk_lookup_kern.c | 1 - + .../selftests/bpf/progs/cgrp_kfunc_common.h | 11 +- + .../selftests/bpf/progs/cgrp_kfunc_failure.c | 104 +- + .../selftests/bpf/progs/cgrp_kfunc_success.c | 69 +- + .../selftests/bpf/progs/cgrp_ls_attach_cgroup.c | 1 - + .../selftests/bpf/progs/cgrp_ls_sleepable.c | 5 +- + tools/testing/selftests/bpf/progs/connect4_prog.c | 2 +- + tools/testing/selftests/bpf/progs/core_kern.c | 2 +- + tools/testing/selftests/bpf/progs/cpumask_common.h | 9 +- + .../testing/selftests/bpf/progs/cpumask_failure.c | 98 +- + .../testing/selftests/bpf/progs/cpumask_success.c | 30 +- + tools/testing/selftests/bpf/progs/dynptr_fail.c | 292 +- + tools/testing/selftests/bpf/progs/dynptr_success.c | 54 +- + tools/testing/selftests/bpf/progs/err.h | 18 + + tools/testing/selftests/bpf/progs/fexit_bpf2bpf.c | 2 - + tools/testing/selftests/bpf/progs/find_vma_fail1.c | 2 +- + .../selftests/bpf/progs/freplace_attach_probe.c | 2 +- + tools/testing/selftests/bpf/progs/iters.c | 723 + + tools/testing/selftests/bpf/progs/iters_looping.c | 163 + + tools/testing/selftests/bpf/progs/iters_num.c | 242 + + .../selftests/bpf/progs/iters_state_safety.c | 426 + + .../selftests/bpf/progs/iters_testmod_seq.c | 79 + + tools/testing/selftests/bpf/progs/jit_probe_mem.c | 2 +- + tools/testing/selftests/bpf/progs/linked_funcs1.c | 3 + + tools/testing/selftests/bpf/progs/linked_funcs2.c | 3 + + tools/testing/selftests/bpf/progs/linked_list.c | 38 +- + tools/testing/selftests/bpf/progs/linked_list.h | 4 +- + .../testing/selftests/bpf/progs/linked_list_fail.c | 97 +- + .../testing/selftests/bpf/progs/local_kptr_stash.c | 108 + + tools/testing/selftests/bpf/progs/local_storage.c | 76 +- + tools/testing/selftests/bpf/progs/loop6.c | 3 + + tools/testing/selftests/bpf/progs/lru_bug.c | 2 +- + tools/testing/selftests/bpf/progs/lsm.c | 4 +- + tools/testing/selftests/bpf/progs/map_kptr.c | 373 +- + tools/testing/selftests/bpf/progs/map_kptr_fail.c | 87 +- + .../selftests/bpf/progs/nested_trust_failure.c | 2 +- + tools/testing/selftests/bpf/progs/netcnt_prog.c | 1 - + .../selftests/bpf/progs/netif_receive_skb.c | 1 - + tools/testing/selftests/bpf/progs/perfbuf_bench.c | 1 - + tools/testing/selftests/bpf/progs/profiler.inc.h | 3 +- + tools/testing/selftests/bpf/progs/pyperf.h | 16 +- + tools/testing/selftests/bpf/progs/pyperf600_iter.c | 7 + + .../selftests/bpf/progs/pyperf600_nounroll.c | 3 - + tools/testing/selftests/bpf/progs/rbtree.c | 76 +- + .../bpf/progs/rbtree_btf_fail__wrong_node_type.c | 11 - + tools/testing/selftests/bpf/progs/rbtree_fail.c | 83 +- + tools/testing/selftests/bpf/progs/rcu_read_lock.c | 19 +- + .../selftests/bpf/progs/rcu_tasks_trace_gp.c | 36 + + .../bpf/progs/read_bpf_task_storage_busy.c | 1 - + tools/testing/selftests/bpf/progs/recvmsg4_prog.c | 2 - + tools/testing/selftests/bpf/progs/recvmsg6_prog.c | 2 - + .../testing/selftests/bpf/progs/refcounted_kptr.c | 406 + + .../selftests/bpf/progs/refcounted_kptr_fail.c | 72 + + tools/testing/selftests/bpf/progs/sendmsg4_prog.c | 2 - + .../selftests/bpf/progs/sockmap_verdict_prog.c | 4 + + tools/testing/selftests/bpf/progs/sockopt_sk.c | 12 + + tools/testing/selftests/bpf/progs/strobemeta.h | 1 - + .../selftests/bpf/progs/tailcall_bpf2bpf3.c | 11 + + .../selftests/bpf/progs/tailcall_bpf2bpf6.c | 3 + + .../selftests/bpf/progs/task_kfunc_common.h | 8 +- + .../selftests/bpf/progs/task_kfunc_failure.c | 178 +- + .../selftests/bpf/progs/task_kfunc_success.c | 78 +- + tools/testing/selftests/bpf/progs/tcp_ca_update.c | 80 + + .../selftests/bpf/progs/tcp_ca_write_sk_pacing.c | 13 +- + .../bpf/progs/test_access_variable_array.c | 19 + + .../bpf/progs/test_attach_kprobe_sleepable.c | 23 + + .../selftests/bpf/progs/test_attach_probe.c | 35 +- + .../selftests/bpf/progs/test_attach_probe_manual.c | 53 + + tools/testing/selftests/bpf/progs/test_bpf_nf.c | 1 - + .../selftests/bpf/progs/test_cls_redirect_dynptr.c | 979 ++ + .../bpf/progs/test_core_reloc_bitfields_probed.c | 1 - + .../selftests/bpf/progs/test_global_func1.c | 4 + + .../selftests/bpf/progs/test_global_func2.c | 4 + + .../selftests/bpf/progs/test_hash_large_key.c | 2 +- + .../selftests/bpf/progs/test_kfunc_dynptr_param.c | 2 +- + .../bpf/progs/test_ksyms_btf_write_check.c | 1 - + .../testing/selftests/bpf/progs/test_ksyms_weak.c | 17 +- + .../bpf/progs/test_l4lb_noinline_dynptr.c | 487 + + .../selftests/bpf/progs/test_legacy_printk.c | 2 +- + tools/testing/selftests/bpf/progs/test_log_fixup.c | 10 + + tools/testing/selftests/bpf/progs/test_map_lock.c | 2 +- + tools/testing/selftests/bpf/progs/test_map_ops.c | 138 + + tools/testing/selftests/bpf/progs/test_obj_id.c | 2 + + .../selftests/bpf/progs/test_parse_tcp_hdr_opt.c | 118 + + .../bpf/progs/test_parse_tcp_hdr_opt_dynptr.c | 114 + + .../testing/selftests/bpf/progs/test_pkt_access.c | 5 + + tools/testing/selftests/bpf/progs/test_ringbuf.c | 1 - + .../selftests/bpf/progs/test_ringbuf_map_key.c | 1 + + .../selftests/bpf/progs/test_ringbuf_multi.c | 1 - + .../bpf/progs/test_select_reuseport_kern.c | 2 +- + tools/testing/selftests/bpf/progs/test_sk_assign.c | 4 +- + tools/testing/selftests/bpf/progs/test_sk_lookup.c | 9 +- + .../selftests/bpf/progs/test_sk_lookup_kern.c | 4 +- + .../selftests/bpf/progs/test_sk_storage_tracing.c | 16 + + .../testing/selftests/bpf/progs/test_sock_fields.c | 2 +- + .../selftests/bpf/progs/test_sockmap_kern.h | 14 +- + tools/testing/selftests/bpf/progs/test_spin_lock.c | 3 + + .../selftests/bpf/progs/test_stacktrace_map.c | 2 +- + tools/testing/selftests/bpf/progs/test_tc_dtime.c | 4 +- + tools/testing/selftests/bpf/progs/test_tc_neigh.c | 4 +- + .../testing/selftests/bpf/progs/test_tcpbpf_kern.c | 2 - + .../testing/selftests/bpf/progs/test_tracepoint.c | 2 +- + .../testing/selftests/bpf/progs/test_tunnel_kern.c | 133 +- + .../selftests/bpf/progs/test_usdt_multispec.c | 2 - + .../selftests/bpf/progs/test_verif_scale1.c | 2 +- + .../selftests/bpf/progs/test_verif_scale2.c | 2 +- + .../selftests/bpf/progs/test_verif_scale3.c | 2 +- + .../bpf/progs/test_xdp_adjust_tail_grow.c | 2 - + .../testing/selftests/bpf/progs/test_xdp_bpf2bpf.c | 2 - + .../selftests/bpf/progs/test_xdp_do_redirect.c | 38 +- + .../testing/selftests/bpf/progs/test_xdp_dynptr.c | 255 + + .../selftests/bpf/progs/test_xdp_noinline.c | 43 - + tools/testing/selftests/bpf/progs/test_xdp_vlan.c | 13 - + tools/testing/selftests/bpf/progs/timer.c | 45 + + tools/testing/selftests/bpf/progs/tracing_struct.c | 13 + + tools/testing/selftests/bpf/progs/type_cast.c | 1 - + tools/testing/selftests/bpf/progs/udp_limit.c | 2 - + .../selftests/bpf/progs/user_ringbuf_success.c | 8 +- + tools/testing/selftests/bpf/progs/verifier_and.c | 107 + + .../selftests/bpf/progs/verifier_array_access.c | 529 + + .../selftests/bpf/progs/verifier_basic_stack.c | 100 + + .../testing/selftests/bpf/progs/verifier_bounds.c | 1076 ++ + .../bpf/progs/verifier_bounds_deduction.c | 171 + + .../progs/verifier_bounds_deduction_non_const.c | 639 + + .../bpf/progs/verifier_bounds_mix_sign_unsign.c | 554 + + .../selftests/bpf/progs/verifier_bpf_get_stack.c | 124 + + .../selftests/bpf/progs/verifier_btf_ctx_access.c | 32 + + tools/testing/selftests/bpf/progs/verifier_cfg.c | 100 + + .../bpf/progs/verifier_cgroup_inv_retcode.c | 89 + + .../selftests/bpf/progs/verifier_cgroup_skb.c | 227 + + .../selftests/bpf/progs/verifier_cgroup_storage.c | 308 + + .../selftests/bpf/progs/verifier_const_or.c | 82 + + tools/testing/selftests/bpf/progs/verifier_ctx.c | 221 + + .../selftests/bpf/progs/verifier_ctx_sk_msg.c | 228 + + .../testing/selftests/bpf/progs/verifier_d_path.c | 48 + + .../bpf/progs/verifier_direct_packet_access.c | 803 + + .../verifier_direct_stack_access_wraparound.c | 56 + + tools/testing/selftests/bpf/progs/verifier_div0.c | 213 + + .../selftests/bpf/progs/verifier_div_overflow.c | 144 + + .../bpf/progs/verifier_helper_access_var_len.c | 825 ++ + .../bpf/progs/verifier_helper_packet_access.c | 550 + + .../bpf/progs/verifier_helper_restricted.c | 279 + + .../bpf/progs/verifier_helper_value_access.c | 1245 ++ + .../testing/selftests/bpf/progs/verifier_int_ptr.c | 157 + + .../bpf/progs/verifier_jeq_infer_not_null.c | 213 + + .../testing/selftests/bpf/progs/verifier_ld_ind.c | 110 + + .../selftests/bpf/progs/verifier_leak_ptr.c | 92 + + .../testing/selftests/bpf/progs/verifier_loops1.c | 259 + + tools/testing/selftests/bpf/progs/verifier_lwt.c | 234 + + .../selftests/bpf/progs/verifier_map_in_map.c | 142 + + .../testing/selftests/bpf/progs/verifier_map_ptr.c | 159 + + .../selftests/bpf/progs/verifier_map_ptr_mixing.c | 265 + + .../selftests/bpf/progs/verifier_map_ret_val.c | 110 + + .../testing/selftests/bpf/progs/verifier_masking.c | 410 + + .../selftests/bpf/progs/verifier_meta_access.c | 284 + + .../selftests/bpf/progs/verifier_netfilter_ctx.c | 121 + + .../bpf/progs/verifier_netfilter_retcode.c | 49 + + .../bpf/progs/verifier_prevent_map_lookup.c | 61 + + .../selftests/bpf/progs/verifier_raw_stack.c | 371 + + .../selftests/bpf/progs/verifier_raw_tp_writable.c | 50 + + .../selftests/bpf/progs/verifier_ref_tracking.c | 1495 ++ + .../selftests/bpf/progs/verifier_reg_equal.c | 58 + + .../selftests/bpf/progs/verifier_regalloc.c | 364 + + .../testing/selftests/bpf/progs/verifier_ringbuf.c | 131 + + .../selftests/bpf/progs/verifier_runtime_jit.c | 360 + + .../selftests/bpf/progs/verifier_search_pruning.c | 339 + + tools/testing/selftests/bpf/progs/verifier_sock.c | 980 ++ + .../selftests/bpf/progs/verifier_spill_fill.c | 374 + + .../selftests/bpf/progs/verifier_spin_lock.c | 533 + + .../selftests/bpf/progs/verifier_stack_ptr.c | 484 + + .../testing/selftests/bpf/progs/verifier_subreg.c | 673 + + .../testing/selftests/bpf/progs/verifier_uninit.c | 61 + + .../testing/selftests/bpf/progs/verifier_unpriv.c | 726 + + .../selftests/bpf/progs/verifier_unpriv_perf.c | 34 + + tools/testing/selftests/bpf/progs/verifier_value.c | 158 + + .../selftests/bpf/progs/verifier_value_adj_spill.c | 78 + + .../bpf/progs/verifier_value_illegal_alu.c | 149 + + .../selftests/bpf/progs/verifier_value_or_null.c | 288 + + .../selftests/bpf/progs/verifier_value_ptr_arith.c | 1423 ++ + .../testing/selftests/bpf/progs/verifier_var_off.c | 349 + + tools/testing/selftests/bpf/progs/verifier_xadd.c | 124 + + tools/testing/selftests/bpf/progs/verifier_xdp.c | 24 + + .../bpf/progs/verifier_xdp_direct_packet_access.c | 1722 +++ + tools/testing/selftests/bpf/progs/xdp_features.c | 1 - + tools/testing/selftests/bpf/progs/xdping_kern.c | 2 - + tools/testing/selftests/bpf/progs/xdpwall.c | 1 - + tools/testing/selftests/bpf/progs/xsk_xdp_progs.c | 25 + + tools/testing/selftests/bpf/test_ftrace.sh | 7 +- + tools/testing/selftests/bpf/test_loader.c | 614 +- + tools/testing/selftests/bpf/test_progs.c | 108 +- + tools/testing/selftests/bpf/test_progs.h | 27 +- + tools/testing/selftests/bpf/test_tcp_hdr_options.h | 1 + + tools/testing/selftests/bpf/test_tunnel.sh | 13 +- + tools/testing/selftests/bpf/test_verifier.c | 49 +- + tools/testing/selftests/bpf/test_verifier_log.c | 175 - + tools/testing/selftests/bpf/test_xsk.sh | 1 + + tools/testing/selftests/bpf/testing_helpers.c | 22 +- + tools/testing/selftests/bpf/testing_helpers.h | 2 + + tools/testing/selftests/bpf/trace_helpers.c | 90 +- + tools/testing/selftests/bpf/trace_helpers.h | 5 + + tools/testing/selftests/bpf/unpriv_helpers.c | 26 + + tools/testing/selftests/bpf/unpriv_helpers.h | 7 + + tools/testing/selftests/bpf/verifier/and.c | 68 - + .../testing/selftests/bpf/verifier/array_access.c | 379 - + tools/testing/selftests/bpf/verifier/basic_stack.c | 64 - + tools/testing/selftests/bpf/verifier/bounds.c | 755 - + .../selftests/bpf/verifier/bounds_deduction.c | 136 - + .../bpf/verifier/bounds_mix_sign_unsign.c | 411 - + .../testing/selftests/bpf/verifier/bpf_get_stack.c | 87 - + .../selftests/bpf/verifier/btf_ctx_access.c | 12 - + tools/testing/selftests/bpf/verifier/calls.c | 14 +- + tools/testing/selftests/bpf/verifier/cfg.c | 73 - + .../selftests/bpf/verifier/cgroup_inv_retcode.c | 72 - + tools/testing/selftests/bpf/verifier/cgroup_skb.c | 197 - + .../selftests/bpf/verifier/cgroup_storage.c | 220 - + tools/testing/selftests/bpf/verifier/const_or.c | 60 - + tools/testing/selftests/bpf/verifier/ctx.c | 197 - + tools/testing/selftests/bpf/verifier/ctx_sk_msg.c | 181 - + tools/testing/selftests/bpf/verifier/d_path.c | 37 - + .../selftests/bpf/verifier/direct_packet_access.c | 710 - + .../bpf/verifier/direct_stack_access_wraparound.c | 40 - + tools/testing/selftests/bpf/verifier/div0.c | 184 - + .../testing/selftests/bpf/verifier/div_overflow.c | 110 - + .../selftests/bpf/verifier/helper_access_var_len.c | 650 - + .../selftests/bpf/verifier/helper_packet_access.c | 460 - + .../selftests/bpf/verifier/helper_restricted.c | 196 - + .../selftests/bpf/verifier/helper_value_access.c | 953 -- + tools/testing/selftests/bpf/verifier/int_ptr.c | 161 - + .../selftests/bpf/verifier/jeq_infer_not_null.c | 174 - + tools/testing/selftests/bpf/verifier/ld_ind.c | 72 - + tools/testing/selftests/bpf/verifier/leak_ptr.c | 67 - + tools/testing/selftests/bpf/verifier/loops1.c | 206 - + tools/testing/selftests/bpf/verifier/lwt.c | 189 - + tools/testing/selftests/bpf/verifier/map_in_map.c | 96 - + tools/testing/selftests/bpf/verifier/map_kptr.c | 29 +- + tools/testing/selftests/bpf/verifier/map_ptr.c | 99 - + .../selftests/bpf/verifier/map_ptr_mixing.c | 100 - + tools/testing/selftests/bpf/verifier/map_ret_val.c | 65 - + tools/testing/selftests/bpf/verifier/masking.c | 322 - + tools/testing/selftests/bpf/verifier/meta_access.c | 235 - + .../selftests/bpf/verifier/prevent_map_lookup.c | 29 - + tools/testing/selftests/bpf/verifier/raw_stack.c | 305 - + .../selftests/bpf/verifier/raw_tp_writable.c | 35 - + .../testing/selftests/bpf/verifier/ref_tracking.c | 1082 -- + tools/testing/selftests/bpf/verifier/regalloc.c | 277 - + tools/testing/selftests/bpf/verifier/ringbuf.c | 95 - + tools/testing/selftests/bpf/verifier/runtime_jit.c | 231 - + .../selftests/bpf/verifier/search_pruning.c | 266 - + tools/testing/selftests/bpf/verifier/sock.c | 706 - + tools/testing/selftests/bpf/verifier/spill_fill.c | 345 - + tools/testing/selftests/bpf/verifier/spin_lock.c | 447 - + tools/testing/selftests/bpf/verifier/stack_ptr.c | 359 - + tools/testing/selftests/bpf/verifier/subreg.c | 533 - + tools/testing/selftests/bpf/verifier/uninit.c | 39 - + tools/testing/selftests/bpf/verifier/unpriv.c | 539 - + tools/testing/selftests/bpf/verifier/value.c | 104 - + .../selftests/bpf/verifier/value_adj_spill.c | 43 - + .../selftests/bpf/verifier/value_illegal_alu.c | 95 - + .../testing/selftests/bpf/verifier/value_or_null.c | 220 - + .../selftests/bpf/verifier/value_ptr_arith.c | 1140 -- + tools/testing/selftests/bpf/verifier/var_off.c | 291 - + tools/testing/selftests/bpf/verifier/xadd.c | 97 - + tools/testing/selftests/bpf/verifier/xdp.c | 14 - + .../bpf/verifier/xdp_direct_packet_access.c | 1468 -- + tools/testing/selftests/bpf/veristat.c | 207 +- + tools/testing/selftests/bpf/xdp_features.c | 67 +- + tools/testing/selftests/bpf/xsk_xdp_metadata.h | 5 + + tools/testing/selftests/bpf/xskxceiver.c | 110 +- + tools/testing/selftests/bpf/xskxceiver.h | 5 +- + .../selftests/drivers/net/mlxsw/qos_headroom.sh | 3 +- + .../testing/selftests/drivers/net/mlxsw/qos_lib.sh | 28 - + .../testing/selftests/drivers/net/mlxsw/qos_pfc.sh | 3 +- + .../testing/selftests/drivers/net/mlxsw/sch_ets.sh | 3 +- + .../selftests/drivers/net/mlxsw/sch_red_core.sh | 1 - + .../selftests/drivers/net/mlxsw/sch_red_ets.sh | 2 +- + .../selftests/drivers/net/mlxsw/sch_red_root.sh | 2 +- + .../selftests/drivers/net/mlxsw/sch_tbf_ets.sh | 6 +- + .../selftests/drivers/net/mlxsw/sch_tbf_prio.sh | 6 +- + .../selftests/drivers/net/mlxsw/sch_tbf_root.sh | 6 +- + tools/testing/selftests/net/Makefile | 5 +- + tools/testing/selftests/net/big_tcp.sh | 180 + + tools/testing/selftests/net/config | 1 + + tools/testing/selftests/net/forwarding/Makefile | 2 + + .../testing/selftests/net/forwarding/ethtool_mm.sh | 288 + + .../selftests/net/forwarding/hw_stats_l3.sh | 15 +- + tools/testing/selftests/net/forwarding/lib.sh | 60 + + .../selftests/net/forwarding/sch_tbf_etsprio.sh | 4 + + .../selftests/net/forwarding/sch_tbf_root.sh | 4 + + .../selftests/net/forwarding/tc_tunnel_key.sh | 161 + + tools/testing/selftests/net/mptcp/mptcp_connect.c | 8 +- + tools/testing/selftests/net/mptcp/mptcp_join.sh | 57 +- + .../selftests/net/openvswitch/openvswitch.sh | 89 +- + .../testing/selftests/net/openvswitch/ovs-dpctl.py | 1276 +- + tools/testing/selftests/net/rtnetlink.sh | 161 +- + tools/testing/selftests/net/tcp_mmap.c | 102 +- + .../selftests/net/test_bridge_neigh_suppress.sh | 862 ++ + tools/testing/selftests/net/test_vxlan_mdb.sh | 2318 +++ + tools/testing/selftests/net/tls.c | 45 + + .../creating-testcases/AddingTestCases.txt | 2 + + .../tc-testing/tc-tests/actions/tunnel_key.json | 25 + + .../tc-testing/tc-tests/infra/actions.json | 416 + + .../selftests/tc-testing/tc-tests/qdiscs/fq.json | 22 + + .../selftests/tc-testing/tc-tests/qdiscs/qfq.json | 72 + + tools/testing/selftests/tc-testing/tdc.py | 13 + + tools/testing/vsock/.gitignore | 1 + + tools/testing/vsock/vsock_test.c | 4 +- + 2842 files changed, 159263 insertions(+), 65253 deletions(-) + create mode 100644 Documentation/bpf/libbpf/libbpf_overview.rst + delete mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,sgmiisys.txt + delete mode 100644 Documentation/devicetree/bindings/crypto/qcom-qce.txt + create mode 100644 Documentation/devicetree/bindings/crypto/qcom-qce.yaml + create mode 100644 Documentation/devicetree/bindings/net/bluetooth/nxp,88w8987-bt.yaml + create mode 100644 Documentation/devicetree/bindings/net/can/st,stm32-bxcan.yaml + create mode 100644 Documentation/devicetree/bindings/net/pcs/mediatek,sgmiisys.yaml + delete mode 100644 Documentation/devicetree/bindings/net/qcom,ethqos.txt + create mode 100644 Documentation/devicetree/bindings/net/qcom,ethqos.yaml + create mode 100644 Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml + delete mode 100644 Documentation/devicetree/bindings/net/wireless/qcom,ath10k.txt + create mode 100644 Documentation/devicetree/bindings/net/wireless/qcom,ath10k.yaml + create mode 100644 Documentation/devicetree/bindings/net/wireless/qcom,ath11k-pci.yaml + create mode 100644 Documentation/netlink/specs/devlink.yaml + create mode 100644 Documentation/netlink/specs/handshake.yaml + create mode 100644 Documentation/netlink/specs/ovs_datapath.yaml + create mode 100644 Documentation/netlink/specs/ovs_vport.yaml + create mode 100644 Documentation/networking/device_drivers/ethernet/amd/pds_core.rst + delete mode 100644 Documentation/networking/device_drivers/ethernet/intel/ixgb.rst + create mode 100644 Documentation/networking/napi.rst + create mode 100644 Documentation/networking/tls-handshake.rst + create mode 100644 arch/powerpc/crypto/aes-gcm-p10-glue.c + create mode 100644 arch/powerpc/crypto/aes-gcm-p10.S + create mode 100644 arch/powerpc/crypto/aesp8-ppc.pl + create mode 100644 arch/powerpc/crypto/ghashp8-ppc.pl + create mode 100644 arch/powerpc/crypto/ppc-xlate.pl + delete mode 100644 block/blk-mq-rdma.c + delete mode 100644 block/blk-mq-tag.h + create mode 100644 crypto/compress.h + create mode 100644 crypto/hash.h + rename {include/linux => drivers/ata/pata_parport}/pata_parport.h (75%) + delete mode 100644 drivers/ata/pata_parport/ppc6lnx.c + create mode 100644 drivers/bluetooth/btnxpuart.c + create mode 100644 drivers/crypto/ccp/platform-access.c + create mode 100644 drivers/crypto/ccp/platform-access.h + create mode 100644 drivers/crypto/hisilicon/trng/trng-stb.c + create mode 100644 drivers/crypto/intel/Kconfig + create mode 100644 drivers/crypto/intel/Makefile + create mode 100644 drivers/crypto/intel/ixp4xx/Kconfig + create mode 100644 drivers/crypto/intel/ixp4xx/Makefile + rename drivers/crypto/{ => intel/ixp4xx}/ixp4xx_crypto.c (99%) + rename drivers/crypto/{ => intel}/keembay/Kconfig (100%) + rename drivers/crypto/{ => intel}/keembay/Makefile (100%) + rename drivers/crypto/{ => intel}/keembay/keembay-ocs-aes-core.c (99%) + rename drivers/crypto/{ => intel}/keembay/keembay-ocs-ecc.c (100%) + rename drivers/crypto/{ => intel}/keembay/keembay-ocs-hcu-core.c (100%) + rename drivers/crypto/{ => intel}/keembay/ocs-aes.c (100%) + rename drivers/crypto/{ => intel}/keembay/ocs-aes.h (100%) + rename drivers/crypto/{ => intel}/keembay/ocs-hcu.c (100%) + rename drivers/crypto/{ => intel}/keembay/ocs-hcu.h (100%) + rename drivers/crypto/{ => intel}/qat/Kconfig (100%) + rename drivers/crypto/{ => intel}/qat/Makefile (100%) + rename drivers/crypto/{ => intel}/qat/qat_4xxx/Makefile (100%) + rename drivers/crypto/{ => intel}/qat/qat_4xxx/adf_4xxx_hw_data.c (87%) + rename drivers/crypto/{ => intel}/qat/qat_4xxx/adf_4xxx_hw_data.h (86%) + rename drivers/crypto/{ => intel}/qat/qat_4xxx/adf_drv.c (95%) + rename drivers/crypto/{ => intel}/qat/qat_c3xxx/Makefile (100%) + rename drivers/crypto/{ => intel}/qat/qat_c3xxx/adf_c3xxx_hw_data.c (98%) + rename drivers/crypto/{ => intel}/qat/qat_c3xxx/adf_c3xxx_hw_data.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_c3xxx/adf_drv.c (93%) + rename drivers/crypto/{ => intel}/qat/qat_c3xxxvf/Makefile (100%) + rename drivers/crypto/{ => intel}/qat/qat_c3xxxvf/adf_c3xxxvf_hw_data.c (100%) + rename drivers/crypto/{ => intel}/qat/qat_c3xxxvf/adf_c3xxxvf_hw_data.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_c3xxxvf/adf_drv.c (96%) + rename drivers/crypto/{ => intel}/qat/qat_c62x/Makefile (100%) + rename drivers/crypto/{ => intel}/qat/qat_c62x/adf_c62x_hw_data.c (98%) + rename drivers/crypto/{ => intel}/qat/qat_c62x/adf_c62x_hw_data.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_c62x/adf_drv.c (93%) + rename drivers/crypto/{ => intel}/qat/qat_c62xvf/Makefile (100%) + rename drivers/crypto/{ => intel}/qat/qat_c62xvf/adf_c62xvf_hw_data.c (100%) + rename drivers/crypto/{ => intel}/qat/qat_c62xvf/adf_c62xvf_hw_data.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_c62xvf/adf_drv.c (96%) + rename drivers/crypto/{ => intel}/qat/qat_common/Makefile (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_accel_devices.h (97%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_accel_engine.c (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_admin.c (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_aer.c (82%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_cfg.c (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_cfg.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_cfg_common.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_cfg_strings.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_cfg_user.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_common_drv.h (96%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_ctl_drv.c (95%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_dev_mgr.c (99%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen2_config.c (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen2_config.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen2_dc.c (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen2_dc.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen2_hw_data.c (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen2_hw_data.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen2_pfvf.c (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen2_pfvf.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen4_dc.c (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen4_dc.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen4_hw_data.c (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen4_hw_data.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen4_pfvf.c (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen4_pfvf.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen4_pm.c (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen4_pm.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_hw_arbiter.c (98%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_init.c (85%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_isr.c (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_pfvf_msg.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_pfvf_pf_msg.c (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_pfvf_pf_msg.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_pfvf_pf_proto.c (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_pfvf_pf_proto.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_pfvf_utils.c (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_pfvf_utils.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_pfvf_vf_msg.c (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_pfvf_vf_msg.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_pfvf_vf_proto.c (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_pfvf_vf_proto.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_sriov.c (96%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_sysfs.c (88%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_transport.c (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_transport.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_transport_access_macros.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_transport_debug.c (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_transport_internal.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_vf_isr.c (99%) + rename drivers/crypto/{ => intel}/qat/qat_common/icp_qat_fw.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/icp_qat_fw_comp.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/icp_qat_fw_init_admin.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/icp_qat_fw_la.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/icp_qat_fw_loader_handle.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/icp_qat_fw_pke.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/icp_qat_hal.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/icp_qat_hw.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/icp_qat_hw_20_comp.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/icp_qat_hw_20_comp_defs.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/icp_qat_uclo.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/qat_algs.c (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/qat_algs_send.c (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/qat_algs_send.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/qat_asym_algs.c (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/qat_bl.c (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/qat_bl.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/qat_comp_algs.c (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/qat_comp_req.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/qat_compression.c (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/qat_compression.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/qat_crypto.c (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/qat_crypto.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/qat_hal.c (99%) + rename drivers/crypto/{ => intel}/qat/qat_common/qat_uclo.c (99%) + rename drivers/crypto/{ => intel}/qat/qat_dh895xcc/Makefile (100%) + rename drivers/crypto/{ => intel}/qat/qat_dh895xcc/adf_dh895xcc_hw_data.c (99%) + rename drivers/crypto/{ => intel}/qat/qat_dh895xcc/adf_dh895xcc_hw_data.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_dh895xcc/adf_drv.c (93%) + rename drivers/crypto/{ => intel}/qat/qat_dh895xccvf/Makefile (100%) + rename drivers/crypto/{ => intel}/qat/qat_dh895xccvf/adf_dh895xccvf_hw_data.c (100%) + rename drivers/crypto/{ => intel}/qat/qat_dh895xccvf/adf_dh895xccvf_hw_data.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_dh895xccvf/adf_drv.c (96%) + create mode 100644 drivers/net/can/bxcan.c + create mode 100644 drivers/net/dsa/mt7530-mdio.c + create mode 100644 drivers/net/dsa/mt7530-mmio.c + create mode 100644 drivers/net/dsa/qca/qca8k-leds.c + create mode 100644 drivers/net/dsa/qca/qca8k_leds.h + create mode 100644 drivers/net/ethernet/amd/pds_core/Makefile + create mode 100644 drivers/net/ethernet/amd/pds_core/adminq.c + create mode 100644 drivers/net/ethernet/amd/pds_core/auxbus.c + create mode 100644 drivers/net/ethernet/amd/pds_core/core.c + create mode 100644 drivers/net/ethernet/amd/pds_core/core.h + create mode 100644 drivers/net/ethernet/amd/pds_core/debugfs.c + create mode 100644 drivers/net/ethernet/amd/pds_core/dev.c + create mode 100644 drivers/net/ethernet/amd/pds_core/devlink.c + create mode 100644 drivers/net/ethernet/amd/pds_core/fw.c + create mode 100644 drivers/net/ethernet/amd/pds_core/main.c + delete mode 100644 drivers/net/ethernet/intel/ixgb/Makefile + delete mode 100644 drivers/net/ethernet/intel/ixgb/ixgb.h + delete mode 100644 drivers/net/ethernet/intel/ixgb/ixgb_ee.c + delete mode 100644 drivers/net/ethernet/intel/ixgb/ixgb_ee.h + delete mode 100644 drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c + delete mode 100644 drivers/net/ethernet/intel/ixgb/ixgb_hw.c + delete mode 100644 drivers/net/ethernet/intel/ixgb/ixgb_hw.h + delete mode 100644 drivers/net/ethernet/intel/ixgb/ixgb_ids.h + delete mode 100644 drivers/net/ethernet/intel/ixgb/ixgb_main.c + delete mode 100644 drivers/net/ethernet/intel/ixgb/ixgb_osdep.h + delete mode 100644 drivers/net/ethernet/intel/ixgb/ixgb_param.c + delete mode 100644 drivers/net/ethernet/mediatek/mtk_sgmii.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/diag/reporter_vnic.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/diag/reporter_vnic.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/esw/bridge_mcast.c + delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/esw/debugfs.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/steering/dr_arg.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ptrn.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/thermal.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/thermal.h + create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c + create mode 100644 drivers/net/ipa/data/ipa_data-v5.0.c + create mode 100644 drivers/net/ipa/reg/gsi_reg-v5.0.c + create mode 100644 drivers/net/ipa/reg/ipa_reg-v5.0.c + create mode 100644 drivers/net/pcs/pcs-mtk-lynxi.c + create mode 100644 drivers/net/phy/microchip_t1s.c + create mode 100644 drivers/net/phy/nxp-cbtx.c + create mode 100644 drivers/net/vxlan/vxlan_mdb.c + create mode 100644 drivers/net/wireless/broadcom/brcm80211/brcmfmac/acpi.c + create mode 100644 drivers/net/wireless/intel/iwlwifi/mvm/link.c + create mode 100644 drivers/net/wireless/intel/iwlwifi/mvm/mld-mac.c + create mode 100644 drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c + create mode 100644 drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c + create mode 100644 drivers/net/wireless/intel/iwlwifi/mvm/ptp.c + create mode 100644 drivers/net/wireless/intel/iwlwifi/mvm/time-sync.c + create mode 100644 drivers/net/wireless/intel/iwlwifi/mvm/time-sync.h + create mode 100644 drivers/net/wireless/legacy/Kconfig + create mode 100644 drivers/net/wireless/legacy/Makefile + rename drivers/net/wireless/{ => legacy}/ray_cs.c (100%) + rename drivers/net/wireless/{ => legacy}/ray_cs.h (100%) + rename drivers/net/wireless/{ => legacy}/rayctl.h (100%) + rename drivers/net/wireless/{ => legacy}/rndis_wlan.c (99%) + rename drivers/net/wireless/{ => legacy}/wl3501.h (100%) + rename drivers/net/wireless/{ => legacy}/wl3501_cs.c (100%) + delete mode 100644 drivers/net/wireless/mediatek/mt76/mt7921/eeprom.h + delete mode 100644 drivers/net/wireless/mediatek/mt76/mt7921/mac.h + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7996/coredump.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7996/coredump.h + create mode 100644 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8710b.c + create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8821cs.c + create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8822bs.c + create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8822cs.c + create mode 100644 drivers/net/wireless/realtek/rtw88/sdio.c + create mode 100644 drivers/net/wireless/realtek/rtw88/sdio.h + create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8851b_rfk_table.c + create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8851b_rfk_table.h + create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8851b_table.c + create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8851b_table.h + create mode 100644 drivers/net/wireless/virtual/Kconfig + create mode 100644 drivers/net/wireless/virtual/Makefile + rename drivers/net/wireless/{ => virtual}/mac80211_hwsim.c (86%) + rename drivers/net/wireless/{ => virtual}/mac80211_hwsim.h (80%) + rename drivers/net/wireless/{ => virtual}/virt_wifi.c (100%) + create mode 100644 drivers/ptp/ptp_dfl_tod.c + create mode 100644 drivers/target/tcm_remote/Kconfig + create mode 100644 drivers/target/tcm_remote/Makefile + create mode 100644 drivers/target/tcm_remote/tcm_remote.c + create mode 100644 drivers/target/tcm_remote/tcm_remote.h + delete mode 100644 fs/dlm/netlink.c + create mode 100644 include/crypto/utils.h + delete mode 100644 include/linux/blk-mq-rdma.h + create mode 100644 include/linux/net_tstamp.h + create mode 100644 include/linux/pcs/pcs-mtk-lynxi.h + create mode 100644 include/linux/pds/pds_adminq.h + create mode 100644 include/linux/pds/pds_auxbus.h + create mode 100644 include/linux/pds/pds_common.h + create mode 100644 include/linux/pds/pds_core_if.h + create mode 100644 include/linux/pds/pds_intr.h + delete mode 100644 include/linux/platform_data/nfcmrvl.h + create mode 100644 include/linux/psp-platform-access.h + create mode 100644 include/linux/psp.h + create mode 100644 include/linux/rcuref.h + create mode 100644 include/net/bluetooth/coredump.h + create mode 100644 include/net/dropreason-core.h + create mode 100644 include/net/dsa_stubs.h + create mode 100644 include/net/handshake.h + create mode 100644 include/net/netdev_queues.h + create mode 100644 include/net/netfilter/nf_bpf_link.h + create mode 100644 include/trace/events/handshake.h + delete mode 100644 include/uapi/linux/dlm_netlink.h + create mode 100644 include/uapi/linux/ext4.h + create mode 100644 include/uapi/linux/handshake.h + create mode 100644 kernel/bpf/log.c + create mode 100644 lib/rcuref.c + create mode 100644 net/bluetooth/coredump.c + create mode 100644 net/dsa/stubs.c + create mode 100644 net/dsa/trace.c + create mode 100644 net/dsa/trace.h + create mode 100644 net/handshake/.kunitconfig + create mode 100644 net/handshake/Makefile + create mode 100644 net/handshake/genl.c + create mode 100644 net/handshake/genl.h + create mode 100644 net/handshake/handshake-test.c + create mode 100644 net/handshake/handshake.h + create mode 100644 net/handshake/netlink.c + create mode 100644 net/handshake/request.c + create mode 100644 net/handshake/tlshd.c + create mode 100644 net/handshake/trace.c + create mode 100644 net/ipv4/fou_bpf.c + create mode 100644 net/mac80211/drop.h + create mode 100644 net/netfilter/nf_bpf_link.c + create mode 100644 net/sctp/stream_sched_fc.c + create mode 100644 net/vmw_vsock/vsock_bpf.c + delete mode 100644 tools/arch/arm64/include/uapi/asm/bpf_perf_event.h + delete mode 100644 tools/arch/s390/include/uapi/asm/bpf_perf_event.h + delete mode 100644 tools/arch/s390/include/uapi/asm/ptrace.h + create mode 100644 tools/lib/bpf/zip.c + create mode 100644 tools/lib/bpf/zip.h + create mode 100755 tools/net/ynl/ethtool.py + create mode 100644 tools/net/ynl/requirements.txt + create mode 100644 tools/testing/selftests/bpf/autoconf_helper.h + create mode 100644 tools/testing/selftests/bpf/benchs/bench_local_storage_create.c + create mode 100644 tools/testing/selftests/bpf/bpf_kfuncs.h + create mode 120000 tools/testing/selftests/bpf/disasm.c + create mode 120000 tools/testing/selftests/bpf/disasm.h + create mode 120000 tools/testing/selftests/bpf/json_writer.c + create mode 120000 tools/testing/selftests/bpf/json_writer.h + create mode 100644 tools/testing/selftests/bpf/prog_tests/access_variable_array.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/ctx_rewrite.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/iters.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/local_kptr_stash.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/map_ops.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/module_fentry_shadow.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/parse_tcp_hdr_opt.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/refcounted_kptr.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/verifier.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/verifier_log.c + create mode 100644 tools/testing/selftests/bpf/progs/bench_local_storage_create.c + create mode 100644 tools/testing/selftests/bpf/progs/err.h + create mode 100644 tools/testing/selftests/bpf/progs/iters.c + create mode 100644 tools/testing/selftests/bpf/progs/iters_looping.c + create mode 100644 tools/testing/selftests/bpf/progs/iters_num.c + create mode 100644 tools/testing/selftests/bpf/progs/iters_state_safety.c + create mode 100644 tools/testing/selftests/bpf/progs/iters_testmod_seq.c + create mode 100644 tools/testing/selftests/bpf/progs/local_kptr_stash.c + create mode 100644 tools/testing/selftests/bpf/progs/pyperf600_iter.c + create mode 100644 tools/testing/selftests/bpf/progs/rcu_tasks_trace_gp.c + create mode 100644 tools/testing/selftests/bpf/progs/refcounted_kptr.c + create mode 100644 tools/testing/selftests/bpf/progs/refcounted_kptr_fail.c + create mode 100644 tools/testing/selftests/bpf/progs/tcp_ca_update.c + create mode 100644 tools/testing/selftests/bpf/progs/test_access_variable_array.c + create mode 100644 tools/testing/selftests/bpf/progs/test_attach_kprobe_sleepable.c + create mode 100644 tools/testing/selftests/bpf/progs/test_attach_probe_manual.c + create mode 100644 tools/testing/selftests/bpf/progs/test_cls_redirect_dynptr.c + create mode 100644 tools/testing/selftests/bpf/progs/test_l4lb_noinline_dynptr.c + create mode 100644 tools/testing/selftests/bpf/progs/test_map_ops.c + create mode 100644 tools/testing/selftests/bpf/progs/test_parse_tcp_hdr_opt.c + create mode 100644 tools/testing/selftests/bpf/progs/test_parse_tcp_hdr_opt_dynptr.c + create mode 100644 tools/testing/selftests/bpf/progs/test_xdp_dynptr.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_and.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_array_access.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_basic_stack.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_bounds.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_bounds_deduction.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_bounds_deduction_non_const.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_bounds_mix_sign_unsign.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_bpf_get_stack.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_btf_ctx_access.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_cfg.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_cgroup_inv_retcode.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_cgroup_skb.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_cgroup_storage.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_const_or.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_ctx.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_ctx_sk_msg.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_d_path.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_direct_packet_access.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_direct_stack_access_wraparound.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_div0.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_div_overflow.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_helper_access_var_len.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_helper_packet_access.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_helper_restricted.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_helper_value_access.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_int_ptr.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_jeq_infer_not_null.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_ld_ind.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_leak_ptr.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_loops1.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_lwt.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_map_in_map.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_map_ptr.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_map_ptr_mixing.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_map_ret_val.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_masking.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_meta_access.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_netfilter_ctx.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_netfilter_retcode.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_prevent_map_lookup.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_raw_stack.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_raw_tp_writable.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_ref_tracking.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_reg_equal.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_regalloc.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_ringbuf.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_runtime_jit.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_search_pruning.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_sock.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_spill_fill.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_spin_lock.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_stack_ptr.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_subreg.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_uninit.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_unpriv.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_unpriv_perf.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_value.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_value_adj_spill.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_value_illegal_alu.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_value_or_null.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_value_ptr_arith.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_var_off.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_xadd.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_xdp.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_xdp_direct_packet_access.c + delete mode 100644 tools/testing/selftests/bpf/test_verifier_log.c + create mode 100644 tools/testing/selftests/bpf/unpriv_helpers.c + create mode 100644 tools/testing/selftests/bpf/unpriv_helpers.h + delete mode 100644 tools/testing/selftests/bpf/verifier/and.c + delete mode 100644 tools/testing/selftests/bpf/verifier/array_access.c + delete mode 100644 tools/testing/selftests/bpf/verifier/basic_stack.c + delete mode 100644 tools/testing/selftests/bpf/verifier/bounds.c + delete mode 100644 tools/testing/selftests/bpf/verifier/bounds_deduction.c + delete mode 100644 tools/testing/selftests/bpf/verifier/bounds_mix_sign_unsign.c + delete mode 100644 tools/testing/selftests/bpf/verifier/bpf_get_stack.c + delete mode 100644 tools/testing/selftests/bpf/verifier/btf_ctx_access.c + delete mode 100644 tools/testing/selftests/bpf/verifier/cfg.c + delete mode 100644 tools/testing/selftests/bpf/verifier/cgroup_inv_retcode.c + delete mode 100644 tools/testing/selftests/bpf/verifier/cgroup_skb.c + delete mode 100644 tools/testing/selftests/bpf/verifier/cgroup_storage.c + delete mode 100644 tools/testing/selftests/bpf/verifier/const_or.c + delete mode 100644 tools/testing/selftests/bpf/verifier/ctx.c + delete mode 100644 tools/testing/selftests/bpf/verifier/ctx_sk_msg.c + delete mode 100644 tools/testing/selftests/bpf/verifier/d_path.c + delete mode 100644 tools/testing/selftests/bpf/verifier/direct_packet_access.c + delete mode 100644 tools/testing/selftests/bpf/verifier/direct_stack_access_wraparound.c + delete mode 100644 tools/testing/selftests/bpf/verifier/div0.c + delete mode 100644 tools/testing/selftests/bpf/verifier/div_overflow.c + delete mode 100644 tools/testing/selftests/bpf/verifier/helper_access_var_len.c + delete mode 100644 tools/testing/selftests/bpf/verifier/helper_packet_access.c + delete mode 100644 tools/testing/selftests/bpf/verifier/helper_restricted.c + delete mode 100644 tools/testing/selftests/bpf/verifier/helper_value_access.c + delete mode 100644 tools/testing/selftests/bpf/verifier/int_ptr.c + delete mode 100644 tools/testing/selftests/bpf/verifier/jeq_infer_not_null.c + delete mode 100644 tools/testing/selftests/bpf/verifier/ld_ind.c + delete mode 100644 tools/testing/selftests/bpf/verifier/leak_ptr.c + delete mode 100644 tools/testing/selftests/bpf/verifier/loops1.c + delete mode 100644 tools/testing/selftests/bpf/verifier/lwt.c + delete mode 100644 tools/testing/selftests/bpf/verifier/map_in_map.c + delete mode 100644 tools/testing/selftests/bpf/verifier/map_ptr.c + delete mode 100644 tools/testing/selftests/bpf/verifier/map_ptr_mixing.c + delete mode 100644 tools/testing/selftests/bpf/verifier/map_ret_val.c + delete mode 100644 tools/testing/selftests/bpf/verifier/masking.c + delete mode 100644 tools/testing/selftests/bpf/verifier/meta_access.c + delete mode 100644 tools/testing/selftests/bpf/verifier/prevent_map_lookup.c + delete mode 100644 tools/testing/selftests/bpf/verifier/raw_stack.c + delete mode 100644 tools/testing/selftests/bpf/verifier/raw_tp_writable.c + delete mode 100644 tools/testing/selftests/bpf/verifier/ref_tracking.c + delete mode 100644 tools/testing/selftests/bpf/verifier/regalloc.c + delete mode 100644 tools/testing/selftests/bpf/verifier/ringbuf.c + delete mode 100644 tools/testing/selftests/bpf/verifier/runtime_jit.c + delete mode 100644 tools/testing/selftests/bpf/verifier/search_pruning.c + delete mode 100644 tools/testing/selftests/bpf/verifier/sock.c + delete mode 100644 tools/testing/selftests/bpf/verifier/spill_fill.c + delete mode 100644 tools/testing/selftests/bpf/verifier/spin_lock.c + delete mode 100644 tools/testing/selftests/bpf/verifier/stack_ptr.c + delete mode 100644 tools/testing/selftests/bpf/verifier/subreg.c + delete mode 100644 tools/testing/selftests/bpf/verifier/uninit.c + delete mode 100644 tools/testing/selftests/bpf/verifier/unpriv.c + delete mode 100644 tools/testing/selftests/bpf/verifier/value.c + delete mode 100644 tools/testing/selftests/bpf/verifier/value_adj_spill.c + delete mode 100644 tools/testing/selftests/bpf/verifier/value_illegal_alu.c + delete mode 100644 tools/testing/selftests/bpf/verifier/value_or_null.c + delete mode 100644 tools/testing/selftests/bpf/verifier/value_ptr_arith.c + delete mode 100644 tools/testing/selftests/bpf/verifier/var_off.c + delete mode 100644 tools/testing/selftests/bpf/verifier/xadd.c + delete mode 100644 tools/testing/selftests/bpf/verifier/xdp.c + delete mode 100644 tools/testing/selftests/bpf/verifier/xdp_direct_packet_access.c + create mode 100644 tools/testing/selftests/bpf/xsk_xdp_metadata.h + create mode 100755 tools/testing/selftests/net/big_tcp.sh + create mode 100755 tools/testing/selftests/net/forwarding/ethtool_mm.sh + create mode 100755 tools/testing/selftests/net/forwarding/tc_tunnel_key.sh + create mode 100755 tools/testing/selftests/net/test_bridge_neigh_suppress.sh + create mode 100755 tools/testing/selftests/net/test_vxlan_mdb.sh + create mode 100644 tools/testing/selftests/tc-testing/tc-tests/infra/actions.json +Merging fixes/fixes (1c23f9e627a7b Linux 6.0-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 mm-hotfixes/mm-hotfixes-unstable (f9b0a629ef58a relayfs: fix out-of-bounds access in relay_file_read) +$ 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 mm/shmem.c +Merge made by the 'recursive' strategy. + kernel/relay.c | 3 ++- + mm/kasan/hw_tags.c | 4 ++-- + mm/memory.c | 3 +++ + mm/shmem.c | 17 ++++++++++++++++- + 4 files changed, 23 insertions(+), 4 deletions(-) +Merging kbuild-current/fixes (9cedc5e89a59d kbuild: use proper prefix for tarballs to fix rpm-pkg build error) +$ 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 (30a0b95b1335e Linux 6.1-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 (c76c6c4ecbec0 ARM: 9294/2: vfp: Fix broken softirq handling with instrumentation enabled) +$ git merge -m Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm-current/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (32d8599968060 arm64: compat: Work around uninitialized variable warning) +$ 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 (d75eecc3d170d Merge tag 'qcom-arm64-fixes-for-6.3-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/fixes) +$ git merge -m Merge branch 'arm/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc-fixes/arm/fixes +Already up to date. +Merging davinci-current/davinci/for-current (fe15c26ee26ef Linux 6.3-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 (fe15c26ee26ef Linux 6.3-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory-fixes/fixes +Already up to date. +Merging tee-fixes/fixes (ceaa837f96adb Linux 6.2-rc8) +$ git merge -m Merge branch 'fixes' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee-fixes/fixes +Already up to date. +Merging m68k-current/for-linus (aaee8c7f2a17d m68k: kexec: Include <linux/reboot.h>) +$ 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 (b277fc793daf2 powerpc/papr_scm: Update the NUMA distance table for the target node) +$ 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 (f9bbf25e7b2b7 s390/ptrace: fix PTRACE_GET_LAST_BREAK error handling) +$ 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 sparc/master (2d2b17d08bfc3 sparc: Unbreak the build) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git sparc/master +Auto-merging arch/sparc/mm/srmmu.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 13898 and retry the command. +Merge made by the 'recursive' strategy. +Merging fscrypt-current/for-current (4bcf6f827a79c fscrypt: check for NULL keyring in fscrypt_put_master_key_activeref()) +$ git merge -m Merge branch 'for-current' of git://git.kernel.org/pub/scm/fs/fscrypt/linux.git fscrypt-current/for-current +Already up to date. +Merging fsverity-current/for-current (a075bacde257f fsverity: don't drop pagecache at end of FS_IOC_ENABLE_VERITY) +$ git merge -m Merge branch 'for-current' of git://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity-current/for-current +Already up to date. +Merging net/main (075cafffce242 Merge branch 'macsec-fixes-for-cn10kb') +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/main +Merge made by the 'recursive' strategy. + drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c | 3 - + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 6 +- + drivers/net/ethernet/marvell/octeontx2/af/mcs.c | 110 ++++++++++----------- + drivers/net/ethernet/marvell/octeontx2/af/mcs.h | 26 +++-- + .../ethernet/marvell/octeontx2/af/mcs_cnf10kb.c | 63 ++++++++++++ + .../net/ethernet/marvell/octeontx2/af/mcs_reg.h | 6 +- + .../net/ethernet/marvell/octeontx2/af/mcs_rvu_if.c | 37 +++++++ + drivers/net/ethernet/marvell/octeontx2/af/rvu.h | 1 + + .../net/ethernet/marvell/octeontx2/af/rvu_cgx.c | 2 + + .../ethernet/marvell/octeontx2/af/rvu_debugfs.c | 5 +- + .../ethernet/marvell/octeontx2/nic/cn10k_macsec.c | 48 ++++++--- + .../ethernet/marvell/octeontx2/nic/otx2_common.h | 2 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 3 +- + net/rxrpc/sendmsg.c | 12 +-- + net/sched/act_pedit.c | 4 +- + net/sched/cls_flower.c | 2 +- + 16 files changed, 226 insertions(+), 104 deletions(-) +Merging bpf/master (2b5fdc0f5caa5 rxrpc: Fix potential data race in rxrpc_wait_to_be_connected()) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git bpf/master +Already up to date. +Merging ipsec/master (ec8f32ad9a65a xfrm: Fix leak of dev tracker) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master +Auto-merging net/xfrm/xfrm_user.c +Auto-merging net/xfrm/xfrm_device.c +Merge made by the 'recursive' strategy. + net/xfrm/xfrm_device.c | 2 +- + net/xfrm/xfrm_policy.c | 6 ------ + net/xfrm/xfrm_user.c | 1 + + 3 files changed, 2 insertions(+), 7 deletions(-) +Merging netfilter/master (7fb0269720d7d Merge tag 'for-net-2022-05-23' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git netfilter/master +Already up to date. +Merging ipvs/main (73db1b8f2bb67 netfilter: conntrack: fix wrong ct->timeout value) +$ 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 (50749f2dd6854 tcp/udp: Fix memleaks of sk and zerocopy skbs with TX timestamp.) +$ 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 wpan/master (bd4e3d82f4ccb MAINTAINERS: Add wpan patchwork) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan.git wpan/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 5 +++-- + drivers/net/ieee802154/mac802154_hwsim.c | 6 ++++-- + 2 files changed, 7 insertions(+), 4 deletions(-) +Merging rdma-fixes/for-rc (aca3b0fa3d04b RDMA/core: Fix GID entry ref leak when create_ah fails) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (2ae147d643d32 ALSA: hda/realtek: fix mute/micmute LEDs for a HP ProBook) +$ 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 (377171af728ed Merge remote-tracking branch 'asoc/for-6.3' into asoc-linus) +$ 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 +Auto-merging arch/powerpc/platforms/8xx/cpm1.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/sound/wm8994.txt +Removing Documentation/devicetree/bindings/sound/wm8960.txt +Removing Documentation/devicetree/bindings/sound/wm8753.txt +Removing Documentation/devicetree/bindings/sound/wm8737.txt +Removing Documentation/devicetree/bindings/sound/wm8728.txt +Removing Documentation/devicetree/bindings/sound/wm8711.txt +Removing Documentation/devicetree/bindings/sound/wm8580.txt +Removing Documentation/devicetree/bindings/sound/wm8524.txt +Removing Documentation/devicetree/bindings/sound/wm8523.txt +Removing Documentation/devicetree/bindings/sound/wm8510.txt +Removing Documentation/devicetree/bindings/sound/qcom,wcd9335.txt +Removing Documentation/devicetree/bindings/sound/maxim,max9759.txt +Removing Documentation/devicetree/bindings/sound/max9867.txt +Removing Documentation/devicetree/bindings/sound/max98371.txt +Removing Documentation/devicetree/bindings/sound/alc5632.txt +Removing Documentation/devicetree/bindings/sound/ak5558.txt +Removing Documentation/devicetree/bindings/sound/ak4458.txt +Removing Documentation/devicetree/bindings/sound/adi,adau17x1.txt +Merge made by the 'recursive' strategy. + .../bindings/soc/fsl/cpm_qe/fsl,cpm1-scc-qmc.yaml | 162 ++ + .../bindings/soc/fsl/cpm_qe/fsl,cpm1-tsa.yaml | 205 +++ + .../devicetree/bindings/sound/adi,adau1372.yaml | 2 +- + .../devicetree/bindings/sound/adi,adau17x1.txt | 32 - + .../devicetree/bindings/sound/adi,adau17x1.yaml | 52 + + .../devicetree/bindings/sound/adi,max98363.yaml | 60 + + .../devicetree/bindings/sound/adi,max98396.yaml | 8 +- + Documentation/devicetree/bindings/sound/ak4458.txt | 28 - + Documentation/devicetree/bindings/sound/ak5558.txt | 24 - + .../devicetree/bindings/sound/alc5632.txt | 43 - + .../bindings/sound/asahi-kasei,ak4458.yaml | 73 + + .../bindings/sound/asahi-kasei,ak5558.yaml | 48 + + .../bindings/sound/audio-graph-port.yaml | 22 +- + .../devicetree/bindings/sound/audio-graph.yaml | 8 +- + .../devicetree/bindings/sound/cirrus,cs35l41.yaml | 10 +- + .../devicetree/bindings/sound/cirrus,cs35l45.yaml | 80 +- + .../devicetree/bindings/sound/cirrus,cs42l42.yaml | 12 +- + .../bindings/sound/cirrus,ep9301-i2s.yaml | 66 + + .../devicetree/bindings/sound/everest,es8316.yaml | 4 + + .../devicetree/bindings/sound/fsl,qmc-audio.yaml | 117 ++ + .../devicetree/bindings/sound/max98371.txt | 17 - + .../devicetree/bindings/sound/max9867.txt | 17 - + .../devicetree/bindings/sound/maxim,max9759.txt | 18 - + .../devicetree/bindings/sound/maxim,max9759.yaml | 45 + + .../devicetree/bindings/sound/maxim,max98371.yaml | 42 + + .../devicetree/bindings/sound/maxim,max9867.yaml | 60 + + .../devicetree/bindings/sound/mt8186-afe-pcm.yaml | 6 +- + .../sound/mt8186-mt6366-da7219-max98357.yaml | 2 +- + .../sound/mt8186-mt6366-rt1019-rt5682s.yaml | 2 +- + .../devicetree/bindings/sound/mt8192-afe-pcm.yaml | 6 +- + .../sound/mt8192-mt6359-rt1015-rt5682.yaml | 4 +- + .../devicetree/bindings/sound/mt8195-afe-pcm.yaml | 2 +- + .../devicetree/bindings/sound/mt8195-mt6359.yaml | 8 +- + .../devicetree/bindings/sound/nau8825.txt | 3 + + .../bindings/sound/nvidia,tegra-audio-alc5632.yaml | 8 +- + .../bindings/sound/nvidia,tegra-audio-common.yaml | 4 + + .../sound/nvidia,tegra-audio-max9808x.yaml | 90 ++ + .../sound/nvidia,tegra-audio-max98090.yaml | 8 +- + .../bindings/sound/nvidia,tegra-audio-rt5631.yaml | 85 ++ + .../bindings/sound/nvidia,tegra-audio-rt5640.yaml | 6 +- + .../bindings/sound/nvidia,tegra-audio-rt5677.yaml | 26 +- + .../sound/nvidia,tegra-audio-sgtl5000.yaml | 6 +- + .../bindings/sound/nvidia,tegra-audio-wm8753.yaml | 6 +- + .../bindings/sound/nvidia,tegra-audio-wm8903.yaml | 8 +- + .../bindings/sound/nvidia,tegra-audio-wm9712.yaml | 8 +- + .../bindings/sound/qcom,lpass-rx-macro.yaml | 77 +- + .../bindings/sound/qcom,lpass-tx-macro.yaml | 81 +- + .../bindings/sound/qcom,lpass-va-macro.yaml | 86 +- + .../bindings/sound/qcom,lpass-wsa-macro.yaml | 23 +- + .../devicetree/bindings/sound/qcom,q6asm-dais.yaml | 2 +- + .../devicetree/bindings/sound/qcom,wcd9335.txt | 123 -- + .../devicetree/bindings/sound/qcom,wcd9335.yaml | 156 ++ + .../devicetree/bindings/sound/qcom,wcd934x.yaml | 1 + + .../devicetree/bindings/sound/realtek,alc5632.yaml | 63 + + .../devicetree/bindings/sound/renesas,rsnd.yaml | 129 +- + .../devicetree/bindings/sound/renesas,rz-ssi.yaml | 21 +- + .../bindings/sound/rockchip,i2s-tdm.yaml | 7 + + .../devicetree/bindings/sound/rockchip-i2s.yaml | 5 + + .../devicetree/bindings/sound/sgtl5000.yaml | 6 +- + .../devicetree/bindings/sound/simple-card.yaml | 2 +- + .../bindings/sound/socionext,uniphier-aio.yaml | 2 +- + .../devicetree/bindings/sound/tas571x.txt | 1 + + .../devicetree/bindings/sound/wlf,wm8510.yaml | 41 + + .../devicetree/bindings/sound/wlf,wm8523.yaml | 40 + + .../devicetree/bindings/sound/wlf,wm8524.yaml | 40 + + .../devicetree/bindings/sound/wlf,wm8580.yaml | 42 + + .../devicetree/bindings/sound/wlf,wm8711.yaml | 40 + + .../devicetree/bindings/sound/wlf,wm8728.yaml | 40 + + .../devicetree/bindings/sound/wlf,wm8737.yaml | 40 + + .../devicetree/bindings/sound/wlf,wm8753.yaml | 62 + + .../devicetree/bindings/sound/wlf,wm8960.yaml | 88 ++ + .../devicetree/bindings/sound/wlf,wm8994.yaml | 194 +++ + Documentation/devicetree/bindings/sound/wm8510.txt | 18 - + Documentation/devicetree/bindings/sound/wm8523.txt | 16 - + Documentation/devicetree/bindings/sound/wm8524.txt | 16 - + Documentation/devicetree/bindings/sound/wm8580.txt | 16 - + Documentation/devicetree/bindings/sound/wm8711.txt | 18 - + Documentation/devicetree/bindings/sound/wm8728.txt | 18 - + Documentation/devicetree/bindings/sound/wm8737.txt | 18 - + Documentation/devicetree/bindings/sound/wm8753.txt | 40 - + Documentation/devicetree/bindings/sound/wm8960.txt | 42 - + Documentation/devicetree/bindings/sound/wm8994.txt | 112 -- + Documentation/sound/hd-audio/index.rst | 1 + + Documentation/sound/hd-audio/intel-multi-link.rst | 312 ++++ + MAINTAINERS | 36 +- + arch/powerpc/platforms/8xx/cpm1.c | 2 +- + drivers/firmware/cirrus/cs_dsp.c | 48 +- + drivers/soc/fsl/qe/Kconfig | 23 + + drivers/soc/fsl/qe/Makefile | 2 + + drivers/soc/fsl/qe/qmc.c | 1537 +++++++++++++++++++ + drivers/soc/fsl/qe/tsa.c | 846 +++++++++++ + drivers/soc/fsl/qe/tsa.h | 42 + + include/dt-bindings/soc/cpm1-fsl,tsa.h | 13 + + include/dt-bindings/sound/cs35l45.h | 57 + + include/linux/firmware/cirrus/cs_dsp.h | 1 + + include/soc/fsl/qe/qmc.h | 71 + + include/sound/cs35l41.h | 13 +- + include/sound/cs35l56.h | 266 ++++ + include/sound/hda-mlink.h | 166 ++ + include/sound/hda_register.h | 40 +- + include/sound/soc-card.h | 17 +- + include/sound/soc-dapm.h | 5 - + include/sound/soc-dpcm.h | 1 - + include/sound/soc.h | 119 +- + include/sound/sof.h | 5 + + include/sound/sof/ipc4/header.h | 33 + + include/uapi/sound/sof/abi.h | 2 + + include/uapi/sound/sof/header.h | 27 +- + include/uapi/sound/sof/tokens.h | 21 +- + sound/arm/pxa2xx-ac97.c | 6 +- + sound/atmel/ac97c.c | 6 +- + sound/drivers/mts64.c | 6 +- + sound/drivers/portman2x4.c | 6 +- + sound/mips/hal2.c | 5 +- + sound/mips/sgio2audio.c | 5 +- + sound/pci/hda/cs35l41_hda.c | 6 +- + sound/pci/hda/hda_tegra.c | 6 +- + sound/ppc/powermac.c | 5 +- + sound/sh/aica.c | 7 +- + sound/sh/sh_dac_audio.c | 5 +- + sound/soc/adi/axi-i2s.c | 6 +- + sound/soc/adi/axi-spdif.c | 6 +- + sound/soc/amd/Kconfig | 2 + + sound/soc/amd/acp-pcm-dma.c | 6 +- + sound/soc/amd/acp/acp-rembrandt.c | 13 +- + sound/soc/amd/acp/acp-renoir.c | 5 +- + sound/soc/amd/ps/acp63.h | 2 + + sound/soc/amd/ps/pci-ps.c | 10 +- + sound/soc/amd/ps/ps-pdm-dma.c | 5 +- + sound/soc/amd/raven/acp3x-pcm-dma.c | 5 +- + sound/soc/amd/renoir/acp3x-pdm-dma.c | 5 +- + sound/soc/amd/vangogh/acp5x-mach.c | 297 ++-- + sound/soc/amd/vangogh/acp5x-pcm-dma.c | 5 +- + sound/soc/amd/yc/acp6x-mach.c | 21 + + sound/soc/amd/yc/acp6x-pdm-dma.c | 5 +- + sound/soc/amd/yc/acp6x.h | 3 + + sound/soc/amd/yc/pci-acp6x.c | 8 +- + sound/soc/apple/mca.c | 5 +- + sound/soc/atmel/atmel-classd.c | 5 +- + sound/soc/atmel/atmel-i2s.c | 6 +- + sound/soc/atmel/atmel-pdmic.c | 5 +- + sound/soc/atmel/atmel_wm8904.c | 6 +- + sound/soc/atmel/mchp-i2s-mcc.c | 6 +- + sound/soc/atmel/mchp-pdmc.c | 25 +- + sound/soc/atmel/mchp-spdifrx.c | 6 +- + sound/soc/atmel/mchp-spdiftx.c | 51 +- + sound/soc/atmel/mikroe-proto.c | 6 +- + sound/soc/atmel/sam9g20_wm8731.c | 6 +- + sound/soc/atmel/sam9x5_wm8731.c | 6 +- + sound/soc/atmel/tse850-pcm5142.c | 6 +- + sound/soc/au1x/ac97c.c | 6 +- + sound/soc/au1x/i2sc.c | 6 +- + sound/soc/au1x/psc-ac97.c | 6 +- + sound/soc/au1x/psc-i2s.c | 6 +- + sound/soc/bcm/bcm63xx-i2s-whistler.c | 5 +- + sound/soc/bcm/cygnus-ssp.c | 6 +- + sound/soc/cirrus/Kconfig | 6 +- + sound/soc/cirrus/edb93xx.c | 6 +- + sound/soc/cirrus/ep93xx-i2s.c | 25 +- + sound/soc/codecs/Kconfig | 64 +- + sound/soc/codecs/Makefile | 14 + + sound/soc/codecs/adau1977-spi.c | 2 +- + sound/soc/codecs/cs35l41-lib.c | 73 +- + sound/soc/codecs/cs35l41.c | 144 +- + sound/soc/codecs/cs35l41.h | 1 + + sound/soc/codecs/cs35l45-i2c.c | 3 + + sound/soc/codecs/cs35l45-spi.c | 5 + + sound/soc/codecs/cs35l45-tables.c | 135 +- + sound/soc/codecs/cs35l45.c | 630 +++++++- + sound/soc/codecs/cs35l45.h | 267 +++- + sound/soc/codecs/cs35l56-i2c.c | 82 + + sound/soc/codecs/cs35l56-sdw.c | 566 +++++++ + sound/soc/codecs/cs35l56-shared.c | 362 +++++ + sound/soc/codecs/cs35l56-spi.c | 79 + + sound/soc/codecs/cs35l56.c | 1601 ++++++++++++++++++++ + sound/soc/codecs/cs35l56.h | 81 + + sound/soc/codecs/cs4271-i2c.c | 1 - + sound/soc/codecs/cs4271-spi.c | 1 - + sound/soc/codecs/cs4271.c | 4 +- + sound/soc/codecs/cs42l42-sdw.c | 3 - + sound/soc/codecs/cs47l15.c | 6 +- + sound/soc/codecs/cs47l24.c | 6 +- + sound/soc/codecs/cs47l35.c | 6 +- + sound/soc/codecs/cs47l85.c | 6 +- + sound/soc/codecs/cs47l90.c | 6 +- + sound/soc/codecs/cs47l92.c | 6 +- + sound/soc/codecs/da7218.c | 10 +- + sound/soc/codecs/da7219-aad.c | 60 +- + sound/soc/codecs/da7219-aad.h | 5 +- + sound/soc/codecs/es8316.c | 33 +- + sound/soc/codecs/inno_rk3036.c | 6 +- + sound/soc/codecs/lpass-macro-common.c | 2 +- + sound/soc/codecs/lpass-macro-common.h | 3 + + sound/soc/codecs/lpass-rx-macro.c | 42 +- + sound/soc/codecs/lpass-tx-macro.c | 41 +- + sound/soc/codecs/lpass-va-macro.c | 6 +- + sound/soc/codecs/lpass-wsa-macro.c | 43 +- + sound/soc/codecs/max98363.c | 464 ++++++ + sound/soc/codecs/max98363.h | 36 + + sound/soc/codecs/max98373-sdw.c | 34 +- + sound/soc/codecs/max9867.c | 19 +- + sound/soc/codecs/msm8916-wcd-analog.c | 6 +- + sound/soc/codecs/msm8916-wcd-digital.c | 6 +- + sound/soc/codecs/mt6358.c | 2 +- + sound/soc/codecs/mt6359.c | 2 +- + sound/soc/codecs/nau8821.c | 96 ++ + sound/soc/codecs/nau8821.h | 23 + + sound/soc/codecs/nau8825.c | 8 +- + sound/soc/codecs/nau8825.h | 1 + + sound/soc/codecs/pcm179x-spi.c | 2 +- + sound/soc/codecs/rk817_codec.c | 6 +- + sound/soc/codecs/rt1019.c | 2 +- + sound/soc/codecs/rt1308-sdw.c | 30 +- + sound/soc/codecs/rt1308-sdw.h | 4 - + sound/soc/codecs/rt1316-sdw.c | 30 +- + sound/soc/codecs/rt1316-sdw.h | 4 - + sound/soc/codecs/rt1318-sdw.c | 30 +- + sound/soc/codecs/rt1318-sdw.h | 4 - + sound/soc/codecs/rt5682-sdw.c | 34 +- + sound/soc/codecs/rt700.c | 30 +- + sound/soc/codecs/rt700.h | 4 - + sound/soc/codecs/rt711-sdca.c | 30 +- + sound/soc/codecs/rt711-sdca.h | 4 - + sound/soc/codecs/rt711.c | 30 +- + sound/soc/codecs/rt711.h | 4 - + sound/soc/codecs/rt712-sdca-dmic.c | 983 ++++++++++++ + sound/soc/codecs/rt712-sdca-dmic.h | 108 ++ + sound/soc/codecs/rt712-sdca.c | 30 +- + sound/soc/codecs/rt712-sdca.h | 4 - + sound/soc/codecs/rt715-sdca.c | 30 +- + sound/soc/codecs/rt715-sdca.h | 4 - + sound/soc/codecs/rt715.c | 30 +- + sound/soc/codecs/rt715.h | 4 - + sound/soc/codecs/sdw-mockup.c | 34 +- + sound/soc/codecs/sma1303.c | 2 +- + sound/soc/codecs/src4xxx-i2c.c | 2 +- + sound/soc/codecs/ssm2602.c | 15 +- + sound/soc/codecs/sta32x.c | 39 +- + sound/soc/codecs/sta350.c | 63 +- + sound/soc/codecs/tas5086.c | 2 +- + sound/soc/codecs/tas571x.c | 59 + + sound/soc/codecs/tas5720.c | 3 +- + sound/soc/codecs/wcd9335.c | 27 +- + sound/soc/codecs/wcd934x.c | 25 +- + sound/soc/codecs/wcd938x.c | 33 +- + sound/soc/codecs/wm5102.c | 6 +- + sound/soc/codecs/wm5110.c | 6 +- + sound/soc/codecs/wm8903.c | 1 - + sound/soc/codecs/wm8994.c | 6 +- + sound/soc/codecs/wm8997.c | 6 +- + sound/soc/codecs/wm8998.c | 6 +- + sound/soc/codecs/wm_adsp.c | 63 +- + sound/soc/codecs/wm_adsp.h | 3 + + sound/soc/codecs/zl38060.c | 2 +- + sound/soc/dwc/dwc-i2s.c | 5 +- + sound/soc/fsl/Kconfig | 9 + + sound/soc/fsl/Makefile | 2 + + sound/soc/fsl/eukrea-tlv320.c | 6 +- + sound/soc/fsl/fsl-asoc-card.c | 9 +- + sound/soc/fsl/fsl_asrc.c | 6 +- + sound/soc/fsl/fsl_aud2htx.c | 6 +- + sound/soc/fsl/fsl_audmix.c | 6 +- + sound/soc/fsl/fsl_dma.c | 6 +- + sound/soc/fsl/fsl_easrc.c | 6 +- + sound/soc/fsl/fsl_esai.c | 6 +- + sound/soc/fsl/fsl_mqs.c | 20 +- + sound/soc/fsl/fsl_qmc_audio.c | 735 +++++++++ + sound/soc/fsl/fsl_rpmsg.c | 6 +- + sound/soc/fsl/fsl_sai.c | 18 +- + sound/soc/fsl/fsl_spdif.c | 6 +- + sound/soc/fsl/fsl_ssi.c | 8 +- + sound/soc/fsl/fsl_xcvr.c | 5 +- + sound/soc/fsl/imx-audmix.c | 22 +- + sound/soc/fsl/imx-audmux.c | 6 +- + sound/soc/fsl/imx-card.c | 2 +- + sound/soc/fsl/imx-es8328.c | 11 +- + sound/soc/fsl/imx-pcm-rpmsg.c | 6 +- + sound/soc/fsl/imx-sgtl5000.c | 6 +- + sound/soc/fsl/imx-spdif.c | 11 +- + sound/soc/fsl/mpc5200_psc_ac97.c | 5 +- + sound/soc/fsl/mpc5200_psc_i2s.c | 5 +- + sound/soc/fsl/mpc8610_hpcd.c | 6 +- + sound/soc/fsl/p1022_ds.c | 6 +- + sound/soc/fsl/p1022_rdk.c | 6 +- + sound/soc/fsl/pcm030-audio-fabric.c | 6 +- + sound/soc/generic/audio-graph-card.c | 15 +- + .../soc/generic/audio-graph-card2-custom-sample.c | 3 + + sound/soc/generic/audio-graph-card2.c | 23 +- + sound/soc/generic/simple-card-utils.c | 35 +- + sound/soc/generic/simple-card.c | 23 +- + sound/soc/generic/test-component.c | 6 +- + sound/soc/img/img-i2s-in.c | 6 +- + sound/soc/img/img-i2s-out.c | 6 +- + sound/soc/img/img-parallel-out.c | 6 +- + sound/soc/img/img-spdif-in.c | 6 +- + sound/soc/img/img-spdif-out.c | 6 +- + sound/soc/img/pistachio-internal-dac.c | 6 +- + sound/soc/intel/atom/sst-mfld-platform-pcm.c | 5 +- + sound/soc/intel/atom/sst/sst_acpi.c | 5 +- + sound/soc/intel/avs/boards/hdaudio.c | 10 +- + sound/soc/intel/avs/path.c | 2 +- + sound/soc/intel/boards/bytcht_es8316.c | 5 +- + sound/soc/intel/boards/bytcr_rt5640.c | 5 +- + sound/soc/intel/boards/bytcr_rt5651.c | 5 +- + sound/soc/intel/boards/bytcr_wm5102.c | 5 +- + sound/soc/intel/boards/cht_bsw_max98090_ti.c | 6 +- + sound/soc/intel/boards/sof_cirrus_common.c | 7 +- + sound/soc/intel/boards/sof_es8336.c | 6 +- + sound/soc/intel/boards/sof_pcm512x.c | 6 +- + sound/soc/intel/boards/sof_rt5682.c | 28 +- + sound/soc/intel/boards/sof_sdw.c | 187 ++- + sound/soc/intel/boards/sof_sdw_common.h | 3 - + sound/soc/intel/boards/sof_sdw_max98373.c | 22 +- + sound/soc/intel/boards/sof_wm8804.c | 5 +- + sound/soc/intel/catpt/device.c | 6 +- + sound/soc/intel/common/soc-acpi-intel-byt-match.c | 2 +- + sound/soc/intel/common/soc-acpi-intel-rpl-match.c | 34 +- + sound/soc/intel/skylake/skl-ssp-clk.c | 6 +- + sound/soc/kirkwood/kirkwood-i2s.c | 6 +- + sound/soc/mediatek/common/mtk-btcvsd.c | 5 +- + sound/soc/mediatek/common/mtk-soundcard-driver.c | 12 +- + sound/soc/mediatek/mt2701/mt2701-afe-pcm.c | 6 +- + sound/soc/mediatek/mt6797/mt6797-afe-pcm.c | 6 +- + sound/soc/mediatek/mt8173/mt8173-afe-pcm.c | 5 +- + sound/soc/mediatek/mt8183/mt8183-afe-pcm.c | 6 +- + sound/soc/mediatek/mt8186/mt8186-afe-gpio.c | 28 +- + sound/soc/mediatek/mt8186/mt8186-dai-adda.c | 4 +- + .../mt8186/mt8186-mt6366-da7219-max98357.c | 2 +- + .../mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c | 6 +- + sound/soc/mediatek/mt8188/mt8188-afe-pcm.c | 6 +- + sound/soc/mediatek/mt8192/mt8192-afe-clk.c | 4 - + sound/soc/mediatek/mt8192/mt8192-afe-pcm.c | 11 +- + sound/soc/mediatek/mt8192/mt8192-dai-tdm.c | 28 +- + .../mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c | 12 +- + sound/soc/mediatek/mt8195/mt8195-afe-pcm.c | 5 +- + sound/soc/mediatek/mt8195/mt8195-dai-adda.c | 17 +- + sound/soc/mediatek/mt8195/mt8195-dai-etdm.c | 177 ++- + sound/soc/mediatek/mt8195/mt8195-dai-pcm.c | 26 +- + sound/soc/mediatek/mt8195/mt8195-mt6359.c | 2 +- + sound/soc/meson/aiu.c | 6 +- + sound/soc/meson/axg-card.c | 3 +- + sound/soc/meson/axg-tdm-interface.c | 13 +- + sound/soc/meson/gx-card.c | 3 +- + sound/soc/meson/meson-codec-glue.c | 5 +- + sound/soc/mxs/mxs-sgtl5000.c | 8 +- + sound/soc/pxa/mmp-sspa.c | 7 +- + sound/soc/pxa/pxa2xx-ac97.c | 5 +- + sound/soc/qcom/common.c | 17 +- + sound/soc/qcom/qdsp6/q6apm-lpass-dais.c | 3 + + sound/soc/qcom/qdsp6/q6apm.c | 2 +- + sound/soc/qcom/qdsp6/q6routing.c | 6 +- + sound/soc/qcom/sdw.c | 7 +- + sound/soc/rockchip/rockchip_i2s.c | 7 +- + sound/soc/rockchip/rockchip_pdm.c | 6 +- + sound/soc/rockchip/rockchip_rt5645.c | 6 +- + sound/soc/rockchip/rockchip_spdif.c | 6 +- + sound/soc/samsung/aries_wm8994.c | 6 +- + sound/soc/samsung/arndale.c | 5 +- + sound/soc/samsung/bells.c | 21 +- + sound/soc/samsung/i2s.c | 10 +- + sound/soc/samsung/littlemill.c | 3 +- + sound/soc/samsung/lowland.c | 3 +- + sound/soc/samsung/odroid.c | 6 +- + sound/soc/samsung/pcm.c | 6 +- + sound/soc/samsung/snow.c | 6 +- + sound/soc/samsung/spdif.c | 6 +- + sound/soc/samsung/speyside.c | 3 +- + sound/soc/sh/fsi.c | 8 +- + sound/soc/sh/hac.c | 5 +- + sound/soc/sh/rcar/core.c | 6 +- + sound/soc/sh/rcar/ssi.c | 4 +- + sound/soc/sh/rz-ssi.c | 69 +- + sound/soc/sh/siu_dai.c | 5 +- + sound/soc/soc-component.c | 12 +- + sound/soc/soc-compress.c | 70 +- + sound/soc/soc-core.c | 52 +- + sound/soc/soc-dai.c | 3 + + sound/soc/soc-dapm.c | 324 ++-- + sound/soc/soc-jack.c | 1 + + sound/soc/soc-pcm.c | 37 +- + sound/soc/soc-topology.c | 10 +- + sound/soc/sof/amd/acp-common.c | 17 +- + sound/soc/sof/amd/acp-pcm.c | 34 + + sound/soc/sof/amd/acp.c | 45 +- + sound/soc/sof/amd/acp.h | 7 +- + sound/soc/sof/amd/pci-rmb.c | 91 +- + sound/soc/sof/amd/pci-rn.c | 91 +- + sound/soc/sof/amd/rembrandt.c | 4 - + sound/soc/sof/amd/renoir.c | 3 - + sound/soc/sof/compress.c | 8 +- + sound/soc/sof/core.c | 31 +- + sound/soc/sof/debug.c | 1 + + sound/soc/sof/intel/Kconfig | 7 + + sound/soc/sof/intel/Makefile | 5 +- + sound/soc/sof/intel/apl.c | 4 + + sound/soc/sof/intel/cnl.c | 4 + + sound/soc/sof/intel/hda-common-ops.c | 1 - + sound/soc/sof/intel/hda-ctrl.c | 9 +- + sound/soc/sof/intel/hda-dai-ops.c | 390 +++++ + sound/soc/sof/intel/hda-dai.c | 698 +++------ + sound/soc/sof/intel/hda-dsp.c | 101 +- + sound/soc/sof/intel/hda-ipc.c | 3 + + sound/soc/sof/intel/hda-loader.c | 9 +- + sound/soc/sof/intel/hda-mlink.c | 822 +++++++++- + sound/soc/sof/intel/hda-pcm.c | 24 +- + sound/soc/sof/intel/hda-stream.c | 93 +- + sound/soc/sof/intel/hda.c | 233 +-- + sound/soc/sof/intel/hda.h | 69 +- + sound/soc/sof/intel/icl.c | 4 + + sound/soc/sof/intel/mtl.c | 26 +- + sound/soc/sof/intel/pci-apl.c | 2 + + sound/soc/sof/intel/pci-cnl.c | 3 + + sound/soc/sof/intel/pci-icl.c | 2 + + sound/soc/sof/intel/pci-mtl.c | 1 + + sound/soc/sof/intel/pci-skl.c | 2 + + sound/soc/sof/intel/pci-tgl.c | 8 + + sound/soc/sof/intel/tgl.c | 4 + + sound/soc/sof/ipc3-control.c | 90 +- + sound/soc/sof/ipc3-dtrace.c | 12 +- + sound/soc/sof/ipc3-pcm.c | 7 +- + sound/soc/sof/ipc3-topology.c | 33 +- + sound/soc/sof/ipc3.c | 12 +- + sound/soc/sof/ipc4-control.c | 257 +++- + sound/soc/sof/ipc4-mtrace.c | 21 + + sound/soc/sof/ipc4-pcm.c | 186 ++- + sound/soc/sof/ipc4-topology.c | 1214 +++++++++++---- + sound/soc/sof/ipc4-topology.h | 89 +- + sound/soc/sof/loader.c | 4 +- + sound/soc/sof/pcm.c | 63 +- + sound/soc/sof/pm.c | 5 + + sound/soc/sof/sof-audio.c | 85 +- + sound/soc/sof/sof-audio.h | 49 +- + sound/soc/sof/sof-client-ipc-flood-test.c | 3 +- + sound/soc/sof/sof-client-probes-ipc3.c | 12 +- + sound/soc/sof/sof-client-probes-ipc4.c | 4 +- + sound/soc/sof/sof-client.c | 3 + + sound/soc/sof/sof-client.h | 4 + + sound/soc/sof/sof-priv.h | 21 + + sound/soc/sof/topology.c | 302 +++- + sound/soc/sprd/sprd-mcdt.c | 6 +- + sound/soc/stm/stm32_adfsdm.c | 6 +- + sound/soc/stm/stm32_i2s.c | 8 +- + sound/soc/stm/stm32_sai_sub.c | 10 +- + sound/soc/stm/stm32_spdifrx.c | 6 +- + sound/soc/sunxi/sun4i-codec.c | 6 +- + sound/soc/sunxi/sun4i-i2s.c | 6 +- + sound/soc/sunxi/sun4i-spdif.c | 6 +- + sound/soc/sunxi/sun50i-dmic.c | 6 +- + sound/soc/sunxi/sun8i-codec.c | 6 +- + sound/soc/tegra/Kconfig | 18 + + sound/soc/tegra/tegra186_asrc.c | 6 +- + sound/soc/tegra/tegra186_dspk.c | 6 +- + sound/soc/tegra/tegra20_ac97.c | 9 +- + sound/soc/tegra/tegra20_i2s.c | 6 +- + sound/soc/tegra/tegra210_admaif.c | 6 +- + sound/soc/tegra/tegra210_adx.c | 6 +- + sound/soc/tegra/tegra210_ahub.c | 6 +- + sound/soc/tegra/tegra210_amx.c | 6 +- + sound/soc/tegra/tegra210_dmic.c | 6 +- + sound/soc/tegra/tegra210_i2s.c | 6 +- + sound/soc/tegra/tegra210_mixer.c | 6 +- + sound/soc/tegra/tegra210_mvc.c | 6 +- + sound/soc/tegra/tegra210_ope.c | 6 +- + sound/soc/tegra/tegra210_sfc.c | 6 +- + sound/soc/tegra/tegra30_ahub.c | 6 +- + sound/soc/tegra/tegra30_i2s.c | 6 +- + sound/soc/tegra/tegra_asoc_machine.c | 127 +- + sound/soc/ti/ams-delta.c | 5 +- + sound/soc/ti/davinci-i2s.c | 6 +- + sound/soc/ti/davinci-mcasp.c | 6 +- + sound/soc/ti/omap-hdmi.c | 10 +- + sound/soc/ti/omap-mcbsp.c | 6 +- + sound/soc/uniphier/evea.c | 6 +- + sound/soc/ux500/mop500.c | 6 +- + sound/soc/ux500/ux500_msp_dai.c | 6 +- + sound/soc/xilinx/xlnx_formatter_pcm.c | 5 +- + sound/soc/xilinx/xlnx_spdif.c | 5 +- + sound/soc/xtensa/xtfpga-i2s.c | 5 +- + sound/sparc/cs4231.c | 6 +- + sound/sparc/dbri.c | 6 +- + 480 files changed, 18464 insertions(+), 4484 deletions(-) + create mode 100644 Documentation/devicetree/bindings/soc/fsl/cpm_qe/fsl,cpm1-scc-qmc.yaml + create mode 100644 Documentation/devicetree/bindings/soc/fsl/cpm_qe/fsl,cpm1-tsa.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/adi,adau17x1.txt + create mode 100644 Documentation/devicetree/bindings/sound/adi,adau17x1.yaml + create mode 100644 Documentation/devicetree/bindings/sound/adi,max98363.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/ak4458.txt + delete mode 100644 Documentation/devicetree/bindings/sound/ak5558.txt + delete mode 100644 Documentation/devicetree/bindings/sound/alc5632.txt + create mode 100644 Documentation/devicetree/bindings/sound/asahi-kasei,ak4458.yaml + create mode 100644 Documentation/devicetree/bindings/sound/asahi-kasei,ak5558.yaml + create mode 100644 Documentation/devicetree/bindings/sound/cirrus,ep9301-i2s.yaml + create mode 100644 Documentation/devicetree/bindings/sound/fsl,qmc-audio.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/max98371.txt + delete mode 100644 Documentation/devicetree/bindings/sound/max9867.txt + delete mode 100644 Documentation/devicetree/bindings/sound/maxim,max9759.txt + create mode 100644 Documentation/devicetree/bindings/sound/maxim,max9759.yaml + create mode 100644 Documentation/devicetree/bindings/sound/maxim,max98371.yaml + create mode 100644 Documentation/devicetree/bindings/sound/maxim,max9867.yaml + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-max9808x.yaml + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-rt5631.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/qcom,wcd9335.txt + create mode 100644 Documentation/devicetree/bindings/sound/qcom,wcd9335.yaml + create mode 100644 Documentation/devicetree/bindings/sound/realtek,alc5632.yaml + create mode 100644 Documentation/devicetree/bindings/sound/wlf,wm8510.yaml + create mode 100644 Documentation/devicetree/bindings/sound/wlf,wm8523.yaml + create mode 100644 Documentation/devicetree/bindings/sound/wlf,wm8524.yaml + create mode 100644 Documentation/devicetree/bindings/sound/wlf,wm8580.yaml + create mode 100644 Documentation/devicetree/bindings/sound/wlf,wm8711.yaml + create mode 100644 Documentation/devicetree/bindings/sound/wlf,wm8728.yaml + create mode 100644 Documentation/devicetree/bindings/sound/wlf,wm8737.yaml + create mode 100644 Documentation/devicetree/bindings/sound/wlf,wm8753.yaml + create mode 100644 Documentation/devicetree/bindings/sound/wlf,wm8960.yaml + create mode 100644 Documentation/devicetree/bindings/sound/wlf,wm8994.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/wm8510.txt + delete mode 100644 Documentation/devicetree/bindings/sound/wm8523.txt + delete mode 100644 Documentation/devicetree/bindings/sound/wm8524.txt + delete mode 100644 Documentation/devicetree/bindings/sound/wm8580.txt + delete mode 100644 Documentation/devicetree/bindings/sound/wm8711.txt + delete mode 100644 Documentation/devicetree/bindings/sound/wm8728.txt + delete mode 100644 Documentation/devicetree/bindings/sound/wm8737.txt + delete mode 100644 Documentation/devicetree/bindings/sound/wm8753.txt + delete mode 100644 Documentation/devicetree/bindings/sound/wm8960.txt + delete mode 100644 Documentation/devicetree/bindings/sound/wm8994.txt + create mode 100644 Documentation/sound/hd-audio/intel-multi-link.rst + create mode 100644 drivers/soc/fsl/qe/qmc.c + create mode 100644 drivers/soc/fsl/qe/tsa.c + create mode 100644 drivers/soc/fsl/qe/tsa.h + create mode 100644 include/dt-bindings/soc/cpm1-fsl,tsa.h + create mode 100644 include/soc/fsl/qe/qmc.h + create mode 100644 include/sound/cs35l56.h + create mode 100644 include/sound/hda-mlink.h + create mode 100644 sound/soc/codecs/cs35l56-i2c.c + create mode 100644 sound/soc/codecs/cs35l56-sdw.c + create mode 100644 sound/soc/codecs/cs35l56-shared.c + create mode 100644 sound/soc/codecs/cs35l56-spi.c + create mode 100644 sound/soc/codecs/cs35l56.c + create mode 100644 sound/soc/codecs/cs35l56.h + create mode 100644 sound/soc/codecs/max98363.c + create mode 100644 sound/soc/codecs/max98363.h + create mode 100644 sound/soc/codecs/rt712-sdca-dmic.c + create mode 100644 sound/soc/codecs/rt712-sdca-dmic.h + create mode 100644 sound/soc/fsl/fsl_qmc_audio.c + create mode 100644 sound/soc/sof/intel/hda-dai-ops.c +Merging regmap-fixes/for-linus (eeac8ede17557 Linux 6.3-rc2) +$ 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 (7c7504067c709 regulator: sm5703: Fix missing n_voltages for fixed regulators) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus +Already up to date. +Merging spi-fixes/for-linus (cb1499966178e Merge remote-tracking branch 'spi/for-6.3' into spi-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi-fixes/for-linus +Auto-merging drivers/spi/spi.c +Auto-merging drivers/platform/x86/serial-multi-instantiate.c +Auto-merging drivers/net/ieee802154/ca8210.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/spi/amlogic,a1-spifc.yaml | 41 ++ + .../devicetree/bindings/spi/cdns,qspi-nor.yaml | 37 +- + .../devicetree/bindings/spi/renesas,sh-msiof.yaml | 23 +- + .../devicetree/bindings/spi/snps,dw-apb-ssi.yaml | 19 + + Documentation/spi/spi-summary.rst | 23 +- + MAINTAINERS | 2 +- + arch/powerpc/platforms/83xx/mpc832x_rdb.c | 2 +- + drivers/iio/imu/adis16400.c | 2 +- + drivers/mtd/devices/mtd_dataflash.c | 2 +- + drivers/net/ethernet/adi/adin1110.c | 2 +- + drivers/net/ethernet/asix/ax88796c_main.c | 2 +- + drivers/net/ethernet/davicom/dm9051.c | 2 +- + drivers/net/ethernet/qualcomm/qca_debug.c | 2 +- + drivers/net/ieee802154/ca8210.c | 2 +- + drivers/net/wan/slic_ds26522.c | 2 +- + drivers/net/wireless/marvell/libertas/if_spi.c | 2 +- + drivers/net/wireless/silabs/wfx/bus_spi.c | 2 +- + drivers/net/wireless/st/cw1200/cw1200_spi.c | 2 +- + drivers/platform/x86/serial-multi-instantiate.c | 3 +- + drivers/spi/Kconfig | 17 +- + drivers/spi/Makefile | 1 + + drivers/spi/atmel-quadspi.c | 36 +- + drivers/spi/spi-altera-core.c | 2 +- + drivers/spi/spi-amd.c | 4 +- + drivers/spi/spi-amlogic-spifc-a1.c | 456 +++++++++++++++++++++ + drivers/spi/spi-ar934x.c | 8 +- + drivers/spi/spi-armada-3700.c | 10 +- + drivers/spi/spi-aspeed-smc.c | 18 +- + drivers/spi/spi-at91-usart.c | 8 +- + drivers/spi/spi-ath79.c | 10 +- + drivers/spi/spi-atmel.c | 32 +- + drivers/spi/spi-au1550.c | 9 +- + drivers/spi/spi-axi-spi-engine.c | 8 +- + drivers/spi/spi-bcm-qspi.c | 12 +- + drivers/spi/spi-bcm2835.c | 36 +- + drivers/spi/spi-bcm2835aux.c | 10 +- + drivers/spi/spi-bcm63xx-hsspi.c | 36 +- + drivers/spi/spi-bcm63xx.c | 24 +- + drivers/spi/spi-bcmbca-hsspi.c | 36 +- + drivers/spi/spi-brcmstb-qspi.c | 6 +- + drivers/spi/spi-cadence-quadspi.c | 104 +++-- + drivers/spi/spi-cadence-xspi.c | 4 +- + drivers/spi/spi-cadence.c | 334 +++++++++------ + drivers/spi/spi-cavium-octeon.c | 6 +- + drivers/spi/spi-cavium.c | 8 +- + drivers/spi/spi-coldfire-qspi.c | 14 +- + drivers/spi/spi-davinci.c | 23 +- + drivers/spi/spi-dln2.c | 12 +- + drivers/spi/spi-dw-bt1.c | 6 +- + drivers/spi/spi-dw-core.c | 2 +- + drivers/spi/spi-dw-mmio.c | 68 ++- + drivers/spi/spi-ep93xx.c | 6 +- + drivers/spi/spi-falcon.c | 2 +- + drivers/spi/spi-fsi.c | 2 +- + drivers/spi/spi-fsl-cpm.c | 23 ++ + drivers/spi/spi-fsl-dspi.c | 24 +- + drivers/spi/spi-fsl-espi.c | 12 +- + drivers/spi/spi-fsl-lpspi.c | 7 +- + drivers/spi/spi-fsl-qspi.c | 12 +- + drivers/spi/spi-fsl-spi.c | 92 ++--- + drivers/spi/spi-geni-qcom.c | 11 +- + drivers/spi/spi-gpio.c | 4 +- + drivers/spi/spi-gxp.c | 4 +- + drivers/spi/spi-hisi-kunpeng.c | 6 +- + drivers/spi/spi-hisi-sfc-v3xx.c | 2 +- + drivers/spi/spi-img-spfi.c | 20 +- + drivers/spi/spi-imx.c | 75 ++-- + drivers/spi/spi-ingenic.c | 4 +- + drivers/spi/spi-intel-pci.c | 1 + + drivers/spi/spi-intel.c | 2 +- + drivers/spi/spi-iproc-qspi.c | 6 +- + drivers/spi/spi-jcore.c | 4 +- + drivers/spi/spi-lantiq-ssc.c | 12 +- + drivers/spi/spi-loopback-test.c | 8 + + drivers/spi/spi-mem.c | 4 +- + drivers/spi/spi-meson-spicc.c | 8 +- + drivers/spi/spi-meson-spifc.c | 6 +- + drivers/spi/spi-microchip-core-qspi.c | 6 +- + drivers/spi/spi-microchip-core.c | 12 +- + drivers/spi/spi-mpc512x-psc.c | 142 ++----- + drivers/spi/spi-mpc52xx-psc.c | 145 ++----- + drivers/spi/spi-mpc52xx.c | 8 +- + drivers/spi/spi-mt65xx.c | 6 +- + drivers/spi/spi-mt7621.c | 2 +- + drivers/spi/spi-mtk-nor.c | 6 +- + drivers/spi/spi-mtk-snfi.c | 5 +- + drivers/spi/spi-mux.c | 8 +- + drivers/spi/spi-mxic.c | 16 +- + drivers/spi/spi-mxs.c | 8 +- + drivers/spi/spi-npcm-fiu.c | 25 +- + drivers/spi/spi-npcm-pspi.c | 6 +- + drivers/spi/spi-nxp-fspi.c | 74 +++- + drivers/spi/spi-oc-tiny.c | 5 +- + drivers/spi/spi-omap-uwire.c | 13 +- + drivers/spi/spi-omap2-mcspi.c | 35 +- + drivers/spi/spi-orion.c | 13 +- + drivers/spi/spi-pci1xxxx.c | 22 +- + drivers/spi/spi-pic32-sqi.c | 8 +- + drivers/spi/spi-pic32.c | 13 +- + drivers/spi/spi-pl022.c | 4 +- + drivers/spi/spi-ppc4xx.c | 5 +- + drivers/spi/spi-pxa2xx.c | 14 +- + drivers/spi/spi-qcom-qspi.c | 13 +- + drivers/spi/spi-qup.c | 31 +- + drivers/spi/spi-rb4xx.c | 8 +- + drivers/spi/spi-rockchip-sfc.c | 12 +- + drivers/spi/spi-rockchip.c | 36 +- + drivers/spi/spi-rpc-if.c | 6 +- + drivers/spi/spi-rspi.c | 24 +- + drivers/spi/spi-s3c64xx.c | 8 +- + drivers/spi/spi-sc18is602.c | 6 +- + drivers/spi/spi-sh-hspi.c | 6 +- + drivers/spi/spi-sh-msiof.c | 13 +- + drivers/spi/spi-sh-sci.c | 7 +- + drivers/spi/spi-sh.c | 6 +- + drivers/spi/spi-sifive.c | 12 +- + drivers/spi/spi-slave-mt27xx.c | 6 +- + drivers/spi/spi-sn-f-ospi.c | 10 +- + drivers/spi/spi-sprd-adi.c | 8 +- + drivers/spi/spi-sprd.c | 23 +- + drivers/spi/spi-st-ssc4.c | 8 +- + drivers/spi/spi-stm32-qspi.c | 18 +- + drivers/spi/spi-stm32.c | 15 +- + drivers/spi/spi-sun4i.c | 8 +- + drivers/spi/spi-sun6i.c | 7 +- + drivers/spi/spi-sunplus-sp7021.c | 5 +- + drivers/spi/spi-synquacer.c | 12 +- + drivers/spi/spi-tegra114.c | 37 +- + drivers/spi/spi-tegra20-sflash.c | 8 +- + drivers/spi/spi-tegra20-slink.c | 11 +- + drivers/spi/spi-tegra210-quad.c | 31 +- + drivers/spi/spi-ti-qspi.c | 16 +- + drivers/spi/spi-topcliff-pch.c | 10 +- + drivers/spi/spi-uniphier.c | 6 +- + drivers/spi/spi-wpcm-fiu.c | 12 +- + drivers/spi/spi-xcomm.c | 2 +- + drivers/spi/spi-xilinx.c | 15 +- + drivers/spi/spi-xlp.c | 4 +- + drivers/spi/spi-xtensa-xtfpga.c | 6 +- + drivers/spi/spi-zynq-qspi.c | 8 +- + drivers/spi/spi-zynqmp-gqspi.c | 8 +- + drivers/spi/spi.c | 102 +++-- + drivers/spi/spidev.c | 6 +- + drivers/staging/fbtft/fbtft-core.c | 2 +- + drivers/staging/greybus/spilib.c | 2 +- + include/linux/platform_data/spi-s3c64xx.h | 1 + + include/linux/spi/spi.h | 36 +- + include/trace/events/spi.h | 10 +- + sound/pci/hda/cs35l41_hda_spi.c | 2 +- + 149 files changed, 1845 insertions(+), 1288 deletions(-) + create mode 100644 Documentation/devicetree/bindings/spi/amlogic,a1-spifc.yaml + create mode 100644 drivers/spi/spi-amlogic-spifc-a1.c +Merging pci-current/for-linus (0d21e71a91deb PCI: Restrict device disabled status check to DT) +$ 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 (7e364e56293bb Linux 6.3-rc5) +$ git merge -m Merge branch 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (09a9639e56c01 Linux 6.3-rc6) +$ git merge -m Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (09a9639e56c01 Linux 6.3-rc6) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus +Already up to date. +Merging usb-serial-fixes/usb-linus (09a9639e56c01 Linux 6.3-rc6) +$ 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 (fe15c26ee26ef Linux 6.3-rc1) +$ 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 (eeac8ede17557 Linux 6.3-rc2) +$ 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 (abfb5b9bedb49 iio: ad4130: Make sure clock provider gets removed) +$ 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 'recursive' strategy. + drivers/iio/adc/ad4130.c | 12 ++++++++- + drivers/iio/adc/imx93_adc.c | 7 +++-- + drivers/iio/adc/mt6370-adc.c | 53 +++++++++++++++++++++++++++++++++++-- + drivers/iio/magnetometer/tmag5273.c | 5 ++-- + 4 files changed, 68 insertions(+), 9 deletions(-) +Merging counter-current/counter-current (6a8f57ae2eb07 Linux 6.3-rc7) +$ git merge -m Merge branch 'counter-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-current/counter-current +Already up to date. +Merging char-misc.current/char-misc-linus (a042d7feae7ef Merge tag 'fpga-for-6.3-final' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga into char-misc-next) +$ 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 +Already up to date. +Merging soundwire-fixes/fixes (fe15c26ee26ef Linux 6.3-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 (457391b038033 Linux 6.3) +$ 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 (5dc63e56a9cf8 Input: cyttsp5 - fix sensing configuration data structure) +$ 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 (482c84e906e53 i2c: designware: Add doorbell support for Mendocino) +$ 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 (4928f67bc911e vfio/mlx5: Fix the report of dirty_bytes upon pre-copy) +$ 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 (f1594bc676579 selftests mount: Fix mount_setattr_test builds failed) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest-fixes/fixes +Already up to date. +Merging modules-fixes/modules-linus (f412eef03938d Documentation: livepatch: module-elf-format: Remove local klp_modinfo definition) +$ git merge -m Merge branch 'modules-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules-fixes/modules-linus +Already up to date. +Merging dmaengine-fixes/fixes (d9503be5a100c dmaengine: apple-admac: Fix 'current_tx' not getting freed) +$ 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 (88603b6dc4194 Linux 6.2-rc2) +$ 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 (93942b7046157 mtd: rawnand: meson: fix bitmask for length in command word) +$ 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 (88603b6dc4194 Linux 6.2-rc2) +$ 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 (8df08ba4a331e media: ov5670: Fix probe on ACPI) +$ git merge -m Merge branch 'fixes' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-fixes/fixes +Auto-merging drivers/media/i2c/ov5670.c +Merge made by the 'recursive' strategy. +Merging reset-fixes/reset/fixes (3a2390c6777e3 reset: uniphier-glue: Fix possible null-ptr-deref) +$ 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 (6dcbd0a69c84a MIPS: Define RUNTIME_DISCARD_EXIT in LD script) +$ 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 (fe15c26ee26ef Linux 6.3-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 (2a906db2824b7 Merge branch 'am5748-fix' into fixes) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap-fixes/fixes +Already up to date. +Merging kvm-fixes/master (265b97cbc22e0 Merge tag 'kvmarm-fixes-6.3-4' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm 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 (21f27df854008 KVM: s390: pv: fix external interruption loop not always detected) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390-fixes/master +Already up to date. +Merging hwmon-fixes/hwmon (0c072385348e3 hwmon: (k10temp) Check range scale when CUR_TEMP register is read-write) +$ 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 (c91d713630848 nvdimm: Support sizeof(struct page) > MAX_STRUCT_PAGE_SIZE) +$ git merge -m Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging cxl-fixes/fixes (c841ecd827715 cxl/hdm: Add more HDM decoder debug messages at startup) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/cxl/core/hdm.c | 52 +++++++++++++++++++++++++++++++++++++------------ + drivers/cxl/core/mbox.c | 1 - + drivers/cxl/core/port.c | 1 - + drivers/cxl/port.c | 18 ++++++++++++----- + 4 files changed, 53 insertions(+), 19 deletions(-) +Merging btrfs-fixes/next-fixes (5025cc87462ef Merge branch 'misc-6.3' 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 +Already up to date! +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1619 and retry the command. +Merge made by the 'recursive' strategy. +Merging vfs-fixes/fixes (609d54441493c fs: prevent out-of-bounds array speculation when closing a file descriptor) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs-fixes/fixes +Already up to date. +Merging dma-mapping-fixes/for-linus (bbb73a103fbbe swiotlb: fix a braino in the alignment check fix) +$ git merge -m Merge branch 'for-linus' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping-fixes/for-linus +Already up to date. +Merging drivers-x86-fixes/fixes (9a469c6dfab38 platform/x86: thinkpad_acpi: Add missing T14s Gen1 type to s2idle quirk list) +$ 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 (fe15c26ee26ef Linux 6.3-rc1) +$ 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 (fe15c26ee26ef Linux 6.3-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 (1a50d9403fb90 treewide: Fix probing of devices in DT overlays) +$ 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 (fe15c26ee26ef Linux 6.3-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 (c8e22b7a1694b scsi: ses: Handle enclosure with just a primary component gracefully) +$ 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 (00a4bd000e78a Merge tag 'amd-drm-fixes-6.3-2023-04-19' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes) +$ git merge -m Merge branch 'drm-fixes' of git://git.freedesktop.org/git/drm/drm.git drm-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (457391b038033 Linux 6.3) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm-intel drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (4b6d621c9d859 memstick: fix memory leak if card device is never registered) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes +Already up to date. +Merging rtc-fixes/rtc-fixes (08279468a294d rtc: sunplus: fix format string for printing resource) +$ git merge -m Merge branch 'rtc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc-fixes/rtc-fixes +Already up to date. +Merging gnss-fixes/gnss-linus (1b929c02afd37 Linux 6.2-rc1) +$ 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 (f8acb24aaf89f x86/hyperv: Block root partition functionality in a Confidential VM) +$ 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 soc-fsl-fixes/fix (4b0986a3613c9 Linux 5.18) +$ git merge -m Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl-fixes/fix +Already up to date. +Merging risc-v-fixes/fixes (1b50f956c8fe9 riscv: No need to relocate the dtb as it lies in the fixmap region) +$ 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 (8056dc043d7f7 riscv: dts: canaan: drop invalid spi-max-frequency) +$ 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 (fe15c26ee26ef Linux 6.3-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 (dc70eb868b9cd fpga: bridge: properly initialize bridge device before populating children) +$ 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 (fe15c26ee26ef Linux 6.3-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 (2ce987d7eeb16 gpio: 104-idi-48: Enable use_raw_spinlock for idi48_regmap_config) +$ git merge -m Merge branch 'gpio/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl-fixes/gpio/for-current +Already up to date. +Merging gpio-intel-fixes/fixes (fe15c26ee26ef Linux 6.3-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 (fe15c26ee26ef Linux 6.3-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 erofs-fixes/fixes (3993f4f456309 erofs: use wrapper i_blocksize() in erofs_file_read_iter()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs-fixes/fixes +Already up to date. +Merging kunit-fixes/kunit-fixes (fe15c26ee26ef Linux 6.3-rc1) +$ git merge -m Merge branch 'kunit-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-fixes/kunit-fixes +Already up to date. +Merging ubifs-fixes/fixes (2241ab53cbb5c Linux 6.2-rc5) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs-fixes/fixes +Already up to date. +Merging memblock-fixes/fixes (647037adcad00 Revert "mm: Always release pages to the buddy allocator in memblock_free_late().") +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock-fixes/fixes +Already up to date. +Merging nfsd-fixes/nfsd-fixes (d51425190805d SUNRPC: Fix failures of checksum Kunit tests) +$ 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 irqchip-fixes/irq/irqchip-fixes (6c9f7434159b9 irqchip: IMX_MU_MSI should depend on ARCH_MXC) +$ git merge -m Merge branch 'irq/irqchip-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git irqchip-fixes/irq/irqchip-fixes +Already up to date. +Merging renesas-fixes/fixes (ab2866f12ca18 arm64: dts: renesas: r8a779g0: Fix HSCIF0 interrupt number) +$ 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 broadcom-fixes/fixes (9abf2313adc1c Linux 6.1-rc1) +$ git merge -m Merge branch 'fixes' of https://github.com/Broadcom/stblinux.git broadcom-fixes/fixes +Already up to date. +Merging perf-current/perf/urgent (5b201a82cd9d0 perf tools: Add Adrian Hunter to MAINTAINERS as a reviewer) +$ git merge -m Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git perf-current/perf/urgent +Already up to date. +Merging efi-fixes/urgent (0b1d9debe3030 efi/libstub: randomalloc: Return EFI_OUT_OF_RESOURCES on failure) +$ git merge -m Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-fixes/urgent +Already up to date. +Merging zstd-fixes/zstd-linus (6906598f1ce93 zstd: Fix definition of assert()) +$ git merge -m Merge branch 'zstd-linus' of https://github.com/terrelln/linux.git zstd-fixes/zstd-linus +Already up to date. +Merging battery-fixes/fixes (06615d11cc781 power: supply: da9150: Fix use after free bug in da9150_charger_remove due to race condition) +$ 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 uml-fixes/fixes (a3046a618a284 um: Only disable SSE on clang to work around old GCC bugs) +$ 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 asahi-soc-fixes/asahi-soc/fixes (568035b01cfb1 Linux 6.0-rc1) +$ git merge -m Merge branch 'asahi-soc/fixes' of https://github.com/AsahiLinux/linux.git asahi-soc-fixes/asahi-soc/fixes +Already up to date. +Merging iommufd-fixes/for-rc (13a0d1ae7ee6b iommufd: Do not corrupt the pfn list when doing batch carry) +$ 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 (d966c3cab924f rust: allow to use INIT_STACK_ALL_ZERO) +$ git merge -m Merge branch 'rust-fixes' of https://github.com/Rust-for-Linux/linux.git rust-fixes/rust-fixes +Already up to date. +Merging v9fs-fixes/fixes/next (ccd58b45e607e fs/9p: Fix a datatype used with V9FS_DIRECT_IO) +$ git merge -m Merge branch 'fixes/next' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git v9fs-fixes/fixes/next +Merge made by the 'recursive' strategy. + fs/9p/v9fs.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging drm-misc-fixes/for-linux-next-fixes (0d68683838f28 drm/dsc: fix DP_DSC_MAX_BPP_DELTA_* macro values) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm/drm-misc drm-misc-fixes/for-linux-next-fixes +Auto-merging include/drm/display/drm_dp_helper.h +Auto-merging include/drm/display/drm_dp.h +Auto-merging drivers/gpu/drm/drm_fb_helper.c +Auto-merging drivers/gpu/drm/ast/ast_main.c +Merge made by the 'recursive' strategy. + drivers/firmware/sysfb_simplefb.c | 4 +++- + drivers/gpu/drm/ast/ast_main.c | 9 +++++---- + drivers/gpu/drm/drm_fb_helper.c | 16 ++++++++++++---- + include/drm/display/drm_dp.h | 5 ++--- + include/drm/display/drm_dp_helper.h | 5 ++--- + 5 files changed, 24 insertions(+), 15 deletions(-) +Merging mm-stable/mm-stable (f0ca8c25256dd sparse: remove unnecessary 0 values from rc) +$ git merge -m Merge branch 'mm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-stable/mm-stable +Removing tools/testing/selftests/mm/util.h +Removing tools/testing/selftests/mm/userfaultfd.c +Auto-merging samples/Kconfig +Auto-merging mm/vmscan.c +Auto-merging mm/slub.c +CONFLICT (modify/delete): mm/slob.c deleted in HEAD and modified in mm-stable/mm-stable. Version mm-stable/mm-stable of mm/slob.c left in tree. +Auto-merging mm/slab.h +Auto-merging mm/shmem.c +Auto-merging mm/memory.c +Auto-merging mm/madvise.c +Auto-merging mm/kfence/core.c +Auto-merging mm/kasan/hw_tags.c +Auto-merging mm/folio-compat.c +Auto-merging mm/Makefile +Auto-merging mm/Kconfig.debug +Auto-merging mm/Kconfig +Auto-merging lib/vsprintf.c +Auto-merging lib/test_vmalloc.c +Auto-merging lib/iov_iter.c +Auto-merging lib/Kconfig.debug +Auto-merging kernel/sched/fair.c +Auto-merging kernel/printk/printk.c +Auto-merging kernel/kthread.c +Auto-merging kernel/fork.c +Auto-merging kernel/cgroup/rstat.c +Auto-merging init/main.c +Auto-merging include/linux/uio.h +Auto-merging include/linux/slab.h +CONFLICT (content): Merge conflict in include/linux/slab.h +Auto-merging include/linux/pagemap.h +CONFLICT (content): Merge conflict in include/linux/pagemap.h +Auto-merging include/linux/page-flags.h +Auto-merging fs/xfs/xfs_file.c +Auto-merging fs/nfs/file.c +CONFLICT (content): Merge conflict in fs/nfs/file.c +Auto-merging fs/netfs/buffered_read.c +Auto-merging fs/iomap/buffered-io.c +CONFLICT (content): Merge conflict in fs/iomap/buffered-io.c +Auto-merging fs/inode.c +Auto-merging fs/ext4/move_extent.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/buffer.c +Auto-merging drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +Auto-merging drivers/md/dm-bufio.c +Auto-merging drivers/irqchip/irq-gic-v3-its.c +Auto-merging drivers/gpu/drm/ttm/ttm_pool.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/ttm/ttm_pool.c +Auto-merging drivers/gpu/drm/ttm/ttm_bo_vm.c +Auto-merging drivers/crypto/ccp/sev-dev.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/sparc/Kconfig +Auto-merging arch/powerpc/include/asm/book3s/64/tlbflush.h +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/mips/Kconfig +Auto-merging arch/m68k/Kconfig.cpu +Auto-merging arch/loongarch/Kconfig +Auto-merging arch/ia64/Kconfig +Auto-merging arch/arm64/include/asm/uaccess.h +Auto-merging arch/arm64/include/asm/memory.h +Auto-merging arch/arm64/Kconfig +CONFLICT (modify/delete): arch/arm/configs/oxnas_v6_defconfig deleted in HEAD and modified in mm-stable/mm-stable. Version mm-stable/mm-stable of arch/arm/configs/oxnas_v6_defconfig left in tree. +Auto-merging arch/arm/configs/imx_v6_v7_defconfig +Auto-merging arch/arm/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/filesystems/proc.rst +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Resolved 'drivers/gpu/drm/ttm/ttm_pool.c' using previous resolution. +Resolved 'fs/iomap/buffered-io.c' using previous resolution. +Resolved 'fs/nfs/file.c' using previous resolution. +Resolved 'include/linux/pagemap.h' using previous resolution. +Resolved 'include/linux/slab.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 8bf34e12ef411] Merge branch 'mm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-kernel-mm-ksm | 8 + + Documentation/admin-guide/kdump/vmcoreinfo.rst | 6 +- + Documentation/admin-guide/kernel-parameters.txt | 2 +- + Documentation/admin-guide/mm/ksm.rst | 5 +- + Documentation/admin-guide/mm/userfaultfd.rst | 25 + + Documentation/core-api/printk-formats.rst | 16 +- + Documentation/filesystems/locking.rst | 4 +- + Documentation/filesystems/proc.rst | 8 + + Documentation/filesystems/tmpfs.rst | 66 +- + Documentation/mm/active_mm.rst | 6 + + Documentation/mm/arch_pgtable_helpers.rst | 2 +- + Documentation/mm/multigen_lru.rst | 44 +- + Documentation/mm/unevictable-lru.rst | 2 + + MAINTAINERS | 5 +- + arch/Kconfig | 32 + + arch/arc/Kconfig | 4 +- + arch/arc/mm/init.c | 5 - + arch/arm/Kconfig | 27 +- + arch/arm/configs/imx_v6_v7_defconfig | 2 +- + arch/arm/configs/milbeaut_m10v_defconfig | 2 +- + arch/arm/configs/pxa_defconfig | 2 +- + arch/arm/configs/sama7_defconfig | 2 +- + arch/arm/configs/sp7021_defconfig | 2 +- + arch/arm/mach-rpc/ecard.c | 2 +- + arch/arm64/Kconfig | 52 +- + arch/arm64/include/asm/memory.h | 8 +- + arch/arm64/include/asm/mte-kasan.h | 81 + + arch/arm64/include/asm/mte.h | 12 - + arch/arm64/include/asm/pgtable.h | 2 +- + arch/arm64/include/asm/sparsemem.h | 2 +- + arch/arm64/include/asm/uaccess.h | 66 +- + arch/arm64/include/asm/word-at-a-time.h | 4 +- + arch/arm64/kvm/hyp/include/nvhe/gfp.h | 2 +- + arch/arm64/kvm/hyp/nvhe/page_alloc.c | 10 +- + arch/arm64/mm/fault.c | 36 + + arch/csky/Kconfig | 4 - + arch/ia64/Kconfig | 7 +- + arch/ia64/include/asm/sparsemem.h | 4 +- + arch/ia64/mm/hugetlbpage.c | 2 +- + arch/loongarch/Kconfig | 14 +- + arch/m68k/Kconfig.cpu | 19 +- + arch/m68k/include/asm/mcf_pgtable.h | 2 +- + arch/mips/Kconfig | 15 +- + arch/mips/include/asm/fixmap.h | 2 +- + arch/mips/include/asm/pgtable.h | 3 +- + arch/nios2/Kconfig | 22 +- + arch/powerpc/Kconfig | 38 +- + arch/powerpc/configs/85xx/ge_imp3a_defconfig | 2 +- + arch/powerpc/configs/fsl-emb-nonhw.config | 2 +- + arch/powerpc/include/asm/book3s/64/tlbflush.h | 3 +- + arch/powerpc/kernel/smp.c | 2 +- + arch/powerpc/mm/book3s64/iommu_api.c | 2 +- + arch/powerpc/mm/book3s64/radix_tlb.c | 4 +- + arch/powerpc/mm/fault.c | 37 + + arch/powerpc/mm/hugetlbpage.c | 2 +- + arch/powerpc/platforms/powernv/Kconfig | 1 + + arch/powerpc/platforms/powernv/pci-ioda.c | 2 +- + arch/powerpc/platforms/pseries/Kconfig | 1 + + arch/s390/Kconfig | 3 +- + arch/s390/include/asm/pgtable.h | 12 +- + arch/s390/mm/fault.c | 24 + + arch/s390/mm/gmap.c | 7 + + arch/s390/mm/hugetlbpage.c | 2 +- + arch/s390/mm/mmap.c | 2 +- + arch/sh/configs/ecovec24_defconfig | 2 +- + arch/sh/mm/Kconfig | 30 +- + arch/sparc/Kconfig | 21 +- + arch/sparc/include/asm/pgtable_64.h | 116 +- + arch/sparc/kernel/pci_sun4v.c | 2 +- + arch/sparc/kernel/traps_64.c | 2 +- + arch/sparc/mm/tsb.c | 4 +- + arch/x86/Kconfig | 3 +- + arch/x86/include/asm/pgtable.h | 2 +- + arch/x86/include/asm/string_64.h | 23 +- + arch/x86/mm/fault.c | 36 + + arch/x86/mm/pat/memtype.c | 12 +- + arch/xtensa/Kconfig | 23 +- + drivers/base/regmap/regmap-debugfs.c | 8 +- + drivers/block/floppy.c | 2 +- + drivers/block/zram/zram_drv.c | 382 +-- + drivers/block/zram/zram_drv.h | 1 - + drivers/crypto/ccp/sev-dev.c | 2 +- + drivers/crypto/hisilicon/sgl.c | 6 +- + drivers/dma-buf/heaps/system_heap.c | 5 +- + drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 2 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 2 +- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 2 +- + drivers/iommu/dma-iommu.c | 4 +- + drivers/irqchip/irq-gic-v3-its.c | 4 +- + drivers/md/dm-bufio.c | 2 +- + drivers/md/dm-cache-metadata.c | 2 +- + drivers/md/dm-thin-metadata.c | 2 +- + drivers/misc/genwqe/card_utils.c | 2 +- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 2 +- + drivers/net/ethernet/ibm/ibmvnic.h | 2 +- + drivers/video/fbdev/hyperv_fb.c | 4 +- + drivers/video/fbdev/vermilion/vermilion.c | 2 +- + drivers/virtio/virtio_balloon.c | 2 +- + drivers/virtio/virtio_mem.c | 12 +- + fs/Kconfig | 9 +- + fs/afs/dir.c | 10 +- + fs/afs/dir_edit.c | 2 +- + fs/afs/file.c | 14 +- + fs/afs/inode.c | 27 +- + fs/afs/internal.h | 1 + + fs/afs/write.c | 4 +- + fs/buffer.c | 89 +- + fs/exec.c | 2 +- + fs/ext4/inode.c | 2 +- + fs/ext4/move_extent.c | 8 +- + fs/hugetlbfs/inode.c | 4 +- + fs/inode.c | 3 +- + fs/iomap/buffered-io.c | 11 +- + fs/mpage.c | 66 +- + fs/netfs/buffered_read.c | 4 +- + fs/nfs/file.c | 4 +- + fs/nilfs2/page.c | 6 +- + fs/orangefs/inode.c | 9 +- + fs/proc/base.c | 3 + + fs/proc/kcore.c | 85 +- + fs/proc/meminfo.c | 13 + + fs/proc/task_mmu.c | 3 +- + fs/ramfs/file-nommu.c | 2 +- + fs/super.c | 2 +- + fs/userfaultfd.c | 45 +- + fs/xfs/xfs_buf.c | 3 +- + fs/xfs/xfs_file.c | 17 +- + include/asm-generic/pgalloc.h | 4 +- + include/drm/ttm/ttm_pool.h | 2 +- + include/linux/buffer_head.h | 6 + + include/linux/cgroup.h | 2 +- + include/linux/gfp.h | 7 +- + include/linux/gfp_types.h | 30 +- + include/linux/highmem.h | 62 +- + include/linux/huge_mm.h | 41 +- + include/linux/hugetlb.h | 46 +- + include/linux/io-mapping.h | 20 +- + include/linux/kmsan.h | 43 +- + include/linux/ksm.h | 37 +- + include/linux/memblock.h | 2 + + include/linux/memcontrol.h | 10 +- + include/linux/memfd.h | 4 +- + include/linux/mm.h | 206 +- + include/linux/mm_inline.h | 6 + + include/linux/mm_types.h | 46 +- + include/linux/mmap_lock.h | 37 +- + include/linux/mmzone.h | 34 +- + include/linux/page-flags.h | 23 +- + include/linux/page_ext.h | 2 - + include/linux/pageblock-flags.h | 4 +- + include/linux/pagemap.h | 15 +- + include/linux/pgtable.h | 9 +- + include/linux/sched/coredump.h | 1 + + include/linux/sched/isolation.h | 12 + + include/linux/sched/mm.h | 28 + + include/linux/shmem_fs.h | 19 +- + include/linux/slab.h | 5 +- + include/linux/swap.h | 38 +- + include/linux/uio.h | 2 + + include/linux/userfaultfd_k.h | 92 +- + include/linux/vm_event_item.h | 6 + + include/linux/vmalloc.h | 7 +- + include/linux/vmstat.h | 6 + + include/trace/events/cma.h | 58 +- + include/trace/events/huge_memory.h | 5 +- + include/trace/events/ksm.h | 251 ++ + include/trace/events/mmflags.h | 94 +- + include/uapi/linux/prctl.h | 4 + + include/uapi/linux/userfaultfd.h | 17 +- + init/main.c | 74 +- + kernel/cgroup/rstat.c | 4 +- + kernel/cpu.c | 2 +- + kernel/crash_core.c | 2 +- + kernel/dma/pool.c | 6 +- + kernel/events/ring_buffer.c | 2 +- + kernel/exit.c | 2 +- + kernel/fork.c | 163 +- + kernel/kcsan/kcsan_test.c | 20 +- + kernel/kthread.c | 22 +- + kernel/printk/printk.c | 2 + + kernel/sched/core.c | 15 +- + kernel/sched/fair.c | 57 + + kernel/sys.c | 42 + + lib/Kconfig.debug | 10 + + lib/iov_iter.c | 48 + + lib/maple_tree.c | 78 +- + lib/show_mem.c | 19 +- + lib/stackdepot.c | 12 + + lib/test_printf.c | 26 + + lib/test_vmalloc.c | 37 + + lib/vsprintf.c | 21 + + mm/Kconfig | 37 +- + mm/Kconfig.debug | 14 +- + mm/Makefile | 1 + + mm/backing-dev.c | 4 +- + mm/cma.c | 1 + + mm/cma_sysfs.c | 2 +- + mm/compaction.c | 20 +- + mm/damon/sysfs-schemes.c | 4 +- + mm/debug.c | 7 + + mm/debug_vm_pgtable.c | 10 +- + mm/dmapool_test.c | 147 + + mm/filemap.c | 27 +- + mm/folio-compat.c | 4 +- + mm/gup.c | 2 +- + mm/huge_memory.c | 85 +- + mm/hugetlb.c | 136 +- + mm/hugetlb_vmemmap.c | 18 +- + mm/init-mm.c | 3 + + mm/internal.h | 73 +- + mm/kasan/hw_tags.c | 14 +- + mm/kasan/kasan.h | 38 +- + mm/kasan/kasan_test.c | 24 +- + mm/kasan/quarantine.c | 34 +- + mm/kasan/report.c | 59 +- + mm/kfence/core.c | 70 +- + mm/kfence/kfence.h | 10 +- + mm/kfence/kfence_test.c | 22 +- + mm/kfence/report.c | 2 +- + mm/khugepaged.c | 454 ++- + mm/kmsan/core.c | 2 +- + mm/kmsan/init.c | 6 +- + mm/kmsan/kmsan_test.c | 119 +- + mm/ksm.c | 191 +- + mm/madvise.c | 14 +- + mm/memblock.c | 11 +- + mm/memcontrol.c | 127 +- + mm/memfd.c | 6 +- + mm/memory-failure.c | 65 +- + mm/memory.c | 427 ++- + mm/memory_hotplug.c | 15 +- + mm/memtest.c | 6 + + mm/migrate.c | 11 +- + mm/mincore.c | 2 +- + mm/mlock.c | 2 +- + mm/mm_init.c | 2550 ++++++++++++++++ + mm/mmap.c | 292 +- + mm/mmu_gather.c | 2 +- + mm/mprotect.c | 53 +- + mm/mremap.c | 23 +- + mm/nommu.c | 10 +- + mm/page_alloc.c | 3160 ++------------------ + mm/page_isolation.c | 12 +- + mm/page_owner.c | 6 +- + mm/page_reporting.c | 4 +- + mm/pgtable-generic.c | 2 +- + mm/rmap.c | 38 +- + mm/shmem.c | 133 +- + mm/shrinker_debug.c | 43 +- + mm/shuffle.h | 2 +- + mm/slab.c | 5 +- + mm/slab.h | 1 + + mm/slub.c | 9 +- + mm/sparse-vmemmap.c | 3 +- + mm/sparse.c | 2 +- + mm/swap_state.c | 19 +- + mm/swapfile.c | 10 +- + mm/truncate.c | 15 +- + mm/userfaultfd.c | 287 +- + mm/vmalloc.c | 310 +- + mm/vmscan.c | 383 +-- + mm/vmstat.c | 20 +- + mm/workingset.c | 28 +- + mm/zsmalloc.c | 370 +-- + mm/zswap.c | 138 +- + net/smc/smc_ib.c | 2 +- + samples/Kconfig | 7 + + samples/Makefile | 2 +- + samples/kmemleak/Makefile | 2 +- + scripts/Makefile.kasan | 2 + + security/integrity/ima/ima_crypto.c | 2 +- + tools/include/uapi/linux/prctl.h | 2 + + tools/testing/memblock/linux/mmzone.h | 6 +- + tools/testing/radix-tree/maple.c | 24 + + tools/testing/selftests/memfd/memfd_test.c | 14 +- + tools/testing/selftests/mm/.gitignore | 5 +- + tools/testing/selftests/mm/Makefile | 92 +- + tools/testing/selftests/mm/check_config.sh | 4 +- + tools/testing/selftests/mm/cow.c | 33 +- + tools/testing/selftests/mm/gup_test.c | 5 +- + tools/testing/selftests/mm/hugepage-mremap.c | 9 +- + tools/testing/selftests/mm/hugetlb-madvise.c | 25 +- + tools/testing/selftests/mm/khugepaged.c | 4 + + tools/testing/selftests/mm/ksm_functional_tests.c | 97 +- + tools/testing/selftests/mm/ksm_tests.c | 174 +- + tools/testing/selftests/mm/mkdirty.c | 379 +++ + tools/testing/selftests/mm/mrelease_test.c | 11 +- + tools/testing/selftests/mm/run_vmtests.sh | 46 +- + tools/testing/selftests/mm/soft-dirty.c | 3 + + tools/testing/selftests/mm/split_huge_page_test.c | 10 +- + tools/testing/selftests/mm/thuge-gen.c | 19 +- + tools/testing/selftests/mm/transhuge-stress.c | 12 +- + tools/testing/selftests/mm/uffd-common.c | 618 ++++ + tools/testing/selftests/mm/uffd-common.h | 117 + + tools/testing/selftests/mm/uffd-stress.c | 481 +++ + tools/testing/selftests/mm/uffd-unit-tests.c | 1228 ++++++++ + tools/testing/selftests/mm/userfaultfd.c | 1858 ------------ + tools/testing/selftests/mm/util.h | 69 - + .../mm/{va_128TBswitch.c => va_high_addr_switch.c} | 41 +- + .../{va_128TBswitch.sh => va_high_addr_switch.sh} | 6 +- + tools/testing/selftests/mm/virtual_address_range.c | 24 +- + tools/testing/selftests/mm/vm_util.c | 180 +- + tools/testing/selftests/mm/vm_util.h | 50 + + 303 files changed, 11744 insertions(+), 8152 deletions(-) + create mode 100644 include/trace/events/ksm.h + create mode 100644 mm/dmapool_test.c + create mode 100644 tools/testing/selftests/mm/mkdirty.c + create mode 100644 tools/testing/selftests/mm/uffd-common.c + create mode 100644 tools/testing/selftests/mm/uffd-common.h + create mode 100644 tools/testing/selftests/mm/uffd-stress.c + create mode 100644 tools/testing/selftests/mm/uffd-unit-tests.c + delete mode 100644 tools/testing/selftests/mm/userfaultfd.c + delete mode 100644 tools/testing/selftests/mm/util.h + rename tools/testing/selftests/mm/{va_128TBswitch.c => va_high_addr_switch.c} (86%) + rename tools/testing/selftests/mm/{va_128TBswitch.sh => va_high_addr_switch.sh} (89%) +Merging mm-nonmm-stable/mm-nonmm-stable (22ba509dd4dad mailmap: add entry for Oleksandr) +$ git merge -m Merge branch 'mm-nonmm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-nonmm-stable/mm-nonmm-stable +Auto-merging tools/lib/bpf/usdt.c +Auto-merging tools/lib/bpf/libbpf.c +Auto-merging scripts/checkpatch.pl +Auto-merging kernel/sched/core.c +Auto-merging fs/proc/base.c +Auto-merging fs/nfs/nfs3acl.c +Auto-merging fs/eventpoll.c +Auto-merging arch/ia64/mm/hugetlbpage.c +Auto-merging MAINTAINERS +Auto-merging Documentation/process/submitting-patches.rst +Auto-merging Documentation/filesystems/proc.rst +Auto-merging .mailmap +Merge made by the 'recursive' strategy. + .mailmap | 1 + + Documentation/accounting/delay-accounting.rst | 19 +- + Documentation/dev-tools/kcov.rst | 169 +++++++++------ + Documentation/filesystems/proc.rst | 2 + + Documentation/process/5.Posting.rst | 22 +- + Documentation/process/submitting-patches.rst | 26 ++- + .../zh_CN/accounting/delay-accounting.rst | 10 +- + MAINTAINERS | 6 - + arch/ia64/kernel/salinfo.c | 2 +- + arch/ia64/mm/contig.c | 2 +- + arch/ia64/mm/hugetlbpage.c | 2 +- + arch/mips/boot/tools/relocs.c | 2 +- + arch/um/os-Linux/elf_aux.c | 2 +- + arch/x86/include/asm/kexec.h | 3 - + arch/x86/kernel/machine_kexec_64.c | 11 - + arch/x86/tools/relocs.c | 2 +- + drivers/dca/dca-core.c | 4 +- + drivers/rapidio/devices/tsi721.c | 3 - + drivers/remoteproc/remoteproc_coredump.c | 4 +- + drivers/remoteproc/remoteproc_elf_loader.c | 4 +- + fs/binfmt_elf.c | 2 +- + fs/binfmt_elf_fdpic.c | 2 +- + fs/eventpoll.c | 215 +++++++++++-------- + fs/nfs/nfs3acl.c | 5 +- + fs/ocfs2/ioctl.c | 37 +++- + fs/proc/array.c | 2 + + fs/proc/base.c | 1 - + fs/proc/generic.c | 1 - + fs/proc/proc_sysctl.c | 1 - + fs/proc/stat.c | 26 --- + fs/proc/vmcore.c | 22 +- + include/linux/delayacct.h | 15 ++ + include/linux/hex.h | 35 ++++ + include/linux/kernel.h | 29 +-- + include/linux/kexec.h | 8 - + include/linux/rbtree_augmented.h | 4 +- + include/trace/events/notifier.h | 69 ++++++ + include/uapi/linux/const.h | 2 +- + include/uapi/linux/taskstats.h | 6 +- + kernel/delayacct.c | 14 ++ + kernel/hung_task.c | 10 +- + kernel/kexec_file.c | 6 +- + kernel/notifier.c | 6 + + kernel/sched/core.c | 1 + + lib/buildid.c | 2 +- + lib/rbtree.c | 2 +- + lib/test-string_helpers.c | 2 +- + mm/util.c | 1 + + scripts/checkpatch.pl | 52 ++++- + scripts/gdb/linux/clk.py | 2 + + scripts/gdb/linux/constants.py.in | 24 +++ + scripts/gdb/linux/cpus.py | 24 ++- + scripts/gdb/linux/genpd.py | 4 +- + scripts/gdb/linux/interrupts.py | 232 +++++++++++++++++++++ + scripts/gdb/linux/proc.py | 16 +- + scripts/gdb/linux/radixtree.py | 90 ++++++++ + scripts/gdb/linux/timerlist.py | 12 +- + scripts/gdb/linux/utils.py | 13 +- + scripts/gdb/linux/vfs.py | 59 ++++++ + scripts/gdb/vmlinux-gdb.py | 8 +- + scripts/link-vmlinux.sh | 2 +- + sound/soc/codecs/rt5677.c | 2 +- + tools/accounting/getdelays.c | 30 +-- + tools/bpf/resolve_btfids/main.c | 2 +- + tools/lib/bpf/libbpf.c | 2 +- + tools/lib/bpf/usdt.c | 2 +- + tools/perf/util/symbol-elf.c | 2 +- + 67 files changed, 1023 insertions(+), 377 deletions(-) + create mode 100644 include/linux/hex.h + create mode 100644 include/trace/events/notifier.h + create mode 100644 scripts/gdb/linux/interrupts.py + create mode 100644 scripts/gdb/linux/radixtree.py + create mode 100644 scripts/gdb/linux/vfs.py +Merging mm/mm-everything (25aab2ea365fe Merge branch 'mm-nonmm-unstable' into mm-everything) +$ git merge -m Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm/mm-everything +Auto-merging mm/shmem.c +Auto-merging lib/iov_iter.c +Auto-merging kernel/cgroup/cpuset.c +Auto-merging include/linux/uio.h +Auto-merging .mailmap +Merge made by the 'recursive' strategy. + .mailmap | 2 + + arch/s390/mm/gmap.c | 20 +------ + drivers/dma-buf/heaps/system_heap.c | 5 +- + fs/coredump.c | 1 + + include/linux/cpuset.h | 16 +----- + include/linux/ksm.h | 7 +++ + include/linux/libgcc.h | 7 +++ + include/linux/uio.h | 16 ++++++ + kernel/cgroup/cpuset.c | 4 +- + kernel/sys.c | 12 +--- + lib/iov_iter.c | 17 +++++- + mm/hugetlb_vmemmap.c | 11 ++-- + mm/khugepaged.c | 23 +------- + mm/ksm.c | 70 +++++++++++++++++++++++ + mm/memcontrol.c | 5 +- + mm/page_alloc.c | 4 +- + mm/rmap.c | 12 ++-- + mm/shmem.c | 4 ++ + tools/testing/selftests/mm/ksm_functional_tests.c | 46 +++++++++++++-- + 19 files changed, 193 insertions(+), 89 deletions(-) +$ git am -3 ../patches/0001-mm-slab-fix-up-for-mm-kmsan-call-KMSAN-hooks-from-SL.patch +Applying: mm/slab: fix up for "mm: kmsan: call KMSAN hooks from SLUB code" +Using index info to reconstruct a base tree... +M mm/slab_common.c +Falling back to patching base and 3-way merge... +Auto-merging mm/slab_common.c +No changes -- Patch already applied. +$ git am -3 ../patches/crypto-x86-kmsan-disable-accelerated-configs-in-KMSAN-builds.patch +Applying: crypto: x86: kmsan: disable accelerated configs in KMSAN builds +Using index info to reconstruct a base tree... +M crypto/Kconfig +Falling back to patching base and 3-way merge... +Auto-merging crypto/Kconfig +$ git reset HEAD^ +Unstaged changes after reset: +M crypto/Kconfig +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master 1d49d8255ddb1] Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm + Date: Thu Apr 27 12:43:51 2023 +0100 +Merging kbuild/for-next (9892bd72efdc9 kbuild: deb-pkg: specify targets in debian/rules as .PHONY) +$ 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 scripts/package/mkdebian +Auto-merging scripts/link-vmlinux.sh +Auto-merging scripts/Makefile.package +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Makefile | 3 +- + arch/sparc/Makefile | 15 +- + scripts/Makefile.clang | 8 +- + scripts/Makefile.package | 61 +++++-- + scripts/kallsyms.c | 229 +++++++++------------------ + scripts/kconfig/lxdialog/dialog.h | 27 ---- + scripts/kconfig/lxdialog/menubox.c | 8 - + scripts/kconfig/lxdialog/textbox.c | 267 +++++++++++++++---------------- + scripts/kconfig/mconf.c | 314 ++++++++++++++++++------------------- + scripts/link-vmlinux.sh | 6 +- + scripts/mksysmap | 135 ++++++++++------ + scripts/package/builddeb | 2 +- + scripts/package/mkdebian | 2 + + scripts/package/mkspec | 7 +- + scripts/tools-support-relr.sh | 8 +- + 15 files changed, 510 insertions(+), 582 deletions(-) +Merging clang-format/clang-format (781121a7f6d11 clang-format: Fix space after for_each macros) +$ 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 (d1efa4a0a696e perf cs-etm: Add separate decode paths for timeless and per-thread modes) +$ git merge -m Merge branch 'perf-tools-next' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git perf/perf-tools-next +Auto-merging tools/perf/util/symbol-elf.c +Removing tools/perf/pmu-events/arch/x86/snowridgex/uncore-other.json +Removing tools/perf/pmu-events/arch/x86/skylakex/uncore-other.json +Removing tools/perf/pmu-events/arch/x86/sapphirerapids/uncore-other.json +Removing tools/perf/pmu-events/arch/x86/jaketown/uncore-other.json +Removing tools/perf/pmu-events/arch/x86/ivytown/uncore-other.json +Removing tools/perf/pmu-events/arch/x86/icelakex/uncore-other.json +Removing tools/perf/pmu-events/arch/x86/haswellx/uncore-other.json +Removing tools/perf/pmu-events/arch/x86/cascadelakex/uncore-other.json +Removing tools/perf/pmu-events/arch/x86/broadwellx/uncore-other.json +Removing tools/build/feature/test-libbpf-btf__raw_data.c +Removing tools/build/feature/test-libbpf-btf__load_from_kernel_by_id.c +Removing tools/build/feature/test-libbpf-bpf_program__set_insns.c +Removing tools/build/feature/test-libbpf-bpf_prog_load.c +Removing tools/build/feature/test-libbpf-bpf_object__next_program.c +Removing tools/build/feature/test-libbpf-bpf_object__next_map.c +Removing tools/build/feature/test-libbpf-bpf_map_create.c +Merge made by the 'recursive' strategy. + tools/arch/x86/include/uapi/asm/unistd_32.h | 4 +- + tools/arch/x86/include/uapi/asm/unistd_64.h | 3 + + tools/build/Makefile.feature | 2 + + tools/build/feature/Makefile | 15 +- + tools/build/feature/test-all.c | 5 + + tools/build/feature/test-cxa-demangle.cpp | 17 + + tools/build/feature/test-libbpf-bpf_map_create.c | 8 - + .../feature/test-libbpf-bpf_object__next_map.c | 8 - + .../feature/test-libbpf-bpf_object__next_program.c | 8 - + tools/build/feature/test-libbpf-bpf_prog_load.c | 9 - + .../feature/test-libbpf-bpf_program__set_insns.c | 8 - + .../test-libbpf-btf__load_from_kernel_by_id.c | 8 - + tools/build/feature/test-libbpf-btf__raw_data.c | 8 - + tools/build/feature/test-libbpf.c | 4 + + tools/build/feature/test-scandirat.c | 13 + + tools/include/linux/compiler-gcc.h | 6 +- + tools/include/linux/compiler.h | 4 - + tools/include/linux/coresight-pmu.h | 47 +- + tools/include/uapi/linux/perf_event.h | 3 +- + tools/lib/api/io.h | 45 + + tools/lib/perf/Makefile | 2 +- + tools/lib/perf/cpumap.c | 94 +- + tools/lib/perf/evlist.c | 31 +- + tools/lib/perf/include/internal/cpumap.h | 10 +- + tools/lib/perf/include/internal/evlist.h | 1 - + tools/lib/perf/include/internal/rc_check.h | 102 + + tools/lib/perf/include/perf/event.h | 2 + + tools/lib/perf/include/perf/evlist.h | 1 + + tools/perf/Build | 2 +- + tools/perf/Documentation/perf-annotate.txt | 3 + + tools/perf/Documentation/perf-config.txt | 8 +- + tools/perf/Documentation/perf-kvm.txt | 9 +- + tools/perf/Documentation/perf-lock.txt | 4 +- + tools/perf/Documentation/perf-record.txt | 60 +- + tools/perf/Documentation/perf-report.txt | 4 + + tools/perf/Documentation/perf-stat.txt | 27 +- + tools/perf/Documentation/perf-top.txt | 10 + + tools/perf/Documentation/topdown.txt | 70 +- + tools/perf/Makefile.config | 126 +- + tools/perf/Makefile.perf | 29 +- + tools/perf/arch/arm/tests/dwarf-unwind.c | 2 +- + tools/perf/arch/arm/util/cs-etm.c | 264 +- + tools/perf/arch/arm/util/pmu.c | 2 + + tools/perf/arch/arm64/tests/dwarf-unwind.c | 2 +- + tools/perf/arch/arm64/util/arm-spe.c | 28 +- + tools/perf/arch/arm64/util/kvm-stat.c | 5 +- + tools/perf/arch/common.c | 4 +- + tools/perf/arch/common.h | 2 +- + tools/perf/arch/powerpc/tests/dwarf-unwind.c | 2 +- + tools/perf/arch/powerpc/util/header.c | 2 +- + tools/perf/arch/powerpc/util/kvm-stat.c | 7 +- + tools/perf/arch/powerpc/util/skip-callchain-idx.c | 4 +- + tools/perf/arch/powerpc/util/sym-handling.c | 4 +- + tools/perf/arch/s390/annotate/instructions.c | 2 +- + tools/perf/arch/s390/util/Build | 1 + + tools/perf/arch/s390/util/kvm-stat.c | 1 - + tools/perf/arch/s390/util/pmu.c | 23 + + tools/perf/arch/x86/tests/dwarf-unwind.c | 2 +- + tools/perf/arch/x86/tests/insn-x86.c | 4 + + tools/perf/arch/x86/util/auxtrace.c | 4 - + tools/perf/arch/x86/util/event.c | 13 +- + tools/perf/arch/x86/util/evlist.c | 45 +- + tools/perf/arch/x86/util/intel-pt.c | 72 +- + tools/perf/arch/x86/util/iostat.c | 7 +- + tools/perf/arch/x86/util/kvm-stat.c | 15 +- + tools/perf/arch/x86/util/pmu.c | 21 +- + tools/perf/arch/x86/util/topdown.c | 78 +- + tools/perf/arch/x86/util/topdown.h | 1 - + tools/perf/bench/Build | 1 + + tools/perf/bench/bench.h | 2 + + tools/perf/bench/find-bit-bench.c | 8 +- + tools/perf/bench/inject-buildid.c | 3 +- + tools/perf/bench/numa.c | 2 +- + tools/perf/bench/pmu-scan.c | 184 + + tools/perf/bench/syscall.c | 35 + + tools/perf/builtin-annotate.c | 60 +- + tools/perf/builtin-bench.c | 2 + + tools/perf/builtin-buildid-list.c | 6 +- + tools/perf/builtin-c2c.c | 20 +- + tools/perf/builtin-daemon.c | 14 +- + tools/perf/builtin-data.c | 2 +- + tools/perf/builtin-diff.c | 6 +- + tools/perf/builtin-evlist.c | 2 +- + tools/perf/builtin-ftrace.c | 16 +- + tools/perf/builtin-help.c | 1 + + tools/perf/builtin-inject.c | 20 +- + tools/perf/builtin-kallsyms.c | 6 +- + tools/perf/builtin-kmem.c | 6 +- + tools/perf/builtin-kvm.c | 870 +- + tools/perf/builtin-kwork.c | 2 +- + tools/perf/builtin-list.c | 21 +- + tools/perf/builtin-lock.c | 144 +- + tools/perf/builtin-mem.c | 12 +- + tools/perf/builtin-probe.c | 2 +- + tools/perf/builtin-record.c | 56 +- + tools/perf/builtin-report.c | 63 +- + tools/perf/builtin-sched.c | 17 +- + tools/perf/builtin-script.c | 39 +- + tools/perf/builtin-stat.c | 269 +- + tools/perf/builtin-timechart.c | 2 +- + tools/perf/builtin-top.c | 67 +- + tools/perf/builtin-trace.c | 18 +- + tools/perf/builtin-version.c | 9 +- + tools/perf/builtin.h | 3 - + tools/perf/check-headers.sh | 1 - + tools/perf/perf.c | 27 +- + tools/perf/perf.h | 9 - + .../arm/{cortex-a76-n1 => cortex-a76}/branch.json | 0 + .../arm/{cortex-a76-n1 => cortex-a76}/bus.json | 0 + .../arm/{cortex-a76-n1 => cortex-a76}/cache.json | 0 + .../{cortex-a76-n1 => cortex-a76}/exception.json | 0 + .../{cortex-a76-n1 => cortex-a76}/instruction.json | 0 + .../arm/{cortex-a76-n1 => cortex-a76}/memory.json | 0 + .../{cortex-a76-n1 => cortex-a76}/pipeline.json | 0 + .../pmu-events/arch/arm64/arm/neoverse-n1/bus.json | 18 + + .../arch/arm64/arm/neoverse-n1/exception.json | 62 + + .../arch/arm64/arm/neoverse-n1/general.json | 6 + + .../arch/arm64/arm/neoverse-n1/l1d_cache.json | 50 + + .../arch/arm64/arm/neoverse-n1/l1i_cache.json | 10 + + .../arch/arm64/arm/neoverse-n1/l2_cache.json | 46 + + .../arch/arm64/arm/neoverse-n1/l3_cache.json | 18 + + .../arch/arm64/arm/neoverse-n1/ll_cache.json | 10 + + .../arch/arm64/arm/neoverse-n1/memory.json | 22 + + .../arch/arm64/arm/neoverse-n1/metrics.json | 219 + + .../arch/arm64/arm/neoverse-n1/retired.json | 26 + + .../pmu-events/arch/arm64/arm/neoverse-n1/spe.json | 18 + + .../arch/arm64/arm/neoverse-n1/spec_operation.json | 102 + + .../arch/arm64/arm/neoverse-n1/stall.json | 10 + + .../pmu-events/arch/arm64/arm/neoverse-n1/tlb.json | 66 + + tools/perf/pmu-events/arch/arm64/mapfile.csv | 4 +- + .../perf/pmu-events/arch/powerpc/power9/other.json | 4 +- + .../pmu-events/arch/powerpc/power9/pipeline.json | 2 +- + .../pmu-events/arch/s390/cf_z13/transaction.json | 70 + + .../pmu-events/arch/s390/cf_z14/transaction.json | 65 + + .../pmu-events/arch/s390/cf_z15/transaction.json | 65 + + .../perf/pmu-events/arch/s390/cf_z16/extended.json | 10 +- + .../perf/pmu-events/arch/s390/cf_z16/pai_ext.json | 178 + + .../pmu-events/arch/s390/cf_z16/transaction.json | 65 + + .../pmu-events/arch/x86/alderlake/adl-metrics.json | 3230 +- + .../perf/pmu-events/arch/x86/alderlake/cache.json | 36 +- + .../arch/x86/alderlake/floating-point.json | 27 + + .../pmu-events/arch/x86/alderlake/frontend.json | 9 + + .../perf/pmu-events/arch/x86/alderlake/memory.json | 11 +- + .../perf/pmu-events/arch/x86/alderlake/other.json | 3 +- + .../pmu-events/arch/x86/alderlake/pipeline.json | 28 +- + .../arch/x86/alderlake/uncore-interconnect.json | 90 + + .../arch/x86/alderlake/uncore-memory.json | 16 +- + .../arch/x86/alderlake/uncore-other.json | 64 - + .../arch/x86/alderlaken/adln-metrics.json | 825 +- + .../pmu-events/arch/x86/alderlaken/memory.json | 7 + + .../arch/x86/alderlaken/uncore-interconnect.json | 26 + + .../arch/x86/alderlaken/uncore-memory.json | 16 +- + .../arch/x86/alderlaken/uncore-other.json | 24 - + .../pmu-events/arch/x86/broadwell/bdw-metrics.json | 1439 +- + .../perf/pmu-events/arch/x86/broadwell/cache.json | 296 +- + .../arch/x86/broadwell/floating-point.json | 7 + + .../pmu-events/arch/x86/broadwell/frontend.json | 18 +- + .../perf/pmu-events/arch/x86/broadwell/memory.json | 248 +- + .../pmu-events/arch/x86/broadwell/pipeline.json | 22 +- + .../arch/x86/broadwell/uncore-cache.json | 30 +- + .../arch/x86/broadwell/uncore-interconnect.json | 61 + + .../arch/x86/broadwell/uncore-other.json | 59 - + .../arch/x86/broadwellde/bdwde-metrics.json | 1405 +- + .../pmu-events/arch/x86/broadwellde/cache.json | 105 +- + .../arch/x86/broadwellde/floating-point.json | 45 +- + .../pmu-events/arch/x86/broadwellde/frontend.json | 18 +- + .../pmu-events/arch/x86/broadwellde/memory.json | 64 +- + .../pmu-events/arch/x86/broadwellde/pipeline.json | 79 +- + .../arch/x86/broadwellde/uncore-cache.json | 396 +- + .../arch/x86/broadwellde/uncore-interconnect.json | 614 + + .../{uncore-other.json => uncore-io.json} | 595 +- + .../arch/x86/broadwellde/uncore-memory.json | 256 +- + .../arch/x86/broadwellde/uncore-power.json | 10 +- + .../arch/x86/broadwellx/bdx-metrics.json | 1626 +- + .../perf/pmu-events/arch/x86/broadwellx/cache.json | 16 +- + .../pmu-events/arch/x86/broadwellx/frontend.json | 18 +- + .../pmu-events/arch/x86/broadwellx/pipeline.json | 20 +- + .../arch/x86/broadwellx/uncore-cache.json | 456 +- + .../arch/x86/broadwellx/uncore-interconnect.json | 4305 ++- + .../pmu-events/arch/x86/broadwellx/uncore-io.json | 555 + + .../arch/x86/broadwellx/uncore-memory.json | 522 +- + .../arch/x86/broadwellx/uncore-other.json | 3250 -- + .../arch/x86/broadwellx/uncore-power.json | 10 +- + .../pmu-events/arch/x86/cascadelakex/cache.json | 24 +- + .../arch/x86/cascadelakex/clx-metrics.json | 2204 +- + .../pmu-events/arch/x86/cascadelakex/frontend.json | 8 +- + .../pmu-events/arch/x86/cascadelakex/pipeline.json | 16 + + .../arch/x86/cascadelakex/uncore-cache.json | 10764 ++++++ + .../arch/x86/cascadelakex/uncore-interconnect.json | 11334 +++++++ + .../arch/x86/cascadelakex/uncore-io.json | 4250 +++ + .../arch/x86/cascadelakex/uncore-memory.json | 18 +- + .../arch/x86/cascadelakex/uncore-other.json | 26336 --------------- + .../arch/x86/cascadelakex/uncore-power.json | 8 +- + .../perf/pmu-events/arch/x86/grandridge/cache.json | 155 + + .../pmu-events/arch/x86/grandridge/frontend.json | 16 + + .../pmu-events/arch/x86/grandridge/memory.json | 20 + + .../perf/pmu-events/arch/x86/grandridge/other.json | 20 + + .../pmu-events/arch/x86/grandridge/pipeline.json | 96 + + .../arch/x86/grandridge/virtual-memory.json | 24 + + .../pmu-events/arch/x86/graniterapids/cache.json | 54 + + .../arch/x86/graniterapids/frontend.json | 10 + + .../pmu-events/arch/x86/graniterapids/memory.json | 174 + + .../pmu-events/arch/x86/graniterapids/other.json | 29 + + .../arch/x86/graniterapids/pipeline.json | 102 + + .../arch/x86/graniterapids/virtual-memory.json | 26 + + tools/perf/pmu-events/arch/x86/haswell/cache.json | 38 +- + .../pmu-events/arch/x86/haswell/hsw-metrics.json | 1220 +- + tools/perf/pmu-events/arch/x86/haswell/memory.json | 38 +- + .../perf/pmu-events/arch/x86/haswell/pipeline.json | 8 + + .../pmu-events/arch/x86/haswell/uncore-cache.json | 50 +- + .../arch/x86/haswell/uncore-interconnect.json | 52 + + .../pmu-events/arch/x86/haswell/uncore-other.json | 50 - + tools/perf/pmu-events/arch/x86/haswellx/cache.json | 2 +- + .../pmu-events/arch/x86/haswellx/hsx-metrics.json | 1397 +- + .../pmu-events/arch/x86/haswellx/pipeline.json | 8 + + .../pmu-events/arch/x86/haswellx/uncore-cache.json | 376 +- + .../arch/x86/haswellx/uncore-interconnect.json | 4242 ++- + .../pmu-events/arch/x86/haswellx/uncore-io.json | 528 + + .../pmu-events/arch/x86/haswellx/uncore-other.json | 3160 -- + tools/perf/pmu-events/arch/x86/icelake/cache.json | 16 + + .../arch/x86/icelake/floating-point.json | 31 + + .../pmu-events/arch/x86/icelake/icl-metrics.json | 1932 +- + .../perf/pmu-events/arch/x86/icelake/pipeline.json | 23 +- + .../arch/x86/icelake/uncore-interconnect.json | 74 + + .../pmu-events/arch/x86/icelake/uncore-other.json | 16 - + tools/perf/pmu-events/arch/x86/icelakex/cache.json | 8 + + .../arch/x86/icelakex/floating-point.json | 31 + + .../pmu-events/arch/x86/icelakex/icx-metrics.json | 2153 +- + .../pmu-events/arch/x86/icelakex/pipeline.json | 10 + + .../pmu-events/arch/x86/icelakex/uncore-cache.json | 9860 ++++++ + .../arch/x86/icelakex/uncore-interconnect.json | 14571 ++++++++ + .../pmu-events/arch/x86/icelakex/uncore-io.json | 9270 +++++ + .../arch/x86/icelakex/uncore-memory.json | 6 +- + .../pmu-events/arch/x86/icelakex/uncore-other.json | 33727 ------------------- + .../pmu-events/arch/x86/ivybridge/ivb-metrics.json | 1270 +- + .../pmu-events/arch/x86/ivybridge/pipeline.json | 8 + + .../arch/x86/ivybridge/uncore-cache.json | 50 +- + ...{uncore-other.json => uncore-interconnect.json} | 0 + .../pmu-events/arch/x86/ivytown/ivt-metrics.json | 1311 +- + .../perf/pmu-events/arch/x86/ivytown/pipeline.json | 8 + + .../pmu-events/arch/x86/ivytown/uncore-cache.json | 314 +- + .../arch/x86/ivytown/uncore-interconnect.json | 2025 +- + .../pmu-events/arch/x86/ivytown/uncore-io.json | 549 + + .../pmu-events/arch/x86/ivytown/uncore-other.json | 2174 -- + tools/perf/pmu-events/arch/x86/jaketown/cache.json | 6 +- + .../arch/x86/jaketown/floating-point.json | 2 +- + .../pmu-events/arch/x86/jaketown/frontend.json | 12 +- + .../pmu-events/arch/x86/jaketown/jkt-metrics.json | 602 +- + .../pmu-events/arch/x86/jaketown/pipeline.json | 10 +- + .../pmu-events/arch/x86/jaketown/uncore-cache.json | 216 +- + .../arch/x86/jaketown/uncore-interconnect.json | 1311 +- + .../pmu-events/arch/x86/jaketown/uncore-io.json | 324 + + .../arch/x86/jaketown/uncore-memory.json | 4 +- + .../pmu-events/arch/x86/jaketown/uncore-other.json | 1393 - + .../pmu-events/arch/x86/jaketown/uncore-power.json | 8 +- + .../pmu-events/arch/x86/knightslanding/cache.json | 94 +- + .../arch/x86/knightslanding/pipeline.json | 8 +- + .../{uncore-other.json => uncore-cache.json} | 304 +- + .../arch/x86/knightslanding/uncore-io.json | 194 + + .../arch/x86/knightslanding/uncore-memory.json | 106 + + tools/perf/pmu-events/arch/x86/mapfile.csv | 47 +- + .../perf/pmu-events/arch/x86/meteorlake/cache.json | 8 + + .../pmu-events/arch/x86/meteorlake/frontend.json | 9 + + .../pmu-events/arch/x86/meteorlake/memory.json | 13 +- + .../perf/pmu-events/arch/x86/meteorlake/other.json | 4 +- + .../pmu-events/arch/x86/meteorlake/pipeline.json | 36 +- + .../arch/x86/meteorlake/virtual-memory.json | 4 + + .../pmu-events/arch/x86/sandybridge/cache.json | 8 +- + .../arch/x86/sandybridge/floating-point.json | 2 +- + .../pmu-events/arch/x86/sandybridge/frontend.json | 12 +- + .../pmu-events/arch/x86/sandybridge/pipeline.json | 10 +- + .../arch/x86/sandybridge/snb-metrics.json | 601 +- + .../arch/x86/sandybridge/uncore-cache.json | 50 +- + ...{uncore-other.json => uncore-interconnect.json} | 0 + .../pmu-events/arch/x86/sapphirerapids/cache.json | 24 +- + .../arch/x86/sapphirerapids/floating-point.json | 32 + + .../arch/x86/sapphirerapids/frontend.json | 8 + + .../pmu-events/arch/x86/sapphirerapids/other.json | 3 +- + .../arch/x86/sapphirerapids/pipeline.json | 23 +- + .../arch/x86/sapphirerapids/spr-metrics.json | 2293 +- + .../arch/x86/sapphirerapids/uncore-cache.json | 5644 ++++ + .../arch/x86/sapphirerapids/uncore-cxl.json | 450 + + .../x86/sapphirerapids/uncore-interconnect.json | 6199 ++++ + .../arch/x86/sapphirerapids/uncore-io.json | 3651 ++ + .../arch/x86/sapphirerapids/uncore-memory.json | 3283 +- + .../arch/x86/sapphirerapids/uncore-other.json | 4465 --- + .../arch/x86/sapphirerapids/uncore-power.json | 107 + + .../pmu-events/arch/x86/sierraforest/cache.json | 155 + + .../pmu-events/arch/x86/sierraforest/frontend.json | 16 + + .../pmu-events/arch/x86/sierraforest/memory.json | 20 + + .../pmu-events/arch/x86/sierraforest/other.json | 20 + + .../pmu-events/arch/x86/sierraforest/pipeline.json | 96 + + .../arch/x86/sierraforest/virtual-memory.json | 24 + + .../pmu-events/arch/x86/silvermont/frontend.json | 2 +- + .../pmu-events/arch/x86/silvermont/pipeline.json | 2 +- + tools/perf/pmu-events/arch/x86/skylake/cache.json | 17 +- + .../arch/x86/skylake/floating-point.json | 15 + + .../perf/pmu-events/arch/x86/skylake/frontend.json | 8 +- + tools/perf/pmu-events/arch/x86/skylake/other.json | 1 + + .../perf/pmu-events/arch/x86/skylake/pipeline.json | 26 + + .../pmu-events/arch/x86/skylake/skl-metrics.json | 1877 +- + .../pmu-events/arch/x86/skylake/uncore-cache.json | 28 +- + .../arch/x86/skylake/uncore-interconnect.json | 67 + + .../pmu-events/arch/x86/skylake/uncore-other.json | 64 - + tools/perf/pmu-events/arch/x86/skylakex/cache.json | 8 +- + .../pmu-events/arch/x86/skylakex/frontend.json | 8 +- + .../pmu-events/arch/x86/skylakex/pipeline.json | 16 + + .../pmu-events/arch/x86/skylakex/skx-metrics.json | 2097 +- + .../pmu-events/arch/x86/skylakex/uncore-cache.json | 10649 ++++++ + .../arch/x86/skylakex/uncore-interconnect.json | 11248 +++++++ + .../pmu-events/arch/x86/skylakex/uncore-io.json | 4250 +++ + .../arch/x86/skylakex/uncore-memory.json | 2 +- + .../pmu-events/arch/x86/skylakex/uncore-other.json | 26135 -------------- + .../pmu-events/arch/x86/skylakex/uncore-power.json | 6 +- + .../arch/x86/snowridgex/uncore-cache.json | 7100 ++++ + .../arch/x86/snowridgex/uncore-interconnect.json | 6016 ++++ + .../pmu-events/arch/x86/snowridgex/uncore-io.json | 8944 +++++ + .../arch/x86/snowridgex/uncore-memory.json | 4 +- + .../arch/x86/snowridgex/uncore-other.json | 22094 ------------ + .../arch/x86/tigerlake/floating-point.json | 31 + + .../pmu-events/arch/x86/tigerlake/pipeline.json | 18 + + .../pmu-events/arch/x86/tigerlake/tgl-metrics.json | 1942 +- + .../arch/x86/tigerlake/uncore-interconnect.json | 90 + + .../arch/x86/tigerlake/uncore-memory.json | 50 + + .../arch/x86/tigerlake/uncore-other.json | 100 - + .../pmu-events/arch/x86/westmereep-dp/cache.json | 2 +- + .../arch/x86/westmereep-dp/virtual-memory.json | 2 +- + tools/perf/pmu-events/empty-pmu-events.c | 6 +- + tools/perf/pmu-events/jevents.py | 61 +- + tools/perf/pmu-events/metric.py | 8 +- + tools/perf/pmu-events/pmu-events.h | 35 +- + tools/perf/scripts/Build | 4 +- + tools/perf/scripts/python/Perf-Trace-Util/Build | 2 +- + .../perf/scripts/python/Perf-Trace-Util/Context.c | 17 +- + tools/perf/scripts/python/intel-pt-events.py | 8 +- + tools/perf/scripts/python/task-analyzer.py | 2 +- + tools/perf/tests/api-io.c | 39 +- + tools/perf/tests/attr/base-record | 2 +- + tools/perf/tests/attr/base-stat | 2 +- + tools/perf/tests/attr/system-wide-dummy | 2 +- + tools/perf/tests/bpf.c | 1 - + tools/perf/tests/builtin-test.c | 4 +- + tools/perf/tests/code-reading.c | 76 +- + tools/perf/tests/cpumap.c | 4 +- + tools/perf/tests/expand-cgroup.c | 5 +- + tools/perf/tests/expr.c | 7 +- + tools/perf/tests/hists_common.c | 8 +- + tools/perf/tests/hists_cumulate.c | 14 +- + tools/perf/tests/hists_filter.c | 14 +- + tools/perf/tests/hists_link.c | 22 +- + tools/perf/tests/hists_output.c | 12 +- + tools/perf/tests/make | 28 +- + tools/perf/tests/maps.c | 69 +- + tools/perf/tests/mmap-thread-lookup.c | 3 +- + tools/perf/tests/parse-events.c | 49 +- + tools/perf/tests/parse-metric.c | 23 +- + tools/perf/tests/pfm.c | 12 +- + tools/perf/tests/pmu-events.c | 53 +- + tools/perf/tests/pmu.c | 9 +- + .../perf/tests/shell/lib/perf_json_output_lint.py | 3 +- + tools/perf/tests/shell/record_offcpu.sh | 4 +- + tools/perf/tests/shell/stat+csv_output.sh | 58 +- + tools/perf/tests/shell/stat+json_output.sh | 48 +- + tools/perf/tests/shell/test_arm_coresight.sh | 24 + + tools/perf/tests/symbols.c | 7 +- + tools/perf/tests/thread-maps-share.c | 28 +- + tools/perf/tests/vmlinux-kallsyms.c | 54 +- + tools/perf/ui/browsers/annotate.c | 9 +- + tools/perf/ui/browsers/hists.c | 22 +- + tools/perf/ui/browsers/map.c | 4 +- + tools/perf/ui/gtk/annotate.c | 11 +- + tools/perf/ui/gtk/browser.c | 2 +- + tools/perf/ui/gtk/gtk.h | 2 + + tools/perf/ui/gtk/helpline.c | 2 +- + tools/perf/ui/gtk/hists.c | 2 +- + tools/perf/ui/hist.c | 2 +- + tools/perf/ui/setup.c | 19 + + tools/perf/ui/tui/setup.c | 1 - + tools/perf/ui/ui.h | 3 + + tools/perf/util/Build | 19 +- + tools/perf/util/amd-sample-raw.c | 14 +- + tools/perf/util/annotate.c | 85 +- + tools/perf/util/annotate.h | 9 +- + tools/perf/util/arm-spe-decoder/arm-spe-decoder.c | 30 +- + tools/perf/util/arm-spe-decoder/arm-spe-decoder.h | 47 +- + .../util/arm-spe-decoder/arm-spe-pkt-decoder.c | 9 + + .../util/arm-spe-decoder/arm-spe-pkt-decoder.h | 3 + + tools/perf/util/arm-spe.c | 28 +- + tools/perf/util/auxtrace.c | 7 +- + tools/perf/util/block-info.c | 4 +- + tools/perf/util/block-range.c | 6 +- + tools/perf/util/bpf-event.c | 76 +- + tools/perf/util/bpf-filter.c | 197 + + tools/perf/util/bpf-filter.h | 49 + + tools/perf/util/bpf-filter.l | 159 + + tools/perf/util/bpf-filter.y | 78 + + tools/perf/util/bpf-loader.c | 18 - + tools/perf/util/bpf_counter.c | 28 +- + tools/perf/util/bpf_lock_contention.c | 54 +- + tools/perf/util/bpf_skel/.gitignore | 3 +- + tools/perf/util/bpf_skel/lock_contention.bpf.c | 136 +- + tools/perf/util/bpf_skel/lock_data.h | 17 + + tools/perf/util/bpf_skel/sample-filter.h | 27 + + tools/perf/util/bpf_skel/sample_filter.bpf.c | 196 + + tools/perf/util/build-id.c | 2 +- + tools/perf/util/callchain.c | 28 +- + tools/perf/util/cloexec.c | 13 - + tools/perf/util/cpumap.c | 43 +- + tools/perf/util/cpumap.h | 3 + + tools/perf/util/cputopo.c | 14 + + tools/perf/util/cputopo.h | 5 + + tools/perf/util/cs-etm-base.c | 3 +- + tools/perf/util/cs-etm-decoder/cs-etm-decoder.c | 7 + + tools/perf/util/cs-etm-decoder/cs-etm-decoder.h | 8 +- + tools/perf/util/cs-etm.c | 546 +- + tools/perf/util/cs-etm.h | 20 +- + tools/perf/util/data-convert-json.c | 10 +- + tools/perf/util/db-export.c | 16 +- + tools/perf/util/demangle-cxx.cpp | 49 + + tools/perf/util/demangle-cxx.h | 16 + + tools/perf/util/dlfilter.c | 28 +- + tools/perf/util/dso.c | 13 +- + tools/perf/util/dso.h | 2 + + tools/perf/util/dsos.c | 3 +- + tools/perf/util/env.c | 2 +- + tools/perf/util/event.c | 29 +- + tools/perf/util/event.h | 3 +- + tools/perf/util/evlist.c | 42 +- + tools/perf/util/evlist.h | 8 +- + tools/perf/util/evsel.c | 46 +- + tools/perf/util/evsel.h | 21 +- + tools/perf/util/evsel_fprintf.c | 4 +- + tools/perf/util/expr.c | 49 +- + tools/perf/util/expr.y | 12 +- + tools/perf/util/ftrace.h | 1 - + tools/perf/util/genelf_debug.c | 46 +- + tools/perf/util/header.c | 3 +- + tools/perf/util/header.h | 2 + + tools/perf/util/hist.c | 49 +- + tools/perf/util/hist.h | 4 + + .../perf/util/intel-pt-decoder/intel-pt-decoder.c | 8 +- + .../util/intel-pt-decoder/intel-pt-insn-decoder.c | 18 + + .../util/intel-pt-decoder/intel-pt-insn-decoder.h | 2 + + .../util/intel-pt-decoder/intel-pt-pkt-decoder.c | 2 +- + tools/perf/util/intel-pt.c | 63 +- + tools/perf/util/jitdump.c | 7 +- + tools/perf/util/kvm-stat.h | 73 +- + tools/perf/util/lock-contention.h | 10 +- + tools/perf/util/machine.c | 257 +- + tools/perf/util/map.c | 219 +- + tools/perf/util/map.h | 144 +- + tools/perf/util/maps.c | 317 +- + tools/perf/util/maps.h | 72 +- + tools/perf/util/mem-events.c | 90 +- + tools/perf/util/metricgroup.c | 199 +- + tools/perf/util/metricgroup.h | 5 +- + tools/perf/util/namespaces.c | 141 +- + tools/perf/util/namespaces.h | 3 +- + tools/perf/util/ordered-events.c | 2 +- + tools/perf/util/parse-events.c | 295 +- + tools/perf/util/parse-events.h | 15 +- + tools/perf/util/parse-events.l | 1 + + tools/perf/util/parse-events.y | 28 +- + tools/perf/util/pfm.c | 1 - + tools/perf/util/pmu.c | 461 +- + tools/perf/util/pmu.h | 23 +- + tools/perf/util/pmu.l | 17 +- + tools/perf/util/pmu.y | 5 +- + tools/perf/util/print-events.c | 38 +- + tools/perf/util/print-events.h | 1 + + tools/perf/util/probe-event.c | 62 +- + tools/perf/util/probe-finder.c | 2 +- + tools/perf/util/python.c | 21 +- + tools/perf/util/record.h | 1 - + tools/perf/util/sample.h | 13 + + tools/perf/util/scripting-engines/Build | 2 +- + .../perf/util/scripting-engines/trace-event-perl.c | 10 +- + .../util/scripting-engines/trace-event-python.c | 101 +- + tools/perf/util/session.c | 5 +- + tools/perf/util/smt.c | 11 +- + tools/perf/util/smt.h | 12 +- + tools/perf/util/sort.c | 126 +- + tools/perf/util/sort.h | 3 + + tools/perf/util/srcline.c | 183 +- + tools/perf/util/stat-display.c | 117 +- + tools/perf/util/stat-shadow.c | 1287 +- + tools/perf/util/stat.c | 74 - + tools/perf/util/stat.h | 96 +- + tools/perf/util/strfilter.c | 2 +- + tools/perf/util/string.c | 2 +- + tools/perf/util/symbol-elf.c | 92 +- + tools/perf/util/symbol.c | 314 +- + tools/perf/util/symbol_conf.h | 2 +- + tools/perf/util/symbol_fprintf.c | 2 +- + tools/perf/util/synthetic-events.c | 36 +- + tools/perf/util/thread-stack.c | 4 +- + tools/perf/util/thread.c | 69 +- + tools/perf/util/top.c | 2 +- + tools/perf/util/topdown.c | 68 +- + tools/perf/util/topdown.h | 11 +- + tools/perf/util/trace-event-scripting.c | 9 +- + tools/perf/util/unwind-libdw.c | 20 +- + tools/perf/util/unwind-libunwind-local.c | 68 +- + tools/perf/util/unwind-libunwind.c | 37 +- + tools/perf/util/usage.c | 6 + + tools/perf/util/util.c | 21 +- + tools/perf/util/util.h | 8 + + tools/perf/util/vdso.c | 7 +- + .../drivers/net/dsa/test_bridge_fdb_stress.sh | 2 +- + 509 files changed, 169204 insertions(+), 146267 deletions(-) + create mode 100644 tools/build/feature/test-cxa-demangle.cpp + delete mode 100644 tools/build/feature/test-libbpf-bpf_map_create.c + delete mode 100644 tools/build/feature/test-libbpf-bpf_object__next_map.c + delete mode 100644 tools/build/feature/test-libbpf-bpf_object__next_program.c + delete mode 100644 tools/build/feature/test-libbpf-bpf_prog_load.c + delete mode 100644 tools/build/feature/test-libbpf-bpf_program__set_insns.c + delete mode 100644 tools/build/feature/test-libbpf-btf__load_from_kernel_by_id.c + delete mode 100644 tools/build/feature/test-libbpf-btf__raw_data.c + create mode 100644 tools/build/feature/test-scandirat.c + create mode 100644 tools/lib/perf/include/internal/rc_check.h + create mode 100644 tools/perf/arch/s390/util/pmu.c + create mode 100644 tools/perf/bench/pmu-scan.c + rename tools/perf/pmu-events/arch/arm64/arm/{cortex-a76-n1 => cortex-a76}/branch.json (100%) + rename tools/perf/pmu-events/arch/arm64/arm/{cortex-a76-n1 => cortex-a76}/bus.json (100%) + rename tools/perf/pmu-events/arch/arm64/arm/{cortex-a76-n1 => cortex-a76}/cache.json (100%) + rename tools/perf/pmu-events/arch/arm64/arm/{cortex-a76-n1 => cortex-a76}/exception.json (100%) + rename tools/perf/pmu-events/arch/arm64/arm/{cortex-a76-n1 => cortex-a76}/instruction.json (100%) + rename tools/perf/pmu-events/arch/arm64/arm/{cortex-a76-n1 => cortex-a76}/memory.json (100%) + rename tools/perf/pmu-events/arch/arm64/arm/{cortex-a76-n1 => cortex-a76}/pipeline.json (100%) + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n1/bus.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n1/exception.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n1/general.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n1/l1d_cache.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n1/l1i_cache.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n1/l2_cache.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n1/l3_cache.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n1/ll_cache.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n1/memory.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n1/metrics.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n1/retired.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n1/spe.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n1/spec_operation.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n1/stall.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n1/tlb.json + create mode 100644 tools/perf/pmu-events/arch/s390/cf_z16/pai_ext.json + create mode 100644 tools/perf/pmu-events/arch/x86/alderlake/uncore-interconnect.json + create mode 100644 tools/perf/pmu-events/arch/x86/alderlaken/uncore-interconnect.json + create mode 100644 tools/perf/pmu-events/arch/x86/broadwell/uncore-interconnect.json + create mode 100644 tools/perf/pmu-events/arch/x86/broadwellde/uncore-interconnect.json + rename tools/perf/pmu-events/arch/x86/broadwellde/{uncore-other.json => uncore-io.json} (54%) + create mode 100644 tools/perf/pmu-events/arch/x86/broadwellx/uncore-io.json + delete mode 100644 tools/perf/pmu-events/arch/x86/broadwellx/uncore-other.json + create mode 100644 tools/perf/pmu-events/arch/x86/cascadelakex/uncore-cache.json + create mode 100644 tools/perf/pmu-events/arch/x86/cascadelakex/uncore-interconnect.json + create mode 100644 tools/perf/pmu-events/arch/x86/cascadelakex/uncore-io.json + delete mode 100644 tools/perf/pmu-events/arch/x86/cascadelakex/uncore-other.json + create mode 100644 tools/perf/pmu-events/arch/x86/grandridge/cache.json + create mode 100644 tools/perf/pmu-events/arch/x86/grandridge/frontend.json + create mode 100644 tools/perf/pmu-events/arch/x86/grandridge/memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/grandridge/other.json + create mode 100644 tools/perf/pmu-events/arch/x86/grandridge/pipeline.json + create mode 100644 tools/perf/pmu-events/arch/x86/grandridge/virtual-memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/graniterapids/cache.json + create mode 100644 tools/perf/pmu-events/arch/x86/graniterapids/frontend.json + create mode 100644 tools/perf/pmu-events/arch/x86/graniterapids/memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/graniterapids/other.json + create mode 100644 tools/perf/pmu-events/arch/x86/graniterapids/pipeline.json + create mode 100644 tools/perf/pmu-events/arch/x86/graniterapids/virtual-memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/haswell/uncore-interconnect.json + create mode 100644 tools/perf/pmu-events/arch/x86/haswellx/uncore-io.json + delete mode 100644 tools/perf/pmu-events/arch/x86/haswellx/uncore-other.json + create mode 100644 tools/perf/pmu-events/arch/x86/icelake/uncore-interconnect.json + create mode 100644 tools/perf/pmu-events/arch/x86/icelakex/uncore-cache.json + create mode 100644 tools/perf/pmu-events/arch/x86/icelakex/uncore-interconnect.json + create mode 100644 tools/perf/pmu-events/arch/x86/icelakex/uncore-io.json + delete mode 100644 tools/perf/pmu-events/arch/x86/icelakex/uncore-other.json + rename tools/perf/pmu-events/arch/x86/ivybridge/{uncore-other.json => uncore-interconnect.json} (100%) + create mode 100644 tools/perf/pmu-events/arch/x86/ivytown/uncore-io.json + delete mode 100644 tools/perf/pmu-events/arch/x86/ivytown/uncore-other.json + create mode 100644 tools/perf/pmu-events/arch/x86/jaketown/uncore-io.json + delete mode 100644 tools/perf/pmu-events/arch/x86/jaketown/uncore-other.json + rename tools/perf/pmu-events/arch/x86/knightslanding/{uncore-other.json => uncore-cache.json} (90%) + create mode 100644 tools/perf/pmu-events/arch/x86/knightslanding/uncore-io.json + create mode 100644 tools/perf/pmu-events/arch/x86/knightslanding/uncore-memory.json + rename tools/perf/pmu-events/arch/x86/sandybridge/{uncore-other.json => uncore-interconnect.json} (100%) + create mode 100644 tools/perf/pmu-events/arch/x86/sapphirerapids/uncore-cache.json + create mode 100644 tools/perf/pmu-events/arch/x86/sapphirerapids/uncore-cxl.json + create mode 100644 tools/perf/pmu-events/arch/x86/sapphirerapids/uncore-interconnect.json + create mode 100644 tools/perf/pmu-events/arch/x86/sapphirerapids/uncore-io.json + delete mode 100644 tools/perf/pmu-events/arch/x86/sapphirerapids/uncore-other.json + create mode 100644 tools/perf/pmu-events/arch/x86/sierraforest/cache.json + create mode 100644 tools/perf/pmu-events/arch/x86/sierraforest/frontend.json + create mode 100644 tools/perf/pmu-events/arch/x86/sierraforest/memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/sierraforest/other.json + create mode 100644 tools/perf/pmu-events/arch/x86/sierraforest/pipeline.json + create mode 100644 tools/perf/pmu-events/arch/x86/sierraforest/virtual-memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/skylake/uncore-interconnect.json + create mode 100644 tools/perf/pmu-events/arch/x86/skylakex/uncore-cache.json + create mode 100644 tools/perf/pmu-events/arch/x86/skylakex/uncore-interconnect.json + create mode 100644 tools/perf/pmu-events/arch/x86/skylakex/uncore-io.json + delete mode 100644 tools/perf/pmu-events/arch/x86/skylakex/uncore-other.json + create mode 100644 tools/perf/pmu-events/arch/x86/snowridgex/uncore-cache.json + create mode 100644 tools/perf/pmu-events/arch/x86/snowridgex/uncore-interconnect.json + create mode 100644 tools/perf/pmu-events/arch/x86/snowridgex/uncore-io.json + delete mode 100644 tools/perf/pmu-events/arch/x86/snowridgex/uncore-other.json + create mode 100644 tools/perf/pmu-events/arch/x86/tigerlake/uncore-interconnect.json + create mode 100644 tools/perf/pmu-events/arch/x86/tigerlake/uncore-memory.json + create mode 100644 tools/perf/util/bpf-filter.c + create mode 100644 tools/perf/util/bpf-filter.h + create mode 100644 tools/perf/util/bpf-filter.l + create mode 100644 tools/perf/util/bpf-filter.y + create mode 100644 tools/perf/util/bpf_skel/sample-filter.h + create mode 100644 tools/perf/util/bpf_skel/sample_filter.bpf.c + create mode 100644 tools/perf/util/demangle-cxx.cpp + create mode 100644 tools/perf/util/demangle-cxx.h +Merging compiler-attributes/compiler-attributes (eeac8ede17557 Linux 6.3-rc2) +$ 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/for-next (ec274aff21b6a swiotlb: Omit total_used and used_hiwater if !CONFIG_DEBUG_FS) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping/for-next +Auto-merging kernel/dma/swiotlb.c +Auto-merging arch/riscv/Kconfig +Auto-merging arch/powerpc/Kconfig +Merge made by the 'recursive' strategy. + arch/powerpc/Kconfig | 2 +- + arch/riscv/Kconfig | 2 +- + drivers/of/Kconfig | 4 -- + drivers/of/address.c | 2 +- + include/linux/dma-map-ops.h | 2 + + include/linux/swiotlb.h | 9 +++ + kernel/dma/Kconfig | 7 +++ + kernel/dma/debug.c | 131 +++++++++++++++++++++++--------------------- + kernel/dma/direct.c | 15 +++-- + kernel/dma/mapping.c | 6 +- + kernel/dma/swiotlb.c | 97 ++++++++++++++++++++++++++++---- + 11 files changed, 189 insertions(+), 88 deletions(-) +Merging asm-generic/master (5e98654e30e18 Merge branch 'asm-generic-fixes' into asm-generic) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git asm-generic/master +Already up to date! +Merge made by the 'recursive' strategy. +Merging arc/for-next (f2906aa863381 Linux 5.19-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc/for-next +Already up to date. +Merging arm/for-next (60261442c1b91 Merge branches 'misc' and 'fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm/for-next +Already up to date. +Merging arm64/for-next/core (4e8f6e44bce8d arm64: Fix label placement in record_mmu_state()) +$ git merge -m Merge branch 'for-next/core' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64/for-next/core +Merge made by the 'recursive' strategy. + arch/arm64/kernel/head.S | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging arm-perf/for-next/perf (257aedb72e731 drivers/perf: hisi: add NULL check for name) +$ 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 +Already up to date. +Merging arm-soc/for-next (8ecfe9a0e657e soc: document merges) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next +Merge made by the 'recursive' strategy. + arch/arm/arm-soc-for-next-contents.txt | 217 +++++++++++++++++++++++++++++++++ + 1 file changed, 217 insertions(+) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt +Merging amlogic/for-next (ae68fb187b59b Merge branch 'v6.4/drivers' 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 +Already up to date! +Merge made by the 'recursive' strategy. +Merging asahi-soc/asahi-soc/for-next (f41aba1578192 Merge branch 'asahi-soc/dt' 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 +Already up to date! +Merge made by the 'recursive' strategy. +Merging aspeed/for-next (7d4f0b0df7c5e ARM: dts: aspeed-g6: Add UDMA node) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git aspeed/for-next +Already up to date. +Merging at91/at91-next (ad5125686a4f1 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 'recursive' strategy. + drivers/clk/microchip/Kconfig | 4 ++-- + drivers/clk/microchip/clk-pic32mzda.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) +Merging broadcom/next (89ec1caa5e4a1 Merge branch 'soc/next' into next) +$ git merge -m Merge branch 'next' of https://github.com/Broadcom/stblinux.git broadcom/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging davinci/davinci/for-next (fe15c26ee26ef Linux 6.3-rc1) +$ git merge -m Merge branch 'davinci/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git davinci/davinci/for-next +Already up to date. +Merging drivers-memory/for-next (3ec0e1ea4770e memory: mtk-smi: mt8365: Add SMI Support) +$ 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 +Already up to date. +Merging imx-mxs/for-next (159d28f666990 Merge branch 'imx/defconfig' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git imx-mxs/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging mediatek/for-next (e586dd4471725 Merge branch 'v6.3-next/soc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git mediatek/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (12845aa04754a Merge branch 'mvebu/dt' into mvebu/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git mvebu/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging omap/for-next (c45167f4f5cfd Merge branch 'omap-for-v6.4/dt' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging qcom/for-next (8358703a007ea Merge branches 'arm64-defconfig-for-6.4', 'arm64-fixes-for-6.3', 'arm64-for-6.4', 'clk-for-6.4', 'drivers-fixes-for-6.3', 'drivers-for-6.4', 'dts-fixes-for-6.3' and 'dts-for-6.4' 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 +Removing Documentation/devicetree/bindings/arm/msm/qcom,kpss-gcc.txt +Removing Documentation/devicetree/bindings/arm/msm/qcom,kpss-acc.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/msm/qcom,kpss-acc.txt | 49 - + .../devicetree/bindings/arm/msm/qcom,kpss-gcc.txt | 44 - + .../devicetree/bindings/clock/qcom,a53pll.yaml | 1 + + .../bindings/clock/qcom,gcc-ipq4019.yaml | 53 + + .../bindings/clock/qcom,gcc-msm8909.yaml | 13 +- + .../devicetree/bindings/clock/qcom,gcc-other.yaml | 2 - + .../devicetree/bindings/clock/qcom,gpucc.yaml | 2 + + .../bindings/clock/qcom,kpss-acc-v1.yaml | 72 + + .../devicetree/bindings/clock/qcom,kpss-gcc.yaml | 88 + + .../devicetree/bindings/clock/qcom,rpmcc.yaml | 2 + + .../bindings/clock/qcom,sc7280-lpasscc.yaml | 7 + + .../devicetree/bindings/clock/qcom,sm7150-gcc.yaml | 52 + + .../bindings/mailbox/qcom,apcs-kpss-global.yaml | 9 +- + .../bindings/power/qcom,kpss-acc-v2.yaml | 42 + + drivers/clk/qcom/Kconfig | 70 + + drivers/clk/qcom/Makefile | 8 + + drivers/clk/qcom/apcs-msm8916.c | 6 +- + drivers/clk/qcom/apcs-sdx55.c | 6 +- + drivers/clk/qcom/apss-ipq-pll.c | 116 +- + drivers/clk/qcom/clk-alpha-pll.c | 139 +- + drivers/clk/qcom/clk-alpha-pll.h | 14 +- + drivers/clk/qcom/clk-branch.c | 15 +- + drivers/clk/qcom/clk-branch.h | 44 + + drivers/clk/qcom/clk-hfpll.c | 14 +- + drivers/clk/qcom/clk-krait.c | 10 +- + drivers/clk/qcom/clk-rpm.c | 11 +- + drivers/clk/qcom/clk-smd-rpm.c | 37 + + drivers/clk/qcom/dispcc-qcm2290.c | 10 +- + drivers/clk/qcom/gcc-ipq4019.c | 1665 ++++---- + drivers/clk/qcom/gcc-ipq5332.c | 3824 ++++++++++++++++++ + drivers/clk/qcom/gcc-ipq9574.c | 4248 ++++++++++++++++++++ + drivers/clk/qcom/gcc-msm8917.c | 3303 +++++++++++++++ + drivers/clk/qcom/gcc-msm8960.c | 6 +- + drivers/clk/qcom/gcc-msm8996.c | 3 +- + drivers/clk/qcom/gcc-msm8998.c | 3 +- + drivers/clk/qcom/gcc-qcm2290.c | 3 +- + drivers/clk/qcom/gcc-sm6115.c | 50 +- + drivers/clk/qcom/gcc-sm6375.c | 3 +- + drivers/clk/qcom/gcc-sm7150.c | 3048 ++++++++++++++ + drivers/clk/qcom/gcc-sm8350.c | 47 +- + drivers/clk/qcom/gpucc-sa8775p.c | 625 +++ + drivers/clk/qcom/gpucc-sm6115.c | 503 +++ + drivers/clk/qcom/gpucc-sm6125.c | 424 ++ + drivers/clk/qcom/gpucc-sm6375.c | 458 +++ + drivers/clk/qcom/lpassaudiocc-sc7280.c | 2 + + drivers/clk/qcom/lpasscc-sc7280.c | 16 +- + include/dt-bindings/clock/qcom,dispcc-qcm2290.h | 4 + + include/dt-bindings/clock/qcom,gcc-msm8917.h | 190 + + include/dt-bindings/clock/qcom,sa8775p-gpucc.h | 50 + + include/dt-bindings/clock/qcom,sm7150-gcc.h | 186 + + 50 files changed, 18515 insertions(+), 1082 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/arm/msm/qcom,kpss-acc.txt + delete mode 100644 Documentation/devicetree/bindings/arm/msm/qcom,kpss-gcc.txt + create mode 100644 Documentation/devicetree/bindings/clock/qcom,gcc-ipq4019.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,kpss-acc-v1.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,kpss-gcc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,sm7150-gcc.yaml + create mode 100644 Documentation/devicetree/bindings/power/qcom,kpss-acc-v2.yaml + create mode 100644 drivers/clk/qcom/gcc-ipq5332.c + create mode 100644 drivers/clk/qcom/gcc-ipq9574.c + create mode 100644 drivers/clk/qcom/gcc-msm8917.c + create mode 100644 drivers/clk/qcom/gcc-sm7150.c + create mode 100644 drivers/clk/qcom/gpucc-sa8775p.c + create mode 100644 drivers/clk/qcom/gpucc-sm6115.c + create mode 100644 drivers/clk/qcom/gpucc-sm6125.c + create mode 100644 drivers/clk/qcom/gpucc-sm6375.c + create mode 100644 include/dt-bindings/clock/qcom,gcc-msm8917.h + create mode 100644 include/dt-bindings/clock/qcom,sa8775p-gpucc.h + create mode 100644 include/dt-bindings/clock/qcom,sm7150-gcc.h +Merging renesas/next (6f03a6e4e947d Merge branches 'renesas-drivers-for-v6.4' and 'renesas-dts-for-v6.4' 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 +Already up to date! +Merge made by the 'recursive' strategy. +Merging reset/reset/next (1b929c02afd37 Linux 6.2-rc1) +$ git merge -m Merge branch 'reset/next' of https://git.pengutronix.de/git/pza/linux reset/reset/next +Already up to date. +Merging rockchip/for-next (fcda20d5c0d00 Merge branch 'v6.4-clk/next' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git rockchip/for-next +Merge made by the 'recursive' strategy. + drivers/clk/rockchip/clk-rk3399.c | 2 +- + drivers/clk/rockchip/clk-rk3588.c | 42 ++++++++++++++++++++++++--------------- + 2 files changed, 27 insertions(+), 17 deletions(-) +Merging samsung-krzk/for-next (f5391a4705ef3 Merge branch 'next/dt' 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 +Merge made by the 'recursive' strategy. + drivers/clk/samsung/clk-exynos-arm64.c | 229 ++++++++++++++++++++++++++++--- + drivers/clk/samsung/clk-exynos-arm64.h | 3 + + drivers/clk/samsung/clk-exynos-audss.c | 6 +- + drivers/clk/samsung/clk-exynos-clkout.c | 6 +- + drivers/clk/samsung/clk-exynos4.c | 6 +- + drivers/clk/samsung/clk-exynos4412-isp.c | 3 +- + drivers/clk/samsung/clk-exynos5250.c | 5 +- + drivers/clk/samsung/clk-exynos5420.c | 5 +- + drivers/clk/samsung/clk-exynos5433.c | 157 +-------------------- + drivers/clk/samsung/clk-exynos850.c | 141 ++++++++++++++++++- + drivers/clk/samsung/clk-pll.c | 12 +- + drivers/clk/samsung/clk-pll.h | 1 + + drivers/clk/samsung/clk-s3c64xx.c | 4 +- + drivers/clk/samsung/clk-s5pv210.c | 6 +- + drivers/clk/samsung/clk.c | 64 ++++++--- + drivers/clk/samsung/clk.h | 10 +- + 16 files changed, 431 insertions(+), 227 deletions(-) +Merging scmi/for-linux-next (ed0a3b4a31ee6 Merge branch 'for-next/juno/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) +$ git merge -m Merge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git scmi/for-linux-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/vexpress-v2p-ca5s.dts | 1 + + arch/arm64/boot/dts/arm/foundation-v8.dtsi | 1 + + arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts | 1 + + .../boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts | 1 + + arch/arm64/kernel/cacheinfo.c | 25 ++++- + drivers/base/arch_topology.c | 11 +- + drivers/base/cacheinfo.c | 124 ++++++++++++++++----- + drivers/firmware/arm_ffa/bus.c | 19 +++- + drivers/firmware/arm_ffa/driver.c | 3 +- + drivers/firmware/arm_scmi/raw_mode.c | 2 +- + include/linux/arm_ffa.h | 1 + + include/linux/cacheinfo.h | 8 ++ + 12 files changed, 156 insertions(+), 41 deletions(-) +Merging stm32/stm32-next (49f1d0b65f876 ARM: stm32: add initial documentation for STM32MP151) +$ git merge -m Merge branch 'stm32-next' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next +Already up to date. +Merging sunxi/sunxi/for-next (7081db38231a4 Merge branch 'sunxi/dt-for-6.4' 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 +Already up to date! +Merge made by the 'recursive' strategy. +Merging tee/next (cf1773f935d8f Merge branch 'optee_load-for-v6.4' into next) +$ git merge -m Merge branch 'next' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging tegra/for-next (7947eeb21f005 Merge branch for-6.4/arm64/defconfig 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 +Already up to date! +Merge made by the 'recursive' strategy. +Merging ti/ti-next (a8fccb83f3e25 Merge branches 'ti-drivers-soc-next', 'ti-k3-config-next' and 'ti-k3-dts-next' into ti-next) +$ git merge -m Merge branch 'ti-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git ti/ti-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging xilinx/for-next (ec1696c3440f1 Merge remote-tracking branch 'zynqmp/soc' 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 'recursive' strategy. + Documentation/devicetree/bindings/gpu/arm,mali-utgard.yaml | 1 + + arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi | 4 ++++ + arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts | 4 ++++ + arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts | 3 +++ + arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm018-dc4.dts | 4 ++++ + arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts | 4 ++++ + arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts | 4 ++++ + arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts | 4 ++++ + arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts | 4 ++++ + arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts | 4 ++++ + arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts | 4 ++++ + arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 12 ++++++++++++ + drivers/soc/xilinx/zynqmp_power.c | 4 ++-- + 13 files changed, 54 insertions(+), 2 deletions(-) +Merging clk/clk-next (a9863979fbc25 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 +Auto-merging include/linux/clk-provider.h +Removing drivers/reset/reset-starfive-jh7100.c +Removing drivers/clk/starfive/clk-starfive-jh7100.h +Auto-merging drivers/clk/sprd/common.c +Removing drivers/clk/loongson1/clk.h +Removing drivers/clk/loongson1/clk.c +Removing drivers/clk/loongson1/clk-loongson1c.c +Removing drivers/clk/loongson1/clk-loongson1b.c +Removing drivers/clk/loongson1/Makefile +Auto-merging drivers/clk/hisilicon/clk-hi3559a.c +Auto-merging drivers/clk/clk-renesas-pcie.c +Auto-merging drivers/clk/clk-fixed-mmio.c +Auto-merging drivers/clk/Kconfig +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Resolved 'MAINTAINERS' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 3c7068f104645] Merge branch 'clk-next' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/clock/brcm,bcm63268-timer-clocks.yaml | 40 + + .../devicetree/bindings/clock/imx8mp-audiomix.yaml | 79 ++ + .../bindings/clock/loongson,ls1x-clk.yaml | 45 + + .../bindings/clock/mediatek,mt8186-fhctl.yaml | 7 +- + .../bindings/clock/mediatek,mt8188-clock.yaml | 71 + + .../bindings/clock/mediatek,mt8188-sys-clock.yaml | 55 + + .../devicetree/bindings/clock/renesas,9series.yaml | 6 + + .../bindings/clock/skyworks,si521xx.yaml | 59 + + MAINTAINERS | 25 +- + arch/mips/include/asm/mach-loongson32/platform.h | 1 - + arch/mips/loongson32/common/time.c | 3 +- + drivers/clk/Kconfig | 28 + + drivers/clk/Makefile | 7 +- + drivers/clk/at91/clk-sam9x60-pll.c | 2 +- + drivers/clk/axs10x/i2s_pll_clock.c | 5 +- + drivers/clk/axs10x/pll_clock.c | 11 +- + drivers/clk/bcm/Kconfig | 9 + + drivers/clk/bcm/Makefile | 1 + + drivers/clk/bcm/clk-bcm2711-dvp.c | 6 +- + drivers/clk/bcm/clk-bcm63268-timer.c | 216 ++++ + drivers/clk/bcm/clk-bcm63xx-gate.c | 6 +- + drivers/clk/bcm/clk-raspberrypi.c | 6 +- + drivers/clk/clk-ast2600.c | 67 +- + drivers/clk/clk-axi-clkgen.c | 12 +- + drivers/clk/clk-axm5516.c | 9 +- + drivers/clk/clk-cdce706.c | 11 +- + drivers/clk/clk-conf.c | 12 +- + drivers/clk/clk-fixed-factor.c | 6 +- + drivers/clk/clk-fixed-mmio.c | 6 +- + drivers/clk/clk-fixed-rate.c | 6 +- + drivers/clk/clk-fractional-divider.c | 16 +- + drivers/clk/clk-hsdk-pll.c | 11 +- + drivers/clk/clk-lmk04832.c | 5 +- + drivers/clk/clk-loongson1.c | 303 +++++ + drivers/clk/clk-loongson2.c | 341 +++++ + drivers/clk/clk-milbeaut.c | 4 +- + drivers/clk/clk-palmas.c | 5 +- + drivers/clk/clk-pwm.c | 6 +- + drivers/clk/clk-renesas-pcie.c | 70 +- + drivers/clk/clk-s2mps11.c | 6 +- + drivers/clk/clk-scpi.c | 5 +- + drivers/clk/clk-si514.c | 10 +- + drivers/clk/clk-si521xx.c | 395 ++++++ + drivers/clk/clk-si5351.c | 10 +- + drivers/clk/clk-si570.c | 14 +- + drivers/clk/clk-sp7021.c | 713 +++++++++++ + drivers/clk/clk-stm32h7.c | 1 - + drivers/clk/clk-stm32mp1.c | 6 +- + drivers/clk/clk.c | 10 +- + drivers/clk/hisilicon/clk-hi3519.c | 5 +- + drivers/clk/hisilicon/clk-hi3559a.c | 5 +- + drivers/clk/hisilicon/crg-hi3516cv300.c | 5 +- + drivers/clk/hisilicon/crg-hi3798cv200.c | 5 +- + drivers/clk/imx/Makefile | 2 +- + drivers/clk/imx/clk-composite-7ulp.c | 4 - + drivers/clk/imx/clk-composite-8m.c | 7 + + drivers/clk/imx/clk-composite-93.c | 8 +- + drivers/clk/imx/clk-fracn-gppll.c | 91 +- + drivers/clk/imx/clk-gpr-mux.c | 3 +- + drivers/clk/imx/clk-imx8mm.c | 2 +- + drivers/clk/imx/clk-imx8mn.c | 2 +- + drivers/clk/imx/clk-imx8mp-audiomix.c | 277 ++++ + drivers/clk/imx/clk-imx8mp.c | 5 +- + drivers/clk/imx/clk-imx8ulp.c | 34 +- + drivers/clk/imx/clk-imx93.c | 19 +- + drivers/clk/imx/clk.h | 23 +- + drivers/clk/keystone/sci-clk.c | 6 +- + drivers/clk/loongson1/Makefile | 4 - + drivers/clk/loongson1/clk-loongson1b.c | 118 -- + drivers/clk/loongson1/clk-loongson1c.c | 95 -- + drivers/clk/loongson1/clk.c | 41 - + drivers/clk/loongson1/clk.h | 15 - + drivers/clk/mediatek/Kconfig | 399 +++++- + drivers/clk/mediatek/Makefile | 68 +- + drivers/clk/mediatek/clk-fhctl.c | 26 +- + drivers/clk/mediatek/clk-fhctl.h | 9 +- + drivers/clk/mediatek/clk-mt2701-aud.c | 45 +- + drivers/clk/mediatek/clk-mt2701-bdp.c | 25 +- + drivers/clk/mediatek/clk-mt2701-eth.c | 15 +- + drivers/clk/mediatek/clk-mt2701-g3d.c | 15 +- + drivers/clk/mediatek/clk-mt2701-hif.c | 15 +- + drivers/clk/mediatek/clk-mt2701-img.c | 15 +- + drivers/clk/mediatek/clk-mt2701-mm.c | 56 +- + drivers/clk/mediatek/clk-mt2701-vdec.c | 25 +- + drivers/clk/mediatek/clk-mt2701.c | 44 +- + drivers/clk/mediatek/clk-mt2712-apmixedsys.c | 168 +++ + drivers/clk/mediatek/clk-mt2712-bdp.c | 15 +- + drivers/clk/mediatek/clk-mt2712-img.c | 15 +- + drivers/clk/mediatek/clk-mt2712-jpgdec.c | 15 +- + drivers/clk/mediatek/clk-mt2712-mfg.c | 15 +- + drivers/clk/mediatek/clk-mt2712-mm.c | 66 +- + drivers/clk/mediatek/clk-mt2712-vdec.c | 25 +- + drivers/clk/mediatek/clk-mt2712-venc.c | 15 +- + drivers/clk/mediatek/clk-mt2712.c | 1010 ++++----------- + drivers/clk/mediatek/clk-mt6765-audio.c | 25 +- + drivers/clk/mediatek/clk-mt6765-cam.c | 15 +- + drivers/clk/mediatek/clk-mt6765-img.c | 15 +- + drivers/clk/mediatek/clk-mt6765-mipi0a.c | 15 +- + drivers/clk/mediatek/clk-mt6765-mm.c | 15 +- + drivers/clk/mediatek/clk-mt6765-vcodec.c | 15 +- + drivers/clk/mediatek/clk-mt6765.c | 82 +- + drivers/clk/mediatek/clk-mt6779-aud.c | 1 + + drivers/clk/mediatek/clk-mt6779-cam.c | 1 + + drivers/clk/mediatek/clk-mt6779-img.c | 1 + + drivers/clk/mediatek/clk-mt6779-ipe.c | 1 + + drivers/clk/mediatek/clk-mt6779-mfg.c | 1 + + drivers/clk/mediatek/clk-mt6779-mm.c | 25 +- + drivers/clk/mediatek/clk-mt6779-vdec.c | 1 + + drivers/clk/mediatek/clk-mt6779-venc.c | 1 + + drivers/clk/mediatek/clk-mt6779.c | 1 + + drivers/clk/mediatek/clk-mt6795-apmixedsys.c | 64 +- + drivers/clk/mediatek/clk-mt6795-infracfg.c | 1 + + drivers/clk/mediatek/clk-mt6795-mfg.c | 1 + + drivers/clk/mediatek/clk-mt6795-mm.c | 56 +- + drivers/clk/mediatek/clk-mt6795-pericfg.c | 1 + + drivers/clk/mediatek/clk-mt6795-topckgen.c | 1 + + drivers/clk/mediatek/clk-mt6795-vdecsys.c | 1 + + drivers/clk/mediatek/clk-mt6795-vencsys.c | 1 + + drivers/clk/mediatek/clk-mt6797-img.c | 15 +- + drivers/clk/mediatek/clk-mt6797-mm.c | 56 +- + drivers/clk/mediatek/clk-mt6797-vdec.c | 25 +- + drivers/clk/mediatek/clk-mt6797-venc.c | 15 +- + drivers/clk/mediatek/clk-mt6797.c | 44 +- + drivers/clk/mediatek/clk-mt7622-apmixedsys.c | 152 +++ + drivers/clk/mediatek/clk-mt7622-aud.c | 45 +- + drivers/clk/mediatek/clk-mt7622-eth.c | 25 +- + drivers/clk/mediatek/clk-mt7622-hif.c | 25 +- + drivers/clk/mediatek/clk-mt7622-infracfg.c | 128 ++ + drivers/clk/mediatek/clk-mt7622.c | 371 +----- + drivers/clk/mediatek/clk-mt7629-eth.c | 22 +- + drivers/clk/mediatek/clk-mt7629-hif.c | 25 +- + drivers/clk/mediatek/clk-mt7629.c | 42 +- + drivers/clk/mediatek/clk-mt7981-apmixed.c | 2 + + drivers/clk/mediatek/clk-mt7981-eth.c | 3 +- + drivers/clk/mediatek/clk-mt7981-infracfg.c | 4 +- + drivers/clk/mediatek/clk-mt7981-topckgen.c | 4 +- + drivers/clk/mediatek/clk-mt7986-apmixed.c | 8 +- + drivers/clk/mediatek/clk-mt7986-eth.c | 112 +- + drivers/clk/mediatek/clk-mt7986-infracfg.c | 90 +- + drivers/clk/mediatek/clk-mt7986-topckgen.c | 4 +- + drivers/clk/mediatek/clk-mt8135-apmixedsys.c | 105 ++ + drivers/clk/mediatek/clk-mt8135.c | 268 ++-- + drivers/clk/mediatek/clk-mt8167-apmixedsys.c | 145 +++ + drivers/clk/mediatek/clk-mt8167-aud.c | 46 +- + drivers/clk/mediatek/clk-mt8167-img.c | 50 +- + drivers/clk/mediatek/clk-mt8167-mfgcfg.c | 50 +- + drivers/clk/mediatek/clk-mt8167-mm.c | 69 +- + drivers/clk/mediatek/clk-mt8167-vdec.c | 57 +- + drivers/clk/mediatek/clk-mt8167.c | 382 ++---- + drivers/clk/mediatek/clk-mt8173-apmixedsys.c | 66 +- + drivers/clk/mediatek/clk-mt8173-img.c | 1 + + drivers/clk/mediatek/clk-mt8173-infracfg.c | 1 + + drivers/clk/mediatek/clk-mt8173-mm.c | 82 +- + drivers/clk/mediatek/clk-mt8173-pericfg.c | 1 + + drivers/clk/mediatek/clk-mt8173-topckgen.c | 1 + + drivers/clk/mediatek/clk-mt8173-vdecsys.c | 1 + + drivers/clk/mediatek/clk-mt8173-vencsys.c | 1 + + drivers/clk/mediatek/clk-mt8183-apmixedsys.c | 195 +++ + drivers/clk/mediatek/clk-mt8183-audio.c | 5 +- + drivers/clk/mediatek/clk-mt8183-cam.c | 5 +- + drivers/clk/mediatek/clk-mt8183-img.c | 5 +- + drivers/clk/mediatek/clk-mt8183-ipu0.c | 5 +- + drivers/clk/mediatek/clk-mt8183-ipu1.c | 5 +- + drivers/clk/mediatek/clk-mt8183-ipu_adl.c | 5 +- + drivers/clk/mediatek/clk-mt8183-ipu_conn.c | 5 +- + drivers/clk/mediatek/clk-mt8183-mfgcfg.c | 5 +- + drivers/clk/mediatek/clk-mt8183-mm.c | 29 +- + drivers/clk/mediatek/clk-mt8183-vdec.c | 5 +- + drivers/clk/mediatek/clk-mt8183-venc.c | 5 +- + drivers/clk/mediatek/clk-mt8183.c | 771 +++-------- + drivers/clk/mediatek/clk-mt8186-apmixedsys.c | 6 +- + drivers/clk/mediatek/clk-mt8186-cam.c | 4 +- + drivers/clk/mediatek/clk-mt8186-img.c | 4 +- + drivers/clk/mediatek/clk-mt8186-imp_iic_wrap.c | 4 +- + drivers/clk/mediatek/clk-mt8186-infra_ao.c | 4 +- + drivers/clk/mediatek/clk-mt8186-ipe.c | 4 +- + drivers/clk/mediatek/clk-mt8186-mcu.c | 69 +- + drivers/clk/mediatek/clk-mt8186-mdp.c | 4 +- + drivers/clk/mediatek/clk-mt8186-mfg.c | 4 +- + drivers/clk/mediatek/clk-mt8186-mm.c | 59 +- + drivers/clk/mediatek/clk-mt8186-topckgen.c | 4 +- + drivers/clk/mediatek/clk-mt8186-vdec.c | 4 +- + drivers/clk/mediatek/clk-mt8186-venc.c | 4 +- + drivers/clk/mediatek/clk-mt8186-wpe.c | 4 +- + drivers/clk/mediatek/clk-mt8188-adsp_audio26m.c | 50 + + drivers/clk/mediatek/clk-mt8188-apmixedsys.c | 157 +++ + drivers/clk/mediatek/clk-mt8188-cam.c | 120 ++ + drivers/clk/mediatek/clk-mt8188-ccu.c | 50 + + drivers/clk/mediatek/clk-mt8188-img.c | 112 ++ + drivers/clk/mediatek/clk-mt8188-imp_iic_wrap.c | 82 ++ + drivers/clk/mediatek/clk-mt8188-infra_ao.c | 199 +++ + drivers/clk/mediatek/clk-mt8188-ipe.c | 52 + + drivers/clk/mediatek/clk-mt8188-mfg.c | 49 + + drivers/clk/mediatek/clk-mt8188-peri_ao.c | 59 + + drivers/clk/mediatek/clk-mt8188-topckgen.c | 1350 ++++++++++++++++++++ + drivers/clk/mediatek/clk-mt8188-vdec.c | 92 ++ + drivers/clk/mediatek/clk-mt8188-vdo0.c | 107 ++ + drivers/clk/mediatek/clk-mt8188-vdo1.c | 154 +++ + drivers/clk/mediatek/clk-mt8188-venc.c | 56 + + drivers/clk/mediatek/clk-mt8188-vpp0.c | 114 ++ + drivers/clk/mediatek/clk-mt8188-vpp1.c | 109 ++ + drivers/clk/mediatek/clk-mt8188-wpe.c | 105 ++ + drivers/clk/mediatek/clk-mt8192-apmixedsys.c | 215 ++++ + drivers/clk/mediatek/clk-mt8192-aud.c | 5 +- + drivers/clk/mediatek/clk-mt8192-cam.c | 5 +- + drivers/clk/mediatek/clk-mt8192-img.c | 5 +- + drivers/clk/mediatek/clk-mt8192-imp_iic_wrap.c | 5 +- + drivers/clk/mediatek/clk-mt8192-ipe.c | 5 +- + drivers/clk/mediatek/clk-mt8192-mdp.c | 5 +- + drivers/clk/mediatek/clk-mt8192-mfg.c | 5 +- + drivers/clk/mediatek/clk-mt8192-mm.c | 34 +- + drivers/clk/mediatek/clk-mt8192-msdc.c | 5 +- + drivers/clk/mediatek/clk-mt8192-scp_adsp.c | 5 +- + drivers/clk/mediatek/clk-mt8192-vdec.c | 5 +- + drivers/clk/mediatek/clk-mt8192-venc.c | 5 +- + drivers/clk/mediatek/clk-mt8192.c | 160 +-- + drivers/clk/mediatek/clk-mt8195-apmixedsys.c | 73 +- + drivers/clk/mediatek/clk-mt8195-apusys_pll.c | 4 +- + drivers/clk/mediatek/clk-mt8195-cam.c | 4 +- + drivers/clk/mediatek/clk-mt8195-ccu.c | 4 +- + drivers/clk/mediatek/clk-mt8195-img.c | 4 +- + drivers/clk/mediatek/clk-mt8195-imp_iic_wrap.c | 4 +- + drivers/clk/mediatek/clk-mt8195-infra_ao.c | 4 +- + drivers/clk/mediatek/clk-mt8195-ipe.c | 4 +- + drivers/clk/mediatek/clk-mt8195-mfg.c | 4 +- + drivers/clk/mediatek/clk-mt8195-peri_ao.c | 4 +- + drivers/clk/mediatek/clk-mt8195-scp_adsp.c | 4 +- + drivers/clk/mediatek/clk-mt8195-topckgen.c | 4 +- + drivers/clk/mediatek/clk-mt8195-vdec.c | 4 +- + drivers/clk/mediatek/clk-mt8195-vdo0.c | 59 +- + drivers/clk/mediatek/clk-mt8195-vdo1.c | 61 +- + drivers/clk/mediatek/clk-mt8195-venc.c | 4 +- + drivers/clk/mediatek/clk-mt8195-vpp0.c | 58 +- + drivers/clk/mediatek/clk-mt8195-vpp1.c | 58 +- + drivers/clk/mediatek/clk-mt8195-wpe.c | 4 +- + drivers/clk/mediatek/clk-mt8365-apmixedsys.c | 166 +++ + drivers/clk/mediatek/clk-mt8365-apu.c | 3 +- + drivers/clk/mediatek/clk-mt8365-cam.c | 3 +- + drivers/clk/mediatek/clk-mt8365-mfg.c | 3 +- + drivers/clk/mediatek/clk-mt8365-mm.c | 42 +- + drivers/clk/mediatek/clk-mt8365-vdec.c | 3 +- + drivers/clk/mediatek/clk-mt8365-venc.c | 3 +- + drivers/clk/mediatek/clk-mt8365.c | 606 ++------- + drivers/clk/mediatek/clk-mt8516-apmixedsys.c | 122 ++ + drivers/clk/mediatek/clk-mt8516-aud.c | 46 +- + drivers/clk/mediatek/clk-mt8516.c | 240 +--- + drivers/clk/mediatek/clk-mtk.c | 82 +- + drivers/clk/mediatek/clk-mtk.h | 7 +- + drivers/clk/mediatek/clk-pllfh.c | 37 +- + drivers/clk/mediatek/clk-pllfh.h | 1 + + drivers/clk/microchip/clk-mpfs.c | 3 +- + drivers/clk/mmp/clk-audio.c | 6 +- + drivers/clk/mvebu/armada-37xx-periph.c | 6 +- + drivers/clk/mvebu/armada-37xx-tbg.c | 6 +- + drivers/clk/mvebu/armada-37xx-xtal.c | 6 +- + drivers/clk/qcom/gcc-sc8280xp.c | 18 + + drivers/clk/renesas/r8a77970-cpg-mssr.c | 1 + + drivers/clk/renesas/r8a77980-cpg-mssr.c | 18 + + drivers/clk/renesas/r8a77995-cpg-mssr.c | 2 +- + drivers/clk/renesas/r8a779g0-cpg-mssr.c | 24 + + drivers/clk/renesas/r9a06g032-clocks.c | 736 ++++++++--- + drivers/clk/renesas/rcar-usb2-clock-sel.c | 6 +- + drivers/clk/renesas/renesas-cpg-mssr.c | 8 +- + drivers/clk/rockchip/clk.c | 2 - + drivers/clk/sifive/Kconfig | 6 +- + drivers/clk/socfpga/clk-gate-a10.c | 26 +- + drivers/clk/socfpga/clk-gate.c | 35 +- + drivers/clk/socfpga/clk-periph-a10.c | 22 +- + drivers/clk/socfpga/clk-periph.c | 26 +- + drivers/clk/socfpga/clk-pll-a10.c | 30 +- + drivers/clk/socfpga/clk-pll.c | 32 +- + drivers/clk/sprd/common.c | 2 +- + drivers/clk/starfive/Kconfig | 33 +- + drivers/clk/starfive/Makefile | 6 +- + drivers/clk/starfive/clk-starfive-jh7100-audio.c | 74 +- + drivers/clk/starfive/clk-starfive-jh7100.c | 716 +++-------- + drivers/clk/starfive/clk-starfive-jh7100.h | 112 -- + drivers/clk/starfive/clk-starfive-jh7110-aon.c | 154 +++ + drivers/clk/starfive/clk-starfive-jh7110-sys.c | 497 +++++++ + drivers/clk/starfive/clk-starfive-jh7110.h | 11 + + drivers/clk/starfive/clk-starfive-jh71x0.c | 333 +++++ + drivers/clk/starfive/clk-starfive-jh71x0.h | 123 ++ + drivers/clk/stm32/clk-stm32mp13.c | 6 +- + drivers/clk/tegra/clk-dfll.c | 5 +- + drivers/clk/tegra/clk-tegra124-dfll-fcpu.c | 17 +- + drivers/clk/tegra/clk-tegra20.c | 28 +- + drivers/clk/ti/adpll.c | 6 +- + drivers/clk/ti/clkctrl.c | 6 +- + drivers/clk/uniphier/clk-uniphier-core.c | 12 +- + drivers/clk/visconti/pll.h | 1 - + drivers/clk/x86/clk-fch.c | 7 +- + drivers/clk/x86/clk-pmc-atom.c | 5 +- + drivers/clk/xilinx/clk-xlnx-clock-wizard.c | 234 +++- + drivers/clk/xilinx/xlnx_vcu.c | 8 +- + drivers/clk/zynqmp/pll.c | 2 - + drivers/reset/Kconfig | 8 +- + drivers/reset/Makefile | 2 +- + drivers/reset/reset-starfive-jh7100.c | 173 --- + drivers/reset/starfive/Kconfig | 20 + + drivers/reset/starfive/Makefile | 5 + + drivers/reset/starfive/reset-starfive-jh7100.c | 74 ++ + drivers/reset/starfive/reset-starfive-jh7110.c | 73 ++ + drivers/reset/starfive/reset-starfive-jh71x0.c | 131 ++ + drivers/reset/starfive/reset-starfive-jh71x0.h | 14 + + include/dt-bindings/clock/ast2600-clock.h | 5 +- + include/dt-bindings/clock/bcm63268-clock.h | 13 + + include/dt-bindings/clock/imx8mp-clock.h | 4 +- + include/dt-bindings/clock/imx93-clock.h | 6 +- + include/dt-bindings/clock/loongson,ls1x-clk.h | 19 + + include/dt-bindings/clock/loongson,ls2k-clk.h | 3 +- + include/dt-bindings/clock/mediatek,mt8188-clk.h | 726 +++++++++++ + include/dt-bindings/clock/qcom,gcc-sc8280xp.h | 2 + + include/dt-bindings/reset/bcm63268-reset.h | 4 + + include/linux/clk-provider.h | 21 +- + include/soc/starfive/reset-starfive-jh71x0.h | 17 + + 315 files changed, 13369 insertions(+), 6310 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/brcm,bcm63268-timer-clocks.yaml + create mode 100644 Documentation/devicetree/bindings/clock/imx8mp-audiomix.yaml + create mode 100644 Documentation/devicetree/bindings/clock/loongson,ls1x-clk.yaml + create mode 100644 Documentation/devicetree/bindings/clock/mediatek,mt8188-clock.yaml + create mode 100644 Documentation/devicetree/bindings/clock/mediatek,mt8188-sys-clock.yaml + create mode 100644 Documentation/devicetree/bindings/clock/skyworks,si521xx.yaml + create mode 100644 drivers/clk/bcm/clk-bcm63268-timer.c + create mode 100644 drivers/clk/clk-loongson1.c + create mode 100644 drivers/clk/clk-loongson2.c + create mode 100644 drivers/clk/clk-si521xx.c + create mode 100644 drivers/clk/clk-sp7021.c + create mode 100644 drivers/clk/imx/clk-imx8mp-audiomix.c + delete mode 100644 drivers/clk/loongson1/Makefile + delete mode 100644 drivers/clk/loongson1/clk-loongson1b.c + delete mode 100644 drivers/clk/loongson1/clk-loongson1c.c + delete mode 100644 drivers/clk/loongson1/clk.c + delete mode 100644 drivers/clk/loongson1/clk.h + create mode 100644 drivers/clk/mediatek/clk-mt2712-apmixedsys.c + create mode 100644 drivers/clk/mediatek/clk-mt7622-apmixedsys.c + create mode 100644 drivers/clk/mediatek/clk-mt7622-infracfg.c + create mode 100644 drivers/clk/mediatek/clk-mt8135-apmixedsys.c + create mode 100644 drivers/clk/mediatek/clk-mt8167-apmixedsys.c + create mode 100644 drivers/clk/mediatek/clk-mt8183-apmixedsys.c + create mode 100644 drivers/clk/mediatek/clk-mt8188-adsp_audio26m.c + create mode 100644 drivers/clk/mediatek/clk-mt8188-apmixedsys.c + create mode 100644 drivers/clk/mediatek/clk-mt8188-cam.c + create mode 100644 drivers/clk/mediatek/clk-mt8188-ccu.c + create mode 100644 drivers/clk/mediatek/clk-mt8188-img.c + create mode 100644 drivers/clk/mediatek/clk-mt8188-imp_iic_wrap.c + create mode 100644 drivers/clk/mediatek/clk-mt8188-infra_ao.c + create mode 100644 drivers/clk/mediatek/clk-mt8188-ipe.c + create mode 100644 drivers/clk/mediatek/clk-mt8188-mfg.c + create mode 100644 drivers/clk/mediatek/clk-mt8188-peri_ao.c + create mode 100644 drivers/clk/mediatek/clk-mt8188-topckgen.c + create mode 100644 drivers/clk/mediatek/clk-mt8188-vdec.c + create mode 100644 drivers/clk/mediatek/clk-mt8188-vdo0.c + create mode 100644 drivers/clk/mediatek/clk-mt8188-vdo1.c + create mode 100644 drivers/clk/mediatek/clk-mt8188-venc.c + create mode 100644 drivers/clk/mediatek/clk-mt8188-vpp0.c + create mode 100644 drivers/clk/mediatek/clk-mt8188-vpp1.c + create mode 100644 drivers/clk/mediatek/clk-mt8188-wpe.c + create mode 100644 drivers/clk/mediatek/clk-mt8192-apmixedsys.c + create mode 100644 drivers/clk/mediatek/clk-mt8365-apmixedsys.c + create mode 100644 drivers/clk/mediatek/clk-mt8516-apmixedsys.c + delete mode 100644 drivers/clk/starfive/clk-starfive-jh7100.h + create mode 100644 drivers/clk/starfive/clk-starfive-jh7110-aon.c + create mode 100644 drivers/clk/starfive/clk-starfive-jh7110-sys.c + create mode 100644 drivers/clk/starfive/clk-starfive-jh7110.h + create mode 100644 drivers/clk/starfive/clk-starfive-jh71x0.c + create mode 100644 drivers/clk/starfive/clk-starfive-jh71x0.h + delete mode 100644 drivers/reset/reset-starfive-jh7100.c + create mode 100644 drivers/reset/starfive/Kconfig + create mode 100644 drivers/reset/starfive/Makefile + create mode 100644 drivers/reset/starfive/reset-starfive-jh7100.c + create mode 100644 drivers/reset/starfive/reset-starfive-jh7110.c + create mode 100644 drivers/reset/starfive/reset-starfive-jh71x0.c + create mode 100644 drivers/reset/starfive/reset-starfive-jh71x0.h + create mode 100644 include/dt-bindings/clock/loongson,ls1x-clk.h + create mode 100644 include/dt-bindings/clock/mediatek,mt8188-clk.h + create mode 100644 include/soc/starfive/reset-starfive-jh71x0.h +Merging clk-imx/for-next (8a05f5cccdbe8 clk: imx: imx8ulp: update clk flag for system critical clock) +$ 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 (5e96c2e0e88d3 clk: renesas: r8a77980: Add I2C5 clock) +$ git merge -m Merge branch 'renesas-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git clk-renesas/renesas-clk +Already up to date. +Merging clk-samsung/for-next (b35f27fe73d8c clk: samsung: exynosautov9: add cmu_peric1 clock support) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git clk-samsung/for-next +Already up to date. +Merging csky/linux-next (1f62ed00a56bf csky: mmu: Prevent spurious page faults) +$ git merge -m Merge branch 'linux-next' of git://github.com/c-sky/csky-linux.git csky/linux-next +Auto-merging arch/csky/Kconfig +Merge made by the 'recursive' strategy. + arch/csky/Kconfig | 5 ----- + arch/csky/abiv1/cacheflush.c | 3 +++ + arch/csky/abiv2/cacheflush.c | 3 +++ + 3 files changed, 6 insertions(+), 5 deletions(-) +Merging loongarch/loongarch-next (b5533e990dd1d tools/loongarch: Use __SIZEOF_LONG__ to define __BITS_PER_LONG) +$ 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 (aaee8c7f2a17d m68k: kexec: Include <linux/reboot.h>) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k/for-next +Already up to date. +Merging m68knommu/for-next (8ab89e9563161 m68k: Kconfig.machine: remove obsolete configs ROMBASE and ROMSIZE) +$ 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/Kconfig.machine +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 -- + arch/m68k/Kconfig.machine | 17 ----------------- + 2 files changed, 19 deletions(-) +Merging microblaze/next (fe15c26ee26ef Linux 6.3-rc1) +$ git merge -m Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze.git microblaze/next +Already up to date. +Merging mips/mips-next (46e614cc91f7b MIPS: uprobes: Restore thread.trap_nr) +$ git merge -m Merge branch 'mips-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next +Removing arch/mips/mti-malta/malta-amon.c +Removing arch/mips/kernel/vpe-cmp.c +Removing arch/mips/kernel/smp-cmp.c +Removing arch/mips/kernel/rtlx-cmp.c +Removing arch/mips/include/asm/sibyte/carmel.h +Removing arch/mips/include/asm/mach-generic/ide.h +Removing arch/mips/include/asm/ide.h +Auto-merging arch/mips/Kconfig +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mips/loongson/devices.yaml | 12 ++ + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + arch/mips/Kbuild.platforms | 1 - + arch/mips/Kconfig | 77 +-------- + arch/mips/Makefile | 38 +++++ + arch/mips/ath79/Kconfig | 16 -- + arch/mips/bcm47xx/board.c | 1 + + arch/mips/bcm47xx/leds.c | 8 + + arch/mips/cavium-octeon/Kconfig | 3 +- + arch/mips/cavium-octeon/octeon-irq.c | 35 ++-- + arch/mips/configs/generic/board-virt.config | 38 +++++ + arch/mips/fw/lib/cmdline.c | 2 +- + arch/mips/include/asm/asmmacro.h | 4 +- + arch/mips/include/asm/bugs.h | 8 +- + arch/mips/include/asm/cache.h | 2 + + arch/mips/include/asm/cacheflush.h | 1 - + arch/mips/include/asm/cpu-features.h | 21 ++- + arch/mips/include/asm/ide.h | 13 -- + arch/mips/include/asm/io.h | 2 +- + arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h | 1 + + arch/mips/include/asm/mach-generic/ide.h | 138 ---------------- + .../mips/include/asm/mach-lantiq/xway/lantiq_soc.h | 3 - + arch/mips/include/asm/mach-ralink/mt7620.h | 3 +- + arch/mips/include/asm/mach-ralink/rt288x.h | 3 +- + arch/mips/include/asm/mach-ralink/rt305x.h | 3 +- + arch/mips/include/asm/mach-ralink/rt3883.h | 4 +- + arch/mips/include/asm/pgtable-bits.h | 3 +- + arch/mips/include/asm/processor.h | 7 +- + arch/mips/include/asm/rtlx.h | 1 - + arch/mips/include/asm/sibyte/board.h | 6 +- + arch/mips/include/asm/sibyte/carmel.h | 45 ------ + arch/mips/include/asm/sibyte/swarm.h | 5 - + arch/mips/include/asm/smp-ops.h | 16 -- + arch/mips/include/asm/vpe.h | 4 - + arch/mips/kernel/Makefile | 3 - + arch/mips/kernel/asm-offsets.c | 3 + + arch/mips/kernel/cps-vec.S | 5 + + arch/mips/kernel/cpu-probe.c | 2 + + arch/mips/kernel/mips-cm.c | 9 +- + arch/mips/kernel/octeon_switch.S | 6 - + arch/mips/kernel/rtlx-cmp.c | 122 -------------- + arch/mips/kernel/setup.c | 3 +- + arch/mips/kernel/smp-cmp.c | 148 ----------------- + arch/mips/kernel/smp-cps.c | 5 + + arch/mips/kernel/uprobes.c | 19 +-- + arch/mips/kernel/vpe-cmp.c | 180 --------------------- + arch/mips/kernel/vpe.c | 2 +- + arch/mips/loongson2ef/Kconfig | 3 + + arch/mips/loongson2ef/Platform | 35 ---- + arch/mips/loongson2ef/common/cs5536/cs5536_isa.c | 2 +- + arch/mips/loongson64/Platform | 16 -- + arch/mips/loongson64/setup.c | 15 -- + arch/mips/loongson64/smp.c | 50 +++--- + arch/mips/mm/c-octeon.c | 5 + + arch/mips/mm/c-r3k.c | 5 - + arch/mips/mm/c-r4k.c | 129 +-------------- + arch/mips/mm/cache.c | 21 ++- + arch/mips/mti-malta/Makefile | 2 - + arch/mips/mti-malta/malta-amon.c | 88 ---------- + arch/mips/mti-malta/malta-init.c | 2 - + arch/mips/mti-malta/malta-platform.c | 2 - + arch/mips/pci/pci-lantiq.c | 2 +- + arch/mips/pci/pci-rt3883.c | 2 +- + arch/mips/ralink/Kconfig | 4 + + arch/mips/ralink/mt7620.c | 145 ++++++++++++++--- + arch/mips/ralink/mt7621.c | 2 - + arch/mips/ralink/rt288x.c | 94 +++++++++-- + arch/mips/ralink/rt305x.c | 147 ++++++++++++++--- + arch/mips/ralink/rt3883.c | 94 +++++++++-- + arch/mips/sibyte/Kconfig | 33 +--- + arch/mips/sibyte/Makefile | 6 - + arch/mips/sibyte/Platform | 8 - + arch/mips/sibyte/common/bus_watcher.c | 4 +- + arch/mips/sibyte/common/cfe.c | 17 +- + arch/mips/sibyte/common/sb_tbprof.c | 10 +- + arch/mips/sibyte/swarm/setup.c | 12 +- + drivers/irqchip/irq-mips-gic.c | 26 --- + 77 files changed, 657 insertions(+), 1357 deletions(-) + create mode 100644 arch/mips/configs/generic/board-virt.config + delete mode 100644 arch/mips/include/asm/ide.h + delete mode 100644 arch/mips/include/asm/mach-generic/ide.h + delete mode 100644 arch/mips/include/asm/sibyte/carmel.h + delete mode 100644 arch/mips/kernel/rtlx-cmp.c + delete mode 100644 arch/mips/kernel/smp-cmp.c + delete mode 100644 arch/mips/kernel/vpe-cmp.c + delete mode 100644 arch/mips/mti-malta/malta-amon.c +Merging openrisc/for-next (c91b4a07655d5 openrisc: Add floating point regset) +$ git merge -m Merge branch 'for-next' of git://github.com/openrisc/linux.git openrisc/for-next +Merge made by the 'recursive' strategy. + arch/openrisc/include/asm/ptrace.h | 4 ++-- + arch/openrisc/include/uapi/asm/elf.h | 3 +-- + arch/openrisc/include/uapi/asm/ptrace.h | 4 ++++ + arch/openrisc/include/uapi/asm/sigcontext.h | 1 + + arch/openrisc/kernel/entry.S | 31 +++++++++++++++++++----- + arch/openrisc/kernel/head.S | 4 ++-- + arch/openrisc/kernel/ptrace.c | 37 +++++++++++++++++++++++++++++ + arch/openrisc/kernel/setup.c | 19 ++------------- + arch/openrisc/kernel/signal.c | 2 ++ + arch/openrisc/kernel/traps.c | 27 +++++++++++++++++++-- + 10 files changed, 101 insertions(+), 31 deletions(-) +Merging parisc-hd/for-next (9520b7fc7e14b parisc: Cleanup mmap implementation regarding color alignment) +$ 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 Documentation/kbuild/kbuild.rst +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 2107 and retry the command. +Merge made by the 'recursive' strategy. + Documentation/kbuild/kbuild.rst | 1 + + arch/parisc/include/asm/grfioctl.h | 38 --------- + arch/parisc/include/asm/kgdb.h | 2 + + arch/parisc/include/asm/pdc.h | 1 + + arch/parisc/kernel/firmware.c | 27 +++++- + arch/parisc/kernel/pacache.S | 2 + + arch/parisc/kernel/sys_parisc.c | 166 ++++++++++++++----------------------- + drivers/parisc/power.c | 16 ++-- + 8 files changed, 102 insertions(+), 151 deletions(-) +Merging powerpc/next (169f8997968ab powerpc/64s: Disable pcrel code model on Clang) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next +Removing tools/testing/selftests/powerpc/dscr/settings +Auto-merging drivers/gpu/drm/amd/display/Kconfig +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/Kconfig +Auto-merging arch/powerpc/platforms/powernv/pci-ioda.c +Removing arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c +Auto-merging arch/powerpc/platforms/Kconfig +Removing arch/powerpc/platforms/86xx/mpc86xx_hpcn.c +Removing arch/powerpc/platforms/86xx/mpc8610_hpcd.c +Removing arch/powerpc/platforms/83xx/mpc837x_mds.c +Removing arch/powerpc/platforms/83xx/mpc836x_mds.c +Removing arch/powerpc/platforms/83xx/mpc834x_mds.c +Auto-merging arch/powerpc/platforms/83xx/mpc832x_rdb.c +Removing arch/powerpc/platforms/83xx/mpc832x_mds.c +Removing arch/powerpc/platforms/82xx/pq2fads.c +Removing arch/powerpc/platforms/82xx/pq2ads.h +Removing arch/powerpc/platforms/82xx/pq2ads-pci-pic.c +Removing arch/powerpc/platforms/82xx/mpc8272_ads.c +Auto-merging arch/powerpc/mm/numa.c +Auto-merging arch/powerpc/kvm/powerpc.c +CONFLICT (modify/delete): arch/powerpc/configs/pseries_defconfig deleted in powerpc/next and modified in HEAD. Version HEAD of arch/powerpc/configs/pseries_defconfig left in tree. +Removing arch/powerpc/configs/pq2fads_defconfig +Auto-merging arch/powerpc/configs/ppc6xx_defconfig +Auto-merging arch/powerpc/configs/ppc64_defconfig +Auto-merging arch/powerpc/configs/powernv_defconfig +CONFLICT (content): Merge conflict in arch/powerpc/configs/powernv_defconfig +Removing arch/powerpc/configs/mpc8272_ads_defconfig +Removing arch/powerpc/configs/mpc7448_hpc2_defconfig +Removing arch/powerpc/configs/83xx/mpc837x_mds_defconfig +Removing arch/powerpc/configs/83xx/mpc836x_mds_defconfig +Removing arch/powerpc/configs/83xx/mpc834x_mds_defconfig +Removing arch/powerpc/configs/83xx/mpc832x_mds_defconfig +Removing arch/powerpc/boot/dts/pq2fads.dts +Removing arch/powerpc/boot/dts/mpc8610_hpcd.dts +Removing arch/powerpc/boot/dts/mpc8379_mds.dts +Removing arch/powerpc/boot/dts/mpc8378_mds.dts +Removing arch/powerpc/boot/dts/mpc8377_mds.dts +Removing arch/powerpc/boot/dts/mpc836x_mds.dts +Removing arch/powerpc/boot/dts/mpc834x_mds.dts +Removing arch/powerpc/boot/dts/mpc832x_mds.dts +Removing arch/powerpc/boot/dts/mpc8272ads.dts +Removing arch/powerpc/boot/dts/mpc7448hpc2.dts +Removing arch/powerpc/boot/dts/fsl/mpc8641_hpcn_36b.dts +Removing arch/powerpc/boot/dts/fsl/mpc8641_hpcn.dts +Removing arch/powerpc/boot/cuboot-mpc7448hpc2.c +Auto-merging arch/powerpc/Kconfig +Auto-merging MAINTAINERS +Resolved 'arch/powerpc/configs/powernv_defconfig' using previous resolution. +Resolved 'drivers/gpu/drm/amd/display/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 3d692bfcd1abe] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 5 + + arch/powerpc/Kconfig | 20 +- + arch/powerpc/Makefile | 105 +++-- + arch/powerpc/boot/Makefile | 16 +- + arch/powerpc/boot/crt0.S | 4 +- + arch/powerpc/boot/cuboot-mpc7448hpc2.c | 43 -- + arch/powerpc/boot/dts/fsl/mpc8641_hpcn.dts | 394 ---------------- + arch/powerpc/boot/dts/fsl/mpc8641_hpcn_36b.dts | 337 -------------- + arch/powerpc/boot/dts/mpc7448hpc2.dts | 192 -------- + arch/powerpc/boot/dts/mpc8272ads.dts | 263 ----------- + arch/powerpc/boot/dts/mpc832x_mds.dts | 436 ------------------ + arch/powerpc/boot/dts/mpc834x_mds.dts | 403 ---------------- + arch/powerpc/boot/dts/mpc836x_mds.dts | 481 -------------------- + arch/powerpc/boot/dts/mpc8377_mds.dts | 505 --------------------- + arch/powerpc/boot/dts/mpc8378_mds.dts | 489 -------------------- + arch/powerpc/boot/dts/mpc8379_mds.dts | 455 ------------------- + arch/powerpc/boot/dts/mpc8610_hpcd.dts | 503 -------------------- + arch/powerpc/boot/dts/pq2fads.dts | 243 ---------- + arch/powerpc/boot/dts/turris1x.dts | 2 +- + arch/powerpc/configs/83xx/mpc832x_mds_defconfig | 59 --- + arch/powerpc/configs/83xx/mpc834x_mds_defconfig | 58 --- + arch/powerpc/configs/83xx/mpc836x_mds_defconfig | 64 --- + arch/powerpc/configs/83xx/mpc837x_mds_defconfig | 58 --- + arch/powerpc/configs/corenet_base.config | 1 + + arch/powerpc/configs/guest.config | 2 + + arch/powerpc/configs/kvm_guest.config | 1 + + arch/powerpc/configs/mpc7448_hpc2_defconfig | 54 --- + arch/powerpc/configs/mpc8272_ads_defconfig | 79 ---- + arch/powerpc/configs/mpc83xx_defconfig | 4 - + arch/powerpc/configs/mpc86xx_base.config | 2 - + arch/powerpc/configs/ppc64_defconfig | 183 ++++++-- + arch/powerpc/configs/ppc6xx_defconfig | 8 - + arch/powerpc/configs/pq2fads_defconfig | 80 ---- + arch/powerpc/configs/pseries_defconfig | 322 ------------- + arch/powerpc/include/asm/atomic.h | 53 +-- + arch/powerpc/include/asm/firmware.h | 4 +- + arch/powerpc/include/asm/idle.h | 12 +- + arch/powerpc/include/asm/io.h | 37 ++ + arch/powerpc/include/asm/iommu.h | 6 +- + arch/powerpc/include/asm/kvm_host.h | 4 +- + arch/powerpc/include/asm/kvm_ppc.h | 64 ++- + arch/powerpc/include/asm/machdep.h | 3 +- + arch/powerpc/include/asm/module.h | 10 +- + arch/powerpc/include/asm/mpc8260.h | 4 - + arch/powerpc/include/asm/paca.h | 2 + + arch/powerpc/include/asm/pci-bridge.h | 7 + + arch/powerpc/include/asm/ppc-opcode.h | 8 + + arch/powerpc/include/asm/ppc-pci.h | 8 + + arch/powerpc/include/asm/ppc_asm.h | 32 ++ + arch/powerpc/include/asm/reg.h | 8 +- + arch/powerpc/include/asm/rtas-types.h | 4 +- + arch/powerpc/include/asm/sections.h | 5 + + arch/powerpc/include/asm/thread_info.h | 40 ++ + arch/powerpc/include/asm/uaccess.h | 30 +- + arch/powerpc/include/uapi/asm/elf.h | 4 + + arch/powerpc/kernel/asm-offsets.c | 2 + + arch/powerpc/kernel/btext.c | 2 +- + arch/powerpc/kernel/entry_32.S | 23 +- + arch/powerpc/kernel/exceptions-64s.S | 112 ++--- + arch/powerpc/kernel/head_64.S | 133 ++++-- + arch/powerpc/kernel/head_booke.h | 1 + + arch/powerpc/kernel/idle.c | 10 +- + arch/powerpc/kernel/interrupt.c | 2 +- + arch/powerpc/kernel/interrupt_64.S | 56 ++- + arch/powerpc/kernel/iommu.c | 246 +++++++++- + arch/powerpc/kernel/irq.c | 8 + + arch/powerpc/kernel/irq_64.c | 10 +- + arch/powerpc/kernel/isa-bridge.c | 166 ++----- + arch/powerpc/kernel/legacy_serial.c | 10 +- + arch/powerpc/kernel/misc_64.S | 2 +- + arch/powerpc/kernel/module_64.c | 377 +++++++++++++-- + arch/powerpc/kernel/paca.c | 2 + + arch/powerpc/kernel/pci_64.c | 2 +- + arch/powerpc/kernel/process.c | 126 ++--- + arch/powerpc/kernel/rtas.c | 54 ++- + arch/powerpc/kernel/setup-common.c | 13 +- + arch/powerpc/kernel/time.c | 6 +- + arch/powerpc/kernel/trace/ftrace.c | 50 +- + arch/powerpc/kernel/vdso/gettimeofday.S | 6 +- + arch/powerpc/kernel/vector.S | 6 + + arch/powerpc/kernel/vmlinux.lds.S | 6 + + arch/powerpc/kvm/book3s.c | 64 ++- + arch/powerpc/kvm/book3s_64_mmu_hv.c | 26 +- + arch/powerpc/kvm/book3s_64_mmu_radix.c | 13 +- + arch/powerpc/kvm/book3s_hv.c | 47 +- + arch/powerpc/kvm/book3s_hv_nested.c | 9 +- + arch/powerpc/kvm/book3s_hv_rmhandlers.S | 26 +- + arch/powerpc/kvm/book3s_paired_singles.c | 4 +- + arch/powerpc/kvm/book3s_pr.c | 26 +- + arch/powerpc/kvm/book3s_rmhandlers.S | 1 + + arch/powerpc/kvm/booke.c | 30 +- + arch/powerpc/kvm/booke.h | 3 + + arch/powerpc/kvm/bookehv_interrupts.S | 2 +- + arch/powerpc/kvm/e500_mmu_host.c | 4 +- + arch/powerpc/kvm/e500mc.c | 2 +- + arch/powerpc/kvm/emulate.c | 8 +- + arch/powerpc/kvm/emulate_loadstore.c | 14 +- + arch/powerpc/kvm/powerpc.c | 8 +- + arch/powerpc/lib/copypage_64.S | 10 + + arch/powerpc/lib/copypage_power7.S | 4 +- + arch/powerpc/lib/copyuser_power7.S | 8 +- + arch/powerpc/lib/hweight_64.S | 8 +- + arch/powerpc/lib/memcmp_64.S | 4 +- + arch/powerpc/lib/memcpy_power7.S | 6 +- + arch/powerpc/lib/pmem.c | 7 - + arch/powerpc/mm/numa.c | 21 +- + arch/powerpc/net/bpf_jit.h | 10 +- + arch/powerpc/net/bpf_jit_comp64.c | 36 +- + arch/powerpc/perf/mpc7450-pmu.c | 6 +- + arch/powerpc/platforms/40x/ppc40x_simple.c | 1 - + arch/powerpc/platforms/44x/canyonlands.c | 10 +- + arch/powerpc/platforms/44x/ebony.c | 5 +- + arch/powerpc/platforms/44x/fsp2.c | 1 - + arch/powerpc/platforms/44x/iss4xx.c | 16 +- + arch/powerpc/platforms/44x/ppc44x_simple.c | 1 - + arch/powerpc/platforms/44x/ppc476.c | 39 +- + arch/powerpc/platforms/44x/sam440ep.c | 5 +- + arch/powerpc/platforms/44x/warp.c | 11 +- + arch/powerpc/platforms/4xx/pci.c | 18 +- + arch/powerpc/platforms/512x/clock-commonclk.c | 2 +- + arch/powerpc/platforms/512x/mpc5121_ads.c | 5 +- + arch/powerpc/platforms/512x/mpc512x_generic.c | 1 - + arch/powerpc/platforms/512x/pdm360ng.c | 5 +- + arch/powerpc/platforms/52xx/efika.c | 1 - + arch/powerpc/platforms/52xx/lite5200.c | 1 - + arch/powerpc/platforms/52xx/lite5200_pm.c | 9 +- + arch/powerpc/platforms/52xx/media5200.c | 17 +- + arch/powerpc/platforms/52xx/mpc5200_simple.c | 1 - + arch/powerpc/platforms/52xx/mpc52xx_common.c | 4 +- + arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 4 +- + arch/powerpc/platforms/82xx/Kconfig | 27 -- + arch/powerpc/platforms/82xx/Makefile | 3 - + arch/powerpc/platforms/82xx/ep8248e.c | 11 +- + arch/powerpc/platforms/82xx/km82xx.c | 11 +- + arch/powerpc/platforms/82xx/mpc8272_ads.c | 213 --------- + arch/powerpc/platforms/82xx/pq2ads-pci-pic.c | 172 ------- + arch/powerpc/platforms/82xx/pq2ads.h | 40 -- + arch/powerpc/platforms/82xx/pq2fads.c | 191 -------- + arch/powerpc/platforms/83xx/Kconfig | 32 -- + arch/powerpc/platforms/83xx/Makefile | 4 - + arch/powerpc/platforms/83xx/asp834x.c | 11 +- + arch/powerpc/platforms/83xx/km83xx.c | 1 - + arch/powerpc/platforms/83xx/mpc830x_rdb.c | 1 - + arch/powerpc/platforms/83xx/mpc831x_rdb.c | 1 - + arch/powerpc/platforms/83xx/mpc832x_mds.c | 110 ----- + arch/powerpc/platforms/83xx/mpc832x_rdb.c | 11 +- + arch/powerpc/platforms/83xx/mpc834x_itx.c | 11 +- + arch/powerpc/platforms/83xx/mpc834x_mds.c | 101 ----- + arch/powerpc/platforms/83xx/mpc836x_mds.c | 210 --------- + arch/powerpc/platforms/83xx/mpc836x_rdk.c | 11 +- + arch/powerpc/platforms/83xx/mpc837x_mds.c | 103 ----- + arch/powerpc/platforms/83xx/mpc837x_rdb.c | 1 - + arch/powerpc/platforms/85xx/Kconfig | 23 +- + arch/powerpc/platforms/85xx/Makefile | 4 +- + arch/powerpc/platforms/85xx/bsc913x_qds.c | 12 +- + arch/powerpc/platforms/85xx/bsc913x_rdb.c | 12 +- + arch/powerpc/platforms/85xx/c293pcie.c | 13 +- + arch/powerpc/platforms/85xx/corenet_generic.c | 1 - + arch/powerpc/platforms/85xx/ge_imp3a.c | 11 +- + arch/powerpc/platforms/85xx/ksi8560.c | 11 +- + arch/powerpc/platforms/85xx/mpc8536_ds.c | 11 +- + arch/powerpc/platforms/85xx/mpc85xx.h | 6 + + arch/powerpc/platforms/85xx/mpc85xx_8259.c | 64 +++ + arch/powerpc/platforms/85xx/mpc85xx_ads.c | 11 +- + arch/powerpc/platforms/85xx/mpc85xx_cds.c | 12 +- + arch/powerpc/platforms/85xx/mpc85xx_ds.c | 157 +------ + arch/powerpc/platforms/85xx/mpc85xx_mds.c | 32 +- + arch/powerpc/platforms/85xx/mpc85xx_rdb.c | 150 +----- + arch/powerpc/platforms/85xx/mvme2500.c | 11 +- + arch/powerpc/platforms/85xx/p1010rdb.c | 1 - + arch/powerpc/platforms/85xx/p1022_ds.c | 11 +- + arch/powerpc/platforms/85xx/p1022_rdk.c | 11 +- + arch/powerpc/platforms/85xx/p1023_rdb.c | 17 +- + arch/powerpc/platforms/85xx/p2020.c | 81 ++++ + arch/powerpc/platforms/85xx/ppa8548.c | 11 +- + arch/powerpc/platforms/85xx/qemu_e500.c | 11 +- + arch/powerpc/platforms/85xx/socrates.c | 14 +- + arch/powerpc/platforms/85xx/stx_gp3.c | 11 +- + arch/powerpc/platforms/85xx/tqm85xx.c | 1 - + arch/powerpc/platforms/85xx/twr_p102x.c | 8 +- + arch/powerpc/platforms/85xx/xes_mpc85xx.c | 27 +- + arch/powerpc/platforms/86xx/Kconfig | 20 +- + arch/powerpc/platforms/86xx/Makefile | 2 - + arch/powerpc/platforms/86xx/gef_ppc9a.c | 19 +- + arch/powerpc/platforms/86xx/gef_sbc310.c | 19 +- + arch/powerpc/platforms/86xx/gef_sbc610.c | 19 +- + arch/powerpc/platforms/86xx/mpc8610_hpcd.c | 333 -------------- + arch/powerpc/platforms/86xx/mpc86xx_hpcn.c | 127 ------ + arch/powerpc/platforms/86xx/mvme7100.c | 1 - + arch/powerpc/platforms/8xx/adder875.c | 8 +- + arch/powerpc/platforms/8xx/ep88xc.c | 7 +- + arch/powerpc/platforms/8xx/mpc86xads_setup.c | 7 +- + arch/powerpc/platforms/8xx/mpc885ads_setup.c | 7 +- + arch/powerpc/platforms/8xx/tqm8xx_setup.c | 7 +- + arch/powerpc/platforms/Kconfig | 4 +- + arch/powerpc/platforms/Kconfig.cputype | 38 ++ + arch/powerpc/platforms/amigaone/setup.c | 22 +- + arch/powerpc/platforms/cell/axon_msi.c | 9 +- + arch/powerpc/platforms/cell/setup.c | 1 - + arch/powerpc/platforms/cell/spu_manage.c | 2 +- + arch/powerpc/platforms/chrp/setup.c | 1 - + arch/powerpc/platforms/embedded6xx/Kconfig | 10 - + arch/powerpc/platforms/embedded6xx/Makefile | 1 - + arch/powerpc/platforms/embedded6xx/flipper-pic.c | 2 +- + arch/powerpc/platforms/embedded6xx/gamecube.c | 10 +- + arch/powerpc/platforms/embedded6xx/hlwd-pic.c | 2 +- + arch/powerpc/platforms/embedded6xx/holly.c | 20 +- + arch/powerpc/platforms/embedded6xx/linkstation.c | 5 +- + arch/powerpc/platforms/embedded6xx/ls_uart.c | 17 +- + arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c | 198 -------- + arch/powerpc/platforms/embedded6xx/mvme5100.c | 11 +- + arch/powerpc/platforms/embedded6xx/storcenter.c | 8 +- + arch/powerpc/platforms/embedded6xx/usbgecko_udbg.c | 20 +- + arch/powerpc/platforms/embedded6xx/wii.c | 14 +- + arch/powerpc/platforms/fsl_uli1575.c | 29 +- + arch/powerpc/platforms/maple/setup.c | 3 +- + arch/powerpc/platforms/microwatt/setup.c | 8 +- + arch/powerpc/platforms/pasemi/iommu.c | 2 +- + arch/powerpc/platforms/pasemi/setup.c | 1 - + arch/powerpc/platforms/powermac/feature.c | 18 +- + arch/powerpc/platforms/powermac/pic.c | 7 +- + arch/powerpc/platforms/powermac/setup.c | 2 +- + arch/powerpc/platforms/powermac/smp.c | 2 +- + arch/powerpc/platforms/powernv/opal-lpc.c | 2 +- + arch/powerpc/platforms/powernv/pci-ioda.c | 42 +- + arch/powerpc/platforms/powernv/setup.c | 5 +- + arch/powerpc/platforms/ps3/setup.c | 4 +- + arch/powerpc/platforms/pseries/firmware.c | 1 + + arch/powerpc/platforms/pseries/hotplug-cpu.c | 2 +- + arch/powerpc/platforms/pseries/hotplug-memory.c | 45 +- + arch/powerpc/platforms/pseries/hvCall.S | 4 +- + arch/powerpc/platforms/pseries/iommu.c | 51 ++- + arch/powerpc/platforms/pseries/mobility.c | 10 +- + arch/powerpc/platforms/pseries/plpks.c | 5 +- + arch/powerpc/platforms/pseries/pseries.h | 4 + + arch/powerpc/platforms/pseries/setup.c | 4 +- + arch/powerpc/platforms/pseries/vio.c | 4 +- + arch/powerpc/sysdev/dcr.c | 2 +- + arch/powerpc/sysdev/ehv_pic.c | 6 +- + arch/powerpc/sysdev/fsl_rio.c | 23 +- + arch/powerpc/sysdev/fsl_soc.c | 2 +- + arch/powerpc/sysdev/mpic.c | 6 +- + arch/powerpc/sysdev/mpic_msgr.c | 2 +- + arch/powerpc/sysdev/tsi108_dev.c | 8 +- + arch/powerpc/sysdev/tsi108_pci.c | 5 +- + arch/powerpc/sysdev/xics/icp-native.c | 17 +- + arch/powerpc/sysdev/xive/native.c | 6 +- + arch/powerpc/xmon/xmon.c | 2 + + drivers/cpuidle/cpuidle-pseries.c | 28 +- + drivers/gpu/drm/amd/display/Kconfig | 2 +- + drivers/macintosh/Kconfig | 1 + + drivers/macintosh/rack-meter.c | 2 +- + drivers/macintosh/therm_adt746x.c | 2 +- + drivers/macintosh/windfarm_smu_sat.c | 1 + + drivers/vfio/vfio_iommu_spapr_tce.c | 96 +--- + tools/testing/selftests/powerpc/Makefile | 8 +- + .../selftests/powerpc/copyloops/asm/ppc_asm.h | 1 + + tools/testing/selftests/powerpc/dscr/Makefile | 3 +- + tools/testing/selftests/powerpc/dscr/dscr.h | 4 - + .../selftests/powerpc/dscr/dscr_default_test.c | 207 +++++---- + .../selftests/powerpc/dscr/dscr_explicit_test.c | 169 +++++-- + .../selftests/powerpc/dscr/dscr_inherit_test.c | 4 +- + .../selftests/powerpc/dscr/dscr_sysfs_test.c | 11 +- + .../selftests/powerpc/dscr/dscr_user_test.c | 4 +- + tools/testing/selftests/powerpc/dscr/settings | 1 - + tools/testing/selftests/powerpc/include/utils.h | 3 + + tools/testing/selftests/powerpc/math/vmx_signal.c | 1 + + tools/testing/selftests/powerpc/mm/Makefile | 2 +- + tools/testing/selftests/powerpc/pmu/Makefile | 31 +- + .../powerpc/pmu/ebb/cpu_event_pinned_vs_ebb_test.c | 3 +- + .../powerpc/pmu/ebb/cpu_event_vs_ebb_test.c | 3 +- + .../powerpc/pmu/ebb/ebb_vs_cpu_event_test.c | 3 +- + .../powerpc/pmu/ebb/multi_ebb_procs_test.c | 6 +- + tools/testing/selftests/powerpc/pmu/lib.c | 19 +- + tools/testing/selftests/powerpc/pmu/lib.h | 1 - + .../mmcra_thresh_marked_sample_test.c | 4 +- + .../selftests/powerpc/stringloops/asm/ppc_asm.h | 1 + + tools/testing/selftests/powerpc/utils.c | 23 + + 278 files changed, 2671 insertions(+), 9510 deletions(-) + delete mode 100644 arch/powerpc/boot/cuboot-mpc7448hpc2.c + delete mode 100644 arch/powerpc/boot/dts/fsl/mpc8641_hpcn.dts + delete mode 100644 arch/powerpc/boot/dts/fsl/mpc8641_hpcn_36b.dts + delete mode 100644 arch/powerpc/boot/dts/mpc7448hpc2.dts + delete mode 100644 arch/powerpc/boot/dts/mpc8272ads.dts + delete mode 100644 arch/powerpc/boot/dts/mpc832x_mds.dts + delete mode 100644 arch/powerpc/boot/dts/mpc834x_mds.dts + delete mode 100644 arch/powerpc/boot/dts/mpc836x_mds.dts + delete mode 100644 arch/powerpc/boot/dts/mpc8377_mds.dts + delete mode 100644 arch/powerpc/boot/dts/mpc8378_mds.dts + delete mode 100644 arch/powerpc/boot/dts/mpc8379_mds.dts + delete mode 100644 arch/powerpc/boot/dts/mpc8610_hpcd.dts + delete mode 100644 arch/powerpc/boot/dts/pq2fads.dts + delete mode 100644 arch/powerpc/configs/83xx/mpc832x_mds_defconfig + delete mode 100644 arch/powerpc/configs/83xx/mpc834x_mds_defconfig + delete mode 100644 arch/powerpc/configs/83xx/mpc836x_mds_defconfig + delete mode 100644 arch/powerpc/configs/83xx/mpc837x_mds_defconfig + create mode 120000 arch/powerpc/configs/kvm_guest.config + delete mode 100644 arch/powerpc/configs/mpc7448_hpc2_defconfig + delete mode 100644 arch/powerpc/configs/mpc8272_ads_defconfig + delete mode 100644 arch/powerpc/configs/pq2fads_defconfig + delete mode 100644 arch/powerpc/configs/pseries_defconfig + delete mode 100644 arch/powerpc/platforms/82xx/mpc8272_ads.c + delete mode 100644 arch/powerpc/platforms/82xx/pq2ads-pci-pic.c + delete mode 100644 arch/powerpc/platforms/82xx/pq2ads.h + delete mode 100644 arch/powerpc/platforms/82xx/pq2fads.c + delete mode 100644 arch/powerpc/platforms/83xx/mpc832x_mds.c + delete mode 100644 arch/powerpc/platforms/83xx/mpc834x_mds.c + delete mode 100644 arch/powerpc/platforms/83xx/mpc836x_mds.c + delete mode 100644 arch/powerpc/platforms/83xx/mpc837x_mds.c + create mode 100644 arch/powerpc/platforms/85xx/mpc85xx_8259.c + create mode 100644 arch/powerpc/platforms/85xx/p2020.c + delete mode 100644 arch/powerpc/platforms/86xx/mpc8610_hpcd.c + delete mode 100644 arch/powerpc/platforms/86xx/mpc86xx_hpcn.c + delete mode 100644 arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c + delete mode 100644 tools/testing/selftests/powerpc/dscr/settings +Merging soc-fsl/next (4b0986a3613c9 Linux 5.18) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl/next +Already up to date. +Merging risc-v/for-next (b09313dd2e726 RISC-V: hwprobe: Explicity check for -1 in vdso init) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v/for-next +Auto-merging tools/testing/selftests/Makefile +Auto-merging arch/riscv/mm/init.c +CONFLICT (content): Merge conflict in arch/riscv/mm/init.c +Auto-merging arch/riscv/mm/fault.c +Auto-merging arch/riscv/mm/cacheflush.c +Auto-merging arch/riscv/kernel/vdso/Makefile +Removing arch/riscv/kernel/trace_irq.h +Removing arch/riscv/kernel/trace_irq.c +Auto-merging arch/riscv/kernel/smpboot.c +Auto-merging arch/riscv/kernel/signal.c +Auto-merging arch/riscv/kernel/setup.c +Auto-merging arch/riscv/kernel/compat_vdso/Makefile +Auto-merging arch/riscv/kernel/Makefile +Auto-merging arch/riscv/include/asm/pgtable.h +Auto-merging arch/riscv/errata/sifive/errata.c +Auto-merging arch/riscv/Makefile +Auto-merging arch/riscv/Kconfig +Auto-merging Documentation/devicetree/bindings/riscv/cpus.yaml +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Resolved 'arch/riscv/mm/init.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 696516a5c1148] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.txt | 5 +- + Documentation/devicetree/bindings/riscv/cpus.yaml | 6 + + Documentation/riscv/hwprobe.rst | 86 ++++ + Documentation/riscv/index.rst | 1 + + arch/powerpc/tools/relocs_check.sh | 18 +- + arch/riscv/Kconfig | 78 +++- + arch/riscv/{Kconfig.erratas => Kconfig.errata} | 0 + arch/riscv/Makefile | 12 +- + arch/riscv/Makefile.postlink | 49 ++ + arch/riscv/boot/Makefile | 7 + + arch/riscv/errata/sifive/errata.c | 8 +- + arch/riscv/errata/thead/errata.c | 14 +- + arch/riscv/include/asm/alternative-macros.h | 72 +-- + arch/riscv/include/asm/alternative.h | 20 +- + arch/riscv/include/asm/asm-prototypes.h | 2 + + arch/riscv/include/asm/asm.h | 61 +++ + arch/riscv/include/asm/cacheflush.h | 3 +- + arch/riscv/include/asm/cpufeature.h | 23 + + arch/riscv/include/asm/csr.h | 1 - + arch/riscv/include/asm/entry-common.h | 11 + + arch/riscv/include/asm/hugetlb.h | 34 +- + arch/riscv/include/asm/hwcap.h | 2 + + arch/riscv/include/asm/hwprobe.h | 13 + + arch/riscv/include/asm/insn-def.h | 4 + + arch/riscv/include/asm/page.h | 30 +- + arch/riscv/include/asm/pgtable-64.h | 34 ++ + arch/riscv/include/asm/pgtable.h | 39 +- + arch/riscv/include/asm/ptrace.h | 10 +- + arch/riscv/include/asm/set_memory.h | 3 + + arch/riscv/include/asm/stacktrace.h | 5 + + arch/riscv/include/asm/syscall.h | 25 + + arch/riscv/include/asm/thread_info.h | 13 +- + arch/riscv/include/asm/topology.h | 21 + + arch/riscv/include/asm/vdso/data.h | 17 + + arch/riscv/include/asm/vdso/gettimeofday.h | 8 + + arch/riscv/include/asm/vmalloc.h | 61 ++- + arch/riscv/include/uapi/asm/hwprobe.h | 37 ++ + arch/riscv/include/uapi/asm/kvm.h | 2 + + arch/riscv/include/uapi/asm/unistd.h | 9 + + arch/riscv/kernel/Makefile | 4 +- + arch/riscv/kernel/alternative.c | 21 +- + arch/riscv/kernel/cacheinfo.c | 66 +-- + arch/riscv/kernel/compat_vdso/Makefile | 2 +- + arch/riscv/kernel/cpu.c | 10 +- + arch/riscv/kernel/cpufeature.c | 67 ++- + arch/riscv/kernel/efi-header.S | 19 +- + arch/riscv/kernel/entry.S | 321 ++----------- + arch/riscv/kernel/head.h | 1 - + arch/riscv/kernel/image-vars.h | 2 - + arch/riscv/kernel/mcount-dyn.S | 57 +-- + arch/riscv/kernel/pi/Makefile | 39 ++ + arch/riscv/kernel/pi/cmdline_early.c | 62 +++ + arch/riscv/kernel/process.c | 5 +- + arch/riscv/kernel/ptrace.c | 44 -- + arch/riscv/kernel/setup.c | 2 +- + arch/riscv/kernel/signal.c | 29 +- + arch/riscv/kernel/smpboot.c | 1 + + arch/riscv/kernel/sys_riscv.c | 230 ++++++++- + arch/riscv/kernel/trace_irq.c | 27 -- + arch/riscv/kernel/trace_irq.h | 11 - + arch/riscv/kernel/traps.c | 144 +++++- + arch/riscv/kernel/vdso.c | 6 - + arch/riscv/kernel/vdso/Makefile | 4 + + arch/riscv/kernel/vdso/hwprobe.c | 52 +++ + arch/riscv/kernel/vdso/sys_hwprobe.S | 15 + + arch/riscv/kernel/vdso/vdso.lds.S | 3 + + arch/riscv/kernel/vmlinux.lds.S | 35 +- + arch/riscv/kvm/vcpu.c | 11 + + arch/riscv/lib/Makefile | 1 + + arch/riscv/lib/clear_page.S | 74 +++ + arch/riscv/lib/memcpy.S | 2 + + arch/riscv/lib/memmove.S | 2 + + arch/riscv/lib/strcmp.S | 3 +- + arch/riscv/lib/strlen.S | 4 +- + arch/riscv/lib/strncmp.S | 3 +- + arch/riscv/mm/Makefile | 4 + + arch/riscv/mm/cacheflush.c | 64 +-- + arch/riscv/mm/fault.c | 6 +- + arch/riscv/mm/hugetlbpage.c | 301 ++++++++++++ + arch/riscv/mm/init.c | 207 +++++++-- + arch/riscv/mm/kasan_init.c | 516 ++++++++++++--------- + arch/riscv/mm/physaddr.c | 16 + + arch/riscv/mm/ptdump.c | 24 +- + arch/riscv/tools/relocs_check.sh | 26 ++ + drivers/of/fdt.c | 11 +- + scripts/relocs_check.sh | 20 + + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/riscv/Makefile | 58 +++ + tools/testing/selftests/riscv/hwprobe/Makefile | 10 + + tools/testing/selftests/riscv/hwprobe/hwprobe.c | 90 ++++ + .../testing/selftests/riscv/hwprobe/sys_hwprobe.S | 12 + + 91 files changed, 2596 insertions(+), 993 deletions(-) + create mode 100644 Documentation/riscv/hwprobe.rst + rename arch/riscv/{Kconfig.erratas => Kconfig.errata} (100%) + create mode 100644 arch/riscv/Makefile.postlink + create mode 100644 arch/riscv/include/asm/cpufeature.h + create mode 100644 arch/riscv/include/asm/entry-common.h + create mode 100644 arch/riscv/include/asm/hwprobe.h + create mode 100644 arch/riscv/include/asm/topology.h + create mode 100644 arch/riscv/include/asm/vdso/data.h + create mode 100644 arch/riscv/include/uapi/asm/hwprobe.h + create mode 100644 arch/riscv/kernel/pi/Makefile + create mode 100644 arch/riscv/kernel/pi/cmdline_early.c + delete mode 100644 arch/riscv/kernel/trace_irq.c + delete mode 100644 arch/riscv/kernel/trace_irq.h + create mode 100644 arch/riscv/kernel/vdso/hwprobe.c + create mode 100644 arch/riscv/kernel/vdso/sys_hwprobe.S + create mode 100644 arch/riscv/lib/clear_page.S + create mode 100755 arch/riscv/tools/relocs_check.sh + create mode 100755 scripts/relocs_check.sh + create mode 100644 tools/testing/selftests/riscv/Makefile + create mode 100644 tools/testing/selftests/riscv/hwprobe/Makefile + create mode 100644 tools/testing/selftests/riscv/hwprobe/hwprobe.c + create mode 100644 tools/testing/selftests/riscv/hwprobe/sys_hwprobe.S +Merging riscv-dt/riscv-dt-for-next (4cd4beb98fe5a Merge branch 'riscv-jh7110_initial_dts' into riscv-dt-for-next) +$ 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 +Already up to date. +Merging riscv-soc/riscv-soc-for-next (4dd472bdafcb6 soc: microchip: mpfs: add a prefix to rx_callback()) +$ 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 (de12921a16653 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 lib/Kconfig.debug +Removing arch/s390/mm/kasan_init.c +Auto-merging arch/s390/kernel/mcount.S +Auto-merging arch/s390/include/asm/pgtable.h +Removing arch/s390/include/asm/mem_detect.h +Removing arch/s390/boot/mem_detect.c +Auto-merging arch/s390/Kconfig +Merge made by the 'recursive' strategy. + .../sched/membarrier-sync-core/arch-support.txt | 4 +- + arch/s390/Kconfig | 10 +- + arch/s390/appldata/appldata_base.c | 32 +- + arch/s390/boot/Makefile | 2 +- + arch/s390/boot/boot.h | 42 ++- + arch/s390/boot/install.sh | 8 +- + arch/s390/boot/ipl_parm.c | 6 +- + arch/s390/boot/ipl_report.c | 106 +++--- + arch/s390/boot/kaslr.c | 171 +++++---- + arch/s390/boot/mem_detect.c | 191 ---------- + arch/s390/boot/pgm_check_info.c | 7 +- + arch/s390/boot/physmem_info.c | 328 +++++++++++++++++ + arch/s390/boot/startup.c | 129 ++++--- + arch/s390/boot/vmem.c | 284 +++++++++++--- + arch/s390/boot/vmlinux.lds.S | 2 + + arch/s390/crypto/chacha-s390.S | 47 +-- + arch/s390/crypto/crc32be-vx.S | 17 +- + arch/s390/crypto/crc32le-vx.S | 30 +- + arch/s390/include/asm/ap.h | 152 ++++++-- + arch/s390/include/asm/checksum.h | 10 +- + arch/s390/include/asm/diag.h | 2 +- + arch/s390/include/asm/entry-common.h | 5 - + arch/s390/include/asm/fcx.h | 2 +- + arch/s390/include/asm/kasan.h | 31 +- + arch/s390/include/asm/linkage.h | 2 +- + arch/s390/include/asm/mem_detect.h | 117 ------ + arch/s390/include/asm/nospec-insn.h | 3 +- + arch/s390/include/asm/perf_event.h | 2 - + arch/s390/include/asm/pgtable.h | 2 +- + arch/s390/include/asm/physmem_info.h | 171 +++++++++ + arch/s390/include/asm/processor.h | 46 ++- + arch/s390/include/asm/set_memory.h | 36 +- + arch/s390/include/asm/setup.h | 20 +- + arch/s390/include/asm/stacktrace.h | 52 ++- + arch/s390/include/asm/string.h | 15 +- + arch/s390/include/asm/thread_info.h | 10 +- + arch/s390/kernel/debug.c | 14 +- + arch/s390/kernel/dumpstack.c | 46 ++- + arch/s390/kernel/early.c | 23 +- + arch/s390/kernel/earlypgm.S | 4 +- + arch/s390/kernel/entry.S | 152 ++++---- + arch/s390/kernel/ftrace.c | 22 +- + arch/s390/kernel/head64.S | 14 +- + arch/s390/kernel/ipl.c | 7 +- + arch/s390/kernel/kprobes.c | 2 +- + arch/s390/kernel/kprobes_insn_page.S | 4 +- + arch/s390/kernel/machine_kexec.c | 56 ++- + arch/s390/kernel/mcount.S | 26 +- + arch/s390/kernel/module.c | 29 +- + arch/s390/kernel/perf_cpum_cf.c | 206 +++++------ + arch/s390/kernel/perf_cpum_sf.c | 14 +- + arch/s390/kernel/process.c | 10 +- + arch/s390/kernel/processor.c | 18 - + arch/s390/kernel/reipl.S | 10 +- + arch/s390/kernel/relocate_kernel.S | 96 +++-- + arch/s390/kernel/setup.c | 152 +++----- + arch/s390/kernel/smp.c | 11 +- + arch/s390/kernel/syscalls/syscall.tbl | 2 +- + arch/s390/kernel/text_amode31.S | 75 ++-- + arch/s390/kernel/topology.c | 12 +- + arch/s390/kernel/vdso32/vdso_user_wrapper.S | 3 +- + arch/s390/kernel/vdso64/vdso_user_wrapper.S | 5 +- + arch/s390/kernel/vmlinux.lds.S | 10 +- + arch/s390/lib/mem.S | 28 +- + arch/s390/lib/uaccess.c | 137 +++---- + arch/s390/mm/Makefile | 3 - + arch/s390/mm/cmm.c | 12 +- + arch/s390/mm/init.c | 5 +- + arch/s390/mm/kasan_init.c | 301 --------------- + arch/s390/mm/pageattr.c | 94 ++++- + arch/s390/mm/pgalloc.c | 20 +- + arch/s390/mm/vmem.c | 35 +- + arch/s390/pci/pci.c | 23 +- + arch/s390/pci/pci_bus.c | 11 +- + arch/s390/purgatory/head.S | 62 +--- + arch/s390/purgatory/kexec-purgatory.S | 14 +- + drivers/s390/char/sclp.h | 2 +- + drivers/s390/char/sclp_cmd.c | 2 +- + drivers/s390/char/sclp_early_core.c | 8 +- + drivers/s390/cio/chsc.c | 2 +- + drivers/s390/cio/chsc.h | 2 +- + drivers/s390/crypto/ap_bus.c | 254 +++++++------ + drivers/s390/crypto/ap_bus.h | 70 ++-- + drivers/s390/crypto/ap_card.c | 23 +- + drivers/s390/crypto/ap_queue.c | 410 +++++++++++++++++---- + drivers/s390/crypto/vfio_ap_drv.c | 6 - + drivers/s390/crypto/vfio_ap_ops.c | 16 +- + drivers/s390/crypto/zcrypt_api.c | 60 +-- + drivers/s390/crypto/zcrypt_card.c | 6 +- + drivers/s390/crypto/zcrypt_cca_key.h | 37 +- + drivers/s390/crypto/zcrypt_ccamisc.c | 74 ++-- + drivers/s390/crypto/zcrypt_cex2c.c | 66 ++-- + drivers/s390/crypto/zcrypt_cex4.c | 141 ++++--- + drivers/s390/crypto/zcrypt_ep11misc.c | 2 +- + drivers/s390/crypto/zcrypt_msgtype50.c | 15 +- + drivers/s390/crypto/zcrypt_msgtype6.c | 139 +++---- + drivers/s390/crypto/zcrypt_queue.c | 4 +- + kernel/stackleak.c | 17 +- + lib/Kconfig.debug | 2 +- + 99 files changed, 2784 insertions(+), 2436 deletions(-) + delete mode 100644 arch/s390/boot/mem_detect.c + create mode 100644 arch/s390/boot/physmem_info.c + delete mode 100644 arch/s390/include/asm/mem_detect.h + create mode 100644 arch/s390/include/asm/physmem_info.h + delete mode 100644 arch/s390/mm/kasan_init.c +Merging sh/for-next (e5c23bec0f121 sh: Replace <uapi/asm/types.h> by <asm-generic/int-ll64.h>) +$ git merge -m Merge branch 'for-next' of git:git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux.git sh/for-next +Auto-merging tools/testing/selftests/mm/run_vmtests.sh +Auto-merging tools/testing/selftests/mm/Makefile +CONFLICT (content): Merge conflict in tools/testing/selftests/mm/Makefile +Auto-merging tools/perf/arch/common.c +Removing arch/sh/lib/lshrdi3.c +Removing arch/sh/lib/ashrdi3.c +Removing arch/sh/lib/ashldi3.c +Auto-merging arch/sh/Kconfig +Auto-merging Documentation/kbuild/kbuild.rst +CONFLICT (content): Merge conflict in Documentation/kbuild/kbuild.rst +Resolved 'Documentation/kbuild/kbuild.rst' using previous resolution. +Resolved 'tools/testing/selftests/mm/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master a1a30ff4c7268] Merge branch 'for-next' of git:git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/kbuild/kbuild.rst | 1 - + Documentation/scheduler/sched-arch.rst | 2 -- + .../translations/zh_CN/scheduler/sched-arch.rst | 2 -- + arch/sh/Kconfig | 3 ++ + arch/sh/Kconfig.debug | 2 +- + arch/sh/boards/Kconfig | 1 - + arch/sh/boot/compressed/ashldi3.c | 4 +-- + arch/sh/drivers/pci/pcie-sh7786.c | 1 - + arch/sh/include/asm/types.h | 2 +- + arch/sh/kernel/cpu/sh4/sq.c | 7 ++--- + arch/sh/kernel/head_32.S | 6 ++-- + arch/sh/kernel/nmi_debug.c | 4 +-- + arch/sh/kernel/setup.c | 4 +-- + arch/sh/lib/Makefile | 4 +-- + arch/sh/lib/ashldi3.c | 30 -------------------- + arch/sh/lib/ashrdi3.c | 32 ---------------------- + arch/sh/lib/lshrdi3.c | 30 -------------------- + arch/sh/math-emu/sfp-util.h | 4 --- + scripts/checkstack.pl | 7 ----- + tools/perf/arch/common.c | 2 -- + tools/scripts/Makefile.arch | 5 ---- + tools/testing/selftests/mm/Makefile | 2 +- + tools/testing/selftests/mm/run_vmtests.sh | 2 +- + 23 files changed, 20 insertions(+), 137 deletions(-) + delete mode 100644 arch/sh/lib/ashldi3.c + delete mode 100644 arch/sh/lib/ashrdi3.c + delete mode 100644 arch/sh/lib/lshrdi3.c +Merging uml/next (6032aca0deb9c um: make stub data pages size tweakable) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml/next +Merge made by the 'recursive' strategy. + arch/um/include/shared/as-layout.h | 3 +- + arch/um/kernel/skas/clone.c | 5 +- + arch/um/kernel/skas/mmu.c | 6 +-- + arch/um/kernel/um_arch.c | 10 ++-- + arch/um/os-Linux/skas/process.c | 6 +-- + arch/um/os-Linux/user_syms.c | 104 ++++++------------------------------ + arch/um/scripts/Makefile.rules | 4 +- + arch/x86/um/shared/sysdep/stub_32.h | 8 +-- + arch/x86/um/shared/sysdep/stub_64.h | 8 +-- + arch/x86/um/stub_segv.c | 2 +- + fs/Makefile | 2 +- + fs/hostfs/Makefile | 6 ++- + fs/hostfs/hostfs_user_exp.c | 28 ++++++++++ + 13 files changed, 78 insertions(+), 114 deletions(-) + create mode 100644 fs/hostfs/hostfs_user_exp.c +Merging xtensa/xtensa-for-next (e313de5b5b041 MAINTAINERS: xtensa: drop linux-xtensa@linux-xtensa.org mailing list) +$ git merge -m Merge branch 'xtensa-for-next' of git://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next +Already up to date. +Merging pidfd/for-next (7bcf0b65b84af Merge branch 'kernel.fork' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git pidfd/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging vfs-idmapping/for-next (4582b273464e4 Merge branch 'fs.misc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/idmapping.git vfs-idmapping/for-next +Auto-merging fs/fuse/dev.c +Merge made by the 'recursive' strategy. + fs/fuse/dev.c | 4 ++-- + fs/pipe.c | 42 ++++++++++++++++++++++++++++++++++-------- + fs/splice.c | 11 +++++++---- + include/linux/pipe_fs_i.h | 8 +++++--- + 4 files changed, 48 insertions(+), 17 deletions(-) +Merging fscrypt/for-next (83e57e47906ce fscrypt: optimize fscrypt_initialize()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/fscrypt/linux.git fscrypt/for-next +Already up to date. +Merging fscache/fscache-next (0885eacdc81f9 Merge tag 'nfsd-5.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux) +$ git merge -m Merge branch 'fscache-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git fscache/fscache-next +Already up to date. +$ git am -3 ../patches/0001-fix-up-for-fs-add-is_idmapped_mnt-helper.patch +Applying: fix up for "fs: add is_idmapped_mnt() helper" +Using index info to reconstruct a base tree... +M fs/cachefiles/cache.c +Falling back to patching base and 3-way merge... +Auto-merging fs/cachefiles/cache.c +No changes -- Patch already applied. +Merging afs/afs-next (0a278bc196e78 afs: Automatically generate trace tag enums) +$ git merge -m Merge branch 'afs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git afs/afs-next +Merge made by the 'recursive' strategy. + include/trace/events/afs.h | 475 ++++++++++++++------------------------------- + 1 file changed, 148 insertions(+), 327 deletions(-) +Merging btrfs/for-next (343d006c1aa06 Merge branch 'for-next-current-v6.2-20230421' into for-next-20230421) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next +Already up to date! +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1619 and retry the command. +Merge made by the 'recursive' strategy. +Merging ceph/master (f7c4d9b133c7a rbd: avoid use-after-free in do_rbd_add() when rbd_dev_create() fails) +$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master +Already up to date. +Merging cifs/for-next (390c90c2928a3 cifs: missing lock when updating session status) +$ git merge -m Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/connect.c | 5 ++- + fs/cifs/file.c | 16 ++++++++ + fs/cifs/misc.c | 2 +- + fs/cifs/smb2pdu.c | 113 ++++++++++++++---------------------------------------- + 4 files changed, 50 insertions(+), 86 deletions(-) +Merging configfs/for-next (77992f896745c configfs: remove mentions of committable items) +$ 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 (a3d78fe3e1ae8 fs: ecryptfs: comment typo fix) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git ecryptfs/next +Auto-merging fs/ecryptfs/crypto.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 4254 and retry the command. +Merge made by the 'recursive' strategy. + fs/ecryptfs/crypto.c | 10 +++++----- + fs/ecryptfs/keystore.c | 2 +- + fs/ecryptfs/read_write.c | 8 ++++---- + 3 files changed, 10 insertions(+), 10 deletions(-) +Merging erofs/dev (745ed7d778340 erofs: cleanup i_format-related stuffs) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs/dev +Already up to date. +Merging exfat/dev (fe15c26ee26ef Linux 6.3-rc1) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev +Already up to date. +Merging ext3/for_next (915f8bcf45303 Pull inotify wd fix.) +$ 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 'recursive' strategy. + fs/notify/inotify/inotify_fsnotify.c | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) +Merging ext4/dev (519fe1bae7e20 ext4: Add a uapi header for ext4 userspace APIs) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev +Already up to date. +$ git am -3 ../patches/willy-ext4-fixup.patch +Applying: ext4: Handle error pointers being returned from __filemap_get_folio +$ git reset HEAD^ +Unstaged changes after reset: +M fs/ext4/inline.c +M fs/ext4/inode.c +M fs/ext4/verity.c +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master 8b8fc05d37037] Merge branch 'for_next' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git + Date: Thu Apr 27 13:06:47 2023 +0100 +Merging f2fs/dev (b68ee1c6131c5 Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev +Already up to date. +Merging fsverity/for-next (04839139213cf fsverity: reject FS_IOC_ENABLE_VERITY on mode 3 fds) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity/for-next +Already up to date. +Merging fuse/for-next (c68ea140050e6 fuse: remove duplicate check for nodeid) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next +Merge made by the 'recursive' strategy. + fs/fuse/dir.c | 2 -- + fs/fuse/inode.c | 3 ++- + include/uapi/linux/fuse.h | 3 +++ + 3 files changed, 5 insertions(+), 3 deletions(-) +Merging gfs2/for-next (644f6bf762fa9 gfs2: gfs2_ail_empty_gl no log flush on error) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next +Already up to date. +Merging jfs/jfs-next (fad376fce0af5 fs/jfs: fix shift exponent db_agl2size negative) +$ git merge -m Merge branch 'jfs-next' of git://github.com/kleikamp/linux-shaggy.git jfs/jfs-next +Already up to date. +Merging ksmbd/ksmbd-for-next (74d7970febf7e ksmbd: fix racy issue from using ->d_parent and ->d_name) +$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next +Auto-merging fs/namei.c +Auto-merging fs/internal.h +Merge made by the 'recursive' strategy. + fs/internal.h | 2 - + fs/ksmbd/smb2pdu.c | 203 ++++++----------------- + fs/ksmbd/vfs.c | 437 ++++++++++++++++++++++---------------------------- + fs/ksmbd/vfs.h | 19 +-- + fs/ksmbd/vfs_cache.c | 5 +- + fs/namei.c | 125 ++++++++++++--- + include/linux/namei.h | 9 ++ + 7 files changed, 357 insertions(+), 443 deletions(-) +Merging nfs/linux-next (e8d018dd0257f Linux 6.3-rc3) +$ 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 (e025f0a73f6ac NFS: Cleanup unused rpc_clnt variable) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/anna/linux-nfs.git nfs-anna/linux-next +Auto-merging fs/nfs/super.c +Auto-merging fs/nfs/inode.c +Merge made by the 'recursive' strategy. + fs/lockd/svc.c | 20 +-- + fs/nfs/Kconfig | 1 + + fs/nfs/dir.c | 300 ++++++++++++++++++++-------------------- + fs/nfs/fscache.c | 238 ++++++++++++++++++------------- + fs/nfs/fscache.h | 131 ++++++++++++------ + fs/nfs/inode.c | 114 +++++++++++++-- + fs/nfs/internal.h | 9 ++ + fs/nfs/iostat.h | 17 --- + fs/nfs/nfs4state.c | 8 +- + fs/nfs/nfs4sysctl.c | 21 +-- + fs/nfs/nfstrace.h | 91 ------------ + fs/nfs/pagelist.c | 4 + + fs/nfs/read.c | 105 +++++++------- + fs/nfs/super.c | 11 -- + fs/nfs/sysctl.c | 20 +-- + include/linux/nfs_fs.h | 72 ++++++++-- + include/linux/nfs_iostat.h | 12 -- + include/linux/nfs_page.h | 3 + + include/linux/nfs_xdr.h | 3 + + include/linux/sunrpc/sched.h | 3 +- + net/sunrpc/clnt.c | 3 - + net/sunrpc/sched.c | 1 - + net/sunrpc/sysctl.c | 42 ++---- + net/sunrpc/xprtrdma/transport.c | 11 +- + net/sunrpc/xprtsock.c | 13 +- + 25 files changed, 637 insertions(+), 616 deletions(-) +Merging nfsd/nfsd-next (aac77b7eb95a0 NFSD: Handle new xprtsec= export option) +$ git merge -m Merge branch 'nfsd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/nfsd-next +Auto-merging fs/nfs/internal.h +Merge made by the 'recursive' strategy. + fs/lockd/Makefile | 6 +- + fs/lockd/clntlock.c | 58 +++-- + fs/lockd/clntproc.c | 42 +++- + fs/lockd/host.c | 1 + + fs/lockd/svclock.c | 21 +- + fs/lockd/trace.c | 3 + + fs/lockd/trace.h | 106 ++++++++++ + fs/nfs/export.c | 9 +- + fs/nfs/internal.h | 15 -- + fs/nfsd/export.c | 64 +++++- + fs/nfsd/export.h | 1 + + fs/nfsd/filecache.c | 430 ++++++++++++++++---------------------- + fs/nfsd/filecache.h | 9 +- + fs/nfsd/nfs4idmap.c | 8 +- + fs/nfsd/vfs.c | 13 +- + include/linux/exportfs.h | 1 + + include/linux/lockd/lockd.h | 29 +-- + include/linux/nfs.h | 20 ++ + include/linux/sunrpc/cache.h | 15 +- + include/linux/sunrpc/svc.h | 16 +- + include/linux/sunrpc/svc_xprt.h | 5 +- + include/linux/sunrpc/svcsock.h | 4 +- + include/net/tls.h | 2 + + include/trace/events/sunrpc.h | 41 +++- + include/uapi/linux/nfsd/export.h | 13 ++ + net/sunrpc/auth_gss/svcauth_gss.c | 12 +- + net/sunrpc/svc.c | 49 ++++- + net/sunrpc/svc_xprt.c | 33 ++- + net/sunrpc/svcauth_unix.c | 23 +- + net/sunrpc/svcsock.c | 186 +++++++++++++++-- + net/sunrpc/xprtrdma/svc_rdma.c | 21 +- + 31 files changed, 808 insertions(+), 448 deletions(-) + create mode 100644 fs/lockd/trace.c + create mode 100644 fs/lockd/trace.h +Merging ntfs3/master (788ee1605c2e9 fs/ntfs3: Fix root inode checking) +$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master +Auto-merging fs/ntfs3/xattr.c +Merge made by the 'recursive' strategy. + Documentation/filesystems/ntfs3.rst | 11 -- + fs/ntfs3/attrib.c | 17 +- + fs/ntfs3/bitmap.c | 25 +-- + fs/ntfs3/file.c | 50 +++--- + fs/ntfs3/frecord.c | 46 +++--- + fs/ntfs3/fslog.c | 83 +++++----- + fs/ntfs3/fsntfs.c | 84 +++++----- + fs/ntfs3/index.c | 81 +++++++--- + fs/ntfs3/inode.c | 134 +++++++++------- + fs/ntfs3/lznt.c | 10 +- + fs/ntfs3/namei.c | 19 ++- + fs/ntfs3/ntfs.h | 3 - + fs/ntfs3/ntfs_fs.h | 19 +-- + fs/ntfs3/record.c | 15 +- + fs/ntfs3/run.c | 6 +- + fs/ntfs3/super.c | 312 +++++++++++++++++++++--------------- + fs/ntfs3/xattr.c | 70 +++----- + 17 files changed, 528 insertions(+), 457 deletions(-) +Merging orangefs/for-next (31720a2b109b3 orangefs: Fix kmemleak in orangefs_{kernel,client}_debug_init()) +$ 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 (4f11ada10d0ad ovl: fail on invalid uid/gid mapping at copy up) +$ git merge -m Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git overlayfs/overlayfs-next +Already up to date. +Merging ubifs/next (b5fda08ef2133 ubifs: Fix memleak when insert_old_idx() failed) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs/next +Merge made by the 'recursive' strategy. + drivers/mtd/ubi/build.c | 2 +- + drivers/mtd/ubi/eba.c | 19 +++++-- + fs/ubifs/compress.c | 1 - + fs/ubifs/dir.c | 7 +-- + fs/ubifs/tnc.c | 142 +++++++++++++++++++++++++++++------------------- + 5 files changed, 102 insertions(+), 69 deletions(-) +Merging v9fs/9p-next (4ec5183ec4865 Linux 6.2-rc7) +$ git merge -m Merge branch '9p-next' of git://github.com/martinetd/linux v9fs/9p-next +Already up to date. +Merging v9fs-ericvh/ericvh/for-next (4eb3117888a92 fs/9p: Rework cache modes and add new options to Documentation) +$ 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 +Auto-merging fs/9p/v9fs.h +Merge made by the 'recursive' strategy. + Documentation/filesystems/9p.rst | 52 +++++++--- + fs/9p/cache.h | 3 +- + fs/9p/fid.c | 48 ++++----- + fs/9p/fid.h | 31 +++++- + fs/9p/v9fs.c | 59 +++++------ + fs/9p/v9fs.h | 62 ++++++++---- + fs/9p/v9fs_vfs.h | 4 - + fs/9p/vfs_addr.c | 50 +++++----- + fs/9p/vfs_dir.c | 10 +- + fs/9p/vfs_file.c | 206 ++++++++------------------------------- + fs/9p/vfs_inode.c | 111 +++++++++++---------- + fs/9p/vfs_inode_dotl.c | 90 +++++++++-------- + fs/9p/vfs_super.c | 44 +++------ + include/net/9p/9p.h | 6 ++ + net/9p/client.c | 8 +- + 15 files changed, 368 insertions(+), 416 deletions(-) +Merging xfs/for-next (9419092fb2630 xfs: fix livelock in delayed allocation at ENOSPC) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next +Merge made by the 'recursive' strategy. + Documentation/admin-guide/xfs.rst | 7 +- + Documentation/filesystems/index.rst | 1 + + .../filesystems/xfs-online-fsck-design.rst | 5315 ++++++++++++++++++++ + .../filesystems/xfs-self-describing-metadata.rst | 1 + + fs/xfs/Kconfig | 32 + + fs/xfs/Makefile | 5 +- + fs/xfs/libxfs/xfs_ag.c | 23 +- + fs/xfs/libxfs/xfs_ag.h | 9 + + fs/xfs/libxfs/xfs_alloc.c | 115 +- + fs/xfs/libxfs/xfs_alloc.h | 22 +- + fs/xfs/libxfs/xfs_alloc_btree.c | 32 +- + fs/xfs/libxfs/xfs_bmap.c | 39 +- + fs/xfs/libxfs/xfs_bmap.h | 8 +- + fs/xfs/libxfs/xfs_bmap_btree.c | 19 +- + fs/xfs/libxfs/xfs_btree.c | 204 +- + fs/xfs/libxfs/xfs_btree.h | 141 +- + fs/xfs/libxfs/xfs_defer.c | 6 +- + fs/xfs/libxfs/xfs_dir2.c | 5 +- + fs/xfs/libxfs/xfs_dir2.h | 31 + + fs/xfs/libxfs/xfs_ialloc.c | 165 +- + fs/xfs/libxfs/xfs_ialloc.h | 7 +- + fs/xfs/libxfs/xfs_ialloc_btree.c | 35 +- + fs/xfs/libxfs/xfs_ialloc_btree.h | 2 +- + fs/xfs/libxfs/xfs_inode_fork.c | 19 +- + fs/xfs/libxfs/xfs_inode_fork.h | 6 +- + fs/xfs/libxfs/xfs_refcount.c | 117 +- + fs/xfs/libxfs/xfs_refcount.h | 10 +- + fs/xfs/libxfs/xfs_refcount_btree.c | 31 +- + fs/xfs/libxfs/xfs_rmap.c | 358 +- + fs/xfs/libxfs/xfs_rmap.h | 38 +- + fs/xfs/libxfs/xfs_rmap_btree.c | 102 +- + fs/xfs/libxfs/xfs_sb.c | 11 +- + fs/xfs/libxfs/xfs_types.h | 12 + + fs/xfs/scrub/agheader.c | 30 +- + fs/xfs/scrub/agheader_repair.c | 105 +- + fs/xfs/scrub/alloc.c | 69 +- + fs/xfs/scrub/attr.c | 312 +- + fs/xfs/scrub/attr.h | 64 +- + fs/xfs/scrub/bitmap.c | 428 +- + fs/xfs/scrub/bitmap.h | 111 +- + fs/xfs/scrub/bmap.c | 420 +- + fs/xfs/scrub/btree.c | 102 +- + fs/xfs/scrub/btree.h | 16 +- + fs/xfs/scrub/common.c | 465 +- + fs/xfs/scrub/common.h | 32 +- + fs/xfs/scrub/dabtree.c | 7 +- + fs/xfs/scrub/dabtree.h | 6 +- + fs/xfs/scrub/dir.c | 246 +- + fs/xfs/scrub/fscounters.c | 11 +- + fs/xfs/scrub/health.c | 8 +- + fs/xfs/scrub/health.h | 6 +- + fs/xfs/scrub/ialloc.c | 304 +- + fs/xfs/scrub/inode.c | 189 +- + fs/xfs/scrub/parent.c | 300 +- + fs/xfs/scrub/quota.c | 9 +- + fs/xfs/scrub/readdir.c | 375 ++ + fs/xfs/scrub/readdir.h | 19 + + fs/xfs/scrub/refcount.c | 197 +- + fs/xfs/scrub/repair.c | 112 +- + fs/xfs/scrub/repair.h | 7 +- + fs/xfs/scrub/rmap.c | 570 ++- + fs/xfs/scrub/rtbitmap.c | 6 +- + fs/xfs/scrub/scrub.c | 74 +- + fs/xfs/scrub/scrub.h | 32 +- + fs/xfs/scrub/symlink.c | 6 +- + fs/xfs/scrub/trace.c | 6 +- + fs/xfs/scrub/trace.h | 75 +- + fs/xfs/scrub/xfs_scrub.h | 6 +- + fs/xfs/xfs_bmap_item.c | 37 +- + fs/xfs/xfs_bmap_util.c | 14 +- + fs/xfs/xfs_buf_item_recover.c | 10 + + fs/xfs/xfs_dahash_test.c | 211 +- + fs/xfs/xfs_dquot.c | 1 - + fs/xfs/xfs_drain.c | 166 + + fs/xfs/xfs_drain.h | 87 + + fs/xfs/xfs_extfree_item.c | 54 +- + fs/xfs/xfs_icache.c | 3 +- + fs/xfs/xfs_icache.h | 11 +- + fs/xfs/xfs_iunlink_item.c | 4 +- + fs/xfs/xfs_iwalk.c | 5 +- + fs/xfs/xfs_linux.h | 1 + + fs/xfs/xfs_refcount_item.c | 36 +- + fs/xfs/xfs_rmap_item.c | 32 +- + fs/xfs/xfs_super.c | 13 + + fs/xfs/xfs_trace.h | 72 + + 85 files changed, 10520 insertions(+), 1890 deletions(-) + create mode 100644 Documentation/filesystems/xfs-online-fsck-design.rst + create mode 100644 fs/xfs/scrub/readdir.c + create mode 100644 fs/xfs/scrub/readdir.h + create mode 100644 fs/xfs/xfs_drain.c + create mode 100644 fs/xfs/xfs_drain.h +Merging zonefs/for-next (2b188a2cfc4d8 zonefs: make kobj_type structure constant) +$ 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 iomap/iomap-for-next (3fd41721cd5c3 iomap: Add DIO tracepoints) +$ git merge -m Merge branch 'iomap-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git iomap/iomap-for-next +Auto-merging include/linux/fs.h +Merge made by the 'recursive' strategy. + fs/iomap/direct-io.c | 9 ++++-- + fs/iomap/trace.c | 1 + + fs/iomap/trace.h | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++ + include/linux/fs.h | 14 +++++++++ + include/linux/iomap.h | 6 ---- + 5 files changed, 100 insertions(+), 8 deletions(-) +Merging djw-vfs/vfs-for-next (a79168a0c00d7 fs/remap_range: avoid spurious writeback on zero length request) +$ git merge -m Merge branch 'vfs-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git djw-vfs/vfs-for-next +Already up to date. +Merging file-locks/locks-next (63355b9884b3d cpumask: be more careful with 'cpumask_setall()') +$ git merge -m Merge branch 'locks-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git file-locks/locks-next +Already up to date. +Merging iversion/iversion-next (63355b9884b3d cpumask: be more careful with 'cpumask_setall()') +$ git merge -m Merge branch 'iversion-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git iversion/iversion-next +Already up to date. +Merging vfs/for-next (cff4b23c731a1 Merge branch 'work.lock_rename_child' 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 +Already up to date! +Merge made by the 'recursive' strategy. +Merging printk/for-next (16bff6f075a10 Merge branch 'for-6.4' 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 +Already up to date! +Merge made by the 'recursive' strategy. +Merging pci/next (09a8e5f01dfb3 Merge branch 'pci/controller/kconfig') +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci/next +Auto-merging include/linux/pci.h +Auto-merging drivers/pci/remove.c +Auto-merging drivers/pci/probe.c +Auto-merging drivers/pci/pci.h +Auto-merging drivers/pci/of.c +Auto-merging drivers/pci/bus.c +Auto-merging arch/x86/pci/fixup.c +CONFLICT (content): Merge conflict in arch/x86/pci/fixup.c +Auto-merging arch/sh/drivers/pci/pcie-sh7786.c +Auto-merging arch/powerpc/platforms/4xx/pci.c +Auto-merging arch/arm/mach-mv78xx0/pcie.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/pci/amlogic,meson-pcie.txt +Resolved 'arch/x86/pci/fixup.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master ed4608d314dff] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git +$ git diff -M --stat --summary HEAD^.. + .clang-format | 1 + + .../devicetree/bindings/pci/amlogic,axg-pcie.yaml | 134 +++ + .../devicetree/bindings/pci/amlogic,meson-pcie.txt | 70 -- + .../bindings/pci/fsl,imx6q-pcie-common.yaml | 279 +++++ + .../devicetree/bindings/pci/fsl,imx6q-pcie-ep.yaml | 85 ++ + .../devicetree/bindings/pci/fsl,imx6q-pcie.yaml | 240 +--- + .../devicetree/bindings/pci/qcom,pcie-ep.yaml | 2 +- + .../devicetree/bindings/pci/qcom,pcie.yaml | 91 +- + MAINTAINERS | 2 + + arch/alpha/kernel/pci.c | 5 +- + arch/arm/kernel/bios32.c | 16 +- + arch/arm/mach-dove/pcie.c | 10 +- + arch/arm/mach-mv78xx0/pcie.c | 10 +- + arch/arm/mach-orion5x/pci.c | 10 +- + arch/mips/pci/ops-bcm63xx.c | 8 +- + arch/mips/pci/pci-legacy.c | 3 +- + arch/powerpc/kernel/pci-common.c | 21 +- + arch/powerpc/platforms/4xx/pci.c | 8 +- + arch/powerpc/platforms/52xx/mpc52xx_pci.c | 5 +- + arch/powerpc/platforms/pseries/pci.c | 16 +- + arch/sh/drivers/pci/pcie-sh7786.c | 10 +- + arch/sparc/kernel/leon_pci.c | 5 +- + arch/sparc/kernel/pci.c | 10 +- + arch/sparc/kernel/pcic.c | 5 +- + arch/x86/pci/fixup.c | 59 + + drivers/eisa/pci_eisa.c | 4 +- + drivers/firmware/efi/cper-arm.c | 1 - + drivers/pci/bus.c | 7 +- + drivers/pci/controller/Kconfig | 423 +++---- + drivers/pci/controller/cadence/Kconfig | 10 +- + drivers/pci/controller/dwc/Kconfig | 431 +++---- + drivers/pci/controller/dwc/pci-imx6.c | 7 + + drivers/pci/controller/dwc/pci-layerscape-ep.c | 1 + + drivers/pci/controller/dwc/pcie-qcom.c | 1246 ++++++++------------ + drivers/pci/controller/mobiveil/Kconfig | 19 +- + drivers/pci/controller/pci-ixp4xx.c | 10 +- + drivers/pci/controller/pci-tegra.c | 4 +- + drivers/pci/controller/pcie-mediatek.c | 2 +- + drivers/pci/controller/pcie-mt7621.c | 4 +- + drivers/pci/controller/pcie-rcar-host.c | 4 +- + drivers/pci/controller/pcie-rcar.h | 2 +- + drivers/pci/hotplug/pciehp_pci.c | 15 + + drivers/pci/hotplug/rpaphp_core.c | 4 +- + drivers/pci/hotplug/shpchp_sysfs.c | 8 +- + drivers/pci/of.c | 2 +- + drivers/pci/p2pdma.c | 3 +- + drivers/pci/pci-driver.c | 3 +- + drivers/pci/pci.c | 21 +- + drivers/pci/pci.h | 9 +- + drivers/pci/pcie/dpc.c | 3 +- + drivers/pci/pcie/edr.c | 12 +- + drivers/pci/probe.c | 2 +- + drivers/pci/quirks.c | 13 + + drivers/pci/remove.c | 5 +- + drivers/pci/setup-bus.c | 37 +- + drivers/pci/setup-res.c | 4 +- + drivers/pci/vgaarb.c | 17 +- + drivers/pci/xen-pcifront.c | 4 +- + drivers/pnp/quirks.c | 29 +- + include/linux/pci.h | 71 +- + 60 files changed, 1860 insertions(+), 1682 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pci/amlogic,axg-pcie.yaml + delete mode 100644 Documentation/devicetree/bindings/pci/amlogic,meson-pcie.txt + create mode 100644 Documentation/devicetree/bindings/pci/fsl,imx6q-pcie-common.yaml + create mode 100644 Documentation/devicetree/bindings/pci/fsl,imx6q-pcie-ep.yaml +Merging pstore/for-next/pstore (5239a89b06d6b pstore: Revert pmsg_lock back to a normal mutex) +$ 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 +Merge made by the 'recursive' strategy. + fs/pstore/pmsg.c | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) +Merging hid/for-next (d777b19c63562 Merge branch 'for-6.4/amd-sfh' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git hid/for-next +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-bus-usb | 17 + + drivers/hid/amd-sfh-hid/amd_sfh_client.c | 1 + + drivers/hid/amd-sfh-hid/amd_sfh_hid.h | 2 +- + drivers/hid/amd-sfh-hid/amd_sfh_pcie.c | 13 + + drivers/hid/amd-sfh-hid/amd_sfh_pcie.h | 1 + + .../amd-sfh-hid/hid_descriptor/amd_sfh_hid_desc.c | 4 + + drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_desc.c | 2 +- + drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.c | 11 + + drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_interface.c | 10 +- + drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_interface.h | 8 +- + drivers/hid/hid-apple.c | 20 +- + drivers/hid/hid-asus.c | 1 + + drivers/hid/hid-ids.h | 10 +- + drivers/hid/hid-input.c | 12 + + drivers/hid/hid-kye.c | 924 ++++----- + drivers/hid/hid-lg-g15.c | 1 + + drivers/hid/hid-logitech-hidpp.c | 256 ++- + drivers/hid/hid-mcp2221.c | 6 +- + drivers/hid/hid-nintendo.c | 95 +- + drivers/hid/hid-quirks.c | 14 +- + drivers/hid/hid-steelseries.c | 1 + + drivers/hid/i2c-hid/Kconfig | 6 +- + drivers/hid/i2c-hid/i2c-hid-of.c | 38 +- + drivers/hid/wacom_sys.c | 10 - + drivers/hid/wacom_wac.c | 84 +- + drivers/hid/wacom_wac.h | 1 + + drivers/usb/core/message.c | 40 + + drivers/usb/core/sysfs.c | 50 + + drivers/usb/core/usb.h | 1 + + include/linux/hid.h | 3 +- + include/linux/usb.h | 16 + + tools/testing/selftests/hid/Makefile | 12 + + tools/testing/selftests/hid/config | 11 + + tools/testing/selftests/hid/hid-apple.sh | 7 + + tools/testing/selftests/hid/hid-core.sh | 7 + + tools/testing/selftests/hid/hid-gamepad.sh | 7 + + tools/testing/selftests/hid/hid-ite.sh | 7 + + tools/testing/selftests/hid/hid-keyboard.sh | 7 + + tools/testing/selftests/hid/hid-mouse.sh | 7 + + tools/testing/selftests/hid/hid-multitouch.sh | 7 + + tools/testing/selftests/hid/hid-sony.sh | 7 + + tools/testing/selftests/hid/hid-tablet.sh | 7 + + tools/testing/selftests/hid/hid-usb_crash.sh | 7 + + tools/testing/selftests/hid/hid-wacom.sh | 7 + + tools/testing/selftests/hid/run-hid-tools-tests.sh | 28 + + tools/testing/selftests/hid/settings | 3 + + tools/testing/selftests/hid/tests/__init__.py | 2 + + tools/testing/selftests/hid/tests/base.py | 345 ++++ + tools/testing/selftests/hid/tests/conftest.py | 81 + + .../selftests/hid/tests/descriptors_wacom.py | 1360 +++++++++++++ + .../selftests/hid/tests/test_apple_keyboard.py | 440 +++++ + tools/testing/selftests/hid/tests/test_gamepad.py | 209 ++ + tools/testing/selftests/hid/tests/test_hid_core.py | 154 ++ + .../selftests/hid/tests/test_ite_keyboard.py | 166 ++ + tools/testing/selftests/hid/tests/test_keyboard.py | 485 +++++ + tools/testing/selftests/hid/tests/test_mouse.py | 977 +++++++++ + .../testing/selftests/hid/tests/test_multitouch.py | 2088 ++++++++++++++++++++ + tools/testing/selftests/hid/tests/test_sony.py | 342 ++++ + tools/testing/selftests/hid/tests/test_tablet.py | 872 ++++++++ + .../testing/selftests/hid/tests/test_usb_crash.py | 103 + + .../selftests/hid/tests/test_wacom_generic.py | 844 ++++++++ + tools/testing/selftests/hid/vmtest.sh | 25 +- + 62 files changed, 9657 insertions(+), 625 deletions(-) + create mode 100755 tools/testing/selftests/hid/hid-apple.sh + create mode 100755 tools/testing/selftests/hid/hid-core.sh + create mode 100755 tools/testing/selftests/hid/hid-gamepad.sh + create mode 100755 tools/testing/selftests/hid/hid-ite.sh + create mode 100755 tools/testing/selftests/hid/hid-keyboard.sh + create mode 100755 tools/testing/selftests/hid/hid-mouse.sh + create mode 100755 tools/testing/selftests/hid/hid-multitouch.sh + create mode 100755 tools/testing/selftests/hid/hid-sony.sh + create mode 100755 tools/testing/selftests/hid/hid-tablet.sh + create mode 100755 tools/testing/selftests/hid/hid-usb_crash.sh + create mode 100755 tools/testing/selftests/hid/hid-wacom.sh + create mode 100755 tools/testing/selftests/hid/run-hid-tools-tests.sh + create mode 100644 tools/testing/selftests/hid/settings + create mode 100644 tools/testing/selftests/hid/tests/__init__.py + create mode 100644 tools/testing/selftests/hid/tests/base.py + create mode 100644 tools/testing/selftests/hid/tests/conftest.py + create mode 100644 tools/testing/selftests/hid/tests/descriptors_wacom.py + create mode 100644 tools/testing/selftests/hid/tests/test_apple_keyboard.py + create mode 100644 tools/testing/selftests/hid/tests/test_gamepad.py + create mode 100644 tools/testing/selftests/hid/tests/test_hid_core.py + create mode 100644 tools/testing/selftests/hid/tests/test_ite_keyboard.py + create mode 100644 tools/testing/selftests/hid/tests/test_keyboard.py + create mode 100644 tools/testing/selftests/hid/tests/test_mouse.py + create mode 100644 tools/testing/selftests/hid/tests/test_multitouch.py + create mode 100644 tools/testing/selftests/hid/tests/test_sony.py + create mode 100644 tools/testing/selftests/hid/tests/test_tablet.py + create mode 100644 tools/testing/selftests/hid/tests/test_usb_crash.py + create mode 100644 tools/testing/selftests/hid/tests/test_wacom_generic.py +Merging i2c/i2c/for-next (08b891569dffc Merge branch 'i2c/for-mergewindow' 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 +Auto-merging drivers/i2c/busses/Kconfig +Auto-merging Documentation/devicetree/bindings/i2c/apple,i2c.yaml +Merge made by the 'recursive' strategy. + .../bindings/i2c/amlogic,meson6-i2c.yaml | 4 +- + .../devicetree/bindings/i2c/apple,i2c.yaml | 4 +- + .../devicetree/bindings/i2c/atmel,at91sam-i2c.yaml | 2 +- + .../devicetree/bindings/i2c/cdns,i2c-r1p10.yaml | 16 ++- + Documentation/devicetree/bindings/i2c/i2c-mpc.yaml | 3 +- + .../devicetree/bindings/i2c/i2c-mt65xx.yaml | 5 + + .../devicetree/bindings/i2c/i2c-mux-gpio.yaml | 4 +- + .../bindings/i2c/qcom,i2c-geni-qcom.yaml | 4 +- + .../devicetree/bindings/i2c/st,stm32-i2c.yaml | 2 +- + .../bindings/i2c/xlnx,xps-iic-2.00.a.yaml | 4 +- + drivers/i2c/busses/Kconfig | 2 +- + drivers/i2c/busses/i2c-brcmstb.c | 4 +- + drivers/i2c/busses/i2c-cadence.c | 117 ++++++++++++++++----- + drivers/i2c/busses/i2c-cros-ec-tunnel.c | 4 +- + drivers/i2c/busses/i2c-davinci.c | 5 +- + drivers/i2c/busses/i2c-imx.c | 12 +-- + drivers/i2c/busses/i2c-mpc.c | 37 ++++--- + drivers/i2c/busses/i2c-mt65xx.c | 15 ++- + drivers/i2c/busses/i2c-omap.c | 9 +- + drivers/i2c/busses/i2c-owl.c | 2 +- + drivers/i2c/busses/i2c-pxa.c | 6 +- + drivers/i2c/busses/i2c-synquacer.c | 2 +- + drivers/i2c/busses/i2c-xiic.c | 9 +- + drivers/i2c/i2c-core-of.c | 2 +- + 24 files changed, 181 insertions(+), 93 deletions(-) +Merging i3c/i3c/next (2810f1de814ad i3c: svc: Convert to platform remove callback returning void) +$ git merge -m Merge branch 'i3c/next' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c/i3c/next +Merge made by the 'recursive' strategy. + drivers/i3c/master.c | 6 +----- + drivers/i3c/master/dw-i3c-master.c | 13 ++++--------- + drivers/i3c/master/i3c-master-cdns.c | 11 +++-------- + drivers/i3c/master/mipi-i3c-hci/core.c | 6 +++--- + drivers/i3c/master/svc-i3c-master.c | 11 +++-------- + include/linux/i3c/master.h | 5 +++-- + 6 files changed, 17 insertions(+), 35 deletions(-) +Merging dmi/dmi-for-next (13a0ac816d22a firmware: dmi: Fortify entry point length checks) +$ 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 (1c19ac768b8ee hwmon: lochnagar: Remove the unneeded include <linux/i2c.h>) +$ 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 +Already up to date. +$ git am -3 ../patches/0001-hwmon-emc2305-fix-up-for-i2c-Make-remove-callback-re.patch +Applying: hwmon: (emc2305) fix up for "i2c: Make remove callback return void" +Using index info to reconstruct a base tree... +M drivers/hwmon/emc2305.c +Falling back to patching base and 3-way merge... +Auto-merging drivers/hwmon/emc2305.c +No changes -- Patch already applied. +Merging jc_docs/docs-next (0b656310bfc33 docs/admin-guide/mm/ksm.rst fix intraface -> interface typo) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Auto-merging Documentation/translations/it_IT/process/submitting-patches.rst +Auto-merging Documentation/admin-guide/mm/ksm.rst +Merge made by the 'recursive' strategy. + Documentation/admin-guide/mm/ksm.rst | 2 +- + Documentation/translations/it_IT/kernel-hacking/locking.rst | 2 +- + Documentation/translations/it_IT/process/deprecated.rst | 2 +- + Documentation/translations/it_IT/process/submitting-patches.rst | 6 +++--- + 4 files changed, 6 insertions(+), 6 deletions(-) +Merging v4l-dvb/master (20af6be6bee4c media: nxp: imx8-isi: Remove 300ms sleep after enabling channel) +$ git merge -m Merge branch 'master' of git://linuxtv.org/media_tree.git v4l-dvb/master +Already up to date. +Merging v4l-dvb-next/master (423f331364bfb media: platform: mtk-mdp3: work around unused-variable warning) +$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master +Merge made by the 'recursive' strategy. + .../media/platform/mediatek/mdp3/mtk-mdp3-comp.c | 3 +- + .../media/platform/nxp/imx8-isi/imx8-isi-core.c | 6 ++-- + drivers/media/platform/nxp/imx8-isi/imx8-isi-hw.c | 41 +++++++++++----------- + drivers/media/platform/renesas/rcar-vin/rcar-dma.c | 21 +++++++---- + 4 files changed, 40 insertions(+), 31 deletions(-) +Merging pm/linux-next (704d7a52a540b Merge branch 'pm-cpufreq' 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 +Already up to date! +Merge made by the 'recursive' strategy. +Merging cpufreq-arm/cpufreq/arm/linux-next (cde3bb62bf56f cpufreq: dt-platdev: Add JH7110 SOC to the allowlist) +$ git merge -m Merge branch 'cpufreq/arm/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git cpufreq-arm/cpufreq/arm/linux-next +Merge made by the 'recursive' strategy. + drivers/cpufreq/cpufreq-dt-platdev.c | 2 ++ + 1 file changed, 2 insertions(+) +Merging cpupower/cpupower (9f8acaf033b38 cpupower:Fix resource leaks in sysfs_get_enabled()) +$ git merge -m Merge branch 'cpupower' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git cpupower/cpupower +Merge made by the 'recursive' strategy. + tools/power/cpupower/lib/powercap.c | 23 ++++++++++++++++------- + 1 file changed, 16 insertions(+), 7 deletions(-) +Merging devfreq/devfreq-next (376b1446153ca PM / devfreq: exynos-ppmu: Use devm_platform_get_and_ioremap_resource()) +$ 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 opp/opp/linux-next (528f2d8d540a3 OPP: Move required opps configuration to specialized callback) +$ 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 (2afa82d1fc648 dt-bindings: thermal: qcom-tsens: Correct unit address) +$ 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 +Merge made by the 'recursive' strategy. + .../devicetree/bindings/thermal/imx-thermal.yaml | 14 +++- + .../bindings/thermal/qcom-spmi-adc-tm-hc.yaml | 4 +- + .../bindings/thermal/qcom-spmi-adc-tm5.yaml | 9 ++- + .../devicetree/bindings/thermal/qcom-tsens.yaml | 4 +- + drivers/thermal/cpuidle_cooling.c | 3 - + drivers/thermal/mediatek/auxadc_thermal.c | 89 +++++++++++----------- + 6 files changed, 64 insertions(+), 59 deletions(-) +Merging dlm/next (7a40f1f18a88c fs: dlm: stop unnecessarily filling zero ms_extra bytes) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm/next +Already up to date. +Merging rdma/for-next (3e358ea8614dd RDMA/mlx5: Fix flow counter query via DEVX) +$ 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 include/linux/mlx5/mlx5_ifc.h +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/main.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en/params.c +Auto-merging drivers/infiniband/ulp/srpt/ib_srpt.c +Auto-merging drivers/infiniband/sw/rdmavt/qp.c +Auto-merging drivers/infiniband/hw/qib/qib_file_ops.c +Auto-merging drivers/infiniband/hw/irdma/utils.c +Auto-merging drivers/infiniband/hw/irdma/hw.c +Auto-merging drivers/infiniband/hw/irdma/cm.c +Auto-merging drivers/infiniband/hw/hfi1/file_ops.c +Auto-merging drivers/infiniband/hw/erdma/erdma_main.c +Auto-merging drivers/infiniband/hw/erdma/erdma_hw.h +Auto-merging drivers/infiniband/hw/erdma/erdma_cq.c +Auto-merging drivers/infiniband/core/cma.c +Merge made by the 'recursive' strategy. + drivers/infiniband/core/cm.c | 3 +- + drivers/infiniband/core/cma.c | 6 +- + drivers/infiniband/core/user_mad.c | 23 +- + drivers/infiniband/hw/bnxt_re/ib_verbs.c | 109 + + drivers/infiniband/hw/bnxt_re/ib_verbs.h | 3 + + drivers/infiniband/hw/bnxt_re/main.c | 103 +- + drivers/infiniband/hw/bnxt_re/qplib_fp.c | 211 +- + drivers/infiniband/hw/bnxt_re/qplib_fp.h | 5 + + drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 97 +- + drivers/infiniband/hw/bnxt_re/qplib_rcfw.h | 66 +- + drivers/infiniband/hw/bnxt_re/qplib_sp.c | 337 +- + drivers/infiniband/hw/bnxt_re/qplib_sp.h | 68 +- + drivers/infiniband/hw/bnxt_re/qplib_tlv.h | 162 + + drivers/infiniband/hw/bnxt_re/roce_hsi.h | 7423 ++++++++++++-------- + drivers/infiniband/hw/efa/efa_admin_cmds_defs.h | 7 +- + drivers/infiniband/hw/efa/efa_verbs.c | 5 +- + drivers/infiniband/hw/erdma/erdma.h | 2 +- + drivers/infiniband/hw/erdma/erdma_cm.h | 10 +- + drivers/infiniband/hw/erdma/erdma_cmdq.c | 42 +- + drivers/infiniband/hw/erdma/erdma_cq.c | 2 +- + drivers/infiniband/hw/erdma/erdma_eq.c | 9 +- + drivers/infiniband/hw/erdma/erdma_hw.h | 4 + + drivers/infiniband/hw/erdma/erdma_main.c | 39 +- + drivers/infiniband/hw/erdma/erdma_verbs.c | 17 +- + drivers/infiniband/hw/hfi1/chip.c | 18 +- + drivers/infiniband/hw/hfi1/driver.c | 2 +- + drivers/infiniband/hw/hfi1/file_ops.c | 2 +- + drivers/infiniband/hw/hfi1/init.c | 12 +- + drivers/infiniband/hw/hfi1/ipoib_tx.c | 6 +- + drivers/infiniband/hw/hfi1/mmu_rb.c | 84 +- + drivers/infiniband/hw/hfi1/mmu_rb.h | 22 +- + drivers/infiniband/hw/hfi1/pcie.c | 2 - + drivers/infiniband/hw/hfi1/pio.c | 2 +- + drivers/infiniband/hw/hfi1/sdma.c | 21 +- + drivers/infiniband/hw/hfi1/sdma.h | 16 +- + drivers/infiniband/hw/hfi1/sdma_txreq.h | 1 + + drivers/infiniband/hw/hfi1/trace_dbg.h | 7 + + drivers/infiniband/hw/hfi1/trace_mmu.h | 4 - + drivers/infiniband/hw/hfi1/user_sdma.c | 600 +- + drivers/infiniband/hw/hfi1/user_sdma.h | 5 - + drivers/infiniband/hw/hfi1/verbs.c | 4 +- + drivers/infiniband/hw/hfi1/vnic_sdma.c | 1 + + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 189 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 31 +- + drivers/infiniband/hw/irdma/cm.c | 2 +- + drivers/infiniband/hw/irdma/ctrl.c | 324 +- + drivers/infiniband/hw/irdma/defs.h | 9 +- + drivers/infiniband/hw/irdma/hw.c | 13 +- + drivers/infiniband/hw/irdma/i40iw_hw.c | 60 +- + drivers/infiniband/hw/irdma/icrdma_hw.c | 51 + + drivers/infiniband/hw/irdma/irdma.h | 1 + + drivers/infiniband/hw/irdma/main.h | 3 + + drivers/infiniband/hw/irdma/pble.c | 16 +- + drivers/infiniband/hw/irdma/pble.h | 2 +- + drivers/infiniband/hw/irdma/protos.h | 8 +- + drivers/infiniband/hw/irdma/type.h | 166 +- + drivers/infiniband/hw/irdma/utils.c | 172 +- + drivers/infiniband/hw/irdma/verbs.c | 200 +- + drivers/infiniband/hw/mlx4/qp.c | 8 +- + drivers/infiniband/hw/mlx5/counters.c | 171 +- + drivers/infiniband/hw/mlx5/devx.c | 33 +- + drivers/infiniband/hw/mlx5/mr.c | 12 +- + drivers/infiniband/hw/mlx5/qp.c | 17 +- + drivers/infiniband/hw/mlx5/umr.c | 7 +- + drivers/infiniband/hw/mlx5/umr.h | 3 +- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 2 - + drivers/infiniband/hw/qib/qib_file_ops.c | 9 +- + drivers/infiniband/hw/qib/qib_pcie.c | 8 - + drivers/infiniband/hw/qib/qib_user_sdma.c | 11 +- + drivers/infiniband/hw/usnic/usnic_ib_main.c | 2 - + drivers/infiniband/sw/rdmavt/qp.c | 4 +- + drivers/infiniband/sw/rxe/rxe.c | 16 +- + drivers/infiniband/sw/rxe/rxe.h | 46 +- + drivers/infiniband/sw/rxe/rxe_comp.c | 161 +- + drivers/infiniband/sw/rxe/rxe_cq.c | 39 +- + drivers/infiniband/sw/rxe/rxe_icrc.c | 4 +- + drivers/infiniband/sw/rxe/rxe_loc.h | 7 +- + drivers/infiniband/sw/rxe/rxe_mmap.c | 6 +- + drivers/infiniband/sw/rxe/rxe_mr.c | 29 +- + drivers/infiniband/sw/rxe/rxe_net.c | 11 +- + drivers/infiniband/sw/rxe/rxe_qp.c | 263 +- + drivers/infiniband/sw/rxe/rxe_queue.c | 5 +- + drivers/infiniband/sw/rxe/rxe_recv.c | 15 +- + drivers/infiniband/sw/rxe/rxe_req.c | 104 +- + drivers/infiniband/sw/rxe/rxe_resp.c | 126 +- + drivers/infiniband/sw/rxe/rxe_srq.c | 6 +- + drivers/infiniband/sw/rxe/rxe_task.c | 268 +- + drivers/infiniband/sw/rxe/rxe_task.h | 23 +- + drivers/infiniband/sw/rxe/rxe_verbs.c | 983 ++- + drivers/infiniband/sw/rxe/rxe_verbs.h | 14 - + drivers/infiniband/sw/siw/siw_main.c | 3 - + drivers/infiniband/sw/siw/siw_qp_rx.c | 6 +- + drivers/infiniband/sw/siw/siw_qp_tx.c | 21 +- + drivers/infiniband/sw/siw/siw_verbs.c | 4 +- + drivers/infiniband/ulp/iser/iser_initiator.c | 17 +- + drivers/infiniband/ulp/iser/iser_verbs.c | 6 - + drivers/infiniband/ulp/srpt/ib_srpt.c | 23 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h | 81 + + .../net/ethernet/mellanox/mlx5/core/en/params.c | 3 +- + .../net/ethernet/mellanox/mlx5/core/en_common.c | 9 +- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 3 + + include/linux/mlx5/mlx5_ifc.h | 31 +- + include/rdma/ib_verbs.h | 25 + + include/uapi/rdma/bnxt_re-abi.h | 4 + + include/uapi/rdma/efa-abi.h | 3 +- + 105 files changed, 7961 insertions(+), 5500 deletions(-) + create mode 100644 drivers/infiniband/hw/bnxt_re/qplib_tlv.h +Merging net-next/main (6e98b09da931a Merge tag 'net-next-6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/main +Already up to date. +Merging bpf-next/for-next (6e98b09da931a Merge tag 'net-next-6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-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 +Already up to date. +Merging ipsec-next/master (f4796398f21b9 xfrm: Remove inner/outer modes from output path) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git ipsec-next/master +Already up to date. +Merging mlx5-next/mlx5-next (77f7eb9f3416a net/mlx5: Introduce other vport query for Q-counters) +$ 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/master (677fb75253313 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git netfilter-next/master +Already up to date. +Merging ipvs-next/main (4774ad841bef9 net: phy: marvell: Fix inconsistent indenting in led_blink_set) +$ 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 (d883a4669a1de Bluetooth: hci_sync: Only allow hci_cmd_sync_queue if running) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master +Already up to date. +Merging wireless-next/for-next (3288ee5844b74 Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git) +$ 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 +Already up to date. +Merging wpan-next/master (1af3de62f03f6 ieee802154: ca8210: Flag the driver as being limited) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git wpan-next/master +Auto-merging net/mac802154/scan.c +Auto-merging net/ieee802154/nl802154.c +Auto-merging drivers/net/ieee802154/ca8210.c +Merge made by the 'recursive' strategy. + drivers/net/ieee802154/ca8210.c | 3 +- + include/net/cfg802154.h | 3 ++ + include/net/ieee802154_netdev.h | 20 +++++++++++- + net/ieee802154/header_ops.c | 36 +++++++++++++++++++++ + net/ieee802154/nl802154.c | 13 +++++++- + net/mac802154/ieee802154_i.h | 21 +++++++++++++ + net/mac802154/main.c | 2 ++ + net/mac802154/rx.c | 70 ++++++++++++++++++++++++++++++++++++++++- + net/mac802154/scan.c | 68 +++++++++++++++++++++++++++++++++++---- + 9 files changed, 226 insertions(+), 10 deletions(-) +Merging mtd/mtd/next (7227aacb62aeb Merge tag 'nand/for-6.4' into mtd/next) +$ git merge -m Merge branch 'mtd/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/mtd/next +Already up to date. +Merging nand/nand/next (ec185b18c2232 mtd: nand: Convert to platform remove callback returning void) +$ git merge -m Merge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next +Already up to date. +Merging spi-nor/spi-nor/next (df6def86b9dcb mtd: spi-nor: spansion: Add support for s25hl02gt and s25hs02gt) +$ 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 +Already up to date. +Merging crypto/master (482c84e906e53 i2c: designware: Add doorbell support for Mendocino) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git crypto/master +Already up to date. +Merging drm/drm-next (cf03e2956af30 Merge tag 'drm-misc-next-fixes-2023-04-26' of git://anongit.freedesktop.org/drm/drm-misc into drm-next) +$ git merge -m Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git drm/drm-next +Removing drivers/accel/qaic/mhi_qaic_ctrl.h +Removing drivers/accel/qaic/mhi_qaic_ctrl.c +Merge made by the 'recursive' strategy. + drivers/accel/qaic/Makefile | 1 - + drivers/accel/qaic/mhi_qaic_ctrl.c | 569 ----------------------- + drivers/accel/qaic/mhi_qaic_ctrl.h | 12 - + drivers/accel/qaic/qaic_drv.c | 10 - + drivers/gpu/drm/panel/panel-novatek-nt35950.c | 10 +- + drivers/gpu/drm/panel/panel-orisetech-otm8009a.c | 2 +- + drivers/gpu/drm/ttm/ttm_pool.c | 30 +- + 7 files changed, 21 insertions(+), 613 deletions(-) + delete mode 100644 drivers/accel/qaic/mhi_qaic_ctrl.c + delete mode 100644 drivers/accel/qaic/mhi_qaic_ctrl.h +$ git am -3 ../patches/0001-Revert-drm-ttm-Reduce-the-number-of-used-allocation-.patch +Applying: Revert "drm/ttm: Reduce the number of used allocation orders for TTM pages" +Using index info to reconstruct a base tree... +M drivers/gpu/drm/ttm/ttm_pool.c +Falling back to patching base and 3-way merge... +Auto-merging drivers/gpu/drm/ttm/ttm_pool.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/ttm/ttm_pool.c +Resolved 'drivers/gpu/drm/ttm/ttm_pool.c' using previous resolution. +error: Failed to merge in the changes. +hint: Use 'git am --show-current-patch=diff' to see the failed patch +Patch failed at 0001 Revert "drm/ttm: Reduce the number of used allocation orders for TTM pages" +When you have resolved this problem, run "git am --continue". +If you prefer to skip this patch, run "git am --skip" instead. +To restore the original branch and stop patching, run "git am --abort". +Merging drm-misc/for-linux-next (a50be876f4fe2 drm/panel: novatek-nt35950: Only unregister DSI1 if it exists) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc drm-misc/for-linux-next +Already up to date. +Merging amdgpu/drm-next (ef1543899a9cb drm/amd/display: set variable custom_backlight_curve0 storage-class-specifier to static) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next +Auto-merging include/drm/display/drm_dp.h +Auto-merging drivers/gpu/drm/amd/display/modules/power/power_helpers.c +Auto-merging drivers/gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn314/dcn314_resource.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | 6 +- + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10_3.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v11.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 22 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 22 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 31 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 104 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 176 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 44 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 36 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_job.h | 6 + + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 26 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 90 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 5 + + drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.c | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 2 +- + drivers/gpu/drm/amd/amdgpu/cik.c | 4 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 89 +- + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 159 +- + drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 26 +- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 42 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 99 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 129 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.h | 2 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c | 6 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 2835 +++++++++++++++++++- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.h | 3 +- + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 13 +- + drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 13 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 12 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/mes_v10_1.c | 22 +- + drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 26 +- + drivers/gpu/drm/amd/amdgpu/nv.c | 31 +- + drivers/gpu/drm/amd/amdgpu/nvd.h | 5 +- + drivers/gpu/drm/amd/amdgpu/si.c | 4 +- + drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c | 2 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 33 +- + drivers/gpu/drm/amd/amdgpu/soc15.h | 2 +- + drivers/gpu/drm/amd/amdgpu/soc21.c | 31 +- + drivers/gpu/drm/amd/amdgpu/vi.c | 4 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 107 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 31 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.h | 2 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 31 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 22 +- + drivers/gpu/drm/amd/display/amdgpu_dm/dc_fpu.c | 2 + + .../gpu/drm/amd/display/dc/bios/command_table2.c | 25 +- + .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 4 +- + .../dc/clk_mgr/dcn30/dcn30_clk_mgr_smu_msg.c | 3 + + .../amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c | 4 +- + .../amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.c | 4 +- + .../amd/display/dc/clk_mgr/dcn315/dcn315_clk_mgr.c | 4 +- + .../amd/display/dc/clk_mgr/dcn316/dcn316_clk_mgr.c | 4 +- + .../amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c | 39 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 56 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 27 +- + drivers/gpu/drm/amd/display/dc/dc.h | 14 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 201 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 15 +- + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 7 + + drivers/gpu/drm/amd/display/dc/dc_dsc.h | 1 + + drivers/gpu/drm/amd/display/dc/dc_helper.c | 28 +- + drivers/gpu/drm/amd/display/dc/dc_stream.h | 8 +- + drivers/gpu/drm/amd/display/dc/dc_types.h | 3 +- + drivers/gpu/drm/amd/display/dc/dce/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c | 264 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_abm_lcd.c | 252 ++ + drivers/gpu/drm/amd/display/dc/dce/dmub_abm_lcd.h | 46 + + .../gpu/drm/amd/display/dc/dce/dmub_hw_lock_mgr.c | 4 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_outbox.c | 4 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 28 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 19 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_dscl.c | 18 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 4 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.c | 5 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 17 +- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubp.c | 7 +- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hwseq.c | 68 +- + .../display/dc/dcn30/dcn30_dio_stream_encoder.c | 15 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 41 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.c | 7 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 4 +- + .../amd/display/dc/dcn31/dcn31_dio_link_encoder.c | 8 +- + .../gpu/drm/amd/display/dc/dcn31/dcn31_hubbub.c | 1 + + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c | 17 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_init.c | 1 + + .../drm/amd/display/dc/dcn31/dcn31_panel_cntl.c | 4 +- + .../gpu/drm/amd/display/dc/dcn314/dcn314_dccg.c | 2 +- + .../gpu/drm/amd/display/dc/dcn314/dcn314_hwseq.c | 4 +- + .../gpu/drm/amd/display/dc/dcn314/dcn314_init.c | 1 + + .../drm/amd/display/dc/dcn314/dcn314_resource.c | 2 +- + .../drm/amd/display/dc/dcn315/dcn315_resource.c | 97 +- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c | 21 +- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_optc.c | 11 +- + .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.c | 51 +- + .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.h | 14 + + .../amd/display/dc/dcn32/dcn32_resource_helpers.c | 15 + + .../drm/amd/display/dc/dcn321/dcn321_resource.c | 9 +- + drivers/gpu/drm/amd/display/dc/dm_services.h | 7 + + drivers/gpu/drm/amd/display/dc/dm_services_types.h | 6 + + .../gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 209 +- + .../amd/display/dc/dml/dcn21/display_mode_vba_21.c | 2 +- + .../gpu/drm/amd/display/dc/dml/dcn30/dcn30_fpu.c | 18 +- + .../amd/display/dc/dml/dcn30/display_mode_vba_30.c | 6 +- + .../display/dc/dml/dcn30/display_rq_dlg_calc_30.c | 4 +- + .../gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c | 25 +- + .../gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.h | 3 + + .../amd/display/dc/dml/dcn31/display_mode_vba_31.c | 43 +- + .../display/dc/dml/dcn31/display_rq_dlg_calc_31.c | 3 +- + .../gpu/drm/amd/display/dc/dml/dcn314/dcn314_fpu.c | 14 +- + .../display/dc/dml/dcn314/display_mode_vba_314.c | 4 +- + .../dc/dml/dcn314/display_rq_dlg_calc_314.c | 26 +- + .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 109 +- + .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.h | 4 + + .../amd/display/dc/dml/dcn32/display_mode_vba_32.c | 12 +- + .../dc/dml/dcn32/display_mode_vba_util_32.c | 20 +- + .../display/dc/dml/dcn32/display_rq_dlg_calc_32.c | 2 +- + .../gpu/drm/amd/display/dc/dml/dcn321/dcn321_fpu.c | 24 +- + .../drm/amd/display/dc/dml/display_mode_structs.h | 3 +- + .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 6 + + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 10 +- + drivers/gpu/drm/amd/display/dc/inc/hw/abm.h | 6 + + drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 1 + + drivers/gpu/drm/amd/display/dc/link/link_dpms.c | 5 + + .../display/dc/link/protocols/link_dp_capability.c | 30 +- + .../amd/display/dc/link/protocols/link_dp_dpia.c | 2 +- + .../display/dc/link/protocols/link_dp_training.c | 5 +- + .../link_dp_training_fixed_vs_pe_retimer.c | 23 +- + .../dc/link/protocols/link_edp_panel_control.c | 30 +- + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 18 +- + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 32 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.c | 5 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.h | 2 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn21.c | 6 - + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn21.h | 4 - + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c | 5 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.h | 2 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn32.c | 19 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn32.h | 3 + + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 42 +- + drivers/gpu/drm/amd/display/include/signal_types.h | 1 + + .../drm/amd/display/modules/freesync/freesync.c | 4 - + .../drm/amd/display/modules/power/power_helpers.c | 43 + + .../drm/amd/display/modules/power/power_helpers.h | 3 + + drivers/gpu/drm/amd/include/amd_shared.h | 1 - + drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.c | 6 +- + .../drm/amd/pm/powerplay/hwmgr/smu7_powertune.c | 12 +- + .../drm/amd/pm/powerplay/hwmgr/vega10_powertune.c | 36 +- + drivers/gpu/drm/amd/pm/powerplay/inc/hwmgr.h | 2 +- + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 4 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 3 + + drivers/gpu/drm/radeon/ci_dpm.c | 28 +- + drivers/gpu/drm/radeon/radeon_cs.c | 3 +- + include/drm/display/drm_dp.h | 3 + + include/uapi/drm/amdgpu_drm.h | 22 + + 168 files changed, 5403 insertions(+), 1546 deletions(-) + create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dmub_abm_lcd.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dmub_abm_lcd.h +Merging drm-intel/for-linux-next (d944eafed618a drm/i915: Check pipe source size when using skl+ scalers) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel drm-intel/for-linux-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/display/skl_scaler.c | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) +Merging drm-tegra/for-next (2429b3c529da2 drm/tegra: Avoid potential 32-bit integer overflow) +$ git merge -m Merge branch 'for-next' of https://gitlab.freedesktop.org/drm/tegra.git drm-tegra/for-next +Already up to date. +Merging drm-msm/msm-next (ac7e7c9c65ecf drm/msm/dpu: drop unused macros from hw catalog) +$ 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 (ac7e7c9c65ecf drm/msm/dpu: drop unused macros from hw catalog) +$ 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 imx-drm/imx-drm/next (927d8fd465adb drm/imx: ipuv3-plane: Remove redundant color encoding and range initialisation) +$ git merge -m Merge branch 'imx-drm/next' of https://git.pengutronix.de/git/pza/linux imx-drm/imx-drm/next +Already up to date. +Merging etnaviv/etnaviv/next (4c22c61e429f0 drm/etnaviv: show number of NN cores in GPU debugfs info) +$ 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 (60ed3cd85b951 MAINTAINERS: Remove rage128 framebuffer driver maintainer) +$ 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 'recursive' strategy. + MAINTAINERS | 3 +-- + drivers/video/fbdev/68328fb.c | 1 + + drivers/video/fbdev/cg14.c | 6 ++---- + drivers/video/fbdev/cg3.c | 6 ++---- + drivers/video/fbdev/cg6.c | 6 ++---- + drivers/video/fbdev/clps711x-fb.c | 6 ++---- + drivers/video/fbdev/cobalt_lcdfb.c | 6 ++---- + drivers/video/fbdev/da8xx-fb.c | 6 ++---- + drivers/video/fbdev/efifb.c | 6 ++---- + drivers/video/fbdev/ep93xx-fb.c | 6 ++---- + drivers/video/fbdev/ffb.c | 6 ++---- + drivers/video/fbdev/fsl-diu-fb.c | 6 ++---- + drivers/video/fbdev/gbefb.c | 6 ++---- + drivers/video/fbdev/goldfishfb.c | 5 ++--- + drivers/video/fbdev/grvga.c | 6 ++---- + drivers/video/fbdev/hecubafb.c | 5 ++--- + drivers/video/fbdev/hgafb.c | 6 ++---- + drivers/video/fbdev/hitfb.c | 6 ++---- + drivers/video/fbdev/imxfb.c | 6 ++---- + drivers/video/fbdev/leo.c | 6 ++---- + drivers/video/fbdev/mb862xx/mb862xxfbdrv.c | 5 ++--- + drivers/video/fbdev/metronomefb.c | 5 ++--- + drivers/video/fbdev/mmp/hw/mmp_ctrl.c | 2 +- + drivers/video/fbdev/mx3fb.c | 5 ++--- + drivers/video/fbdev/ocfb.c | 6 ++---- + drivers/video/fbdev/offb.c | 8 +++----- + drivers/video/fbdev/omap/omapfb_main.c | 6 ++---- + drivers/video/fbdev/omap2/omapfb/dss/core.c | 6 ++---- + drivers/video/fbdev/omap2/omapfb/dss/dispc.c | 5 ++--- + drivers/video/fbdev/omap2/omapfb/dss/dpi.c | 5 ++--- + drivers/video/fbdev/omap2/omapfb/dss/dsi.c | 5 ++--- + drivers/video/fbdev/omap2/omapfb/dss/dss.c | 5 ++--- + drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c | 5 ++--- + drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c | 5 ++--- + drivers/video/fbdev/omap2/omapfb/dss/sdi.c | 5 ++--- + drivers/video/fbdev/omap2/omapfb/dss/venc.c | 5 ++--- + drivers/video/fbdev/omap2/omapfb/omapfb-main.c | 6 ++---- + drivers/video/fbdev/p9100.c | 6 ++---- + drivers/video/fbdev/platinumfb.c | 6 ++---- + drivers/video/fbdev/ps3fb.c | 1 + + drivers/video/fbdev/pxa168fb.c | 8 +++----- + drivers/video/fbdev/pxa3xx-gcu.c | 6 ++---- + drivers/video/fbdev/pxafb.c | 8 +++----- + drivers/video/fbdev/s1d13xxxfb.c | 5 ++--- + drivers/video/fbdev/s3c-fb.c | 6 ++---- + drivers/video/fbdev/sh7760fb.c | 6 ++---- + drivers/video/fbdev/sh_mobile_lcdcfb.c | 5 ++--- + drivers/video/fbdev/simplefb.c | 6 ++---- + drivers/video/fbdev/sm501fb.c | 6 ++---- + drivers/video/fbdev/tcx.c | 6 ++---- + drivers/video/fbdev/uvesafb.c | 6 ++---- + drivers/video/fbdev/vesafb.c | 6 ++---- + drivers/video/fbdev/vfb.c | 6 +++--- + drivers/video/fbdev/vga16fb.c | 6 ++---- + drivers/video/fbdev/via/via-gpio.c | 5 ++--- + drivers/video/fbdev/via/via_i2c.c | 5 ++--- + drivers/video/fbdev/vt8500lcdfb.c | 6 ++---- + drivers/video/fbdev/wm8505fb.c | 6 ++---- + drivers/video/fbdev/wmt_ge_rops.c | 5 ++--- + drivers/video/fbdev/xilinxfb.c | 6 ++---- + include/linux/vt_buffer.h | 2 +- + 61 files changed, 121 insertions(+), 212 deletions(-) +Merging regmap/for-next (4a670ac3e75e5 regmap: allow upshifting register addresses before performing operations) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap/for-next +Already up to date. +Merging sound/for-next (c51e431052e2e ALSA: hda: Glenfly: add HD Audio PCI IDs and HDMI Codec Vendor IDs.) +$ 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/pci/ymfpci/ymfpci_main.c +Auto-merging sound/pci/ymfpci/ymfpci.c +Auto-merging sound/pci/hda/patch_hdmi.c +Auto-merging sound/pci/emu10k1/emupcm.c +Auto-merging sound/core/pcm_native.c +Merge made by the 'recursive' strategy. + Documentation/sound/alsa-configuration.rst | 5 +- + Documentation/sound/cards/audigy-mixer.rst | 27 +- + Documentation/sound/cards/sb-live-mixer.rst | 17 +- + .../sound/kernel-api/writing-an-alsa-driver.rst | 1088 ++++++++------------ + include/sound/ac97_codec.h | 3 + + include/sound/emu10k1.h | 733 +++++++------ + include/sound/pcm-indirect.h | 22 +- + include/sound/pcm.h | 14 +- + include/uapi/sound/asound.h | 14 +- + include/uapi/sound/emu10k1.h | 150 ++- + sound/ac97_bus.c | 11 - + sound/core/pcm_lib.c | 97 +- + sound/core/pcm_local.h | 3 +- + sound/core/pcm_native.c | 14 +- + sound/drivers/portman2x4.c | 10 - + sound/pci/Kconfig | 4 +- + sound/pci/asihpi/hpi6000.c | 2 - + sound/pci/emu10k1/emu10k1.c | 11 - + sound/pci/emu10k1/emu10k1_callback.c | 5 +- + sound/pci/emu10k1/emu10k1_main.c | 256 ++--- + sound/pci/emu10k1/emufx.c | 69 +- + sound/pci/emu10k1/emumixer.c | 45 +- + sound/pci/emu10k1/emupcm.c | 80 +- + sound/pci/emu10k1/emuproc.c | 5 +- + sound/pci/emu10k1/io.c | 61 +- + sound/pci/emu10k1/irq.c | 32 +- + sound/pci/emu10k1/p16v.c | 113 +- + sound/pci/emu10k1/p16v.h | 2 +- + sound/pci/emu10k1/p17v.h | 4 +- + sound/pci/hda/hda_intel.c | 24 + + sound/pci/hda/patch_hdmi.c | 34 +- + sound/pci/rme9652/hdspm.c | 6 - + sound/pci/ymfpci/ymfpci.c | 39 +- + sound/pci/ymfpci/ymfpci.h | 54 +- + sound/pci/ymfpci/ymfpci_main.c | 79 +- + sound/ppc/tumbler.c | 4 +- + sound/usb/card.c | 1 - + sound/usb/endpoint.c | 21 +- + sound/usb/helper.c | 1 - + sound/usb/usbaudio.h | 2 + + tools/testing/selftests/alsa/mixer-test.c | 66 +- + tools/testing/selftests/alsa/pcm-test.c | 23 +- + 42 files changed, 1458 insertions(+), 1793 deletions(-) +Merging ieee1394/for-next (02dc51a0a07a3 firewire: init_ohci1394_dma: use correct function names in comments) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git ieee1394/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 5 +++-- + drivers/firewire/init_ohci1394_dma.c | 4 ++-- + 2 files changed, 5 insertions(+), 4 deletions(-) +Merging sound-asoc/for-next (377171af728ed Merge remote-tracking branch 'asoc/for-6.3' into asoc-linus) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next +Already up to date. +$ git am -3 ../patches/0001-ASoC-cs42l42-fix-up-for-i2c-Make-remove-callback-ret.patch +Applying: ASoC: cs42l42: fix up for "i2c: Make remove callback return void" +Using index info to reconstruct a base tree... +M sound/soc/codecs/cs42l42-i2c.c +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +$ git am -3 ../patches/0001-ASoC-cs42l83-fix-up-for-i2c-Make-remove-callback-ret.patch +Applying: ASoC: cs42l83: fix up for "i2c: Make remove callback return void" +Using index info to reconstruct a base tree... +M sound/soc/codecs/cs42l83-i2c.c +Falling back to patching base and 3-way merge... +Auto-merging sound/soc/codecs/cs42l83-i2c.c +No changes -- Patch already applied. +Merging modules/modules-next (8660484ed1cf3 module: add debugging auto-load duplicate module support) +$ git merge -m Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules/modules-next +Auto-merging scripts/mod/modpost.c +Auto-merging scripts/gdb/linux/constants.py.in +CONFLICT (content): Merge conflict in scripts/gdb/linux/constants.py.in +Auto-merging mm/zswap.c +Auto-merging lib/Makefile +Auto-merging kernel/watch_queue.c +Auto-merging kernel/trace/ftrace.c +Auto-merging kernel/printk/printk.c +Auto-merging kernel/module/kallsyms.c +Auto-merging kernel/module/internal.h +Auto-merging kernel/livepatch/core.c +Auto-merging kernel/Makefile +Auto-merging include/linux/module.h +Auto-merging fs/binfmt_elf.c +Auto-merging drivers/video/fbdev/wmt_ge_rops.c +Auto-merging drivers/video/fbdev/wm8505fb.c +Auto-merging drivers/soc/tegra/cbb/tegra234-cbb.c +Auto-merging drivers/soc/tegra/cbb/tegra194-cbb.c +Auto-merging drivers/regulator/stm32-pwr.c +Auto-merging drivers/power/supply/power_supply_core.c +Auto-merging drivers/platform/x86/intel/ifs/sysfs.c +Auto-merging drivers/perf/apple_m1_cpu_pmu.c +Auto-merging drivers/nvmem/core.c +Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +Auto-merging drivers/interconnect/core.c +Auto-merging drivers/infiniband/ulp/srp/ib_srp.c +Auto-merging drivers/edac/altera_edac.c +Auto-merging drivers/dma-buf/heaps/system_heap.c +Auto-merging drivers/clk/renesas/renesas-cpg-mssr.c +Auto-merging drivers/clk/microchip/clk-mpfs.c +Auto-merging arch/x86/kernel/cpu/intel.c +Auto-merging arch/s390/kernel/module.c +Auto-merging arch/mips/kernel/vpe.c +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Resolved 'scripts/gdb/linux/constants.py.in' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master ab9e42d131e41] Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.txt | 6 + + Documentation/core-api/kernel-api.rst | 24 +- + .../translations/zh_CN/core-api/kernel-api.rst | 2 +- + MAINTAINERS | 13 +- + arch/arc/kernel/unwind.c | 12 +- + arch/arm/boot/compressed/decompress.c | 1 + + arch/arm/kernel/module-plts.c | 9 +- + arch/arm64/kernel/module-plts.c | 13 +- + arch/ia64/kernel/module.c | 24 +- + arch/mips/cavium-octeon/setup.c | 2 +- + arch/mips/kernel/vpe.c | 11 +- + arch/parisc/kernel/module.c | 51 +- + arch/powerpc/kernel/module_32.c | 7 +- + arch/s390/kernel/module.c | 26 +- + arch/x86/crypto/blake2s-glue.c | 5 +- + arch/x86/kernel/callthunks.c | 4 +- + arch/x86/kernel/cpu/intel.c | 2 +- + arch/x86/kernel/module.c | 4 +- + arch/x86/mm/debug_pagetables.c | 1 - + crypto/asymmetric_keys/asymmetric_type.c | 1 - + drivers/accessibility/braille/braille_console.c | 1 - + drivers/bus/arm-integrator-lm.c | 1 - + drivers/bus/bt1-apb.c | 1 - + drivers/bus/bt1-axi.c | 1 - + drivers/bus/intel-ixp4xx-eb.c | 1 - + drivers/bus/qcom-ebi2.c | 1 - + drivers/bus/qcom-ssc-block-bus.c | 1 - + drivers/bus/simple-pm-bus.c | 2 +- + drivers/clk/clk-bm1880.c | 1 - + drivers/clk/microchip/clk-mpfs.c | 1 - + drivers/clk/renesas/renesas-cpg-mssr.c | 1 - + drivers/clk/renesas/rzg2l-cpg.c | 1 - + drivers/clocksource/em_sti.c | 1 - + drivers/clocksource/sh_cmt.c | 1 - + drivers/clocksource/sh_mtu2.c | 1 - + drivers/clocksource/sh_tmu.c | 1 - + drivers/clocksource/timer-stm32-lp.c | 1 - + drivers/clocksource/timer-tegra186.c | 1 - + drivers/clocksource/timer-ti-dm.c | 1 - + drivers/dma-buf/heaps/cma_heap.c | 1 - + drivers/dma-buf/heaps/system_heap.c | 1 - + drivers/dma-buf/udmabuf.c | 1 - + drivers/dma/ep93xx_dma.c | 1 - + drivers/dma/ipu/ipu_idmac.c | 1 - + drivers/dma/mv_xor_v2.c | 1 - + drivers/dma/sh/shdma-base.c | 1 - + drivers/dma/stm32-dmamux.c | 1 - + drivers/dma/stm32-mdma.c | 1 - + drivers/firmware/broadcom/bcm47xx_nvram.c | 1 - + drivers/firmware/efi/runtime-wrappers.c | 2 +- + drivers/firmware/efi/vars.c | 2 +- + drivers/hwspinlock/hwspinlock_core.c | 1 - + drivers/infiniband/ulp/srp/ib_srp.c | 5 - + drivers/interconnect/core.c | 5 - + drivers/iommu/sun50i-iommu.c | 1 - + drivers/irqchip/irq-al-fic.c | 1 - + drivers/irqchip/irq-ls-scfg-msi.c | 1 - + drivers/irqchip/irq-mbigen.c | 1 - + drivers/irqchip/irq-mchp-eic.c | 1 - + drivers/irqchip/irq-renesas-intc-irqpin.c | 1 - + drivers/irqchip/irq-renesas-irqc.c | 1 - + drivers/irqchip/irq-renesas-rza1.c | 1 - + drivers/irqchip/irq-renesas-rzg2l.c | 1 - + drivers/irqchip/irq-sl28cpld.c | 1 - + drivers/irqchip/irq-ti-sci-inta.c | 1 - + drivers/irqchip/irq-ti-sci-intr.c | 1 - + drivers/macintosh/adb.c | 2 +- + drivers/mailbox/Kconfig | 2 +- + drivers/mailbox/rockchip-mailbox.c | 1 - + drivers/mfd/altera-sysmgr.c | 1 - + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 2 +- + drivers/nvmem/core.c | 1 - + drivers/phy/intel/phy-intel-lgm-combo.c | 1 - + drivers/pinctrl/actions/pinctrl-s500.c | 1 - + drivers/pinctrl/actions/pinctrl-s700.c | 1 - + drivers/pinctrl/actions/pinctrl-s900.c | 1 - + drivers/pinctrl/bcm/pinctrl-ns.c | 1 - + drivers/pinctrl/mediatek/pinctrl-mt8188.c | 1 - + drivers/pinctrl/mediatek/pinctrl-mt8192.c | 1 - + drivers/pinctrl/mediatek/pinctrl-mt8365.c | 1 - + drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 1 - + drivers/pinctrl/pinctrl-amd.c | 1 - + drivers/pinctrl/renesas/pinctrl-rza1.c | 1 - + drivers/pinctrl/renesas/pinctrl-rza2.c | 1 - + drivers/pinctrl/renesas/pinctrl-rzg2l.c | 1 - + drivers/pinctrl/renesas/pinctrl-rzn1.c | 1 - + drivers/pinctrl/renesas/pinctrl-rzv2m.c | 1 - + drivers/platform/x86/intel/ifs/sysfs.c | 2 +- + drivers/power/reset/as3722-poweroff.c | 1 - + drivers/power/reset/gpio-poweroff.c | 1 - + drivers/power/reset/gpio-restart.c | 1 - + drivers/power/reset/keystone-reset.c | 1 - + drivers/power/reset/ltc2952-poweroff.c | 1 - + drivers/power/reset/mt6323-poweroff.c | 1 - + drivers/power/reset/regulator-poweroff.c | 1 - + drivers/power/reset/restart-poweroff.c | 1 - + drivers/power/reset/tps65086-restart.c | 1 - + drivers/power/supply/power_supply_core.c | 1 - + drivers/power/supply/wm97xx_battery.c | 1 - + drivers/regulator/stm32-pwr.c | 1 - + drivers/remoteproc/remoteproc_core.c | 1 - + drivers/reset/reset-lantiq.c | 1 - + drivers/reset/reset-microchip-sparx5.c | 1 - + drivers/reset/reset-mpfs.c | 1 - + drivers/scsi/esas2r/esas2r_ioctl.c | 2 +- + drivers/soc/apple/apple-pmgr-pwrstate.c | 1 - + drivers/soc/fujitsu/a64fx-diag.c | 1 - + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 2 +- + drivers/video/fbdev/wm8505fb.c | 1 - + drivers/video/fbdev/wmt_ge_rops.c | 1 - + fs/binfmt_elf.c | 1 - + fs/nfs_common/nfs_ssc.c | 1 - + fs/unicode/utf8-core.c | 1 - + include/linux/dynamic_debug.h | 68 +- + include/linux/kallsyms.h | 7 +- + include/linux/module.h | 141 ++- + include/linux/module_symbol.h | 17 + + include/linux/semaphore.h | 10 +- + kernel/Makefile | 1 - + kernel/dma/map_benchmark.c | 1 - + kernel/events/hw_breakpoint_test.c | 1 - + kernel/kallsyms.c | 5 +- + kernel/kallsyms_selftest.c | 6 +- + kernel/livepatch/core.c | 3 +- + kernel/module/Kconfig | 100 +- + kernel/module/Makefile | 6 +- + kernel/module/decompress.c | 6 +- + kernel/module/dups.c | 246 +++++ + kernel/module/internal.h | 140 ++- + kernel/module/kallsyms.c | 78 +- + kernel/module/kdb.c | 17 +- + kernel/{ => module}/kmod.c | 49 +- + kernel/module/main.c | 1091 +++++++++++--------- + kernel/module/procfs.c | 16 +- + kernel/module/stats.c | 430 ++++++++ + kernel/module/strict_rwx.c | 99 +- + kernel/module/tracking.c | 7 +- + kernel/module/tree_lookup.c | 39 +- + kernel/params.c | 2 +- + kernel/printk/printk.c | 2 +- + kernel/trace/ftrace.c | 3 +- + kernel/trace/rv/reactor_panic.c | 1 - + kernel/trace/rv/reactor_printk.c | 1 - + kernel/watch_queue.c | 1 - + lib/Makefile | 3 + + lib/btree.c | 1 - + lib/crypto/blake2s-generic.c | 5 - + lib/crypto/blake2s.c | 1 - + lib/dynamic_debug.c | 51 +- + lib/pldmfw/pldmfw.c | 1 - + lib/test_fprobe.c | 1 - + mm/zpool.c | 1 - + mm/zswap.c | 1 - + net/rxrpc/call_object.c | 6 +- + scripts/gdb/linux/constants.py.in | 3 + + scripts/gdb/linux/modules.py | 4 +- + scripts/gdb/linux/symbols.py | 4 +- + scripts/mod/modpost.c | 12 +- + 158 files changed, 1982 insertions(+), 1034 deletions(-) + create mode 100644 include/linux/module_symbol.h + create mode 100644 kernel/module/dups.c + rename kernel/{ => module}/kmod.c (77%) + create mode 100644 kernel/module/stats.c +Merging input/next (c55d84fb2bd89 dt-bindings: input: pwm-beeper: convert to dt schema) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next +Auto-merging drivers/input/touchscreen/sun4i-ts.c +Auto-merging drivers/input/joystick/xpad.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/input/pwm-beeper.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/input/adc-joystick.yaml | 4 +- + .../bindings/input/google,cros-ec-keyb.yaml | 4 +- + .../devicetree/bindings/input/imx-keypad.yaml | 2 +- + .../devicetree/bindings/input/matrix-keymap.yaml | 2 +- + .../bindings/input/mediatek,mt6779-keypad.yaml | 2 +- + .../bindings/input/microchip,cap11xx.yaml | 4 +- + .../devicetree/bindings/input/pwm-beeper.txt | 24 - + .../devicetree/bindings/input/pwm-beeper.yaml | 41 ++ + .../devicetree/bindings/input/pwm-vibrator.yaml | 4 +- + .../bindings/input/regulator-haptic.yaml | 4 +- + .../input/touchscreen/elan,elants_i2c.yaml | 4 +- + MAINTAINERS | 6 + + arch/arm/mach-pxa/spitz.c | 1 + + drivers/input/Kconfig | 10 + + drivers/input/Makefile | 1 + + drivers/input/joystick/xpad.c | 46 +- + drivers/input/keyboard/gpio_keys.c | 3 + + drivers/input/keyboard/iqs62x-keys.c | 2 +- + drivers/input/keyboard/matrix_keypad.c | 6 +- + drivers/input/keyboard/omap4-keypad.c | 3 +- + drivers/input/keyboard/samsung-keypad.c | 3 +- + drivers/input/keyboard/st-keyscan.c | 2 +- + drivers/input/keyboard/tegra-kbc.c | 3 +- + drivers/input/keyboard/tm2-touchkey.c | 2 +- + drivers/input/misc/Kconfig | 11 + + drivers/input/misc/Makefile | 1 + + drivers/input/misc/cma3000_d0x.c | 2 - + drivers/input/misc/hp_sdc_rtc.c | 2 +- + drivers/input/misc/nxp-bbnsm-pwrkey.c | 193 ++++++++ + drivers/input/rmi4/rmi_bus.c | 2 +- + drivers/input/tests/.kunitconfig | 3 + + drivers/input/tests/Makefile | 3 + + drivers/input/tests/input_test.c | 150 +++++++ + drivers/input/touchscreen/Kconfig | 11 + + drivers/input/touchscreen/Makefile | 1 + + drivers/input/touchscreen/bcm_iproc_tsc.c | 2 +- + drivers/input/touchscreen/edt-ft5x06.c | 496 +++++++++++---------- + drivers/input/touchscreen/hideep.c | 33 +- + drivers/input/touchscreen/melfas_mip4.c | 19 +- + drivers/input/touchscreen/novatek-nvt-ts.c | 301 +++++++++++++ + drivers/input/touchscreen/raspberrypi-ts.c | 3 +- + drivers/input/touchscreen/sun4i-ts.c | 2 +- + drivers/input/touchscreen/tsc2007_core.c | 17 +- + drivers/input/touchscreen/zinitix.c | 2 +- + include/linux/input/matrix_keypad.h | 5 +- + 45 files changed, 1104 insertions(+), 338 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/input/pwm-beeper.txt + create mode 100644 Documentation/devicetree/bindings/input/pwm-beeper.yaml + create mode 100644 drivers/input/misc/nxp-bbnsm-pwrkey.c + create mode 100644 drivers/input/tests/.kunitconfig + create mode 100644 drivers/input/tests/Makefile + create mode 100644 drivers/input/tests/input_test.c + create mode 100644 drivers/input/touchscreen/novatek-nvt-ts.c +Merging block/for-next (d728076bbfacc Merge branch 'for-6.4/block' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next +Auto-merging fs/splice.c +Auto-merging fs/pipe.c +Auto-merging drivers/block/zram/zram_drv.c +Merge made by the 'recursive' strategy. + block/bdev.c | 13 +++- + block/blk-integrity.c | 175 +++++++++++++++--------------------------- + block/blk.h | 12 +-- + block/genhd.c | 19 ++--- + block/partitions/core.c | 8 -- + drivers/block/brd.c | 1 - + drivers/block/nbd.c | 1 - + drivers/block/null_blk/main.c | 1 - + drivers/block/zram/zram_drv.c | 1 - + drivers/md/bcache/super.c | 1 - + fs/splice.c | 34 +++++++- + include/linux/blkdev.h | 3 - + 12 files changed, 111 insertions(+), 158 deletions(-) +$ git am -3 ../patches/0001-fix-up-for-iov_iter-add-copy_page_to_iter_nofault.patch +Applying: fix up for "iov_iter: add copy_page_to_iter_nofault()" +$ git reset HEAD^ +Unstaged changes after reset: +M lib/iov_iter.c +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master 6c8367a679a02] Merge branch 'for-next' of git://git.kernel.dk/linux-block.git + Date: Thu Apr 27 13:37:47 2023 +0100 +Merging device-mapper/for-next (38d11da522aac dm: don't lock fs when the map is NULL in process of resume) +$ 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 +Already up to date. +Merging libata/for-next (140b26035b2d3 ata: pata_parport-bpck6: Declare mode_map as static) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git libata/for-next +Already up to date. +Merging pcmcia/pcmcia-next (15e74c6c1ce2d pcmcia: remove AT91RM9200 Compact Flash driver) +$ 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 (22a4455e75be4 dt-bindings: mmc: sdhci-msm: Document the IPQ5018 compatible) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next +Already up to date. +Merging mfd/for-mfd-next (9e9ff39243ea8 dt-bindings: mfd: ti,j721e-system-controller: Add SoC chip ID) + 1706636eafcab ("dt-bindings: mfd: dlg,da9063: Document voltage monitoring") +$ 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 +Removing include/linux/mfd/samsung/s5m8763.h +Auto-merging drivers/mfd/ocelot-spi.c +Auto-merging drivers/gpio/Makefile +Auto-merging drivers/gpio/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-bus-counter | 32 + + .../bindings/mfd/canaan,k210-sysctl.yaml | 6 +- + .../devicetree/bindings/mfd/google,cros-ec.yaml | 22 +- + .../bindings/mfd/hisilicon,hi6421-spmi-pmic.yaml | 2 +- + .../devicetree/bindings/mfd/maxim,max5970.yaml | 151 ++++ + .../devicetree/bindings/mfd/qcom,spmi-pmic.yaml | 15 +- + .../devicetree/bindings/mfd/qcom,tcsr.yaml | 4 + + .../devicetree/bindings/mfd/qcom-pm8xxx.yaml | 2 +- + .../devicetree/bindings/mfd/rohm,bd71815-pmic.yaml | 2 +- + .../devicetree/bindings/mfd/rohm,bd71828-pmic.yaml | 2 +- + Documentation/devicetree/bindings/mfd/syscon.yaml | 2 + + .../bindings/mfd/ti,j721e-system-controller.yaml | 11 + + .../devicetree/bindings/mfd/ti,nspire-misc.yaml | 51 ++ + .../devicetree/bindings/mfd/wlf,arizona.yaml | 2 +- + .../devicetree/bindings/mfd/x-powers,ac100.yaml | 4 +- + .../devicetree/bindings/mfd/x-powers,axp152.yaml | 32 +- + .../devicetree/bindings/mfd/xylon,logicvc.yaml | 4 +- + .../devicetree/bindings/timer/renesas,rz-mtu3.yaml | 302 +++++++ + MAINTAINERS | 8 + + drivers/counter/Kconfig | 11 + + drivers/counter/Makefile | 1 + + drivers/counter/rz-mtu3-cnt.c | 906 +++++++++++++++++++++ + drivers/gpio/Kconfig | 12 + + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio-ljca.c | 454 +++++++++++ + drivers/leds/Kconfig | 14 + + drivers/leds/Makefile | 1 + + drivers/leds/leds-bd2606mvv.c | 160 ++++ + drivers/mfd/88pm860x-core.c | 4 +- + drivers/mfd/Kconfig | 23 +- + drivers/mfd/Makefile | 1 + + drivers/mfd/arizona-i2c.c | 1 + + drivers/mfd/arizona-spi.c | 1 + + drivers/mfd/atc260x-i2c.c | 2 +- + drivers/mfd/atmel-flexcom.c | 4 +- + drivers/mfd/atmel-smc.c | 2 +- + drivers/mfd/axp20x-i2c.c | 2 + + drivers/mfd/axp20x.c | 108 +++ + drivers/mfd/bcm2835-pm.c | 3 +- + drivers/mfd/da903x.c | 1 - + drivers/mfd/da9052-core.c | 1 - + drivers/mfd/da9052-i2c.c | 1 - + drivers/mfd/da9052-spi.c | 1 - + drivers/mfd/da9055-core.c | 1 - + drivers/mfd/da9055-i2c.c | 1 - + drivers/mfd/da9062-core.c | 176 ++-- + drivers/mfd/dln2.c | 1 + + drivers/mfd/ezx-pcap.c | 1 - + drivers/mfd/hi6421-pmic-core.c | 4 +- + drivers/mfd/intel-lpss-pci.c | 15 + + drivers/mfd/intel_soc_pmic_chtwc.c | 14 +- + drivers/mfd/intel_soc_pmic_crc.c | 1 - + drivers/mfd/ipaq-micro.c | 4 +- + drivers/mfd/khadas-mcu.c | 2 +- + drivers/mfd/lp8788.c | 1 - + drivers/mfd/mfd-core.c | 26 - + drivers/mfd/ocelot-spi.c | 1 + + drivers/mfd/omap-usb-host.c | 1 - + drivers/mfd/omap-usb-tll.c | 6 - + drivers/mfd/qcom-pm8008.c | 132 ++- + drivers/mfd/qcom_rpm.c | 4 +- + drivers/mfd/rsmu.h | 2 + + drivers/mfd/rsmu_i2c.c | 165 +++- + drivers/mfd/rsmu_spi.c | 48 +- + drivers/mfd/rz-mtu3.c | 391 +++++++++ + drivers/mfd/rz-mtu3.h | 147 ++++ + drivers/mfd/sec-core.c | 46 -- + drivers/mfd/sec-irq.c | 89 -- + drivers/mfd/si476x-cmd.c | 14 +- + drivers/mfd/simple-mfd-i2c.c | 13 + + drivers/mfd/ssbi.c | 4 +- + drivers/mfd/stmpe-i2c.c | 1 - + drivers/mfd/stmpe-spi.c | 1 - + drivers/mfd/stmpe.c | 2 +- + drivers/mfd/sun4i-gpadc.c | 4 +- + drivers/mfd/tc3589x.c | 1 - + drivers/mfd/tps6586x.c | 1 - + drivers/mfd/tqmx86.c | 52 +- + drivers/mfd/twl-core.c | 65 -- + drivers/mfd/twl4030-audio.c | 1 - + drivers/mfd/twl6040.c | 1 - + drivers/mfd/wm8994-core.c | 19 +- + drivers/rtc/rtc-s5m.c | 82 +- + include/dt-bindings/mfd/stm32f4-rcc.h | 1 - + include/linux/mfd/axp20x.h | 85 ++ + include/linux/mfd/core.h | 20 +- + include/linux/mfd/max597x.h | 96 +++ + include/linux/mfd/rsmu.h | 5 +- + include/linux/mfd/rt5033-private.h | 17 +- + include/linux/mfd/rt5033.h | 7 +- + include/linux/mfd/rz-mtu3.h | 257 ++++++ + include/linux/mfd/samsung/core.h | 2 - + include/linux/mfd/samsung/irq.h | 50 -- + include/linux/mfd/samsung/s5m8763.h | 90 -- + 94 files changed, 3694 insertions(+), 845 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mfd/maxim,max5970.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/ti,nspire-misc.yaml + create mode 100644 Documentation/devicetree/bindings/timer/renesas,rz-mtu3.yaml + create mode 100644 drivers/counter/rz-mtu3-cnt.c + create mode 100644 drivers/gpio/gpio-ljca.c + create mode 100644 drivers/leds/leds-bd2606mvv.c + create mode 100644 drivers/mfd/rz-mtu3.c + create mode 100644 drivers/mfd/rz-mtu3.h + create mode 100644 include/linux/mfd/max597x.h + create mode 100644 include/linux/mfd/rz-mtu3.h + delete mode 100644 include/linux/mfd/samsung/s5m8763.h +$ git am -3 ../patches/0001-fixup-for-mfd-qcom-pm8008-Convert-irq-chip-to-config.patch +Applying: fixup for "mfd: qcom-pm8008: Convert irq chip to config regs" +Using index info to reconstruct a base tree... +M drivers/mfd/qcom-pm8008.c +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +Merging backlight/for-backlight-next (fb200218b40b7 backlight: as3711: Use of_property_read_bool() for boolean properties) +$ 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 +Merge made by the 'recursive' strategy. + drivers/video/backlight/aat2870_bl.c | 6 ++---- + drivers/video/backlight/adp5520_bl.c | 6 ++---- + drivers/video/backlight/arcxcnn_bl.c | 2 +- + drivers/video/backlight/as3711_bl.c | 24 ++++++++++++------------ + drivers/video/backlight/cr_bllcd.c | 6 ++---- + drivers/video/backlight/da9052_bl.c | 6 ++---- + drivers/video/backlight/hp680_bl.c | 6 ++---- + drivers/video/backlight/hx8357.c | 2 +- + drivers/video/backlight/led_bl.c | 6 ++---- + drivers/video/backlight/lm3533_bl.c | 6 ++---- + drivers/video/backlight/lp855x_bl.c | 2 +- + drivers/video/backlight/lp8788_bl.c | 6 ++---- + drivers/video/backlight/mt6370-backlight.c | 6 ++---- + drivers/video/backlight/pwm_bl.c | 6 ++---- + drivers/video/backlight/qcom-wled.c | 7 +++---- + drivers/video/backlight/rt4831-backlight.c | 6 ++---- + drivers/video/backlight/sky81452-backlight.c | 6 ++---- + 17 files changed, 42 insertions(+), 67 deletions(-) +Merging battery/for-next (baba1315a74d1 power: supply: rk817: Fix low SOC bugs) +$ 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 +Removing include/linux/power/generic-adc-battery.h +Auto-merging drivers/power/supply/power_supply_core.c +Merge made by the 'recursive' strategy. + .../bindings/power/supply/adc-battery.yaml | 70 ++++++ + drivers/power/reset/qcom-pon.c | 2 +- + drivers/power/supply/axp288_charger.c | 15 +- + drivers/power/supply/bq24257_charger.c | 2 +- + drivers/power/supply/bq256xx_charger.c | 40 ++++ + drivers/power/supply/bq25890_charger.c | 2 +- + drivers/power/supply/charger-manager.c | 2 +- + drivers/power/supply/generic-adc-battery.c | 245 ++++++--------------- + drivers/power/supply/lp8727_charger.c | 2 +- + drivers/power/supply/ltc4162-l-charger.c | 2 +- + drivers/power/supply/power_supply_core.c | 179 +++++++++++++-- + drivers/power/supply/power_supply_sysfs.c | 23 +- + drivers/power/supply/rk817_charger.c | 46 ++-- + drivers/power/supply/rt9455_charger.c | 2 +- + drivers/power/supply/twl4030_charger.c | 2 +- + include/linux/power/generic-adc-battery.h | 23 -- + include/linux/power_supply.h | 8 + + 17 files changed, 412 insertions(+), 253 deletions(-) + create mode 100644 Documentation/devicetree/bindings/power/supply/adc-battery.yaml + delete mode 100644 include/linux/power/generic-adc-battery.h +Merging regulator/for-next (43c75e470e5b5 Merge remote-tracking branch 'regulator/for-6.4' 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 +Already up to date! +Merge made by the 'recursive' strategy. +Merging security/next (d82dcd9e21b77 reiserfs: Add security prefix to xattr name in reiserfs_security_write()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git security/next +Already up to date. +Merging apparmor/apparmor-next (0bb84cff96af2 apparmor: fix missing error check for rhashtable_insert_fast) +$ 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/policy_unpack.c +Auto-merging security/apparmor/file.c +Auto-merging security/apparmor/domain.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 2220 and retry the command. +Merge made by the 'recursive' strategy. + security/apparmor/crypto.c | 10 +++++----- + security/apparmor/domain.c | 2 +- + security/apparmor/file.c | 2 +- + security/apparmor/include/task.h | 2 +- + security/apparmor/policy.c | 7 ++----- + security/apparmor/policy_unpack.c | 11 ++++++++--- + security/apparmor/policy_unpack_test.c | 13 ++++++------- + security/apparmor/secid.c | 3 +-- + security/apparmor/task.c | 5 +---- + 9 files changed, 26 insertions(+), 29 deletions(-) +Merging integrity/next-integrity (644f17412f5ac IMA: allow/fix UML builds) +$ 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 'recursive' strategy. + security/integrity/ima/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging safesetid/safesetid-next (64b634830c919 LSM: SafeSetID: add setgroups() testing to selftest) +$ git merge -m Merge branch 'safesetid-next' of https://github.com/micah-morton/linux.git safesetid/safesetid-next +Already up to date. +Merging selinux/next (4ce1f694eb5d8 selinux: ensure av_permissions.h is built when needed) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next +Already up to date. +Merging smack/next (de93e515db306 Smack: Improve mount process memory use) +$ git merge -m Merge branch 'next' of git://github.com/cschaufler/smack-next smack/next +Already up to date. +Merging tomoyo/master (ecbb4441980e4 workqueue: Emit runtime message when flush_scheduled_work() is called) +$ git merge -m Merge branch 'master' of https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git tomoyo/master +Merge made by the 'recursive' strategy. + include/linux/workqueue.h | 2 ++ + kernel/workqueue.c | 2 ++ + 2 files changed, 4 insertions(+) +Merging tpmdd/next (e2f14081c6839 tpm: Re-enable TPM chip boostrapping non-tpm_tis TPM drivers) +$ 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 'recursive' strategy. + drivers/char/tpm/tpm-chip.c | 22 +++++++++++++++++++--- + drivers/char/tpm/tpm.h | 2 +- + drivers/char/tpm/tpm_tis_core.c | 2 +- + include/linux/tpm.h | 15 +++++++++------ + 4 files changed, 30 insertions(+), 11 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at 871170854bd80 Merge branch 'master' of https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git +Merging next-20230426 version of tpmdd +$ git merge -m next-20230426/tpmdd bd8621ca1510e6e802df9855bdc35a04a3cfa932 +Already up to date. +Merging watchdog/master (66efce1d099a6 MAINTAINERS: Add fragment for Xilinx watchdog driver) +$ git merge -m Merge branch 'master' of git://www.linux-watchdog.org/linux-watchdog-next.git watchdog/master +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml +Removing Documentation/devicetree/bindings/watchdog/rt2880-wdt.txt +Removing Documentation/devicetree/bindings/watchdog/gpio-wdt.yaml +Removing Documentation/devicetree/bindings/watchdog/alphascale-asm9260.txt +Merge made by the 'recursive' strategy. + .../bindings/watchdog/alphascale,asm9260-wdt.yaml | 70 +++ + .../bindings/watchdog/alphascale-asm9260.txt | 35 -- + .../bindings/watchdog/amlogic,meson-gxbb-wdt.yaml | 10 +- + .../bindings/watchdog/arm,sbsa-gwdt.yaml | 1 - + .../devicetree/bindings/watchdog/arm,sp805.yaml | 1 - + .../devicetree/bindings/watchdog/arm,twd-wdt.yaml | 6 +- + .../devicetree/bindings/watchdog/arm-smc-wdt.yaml | 7 +- + .../bindings/watchdog/atmel,sama5d4-wdt.yaml | 14 +- + .../bindings/watchdog/brcm,bcm7038-wdt.yaml | 6 +- + .../bindings/watchdog/faraday,ftwdt010.yaml | 16 +- + .../bindings/watchdog/fsl-imx7ulp-wdt.yaml | 4 +- + .../devicetree/bindings/watchdog/gpio-wdt.yaml | 55 -- + .../bindings/watchdog/linux,wdt-gpio.yaml | 17 +- + .../bindings/watchdog/mediatek,mt7621-wdt.yaml | 6 +- + .../bindings/watchdog/mediatek,mtk-wdt.yaml | 2 + + .../devicetree/bindings/watchdog/qcom-wdt.yaml | 36 +- + .../bindings/watchdog/ralink,rt2880-wdt.yaml | 46 ++ + .../bindings/watchdog/realtek,otto-wdt.yaml | 4 +- + .../devicetree/bindings/watchdog/renesas,wdt.yaml | 14 +- + .../devicetree/bindings/watchdog/rt2880-wdt.txt | 18 - + .../devicetree/bindings/watchdog/snps,dw-wdt.yaml | 32 +- + .../bindings/watchdog/st,stm32-iwdg.yaml | 10 +- + .../bindings/watchdog/starfive,jh7100-wdt.yaml | 71 +++ + .../bindings/watchdog/toshiba,visconti-wdt.yaml | 4 +- + .../bindings/watchdog/xlnx,xps-timebase-wdt.yaml | 12 +- + MAINTAINERS | 18 +- + drivers/watchdog/Kconfig | 11 + + drivers/watchdog/Makefile | 3 + + drivers/watchdog/acquirewdt.c | 6 +- + drivers/watchdog/advantechwdt.c | 6 +- + drivers/watchdog/ar7_wdt.c | 5 +- + drivers/watchdog/aspeed_wdt.c | 2 +- + drivers/watchdog/at91rm9200_wdt.c | 6 +- + drivers/watchdog/ath79_wdt.c | 5 +- + drivers/watchdog/bcm2835_wdt.c | 6 +- + drivers/watchdog/bcm47xx_wdt.c | 12 +- + drivers/watchdog/bcm_kona_wdt.c | 6 +- + drivers/watchdog/cpwd.c | 6 +- + drivers/watchdog/dw_wdt.c | 6 +- + drivers/watchdog/gef_wdt.c | 6 +- + drivers/watchdog/geodewdt.c | 5 +- + drivers/watchdog/ib700wdt.c | 5 +- + drivers/watchdog/ie6xx_wdt.c | 6 +- + drivers/watchdog/imx2_wdt.c | 4 +- + drivers/watchdog/ixp4xx_wdt.c | 18 +- + drivers/watchdog/loongson1_wdt.c | 36 +- + drivers/watchdog/lpc18xx_wdt.c | 6 +- + drivers/watchdog/menz69_wdt.c | 18 +- + drivers/watchdog/mtx-1_wdt.c | 5 +- + drivers/watchdog/nic7018_wdt.c | 6 +- + drivers/watchdog/nv_tco.c | 6 +- + drivers/watchdog/omap_wdt.c | 6 +- + drivers/watchdog/orion_wdt.c | 5 +- + drivers/watchdog/rc32434_wdt.c | 5 +- + drivers/watchdog/rdc321x_wdt.c | 6 +- + drivers/watchdog/renesas_wdt.c | 6 +- + drivers/watchdog/riowd.c | 6 +- + drivers/watchdog/rn5t618_wdt.c | 12 +- + drivers/watchdog/rt2880_wdt.c | 89 +-- + drivers/watchdog/rti_wdt.c | 6 +- + drivers/watchdog/s3c2410_wdt.c | 132 ++--- + drivers/watchdog/sa1100_wdt.c | 6 +- + drivers/watchdog/sbsa_gwdt.c | 4 +- + drivers/watchdog/sch311x_wdt.c | 5 +- + drivers/watchdog/shwdt.c | 6 +- + drivers/watchdog/sp5100_tco.c | 4 + + drivers/watchdog/st_lpc_wdt.c | 6 +- + drivers/watchdog/starfive-wdt.c | 606 +++++++++++++++++++++ + drivers/watchdog/stmp3xxx_rtc_wdt.c | 5 +- + drivers/watchdog/watchdog_core.c | 2 +- + drivers/watchdog/watchdog_dev.c | 3 +- + drivers/watchdog/watchdog_pretimeout.c | 3 +- + drivers/watchdog/wm8350_wdt.c | 9 +- + include/dt-bindings/reset/mediatek,mt6735-wdt.h | 17 + + 74 files changed, 1139 insertions(+), 526 deletions(-) + create mode 100644 Documentation/devicetree/bindings/watchdog/alphascale,asm9260-wdt.yaml + delete mode 100644 Documentation/devicetree/bindings/watchdog/alphascale-asm9260.txt + delete mode 100644 Documentation/devicetree/bindings/watchdog/gpio-wdt.yaml + create mode 100644 Documentation/devicetree/bindings/watchdog/ralink,rt2880-wdt.yaml + delete mode 100644 Documentation/devicetree/bindings/watchdog/rt2880-wdt.txt + create mode 100644 Documentation/devicetree/bindings/watchdog/starfive,jh7100-wdt.yaml + create mode 100644 drivers/watchdog/starfive-wdt.c + create mode 100644 include/dt-bindings/reset/mediatek,mt6735-wdt.h +Merging iommu/next (e51b4198396cd Merge branches 'iommu/fixes', 'arm/allwinner', 'arm/exynos', 'arm/mediatek', 'arm/omap', 'arm/renesas', 'arm/rockchip', 'arm/smmu', 'ppc/pamu', 'unisoc', 'x86/vt-d', 'x86/amd', 'core' and 'platform-remove_new' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git iommu/next +Auto-merging mm/init-mm.c +Auto-merging kernel/fork.c +Auto-merging include/linux/sched/mm.h +Removing include/linux/ioasid.h +Auto-merging drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_drv.c +CONFLICT (content): Merge conflict in drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_drv.c +Auto-merging drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_drv.c +CONFLICT (content): Merge conflict in drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_drv.c +Auto-merging drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c +CONFLICT (content): Merge conflict in drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c +Removing drivers/iommu/ioasid.c +Auto-merging arch/arm64/boot/dts/mediatek/mt8195.dtsi +Auto-merging arch/arm64/boot/dts/mediatek/mt8186.dtsi +Resolved 'drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c' using previous resolution. +Resolved 'drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_drv.c' using previous resolution. +Resolved 'drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_drv.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 77dc825f9e8d3] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-kernel-iommu_groups | 1 - + Documentation/arch/x86/sva.rst | 2 +- + .../devicetree/bindings/iommu/arm,smmu.yaml | 45 ++- + .../bindings/iommu/renesas,ipmmu-vmsa.yaml | 32 +- + .../bindings/media/mediatek,mt8195-jpegdec.yaml | 7 - + .../bindings/media/mediatek,mt8195-jpegenc.yaml | 7 - + .../bindings/media/mediatek,vcodec-decoder.yaml | 5 - + .../bindings/media/mediatek,vcodec-encoder.yaml | 5 - + .../bindings/media/mediatek-jpeg-encoder.yaml | 5 - + arch/arm64/boot/dts/mediatek/mt8186.dtsi | 1 + + arch/arm64/boot/dts/mediatek/mt8195.dtsi | 4 +- + arch/x86/kernel/traps.c | 2 +- + drivers/dma/idxd/device.c | 8 +- + drivers/dma/idxd/idxd.h | 2 +- + drivers/dma/idxd/init.c | 33 +- + drivers/dma/idxd/irq.c | 2 +- + drivers/iommu/Kconfig | 9 +- + drivers/iommu/Makefile | 1 - + drivers/iommu/amd/amd_iommu.h | 9 + + drivers/iommu/amd/amd_iommu_types.h | 12 +- + drivers/iommu/amd/init.c | 30 +- + drivers/iommu/amd/io_pgtable.c | 4 +- + drivers/iommu/amd/io_pgtable_v2.c | 25 +- + drivers/iommu/amd/iommu.c | 17 +- + drivers/iommu/apple-dart.c | 6 +- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 32 +- + drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 16 +- + drivers/iommu/arm/arm-smmu/arm-smmu.c | 14 +- + drivers/iommu/arm/arm-smmu/qcom_iommu.c | 12 +- + drivers/iommu/exynos-iommu.c | 24 +- + drivers/iommu/fsl_pamu.c | 9 +- + drivers/iommu/intel/cap_audit.c | 2 - + drivers/iommu/intel/dmar.c | 13 +- + drivers/iommu/intel/iommu.c | 277 ++++++-------- + drivers/iommu/intel/iommu.h | 35 +- + drivers/iommu/intel/irq_remapping.c | 2 +- + drivers/iommu/intel/pasid.c | 43 --- + drivers/iommu/intel/pasid.h | 7 - + drivers/iommu/intel/svm.c | 3 +- + drivers/iommu/ioasid.c | 422 --------------------- + drivers/iommu/iommu-sva.c | 61 +-- + drivers/iommu/iommu-sva.h | 4 - + drivers/iommu/iommu.c | 347 +++++++---------- + drivers/iommu/ipmmu-vmsa.c | 23 +- + drivers/iommu/msm_iommu.c | 5 +- + drivers/iommu/mtk_iommu.c | 158 ++++++-- + drivers/iommu/mtk_iommu_v1.c | 5 +- + drivers/iommu/omap-iommu.c | 7 +- + drivers/iommu/rockchip-iommu.c | 61 ++- + drivers/iommu/sprd-iommu.c | 60 ++- + .../media/platform/mediatek/jpeg/mtk_jpeg_core.c | 3 - + .../platform/mediatek/vcodec/mtk_vcodec_dec_drv.c | 8 - + .../platform/mediatek/vcodec/mtk_vcodec_enc_drv.c | 3 - + include/linux/ioasid.h | 83 ---- + include/linux/iommu.h | 21 +- + include/linux/sched/mm.h | 26 -- + kernel/fork.c | 1 + + mm/init-mm.c | 4 +- + 58 files changed, 789 insertions(+), 1276 deletions(-) + delete mode 100644 drivers/iommu/ioasid.c + delete mode 100644 include/linux/ioasid.h +Merging audit/next (fe15c26ee26ef Linux 6.3-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 (c50eb01940c75 Merge branch 'dt/address-cleanups' into dt/next) +$ 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 include/linux/cpufreq.h +Removing include/dt-bindings/reset/stih416-resets.h +Removing include/dt-bindings/reset/stih415-resets.h +Auto-merging drivers/thermal/cpuidle_cooling.c +Auto-merging drivers/soc/mediatek/mtk-svs.c +Auto-merging drivers/opp/of.c +Auto-merging drivers/of/address.c +Auto-merging drivers/irqchip/irq-loongson-eiointc.c +Auto-merging drivers/cpuidle/cpuidle-riscv-sbi.c +Auto-merging drivers/cpufreq/tegra20-cpufreq.c +Auto-merging drivers/cpufreq/tegra124-cpufreq.c +Auto-merging drivers/cpufreq/qcom-cpufreq-hw.c +Auto-merging drivers/cpufreq/pmac32-cpufreq.c +Auto-merging drivers/cpufreq/cpufreq-dt-platdev.c +Auto-merging drivers/base/cacheinfo.c +Auto-merging arch/riscv/kernel/setup.c +Auto-merging arch/riscv/kernel/cacheinfo.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/watchdog/st,stm32-iwdg.yaml +Auto-merging Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml +Auto-merging Documentation/devicetree/bindings/watchdog/renesas,wdt.yaml +Auto-merging Documentation/devicetree/bindings/watchdog/fsl-imx7ulp-wdt.yaml +Auto-merging Documentation/devicetree/bindings/watchdog/faraday,ftwdt010.yaml +Auto-merging Documentation/devicetree/bindings/watchdog/brcm,bcm7038-wdt.yaml +Auto-merging Documentation/devicetree/bindings/watchdog/atmel,sama5d4-wdt.yaml +Auto-merging Documentation/devicetree/bindings/watchdog/arm-smc-wdt.yaml +Auto-merging Documentation/devicetree/bindings/watchdog/apple,wdt.yaml +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Removing Documentation/devicetree/bindings/timer/amlogic,meson6-timer.txt +Auto-merging Documentation/devicetree/bindings/sound/simple-card.yaml +Auto-merging Documentation/devicetree/bindings/sound/qcom,wcd934x.yaml +Auto-merging Documentation/devicetree/bindings/sound/qcom,lpass-va-macro.yaml +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/sound/qcom,lpass-va-macro.yaml +Auto-merging Documentation/devicetree/bindings/sound/qcom,lpass-tx-macro.yaml +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/sound/qcom,lpass-tx-macro.yaml +Auto-merging Documentation/devicetree/bindings/sound/qcom,lpass-rx-macro.yaml +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/sound/qcom,lpass-rx-macro.yaml +Auto-merging Documentation/devicetree/bindings/sound/everest,es8316.yaml +Auto-merging Documentation/devicetree/bindings/soc/renesas/renesas.yaml +Auto-merging Documentation/devicetree/bindings/soc/qcom/qcom,smd-rpm.yaml +Auto-merging Documentation/devicetree/bindings/soc/qcom/qcom,apr.yaml +Removing Documentation/devicetree/bindings/rtc/snvs-rtc.txt +Auto-merging Documentation/devicetree/bindings/regulator/rohm,bd71847-regulator.yaml +Auto-merging Documentation/devicetree/bindings/regulator/rohm,bd71837-regulator.yaml +Auto-merging Documentation/devicetree/bindings/regulator/rohm,bd71828-regulator.yaml +Auto-merging Documentation/devicetree/bindings/regulator/nxp,pf8x00-regulator.yaml +Auto-merging Documentation/devicetree/bindings/regulator/nxp,pca9450-regulator.yaml +Auto-merging Documentation/devicetree/bindings/regulator/google,cros-ec-regulator.yaml +Auto-merging Documentation/devicetree/bindings/pci/qcom,pcie-ep.yaml +Auto-merging Documentation/devicetree/bindings/net/vertexcom-mse102x.yaml +Auto-merging Documentation/devicetree/bindings/net/mdio-gpio.yaml +Auto-merging Documentation/devicetree/bindings/mfd/x-powers,axp152.yaml +Auto-merging Documentation/devicetree/bindings/mfd/google,cros-ec.yaml +Auto-merging Documentation/devicetree/bindings/media/ti,cal.yaml +Auto-merging Documentation/devicetree/bindings/media/renesas,vin.yaml +Auto-merging Documentation/devicetree/bindings/media/i2c/sony,imx334.yaml +Auto-merging Documentation/devicetree/bindings/media/i2c/maxim,max9286.yaml +Auto-merging Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml +Removing Documentation/devicetree/bindings/iommu/qcom,iommu.txt +Auto-merging Documentation/devicetree/bindings/interrupt-controller/sifive,plic-1.0.0.yaml +Removing Documentation/devicetree/bindings/input/snvs-pwrkey.txt +Auto-merging Documentation/devicetree/bindings/input/google,cros-ec-keyb.yaml +Removing Documentation/devicetree/bindings/fpga/xilinx-slave-serial.txt +Removing Documentation/devicetree/bindings/fpga/xilinx-pr-decoupler.txt +Auto-merging Documentation/devicetree/bindings/display/mediatek/mediatek,ccorr.yaml +Removing Documentation/devicetree/bindings/display/bridge/toshiba,tc358764.txt +Removing Documentation/devicetree/bindings/display/bridge/ps8622.txt +Auto-merging Documentation/devicetree/bindings/display/bridge/nxp,ptn3460.yaml +Auto-merging Documentation/devicetree/bindings/display/bridge/analogix,anx7625.yaml +Removing Documentation/devicetree/bindings/crypto/fsl-sec4.txt +Auto-merging Documentation/devicetree/bindings/clock/samsung,exynos850-clock.yaml +Auto-merging Documentation/devicetree/bindings/clock/qcom,a53pll.yaml +Auto-merging Documentation/devicetree/bindings/cache/qcom,llcc.yaml +Auto-merging Documentation/devicetree/bindings/auxdisplay/holtek,ht16k33.yaml +Auto-merging Documentation/devicetree/bindings/ata/ahci-platform.yaml +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/ata/ahci-platform.yaml +Auto-merging Documentation/devicetree/bindings/arm/mediatek/mediatek,mt7622-wed.yaml +Auto-merging Documentation/devicetree/bindings/arm/cpus.yaml +Resolved 'Documentation/devicetree/bindings/ata/ahci-platform.yaml' using previous resolution. +Resolved 'Documentation/devicetree/bindings/sound/qcom,lpass-rx-macro.yaml' using previous resolution. +Resolved 'Documentation/devicetree/bindings/sound/qcom,lpass-tx-macro.yaml' using previous resolution. +Resolved 'Documentation/devicetree/bindings/sound/qcom,lpass-va-macro.yaml' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 26b4a06f91c4f] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/.yamllint | 2 +- + .../devicetree/bindings/arm/arm,vexpress-juno.yaml | 1 + + .../arm/bcm/raspberrypi,bcm2835-firmware.yaml | 5 +- + Documentation/devicetree/bindings/arm/cpus.yaml | 2 + + .../bindings/arm/mediatek/mediatek,infracfg.yaml | 4 +- + .../bindings/arm/mediatek/mediatek,mmsys.yaml | 4 +- + .../arm/mediatek/mediatek,mt7622-pcie-mirror.yaml | 4 +- + .../bindings/arm/mediatek/mediatek,mt7622-wed.yaml | 4 +- + .../arm/mediatek/mediatek,mt7986-wed-pcie.yaml | 4 +- + .../arm/mediatek/mediatek,mt8186-clock.yaml | 4 +- + .../arm/mediatek/mediatek,mt8186-sys-clock.yaml | 4 +- + .../arm/mediatek/mediatek,mt8192-clock.yaml | 4 +- + .../arm/mediatek/mediatek,mt8192-sys-clock.yaml | 4 +- + .../arm/mediatek/mediatek,mt8195-clock.yaml | 4 +- + .../arm/mediatek/mediatek,mt8195-sys-clock.yaml | 4 +- + .../bindings/arm/mediatek/mediatek,pericfg.yaml | 4 +- + .../bindings/arm/tegra/nvidia,tegra20-pmc.yaml | 4 + + .../devicetree/bindings/ata/ahci-common.yaml | 6 +- + .../devicetree/bindings/ata/renesas,rcar-sata.yaml | 4 +- + .../bindings/auxdisplay/holtek,ht16k33.yaml | 2 +- + .../bindings/bus/allwinner,sun50i-a64-de2.yaml | 1 + + .../bindings/bus/allwinner,sun8i-a23-rsb.yaml | 1 + + Documentation/devicetree/bindings/bus/palmbus.yaml | 1 + + .../baikal,bt1-l2-ctl.yaml | 2 +- + .../l2cache.txt => cache/freescale-l2cache.txt} | 0 + .../devicetree/bindings/{arm => cache}/l2c2x0.yaml | 2 +- + .../marvell,feroceon-cache.txt} | 0 + .../marvell,tauros2-cache.txt} | 0 + .../bindings/{arm/msm => cache}/qcom,llcc.yaml | 2 +- + .../bindings/{riscv => cache}/sifive,ccache0.yaml | 2 +- + .../socionext,uniphier-system-cache.yaml | 2 +- + .../bindings/chrome/google,cros-ec-typec.yaml | 2 +- + .../chrome/google,cros-kbd-led-backlight.yaml | 2 +- + .../devicetree/bindings/clock/arm,syscon-icst.yaml | 4 +- + .../bindings/clock/mediatek,apmixedsys.yaml | 4 +- + .../bindings/clock/mediatek,topckgen.yaml | 4 +- + .../devicetree/bindings/clock/qcom,a53pll.yaml | 4 +- + .../bindings/clock/renesas,cpg-mssr.yaml | 4 +- + .../clock/renesas,rcar-usb2-clock-sel.yaml | 4 +- + .../bindings/clock/renesas,rzg2l-cpg.yaml | 4 +- + .../bindings/clock/samsung,exynos850-clock.yaml | 2 +- + .../bindings/clock/sprd,sc9863a-clk.yaml | 4 +- + .../devicetree/bindings/clock/sprd,ums512-clk.yaml | 4 +- + .../devicetree/bindings/clock/ti,lmk04832.yaml | 2 +- + .../bindings/clock/xlnx,clocking-wizard.yaml | 4 +- + .../bindings/crypto/fsl,sec-v4.0-mon.yaml | 156 ++++++ + .../devicetree/bindings/crypto/fsl,sec-v4.0.yaml | 266 ++++++++++ + .../devicetree/bindings/crypto/fsl-sec4.txt | 553 --------------------- + .../devicetree/bindings/crypto/ti,sa2ul.yaml | 4 +- + .../bindings/display/bridge/analogix,anx7625.yaml | 5 +- + .../bindings/display/bridge/anx6345.yaml | 2 +- + .../bindings/display/bridge/lontium,lt8912b.yaml | 2 +- + .../bindings/display/bridge/nxp,ptn3460.yaml | 2 +- + .../bindings/display/bridge/parade,ps8622.yaml | 115 +++++ + .../devicetree/bindings/display/bridge/ps8622.txt | 31 -- + .../devicetree/bindings/display/bridge/ps8640.yaml | 2 +- + .../bindings/display/bridge/sil,sii9234.yaml | 2 +- + .../bindings/display/bridge/ti,dlpc3433.yaml | 2 +- + .../bindings/display/bridge/ti,sn65dsi86.yaml | 6 +- + .../bindings/display/bridge/toshiba,tc358762.yaml | 2 +- + .../bindings/display/bridge/toshiba,tc358764.txt | 35 -- + .../bindings/display/bridge/toshiba,tc358764.yaml | 89 ++++ + .../bindings/display/bridge/toshiba,tc358768.yaml | 2 +- + .../bindings/display/mediatek/mediatek,ccorr.yaml | 7 +- + .../bindings/display/mediatek/mediatek,color.yaml | 10 +- + .../bindings/display/mediatek/mediatek,dither.yaml | 4 +- + .../bindings/display/mediatek/mediatek,dsc.yaml | 4 +- + .../bindings/display/mediatek/mediatek,gamma.yaml | 7 +- + .../bindings/display/mediatek/mediatek,merge.yaml | 7 +- + .../bindings/display/mediatek/mediatek,od.yaml | 7 +- + .../bindings/display/mediatek/mediatek,ovl-2l.yaml | 7 +- + .../bindings/display/mediatek/mediatek,ovl.yaml | 13 +- + .../display/mediatek/mediatek,postmask.yaml | 4 +- + .../bindings/display/mediatek/mediatek,rdma.yaml | 13 +- + .../bindings/display/mediatek/mediatek,split.yaml | 4 +- + .../bindings/display/mediatek/mediatek,ufoe.yaml | 4 +- + .../bindings/display/mediatek/mediatek,wdma.yaml | 4 +- + .../devicetree/bindings/display/msm/qcom,mdp5.yaml | 2 +- + .../devicetree/bindings/display/msm/qcom,mdss.yaml | 4 + + .../display/panel/advantech,idk-1110wr.yaml | 2 +- + .../display/panel/innolux,ee101ia-01d.yaml | 2 +- + .../display/panel/mitsubishi,aa104xd12.yaml | 2 +- + .../display/panel/mitsubishi,aa121td01.yaml | 2 +- + .../bindings/display/panel/nec,nl8048hl11.yaml | 2 +- + .../bindings/display/panel/panel-lvds.yaml | 2 +- + .../bindings/display/panel/sgd,gktw70sdae4se.yaml | 2 +- + .../bindings/display/panel/sharp,lq101r1sx01.yaml | 4 +- + .../bindings/display/solomon,ssd1307fb.yaml | 28 +- + Documentation/devicetree/bindings/eeprom/at25.yaml | 2 +- + .../devicetree/bindings/example-schema.yaml | 2 + + .../bindings/extcon/extcon-usbc-cros-ec.yaml | 2 +- + .../bindings/extcon/extcon-usbc-tusb320.yaml | 2 +- + .../bindings/fpga/xilinx-pr-decoupler.txt | 54 -- + .../bindings/fpga/xilinx-slave-serial.txt | 51 -- + .../bindings/fpga/xlnx,fpga-slave-serial.yaml | 80 +++ + .../bindings/fpga/xlnx,pr-decoupler.yaml | 64 +++ + .../devicetree/bindings/gpio/gpio-pca9570.yaml | 2 +- + .../devicetree/bindings/gpio/gpio-pca95xx.yaml | 8 +- + .../bindings/gpio/x-powers,axp209-gpio.yaml | 1 + + .../devicetree/bindings/hwmon/adi,ltc2992.yaml | 1 + + .../devicetree/bindings/i2c/aspeed,i2c.yaml | 2 +- + .../bindings/i2c/google,cros-ec-i2c-tunnel.yaml | 2 +- + .../bindings/i2c/samsung,s3c2410-i2c.yaml | 2 +- + .../devicetree/bindings/input/snvs-pwrkey.txt | 1 - + .../devicetree/bindings/interconnect/qcom,rpm.yaml | 1 + + .../interrupt-controller/actions,owl-sirq.yaml | 4 +- + .../bindings/interrupt-controller/arm,gic-v3.yaml | 2 + + .../bindings/interrupt-controller/arm,gic.yaml | 4 +- + .../interrupt-controller/fsl,irqsteer.yaml | 4 +- + .../interrupt-controller/intel,ce4100-ioapic.yaml | 4 +- + .../interrupt-controller/intel,ce4100-lapic.yaml | 4 +- + .../intel,ixp4xx-interrupt.yaml | 4 +- + .../interrupt-controller/loongson,htpic.yaml | 4 +- + .../interrupt-controller/loongson,htvec.yaml | 4 +- + .../interrupt-controller/loongson,liointc.yaml | 8 +- + .../interrupt-controller/loongson,pch-msi.yaml | 10 +- + .../interrupt-controller/loongson,pch-pic.yaml | 6 +- + .../interrupt-controller/mediatek,sysirq.txt | 1 + + .../bindings/interrupt-controller/mrvl,intc.yaml | 4 +- + .../mscc,ocelot-icpu-intr.yaml | 4 +- + .../bindings/interrupt-controller/qcom,pdc.yaml | 4 +- + .../interrupt-controller/sifive,plic-1.0.0.yaml | 2 +- + .../interrupt-controller/st,sti-irq-syscfg.txt | 9 +- + .../bindings/interrupt-controller/ti,sci-inta.yaml | 3 + + .../devicetree/bindings/iommu/qcom,iommu.txt | 122 ----- + .../devicetree/bindings/iommu/qcom,iommu.yaml | 113 +++++ + .../bindings/leds/cznic,turris-omnia-leds.yaml | 2 +- + .../devicetree/bindings/leds/issi,is31fl319x.yaml | 2 +- + .../devicetree/bindings/leds/leds-aw2013.yaml | 2 +- + .../devicetree/bindings/leds/leds-rt4505.yaml | 2 +- + .../devicetree/bindings/leds/ti,tca6507.yaml | 2 +- + .../bindings/mailbox/amlogic,meson-gxbb-mhu.yaml | 4 +- + .../bindings/mailbox/microchip,mpfs-mailbox.yaml | 4 +- + .../bindings/mailbox/qcom,apcs-kpss-global.yaml | 4 +- + .../devicetree/bindings/mailbox/sprd-mailbox.yaml | 4 +- + .../devicetree/bindings/mailbox/st,stm32-ipcc.yaml | 4 +- + .../bindings/mailbox/xlnx,zynqmp-ipi-mailbox.yaml | 5 +- + .../bindings/media/i2c/aptina,mt9p031.yaml | 2 +- + .../bindings/media/i2c/aptina,mt9v111.yaml | 2 +- + .../devicetree/bindings/media/i2c/imx219.yaml | 2 +- + .../devicetree/bindings/media/i2c/imx258.yaml | 4 +- + .../bindings/media/i2c/maxim,max9286.yaml | 7 + + .../devicetree/bindings/media/i2c/mipi-ccs.yaml | 2 +- + .../devicetree/bindings/media/i2c/ovti,ov5648.yaml | 2 +- + .../devicetree/bindings/media/i2c/ovti,ov772x.yaml | 2 +- + .../devicetree/bindings/media/i2c/ovti,ov8865.yaml | 2 +- + .../devicetree/bindings/media/i2c/ovti,ov9282.yaml | 2 +- + .../devicetree/bindings/media/i2c/rda,rda5807.yaml | 2 +- + .../devicetree/bindings/media/i2c/sony,imx214.yaml | 2 +- + .../devicetree/bindings/media/i2c/sony,imx274.yaml | 2 +- + .../devicetree/bindings/media/i2c/sony,imx334.yaml | 2 +- + .../devicetree/bindings/media/i2c/sony,imx335.yaml | 2 +- + .../devicetree/bindings/media/i2c/sony,imx412.yaml | 2 +- + .../devicetree/bindings/media/renesas,vin.yaml | 4 +- + .../devicetree/bindings/media/ti,cal.yaml | 4 +- + .../bindings/memory-controllers/arm,pl35x-smc.yaml | 1 + + .../bindings/memory-controllers/exynos-srom.yaml | 1 + + .../intel,ixp4xx-expansion-bus-controller.yaml | 1 + + .../memory-controllers/nvidia,tegra124-emc.yaml | 1 + + .../memory-controllers/st,stm32-fmc2-ebi.yaml | 1 + + .../devicetree/bindings/mfd/actions,atc260x.yaml | 2 +- + .../devicetree/bindings/mfd/google,cros-ec.yaml | 6 +- + .../devicetree/bindings/mfd/mediatek,mt6357.yaml | 1 + + .../devicetree/bindings/mfd/mediatek,mt6370.yaml | 2 + + .../devicetree/bindings/mfd/ti,tps65086.yaml | 2 +- + .../devicetree/bindings/mfd/x-powers,axp152.yaml | 4 +- + .../devicetree/bindings/mmc/aspeed,sdhci.yaml | 1 + + Documentation/devicetree/bindings/mtd/mtd.yaml | 1 + + .../devicetree/bindings/net/asix,ax88796c.yaml | 2 +- + .../devicetree/bindings/net/brcm,bcmgenet.yaml | 2 - + .../bindings/net/can/microchip,mcp251xfd.yaml | 2 +- + .../bindings/net/cortina,gemini-ethernet.yaml | 6 +- + .../devicetree/bindings/net/dsa/microchip,ksz.yaml | 2 +- + .../devicetree/bindings/net/mdio-gpio.yaml | 4 +- + .../bindings/net/nfc/samsung,s3fwrn5.yaml | 2 +- + .../devicetree/bindings/net/sti-dwmac.txt | 3 +- + .../devicetree/bindings/net/vertexcom-mse102x.yaml | 2 +- + .../bindings/net/wireless/ti,wlcore.yaml | 10 +- + .../devicetree/bindings/pci/cdns,cdns-pcie-ep.yaml | 2 +- + .../bindings/pci/cdns,cdns-pcie-host.yaml | 2 +- + .../devicetree/bindings/pci/cdns-pcie-ep.yaml | 8 +- + .../devicetree/bindings/pci/cdns-pcie-host.yaml | 8 +- + .../devicetree/bindings/pci/cdns-pcie.yaml | 4 +- + .../bindings/pci/intel,keembay-pcie-ep.yaml | 4 +- + .../bindings/pci/intel,keembay-pcie.yaml | 4 +- + .../devicetree/bindings/pci/qcom,pcie-ep.yaml | 2 +- + .../devicetree/bindings/pci/ti,j721e-pci-ep.yaml | 6 +- + .../devicetree/bindings/pci/ti,j721e-pci-host.yaml | 6 +- + .../phy/marvell,armada-cp110-utmi-phy.yaml | 2 +- + .../devicetree/bindings/phy/phy-stm32-usbphyc.yaml | 2 +- + .../bindings/phy/qcom,sc7180-qmp-usb3-dp-phy.yaml | 2 +- + .../bindings/pinctrl/pinctrl-mt8192.yaml | 2 +- + .../devicetree/bindings/pinctrl/pinmux-node.yaml | 2 +- + .../bindings/pinctrl/starfive,jh7100-pinctrl.yaml | 2 +- + .../devicetree/bindings/power/supply/bq2415x.yaml | 2 +- + .../devicetree/bindings/power/supply/bq24190.yaml | 2 +- + .../devicetree/bindings/power/supply/bq24257.yaml | 4 +- + .../devicetree/bindings/power/supply/bq24735.yaml | 2 +- + .../devicetree/bindings/power/supply/bq2515x.yaml | 2 +- + .../devicetree/bindings/power/supply/bq25890.yaml | 2 +- + .../devicetree/bindings/power/supply/bq25980.yaml | 2 +- + .../devicetree/bindings/power/supply/bq27xxx.yaml | 15 +- + .../bindings/power/supply/lltc,ltc294x.yaml | 2 +- + .../bindings/power/supply/ltc4162-l.yaml | 2 +- + .../bindings/power/supply/maxim,max14656.yaml | 2 +- + .../bindings/power/supply/maxim,max17040.yaml | 4 +- + .../bindings/power/supply/maxim,max17042.yaml | 2 +- + .../bindings/power/supply/richtek,rt9455.yaml | 2 +- + .../bindings/power/supply/ti,lp8727.yaml | 3 +- + .../bindings/regulator/active-semi,act8865.yaml | 2 +- + .../regulator/google,cros-ec-regulator.yaml | 2 +- + .../bindings/regulator/nxp,pca9450-regulator.yaml | 8 +- + .../bindings/regulator/nxp,pf8x00-regulator.yaml | 2 +- + .../bindings/regulator/rohm,bd71828-regulator.yaml | 20 +- + .../bindings/regulator/rohm,bd71837-regulator.yaml | 6 +- + .../bindings/regulator/rohm,bd71847-regulator.yaml | 6 +- + .../bindings/remoteproc/qcom,msm8916-mss-pil.yaml | 2 + + .../bindings/reserved-memory/google,open-dice.yaml | 2 +- + .../reserved-memory/nvidia,tegra210-emc-table.yaml | 2 +- + .../devicetree/bindings/reserved-memory/phram.yaml | 4 +- + .../bindings/reserved-memory/qcom,cmd-db.yaml | 6 +- + .../bindings/reserved-memory/qcom,rmtfs-mem.yaml | 6 +- + .../bindings/reserved-memory/ramoops.yaml | 6 +- + .../bindings/reserved-memory/shared-dma-pool.yaml | 2 +- + .../reset/amlogic,meson-axg-audio-arb.yaml | 4 +- + .../bindings/reset/amlogic,meson-reset.yaml | 4 +- + .../bindings/reset/bitmain,bm1880-reset.yaml | 4 +- + .../bindings/reset/brcm,bcm6345-reset.yaml | 4 +- + .../reset/brcm,bcm7216-pcie-sata-rescal.yaml | 4 +- + .../bindings/reset/brcm,brcmstb-reset.yaml | 4 +- + .../bindings/reset/marvell,berlin2-reset.yaml | 4 +- + .../devicetree/bindings/reset/microchip,rst.yaml | 6 +- + .../bindings/reset/qca,ar7100-reset.yaml | 4 +- + .../devicetree/bindings/reset/renesas,rst.yaml | 4 +- + .../devicetree/bindings/reset/sunplus,reset.yaml | 4 +- + .../devicetree/bindings/rng/amlogic,meson-rng.yaml | 4 +- + .../devicetree/bindings/rng/brcm,iproc-rng200.yaml | 4 +- + Documentation/devicetree/bindings/rng/mtk-rng.yaml | 4 +- + .../devicetree/bindings/rng/ti,keystone-rng.yaml | 2 +- + Documentation/devicetree/bindings/rtc/snvs-rtc.txt | 1 - + .../devicetree/bindings/serial/mediatek,uart.yaml | 1 + + .../devicetree/bindings/soc/imx/fsl,imx93-src.yaml | 3 +- + .../devicetree/bindings/soc/mediatek/devapc.yaml | 4 +- + .../soc/microchip/atmel,at91rm9200-tcb.yaml | 1 + + .../devicetree/bindings/soc/qcom/qcom,apr.yaml | 4 +- + .../devicetree/bindings/soc/qcom/qcom,eud.yaml | 4 +- + .../devicetree/bindings/soc/qcom/qcom,geni-se.yaml | 4 +- + .../devicetree/bindings/soc/qcom/qcom,smd-rpm.yaml | 4 +- + .../devicetree/bindings/soc/qcom/qcom,smem.yaml | 4 +- + .../devicetree/bindings/soc/qcom/qcom,spm.yaml | 4 +- + .../devicetree/bindings/soc/qcom/qcom,wcnss.yaml | 2 +- + .../devicetree/bindings/soc/renesas/renesas.yaml | 2 +- + .../devicetree/bindings/soc/ti/ti,pruss.yaml | 3 +- + .../bindings/sound/amlogic,axg-tdm-iface.yaml | 2 +- + .../devicetree/bindings/sound/everest,es8316.yaml | 2 +- + .../bindings/sound/marvell,mmp-sspa.yaml | 1 + + .../bindings/sound/qcom,lpass-rx-macro.yaml | 4 +- + .../bindings/sound/qcom,lpass-tx-macro.yaml | 4 +- + .../bindings/sound/qcom,q6dsp-lpass-ports.yaml | 2 +- + .../devicetree/bindings/sound/qcom,wcd934x.yaml | 1 + + .../devicetree/bindings/sound/samsung,odroid.yaml | 2 + + .../devicetree/bindings/sound/simple-card.yaml | 24 +- + .../devicetree/bindings/sound/tas2562.yaml | 2 +- + .../devicetree/bindings/sound/tas2770.yaml | 2 +- + .../devicetree/bindings/sound/tas27xx.yaml | 2 +- + .../devicetree/bindings/sound/tas5805m.yaml | 2 +- + .../devicetree/bindings/sound/tlv320adcx140.yaml | 2 +- + .../devicetree/bindings/sound/zl38060.yaml | 2 +- + .../bindings/soundwire/qcom,soundwire.yaml | 1 + + .../bindings/spi/allwinner,sun4i-a10-spi.yaml | 1 + + .../bindings/spi/allwinner,sun6i-a31-spi.yaml | 1 + + .../bindings/spi/microchip,mpfs-spi.yaml | 2 +- + .../devicetree/bindings/spi/spi-controller.yaml | 1 + + .../sram/allwinner,sun4i-a10-system-control.yaml | 10 +- + .../devicetree/bindings/sram/qcom,ocmem.yaml | 1 + + .../devicetree/bindings/thermal/thermal-zones.yaml | 1 + + .../bindings/timer/amlogic,meson6-timer.txt | 22 - + .../bindings/timer/amlogic,meson6-timer.yaml | 54 ++ + .../bindings/timer/arm,arch_timer_mmio.yaml | 2 +- + .../devicetree/bindings/timer/cdns,ttc.yaml | 2 +- + .../bindings/timer/intel,ixp4xx-timer.yaml | 4 +- + .../bindings/timer/nvidia,tegra-timer.yaml | 4 +- + .../bindings/timer/nvidia,tegra186-timer.yaml | 4 +- + .../devicetree/bindings/timer/st,nomadik-mtu.yaml | 4 +- + .../devicetree/bindings/usb/maxim,max33359.yaml | 2 +- + .../devicetree/bindings/usb/maxim,max3420-udc.yaml | 2 +- + .../bindings/usb/mediatek,mt6360-tcpc.yaml | 2 +- + .../devicetree/bindings/usb/qcom,dwc3.yaml | 1 + + .../devicetree/bindings/usb/richtek,rt1711h.yaml | 2 +- + .../devicetree/bindings/usb/richtek,rt1719.yaml | 2 +- + .../devicetree/bindings/usb/st,stusb160x.yaml | 2 +- + .../devicetree/bindings/usb/ti,hd3ss3220.yaml | 2 +- + .../devicetree/bindings/usb/ti,tps6598x.yaml | 2 +- + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + .../bindings/watchdog/allwinner,sun4i-a10-wdt.yaml | 2 +- + .../devicetree/bindings/watchdog/apple,wdt.yaml | 2 +- + .../devicetree/bindings/watchdog/arm-smc-wdt.yaml | 2 +- + .../bindings/watchdog/atmel,sama5d4-wdt.yaml | 2 +- + .../bindings/watchdog/brcm,bcm7038-wdt.yaml | 2 +- + .../bindings/watchdog/faraday,ftwdt010.yaml | 2 +- + .../bindings/watchdog/fsl-imx7ulp-wdt.yaml | 2 +- + .../bindings/watchdog/maxim,max63xx.yaml | 2 +- + .../devicetree/bindings/watchdog/renesas,wdt.yaml | 2 +- + .../devicetree/bindings/watchdog/snps,dw-wdt.yaml | 2 +- + .../bindings/watchdog/socionext,uniphier-wdt.yaml | 2 +- + .../bindings/watchdog/st,stm32-iwdg.yaml | 2 +- + .../devicetree/bindings/watchdog/ti,rti-wdt.yaml | 2 +- + MAINTAINERS | 4 +- + arch/arm/kernel/cpuidle.c | 1 - + arch/arm/mach-sunxi/mc_smp.c | 1 - + arch/riscv/kernel/cacheinfo.c | 1 - + arch/riscv/kernel/setup.c | 2 +- + arch/sparc/include/asm/prom.h | 3 + + arch/sparc/kernel/of_device_32.c | 4 +- + arch/sparc/kernel/of_device_64.c | 6 +- + arch/sparc/kernel/of_device_common.c | 2 +- + arch/sparc/kernel/pci_schizo.c | 2 +- + arch/sparc/kernel/power.c | 2 +- + arch/sparc/kernel/prom_64.c | 2 +- + arch/sparc/kernel/time_32.c | 2 +- + drivers/base/cacheinfo.c | 2 +- + drivers/bus/mvebu-mbus.c | 58 +-- + drivers/bus/tegra-gmi.c | 4 +- + drivers/bus/uniphier-system-bus.c | 54 +- + drivers/clocksource/ingenic-timer.c | 3 +- + drivers/cpufreq/cpufreq-dt-platdev.c | 1 - + drivers/cpufreq/kirkwood-cpufreq.c | 2 +- + drivers/cpufreq/maple-cpufreq.c | 2 +- + drivers/cpufreq/pmac32-cpufreq.c | 2 +- + drivers/cpufreq/pmac64-cpufreq.c | 2 +- + drivers/cpufreq/qcom-cpufreq-hw.c | 4 +- + drivers/cpufreq/spear-cpufreq.c | 2 +- + drivers/cpufreq/sun50i-cpufreq-nvmem.c | 3 +- + drivers/cpufreq/tegra124-cpufreq.c | 1 - + drivers/cpufreq/tegra20-cpufreq.c | 2 +- + drivers/cpuidle/cpuidle-psci.c | 1 - + drivers/cpuidle/cpuidle-qcom-spm.c | 3 +- + drivers/cpuidle/cpuidle-riscv-sbi.c | 2 +- + drivers/cpuidle/dt_idle_states.c | 1 - + drivers/hte/hte.c | 2 +- + drivers/irqchip/irq-loongson-eiointc.c | 5 +- + drivers/of/Makefile | 2 +- + drivers/of/address.c | 347 +++++++------ + drivers/of/base.c | 187 ------- + drivers/of/cpu.c | 210 ++++++++ + drivers/of/of_private.h | 1 + + drivers/of/unittest-data/tests-address.dtsi | 9 +- + drivers/of/unittest.c | 171 ++++++- + drivers/opp/of.c | 2 +- + drivers/sbus/char/display7seg.c | 5 +- + drivers/soc/mediatek/mtk-svs.c | 1 + + drivers/thermal/cpuidle_cooling.c | 3 +- + drivers/virt/fsl_hypervisor.c | 2 +- + drivers/w1/masters/w1-gpio.c | 2 +- + include/dt-bindings/reset/stih415-resets.h | 28 -- + include/dt-bindings/reset/stih416-resets.h | 52 -- + include/linux/cpufreq.h | 1 - + include/linux/of.h | 32 +- + include/linux/of_address.h | 31 ++ + include/linux/of_device.h | 29 +- + include/linux/of_platform.h | 10 +- + 361 files changed, 2159 insertions(+), 1946 deletions(-) + rename Documentation/devicetree/bindings/{memory-controllers => cache}/baikal,bt1-l2-ctl.yaml (95%) + rename Documentation/devicetree/bindings/{powerpc/fsl/l2cache.txt => cache/freescale-l2cache.txt} (100%) + rename Documentation/devicetree/bindings/{arm => cache}/l2c2x0.yaml (99%) + rename Documentation/devicetree/bindings/{arm/mrvl/feroceon.txt => cache/marvell,feroceon-cache.txt} (100%) + rename Documentation/devicetree/bindings/{arm/mrvl/tauros2.txt => cache/marvell,tauros2-cache.txt} (100%) + rename Documentation/devicetree/bindings/{arm/msm => cache}/qcom,llcc.yaml (98%) + rename Documentation/devicetree/bindings/{riscv => cache}/sifive,ccache0.yaml (98%) + rename Documentation/devicetree/bindings/{arm/socionext => cache}/socionext,uniphier-system-cache.yaml (96%) + create mode 100644 Documentation/devicetree/bindings/crypto/fsl,sec-v4.0-mon.yaml + create mode 100644 Documentation/devicetree/bindings/crypto/fsl,sec-v4.0.yaml + delete mode 100644 Documentation/devicetree/bindings/crypto/fsl-sec4.txt + create mode 100644 Documentation/devicetree/bindings/display/bridge/parade,ps8622.yaml + delete mode 100644 Documentation/devicetree/bindings/display/bridge/ps8622.txt + delete mode 100644 Documentation/devicetree/bindings/display/bridge/toshiba,tc358764.txt + create mode 100644 Documentation/devicetree/bindings/display/bridge/toshiba,tc358764.yaml + delete mode 100644 Documentation/devicetree/bindings/fpga/xilinx-pr-decoupler.txt + delete mode 100644 Documentation/devicetree/bindings/fpga/xilinx-slave-serial.txt + create mode 100644 Documentation/devicetree/bindings/fpga/xlnx,fpga-slave-serial.yaml + create mode 100644 Documentation/devicetree/bindings/fpga/xlnx,pr-decoupler.yaml + delete mode 100644 Documentation/devicetree/bindings/input/snvs-pwrkey.txt + delete mode 100644 Documentation/devicetree/bindings/iommu/qcom,iommu.txt + create mode 100644 Documentation/devicetree/bindings/iommu/qcom,iommu.yaml + delete mode 100644 Documentation/devicetree/bindings/rtc/snvs-rtc.txt + delete mode 100644 Documentation/devicetree/bindings/timer/amlogic,meson6-timer.txt + create mode 100644 Documentation/devicetree/bindings/timer/amlogic,meson6-timer.yaml + create mode 100644 drivers/of/cpu.c + delete mode 100644 include/dt-bindings/reset/stih415-resets.h + delete mode 100644 include/dt-bindings/reset/stih416-resets.h +$ git am -3 ../patches/0001-devicetree-fix-up-for-include-rationalisation.patch +Applying: devicetree: fix up for include rationalisation +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/cpufreq/acpi-cpufreq.c +M drivers/cpufreq/pcc-cpufreq.c +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master 8238cc29bef2f] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git + Date: Thu Apr 27 14:12:24 2023 +0100 +$ git am -3 ../patches/0001-of-address-fixup-for-Add-of_property_read_reg-helper.patch +Applying: of/address: fixup for "Add of_property_read_reg() helper" +Using index info to reconstruct a base tree... +M include/linux/of_address.h +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +Merging dt-krzk/for-next (936f3b6478b7b Merge branch 'next/qcom-pinctrl' into for-next) +$ 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 'recursive' strategy. + .../devicetree/bindings/pinctrl/qcom,ipq5332-tlmm.yaml | 11 +---------- + .../devicetree/bindings/pinctrl/qcom,ipq6018-pinctrl.yaml | 10 +--------- + .../devicetree/bindings/pinctrl/qcom,ipq8074-pinctrl.yaml | 11 +---------- + .../devicetree/bindings/pinctrl/qcom,mdm9607-tlmm.yaml | 11 +---------- + .../devicetree/bindings/pinctrl/qcom,mdm9615-pinctrl.yaml | 11 +---------- + .../devicetree/bindings/pinctrl/qcom,msm8226-pinctrl.yaml | 11 +---------- + .../devicetree/bindings/pinctrl/qcom,msm8660-pinctrl.yaml | 12 +----------- + .../devicetree/bindings/pinctrl/qcom,msm8909-tlmm.yaml | 11 +---------- + .../devicetree/bindings/pinctrl/qcom,msm8916-pinctrl.yaml | 11 +---------- + .../devicetree/bindings/pinctrl/qcom,msm8953-pinctrl.yaml | 10 +--------- + .../devicetree/bindings/pinctrl/qcom,msm8960-pinctrl.yaml | 11 +---------- + .../devicetree/bindings/pinctrl/qcom,msm8974-pinctrl.yaml | 11 +---------- + .../devicetree/bindings/pinctrl/qcom,msm8976-pinctrl.yaml | 11 +---------- + .../devicetree/bindings/pinctrl/qcom,msm8994-pinctrl.yaml | 11 +---------- + .../devicetree/bindings/pinctrl/qcom,msm8996-pinctrl.yaml | 11 +---------- + .../devicetree/bindings/pinctrl/qcom,msm8998-pinctrl.yaml | 11 +---------- + .../devicetree/bindings/pinctrl/qcom,qcs404-pinctrl.yaml | 11 +---------- + .../devicetree/bindings/pinctrl/qcom,qdu1000-tlmm.yaml | 11 +---------- + .../devicetree/bindings/pinctrl/qcom,sa8775p-tlmm.yaml | 11 +---------- + .../devicetree/bindings/pinctrl/qcom,sc7180-pinctrl.yaml | 11 +---------- + .../devicetree/bindings/pinctrl/qcom,sc7280-pinctrl.yaml | 12 +----------- + .../devicetree/bindings/pinctrl/qcom,sc8180x-tlmm.yaml | 11 +---------- + .../devicetree/bindings/pinctrl/qcom,sdm630-pinctrl.yaml | 11 +---------- + .../devicetree/bindings/pinctrl/qcom,sdm670-tlmm.yaml | 12 +----------- + .../devicetree/bindings/pinctrl/qcom,sdm845-pinctrl.yaml | 11 +---------- + .../devicetree/bindings/pinctrl/qcom,sdx55-pinctrl.yaml | 10 +--------- + .../devicetree/bindings/pinctrl/qcom,sdx65-tlmm.yaml | 10 +--------- + .../devicetree/bindings/pinctrl/qcom,sm6115-tlmm.yaml | 10 +--------- + .../devicetree/bindings/pinctrl/qcom,sm6125-tlmm.yaml | 11 +---------- + .../devicetree/bindings/pinctrl/qcom,sm6350-tlmm.yaml | 12 +----------- + .../devicetree/bindings/pinctrl/qcom,sm6375-tlmm.yaml | 12 +----------- + .../devicetree/bindings/pinctrl/qcom,sm8150-pinctrl.yaml | 11 +---------- + .../devicetree/bindings/pinctrl/qcom,sm8250-pinctrl.yaml | 11 +---------- + .../devicetree/bindings/pinctrl/qcom,sm8350-tlmm.yaml | 13 +------------ + .../devicetree/bindings/pinctrl/qcom,sm8450-tlmm.yaml | 11 +---------- + .../devicetree/bindings/pinctrl/qcom,sm8550-tlmm.yaml | 11 +---------- + 36 files changed, 36 insertions(+), 362 deletions(-) +Merging mailbox/mailbox-for-next (2a61e7b7bd92f mailbox: Use of_property_read_bool() for boolean properties) +$ git merge -m Merge branch 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu/integration.git mailbox/mailbox-for-next +Merge made by the 'recursive' strategy. + drivers/mailbox/hi6220-mailbox.c | 5 +-- + drivers/mailbox/mailbox.c | 96 ++++++++++++++++++++++++++++------------ + drivers/mailbox/omap-mailbox.c | 25 +++-------- + drivers/mailbox/pcc.c | 84 +++++++++++++++++++---------------- + include/linux/mailbox_client.h | 1 + + 5 files changed, 120 insertions(+), 91 deletions(-) +Merging spi/for-next (cb1499966178e Merge remote-tracking branch 'spi/for-6.3' into spi-linus) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next +Already up to date. +Merging tip/master (01cbd03229865 Merge branch into tip/master: 'x86/tdx') +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master +Auto-merging tools/objtool/check.c +CONFLICT (content): Merge conflict in tools/objtool/check.c +Removing tools/include/linux/objtool.h +Auto-merging mm/util.c +Auto-merging mm/userfaultfd.c +CONFLICT (content): Merge conflict in mm/userfaultfd.c +Auto-merging mm/nommu.c +Auto-merging mm/mprotect.c +Auto-merging mm/mmap.c +Auto-merging mm/migrate.c +Auto-merging mm/memory.c +Auto-merging mm/madvise.c +Auto-merging mm/internal.h +Auto-merging mm/hugetlb.c +Auto-merging mm/huge_memory.c +Auto-merging mm/gup.c +Auto-merging mm/debug_vm_pgtable.c +Auto-merging lib/Kconfig.debug +Auto-merging kernel/sched/fair.c +Auto-merging kernel/sched/core.c +Auto-merging kernel/livepatch/core.c +Auto-merging kernel/fork.c +Auto-merging kernel/cgroup/cgroup.c +Auto-merging init/main.c +Auto-merging include/linux/sched/mm.h +CONFLICT (content): Merge conflict in include/linux/sched/mm.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/pgtable.h +Auto-merging include/linux/mm_types.h +Auto-merging include/linux/mm.h +CONFLICT (modify/delete): include/linux/ioasid.h deleted in HEAD and modified in tip/master. Version tip/master of include/linux/ioasid.h left in tree. +Auto-merging fs/proc/task_mmu.c +Auto-merging fs/proc/array.c +Auto-merging drivers/vhost/vhost.c +Auto-merging drivers/message/fusion/mptbase.h +Auto-merging drivers/iommu/iommu-sva.c +CONFLICT (content): Merge conflict in drivers/iommu/iommu-sva.c +Auto-merging drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c +Auto-merging drivers/gpu/drm/i915/gt/uc/intel_uc.c +Auto-merging drivers/gpu/drm/i915/gt/selftest_timeline.c +Auto-merging drivers/gpu/drm/i915/gt/intel_rps.c +Auto-merging drivers/gpu/drm/i915/gt/intel_rc6.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_rc6.c +Auto-merging drivers/gpu/drm/i915/gt/intel_gt_pm.c +Auto-merging drivers/gpu/drm/i915/gt/intel_gt.c +Auto-merging drivers/gpu/drm/i915/gt/intel_ggtt.c +Auto-merging drivers/gpu/drm/i915/gt/intel_engine_cs.c +Auto-merging arch/x86/mm/tlb.c +Auto-merging arch/x86/mm/pat/set_memory.c +Auto-merging arch/x86/mm/fault.c +Auto-merging arch/x86/lib/usercopy_64.c +Auto-merging arch/x86/kernel/traps.c +Auto-merging arch/x86/kernel/ftrace_64.S +Auto-merging arch/x86/kernel/cpu/resctrl/monitor.c +Auto-merging arch/x86/kernel/cpu/microcode/amd.c +Auto-merging arch/x86/include/asm/uaccess_64.h +Auto-merging arch/x86/include/asm/pgtable.h +Auto-merging arch/x86/entry/entry_64.S +Auto-merging arch/x86/Kconfig +Auto-merging arch/sparc/include/asm/pgtable_64.h +Auto-merging arch/s390/mm/pageattr.c +Auto-merging arch/s390/kernel/smp.c +Auto-merging arch/s390/kernel/setup.c +CONFLICT (content): Merge conflict in arch/s390/kernel/setup.c +Auto-merging arch/s390/include/asm/pgtable.h +Auto-merging arch/riscv/include/asm/pgtable.h +Auto-merging arch/powerpc/kvm/book3s_hv.c +Auto-merging arch/powerpc/kernel/smp.c +Auto-merging arch/mips/loongson64/smp.c +Auto-merging arch/mips/kernel/uprobes.c +Auto-merging arch/mips/kernel/smp-cps.c +CONFLICT (modify/delete): arch/mips/kernel/rtlx-cmp.c deleted in HEAD and modified in tip/master. Version tip/master of arch/mips/kernel/rtlx-cmp.c left in tree. +Auto-merging arch/mips/include/asm/pgtable.h +Auto-merging arch/m68k/include/asm/mcf_pgtable.h +Auto-merging arch/arm64/kernel/signal.c +Auto-merging arch/arm64/kernel/process.c +Auto-merging arch/arm64/include/asm/pgtable.h +Auto-merging MAINTAINERS +Auto-merging Documentation/mm/arch_pgtable_helpers.rst +Auto-merging Documentation/filesystems/proc.rst +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Resolved 'arch/s390/kernel/setup.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/gt/intel_rc6.c' using previous resolution. +Resolved 'drivers/iommu/iommu-sva.c' using previous resolution. +Resolved 'include/linux/sched/mm.h' using previous resolution. +Resolved 'mm/userfaultfd.c' using previous resolution. +Recorded preimage for 'tools/objtool/check.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f include/linux/ioasid.h +rm 'include/linux/ioasid.h' +$ git commit --no-edit -v -a +Recorded resolution for 'tools/objtool/check.c'. +[master b0e447630bf8c] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git +$ git diff -M --stat --summary HEAD^.. + Documentation/accounting/psi.rst | 4 + + Documentation/admin-guide/kernel-parameters.txt | 17 +- + Documentation/arch/x86/index.rst | 1 + + Documentation/arch/x86/microcode.rst | 14 + + Documentation/arch/x86/xstate.rst | 100 ++ + Documentation/filesystems/proc.rst | 1 + + Documentation/livepatch/reliable-stacktrace.rst | 2 +- + Documentation/mm/arch_pgtable_helpers.rst | 9 +- + Documentation/x86/shstk.rst | 179 +++ + MAINTAINERS | 2 +- + arch/alpha/include/asm/cmpxchg.h | 10 +- + arch/alpha/include/asm/local.h | 12 +- + arch/alpha/include/asm/pgtable.h | 6 +- + arch/alpha/kernel/process.c | 4 +- + arch/alpha/kernel/smp.c | 2 +- + arch/arc/include/asm/cmpxchg.h | 4 +- + arch/arc/include/asm/hugepage.h | 2 +- + arch/arc/include/asm/pgtable-bits-arcv2.h | 7 +- + arch/arc/kernel/smp.c | 2 +- + arch/arm/include/asm/cmpxchg.h | 7 +- + arch/arm/include/asm/pgtable-3level.h | 7 +- + arch/arm/include/asm/pgtable.h | 2 +- + arch/arm/kernel/signal.c | 2 +- + arch/arm/kernel/smp.c | 9 +- + arch/arm/mach-actions/platsmp.c | 2 + + arch/arm/probes/uprobes/core.c | 8 +- + arch/arm64/include/asm/cmpxchg.h | 7 +- + arch/arm64/include/asm/exception.h | 4 +- + arch/arm64/include/asm/mmu_context.h | 6 + + arch/arm64/include/asm/pgtable.h | 9 +- + arch/arm64/include/asm/smp.h | 9 +- + arch/arm64/kernel/entry-common.c | 2 +- + arch/arm64/kernel/probes/uprobes.c | 9 +- + arch/arm64/kernel/process.c | 2 +- + arch/arm64/kernel/signal.c | 2 +- + arch/arm64/kernel/signal32.c | 2 +- + arch/arm64/kernel/smp.c | 15 +- + arch/arm64/kernel/traps.c | 3 +- + arch/arm64/mm/trans_pgd.c | 4 +- + arch/csky/include/asm/pgtable.h | 2 +- + arch/csky/kernel/probes/uprobes.c | 9 +- + arch/csky/kernel/smp.c | 6 +- + arch/hexagon/include/asm/cmpxchg.h | 10 +- + arch/hexagon/include/asm/pgtable.h | 2 +- + arch/hexagon/kernel/smp.c | 2 +- + arch/ia64/include/asm/cmpxchg.h | 2 +- + arch/ia64/include/asm/pgtable.h | 2 +- + arch/ia64/include/uapi/asm/cmpxchg.h | 4 +- + arch/ia64/kernel/process.c | 6 +- + arch/ia64/kernel/smp.c | 4 +- + arch/loongarch/include/asm/cmpxchg.h | 4 +- + arch/loongarch/include/asm/local.h | 13 +- + arch/loongarch/include/asm/pgtable.h | 4 +- + arch/loongarch/include/asm/smp.h | 2 +- + arch/loongarch/kernel/process.c | 2 +- + arch/loongarch/kernel/smp.c | 6 +- + arch/m68k/include/asm/cmpxchg.h | 6 +- + arch/m68k/include/asm/mcf_pgtable.h | 2 +- + arch/m68k/include/asm/motorola_pgtable.h | 6 +- + arch/m68k/include/asm/sun3_pgtable.h | 6 +- + arch/microblaze/include/asm/pgtable.h | 2 +- + arch/mips/cavium-octeon/smp.c | 1 + + arch/mips/include/asm/cmpxchg.h | 4 +- + arch/mips/include/asm/local.h | 13 +- + arch/mips/include/asm/pgtable.h | 6 +- + arch/mips/include/asm/smp.h | 4 +- + arch/mips/kernel/process.c | 2 +- + arch/mips/kernel/smp-bmips.c | 4 + + arch/mips/kernel/smp-cps.c | 1 + + arch/mips/kernel/uprobes.c | 10 +- + arch/mips/loongson64/smp.c | 2 + + arch/nios2/include/asm/pgtable.h | 2 +- + arch/openrisc/include/asm/cmpxchg.h | 10 +- + arch/openrisc/include/asm/pgtable.h | 2 +- + arch/openrisc/kernel/smp.c | 2 +- + arch/parisc/include/asm/cmpxchg.h | 4 +- + arch/parisc/include/asm/pgtable.h | 6 +- + arch/parisc/kernel/process.c | 2 +- + arch/parisc/kernel/smp.c | 4 +- + arch/powerpc/include/asm/book3s/32/pgtable.h | 2 +- + arch/powerpc/include/asm/book3s/64/pgtable.h | 4 +- + arch/powerpc/include/asm/cmpxchg.h | 4 +- + arch/powerpc/include/asm/local.h | 11 + + arch/powerpc/include/asm/nohash/32/pgtable.h | 2 +- + arch/powerpc/include/asm/nohash/32/pte-8xx.h | 2 +- + arch/powerpc/include/asm/nohash/64/pgtable.h | 2 +- + arch/powerpc/include/asm/smp.h | 2 +- + arch/powerpc/kernel/setup_64.c | 2 +- + arch/powerpc/kernel/smp.c | 8 +- + arch/powerpc/kernel/uprobes.c | 10 +- + arch/powerpc/kvm/book3s_hv.c | 3 + + arch/powerpc/platforms/powernv/subcore.c | 2 + + arch/riscv/include/asm/atomic.h | 2 +- + arch/riscv/include/asm/cmpxchg.h | 4 +- + arch/riscv/include/asm/pgtable.h | 6 +- + arch/riscv/kernel/cpu-hotplug.c | 2 +- + arch/riscv/kernel/probes/uprobes.c | 9 +- + arch/riscv/kernel/smp.c | 4 +- + arch/s390/include/asm/cmpxchg.h | 8 +- + arch/s390/include/asm/hugetlb.h | 4 +- + arch/s390/include/asm/pgtable.h | 14 +- + arch/s390/kernel/idle.c | 2 +- + arch/s390/kernel/smp.c | 2 +- + arch/s390/kernel/uprobes.c | 7 +- + arch/s390/mm/pageattr.c | 4 +- + arch/sh/include/asm/cmpxchg.h | 4 +- + arch/sh/include/asm/pgtable_32.h | 10 +- + arch/sh/include/asm/smp-ops.h | 5 +- + arch/sh/kernel/idle.c | 3 +- + arch/sh/kernel/smp.c | 2 +- + arch/sparc/include/asm/cmpxchg_32.h | 4 +- + arch/sparc/include/asm/cmpxchg_64.h | 6 +- + arch/sparc/include/asm/mmu_context_64.h | 6 + + arch/sparc/include/asm/pgtable_32.h | 2 +- + arch/sparc/include/asm/pgtable_64.h | 6 +- + arch/sparc/include/asm/smp_64.h | 2 +- + arch/sparc/include/asm/uaccess_64.h | 2 + + arch/sparc/kernel/process_64.c | 2 +- + arch/sparc/kernel/signal32.c | 2 +- + arch/sparc/kernel/signal_64.c | 2 +- + arch/sparc/kernel/smp_32.c | 2 +- + arch/sparc/kernel/smp_64.c | 2 +- + arch/sparc/kernel/uprobes.c | 7 +- + arch/um/include/asm/pgtable.h | 2 +- + arch/x86/Kconfig | 35 + + arch/x86/Kconfig.assembler | 5 + + arch/x86/boot/compressed/ident_map_64.c | 8 - + arch/x86/boot/compressed/misc.h | 9 + + arch/x86/boot/compressed/sev.c | 2 - + arch/x86/boot/compressed/tdx.c | 4 +- + arch/x86/coco/tdx/tdcall.S | 66 +- + arch/x86/coco/tdx/tdx.c | 18 +- + arch/x86/entry/entry_64.S | 28 +- + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + arch/x86/entry/vdso/vdso32-setup.c | 11 +- + arch/x86/entry/vsyscall/vsyscall_64.c | 2 +- + arch/x86/events/intel/core.c | 16 +- + arch/x86/events/intel/cstate.c | 2 + + arch/x86/events/intel/uncore_snbep.c | 12 + + arch/x86/events/msr.c | 2 + + arch/x86/hyperv/ivm.c | 2 +- + arch/x86/include/asm/cmpxchg.h | 6 + + arch/x86/include/asm/cpufeatures.h | 3 + + arch/x86/include/asm/disabled-features.h | 24 +- + arch/x86/include/asm/fpu/api.h | 9 + + arch/x86/include/asm/fpu/regset.h | 7 +- + arch/x86/include/asm/fpu/sched.h | 3 +- + arch/x86/include/asm/fpu/types.h | 16 +- + arch/x86/include/asm/fpu/xstate.h | 6 +- + arch/x86/include/asm/idtentry.h | 2 +- + arch/x86/include/asm/intel-mid.h | 21 - + arch/x86/include/asm/linkage.h | 2 +- + arch/x86/include/asm/local.h | 13 +- + arch/x86/include/asm/mmu.h | 18 +- + arch/x86/include/asm/mmu_context.h | 51 +- + arch/x86/include/asm/mshyperv.h | 2 +- + arch/x86/include/asm/nospec-branch.h | 14 +- + arch/x86/include/asm/orc_types.h | 12 +- + arch/x86/include/asm/pgtable.h | 322 ++++- + arch/x86/include/asm/pgtable_types.h | 56 +- + arch/x86/include/asm/processor-flags.h | 2 + + arch/x86/include/asm/processor.h | 8 + + arch/x86/include/asm/reboot.h | 1 - + arch/x86/include/asm/setup.h | 6 +- + arch/x86/include/asm/shared/tdx.h | 5 +- + arch/x86/include/asm/shstk.h | 38 + + arch/x86/include/asm/smp.h | 7 +- + arch/x86/include/asm/special_insns.h | 13 + + arch/x86/include/asm/tlbflush.h | 51 +- + arch/x86/include/asm/trap_pf.h | 2 + + arch/x86/include/asm/traps.h | 12 + + arch/x86/include/asm/uaccess.h | 58 +- + arch/x86/include/asm/uaccess_64.h | 2 - + arch/x86/include/asm/unwind_hints.h | 18 +- + arch/x86/include/uapi/asm/mman.h | 4 + + arch/x86/include/uapi/asm/prctl.h | 20 + + arch/x86/include/uapi/asm/processor-flags.h | 6 + + arch/x86/kernel/Makefile | 4 + + arch/x86/kernel/cet.c | 152 +++ + arch/x86/kernel/cpu/common.c | 35 +- + arch/x86/kernel/cpu/cpuid-deps.c | 1 + + arch/x86/kernel/cpu/microcode/amd.c | 9 +- + arch/x86/kernel/cpu/microcode/core.c | 9 +- + arch/x86/kernel/cpu/proc.c | 23 + + arch/x86/kernel/cpu/resctrl/monitor.c | 43 +- + arch/x86/kernel/fpu/core.c | 54 +- + arch/x86/kernel/fpu/regset.c | 81 ++ + arch/x86/kernel/fpu/xstate.c | 90 +- + arch/x86/kernel/ftrace_64.S | 2 +- + arch/x86/kernel/head32.c | 2 +- + arch/x86/kernel/head64.c | 4 +- + arch/x86/kernel/head_64.S | 17 +- + arch/x86/kernel/idt.c | 2 +- + arch/x86/kernel/itmt.c | 11 +- + arch/x86/kernel/process.c | 32 +- + arch/x86/kernel/process_64.c | 76 +- + arch/x86/kernel/ptrace.c | 12 + + arch/x86/kernel/reboot.c | 2 +- + arch/x86/kernel/relocate_kernel_64.S | 10 +- + arch/x86/kernel/shstk.c | 499 ++++++++ + arch/x86/kernel/signal.c | 1 + + arch/x86/kernel/signal_32.c | 2 +- + arch/x86/kernel/signal_64.c | 8 +- + arch/x86/kernel/smpboot.c | 2 +- + arch/x86/kernel/sys_x86_64.c | 6 +- + arch/x86/kernel/traps.c | 93 +- + arch/x86/kernel/unwind_orc.c | 27 +- + arch/x86/kvm/svm/svm.c | 4 + + arch/x86/kvm/x86.c | 2 + + arch/x86/lib/getuser.S | 83 +- + arch/x86/lib/putuser.S | 54 +- + arch/x86/lib/retpoline.S | 6 +- + arch/x86/lib/usercopy_64.c | 9 - + arch/x86/mm/fault.c | 22 + + arch/x86/mm/init.c | 5 + + arch/x86/mm/pat/set_memory.c | 4 +- + arch/x86/mm/pgtable.c | 38 + + arch/x86/mm/tlb.c | 53 +- + arch/x86/platform/pvh/head.S | 2 +- + arch/x86/power/cpu.c | 2 +- + arch/x86/xen/enlighten_pv.c | 2 +- + arch/x86/xen/mmu_pv.c | 2 +- + arch/x86/xen/xen-asm.S | 6 +- + arch/x86/xen/xen-head.S | 4 +- + arch/xtensa/include/asm/cmpxchg.h | 4 +- + arch/xtensa/include/asm/pgtable.h | 2 +- + arch/xtensa/include/asm/smp.h | 2 +- + arch/xtensa/kernel/smp.c | 6 +- + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 2 +- + drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c | 4 +- + .../gpu/drm/i915/gt/intel_execlists_submission.c | 4 +- + drivers/gpu/drm/i915/gt/intel_ggtt.c | 4 +- + drivers/gpu/drm/i915/gt/intel_gsc.c | 2 +- + drivers/gpu/drm/i915/gt/intel_gt.c | 4 +- + drivers/gpu/drm/i915/gt/intel_gt_pm.c | 2 +- + drivers/gpu/drm/i915/gt/intel_lrc.c | 6 +- + drivers/gpu/drm/i915/gt/intel_migrate.c | 2 +- + drivers/gpu/drm/i915/gt/intel_rc6.c | 2 +- + drivers/gpu/drm/i915/gt/intel_rps.c | 2 +- + drivers/gpu/drm/i915/gt/selftest_context.c | 2 +- + drivers/gpu/drm/i915/gt/selftest_ring_submission.c | 2 +- + drivers/gpu/drm/i915/gt/selftest_timeline.c | 2 +- + drivers/gpu/drm/i915/gt/uc/intel_uc.c | 2 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 2 +- + drivers/gpu/drm/i915/i915_utils.h | 1 + + drivers/iommu/iommu-sva.c | 12 +- + drivers/message/fusion/mptbase.c | 2 +- + drivers/message/fusion/mptbase.h | 2 +- + drivers/misc/lkdtm/stackleak.c | 6 + + drivers/vfio/vfio_iommu_type1.c | 2 +- + drivers/vhost/vhost.c | 3 +- + fs/aio.c | 2 +- + fs/proc/array.c | 13 + + fs/proc/task_mmu.c | 12 +- + include/asm-generic/hugetlb.h | 4 +- + include/asm-generic/local.h | 1 + + include/asm-generic/local64.h | 12 +- + include/linux/atomic/atomic-arch-fallback.h | 24 +- + include/linux/atomic/atomic-instrumented.h | 86 +- + include/linux/context_tracking.h | 2 +- + include/linux/cpu.h | 2 +- + include/linux/livepatch.h | 1 + + include/linux/livepatch_sched.h | 29 + + include/linux/llist.h | 6 +- + include/linux/mm.h | 76 +- + include/linux/mm_types.h | 82 +- + include/linux/mman.h | 4 + + include/linux/mmu_context.h | 14 + + include/linux/non-atomic/xchg.h | 19 + + include/linux/objtool.h | 81 +- + include/linux/objtool_types.h | 57 + + include/linux/pgtable.h | 14 + + include/linux/proc_fs.h | 2 + + include/linux/psi.h | 2 +- + include/linux/psi_types.h | 43 +- + include/linux/sched.h | 23 +- + include/linux/sched/mm.h | 5 + + include/linux/sched/task_stack.h | 2 +- + include/linux/smp.h | 15 +- + include/linux/start_kernel.h | 6 +- + include/linux/syscalls.h | 1 + + include/linux/uaccess.h | 22 + + include/trace/events/ipi.h | 44 + + include/uapi/asm-generic/siginfo.h | 3 +- + include/uapi/asm-generic/unistd.h | 2 +- + include/uapi/linux/elf.h | 2 + + init/main.c | 6 +- + ipc/shm.c | 2 +- + kernel/cgroup/cgroup.c | 2 +- + kernel/events/core.c | 4 +- + kernel/fork.c | 9 +- + kernel/irq_work.c | 12 +- + kernel/livepatch/core.c | 1 + + kernel/livepatch/transition.c | 122 +- + kernel/locking/rwbase_rt.c | 9 - + kernel/panic.c | 4 +- + kernel/sched/clock.c | 3 + + kernel/sched/core.c | 691 ++++++++++- + kernel/sched/deadline.c | 11 + + kernel/sched/fair.c | 22 +- + kernel/sched/idle.c | 2 +- + kernel/sched/psi.c | 473 ++++---- + kernel/sched/rt.c | 23 + + kernel/sched/sched.h | 243 +++- + kernel/sched/smp.h | 2 +- + kernel/sched/topology.c | 4 +- + kernel/smp.c | 313 ++--- + kernel/sys_ni.c | 1 + + lib/Kconfig.debug | 9 + + mm/debug_vm_pgtable.c | 16 +- + mm/gup.c | 6 +- + mm/huge_memory.c | 7 +- + mm/hugetlb.c | 4 +- + mm/internal.h | 4 +- + mm/madvise.c | 5 +- + mm/memory.c | 5 +- + mm/migrate.c | 11 +- + mm/migrate_device.c | 2 +- + mm/mmap.c | 10 +- + mm/mprotect.c | 2 +- + mm/nommu.c | 4 +- + mm/userfaultfd.c | 2 +- + mm/util.c | 2 +- + scripts/atomic/gen-atomic-fallback.sh | 4 + + scripts/atomic/gen-atomic-instrumented.sh | 8 +- + scripts/objdump-func | 34 +- + scripts/sorttable.h | 2 +- + tools/arch/x86/include/asm/orc_types.h | 12 +- + tools/include/linux/objtool.h | 200 ---- + tools/include/linux/objtool_types.h | 57 + + tools/objtool/check.c | 476 ++++---- + tools/objtool/elf.c | 2 +- + tools/objtool/include/objtool/check.h | 4 +- + tools/objtool/include/objtool/elf.h | 9 + + tools/objtool/include/objtool/warn.h | 5 + + tools/objtool/orc_dump.c | 15 +- + tools/objtool/orc_gen.c | 48 +- + tools/objtool/sync-check.sh | 2 +- + tools/testing/selftests/x86/Makefile | 2 +- + tools/testing/selftests/x86/lam.c | 1241 ++++++++++++++++++++ + tools/testing/selftests/x86/test_shadow_stack.c | 695 +++++++++++ + virt/kvm/kvm_main.c | 3 + + 342 files changed, 7099 insertions(+), 2100 deletions(-) + create mode 100644 Documentation/x86/shstk.rst + create mode 100644 arch/x86/include/asm/shstk.h + create mode 100644 arch/x86/kernel/cet.c + create mode 100644 arch/x86/kernel/shstk.c + create mode 100644 include/linux/livepatch_sched.h + create mode 100644 include/linux/non-atomic/xchg.h + create mode 100644 include/linux/objtool_types.h + delete mode 100644 tools/include/linux/objtool.h + create mode 100644 tools/include/linux/objtool_types.h + create mode 100644 tools/testing/selftests/x86/lam.c + create mode 100644 tools/testing/selftests/x86/test_shadow_stack.c +$ git am -3 ../patches/0001-fixup-for-iommu-sva-Replace-pasid_valid-helper-with-.patch +Applying: fixup for "iommu/sva: Replace pasid_valid() helper with mm_valid_pasid()" +$ git reset HEAD^ +Unstaged changes after reset: +M include/linux/iommu.h +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master 145c8dc00c2e9] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git + Date: Thu Apr 27 14:43:42 2023 +0100 +$ git am -3 ../patches/0001-extra-fixup-for-iommu-sva-Replace-pasid_valid-helper.patch +Applying: extra fixup for "iommu/sva: Replace pasid_valid() helper with mm_valid_pasid()" +$ git reset HEAD^ +Unstaged changes after reset: +M arch/x86/kernel/process_64.c +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master f2bbc883cdd7f] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git + Date: Thu Apr 27 14:43:42 2023 +0100 +$ git am -3 ../patches/0001-mm-migrate-Fixup-for-merge-issue-with-the-mm-tree.patch +Applying: mm/migrate: Fixup for merge issue with the mm tree +$ git reset HEAD^ +Unstaged changes after reset: +M mm/huge_memory.c +M mm/migrate.c +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master 362c9cc97bb09] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git + Date: Thu Apr 27 14:43:42 2023 +0100 +Merging clockevents/timers/drivers/next (62a9488edfd7b dt-bindings: timer: rockchip: Add rk3588 compatible) +$ git merge -m Merge branch 'timers/drivers/next' of git://git.linaro.org/people/daniel.lezcano/linux.git clockevents/timers/drivers/next +Auto-merging drivers/clocksource/timer-ti-dm.c +Auto-merging drivers/clocksource/timer-tegra186.c +Auto-merging drivers/clocksource/timer-stm32-lp.c +Auto-merging drivers/clocksource/sh_mtu2.c +Merge made by the 'recursive' strategy. + .../bindings/timer/rockchip,rk-timer.yaml | 2 +- + drivers/clocksource/Kconfig | 9 ++ + drivers/clocksource/Makefile | 1 + + drivers/clocksource/exynos_mct.c | 2 +- + drivers/clocksource/sh_mtu2.c | 7 +- + drivers/clocksource/timer-davinci.c | 30 ++++- + drivers/clocksource/timer-imx-gpt.c | 19 --- + drivers/clocksource/timer-mediatek-cpux.c | 140 +++++++++++++++++++++ + drivers/clocksource/timer-mediatek.c | 114 ----------------- + drivers/clocksource/timer-stm32-lp.c | 11 +- + drivers/clocksource/timer-tegra186.c | 6 +- + drivers/clocksource/timer-ti-dm-systimer.c | 63 +++++----- + drivers/clocksource/timer-ti-dm.c | 15 +-- + include/soc/imx/timer.h | 7 -- + 14 files changed, 221 insertions(+), 205 deletions(-) + create mode 100644 drivers/clocksource/timer-mediatek-cpux.c +Merging edac/edac-for-next (d6c5e688899b0 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 +Already up to date! +Merge made by the 'recursive' strategy. +Merging irqchip/irq/irqchip-next (2ff1b0839ddd5 Merge branch irq/misc-6.4 into irq/irqchip-next) +$ git merge -m Merge branch 'irq/irqchip-next' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git irqchip/irq/irqchip-next +Already up to date. +Merging ftrace/for-next (3862f86c1529f 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 lib/test_fprobe.c +Auto-merging kernel/trace/ftrace.c +Auto-merging kernel/trace/bpf_trace.c +Auto-merging kernel/fork.c +CONFLICT (content): Merge conflict in kernel/fork.c +Auto-merging kernel/exit.c +Auto-merging include/linux/sched.h +Auto-merging fs/exec.c +Auto-merging Documentation/trace/ftrace.rst +Resolved 'kernel/fork.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master c8c24b24fc3f1] 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/tools/rtla/common_timerlat_aa.rst | 7 + + Documentation/trace/fprobe.rst | 16 +- + Documentation/trace/ftrace.rst | 6 + + Documentation/trace/user_events.rst | 167 ++-- + fs/exec.c | 2 + + include/linux/fprobe.h | 10 +- + include/linux/ftrace.h | 5 +- + include/linux/sched.h | 5 + + include/linux/seq_buf.h | 2 + + include/linux/user_events.h | 101 +- + include/uapi/linux/user_events.h | 81 ++ + kernel/exit.c | 2 + + kernel/fork.c | 2 + + kernel/trace/Kconfig | 6 +- + kernel/trace/bpf_trace.c | 17 +- + kernel/trace/fprobe.c | 32 +- + kernel/trace/ftrace.c | 51 +- + kernel/trace/ring_buffer.c | 98 +- + kernel/trace/rv/rv.c | 2 - + kernel/trace/trace.c | 7 +- + kernel/trace/trace.h | 2 + + kernel/trace/trace_events_user.c | 1034 +++++++++++++++++---- + kernel/trace/trace_output.c | 175 +++- + kernel/trace/trace_output.h | 2 + + lib/seq_buf.c | 32 + + lib/test_fprobe.c | 105 ++- + samples/fprobe/fprobe_example.c | 7 +- + samples/user_events/example.c | 45 +- + scripts/leaking_addresses.pl | 1 + + scripts/recordmcount.c | 6 +- + tools/kvm/kvm_stat/kvm_stat | 2 +- + tools/testing/selftests/mm/protection_keys.c | 4 +- + tools/testing/selftests/user_events/Makefile | 2 +- + tools/testing/selftests/user_events/abi_test.c | 229 +++++ + tools/testing/selftests/user_events/dyn_test.c | 2 +- + tools/testing/selftests/user_events/ftrace_test.c | 176 ++-- + tools/testing/selftests/user_events/perf_test.c | 39 +- + tools/tracing/rtla/.gitignore | 1 + + tools/tracing/rtla/src/timerlat_aa.c | 2 +- + tools/tracing/rtla/src/timerlat_top.c | 49 +- + tools/verification/rv/src/rv.c | 2 +- + 41 files changed, 2009 insertions(+), 527 deletions(-) + create mode 100644 include/uapi/linux/user_events.h + create mode 100644 tools/testing/selftests/user_events/abi_test.c + create mode 100644 tools/tracing/rtla/.gitignore +Merging rcu/rcu/next (523c1335f23e4 Merge branches 'urgent-rcu.2023.04.05a' and 'joel-boqun.2023.04.05a' into HEAD) +$ git merge -m Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git rcu/rcu/next +Already up to date! +Merge made by the 'recursive' strategy. +$ git am -3 ../patches/0001-fixup-for-RDMA-rxe-Add-error-messages.patch +Applying: fixup for "RDMA/rxe: Add error messages" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/infiniband/sw/rxe/rxe_verbs.c +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master e24bfb2be93cd] Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git + Date: Thu Apr 27 14:44:01 2023 +0100 +Merging kvm/next (4f382a79a66b1 Merge tag 'kvmarm-6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next +Auto-merging virt/kvm/kvm_main.c +Auto-merging include/linux/kvm_host.h +Auto-merging arch/x86/kvm/x86.c +Auto-merging arch/x86/kvm/vmx/nested.c +Auto-merging arch/x86/kvm/svm/svm.c +Auto-merging arch/s390/kvm/kvm-s390.c +Auto-merging arch/powerpc/kvm/powerpc.c +Auto-merging arch/powerpc/kvm/book3s_pr.c +Auto-merging arch/powerpc/kvm/book3s_hv.c +Auto-merging arch/powerpc/kvm/book3s_64_mmu_hv.c +Auto-merging arch/powerpc/include/asm/kvm_ppc.h +Auto-merging arch/arm64/tools/sysreg +Auto-merging arch/arm64/kvm/sys_regs.c +Auto-merging arch/arm64/kvm/pmu-emul.c +Auto-merging arch/arm64/kvm/hypercalls.c +Auto-merging arch/arm64/kvm/arm.c +CONFLICT (content): Merge conflict in arch/arm64/kvm/arm.c +Auto-merging arch/arm64/kernel/cpufeature.c +Auto-merging arch/arm64/include/asm/sysreg.h +Auto-merging arch/arm64/include/asm/kvm_host.h +Auto-merging Documentation/virt/kvm/api.rst +Resolved 'arch/arm64/kvm/arm.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 974e7df0fb29a] Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git +$ git diff -M --stat --summary HEAD^.. + Documentation/virt/kvm/api.rst | 74 ++- + Documentation/virt/kvm/devices/vm.rst | 79 +++ + arch/arm64/include/asm/kvm_host.h | 29 +- + arch/arm64/include/asm/kvm_mmu.h | 4 + + arch/arm64/include/asm/sysreg.h | 3 + + arch/arm64/include/uapi/asm/kvm.h | 36 ++ + arch/arm64/kernel/cpufeature.c | 11 + + arch/arm64/kvm/arch_timer.c | 550 ++++++++++++++++----- + arch/arm64/kvm/arm.c | 150 +++++- + arch/arm64/kvm/guest.c | 39 +- + arch/arm64/kvm/handle_exit.c | 36 +- + arch/arm64/kvm/hyp/include/hyp/switch.h | 53 ++ + arch/arm64/kvm/hyp/nvhe/debug-sr.c | 2 - + arch/arm64/kvm/hyp/nvhe/mem_protect.c | 7 + + arch/arm64/kvm/hyp/nvhe/switch.c | 18 + + arch/arm64/kvm/hyp/nvhe/timer-sr.c | 18 +- + arch/arm64/kvm/hyp/nvhe/tlb.c | 38 +- + arch/arm64/kvm/hyp/vhe/switch.c | 7 +- + arch/arm64/kvm/hyp/vhe/sysreg-sr.c | 12 + + arch/arm64/kvm/hypercalls.c | 189 ++++++- + arch/arm64/kvm/pmu-emul.c | 25 +- + arch/arm64/kvm/psci.c | 37 +- + arch/arm64/kvm/reset.c | 15 +- + arch/arm64/kvm/sys_regs.c | 10 + + arch/arm64/kvm/trace_arm.h | 6 +- + arch/arm64/kvm/vgic/vgic-debug.c | 8 +- + arch/arm64/kvm/vgic/vgic-init.c | 36 +- + arch/arm64/kvm/vgic/vgic-its.c | 33 +- + arch/arm64/kvm/vgic/vgic-kvm-device.c | 85 ++-- + arch/arm64/kvm/vgic/vgic-mmio-v3.c | 4 +- + arch/arm64/kvm/vgic/vgic-mmio.c | 12 +- + arch/arm64/kvm/vgic/vgic-v4.c | 11 +- + arch/arm64/kvm/vgic/vgic.c | 27 +- + arch/arm64/kvm/vgic/vgic.h | 3 - + arch/arm64/tools/cpucaps | 1 + + arch/arm64/tools/sysreg | 4 + + arch/mips/kvm/mips.c | 4 +- + arch/powerpc/include/asm/kvm_ppc.h | 14 +- + arch/powerpc/kvm/book3s_64_mmu_hv.c | 14 +- + arch/powerpc/kvm/book3s_64_vio.c | 4 +- + arch/powerpc/kvm/book3s_hv.c | 6 +- + arch/powerpc/kvm/book3s_pr.c | 4 +- + arch/powerpc/kvm/powerpc.c | 5 +- + arch/riscv/kvm/vm.c | 3 +- + arch/s390/kvm/interrupt.c | 4 +- + arch/s390/kvm/kvm-s390.c | 7 +- + arch/s390/kvm/pci.c | 2 +- + arch/s390/kvm/vsie.c | 50 +- + arch/x86/include/asm/kvm_host.h | 44 +- + arch/x86/include/uapi/asm/kvm.h | 3 + + arch/x86/kvm/cpuid.c | 2 +- + arch/x86/kvm/mmu/mmu.c | 5 +- + arch/x86/kvm/mmu/mmu_internal.h | 12 +- + arch/x86/kvm/mmu/paging_tmpl.h | 61 +-- + arch/x86/kvm/svm/svm.c | 34 +- + arch/x86/kvm/vmx/hyperv.c | 107 +++- + arch/x86/kvm/vmx/hyperv.h | 115 +---- + arch/x86/kvm/vmx/nested.c | 3 + + arch/x86/kvm/vmx/vmx.c | 52 +- + arch/x86/kvm/vmx/vmx.h | 2 +- + arch/x86/kvm/vmx/vmx_ops.h | 22 +- + arch/x86/kvm/x86.c | 55 ++- + include/clocksource/arm_arch_timer.h | 1 + + include/kvm/arm_arch_timer.h | 34 +- + include/kvm/arm_hypercalls.h | 6 +- + include/kvm/arm_vgic.h | 1 + + include/linux/kvm_host.h | 3 +- + include/uapi/linux/kvm.h | 14 +- + tools/include/uapi/linux/kvm.h | 2 +- + tools/testing/selftests/kvm/Makefile | 1 + + tools/testing/selftests/kvm/aarch64/arch_timer.c | 56 ++- + tools/testing/selftests/kvm/aarch64/get-reg-list.c | 15 +- + tools/testing/selftests/kvm/aarch64/smccc_filter.c | 268 ++++++++++ + tools/testing/selftests/kvm/config | 1 + + .../selftests/kvm/include/aarch64/processor.h | 13 + + .../testing/selftests/kvm/lib/aarch64/processor.c | 91 ++-- + virt/kvm/kvm_main.c | 4 +- + 77 files changed, 2066 insertions(+), 750 deletions(-) + create mode 100644 tools/testing/selftests/kvm/aarch64/smccc_filter.c +Merging kvm-arm/next (74819ee73f1f3 Merge branch kvm-arm64/misc-6.4 into kvmarm-master/next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm/next +Merge made by the 'recursive' strategy. + arch/arm64/include/asm/kvm_pgtable.h | 1 + + arch/arm64/kvm/fpsimd.c | 26 +++++++++++++-------- + arch/arm64/kvm/hyp/include/hyp/switch.h | 12 ++++++++-- + arch/arm64/kvm/hyp/pgtable.c | 41 +++++++++++++++++++++++++-------- + arch/arm64/kvm/inject_fault.c | 2 +- + arch/arm64/kvm/vmid.c | 7 +++--- + 6 files changed, 64 insertions(+), 25 deletions(-) +Merging kvms390/next (8a46df7cd135f KVM: s390: pci: fix virtual-physical confusion on module unload/load) +$ 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-x86/next (5c291b93e5d66 Merge branch 'pmu') +$ git merge -m Merge branch 'next' of https://github.com/kvm-x86/linux.git kvm-x86/next +Auto-merging virt/kvm/kvm_main.c +Auto-merging tools/testing/selftests/kvm/Makefile +Auto-merging include/linux/kvm_host.h +Auto-merging arch/x86/kvm/x86.c +Auto-merging arch/x86/kvm/vmx/nested.c +Auto-merging arch/x86/kvm/svm/svm_onhyperv.h +Auto-merging arch/x86/kvm/svm/svm.c +Auto-merging arch/x86/kvm/kvm_onhyperv.h +Auto-merging arch/x86/include/asm/kvm_host.h +Auto-merging arch/x86/include/asm/cpufeatures.h +Auto-merging Documentation/virt/kvm/api.rst +Merge made by the 'recursive' strategy. + Documentation/virt/kvm/api.rst | 1 + + Documentation/virt/kvm/locking.rst | 2 +- + arch/mips/include/asm/kvm_host.h | 2 +- + arch/mips/kvm/vz.c | 2 +- + arch/x86/include/asm/cpufeatures.h | 9 +- + arch/x86/include/asm/kvm-x86-ops.h | 6 +- + arch/x86/include/asm/kvm_host.h | 45 +- + arch/x86/include/asm/svm.h | 10 +- + arch/x86/kvm/cpuid.c | 16 +- + arch/x86/kvm/emulate.c | 8 + + arch/x86/kvm/kvm_cache_regs.h | 18 +- + arch/x86/kvm/kvm_onhyperv.c | 33 +- + arch/x86/kvm/kvm_onhyperv.h | 5 +- + arch/x86/kvm/mmu.h | 28 +- + arch/x86/kvm/mmu/mmu.c | 519 ++++++++++++--------- + arch/x86/kvm/mmu/mmu_internal.h | 8 +- + arch/x86/kvm/mmu/paging_tmpl.h | 214 +++------ + arch/x86/kvm/mmu/spte.c | 2 +- + arch/x86/kvm/mmu/tdp_iter.h | 48 +- + arch/x86/kvm/mmu/tdp_mmu.c | 336 +++++-------- + arch/x86/kvm/pmu.c | 25 +- + arch/x86/kvm/pmu.h | 2 +- + arch/x86/kvm/svm/nested.c | 91 +++- + arch/x86/kvm/svm/pmu.c | 2 +- + arch/x86/kvm/svm/svm.c | 161 +++++-- + arch/x86/kvm/svm/svm.h | 29 ++ + arch/x86/kvm/svm/svm_onhyperv.h | 5 +- + arch/x86/kvm/vmx/nested.c | 123 +++-- + arch/x86/kvm/vmx/pmu_intel.c | 135 +++--- + arch/x86/kvm/vmx/sgx.c | 4 +- + arch/x86/kvm/vmx/vmx.c | 44 +- + arch/x86/kvm/vmx/vmx.h | 18 + + arch/x86/kvm/x86.c | 201 +++++--- + arch/x86/kvm/x86.h | 64 ++- + include/linux/kvm_host.h | 4 +- + include/linux/kvm_types.h | 2 +- + tools/testing/selftests/kvm/Makefile | 1 + + tools/testing/selftests/kvm/demand_paging_test.c | 2 +- + .../testing/selftests/kvm/include/kvm_util_base.h | 1 + + .../selftests/kvm/include/x86_64/processor.h | 124 ++++- + tools/testing/selftests/kvm/lib/kvm_util.c | 5 + + tools/testing/selftests/kvm/lib/x86_64/processor.c | 36 +- + tools/testing/selftests/kvm/x86_64/amx_test.c | 118 ++--- + .../selftests/kvm/x86_64/pmu_event_filter_test.c | 253 +++++----- + .../kvm/x86_64/vmx_nested_tsc_scaling_test.c | 8 +- + .../selftests/kvm/x86_64/vmx_pmu_caps_test.c | 231 +++++++-- + .../testing/selftests/kvm/x86_64/xcr0_cpuid_test.c | 132 ++++++ + virt/kvm/kvm_main.c | 26 +- + 48 files changed, 1994 insertions(+), 1165 deletions(-) + create mode 100644 tools/testing/selftests/kvm/x86_64/xcr0_cpuid_test.c +$ git am -3 ../patches/0001-fixup-for-KVM-x86-Rename-Hyper-V-remote-TLB-hooks-to.patch +Applying: fixup for "KVM: x86: Rename Hyper-V remote TLB hooks to match established scheme" +$ git reset HEAD^ +Unstaged changes after reset: +M arch/x86/kvm/kvm_onhyperv.h +M arch/x86/kvm/svm/svm.c +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master 7d1c5e4d3afcc] Merge branch 'next' of https://github.com/kvm-x86/linux.git + Date: Thu Apr 27 14:53:13 2023 +0100 +Merging xen-tip/linux-next (cbfac7707ba16 xen/blkback: move blkif_get_x86_*_req() into blkback.c) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next +Auto-merging drivers/xen/xen-scsiback.c +Merge made by the 'recursive' strategy. + drivers/block/xen-blkback/blkback.c | 126 ++++++++++++++++++++++++++++++++---- + drivers/block/xen-blkback/common.h | 103 +---------------------------- + drivers/xen/pvcalls-front.c | 46 +++++++------ + drivers/xen/xen-pciback/pci_stub.c | 6 +- + drivers/xen/xen-scsiback.c | 27 ++++---- + 5 files changed, 160 insertions(+), 148 deletions(-) +Merging percpu/for-next (b9819165bb455 Merge branch 'for-6.2' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git percpu/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging workqueues/for-next (704bc669e1dda workqueue: Introduce show_freezable_workqueues) +$ 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 kernel/workqueue.c +Auto-merging include/linux/workqueue.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + include/linux/workqueue.h | 1 + + kernel/power/process.c | 2 +- + kernel/workqueue.c | 134 +++++++++++++++++++++++++++++++++++++++++----- + 4 files changed, 124 insertions(+), 14 deletions(-) +Merging drivers-x86/for-next (e578c943e363f platform/x86: x86-android-tablets: Add accelerometer support for Yoga Tablet 2 1050/830 series) +$ 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 +Already up to date. +Merging chrome-platform/for-next (d184d60aa301e platform/chrome: wilco_ec: remove return value check of debugfs_create_dir()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform/for-next +Already up to date. +Merging hsi/for-next (1b929c02afd37 Linux 6.2-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git hsi/for-next +Already up to date. +Merging leds/for-next (1b929c02afd37 Linux 6.2-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git leds/for-next +Already up to date. +Merging leds-lj/for-leds-next (36cd9fb534467 dt-bindings: leds: Add ROHM BD2606MVV LED) +$ 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 include/linux/leds.h +Auto-merging drivers/leds/Kconfig +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/leds/leds-pca9532.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/leds/common.yaml | 35 +- + .../devicetree/bindings/leds/leds-pca9532.txt | 49 - + .../devicetree/bindings/leds/leds-qcom-lpg.yaml | 1 + + .../devicetree/bindings/leds/nxp,pca953x.yaml | 90 ++ + .../bindings/leds/qcom,spmi-flash-led.yaml | 117 +++ + .../devicetree/bindings/leds/rohm,bd2606mvv.yaml | 81 ++ + Documentation/leds/index.rst | 1 + + Documentation/leds/leds-mt6370-rgb.rst | 64 ++ + Documentation/leds/ledtrig-oneshot.rst | 2 +- + MAINTAINERS | 1 + + drivers/leds/Kconfig | 2 +- + drivers/leds/flash/Kconfig | 28 + + drivers/leds/flash/Makefile | 2 + + drivers/leds/flash/leds-mt6370-flash.c | 573 +++++++++++ + drivers/leds/flash/leds-qcom-flash.c | 773 +++++++++++++++ + drivers/leds/leds-lp8860.c | 10 +- + drivers/leds/leds-tca6507.c | 5 +- + drivers/leds/leds-tlc591xx.c | 2 +- + drivers/leds/rgb/Kconfig | 13 + + drivers/leds/rgb/Makefile | 1 + + drivers/leds/rgb/leds-mt6370-rgb.c | 1011 ++++++++++++++++++++ + drivers/leds/rgb/leds-pwm-multicolor.c | 4 +- + drivers/leds/rgb/leds-qcom-lpg.c | 160 +++- + drivers/leds/trigger/Kconfig | 1 + + include/linux/leds.h | 2 +- + 25 files changed, 2916 insertions(+), 112 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/leds/leds-pca9532.txt + create mode 100644 Documentation/devicetree/bindings/leds/nxp,pca953x.yaml + create mode 100644 Documentation/devicetree/bindings/leds/qcom,spmi-flash-led.yaml + create mode 100644 Documentation/devicetree/bindings/leds/rohm,bd2606mvv.yaml + create mode 100644 Documentation/leds/leds-mt6370-rgb.rst + create mode 100644 drivers/leds/flash/leds-mt6370-flash.c + create mode 100644 drivers/leds/flash/leds-qcom-flash.c + create mode 100644 drivers/leds/rgb/leds-mt6370-rgb.c +Merging ipmi/for-next (d08076678ce72 ipmi:ssif: Drop if blocks with always false condition) +$ git merge -m Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git ipmi/for-next +Merge made by the 'recursive' strategy. + drivers/char/ipmi/Kconfig | 3 ++- + drivers/char/ipmi/ipmi_poweroff.c | 16 +--------------- + drivers/char/ipmi/ipmi_ssif.c | 16 ++++++---------- + 3 files changed, 9 insertions(+), 26 deletions(-) +Merging driver-core/driver-core-next (046b6a171009e device property: make device_property functions take const device *) +$ 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 tools/testing/nvdimm/test/nfit.c +Auto-merging mm/backing-dev.c +Auto-merging kernel/workqueue.c +Auto-merging kernel/cpu.c +Auto-merging init/Kconfig +Auto-merging include/linux/iommu.h +CONFLICT (content): Merge conflict in include/linux/iommu.h +Auto-merging fs/pstore/pmsg.c +Auto-merging fs/ksmbd/server.c +Auto-merging fs/kernfs/dir.c +Auto-merging drivers/watchdog/watchdog_dev.c +Auto-merging drivers/video/fbdev/core/fbmem.c +Auto-merging drivers/usb/core/usb.h +Auto-merging drivers/spi/spidev.c +Auto-merging drivers/spi/spi.c +Auto-merging drivers/soc/qcom/rmtfs_mem.c +Auto-merging drivers/scsi/ses.c +Auto-merging drivers/scsi/pmcraid.c +Auto-merging drivers/sbus/char/oradax.c +Auto-merging drivers/s390/crypto/zcrypt_api.c +Auto-merging drivers/s390/crypto/ap_bus.c +Auto-merging drivers/ptp/ptp_ocp.c +Auto-merging drivers/power/supply/power_supply_core.c +Auto-merging drivers/platform/x86/intel/pmt/class.c +Auto-merging drivers/pci/pci.c +Auto-merging drivers/nvme/target/fcloop.c +Auto-merging drivers/nvme/host/core.c +Auto-merging drivers/net/wwan/wwan_hwsim.c +Auto-merging drivers/net/wwan/wwan_core.c +Auto-merging drivers/net/wireless/virtual/mac80211_hwsim.c +Auto-merging drivers/mtd/ubi/build.c +Auto-merging drivers/mtd/mtdcore.c +Auto-merging drivers/macintosh/adb.c +Auto-merging drivers/irqchip/irq-mbigen.c +Auto-merging drivers/iommu/iommu.c +Auto-merging drivers/infiniband/hw/qib/qib_file_ops.c +Auto-merging drivers/infiniband/core/user_mad.c +Auto-merging drivers/hwmon/hwmon.c +Auto-merging drivers/hwmon/drivetemp.c +Auto-merging drivers/hv/vmbus_drv.c +Auto-merging drivers/gpu/drm/i915/gt/uc/intel_huc.h +Auto-merging drivers/gpu/drm/i915/gt/uc/intel_huc.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +Auto-merging drivers/gpio/gpiolib-sysfs.c +Auto-merging drivers/fpga/fpga-bridge.c +Auto-merging drivers/cxl/core/port.c +Auto-merging drivers/crypto/intel/qat/qat_common/adf_ctl_drv.c +Auto-merging drivers/crypto/hisilicon/qm.c +Auto-merging drivers/cpufreq/intel_pstate.c +Auto-merging drivers/cpufreq/cpufreq.c +Auto-merging drivers/cpufreq/amd-pstate.c +Auto-merging drivers/char/tpm/tpm.h +Auto-merging drivers/char/tpm/tpm-chip.c +Auto-merging drivers/block/zram/zram_drv.c +Auto-merging drivers/block/ublk_drv.c +Auto-merging drivers/block/pktcdvd.c +Auto-merging drivers/ata/pata_parport/pata_parport.c +Auto-merging drivers/accel/habanalabs/common/habanalabs_drv.c +Auto-merging block/genhd.c +Auto-merging arch/x86/kernel/cpu/microcode/core.c +Auto-merging arch/s390/kernel/topology.c +CONFLICT (content): Merge conflict in arch/s390/kernel/topology.c +Auto-merging arch/s390/kernel/smp.c +Auto-merging arch/powerpc/platforms/pseries/vio.c +Auto-merging arch/powerpc/platforms/pseries/mobility.c +Auto-merging arch/powerpc/platforms/powernv/subcore.c +Auto-merging arch/mips/sibyte/common/sb_tbprof.c +CONFLICT (modify/delete): arch/mips/kernel/vpe-cmp.c deleted in HEAD and modified in driver-core/driver-core-next. Version driver-core/driver-core-next of arch/mips/kernel/vpe-cmp.c left in tree. +Auto-merging arch/arm64/kernel/cpufeature.c +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Resolved 'arch/s390/kernel/topology.c' using previous resolution. +Resolved 'include/linux/iommu.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +Merging driver-core/driver-core-next (046b6a171009e device property: make device_property functions take const device *) +$ 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 +error: Merging is not possible because you have unmerged files. +hint: Fix them up in the work tree, and then use 'git add/rm <file>' +hint: as appropriate to mark resolution and make a commit. +fatal: Exiting because of an unresolved conflict. +$ git commit --no-edit -v -a +[master 1692824e7c95b] Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-devices-state_synced | 5 + + Documentation/admin-guide/kernel-parameters.txt | 23 +- + Documentation/driver-api/driver-model/bus.rst | 4 +- + Documentation/driver-api/firmware/fw_upload.rst | 3 +- + Documentation/filesystems/sysfs.rst | 4 +- + .../translations/zh_CN/filesystems/sysfs.txt | 4 +- + .../translations/zh_TW/filesystems/sysfs.txt | 4 +- + MAINTAINERS | 2 + + arch/arm/include/asm/dma-iommu.h | 2 +- + arch/arm/mm/dma-mapping.c | 2 +- + arch/arm64/kernel/cpufeature.c | 10 +- + arch/mips/kernel/mips-mt.c | 2 +- + arch/mips/kernel/vpe-mt.c | 1 - + arch/mips/sibyte/common/sb_tbprof.c | 2 +- + arch/powerpc/kernel/sysfs.c | 14 +- + arch/powerpc/platforms/book3s/vas-api.c | 2 +- + arch/powerpc/platforms/powernv/idle.c | 9 +- + arch/powerpc/platforms/powernv/subcore.c | 10 +- + arch/powerpc/platforms/pseries/dlpar.c | 4 +- + arch/powerpc/platforms/pseries/ibmebus.c | 4 +- + arch/powerpc/platforms/pseries/mobility.c | 4 +- + arch/powerpc/platforms/pseries/pseries_energy.c | 28 +- + arch/powerpc/platforms/pseries/suspend.c | 10 +- + arch/powerpc/platforms/pseries/vio.c | 8 +- + arch/powerpc/sysdev/fsl_mpic_timer_wakeup.c | 21 +- + arch/s390/kernel/smp.c | 12 +- + arch/s390/kernel/topology.c | 11 +- + arch/sh/drivers/dma/dma-sysfs.c | 8 +- + arch/x86/kernel/cpu/microcode/core.c | 13 +- + arch/x86/kernel/cpu/resctrl/pseudo_lock.c | 2 +- + arch/x86/kernel/cpu/umwait.c | 8 +- + arch/x86/kernel/cpuid.c | 2 +- + arch/x86/kernel/msr.c | 2 +- + block/bsg.c | 2 +- + block/genhd.c | 20 +- + drivers/accel/drm_accel.c | 2 +- + drivers/accel/habanalabs/common/habanalabs_drv.c | 2 +- + drivers/acpi/acpi_lpit.c | 16 +- + drivers/ata/pata_parport/pata_parport.c | 6 +- + drivers/base/Kconfig | 12 + + drivers/base/base.h | 114 ++++---- + drivers/base/bus.c | 48 ++-- + drivers/base/class.c | 247 ++++++++++------ + drivers/base/core.c | 313 ++++++++++++--------- + drivers/base/dd.c | 36 ++- + drivers/base/devcoredump.c | 5 +- + drivers/base/devres.c | 11 +- + drivers/base/devtmpfs.c | 9 - + drivers/base/firmware_loader/Kconfig | 13 + + drivers/base/firmware_loader/main.c | 65 ++++- + drivers/base/firmware_loader/sysfs.c | 4 +- + drivers/base/physical_location.h | 2 +- + drivers/base/power/wakeup_stats.c | 2 +- + drivers/base/property.c | 148 +++++++--- + drivers/base/soc.c | 15 + + drivers/block/aoe/aoechr.c | 2 +- + drivers/block/pktcdvd.c | 47 +--- + drivers/block/rbd.c | 34 +-- + drivers/block/rnbd/rnbd-clt-sysfs.c | 2 +- + drivers/block/rnbd/rnbd-srv-sysfs.c | 2 +- + drivers/block/ublk_drv.c | 2 +- + drivers/block/zram/zram_drv.c | 10 +- + drivers/bus/fsl-mc/fsl-mc-bus.c | 6 +- + drivers/char/bsr.c | 2 +- + drivers/char/dsp56k.c | 2 +- + drivers/char/ipmi/ipmi_devintf.c | 2 +- + drivers/char/lp.c | 2 +- + drivers/char/mem.c | 2 +- + drivers/char/misc.c | 2 +- + drivers/char/pcmcia/cm4000_cs.c | 2 +- + drivers/char/pcmcia/cm4040_cs.c | 2 +- + drivers/char/pcmcia/scr24x_cs.c | 2 +- + drivers/char/ppdev.c | 2 +- + drivers/char/tpm/tpm-chip.c | 3 +- + drivers/char/tpm/tpm-interface.c | 6 +- + drivers/char/tpm/tpm.h | 1 + + drivers/char/virtio_console.c | 2 +- + drivers/char/xilinx_hwicap/xilinx_hwicap.c | 2 +- + drivers/char/xillybus/xillybus_class.c | 2 +- + drivers/comedi/comedi_fops.c | 2 +- + drivers/comedi/drivers/comedi_test.c | 2 +- + drivers/cpufreq/amd-pstate.c | 24 +- + drivers/cpufreq/cpufreq.c | 7 +- + drivers/cpufreq/intel_pstate.c | 7 +- + drivers/cpuidle/cpuidle.c | 2 +- + drivers/cpuidle/cpuidle.h | 2 +- + drivers/cpuidle/sysfs.c | 13 +- + drivers/crypto/hisilicon/qm.c | 2 +- + drivers/crypto/intel/qat/qat_common/adf_ctl_drv.c | 2 +- + drivers/cxl/core/port.c | 2 +- + drivers/dca/dca-sysfs.c | 2 +- + drivers/devfreq/devfreq-event.c | 2 +- + drivers/devfreq/devfreq.c | 2 +- + drivers/dma-buf/dma-heap.c | 2 +- + drivers/dma/idxd/compat.c | 4 +- + drivers/edac/edac_device_sysfs.c | 16 +- + drivers/edac/edac_pci_sysfs.c | 14 +- + drivers/extcon/extcon.c | 2 +- + drivers/fpga/fpga-bridge.c | 2 +- + drivers/fpga/fpga-mgr.c | 2 +- + drivers/fpga/fpga-region.c | 2 +- + drivers/gnss/core.c | 2 +- + drivers/gpio/gpiolib-sysfs.c | 14 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 2 +- + drivers/gpu/drm/display/drm_dp_aux_dev.c | 2 +- + drivers/gpu/drm/drm_sysfs.c | 2 +- + drivers/gpu/drm/i915/gt/uc/intel_huc.c | 4 +- + drivers/gpu/drm/i915/gt/uc/intel_huc.h | 4 +- + drivers/hid/hid-roccat-arvo.c | 2 +- + drivers/hid/hid-roccat-isku.c | 2 +- + drivers/hid/hid-roccat-kone.c | 2 +- + drivers/hid/hid-roccat-koneplus.c | 2 +- + drivers/hid/hid-roccat-konepure.c | 2 +- + drivers/hid/hid-roccat-kovaplus.c | 2 +- + drivers/hid/hid-roccat-pyra.c | 2 +- + drivers/hid/hid-roccat-ryos.c | 2 +- + drivers/hid/hid-roccat-savu.c | 2 +- + drivers/hid/hidraw.c | 2 +- + drivers/hv/vmbus_drv.c | 2 +- + drivers/hwmon/drivetemp.c | 4 +- + drivers/hwmon/hwmon.c | 1 - + drivers/i2c/i2c-dev.c | 2 +- + drivers/infiniband/core/user_mad.c | 4 +- + drivers/infiniband/core/uverbs_main.c | 2 +- + drivers/infiniband/hw/hfi1/device.c | 4 +- + drivers/infiniband/hw/qib/qib_file_ops.c | 2 +- + drivers/infiniband/ulp/rtrs/rtrs-clt.c | 2 +- + drivers/infiniband/ulp/rtrs/rtrs-srv.c | 2 +- + drivers/iommu/iommu.c | 14 +- + drivers/irqchip/irq-mbigen.c | 13 +- + drivers/isdn/capi/capi.c | 2 +- + drivers/isdn/mISDN/core.c | 7 - + drivers/isdn/mISDN/dsp_pipeline.c | 2 +- + drivers/leds/led-class.c | 2 +- + drivers/macintosh/adb.c | 2 +- + drivers/media/dvb-core/dvbdev.c | 2 +- + drivers/media/pci/ddbridge/ddbridge-core.c | 1 - + drivers/media/rc/lirc_dev.c | 2 +- + drivers/media/usb/pvrusb2/pvrusb2-main.c | 18 +- + drivers/media/usb/pvrusb2/pvrusb2-sysfs.c | 59 ++-- + drivers/media/usb/pvrusb2/pvrusb2-sysfs.h | 16 +- + drivers/mfd/cros_ec_dev.c | 1 - + drivers/misc/c2port/core.c | 2 +- + drivers/misc/cxl/file.c | 2 +- + drivers/misc/enclosure.c | 1 - + drivers/misc/genwqe/card_base.c | 2 +- + drivers/misc/hpilo.c | 2 +- + drivers/misc/mei/main.c | 2 +- + drivers/misc/ocxl/file.c | 2 +- + drivers/misc/phantom.c | 2 +- + drivers/misc/uacce/uacce.c | 2 +- + drivers/most/most_cdev.c | 2 +- + drivers/mtd/mtdcore.c | 1 - + drivers/mtd/ubi/build.c | 3 +- + drivers/mux/core.c | 1 - + drivers/net/bonding/bond_sysfs.c | 18 +- + drivers/net/ethernet/hisilicon/hns/hnae.c | 2 +- + drivers/net/ipvlan/ipvtap.c | 1 - + drivers/net/macvtap.c | 1 - + drivers/net/netdevsim/bus.c | 4 +- + drivers/net/ppp/ppp_generic.c | 2 +- + drivers/net/rionet.c | 3 +- + drivers/net/wireless/virtual/mac80211_hwsim.c | 2 +- + drivers/net/wwan/wwan_core.c | 2 +- + drivers/net/wwan/wwan_hwsim.c | 2 +- + drivers/ntb/hw/mscc/ntb_hw_switchtec.c | 6 +- + drivers/nvdimm/bus.c | 2 +- + drivers/nvme/host/core.c | 6 +- + drivers/nvme/host/fabrics.c | 2 +- + drivers/nvme/host/fc.c | 1 - + drivers/nvme/target/fcloop.c | 2 +- + drivers/pci/endpoint/pci-epc-core.c | 2 +- + drivers/pci/pci-sysfs.c | 2 +- + drivers/pci/pci.c | 4 +- + drivers/pci/switch/switchtec.c | 2 +- + drivers/pcmcia/cs.c | 2 +- + drivers/pcmcia/ds.c | 6 +- + drivers/pcmcia/rsrc_nonstatic.c | 6 +- + drivers/peci/sysfs.c | 2 +- + drivers/phy/phy-core.c | 2 +- + drivers/platform/chrome/wilco_ec/event.c | 1 - + drivers/platform/chrome/wilco_ec/telemetry.c | 1 - + drivers/platform/x86/ibm_rtl.c | 18 +- + drivers/platform/x86/intel/pmt/class.c | 1 - + .../uncore-frequency/uncore-frequency-common.c | 12 +- + drivers/platform/x86/intel_scu_ipc.c | 1 - + drivers/power/supply/power_supply_core.c | 2 +- + drivers/pps/pps.c | 2 +- + drivers/ptp/ptp_clock.c | 2 +- + drivers/ptp/ptp_ocp.c | 1 - + drivers/pwm/sysfs.c | 1 - + drivers/rapidio/devices/rio_mport_cdev.c | 9 +- + drivers/rapidio/rio-driver.c | 1 - + drivers/rapidio/rio-sysfs.c | 2 +- + drivers/rapidio/rio_cm.c | 10 +- + drivers/rpmsg/rpmsg_core.c | 2 +- + drivers/rtc/class.c | 2 +- + drivers/s390/char/hmcdrv_dev.c | 2 +- + drivers/s390/char/raw3270.c | 2 +- + drivers/s390/char/tape_class.c | 2 +- + drivers/s390/char/vmlogrdr.c | 2 +- + drivers/s390/char/vmur.c | 2 +- + drivers/s390/crypto/ap_bus.c | 42 +-- + drivers/s390/crypto/zcrypt_api.c | 10 +- + drivers/sbus/char/oradax.c | 2 +- + drivers/scsi/ch.c | 2 +- + drivers/scsi/cxlflash/main.c | 2 +- + drivers/scsi/fcoe/fcoe_sysfs.c | 8 +- + drivers/scsi/fcoe/fcoe_transport.c | 6 +- + drivers/scsi/pmcraid.c | 2 +- + drivers/scsi/sd.c | 1 - + drivers/scsi/ses.c | 6 +- + drivers/scsi/sg.c | 10 +- + drivers/sh/intc/userimask.c | 10 +- + drivers/soc/amlogic/meson-gx-socinfo.c | 5 - + drivers/soc/qcom/rmtfs_mem.c | 1 - + drivers/spi/spi.c | 2 - + drivers/spi/spidev.c | 2 +- + drivers/staging/fieldbus/anybuss/arcx-anybus.c | 2 +- + drivers/staging/fieldbus/dev_core.c | 1 - + drivers/staging/greybus/authentication.c | 2 +- + drivers/staging/greybus/fw-management.c | 2 +- + drivers/staging/greybus/loopback.c | 1 - + drivers/staging/greybus/raw.c | 2 +- + drivers/staging/greybus/vibrator.c | 1 - + drivers/staging/pi433/pi433_if.c | 2 +- + drivers/staging/vme_user/vme_user.c | 2 +- + drivers/tee/tee_core.c | 2 +- + drivers/tty/pty.c | 2 +- + drivers/tty/tty_io.c | 24 +- + drivers/tty/vt/vc_screen.c | 2 +- + drivers/tty/vt/vt.c | 4 +- + drivers/usb/common/ulpi.c | 2 +- + drivers/usb/core/driver.c | 2 +- + drivers/usb/core/file.c | 2 +- + drivers/usb/core/usb.h | 2 +- + drivers/usb/gadget/function/f_hid.c | 2 +- + drivers/usb/gadget/function/f_printer.c | 2 +- + drivers/usb/gadget/udc/core.c | 6 +- + drivers/usb/mon/mon_bin.c | 2 +- + drivers/usb/roles/class.c | 2 +- + drivers/usb/serial/bus.c | 2 +- + drivers/usb/typec/bus.c | 2 +- + drivers/usb/typec/bus.h | 2 +- + drivers/usb/typec/class.c | 1 - + drivers/usb/typec/mux.c | 1 - + drivers/usb/typec/pd.c | 1 - + drivers/usb/typec/retimer.c | 1 - + drivers/vdpa/vdpa_user/vduse_dev.c | 2 +- + drivers/vfio/group.c | 2 +- + drivers/vfio/vfio_main.c | 2 +- + drivers/vhost/vdpa.c | 2 +- + drivers/video/backlight/backlight.c | 2 +- + drivers/video/backlight/lcd.c | 2 +- + drivers/video/fbdev/core/fbmem.c | 2 +- + drivers/watchdog/watchdog_dev.c | 1 - + fs/coda/psdev.c | 2 +- + fs/fuse/cuse.c | 2 +- + fs/kernfs/dir.c | 26 +- + fs/kernfs/file.c | 4 +- + fs/kernfs/inode.c | 16 +- + fs/kernfs/kernfs-internal.h | 2 + + fs/kernfs/mount.c | 8 +- + fs/ksmbd/server.c | 11 +- + fs/pstore/pmsg.c | 2 +- + include/linux/device.h | 32 +-- + include/linux/device/bus.h | 21 +- + include/linux/device/class.h | 130 +++------ + include/linux/device/driver.h | 28 +- + include/linux/iommu.h | 10 +- + include/linux/kobject.h | 59 ++-- + include/linux/property.h | 45 ++- + include/linux/tty.h | 2 +- + include/linux/usb/serial.h | 2 +- + include/scsi/libfcoe.h | 6 +- + init/Kconfig | 38 --- + kernel/cpu.c | 23 +- + kernel/ksysfs.c | 22 +- + kernel/sched/debug.c | 52 +++- + kernel/time/alarmtimer.c | 3 +- + kernel/workqueue.c | 8 +- + lib/kobject.c | 34 +-- + mm/backing-dev.c | 2 +- + net/bluetooth/hci_sysfs.c | 2 +- + net/netfilter/xt_IDLETIMER.c | 2 +- + net/wireless/sysfs.c | 1 - + samples/vfio-mdev/mbochs.c | 2 +- + samples/vfio-mdev/mdpy.c | 2 +- + samples/vfio-mdev/mtty.c | 2 +- + sound/sound_core.c | 2 +- + tools/testing/nvdimm/test/ndtest.c | 2 +- + tools/testing/nvdimm/test/nfit.c | 2 +- + 292 files changed, 1551 insertions(+), 1253 deletions(-) +$ git am -3 ../patches/0001-fixup-for-driver-core-bus-mark-the-struct-bus_type-f.patch +Applying: fixup for "driver core: bus: mark the struct bus_type for sysfs callbacks as constant" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/s390/crypto/ap_bus.c +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master 0e8f6459679eb] Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git + Date: Thu Apr 27 15:23:26 2023 +0100 +Merging usb/usb-next (8f40fc0808137 usb: dwc3: gadget: Refactor EP0 forced stall/restart into a separate API) +$ 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/linux/usb.h +Removing drivers/usb/misc/ftdi-elan.c +Removing drivers/usb/host/u132-hcd.c +Auto-merging drivers/usb/gadget/udc/core.c +Auto-merging arch/powerpc/configs/ppc6xx_defconfig +Auto-merging arch/mips/configs/mtx1_defconfig +Auto-merging arch/arm64/boot/dts/freescale/imx8mq.dtsi +Auto-merging arch/arm64/boot/dts/freescale/imx8mn.dtsi +Auto-merging arch/arm64/boot/dts/freescale/imx8mm.dtsi +Auto-merging arch/arm64/boot/dts/freescale/imx8-ss-conn.dtsi +Removing Documentation/devicetree/bindings/usb/usbmisc-imx.txt +Removing Documentation/devicetree/bindings/usb/typec-tcpci.txt +Auto-merging Documentation/devicetree/bindings/usb/ti,tps6598x.yaml +Auto-merging Documentation/devicetree/bindings/usb/st,stusb160x.yaml +Auto-merging Documentation/devicetree/bindings/usb/richtek,rt1719.yaml +Auto-merging Documentation/devicetree/bindings/usb/richtek,rt1711h.yaml +Auto-merging Documentation/devicetree/bindings/usb/qcom,dwc3.yaml +Auto-merging Documentation/devicetree/bindings/usb/mediatek,mt6360-tcpc.yaml +Auto-merging Documentation/devicetree/bindings/usb/maxim,max33359.yaml +Removing Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/configfs-usb-gadget-uvc | 4 +- + .../ABI/testing/sysfs-bus-pci-drivers-xhci_hcd | 52 + + .../bindings/usb/amlogic,meson-g12a-usb-ctrl.yaml | 4 +- + .../devicetree/bindings/usb/brcm,bcm7445-ehci.yaml | 2 +- + .../devicetree/bindings/usb/ci-hdrc-usb2.txt | 159 - + .../devicetree/bindings/usb/ci-hdrc-usb2.yaml | 448 +++ + Documentation/devicetree/bindings/usb/dwc2.yaml | 5 +- + .../devicetree/bindings/usb/fcs,fsa4480.yaml | 4 +- + .../devicetree/bindings/usb/fsl,imx8mq-dwc3.yaml | 48 + + .../devicetree/bindings/usb/fsl,usbmisc.yaml | 68 + + .../devicetree/bindings/usb/generic-ehci.yaml | 2 +- + .../devicetree/bindings/usb/generic-ohci.yaml | 2 +- + .../devicetree/bindings/usb/generic-xhci.yaml | 2 +- + .../devicetree/bindings/usb/gpio-sbu-mux.yaml | 4 +- + .../devicetree/bindings/usb/maxim,max33359.yaml | 4 +- + .../bindings/usb/mediatek,mt6360-tcpc.yaml | 4 +- + .../bindings/usb/mediatek,mt6370-tcpc.yaml | 4 +- + .../devicetree/bindings/usb/mediatek,mtk-xhci.yaml | 12 +- + .../devicetree/bindings/usb/mediatek,mtu3.yaml | 12 +- + .../devicetree/bindings/usb/mediatek,musb.yaml | 4 +- + .../devicetree/bindings/usb/nvidia,tegra-xudc.yaml | 4 +- + .../devicetree/bindings/usb/nxp,ptn5110.yaml | 72 + + .../devicetree/bindings/usb/qcom,dwc3.yaml | 2 + + .../devicetree/bindings/usb/realtek,rts5411.yaml | 2 +- + .../devicetree/bindings/usb/richtek,rt1711h.yaml | 4 +- + .../devicetree/bindings/usb/richtek,rt1719.yaml | 4 +- + .../devicetree/bindings/usb/smsc,usb3503.yaml | 54 +- + .../devicetree/bindings/usb/snps,dwc3.yaml | 33 + + .../devicetree/bindings/usb/st,stusb160x.yaml | 4 +- + .../devicetree/bindings/usb/ti,j721e-usb.yaml | 10 +- + .../devicetree/bindings/usb/ti,keystone-dwc3.yaml | 8 - + .../devicetree/bindings/usb/ti,tps6598x.yaml | 6 +- + .../devicetree/bindings/usb/typec-tcpci.txt | 49 - + .../devicetree/bindings/usb/usb-device.yaml | 1 - + .../devicetree/bindings/usb/usb-nop-xceiv.yaml | 3 + + .../devicetree/bindings/usb/usb-xhci.yaml | 2 +- + .../devicetree/bindings/usb/usbmisc-imx.txt | 19 - + Documentation/usb/gadget_uvc.rst | 28 + + arch/arm/boot/dts/imx7ulp.dtsi | 5 +- + arch/arm/boot/dts/stm32mp151.dtsi | 4 +- + arch/arm64/boot/dts/freescale/imx8-ss-conn.dtsi | 4 +- + arch/arm64/boot/dts/freescale/imx8dxl-ss-conn.dtsi | 5 +- + arch/arm64/boot/dts/freescale/imx8mm.dtsi | 10 +- + arch/arm64/boot/dts/freescale/imx8mn.dtsi | 5 +- + arch/arm64/boot/dts/freescale/imx8mq.dtsi | 2 - + arch/mips/configs/mtx1_defconfig | 2 - + arch/powerpc/configs/ppc6xx_defconfig | 2 - + drivers/media/radio/radio-shark.c | 10 + + drivers/media/radio/radio-shark2.c | 10 + + drivers/thunderbolt/acpi.c | 2 +- + drivers/thunderbolt/ctl.c | 2 +- + drivers/thunderbolt/eeprom.c | 204 +- + drivers/thunderbolt/nhi.c | 3 +- + drivers/thunderbolt/switch.c | 4 +- + drivers/thunderbolt/usb4.c | 52 +- + drivers/thunderbolt/xdomain.c | 24 +- + drivers/usb/Kconfig | 29 - + drivers/usb/Makefile | 1 - + drivers/usb/cdns3/cdns3-debug.h | 8 +- + drivers/usb/cdns3/cdns3-trace.h | 28 +- + drivers/usb/cdns3/cdnsp-trace.h | 12 +- + drivers/usb/chipidea/Makefile | 2 +- + drivers/usb/chipidea/ci_hdrc_imx.c | 6 +- + drivers/usb/chipidea/core.c | 4 +- + drivers/usb/chipidea/debug.c | 55 - + drivers/usb/core/usb-acpi.c | 12 +- + drivers/usb/core/usb.c | 76 + + drivers/usb/dwc2/core.h | 2 + + drivers/usb/dwc2/hcd_queue.c | 2 +- + drivers/usb/dwc2/params.c | 3 +- + drivers/usb/dwc2/platform.c | 37 +- + drivers/usb/dwc3/core.c | 443 ++- + drivers/usb/dwc3/core.h | 21 +- + drivers/usb/dwc3/debug.h | 2 + + drivers/usb/dwc3/debugfs.c | 5 + + drivers/usb/dwc3/dwc3-am62.c | 52 +- + drivers/usb/dwc3/dwc3-pci.c | 136 +- + drivers/usb/dwc3/ep0.c | 19 +- + drivers/usb/dwc3/gadget.c | 279 +- + drivers/usb/dwc3/host.c | 7 +- + drivers/usb/dwc3/trace.h | 6 +- + drivers/usb/gadget/composite.c | 127 +- + drivers/usb/gadget/configfs.c | 3 + + drivers/usb/gadget/function/f_ecm.c | 22 + + drivers/usb/gadget/function/f_fs.c | 101 +- + drivers/usb/gadget/function/u_ether.c | 63 + + drivers/usb/gadget/function/u_ether.h | 4 + + drivers/usb/gadget/function/u_fs.h | 2 - + drivers/usb/gadget/function/uvc_configfs.c | 121 +- + drivers/usb/gadget/legacy/g_ffs.c | 9 - + drivers/usb/gadget/udc/aspeed-vhub/core.c | 1 - + drivers/usb/gadget/udc/aspeed-vhub/dev.c | 1 - + drivers/usb/gadget/udc/aspeed-vhub/ep0.c | 1 - + drivers/usb/gadget/udc/aspeed-vhub/epn.c | 1 - + drivers/usb/gadget/udc/aspeed-vhub/hub.c | 1 - + drivers/usb/gadget/udc/core.c | 178 +- + drivers/usb/gadget/udc/max3420_udc.c | 2 +- + drivers/usb/gadget/udc/mv_udc_core.c | 6 +- + drivers/usb/gadget/udc/renesas_usb3.c | 26 +- + drivers/usb/gadget/udc/renesas_usbf.c | 11 - + drivers/usb/gadget/udc/rzv2m_usb3drd.c | 4 +- + drivers/usb/gadget/udc/snps_udc_plat.c | 2 +- + drivers/usb/gadget/udc/tegra-xudc.c | 7 +- + drivers/usb/gadget/udc/trace.h | 5 + + drivers/usb/host/Kconfig | 27 - + drivers/usb/host/Makefile | 1 - + drivers/usb/host/ehci-ppc-of.c | 6 +- + drivers/usb/host/fsl-mph-dr-of.c | 11 +- + drivers/usb/host/max3421-hcd.c | 2 +- + drivers/usb/host/oxu210hp-hcd.c | 2 +- + drivers/usb/host/pci-quirks.c | 4 +- + drivers/usb/host/u132-hcd.c | 3219 -------------------- + drivers/usb/host/xhci-dbgcap.c | 191 +- + drivers/usb/host/xhci-dbgcap.h | 4 + + drivers/usb/host/xhci-debugfs.c | 1 + + drivers/usb/host/xhci-mem.c | 83 +- + drivers/usb/host/xhci-mtk.c | 1 + + drivers/usb/host/xhci-mtk.h | 2 +- + drivers/usb/host/xhci-pci.c | 215 +- + drivers/usb/host/xhci-plat.c | 19 +- + drivers/usb/host/xhci-rcar.c | 36 +- + drivers/usb/host/xhci-ring.c | 1 + + drivers/usb/host/xhci-tegra.c | 17 +- + drivers/usb/host/xhci-trace.c | 1 + + drivers/usb/host/xhci-trace.h | 20 +- + drivers/usb/host/xhci.c | 202 +- + drivers/usb/host/xhci.h | 1 + + drivers/usb/misc/Kconfig | 51 +- + drivers/usb/misc/Makefile | 1 - + drivers/usb/misc/ftdi-elan.c | 2780 ----------------- + drivers/usb/misc/sisusbvga/sisusbvga.c | 14 + + drivers/usb/misc/usb251xb.c | 43 +- + drivers/usb/misc/usb3503.c | 64 +- + drivers/usb/mtu3/mtu3.h | 2 +- + drivers/usb/mtu3/mtu3_dr.c | 1 + + drivers/usb/mtu3/mtu3_gadget.c | 2 +- + drivers/usb/mtu3/mtu3_host.c | 2 +- + drivers/usb/mtu3/mtu3_plat.c | 2 + + drivers/usb/mtu3/mtu3_qmu.c | 44 +- + drivers/usb/musb/Kconfig | 2 +- + drivers/usb/musb/da8xx.c | 6 +- + drivers/usb/musb/jz4740.c | 6 +- + drivers/usb/musb/mediatek.c | 6 +- + drivers/usb/musb/mpfs.c | 6 +- + drivers/usb/musb/musb_core.c | 5 +- + drivers/usb/musb/musb_dsps.c | 6 +- + drivers/usb/musb/omap2430.c | 8 +- + drivers/usb/musb/sunxi.c | 6 +- + drivers/usb/musb/tusb6010.c | 6 +- + drivers/usb/musb/ux500.c | 6 +- + drivers/usb/phy/phy-ab8500-usb.c | 6 +- + drivers/usb/phy/phy-am335x.c | 5 +- + drivers/usb/phy/phy-fsl-usb.c | 6 +- + drivers/usb/phy/phy-generic.c | 6 +- + drivers/usb/phy/phy-gpio-vbus-usb.c | 6 +- + drivers/usb/phy/phy-keystone.c | 6 +- + drivers/usb/phy/phy-mv-usb.c | 6 +- + drivers/usb/phy/phy-mxs-usb.c | 8 +- + drivers/usb/phy/phy-tahvo.c | 6 +- + drivers/usb/phy/phy-tegra-usb.c | 8 +- + drivers/usb/phy/phy-twl6030-usb.c | 6 +- + drivers/usb/renesas_usbhs/common.c | 2 +- + drivers/usb/serial/option.c | 6 + + drivers/usb/serial/quatech2.c | 8 - + drivers/usb/typec/hd3ss3220.c | 2 +- + drivers/usb/typec/tcpm/fusb302.c | 4 +- + drivers/usb/typec/tcpm/tcpci_mt6360.c | 6 - + drivers/usb/typec/tcpm/tcpm.c | 20 +- + drivers/usb/typec/tipd/core.c | 51 +- + drivers/usb/typec/ucsi/Kconfig | 10 + + drivers/usb/typec/ucsi/Makefile | 1 + + drivers/usb/typec/ucsi/ucsi.c | 6 +- + drivers/usb/typec/ucsi/ucsi_acpi.c | 44 +- + drivers/usb/typec/ucsi/ucsi_glink.c | 345 +++ + include/linux/platform_data/usb3503.h | 1 + + include/linux/usb.h | 8 +- + include/linux/usb/composite.h | 8 + + include/linux/usb/gadget.h | 9 + + include/linux/usb/hcd.h | 2 - + 179 files changed, 3323 insertions(+), 7858 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt + create mode 100644 Documentation/devicetree/bindings/usb/ci-hdrc-usb2.yaml + create mode 100644 Documentation/devicetree/bindings/usb/fsl,imx8mq-dwc3.yaml + create mode 100644 Documentation/devicetree/bindings/usb/fsl,usbmisc.yaml + create mode 100644 Documentation/devicetree/bindings/usb/nxp,ptn5110.yaml + delete mode 100644 Documentation/devicetree/bindings/usb/typec-tcpci.txt + delete mode 100644 Documentation/devicetree/bindings/usb/usbmisc-imx.txt + delete mode 100644 drivers/usb/host/u132-hcd.c + delete mode 100644 drivers/usb/misc/ftdi-elan.c + create mode 100644 drivers/usb/typec/ucsi/ucsi_glink.c +Merging thunderbolt/next (1f15af76784cc thunderbolt: Introduce usb4_port_sb_opcode_err_to_errno() helper) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt/next +Already up to date. +Merging usb-serial/usb-next (a095edfc15f08 USB: serial: option: add UNISOC vendor and TOZED LT70C product) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial/usb-next +Already up to date. +Merging tty/tty-next (2b3174c96696c n_gsm: Use array_index_nospec() with index that comes from userspace) +$ 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 include/linux/tty.h +Auto-merging drivers/tty/vt/vt.c +Auto-merging drivers/tty/tty_io.c +Auto-merging arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi +Auto-merging arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +Merge made by the 'recursive' strategy. + Documentation/admin-guide/serial-console.rst | 36 +++- + .../bindings/serial/amlogic,meson-uart.yaml | 13 +- + .../devicetree/bindings/serial/fsl-imx-uart.yaml | 27 +++ + .../devicetree/bindings/serial/fsl-lpuart.yaml | 3 + + .../bindings/serial/qcom,serial-geni-qcom.yaml | 4 +- + .../bindings/serial/renesas,em-uart.yaml | 4 +- + .../devicetree/bindings/serial/renesas,hscif.yaml | 4 +- + .../devicetree/bindings/serial/renesas,sci.yaml | 4 +- + .../devicetree/bindings/serial/renesas,scif.yaml | 4 +- + .../devicetree/bindings/serial/renesas,scifa.yaml | 4 +- + .../devicetree/bindings/serial/renesas,scifb.yaml | 4 +- + .../devicetree/bindings/serial/serial.yaml | 4 +- + .../bindings/serial/snps-dw-apb-uart.yaml | 4 +- + .../devicetree/bindings/serial/sprd-uart.yaml | 4 +- + .../bindings/serial/sunplus,sp7021-uart.yaml | 4 +- + Documentation/driver-api/tty/n_gsm.rst | 20 ++ + arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 15 +- + drivers/char/pcmcia/synclink_cs.c | 6 +- + drivers/mmc/core/sdio_uart.c | 10 +- + drivers/tty/Kconfig | 2 +- + drivers/tty/amiserial.c | 6 +- + drivers/tty/mxser.c | 6 +- + drivers/tty/n_gsm.c | 231 ++++++++++++++++++++- + drivers/tty/n_tty.c | 43 ++-- + drivers/tty/serial/8250/8250.h | 12 ++ + drivers/tty/serial/8250/8250_bcm7271.c | 18 +- + drivers/tty/serial/8250/8250_core.c | 1 + + drivers/tty/serial/8250/8250_em.c | 113 ++++++++-- + drivers/tty/serial/8250/8250_port.c | 11 +- + drivers/tty/serial/Kconfig | 11 +- + drivers/tty/serial/bcm63xx_uart.c | 38 ++++ + drivers/tty/serial/cpm_uart/cpm_uart_core.c | 5 +- + drivers/tty/serial/fsl_lpuart.c | 10 +- + drivers/tty/serial/imx.c | 48 ++--- + drivers/tty/serial/max310x.c | 17 +- + drivers/tty/serial/meson_uart.c | 8 +- + drivers/tty/serial/mxs-auart.c | 4 +- + drivers/tty/serial/qcom_geni_serial.c | 11 +- + drivers/tty/serial/sb1250-duart.c | 2 +- + drivers/tty/serial/serial_core.c | 125 +++++------ + drivers/tty/serial/sh-sci.c | 115 +++++++--- + drivers/tty/serial/sh-sci.h | 3 + + drivers/tty/serial/sprd_serial.c | 2 +- + drivers/tty/serial/stm32-usart.c | 6 +- + drivers/tty/serial/stm32-usart.h | 1 - + drivers/tty/serial/sunzilog.c | 4 +- + drivers/tty/serial/ucc_uart.c | 7 +- + drivers/tty/synclink_gt.c | 24 +-- + drivers/tty/tty.h | 2 + + drivers/tty/tty_io.c | 24 +-- + drivers/tty/tty_ioctl.c | 54 +++-- + drivers/tty/tty_ldisc.c | 3 +- + drivers/tty/vt/vt.c | 205 ++++++++---------- + include/linux/serial_8250.h | 45 ++-- + include/linux/serial_core.h | 15 +- + include/linux/tty.h | 2 +- + include/uapi/linux/gsmmux.h | 17 +- + 57 files changed, 949 insertions(+), 476 deletions(-) +Merging char-misc/char-misc-next (2025b2ca8004c mcb-lpc: Reallocate memory region to avoid memory overlapping) +$ 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 +Removing kernel/configs/android-recommended.config +Removing kernel/configs/android-base.config +Removing include/uapi/linux/cm4000_cs.h +Auto-merging include/linux/of_device.h +Auto-merging include/linux/of.h +CONFLICT (content): Merge conflict in include/linux/of.h +Removing include/linux/cm4000_cs.h +Auto-merging drivers/w1/masters/w1-gpio.c +Auto-merging drivers/usb/common/ulpi.c +Auto-merging drivers/tty/Kconfig +Auto-merging drivers/staging/iio/resolver/ad2s1210.c +Removing drivers/staging/iio/meter/meter.h +Removing drivers/staging/iio/meter/ade7854.h +Removing drivers/staging/iio/meter/ade7854.c +Removing drivers/staging/iio/meter/ade7854-spi.c +Removing drivers/staging/iio/meter/ade7854-i2c.c +Removing drivers/staging/iio/meter/Makefile +Removing drivers/staging/iio/meter/Kconfig +Auto-merging drivers/spi/spi.c +Auto-merging drivers/of/base.c +Auto-merging drivers/of/Makefile +CONFLICT (content): Merge conflict in drivers/of/Makefile +Auto-merging drivers/nvmem/core.c +Auto-merging drivers/misc/mei/main.c +Auto-merging drivers/misc/mei/hdcp/mei_hdcp.c +Auto-merging drivers/misc/hpilo.c +Auto-merging drivers/misc/genwqe/card_base.c +Auto-merging drivers/iommu/iommu.c +Auto-merging drivers/interconnect/core.c +Auto-merging drivers/iio/adc/at91-sama5d2_adc.c +Auto-merging drivers/i2c/i2c-core-of.c +Auto-merging drivers/gpu/drm/drm_mipi_dsi.c +Auto-merging drivers/fpga/fpga-bridge.c +CONFLICT (modify/delete): drivers/char/pcmcia/synclink_cs.c deleted in char-misc/char-misc-next and modified in HEAD. Version HEAD of drivers/char/pcmcia/synclink_cs.c left in tree. +CONFLICT (modify/delete): drivers/char/pcmcia/scr24x_cs.c deleted in char-misc/char-misc-next and modified in HEAD. Version HEAD of drivers/char/pcmcia/scr24x_cs.c left in tree. +Removing drivers/char/pcmcia/cm4040_cs.h +CONFLICT (modify/delete): drivers/char/pcmcia/cm4040_cs.c deleted in char-misc/char-misc-next and modified in HEAD. Version HEAD of drivers/char/pcmcia/cm4040_cs.c left in tree. +CONFLICT (modify/delete): drivers/char/pcmcia/cm4000_cs.c deleted in char-misc/char-misc-next and modified in HEAD. Version HEAD of drivers/char/pcmcia/cm4000_cs.c left in tree. +Removing drivers/char/pcmcia/Makefile +Removing drivers/char/pcmcia/Kconfig +Auto-merging drivers/acpi/bus.c +Auto-merging arch/powerpc/configs/ppc6xx_defconfig +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/nvmem/amlogic-meson-mx-efuse.txt +Removing Documentation/devicetree/bindings/nvmem/amlogic-efuse.txt +Auto-merging CREDITS +Resolved 'drivers/of/Makefile' using previous resolution. +Resolved 'include/linux/of.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/char/pcmcia/cm4000_cs.c drivers/char/pcmcia/cm4040_cs.c drivers/char/pcmcia/scr24x_cs.c drivers/char/pcmcia/synclink_cs.c +rm 'drivers/char/pcmcia/cm4000_cs.c' +rm 'drivers/char/pcmcia/cm4040_cs.c' +rm 'drivers/char/pcmcia/scr24x_cs.c' +rm 'drivers/char/pcmcia/synclink_cs.c' +$ git commit --no-edit -v -a +[master 06bb55d525f4d] 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^.. + CREDITS | 5 + + Documentation/ABI/testing/sysfs-bus-cdx | 56 + + Documentation/ABI/testing/sysfs-bus-iio | 13 +- + .../sysfs-bus-platform-devices-ampere-smpro | 19 +- + Documentation/ABI/testing/sysfs-driver-zynqmp-fpga | 73 + + .../bindings/bus/xlnx,versal-net-cdx.yaml | 82 + + .../bindings/iio/adc/renesas,rcar-gyroadc.yaml | 60 +- + .../devicetree/bindings/iio/adc/ti,ads1100.yaml | 46 + + .../bindings/iio/addac/adi,ad74413r.yaml | 9 + + .../devicetree/bindings/iio/imu/st,lsm6dsx.yaml | 3 + + .../bindings/iio/light/rohm,bu27034.yaml | 46 + + .../devicetree/bindings/iio/pressure/bmp085.yaml | 2 + + .../devicetree/bindings/iio/st,st-sensors.yaml | 6 +- + .../bindings/iio/temperature/adi,ltc2983.yaml | 67 +- + .../bindings/iio/temperature/ti,tmp117.yaml | 8 +- + .../bindings/interconnect/qcom,msm8998-bwmon.yaml | 41 +- + .../bindings/interconnect/qcom,osm-l3.yaml | 1 + + .../bindings/nvmem/allwinner,sun4i-a10-sid.yaml | 2 +- + .../bindings/nvmem/amlogic,meson-gxbb-efuse.yaml | 57 + + .../bindings/nvmem/amlogic,meson6-efuse.yaml | 57 + + .../devicetree/bindings/nvmem/amlogic-efuse.txt | 48 - + .../bindings/nvmem/amlogic-meson-mx-efuse.txt | 22 - + .../devicetree/bindings/nvmem/apple,efuses.yaml | 2 +- + .../devicetree/bindings/nvmem/brcm,nvram.yaml | 2 +- + .../bindings/nvmem/fsl,layerscape-sfp.yaml | 2 +- + .../devicetree/bindings/nvmem/imx-iim.yaml | 2 +- + .../devicetree/bindings/nvmem/imx-ocotp.yaml | 2 +- + .../bindings/nvmem/ingenic,jz4780-efuse.yaml | 2 +- + .../bindings/nvmem/layouts/onie,tlv-layout.yaml | 2 +- + .../devicetree/bindings/nvmem/mediatek,efuse.yaml | 2 +- + .../bindings/nvmem/microchip,sama7g5-otpc.yaml | 2 +- + .../devicetree/bindings/nvmem/mxs-ocotp.yaml | 2 +- + .../devicetree/bindings/nvmem/nintendo-otp.yaml | 2 +- + .../devicetree/bindings/nvmem/qcom,qfprom.yaml | 4 +- + .../devicetree/bindings/nvmem/qcom,spmi-sdam.yaml | 33 +- + Documentation/devicetree/bindings/nvmem/rmem.yaml | 2 +- + .../devicetree/bindings/nvmem/rockchip-efuse.yaml | 2 +- + .../bindings/nvmem/socionext,uniphier-efuse.yaml | 2 +- + .../devicetree/bindings/nvmem/st,stm32-romem.yaml | 2 +- + .../bindings/nvmem/sunplus,sp7021-ocotp.yaml | 2 +- + .../devicetree/bindings/nvmem/u-boot,env.yaml | 7 +- + .../devicetree/bindings/w1/maxim,ds2482.yaml | 44 + + Documentation/driver-api/nvmem.rst | 15 + + Documentation/process/magic-number.rst | 1 - + .../translations/it_IT/process/magic-number.rst | 1 - + .../translations/sp_SP/process/magic-number.rst | 1 - + .../translations/zh_CN/process/magic-number.rst | 1 - + .../translations/zh_TW/process/magic-number.rst | 1 - + Documentation/userspace-api/ioctl/ioctl-number.rst | 1 - + MAINTAINERS | 59 +- + arch/powerpc/configs/ppc6xx_defconfig | 2 - + drivers/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/acpi/bus.c | 7 +- + drivers/bus/mhi/ep/main.c | 4 +- + drivers/bus/mhi/host/boot.c | 16 +- + drivers/bus/mhi/host/init.c | 16 +- + drivers/bus/mhi/host/main.c | 25 +- + drivers/bus/mhi/host/pci_generic.c | 28 +- + drivers/cdx/Kconfig | 19 + + drivers/cdx/Makefile | 8 + + drivers/cdx/cdx.c | 535 +++ + drivers/cdx/cdx.h | 62 + + drivers/cdx/controller/Kconfig | 31 + + drivers/cdx/controller/Makefile | 9 + + drivers/cdx/controller/bitfield.h | 90 + + drivers/cdx/controller/cdx_controller.c | 230 ++ + drivers/cdx/controller/cdx_controller.h | 30 + + drivers/cdx/controller/cdx_rpmsg.c | 202 + + drivers/cdx/controller/mc_cdx_pcol.h | 590 +++ + drivers/cdx/controller/mcdi.c | 903 ++++ + drivers/cdx/controller/mcdi.h | 248 ++ + drivers/cdx/controller/mcdi_functions.c | 139 + + drivers/cdx/controller/mcdi_functions.h | 61 + + drivers/char/Kconfig | 2 - + drivers/char/Makefile | 1 - + drivers/char/pcmcia/Kconfig | 68 - + drivers/char/pcmcia/Makefile | 11 - + drivers/char/pcmcia/cm4000_cs.c | 1912 --------- + drivers/char/pcmcia/cm4040_cs.c | 684 ---- + drivers/char/pcmcia/cm4040_cs.h | 48 - + drivers/char/pcmcia/scr24x_cs.c | 359 -- + drivers/char/pcmcia/synclink_cs.c | 4290 -------------------- + drivers/firmware/dmi-sysfs.c | 4 +- + drivers/firmware/edd.c | 2 +- + drivers/firmware/stratix10-svc.c | 4 +- + drivers/firmware/xilinx/zynqmp.c | 33 + + drivers/fpga/fpga-bridge.c | 2 +- + drivers/fpga/zynqmp-fpga.c | 21 + + drivers/gpu/drm/drm_mipi_dsi.c | 2 +- + drivers/hsi/hsi_core.c | 2 +- + drivers/hwtracing/coresight/coresight-etm-perf.c | 1 + + drivers/i2c/busses/i2c-powermac.c | 2 +- + drivers/i2c/i2c-core-of.c | 2 +- + drivers/iio/Kconfig | 3 + + drivers/iio/Makefile | 1 + + drivers/iio/accel/bma400_core.c | 2 +- + drivers/iio/accel/kionix-kx022a.c | 3 +- + drivers/iio/accel/mma8452.c | 2 +- + drivers/iio/accel/msa311.c | 2 +- + drivers/iio/accel/st_accel.h | 1 + + drivers/iio/accel/st_accel_core.c | 1 + + drivers/iio/accel/st_accel_i2c.c | 5 + + drivers/iio/accel/st_accel_spi.c | 5 + + drivers/iio/adc/Kconfig | 10 + + drivers/iio/adc/Makefile | 1 + + drivers/iio/adc/ad7606.c | 2 +- + drivers/iio/adc/at91-sama5d2_adc.c | 8 +- + drivers/iio/adc/axp20x_adc.c | 77 +- + drivers/iio/adc/max11410.c | 2 +- + drivers/iio/adc/meson_saradc.c | 21 +- + drivers/iio/adc/palmas_gpadc.c | 615 ++- + drivers/iio/adc/qcom-pm8xxx-xoadc.c | 2 +- + drivers/iio/adc/rcar-gyroadc.c | 2 +- + drivers/iio/adc/stm32-adc.c | 6 +- + drivers/iio/adc/ti-ads1100.c | 445 ++ + drivers/iio/addac/Kconfig | 2 + + drivers/iio/addac/ad74413r.c | 44 +- + drivers/iio/addac/stx104.c | 462 ++- + drivers/iio/chemical/sps30_i2c.c | 6 +- + drivers/iio/common/st_sensors/st_sensors_trigger.c | 4 +- + drivers/iio/dac/Kconfig | 1 + + drivers/iio/dac/ad5592r-base.c | 5 + + drivers/iio/dac/cio-dac.c | 68 +- + drivers/iio/dac/max5522.c | 2 +- + drivers/iio/frequency/admv1013.c | 21 +- + drivers/iio/gyro/fxas21002c_core.c | 2 +- + drivers/iio/gyro/mpu3050-core.c | 2 +- + drivers/iio/humidity/hts221_buffer.c | 2 +- + drivers/iio/imu/adis16475.c | 6 +- + drivers/iio/imu/st_lsm6dsx/Kconfig | 4 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 15 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 59 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 99 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c | 21 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c | 5 + + drivers/iio/industrialio-gts-helper.c | 1077 +++++ + drivers/iio/industrialio-trigger.c | 17 +- + drivers/iio/light/Kconfig | 14 + + drivers/iio/light/Makefile | 1 + + drivers/iio/light/acpi-als.c | 2 +- + drivers/iio/light/max44009.c | 13 +- + drivers/iio/light/rohm-bu27034.c | 1497 +++++++ + drivers/iio/light/rpr0521.c | 2 +- + drivers/iio/light/st_uvis25_core.c | 2 +- + drivers/iio/light/vcnl4000.c | 2 +- + drivers/iio/light/vcnl4035.c | 2 +- + drivers/iio/potentiostat/lmp91000.c | 2 +- + drivers/iio/pressure/Kconfig | 6 +- + drivers/iio/pressure/bmp280-core.c | 765 +++- + drivers/iio/pressure/bmp280-i2c.c | 45 +- + drivers/iio/pressure/bmp280-regmap.c | 60 + + drivers/iio/pressure/bmp280-spi.c | 47 +- + drivers/iio/pressure/bmp280.h | 273 +- + drivers/iio/pressure/zpa2326.c | 2 +- + drivers/iio/proximity/as3935.c | 2 +- + drivers/iio/proximity/sx9324.c | 96 +- + drivers/iio/proximity/sx9360.c | 32 +- + drivers/iio/proximity/sx9500.c | 4 +- + drivers/iio/proximity/sx_common.c | 21 + + drivers/iio/proximity/sx_common.h | 6 +- + drivers/iio/temperature/tmp117.c | 80 +- + drivers/iio/trigger/iio-trig-loop.c | 2 +- + drivers/interconnect/core.c | 81 +- + drivers/interconnect/qcom/Kconfig | 2 +- + drivers/interconnect/qcom/icc-rpm.c | 38 +- + drivers/interconnect/qcom/icc-rpm.h | 17 +- + drivers/interconnect/qcom/msm8996.c | 1 - + drivers/interconnect/qcom/osm-l3.c | 7 - + drivers/interconnect/qcom/sc7180.h | 2 - + drivers/interconnect/qcom/sc7280.h | 2 - + drivers/interconnect/qcom/sc8180x.h | 2 - + drivers/interconnect/qcom/sdm845.h | 2 - + drivers/interconnect/qcom/sm8150.h | 2 - + drivers/interconnect/qcom/sm8250.h | 2 - + drivers/iommu/iommu.c | 4 + + drivers/mcb/mcb-lpc.c | 35 +- + drivers/mcb/mcb-parse.c | 15 +- + drivers/mcb/mcb-pci.c | 27 +- + drivers/misc/cardreader/alcor_pci.c | 167 +- + drivers/misc/genwqe/card_base.c | 2 - + drivers/misc/hpilo.c | 6 - + drivers/misc/lis3lv02d/lis3lv02d.c | 66 +- + drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gpio.c | 10 +- + drivers/misc/mei/bus-fixup.c | 2 +- + drivers/misc/mei/hdcp/mei_hdcp.c | 2 +- + drivers/misc/mei/hw.h | 2 +- + drivers/misc/mei/main.c | 1 - + drivers/misc/mei/pxp/mei_pxp.c | 2 +- + drivers/misc/sgi-xp/xpc_main.c | 24 +- + drivers/misc/smpro-errmon.c | 82 + + drivers/misc/sram.c | 28 +- + drivers/misc/sram.h | 1 - + drivers/misc/vmw_vmci/vmci_host.c | 8 +- + drivers/nvmem/Kconfig | 7 +- + drivers/nvmem/Makefile | 1 + + drivers/nvmem/bcm-ocotp.c | 4 +- + drivers/nvmem/core.c | 169 +- + drivers/nvmem/imx-ocotp.c | 30 +- + drivers/nvmem/layouts/Kconfig | 23 + + drivers/nvmem/layouts/Makefile | 7 + + drivers/nvmem/layouts/onie-tlv.c | 244 ++ + drivers/nvmem/layouts/sl28vpd.c | 153 + + drivers/nvmem/mtk-efuse.c | 53 +- + drivers/nvmem/nintendo-otp.c | 4 +- + drivers/nvmem/stm32-romem.c | 2 +- + drivers/nvmem/u-boot-env.c | 26 + + drivers/nvmem/vf610-ocotp.c | 3 +- + drivers/of/Makefile | 2 +- + drivers/of/base.c | 18 +- + drivers/of/device.c | 75 +- + drivers/of/module.c | 74 + + drivers/spi/spi.c | 4 +- + drivers/spmi/hisi-spmi-controller.c | 5 +- + drivers/spmi/spmi-mtk-pmif.c | 7 +- + drivers/spmi/spmi-pmic-arb.c | 9 +- + drivers/spmi/spmi.c | 8 +- + drivers/staging/iio/Kconfig | 1 - + drivers/staging/iio/Makefile | 1 - + drivers/staging/iio/meter/Kconfig | 37 - + drivers/staging/iio/meter/Makefile | 8 - + drivers/staging/iio/meter/ade7854-i2c.c | 153 - + drivers/staging/iio/meter/ade7854-spi.c | 160 - + drivers/staging/iio/meter/ade7854.c | 556 --- + drivers/staging/iio/meter/ade7854.h | 173 - + drivers/staging/iio/meter/meter.h | 398 -- + drivers/staging/iio/resolver/ad2s1210.c | 2 +- + drivers/tty/Kconfig | 9 + + drivers/usb/common/ulpi.c | 2 +- + drivers/w1/masters/Kconfig | 2 +- + drivers/w1/masters/ds2482.c | 13 +- + drivers/w1/masters/ds2490.c | 13 +- + drivers/w1/masters/matrox_w1.c | 16 +- + drivers/w1/masters/omap_hdq.c | 14 +- + drivers/w1/masters/w1-gpio.c | 4 +- + drivers/w1/slaves/w1_ds2406.c | 35 +- + drivers/w1/slaves/w1_ds2408.c | 12 +- + drivers/w1/slaves/w1_ds2413.c | 8 +- + drivers/w1/slaves/w1_ds2433.c | 23 +- + drivers/w1/slaves/w1_ds2780.c | 1 + + drivers/w1/slaves/w1_ds2781.c | 1 + + drivers/w1/slaves/w1_ds2805.c | 2 +- + drivers/w1/slaves/w1_ds28e04.c | 21 +- + drivers/w1/slaves/w1_ds28e17.c | 6 +- + include/linux/alcor_pci.h | 7 - + include/linux/cdx/cdx_bus.h | 174 + + include/linux/cm4000_cs.h | 11 - + include/linux/firmware/xlnx-zynqmp.h | 11 + + include/linux/iio/iio-gts-helper.h | 206 + + include/linux/iio/trigger.h | 8 +- + include/linux/interconnect-provider.h | 17 - + include/linux/mfd/palmas.h | 8 - + include/linux/mhi.h | 7 - + include/linux/mod_devicetable.h | 16 + + include/linux/nvmem-consumer.h | 7 + + include/linux/nvmem-provider.h | 74 +- + include/linux/of.h | 18 +- + include/linux/of_device.h | 6 - + include/linux/uuid.h | 3 - + include/uapi/linux/cm4000_cs.h | 64 - + include/uapi/linux/mei.h | 2 +- + include/uapi/linux/mei_uuid.h | 29 + + include/uapi/linux/uuid.h | 31 +- + kernel/configs/android-base.config | 159 - + kernel/configs/android-recommended.config | 127 - + samples/acrn/vm-sample.c | 5 +- + scripts/mod/devicetable-offsets.c | 4 + + scripts/mod/file2alias.c | 12 + + 268 files changed, 11014 insertions(+), 10982 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-cdx + create mode 100644 Documentation/ABI/testing/sysfs-driver-zynqmp-fpga + create mode 100644 Documentation/devicetree/bindings/bus/xlnx,versal-net-cdx.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/ti,ads1100.yaml + create mode 100644 Documentation/devicetree/bindings/iio/light/rohm,bu27034.yaml + create mode 100644 Documentation/devicetree/bindings/nvmem/amlogic,meson-gxbb-efuse.yaml + create mode 100644 Documentation/devicetree/bindings/nvmem/amlogic,meson6-efuse.yaml + delete mode 100644 Documentation/devicetree/bindings/nvmem/amlogic-efuse.txt + delete mode 100644 Documentation/devicetree/bindings/nvmem/amlogic-meson-mx-efuse.txt + create mode 100644 Documentation/devicetree/bindings/w1/maxim,ds2482.yaml + create mode 100644 drivers/cdx/Kconfig + create mode 100644 drivers/cdx/Makefile + create mode 100644 drivers/cdx/cdx.c + create mode 100644 drivers/cdx/cdx.h + create mode 100644 drivers/cdx/controller/Kconfig + create mode 100644 drivers/cdx/controller/Makefile + create mode 100644 drivers/cdx/controller/bitfield.h + create mode 100644 drivers/cdx/controller/cdx_controller.c + create mode 100644 drivers/cdx/controller/cdx_controller.h + create mode 100644 drivers/cdx/controller/cdx_rpmsg.c + create mode 100644 drivers/cdx/controller/mc_cdx_pcol.h + create mode 100644 drivers/cdx/controller/mcdi.c + create mode 100644 drivers/cdx/controller/mcdi.h + create mode 100644 drivers/cdx/controller/mcdi_functions.c + create mode 100644 drivers/cdx/controller/mcdi_functions.h + delete mode 100644 drivers/char/pcmcia/Kconfig + delete mode 100644 drivers/char/pcmcia/Makefile + delete mode 100644 drivers/char/pcmcia/cm4000_cs.c + delete mode 100644 drivers/char/pcmcia/cm4040_cs.c + delete mode 100644 drivers/char/pcmcia/cm4040_cs.h + delete mode 100644 drivers/char/pcmcia/scr24x_cs.c + delete mode 100644 drivers/char/pcmcia/synclink_cs.c + create mode 100644 drivers/iio/adc/ti-ads1100.c + create mode 100644 drivers/iio/industrialio-gts-helper.c + create mode 100644 drivers/iio/light/rohm-bu27034.c + create mode 100644 drivers/nvmem/layouts/Kconfig + create mode 100644 drivers/nvmem/layouts/Makefile + create mode 100644 drivers/nvmem/layouts/onie-tlv.c + create mode 100644 drivers/nvmem/layouts/sl28vpd.c + create mode 100644 drivers/of/module.c + delete mode 100644 drivers/staging/iio/meter/Kconfig + delete mode 100644 drivers/staging/iio/meter/Makefile + delete mode 100644 drivers/staging/iio/meter/ade7854-i2c.c + delete mode 100644 drivers/staging/iio/meter/ade7854-spi.c + delete mode 100644 drivers/staging/iio/meter/ade7854.c + delete mode 100644 drivers/staging/iio/meter/ade7854.h + delete mode 100644 drivers/staging/iio/meter/meter.h + create mode 100644 include/linux/cdx/cdx_bus.h + delete mode 100644 include/linux/cm4000_cs.h + create mode 100644 include/linux/iio/iio-gts-helper.h + delete mode 100644 include/uapi/linux/cm4000_cs.h + create mode 100644 include/uapi/linux/mei_uuid.h + delete mode 100644 kernel/configs/android-base.config + delete mode 100644 kernel/configs/android-recommended.config +$ git am -3 ../patches/cdx-change-struct-bus_type-for-sysfs-rescon-callback-as-constant.patch +Applying: cdx: change struct bus_type for sysfs rescan callback as constant +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/cdx/cdx.c +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master 5493c2588ac9b] Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git + Date: Thu Apr 27 15:23:43 2023 +0100 +Merging accel/habanalabs-next (afa351a15d809 Merge tag 'drm-intel-next-fixes-2023-04-13' of git://anongit.freedesktop.org/drm/drm-intel 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 (18996a113f256 coresight: etm_pmu: Set the module field) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git coresight/next +Already up to date. +Merging fpga/for-next (fe15c26ee26ef Linux 6.3-rc1) +$ 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 (b7590f3841f47 dt-bindings: interconnect: qcom,msm8998-bwmon: Resolve MSM8998 support) +$ 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 (52cc189b4fc6a iio: adc: palmas: don't alter event config on suspend/resume) +$ 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 (a010613237212 phy: cadence: cdns-dphy-rx: Add common module reset support) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next +Removing drivers/phy/intel/phy-intel-thunderbay-emmc.c +Auto-merging drivers/phy/intel/phy-intel-lgm-combo.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/phy/marvell,armada-cp110-utmi-phy.yaml +Removing Documentation/devicetree/bindings/phy/intel,phy-thunderbay-emmc.yaml +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pci/rockchip-dw-pcie.yaml | 6 +- + .../bindings/phy/allwinner,sun50i-h6-usb3-phy.yaml | 4 +- + .../phy/allwinner,sun6i-a31-mipi-dphy.yaml | 2 +- + .../bindings/phy/amlogic,axg-mipi-dphy.yaml | 4 +- + .../phy/amlogic,g12a-mipi-dphy-analog.yaml | 4 +- + .../bindings/phy/amlogic,g12a-usb2-phy.yaml | 4 +- + .../bindings/phy/amlogic,g12a-usb3-pcie-phy.yaml | 4 +- + .../phy/amlogic,meson-axg-mipi-pcie-analog.yaml | 4 +- + .../bindings/phy/amlogic,meson-axg-pcie.yaml | 4 +- + .../bindings/phy/amlogic,meson8-hdmi-tx-phy.yaml | 4 +- + .../bindings/phy/amlogic,meson8b-usb2-phy.yaml | 4 +- + .../bindings/phy/brcm,bcm63xx-usbh-phy.yaml | 4 +- + .../devicetree/bindings/phy/brcm,sata-phy.yaml | 4 +- + .../devicetree/bindings/phy/cdns,salvo-phy.yaml | 4 +- + .../bindings/phy/hisilicon,hi3660-usb3.yaml | 4 +- + .../bindings/phy/hisilicon,hi3670-usb3.yaml | 6 +- + .../bindings/phy/intel,phy-thunderbay-emmc.yaml | 45 -- + .../bindings/phy/marvell,armada-3700-utmi-phy.yaml | 4 +- + .../phy/marvell,armada-cp110-utmi-phy.yaml | 4 +- + .../bindings/phy/marvell,mmp3-hsic-phy.yaml | 4 +- + .../devicetree/bindings/phy/mediatek,hdmi-phy.yaml | 1 + + .../bindings/phy/mediatek,mt7621-pci-phy.yaml | 4 +- + .../bindings/phy/phy-cadence-sierra.yaml | 12 +- + .../bindings/phy/phy-cadence-torrent.yaml | 10 +- + .../bindings/phy/phy-rockchip-naneng-combphy.yaml | 1 + + .../devicetree/bindings/phy/phy-tegra194-p2u.yaml | 4 +- + .../devicetree/bindings/phy/qcom,edp-phy.yaml | 4 +- + .../devicetree/bindings/phy/qcom,qusb2-phy.yaml | 4 +- + .../bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml | 1 + + .../bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml | 27 +- + .../devicetree/bindings/phy/qcom,usb-hs-28nm.yaml | 4 +- + .../bindings/phy/qcom,usb-snps-femto-v2.yaml | 4 +- + .../devicetree/bindings/phy/qcom,usb-ss.yaml | 4 +- + .../bindings/phy/qcom-usb-ipq4019-phy.yaml | 4 +- + .../bindings/phy/samsung,exynos-pcie-phy.yaml | 4 +- + .../devicetree/bindings/phy/samsung,ufs-phy.yaml | 2 +- + .../bindings/phy/sunplus,sp7021-usb2-phy.yaml | 4 +- + .../bindings/phy/ti,phy-am654-serdes.yaml | 5 - + .../devicetree/bindings/phy/ti,phy-gmii-sel.yaml | 8 +- + .../devicetree/bindings/phy/ti,phy-j721e-wiz.yaml | 25 +- + .../devicetree/bindings/phy/ti,tcan104x-can.yaml | 4 +- + MAINTAINERS | 7 - + drivers/phy/Kconfig | 2 +- + drivers/phy/allwinner/phy-sun4i-usb.c | 8 +- + drivers/phy/amlogic/phy-meson-axg-mipi-dphy.c | 4 +- + drivers/phy/broadcom/phy-bcm-ns-usb2.c | 2 +- + drivers/phy/broadcom/phy-brcm-usb.c | 6 +- + drivers/phy/cadence/cdns-dphy-rx.c | 32 ++ + drivers/phy/cadence/cdns-dphy.c | 6 +- + drivers/phy/cadence/phy-cadence-sierra.c | 250 +++++++--- + drivers/phy/cadence/phy-cadence-torrent.c | 6 +- + drivers/phy/freescale/phy-fsl-imx8qm-lvds-phy.c | 6 +- + drivers/phy/intel/Kconfig | 10 - + drivers/phy/intel/Makefile | 1 - + drivers/phy/intel/phy-intel-lgm-combo.c | 5 +- + drivers/phy/intel/phy-intel-thunderbay-emmc.c | 509 --------------------- + drivers/phy/marvell/phy-pxa-28nm-hsic.c | 2 +- + drivers/phy/marvell/phy-pxa-28nm-usb2.c | 2 +- + drivers/phy/mediatek/Makefile | 1 + + drivers/phy/mediatek/phy-mtk-hdmi-mt8195.c | 495 ++++++++++++++++++++ + drivers/phy/mediatek/phy-mtk-hdmi-mt8195.h | 113 +++++ + drivers/phy/mediatek/phy-mtk-hdmi.c | 15 + + drivers/phy/mediatek/phy-mtk-hdmi.h | 3 + + drivers/phy/mediatek/phy-mtk-mipi-dsi.c | 5 +- + drivers/phy/motorola/phy-cpcap-usb.c | 6 +- + drivers/phy/motorola/phy-mapphone-mdm6600.c | 6 +- + drivers/phy/phy-lgm-usb.c | 6 +- + drivers/phy/qualcomm/phy-qcom-apq8064-sata.c | 6 +- + drivers/phy/qualcomm/phy-qcom-eusb2-repeater.c | 8 +- + drivers/phy/qualcomm/phy-qcom-ipq806x-sata.c | 6 +- + drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 19 +- + drivers/phy/qualcomm/phy-qcom-qmp-pcie.c | 263 ++++++++++- + drivers/phy/qualcomm/phy-qcom-qmp-pcs-pcie-v4_20.h | 2 + + drivers/phy/qualcomm/phy-qcom-qmp-pcs-pcie-v5_20.h | 3 + + drivers/phy/qualcomm/phy-qcom-qmp-pcs-v5_20.h | 1 + + .../phy/qualcomm/phy-qcom-qmp-qserdes-txrx-v5_20.h | 24 + + drivers/phy/qualcomm/phy-qcom-qmp-ufs.c | 98 ++++ + drivers/phy/renesas/phy-rcar-gen3-pcie.c | 6 +- + drivers/phy/renesas/phy-rcar-gen3-usb2.c | 6 +- + drivers/phy/renesas/phy-rcar-gen3-usb3.c | 6 +- + drivers/phy/renesas/r8a779f0-ether-serdes.c | 6 +- + drivers/phy/rockchip/phy-rockchip-inno-csidphy.c | 6 +- + drivers/phy/rockchip/phy-rockchip-inno-dsidphy.c | 11 +- + drivers/phy/rockchip/phy-rockchip-inno-hdmi.c | 6 +- + drivers/phy/rockchip/phy-rockchip-naneng-combphy.c | 184 ++++++++ + drivers/phy/rockchip/phy-rockchip-pcie.c | 15 - + drivers/phy/rockchip/phy-rockchip-typec.c | 6 +- + drivers/phy/st/phy-miphy28lp.c | 42 +- + drivers/phy/st/phy-spear1310-miphy.c | 2 +- + drivers/phy/st/phy-spear1340-miphy.c | 2 +- + drivers/phy/st/phy-stm32-usbphyc.c | 9 +- + drivers/phy/tegra/xusb-tegra186.c | 20 + + drivers/phy/tegra/xusb.c | 8 +- + drivers/phy/tegra/xusb.h | 1 + + drivers/phy/ti/phy-am654-serdes.c | 6 +- + drivers/phy/ti/phy-da8xx-usb.c | 6 +- + drivers/phy/ti/phy-dm816x-usb.c | 6 +- + drivers/phy/ti/phy-j721e-wiz.c | 19 +- + drivers/phy/ti/phy-omap-usb2.c | 14 +- + drivers/phy/ti/phy-ti-pipe3.c | 6 +- + drivers/phy/ti/phy-twl4030-usb.c | 6 +- + drivers/phy/xilinx/phy-zynqmp.c | 5 +- + 102 files changed, 1628 insertions(+), 973 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/phy/intel,phy-thunderbay-emmc.yaml + delete mode 100644 drivers/phy/intel/phy-intel-thunderbay-emmc.c + create mode 100644 drivers/phy/mediatek/phy-mtk-hdmi-mt8195.c + create mode 100644 drivers/phy/mediatek/phy-mtk-hdmi-mt8195.h +Merging soundwire/next (67572c8dc6441 soundwire: intel_auxdevice: improve pm_prepare step) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next +Merge made by the 'recursive' strategy. + drivers/soundwire/Kconfig | 10 + + drivers/soundwire/Makefile | 7 +- + drivers/soundwire/amd_manager.c | 1208 ++++++++++++++++++++++ + drivers/soundwire/amd_manager.h | 258 +++++ + drivers/soundwire/bus.c | 112 +- + drivers/soundwire/bus.h | 20 +- + drivers/soundwire/cadence_master.c | 139 ++- + drivers/soundwire/cadence_master.h | 5 +- + drivers/soundwire/dmi-quirks.c | 25 + + drivers/soundwire/generic_bandwidth_allocation.c | 15 +- + drivers/soundwire/intel.c | 336 +----- + drivers/soundwire/intel.h | 67 ++ + drivers/soundwire/intel_auxdevice.c | 6 +- + drivers/soundwire/intel_bus_common.c | 259 +++++ + drivers/soundwire/qcom.c | 20 +- + drivers/soundwire/stream.c | 20 +- + include/linux/soundwire/sdw_amd.h | 109 ++ + include/linux/soundwire/sdw_intel.h | 11 + + 18 files changed, 2189 insertions(+), 438 deletions(-) + create mode 100644 drivers/soundwire/amd_manager.c + create mode 100644 drivers/soundwire/amd_manager.h + create mode 100644 drivers/soundwire/intel_bus_common.c + create mode 100644 include/linux/soundwire/sdw_amd.h +Merging extcon/extcon-next (4e30418def07f extcon: Drop unneeded assignments) +$ git merge -m Merge branch 'extcon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon/extcon-next +Auto-merging drivers/extcon/extcon.c +CONFLICT (content): Merge conflict in drivers/extcon/extcon.c +Resolved 'drivers/extcon/extcon.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 0d15d9082ecf7] Merge branch 'extcon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/extcon/qcom,pm8941-misc.yaml | 14 +- + drivers/extcon/Kconfig | 1 + + drivers/extcon/extcon-axp288.c | 2 +- + drivers/extcon/extcon-palmas.c | 1 - + drivers/extcon/extcon-qcom-spmi-misc.c | 4 +- + drivers/extcon/extcon-usbc-tusb320.c | 153 +++++++-- + drivers/extcon/extcon.c | 368 ++++++++++++--------- + drivers/extcon/extcon.h | 8 +- + 8 files changed, 354 insertions(+), 197 deletions(-) +Merging gnss/gnss-next (1b929c02afd37 Linux 6.2-rc1) +$ 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 (705b004ee377b docs: kvm: vfio: Suggest KVM_DEV_VFIO_GROUP_ADD vs VFIO_GROUP_GET_DEVICE_FD ordering) +$ git merge -m Merge branch 'next' of git://github.com/awilliam/linux-vfio.git vfio/next +Merge made by the 'recursive' strategy. + Documentation/virt/kvm/devices/vfio.rst | 5 +++++ + drivers/vfio/pci/vfio_pci_config.c | 7 +++++++ + include/linux/vfio.h | 5 +++++ + 3 files changed, 17 insertions(+) +Merging staging/staging-next (3fac2397f562e staging: rtl8192e: Fix W_DISABLE# does not work after stop/start) +$ git merge -m Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next +Auto-merging drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +Removing drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.h +Auto-merging drivers/staging/iio/resolver/ad2s1210.c +Removing drivers/staging/greybus/tools/loopback_test.c +Removing drivers/staging/greybus/tools/lbtest +Removing drivers/staging/greybus/tools/README.loopback +Removing drivers/staging/greybus/tools/Makefile +Removing drivers/staging/greybus/tools/Android.mk +Removing drivers/staging/greybus/tools/.gitignore +Auto-merging drivers/staging/fieldbus/anybuss/arcx-anybus.c +Merge made by the 'recursive' strategy. + drivers/staging/axis-fifo/axis-fifo.c | 34 +- + drivers/staging/emxx_udc/emxx_udc.c | 6 +- + drivers/staging/fieldbus/anybuss/arcx-anybus.c | 5 +- + drivers/staging/greybus/arche-apb-ctrl.c | 6 +- + drivers/staging/greybus/arche-platform.c | 6 +- + drivers/staging/greybus/audio_manager_module.c | 47 +- + drivers/staging/greybus/audio_topology.c | 5 +- + drivers/staging/greybus/gpio.c | 7 +- + drivers/staging/greybus/greybus_authentication.h | 1 - + drivers/staging/greybus/pwm.c | 6 +- + drivers/staging/greybus/tools/.gitignore | 2 - + drivers/staging/greybus/tools/Android.mk | 10 - + drivers/staging/greybus/tools/Makefile | 33 - + drivers/staging/greybus/tools/README.loopback | 198 ----- + drivers/staging/greybus/tools/lbtest | 169 ---- + drivers/staging/greybus/tools/loopback_test.c | 979 --------------------- + drivers/staging/ks7010/ks_hostif.c | 5 +- + drivers/staging/most/dim2/dim2.c | 15 +- + drivers/staging/most/dim2/hal.c | 5 +- + drivers/staging/most/i2c/i2c.c | 5 +- + drivers/staging/most/video/video.c | 3 +- + drivers/staging/nvec/nvec.c | 6 +- + drivers/staging/nvec/nvec_kbd.c | 6 +- + drivers/staging/nvec/nvec_paz00.c | 5 +- + drivers/staging/nvec/nvec_power.c | 6 +- + drivers/staging/nvec/nvec_ps2.c | 6 +- + drivers/staging/octeon/ethernet.c | 5 +- + drivers/staging/octeon/octeon-stubs.h | 4 +- + drivers/staging/qlge/qlge_dbg.c | 35 +- + drivers/staging/rtl8192e/rtl8192e/Makefile | 2 +- + drivers/staging/rtl8192e/rtl8192e/r8190P_def.h | 11 - + drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c | 10 - + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 82 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h | 1 - + .../staging/rtl8192e/rtl8192e/r8192E_firmware.c | 2 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h | 7 - + drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.h | 33 - + drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 609 ++++--------- + drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h | 32 - + drivers/staging/rtl8192e/rtl8192e/r8192E_phyreg.h | 37 - + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 204 +---- + drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 69 -- + drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 258 ++---- + drivers/staging/rtl8192e/rtl8192e/rtl_pci.c | 6 +- + drivers/staging/rtl8192e/rtl8192e/rtl_ps.c | 3 +- + drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 8 +- + .../rtl8192e/rtl8192e/{r8192E_hwimg.c => table.c} | 22 +- + drivers/staging/rtl8192e/rtl8192e/table.h | 27 + + drivers/staging/rtl8192e/rtl819x_HT.h | 3 - + drivers/staging/rtl8192e/rtl819x_TSProc.c | 3 +- + drivers/staging/rtl8192e/rtllib.h | 44 +- + drivers/staging/rtl8192e/rtllib_crypt_ccmp.c | 32 +- + drivers/staging/rtl8192e/rtllib_rx.c | 80 +- + drivers/staging/rtl8192e/rtllib_softmac.c | 47 +- + drivers/staging/rtl8192e/rtllib_softmac_wx.c | 12 +- + drivers/staging/rtl8192e/rtllib_wx.c | 42 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 38 - + drivers/staging/rtl8192u/r8192U_dm.c | 244 +---- + drivers/staging/rtl8192u/r8192U_dm.h | 1 - + drivers/staging/rtl8192u/r819xU_phy.c | 87 -- + drivers/staging/rtl8192u/r819xU_phy.h | 2 - + drivers/staging/rtl8712/rtl8712_efuse.h | 1 + + drivers/staging/rtl8712/rtl871x_mlme.c | 97 +- + drivers/staging/rtl8723bs/core/rtw_mlme.c | 17 +- + drivers/staging/rtl8723bs/hal/hal_btcoex.c | 8 - + drivers/staging/rtl8723bs/hal/hal_com.c | 108 --- + drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 1 - + drivers/staging/rtl8723bs/include/drv_types.h | 6 +- + drivers/staging/rtl8723bs/include/hal_btcoex.h | 1 - + drivers/staging/rtl8723bs/include/hal_com.h | 9 - + drivers/staging/rtl8723bs/include/ieee80211.h | 49 +- + drivers/staging/rtl8723bs/include/rtw_mlme.h | 20 - + drivers/staging/rtl8723bs/include/rtw_recv.h | 9 +- + drivers/staging/rts5208/xd.c | 7 - + .../vc04_services/bcm2835-camera/bcm2835-camera.c | 6 +- + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 6 +- + drivers/staging/vme_user/Kconfig | 3 +- + drivers/staging/vme_user/vme_fake.c | 5 - + drivers/staging/vme_user/vme_tsi148.c | 13 +- + drivers/staging/vme_user/vme_tsi148.h | 534 +++++------ + drivers/staging/vt6655/baseband.c | 44 - + drivers/staging/vt6655/baseband.h | 2 - + drivers/staging/vt6656/card.c | 21 - + drivers/staging/vt6656/card.h | 1 - + drivers/staging/wlan-ng/prism2fw.c | 8 +- + 85 files changed, 893 insertions(+), 3761 deletions(-) + delete mode 100644 drivers/staging/greybus/tools/.gitignore + delete mode 100644 drivers/staging/greybus/tools/Android.mk + delete mode 100644 drivers/staging/greybus/tools/Makefile + delete mode 100644 drivers/staging/greybus/tools/README.loopback + delete mode 100755 drivers/staging/greybus/tools/lbtest + delete mode 100644 drivers/staging/greybus/tools/loopback_test.c + delete mode 100644 drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.h + rename drivers/staging/rtl8192e/rtl8192e/{r8192E_hwimg.c => table.c} (95%) + create mode 100644 drivers/staging/rtl8192e/rtl8192e/table.h +Merging counter-next/counter-next (cf3600f291360 tools/counter: Makefile: Remove lingering 'include' directories on make clean) +$ git merge -m Merge branch 'counter-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-next/counter-next +Auto-merging drivers/counter/Kconfig +Merge made by the 'recursive' strategy. + drivers/counter/Kconfig | 6 +++--- + drivers/counter/stm32-timer-cnt.c | 3 +++ + include/linux/mfd/stm32-timers.h | 1 + + tools/counter/.gitignore | 2 ++ + tools/counter/Makefile | 1 + + 5 files changed, 10 insertions(+), 3 deletions(-) + create mode 100644 tools/counter/.gitignore +Merging mux/for-next (ea327624ae529 mux: mmio: drop obsolete dependency on COMPILE_TEST) +$ git merge -m Merge branch 'for-next' of https://gitlab.com/peda-linux/mux.git mux/for-next +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 3475 and retry the command. +Merge made by the 'recursive' strategy. + drivers/mux/Kconfig | 2 +- + drivers/mux/mmio.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging dmaengine/next (f2dc327131b5c dmaengine: idxd: add per wq PRS disable) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next +Auto-merging drivers/dma/mv_xor_v2.c +Auto-merging drivers/dma/idxd/irq.c +Auto-merging drivers/dma/idxd/init.c +Auto-merging drivers/dma/idxd/idxd.h +Auto-merging drivers/dma/idxd/device.c +Merge made by the 'recursive' strategy. + Documentation/ABI/stable/sysfs-driver-dma-idxd | 51 +++ + .../devicetree/bindings/dma/apple,admac.yaml | 1 + + .../devicetree/bindings/dma/qcom,gpi.yaml | 1 + + .../devicetree/bindings/dma/renesas,rz-dmac.yaml | 14 + + .../devicetree/bindings/dma/snps,dw-axi-dmac.yaml | 23 +- + .../devicetree/bindings/dma/ti/k3-udma.yaml | 2 +- + .../bindings/dma/xilinx/xlnx,zynqmp-dma-1.0.yaml | 2 +- + .../bindings/dma/xilinx/xlnx,zynqmp-dpdma.yaml | 2 +- + drivers/dma/Kconfig | 1 + + drivers/dma/at_xdmac.c | 107 +++++-- + drivers/dma/bestcomm/sram.c | 19 +- + drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 40 ++- + drivers/dma/dw-axi-dmac/dw-axi-dmac.h | 1 + + drivers/dma/dw-edma/dw-edma-core.c | 27 +- + drivers/dma/dw-edma/dw-edma-v0-core.c | 56 ---- + drivers/dma/idxd/Makefile | 2 +- + drivers/dma/idxd/cdev.c | 334 +++++++++++++++++-- + drivers/dma/idxd/debugfs.c | 138 ++++++++ + drivers/dma/idxd/device.c | 113 ++++++- + drivers/dma/idxd/idxd.h | 67 ++++ + drivers/dma/idxd/init.c | 60 +++- + drivers/dma/idxd/irq.c | 210 ++++++++++-- + drivers/dma/idxd/registers.h | 126 +++++++- + drivers/dma/idxd/sysfs.c | 146 ++++++++- + drivers/dma/imx-dma.c | 1 - + drivers/dma/ioat/init.c | 12 +- + drivers/dma/ioat/registers.h | 7 - + drivers/dma/mv_xor_v2.c | 35 +- + drivers/dma/of-dma.c | 2 +- + drivers/dma/qcom/gpi.c | 1 - + drivers/dma/qcom/hidma_mgmt.c | 2 + + drivers/dma/sh/rz-dmac.c | 18 +- + drivers/dma/tegra20-apb-dma.c | 5 - + drivers/dma/ti/Makefile | 3 +- + drivers/dma/ti/edma.c | 8 - + drivers/dma/ti/k3-psil-j784s4.c | 354 +++++++++++++++++++++ + drivers/dma/ti/k3-psil-priv.h | 1 + + drivers/dma/ti/k3-psil.c | 1 + + drivers/dma/ti/k3-udma.c | 75 ++++- + drivers/dma/xilinx/zynqmp_dma.c | 6 +- + include/linux/dma/ti-cppi5.h | 1 + + include/uapi/linux/idxd.h | 48 ++- + 42 files changed, 1863 insertions(+), 260 deletions(-) + create mode 100644 drivers/dma/idxd/debugfs.c + create mode 100644 drivers/dma/ti/k3-psil-j784s4.c +Merging cgroup/for-next (5199604d1ee55 Merge branch 'for-6.4' 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 mm/page_alloc.c +Auto-merging kernel/cgroup/cpuset.c +Auto-merging kernel/cgroup/cgroup.c +Auto-merging kernel/bpf/local_storage.c +Auto-merging kernel/bpf/cgroup.c +Merge made by the 'recursive' strategy. + Documentation/admin-guide/cgroup-v1/cpusets.rst | 2 +- + kernel/bpf/cgroup.c | 38 +++++++------- + kernel/bpf/cgroup_iter.c | 4 +- + kernel/bpf/local_storage.c | 4 +- + kernel/cgroup/cgroup-v1.c | 16 +++--- + kernel/cgroup/cgroup.c | 60 +++++++++++------------ + kernel/cgroup/cpuset.c | 26 ++++++---- + tools/testing/selftests/cgroup/test_cpuset_prs.sh | 25 +++++----- + 8 files changed, 93 insertions(+), 82 deletions(-) +$ git am -3 ../patches/0001-sched-psi-fix-up-for-cgroup-Remove-CFTYPE_PRESSURE.patch +Applying: sched/psi: fix up for "cgroup: Remove CFTYPE_PRESSURE" +Using index info to reconstruct a base tree... +M kernel/cgroup/cgroup.c +Falling back to patching base and 3-way merge... +Auto-merging kernel/cgroup/cgroup.c +No changes -- Patch already applied. +Merging scsi/for-next (6d010c8434271 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 +Merge made by the 'recursive' strategy. +Merging scsi-mkp/for-next (c5749639f2d0a scsi: qedi: Fix use after free bug in qedi_remove()) +$ 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 'recursive' strategy. + drivers/scsi/Kconfig | 3 +- + drivers/scsi/ipr.c | 788 +-------------------------------------- + drivers/scsi/ipr.h | 64 ---- + drivers/scsi/pm8001/pm8001_hwi.c | 7 +- + drivers/scsi/qedi/qedi_main.c | 3 + + drivers/scsi/scsi_debug.c | 22 ++ + drivers/ufs/core/ufs-mcq.c | 6 +- + 7 files changed, 43 insertions(+), 850 deletions(-) +Merging vhost/linux-next (c82729e06644f vhost_vdpa: fix unmap process in no-batch mode) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next +Auto-merging drivers/virtio/virtio_mmio.c +Auto-merging drivers/vhost/vhost.c +Auto-merging drivers/vhost/vdpa.c +Auto-merging drivers/vhost/scsi.c +Auto-merging drivers/vdpa/vdpa_user/vduse_dev.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 + + drivers/s390/virtio/virtio_ccw.c | 22 +- + drivers/vdpa/mlx5/net/mlx5_vnet.c | 261 +++++++++++++--------- + drivers/vdpa/solidrun/Makefile | 1 + + drivers/vdpa/solidrun/snet_ctrl.c | 330 ++++++++++++++++++++++++++++ + drivers/vdpa/solidrun/snet_hwmon.c | 2 +- + drivers/vdpa/solidrun/snet_main.c | 146 ++++++------ + drivers/vdpa/solidrun/snet_vdpa.h | 20 +- + drivers/vdpa/vdpa_sim/vdpa_sim.c | 168 +++++++++++--- + drivers/vdpa/vdpa_sim/vdpa_sim.h | 14 +- + drivers/vdpa/vdpa_sim/vdpa_sim_blk.c | 93 ++++++-- + drivers/vdpa/vdpa_sim/vdpa_sim_net.c | 38 ++-- + drivers/vdpa/vdpa_user/vduse_dev.c | 414 +++++++++++++++++++++++++++++------ + drivers/vhost/scsi.c | 102 +++++---- + drivers/vhost/vdpa.c | 44 +++- + drivers/vhost/vhost.c | 6 +- + drivers/vhost/vringh.c | 191 ++++++++++++---- + drivers/virtio/virtio_mmio.c | 18 +- + drivers/virtio/virtio_pci_modern.c | 22 +- + drivers/virtio/virtio_ring.c | 89 +++++--- + drivers/virtio/virtio_vdpa.c | 120 +++++++++- + include/linux/vdpa.h | 52 ++++- + include/linux/virtio.h | 16 +- + include/linux/virtio_ring.h | 3 + + include/linux/vringh.h | 26 ++- + include/uapi/linux/virtio_config.h | 6 + + lib/group_cpus.c | 1 + + tools/include/linux/types.h | 5 + + tools/virtio/linux/compiler.h | 2 + + tools/virtio/linux/kernel.h | 5 +- + tools/virtio/linux/uaccess.h | 11 +- + tools/virtio/virtio_test.c | 12 +- + 32 files changed, 1761 insertions(+), 481 deletions(-) + create mode 100644 drivers/vdpa/solidrun/snet_ctrl.c +Merging rpmsg/for-next (fb967507b799c Merge branches 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next +Auto-merging drivers/rpmsg/rpmsg_core.c +Auto-merging drivers/rpmsg/qcom_glink_native.c +CONFLICT (content): Merge conflict in drivers/rpmsg/qcom_glink_native.c +Resolved 'drivers/rpmsg/qcom_glink_native.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 02df010081b83] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git +$ git diff -M --stat --summary HEAD^.. + drivers/rpmsg/qcom_glink_native.c | 63 +++++++++++++++++++++++++++++++++++++++ + drivers/rpmsg/rpmsg_char.c | 58 ++++++++++++++++++++++++++++++----- + drivers/rpmsg/rpmsg_core.c | 20 +++++++++++++ + drivers/rpmsg/rpmsg_internal.h | 2 ++ + include/linux/rpmsg.h | 15 ++++++++++ + include/uapi/linux/rpmsg.h | 12 +++++++- + 6 files changed, 162 insertions(+), 8 deletions(-) +Merging gpio/for-next (e73f0f0ee7541 Linux 5.14-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git gpio/for-next +Already up to date. +Merging gpio-brgl/gpio/for-next (8a4adcf67a39b gpio: gpiolib: Simplify gpiochip_add_data_with_key() fwnode) +$ 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 +Already up to date. +Merging gpio-intel/for-next (782eea0c89f7d gpiolib: acpi: Add a ignore wakeup quirk for Clevo NL5xNU) +$ 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 (79debe43aa8b1 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 drivers/pinctrl/renesas/pinctrl-rzn1.c +Auto-merging drivers/pinctrl/renesas/pinctrl-rza1.c +Removing drivers/pinctrl/renesas/pfc-r8a77950.c +Removing drivers/pinctrl/ralink/pinctrl-mt7620.c +Removing drivers/pinctrl/ralink/Makefile +Removing drivers/pinctrl/ralink/Kconfig +Removing drivers/pinctrl/pinctrl-thunderbay.c +Auto-merging drivers/pinctrl/pinctrl-amd.c +Auto-merging drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/pinctrl/starfive,jh7100-pinctrl.yaml +Removing Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt +Auto-merging Documentation/devicetree/bindings/pinctrl/mediatek,mt8192-pinctrl.yaml +Removing Documentation/devicetree/bindings/pinctrl/intel,pinctrl-thunderbay.yaml +Auto-merging Documentation/devicetree/bindings/pinctrl/apple,pinctrl.yaml +Merge made by the 'recursive' strategy. + .../devicetree/bindings/gpio/nxp,pcf8575.yaml | 4 + + .../bindings/pinctrl/actions,s500-pinctrl.yaml | 2 +- + .../pinctrl/allwinner,sun4i-a10-pinctrl.yaml | 2 +- + .../bindings/pinctrl/amlogic,meson-pinctrl-a1.yaml | 67 + + .../pinctrl/amlogic,meson-pinctrl-common.yaml | 57 + + .../pinctrl/amlogic,meson-pinctrl-g12a-aobus.yaml | 68 + + .../amlogic,meson-pinctrl-g12a-periphs.yaml | 72 + + .../pinctrl/amlogic,meson8-pinctrl-aobus.yaml | 76 + + .../pinctrl/amlogic,meson8-pinctrl-cbus.yaml | 78 + + .../devicetree/bindings/pinctrl/apple,pinctrl.yaml | 2 +- + .../bindings/pinctrl/aspeed,ast2400-pinctrl.yaml | 4 +- + .../bindings/pinctrl/aspeed,ast2500-pinctrl.yaml | 4 +- + .../bindings/pinctrl/aspeed,ast2600-pinctrl.yaml | 6 +- + .../bindings/pinctrl/brcm,bcm6318-pinctrl.yaml | 2 +- + .../bindings/pinctrl/brcm,bcm63268-pinctrl.yaml | 2 +- + .../bindings/pinctrl/brcm,bcm6328-pinctrl.yaml | 2 +- + .../bindings/pinctrl/brcm,bcm6358-pinctrl.yaml | 2 +- + .../bindings/pinctrl/brcm,bcm6362-pinctrl.yaml | 2 +- + .../bindings/pinctrl/brcm,bcm6368-pinctrl.yaml | 2 +- + .../bindings/pinctrl/brcm,ns-pinmux.yaml | 2 +- + .../bindings/pinctrl/canaan,k210-fpioa.yaml | 2 +- + .../bindings/pinctrl/cirrus,lochnagar.yaml | 2 +- + .../devicetree/bindings/pinctrl/cirrus,madera.yaml | 4 +- + .../bindings/pinctrl/cypress,cy8c95x0.yaml | 2 +- + .../bindings/pinctrl/fsl,imx7d-pinctrl.yaml | 2 +- + .../bindings/pinctrl/fsl,imx8m-pinctrl.yaml | 2 +- + .../bindings/pinctrl/fsl,imx8ulp-pinctrl.yaml | 2 +- + .../bindings/pinctrl/fsl,imx93-pinctrl.yaml | 2 +- + .../bindings/pinctrl/ingenic,pinctrl.yaml | 2 +- + .../devicetree/bindings/pinctrl/intel,lgm-io.yaml | 2 +- + .../bindings/pinctrl/intel,pinctrl-thunderbay.yaml | 120 - + .../bindings/pinctrl/lantiq,pinctrl-xway.txt | 35 +- + .../bindings/pinctrl/marvell,ac5-pinctrl.yaml | 4 +- + .../bindings/pinctrl/mediatek,mt65xx-pinctrl.yaml | 32 +- + .../bindings/pinctrl/mediatek,mt6779-pinctrl.yaml | 39 +- + ...rl-mt6795.yaml => mediatek,mt6795-pinctrl.yaml} | 51 +- + .../bindings/pinctrl/mediatek,mt7620-pinctrl.yaml | 298 + + ...1-pinctrl.yaml => mediatek,mt7621-pinctrl.yaml} | 17 +- + .../bindings/pinctrl/mediatek,mt7622-pinctrl.yaml | 34 +- + ...0-pinctrl.yaml => mediatek,mt76x8-pinctrl.yaml} | 252 +- + .../bindings/pinctrl/mediatek,mt7981-pinctrl.yaml | 35 +- + .../bindings/pinctrl/mediatek,mt7986-pinctrl.yaml | 80 +- + .../bindings/pinctrl/mediatek,mt8183-pinctrl.yaml | 40 +- + ...rl-mt8186.yaml => mediatek,mt8186-pinctrl.yaml} | 55 +- + .../bindings/pinctrl/mediatek,mt8188-pinctrl.yaml | 80 +- + ...rl-mt8192.yaml => mediatek,mt8192-pinctrl.yaml} | 57 +- + ...rl-mt8195.yaml => mediatek,mt8195-pinctrl.yaml} | 51 +- + .../bindings/pinctrl/mediatek,mt8365-pinctrl.yaml | 69 +- + .../devicetree/bindings/pinctrl/meson,pinctrl.txt | 94 - + .../bindings/pinctrl/mscc,ocelot-pinctrl.yaml | 6 +- + .../bindings/pinctrl/nxp,s32g2-siul2-pinctrl.yaml | 123 + + .../bindings/pinctrl/qcom,ipq9574-tlmm.yaml | 130 + + .../bindings/pinctrl/qcom,pmic-gpio.yaml | 9 +- + .../devicetree/bindings/pinctrl/qcom,pmic-mpp.yaml | 4 +- + .../bindings/pinctrl/qcom,qcm2290-tlmm.yaml | 1 + + .../pinctrl/qcom,sc7280-lpass-lpi-pinctrl.yaml | 2 +- + .../pinctrl/qcom,sc8280xp-lpass-lpi-pinctrl.yaml | 2 +- + .../bindings/pinctrl/qcom,sc8280xp-tlmm.yaml | 1 + + .../bindings/pinctrl/qcom,sm7150-tlmm.yaml | 162 + + .../bindings/pinctrl/qcom,sm8150-pinctrl.yaml | 2 +- + .../pinctrl/qcom,sm8250-lpass-lpi-pinctrl.yaml | 2 +- + .../pinctrl/qcom,sm8450-lpass-lpi-pinctrl.yaml | 2 +- + .../pinctrl/qcom,sm8550-lpass-lpi-pinctrl.yaml | 2 +- + .../bindings/pinctrl/qcom,tlmm-common.yaml | 2 +- + .../bindings/pinctrl/ralink,rt2880-pinctrl.yaml | 11 +- + .../bindings/pinctrl/ralink,rt305x-pinctrl.yaml | 89 +- + .../bindings/pinctrl/ralink,rt3352-pinctrl.yaml | 243 + + .../bindings/pinctrl/ralink,rt3883-pinctrl.yaml | 11 +- + .../bindings/pinctrl/ralink,rt5350-pinctrl.yaml | 206 + + .../devicetree/bindings/pinctrl/renesas,pfc.yaml | 2 +- + .../bindings/pinctrl/renesas,rza1-ports.yaml | 2 +- + .../bindings/pinctrl/renesas,rza2-pinctrl.yaml | 2 +- + .../bindings/pinctrl/renesas,rzg2l-pinctrl.yaml | 2 +- + .../bindings/pinctrl/renesas,rzn1-pinctrl.yaml | 2 +- + .../bindings/pinctrl/renesas,rzv2m-pinctrl.yaml | 2 +- + .../bindings/pinctrl/rockchip,pinctrl.yaml | 10 +- + .../bindings/pinctrl/samsung,pinctrl.yaml | 2 +- + .../bindings/pinctrl/semtech,sx1501q.yaml | 6 +- + .../pinctrl/socionext,uniphier-pinctrl.yaml | 2 +- + .../bindings/pinctrl/st,stm32-pinctrl.yaml | 10 +- + .../bindings/pinctrl/starfive,jh7100-pinctrl.yaml | 6 +- + .../bindings/pinctrl/sunplus,sp7021-pinctrl.yaml | 6 +- + .../bindings/pinctrl/toshiba,visconti-pinctrl.yaml | 8 +- + .../bindings/pinctrl/xlnx,zynq-pinctrl.yaml | 2 +- + MAINTAINERS | 42 +- + drivers/pinctrl/Kconfig | 34 +- + drivers/pinctrl/Makefile | 4 +- + drivers/pinctrl/bcm/pinctrl-bcm2835.c | 19 +- + drivers/pinctrl/bcm/pinctrl-iproc-gpio.c | 38 +- + drivers/pinctrl/bcm/pinctrl-nsp-gpio.c | 23 +- + drivers/pinctrl/freescale/Kconfig | 2 +- + drivers/pinctrl/freescale/pinctrl-imx.c | 80 +- + drivers/pinctrl/freescale/pinctrl-imx.h | 24 - + drivers/pinctrl/mediatek/Kconfig | 54 +- + drivers/pinctrl/mediatek/Makefile | 63 +- + drivers/pinctrl/mediatek/pinctrl-moore.c | 2 +- + drivers/pinctrl/mediatek/pinctrl-mt7620.c | 137 + + .../pinctrl/{ralink => mediatek}/pinctrl-mt7621.c | 31 +- + drivers/pinctrl/mediatek/pinctrl-mt76x8.c | 283 + + .../pinctrl-ralink.c => mediatek/pinctrl-mtmips.c} | 90 +- + .../pinctrl-ralink.h => mediatek/pinctrl-mtmips.h} | 16 +- + .../pinctrl/{ralink => mediatek}/pinctrl-rt2880.c | 21 +- + .../pinctrl/{ralink => mediatek}/pinctrl-rt305x.c | 47 +- + .../pinctrl/{ralink => mediatek}/pinctrl-rt3883.c | 29 +- + drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 34 +- + drivers/pinctrl/nuvoton/Kconfig | 1 + + drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 34 +- + drivers/pinctrl/nxp/Kconfig | 15 + + drivers/pinctrl/nxp/Makefile | 4 + + drivers/pinctrl/nxp/pinctrl-s32.h | 57 + + drivers/pinctrl/nxp/pinctrl-s32cc.c | 973 ++++ + drivers/pinctrl/nxp/pinctrl-s32g2.c | 770 +++ + drivers/pinctrl/pinctrl-amd.c | 90 +- + drivers/pinctrl/pinctrl-at91-pio4.c | 43 +- + drivers/pinctrl/pinctrl-at91.c | 189 +- + drivers/pinctrl/pinctrl-equilibrium.c | 22 +- + drivers/pinctrl/pinctrl-equilibrium.h | 2 - + drivers/pinctrl/pinctrl-mcp23s08.c | 81 +- + drivers/pinctrl/pinctrl-mcp23s08.h | 1 - + drivers/pinctrl/pinctrl-mlxbf3.c | 320 ++ + drivers/pinctrl/pinctrl-pic32.c | 36 +- + drivers/pinctrl/pinctrl-pistachio.c | 35 +- + drivers/pinctrl/pinctrl-single.c | 4 +- + drivers/pinctrl/pinctrl-st.c | 16 +- + drivers/pinctrl/pinctrl-stmfx.c | 38 +- + drivers/pinctrl/pinctrl-sx150x.c | 66 +- + drivers/pinctrl/pinctrl-thunderbay.c | 1294 ----- + drivers/pinctrl/pinctrl-xway.c | 252 - + drivers/pinctrl/qcom/Kconfig | 21 + + drivers/pinctrl/qcom/Makefile | 2 + + drivers/pinctrl/qcom/pinctrl-ipq9574.c | 826 +++ + drivers/pinctrl/qcom/pinctrl-lpass-lpi.c | 46 +- + drivers/pinctrl/qcom/pinctrl-msm.c | 5 +- + drivers/pinctrl/qcom/pinctrl-msm8998.c | 14 + + drivers/pinctrl/qcom/pinctrl-sm7150.c | 1280 +++++ + drivers/pinctrl/qcom/pinctrl-sm8550-lpass-lpi.c | 8 + + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 2 + + drivers/pinctrl/qcom/pinctrl-spmi-mpp.c | 38 +- + drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c | 24 +- + drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c | 35 +- + drivers/pinctrl/ralink/Kconfig | 35 - + drivers/pinctrl/ralink/Makefile | 8 - + drivers/pinctrl/ralink/pinctrl-mt7620.c | 391 -- + drivers/pinctrl/renesas/Kconfig | 5 - + drivers/pinctrl/renesas/Makefile | 1 - + drivers/pinctrl/renesas/core.c | 51 +- + drivers/pinctrl/renesas/pfc-emev2.c | 2 +- + drivers/pinctrl/renesas/pfc-r8a73a4.c | 4 +- + drivers/pinctrl/renesas/pfc-r8a7740.c | 4 +- + drivers/pinctrl/renesas/pfc-r8a77470.c | 46 +- + drivers/pinctrl/renesas/pfc-r8a7778.c | 4 +- + drivers/pinctrl/renesas/pfc-r8a7779.c | 446 +- + drivers/pinctrl/renesas/pfc-r8a7790.c | 4 +- + drivers/pinctrl/renesas/pfc-r8a7791.c | 6 +- + drivers/pinctrl/renesas/pfc-r8a7792.c | 2 +- + drivers/pinctrl/renesas/pfc-r8a7794.c | 50 +- + drivers/pinctrl/renesas/pfc-r8a77950.c | 5947 -------------------- + drivers/pinctrl/renesas/pfc-r8a77951.c | 12 +- + drivers/pinctrl/renesas/pfc-r8a7796.c | 12 +- + drivers/pinctrl/renesas/pfc-r8a77965.c | 12 +- + drivers/pinctrl/renesas/pfc-r8a77970.c | 38 +- + drivers/pinctrl/renesas/pfc-r8a77980.c | 49 +- + drivers/pinctrl/renesas/pfc-r8a77990.c | 41 +- + drivers/pinctrl/renesas/pfc-r8a77995.c | 46 +- + drivers/pinctrl/renesas/pfc-r8a779a0.c | 16 +- + drivers/pinctrl/renesas/pfc-r8a779f0.c | 10 +- + drivers/pinctrl/renesas/pfc-r8a779g0.c | 1095 ++-- + drivers/pinctrl/renesas/pfc-sh7203.c | 4 +- + drivers/pinctrl/renesas/pfc-sh7264.c | 4 +- + drivers/pinctrl/renesas/pfc-sh7269.c | 6 +- + drivers/pinctrl/renesas/pfc-sh73a0.c | 4 +- + drivers/pinctrl/renesas/pfc-sh7720.c | 4 +- + drivers/pinctrl/renesas/pfc-sh7722.c | 4 +- + drivers/pinctrl/renesas/pfc-sh7723.c | 4 +- + drivers/pinctrl/renesas/pfc-sh7724.c | 4 +- + drivers/pinctrl/renesas/pfc-sh7734.c | 4 +- + drivers/pinctrl/renesas/pfc-sh7757.c | 4 +- + drivers/pinctrl/renesas/pfc-sh7785.c | 4 +- + drivers/pinctrl/renesas/pfc-sh7786.c | 4 +- + drivers/pinctrl/renesas/pfc-shx3.c | 4 +- + drivers/pinctrl/renesas/pinctrl-rza1.c | 2 +- + drivers/pinctrl/renesas/pinctrl-rzn1.c | 2 +- + drivers/pinctrl/renesas/pinctrl.c | 53 +- + drivers/pinctrl/renesas/sh_pfc.h | 14 +- + drivers/pinctrl/spear/pinctrl-plgpio.c | 8 +- + drivers/pinctrl/stm32/pinctrl-stm32.c | 2 +- + drivers/pinctrl/sunxi/pinctrl-sunxi.c | 20 +- + 187 files changed, 8898 insertions(+), 10306 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl-a1.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl-common.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl-g12a-aobus.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl-g12a-periphs.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/amlogic,meson8-pinctrl-aobus.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/amlogic,meson8-pinctrl-cbus.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/intel,pinctrl-thunderbay.yaml + rename Documentation/devicetree/bindings/pinctrl/{mediatek,pinctrl-mt6795.yaml => mediatek,mt6795-pinctrl.yaml} (85%) + create mode 100644 Documentation/devicetree/bindings/pinctrl/mediatek,mt7620-pinctrl.yaml + rename Documentation/devicetree/bindings/pinctrl/{ralink,mt7621-pinctrl.yaml => mediatek,mt7621-pinctrl.yaml} (96%) + rename Documentation/devicetree/bindings/pinctrl/{ralink,mt7620-pinctrl.yaml => mediatek,mt76x8-pinctrl.yaml} (61%) + rename Documentation/devicetree/bindings/pinctrl/{pinctrl-mt8186.yaml => mediatek,mt8186-pinctrl.yaml} (87%) + rename Documentation/devicetree/bindings/pinctrl/{pinctrl-mt8192.yaml => mediatek,mt8192-pinctrl.yaml} (81%) + rename Documentation/devicetree/bindings/pinctrl/{pinctrl-mt8195.yaml => mediatek,mt8195-pinctrl.yaml} (89%) + delete mode 100644 Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/nxp,s32g2-siul2-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,ipq9574-tlmm.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sm7150-tlmm.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/ralink,rt3352-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/ralink,rt5350-pinctrl.yaml + create mode 100644 drivers/pinctrl/mediatek/pinctrl-mt7620.c + rename drivers/pinctrl/{ralink => mediatek}/pinctrl-mt7621.c (79%) + create mode 100644 drivers/pinctrl/mediatek/pinctrl-mt76x8.c + rename drivers/pinctrl/{ralink/pinctrl-ralink.c => mediatek/pinctrl-mtmips.c} (74%) + rename drivers/pinctrl/{ralink/pinctrl-ralink.h => mediatek/pinctrl-mtmips.h} (75%) + rename drivers/pinctrl/{ralink => mediatek}/pinctrl-rt2880.c (69%) + rename drivers/pinctrl/{ralink => mediatek}/pinctrl-rt305x.c (73%) + rename drivers/pinctrl/{ralink => mediatek}/pinctrl-rt3883.c (79%) + create mode 100644 drivers/pinctrl/nxp/Kconfig + create mode 100644 drivers/pinctrl/nxp/Makefile + create mode 100644 drivers/pinctrl/nxp/pinctrl-s32.h + create mode 100644 drivers/pinctrl/nxp/pinctrl-s32cc.c + create mode 100644 drivers/pinctrl/nxp/pinctrl-s32g2.c + create mode 100644 drivers/pinctrl/pinctrl-mlxbf3.c + delete mode 100644 drivers/pinctrl/pinctrl-thunderbay.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-ipq9574.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-sm7150.c + delete mode 100644 drivers/pinctrl/ralink/Kconfig + delete mode 100644 drivers/pinctrl/ralink/Makefile + delete mode 100644 drivers/pinctrl/ralink/pinctrl-mt7620.c + delete mode 100644 drivers/pinctrl/renesas/pfc-r8a77950.c +Merging pinctrl-intel/for-next (fe15c26ee26ef Linux 6.3-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel/for-next +Already up to date. +Merging pinctrl-renesas/renesas-pinctrl (45e6cc8ef1cd8 pinctrl: renesas: core: Drop unneeded #ifdef CONFIG_OF) +$ 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 (fe15c26ee26ef Linux 6.3-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung/for-next +Already up to date. +Merging pwm/for-next (247ee6c780406 pwm: Remove unused radix tree) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git pwm/for-next +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/pwm/pwm-meson.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pwm/apple,s5l-fpwm.yaml | 51 +++++++ + .../bindings/pwm/mediatek,mt2712-pwm.yaml | 1 + + .../devicetree/bindings/pwm/pwm-amlogic.yaml | 70 +++++++++ + .../devicetree/bindings/pwm/pwm-meson.txt | 29 ---- + Documentation/driver-api/pwm.rst | 13 +- + MAINTAINERS | 2 + + drivers/pwm/Kconfig | 12 ++ + drivers/pwm/Makefile | 1 + + drivers/pwm/core.c | 71 +-------- + drivers/pwm/pwm-apple.c | 159 +++++++++++++++++++++ + drivers/pwm/pwm-atmel-hlcdc.c | 6 +- + drivers/pwm/pwm-atmel-tcb.c | 6 +- + drivers/pwm/pwm-atmel.c | 6 +- + drivers/pwm/pwm-bcm-iproc.c | 6 +- + drivers/pwm/pwm-bcm2835.c | 6 +- + drivers/pwm/pwm-berlin.c | 6 +- + drivers/pwm/pwm-brcmstb.c | 6 +- + drivers/pwm/pwm-clk.c | 6 +- + drivers/pwm/pwm-cros-ec.c | 6 +- + drivers/pwm/pwm-hibvt.c | 6 +- + drivers/pwm/pwm-img.c | 6 +- + drivers/pwm/pwm-imx-tpm.c | 6 +- + drivers/pwm/pwm-lpc18xx-sct.c | 6 +- + drivers/pwm/pwm-lpss-platform.c | 5 +- + drivers/pwm/pwm-meson.c | 6 +- + drivers/pwm/pwm-mtk-disp.c | 40 ++++-- + drivers/pwm/pwm-omap-dmtimer.c | 6 +- + drivers/pwm/pwm-rcar.c | 8 +- + drivers/pwm/pwm-rockchip.c | 6 +- + drivers/pwm/pwm-samsung.c | 6 +- + drivers/pwm/pwm-sifive.c | 6 +- + drivers/pwm/pwm-spear.c | 6 +- + drivers/pwm/pwm-sprd.c | 6 +- + drivers/pwm/pwm-sti.c | 6 +- + drivers/pwm/pwm-stm32-lp.c | 2 +- + drivers/pwm/pwm-stm32.c | 10 +- + drivers/pwm/pwm-sun4i.c | 6 +- + drivers/pwm/pwm-tegra.c | 6 +- + drivers/pwm/pwm-tiecap.c | 6 +- + drivers/pwm/pwm-tiehrpwm.c | 6 +- + drivers/pwm/pwm-vt8500.c | 6 +- + drivers/pwm/pwm-xilinx.c | 5 +- + include/linux/pwm.h | 13 -- + 43 files changed, 396 insertions(+), 252 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pwm/apple,s5l-fpwm.yaml + create mode 100644 Documentation/devicetree/bindings/pwm/pwm-amlogic.yaml + delete mode 100644 Documentation/devicetree/bindings/pwm/pwm-meson.txt + create mode 100644 drivers/pwm/pwm-apple.c +Merging userns/for-next (05bd6e0242b4c Merge of unpriv-ipc-sysctls-for-v6.2, and fix-atomic_lock_inc_below-for-v6.2 for testing in linux-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git userns/for-next +Auto-merging Documentation/admin-guide/sysctl/kernel.rst +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 3513 and retry the command. +Merge made by the 'recursive' strategy. + Documentation/admin-guide/sysctl/kernel.rst | 14 ++++++++--- + ipc/ipc_sysctl.c | 37 +++++++++++++++++++++++++++-- + ipc/mq_sysctl.c | 36 ++++++++++++++++++++++++++++ + kernel/ucount.c | 16 ++++++------- + 4 files changed, 89 insertions(+), 14 deletions(-) +Merging ktest/for-next (7dc8e24f0e098 ktest: Restore stty setting at first in dodie) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git ktest/for-next +Already up to date. +Merging kselftest/next (50ad2fb7ec2b1 selftests/resctrl: Fix incorrect error return on test complete) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next +Already up to date. +Merging kunit/test (fe15c26ee26ef Linux 6.3-rc1) +$ git merge -m Merge branch 'test' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit/test +Already up to date. +Merging kunit-next/kunit (a42077b787680 kunit: add tests for using current KUnit test field) +$ git merge -m Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-next/kunit +Already up to date. +Merging livepatching/for-next (5e36be5973b6a Merge branch 'for-6.4/core' 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 +Already up to date! +Merge made by the 'recursive' strategy. +Merging rtc/rtc-next (0e6255fa3f649 rtc: meson-vrtc: Use ktime_get_real_ts64() to get the current time) +$ 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 'recursive' strategy. + .../bindings/rtc/allwinner,sun4i-a10-rtc.yaml | 2 +- + .../bindings/rtc/allwinner,sun6i-a31-rtc.yaml | 2 +- + .../devicetree/bindings/rtc/atmel,at91rm9200-rtc.yaml | 2 +- + .../devicetree/bindings/rtc/atmel,at91sam9260-rtt.yaml | 2 +- + .../devicetree/bindings/rtc/brcm,brcmstb-waketimer.yaml | 2 +- + .../devicetree/bindings/rtc/faraday,ftrtc010.yaml | 4 ++-- + .../devicetree/bindings/rtc/microcrystal,rv3032.yaml | 2 +- + .../devicetree/bindings/rtc/mstar,msc313-rtc.yaml | 2 +- + .../devicetree/bindings/rtc/nuvoton,nct3018y.yaml | 2 +- + Documentation/devicetree/bindings/rtc/nxp,pcf2127.yaml | 2 +- + Documentation/devicetree/bindings/rtc/rtc-mxc.yaml | 2 +- + Documentation/devicetree/bindings/rtc/rtc-mxc_v2.yaml | 2 +- + Documentation/devicetree/bindings/rtc/sa1100-rtc.yaml | 4 ++-- + Documentation/devicetree/bindings/rtc/st,stm32-rtc.yaml | 2 +- + Documentation/devicetree/bindings/rtc/ti,k3-rtc.yaml | 2 +- + Documentation/devicetree/bindings/rtc/trivial-rtc.yaml | 2 +- + drivers/rtc/Kconfig | 2 +- + drivers/rtc/rtc-88pm80x.c | 5 ++--- + drivers/rtc/rtc-88pm860x.c | 6 ++---- + drivers/rtc/rtc-ab8500.c | 6 ++---- + drivers/rtc/rtc-ac100.c | 6 ++---- + drivers/rtc/rtc-asm9260.c | 5 ++--- + drivers/rtc/rtc-at91sam9.c | 6 ++---- + drivers/rtc/rtc-brcmstb-waketimer.c | 6 ++---- + drivers/rtc/rtc-cadence.c | 6 ++---- + drivers/rtc/rtc-cmos.c | 5 ++--- + drivers/rtc/rtc-cros-ec.c | 6 ++---- + drivers/rtc/rtc-ds1390.c | 2 +- + drivers/rtc/rtc-ds1685.c | 6 ++---- + drivers/rtc/rtc-ftrtc010.c | 6 ++---- + drivers/rtc/rtc-hid-sensor-time.c | 6 ++---- + drivers/rtc/rtc-lpc24xx.c | 6 ++---- + drivers/rtc/rtc-max77686.c | 6 ++---- + drivers/rtc/rtc-mc13xxx.c | 6 ++---- + drivers/rtc/rtc-meson-vrtc.c | 4 ++-- + drivers/rtc/rtc-mpc5121.c | 6 ++---- + drivers/rtc/rtc-mpfs.c | 6 ++---- + drivers/rtc/rtc-mt7622.c | 6 ++---- + drivers/rtc/rtc-mxc_v2.c | 5 ++--- + drivers/rtc/rtc-omap.c | 7 +++---- + drivers/rtc/rtc-palmas.c | 5 ++--- + drivers/rtc/rtc-pcf50633.c | 6 ++---- + drivers/rtc/rtc-pcf8523.c | 17 ++++++++--------- + drivers/rtc/rtc-pic32.c | 6 ++---- + drivers/rtc/rtc-pm8xxx.c | 5 ++--- + drivers/rtc/rtc-rc5t583.c | 5 ++--- + drivers/rtc/rtc-rtd119x.c | 6 ++---- + drivers/rtc/rtc-rzn1.c | 6 ++---- + drivers/rtc/rtc-s3c.c | 6 ++---- + drivers/rtc/rtc-sa1100.c | 6 ++---- + drivers/rtc/rtc-spear.c | 6 ++---- + drivers/rtc/rtc-stm32.c | 6 ++---- + drivers/rtc/rtc-stmp3xxx.c | 8 +++----- + drivers/rtc/rtc-sun6i.c | 2 +- + drivers/rtc/rtc-sunplus.c | 6 ++---- + drivers/rtc/rtc-tegra.c | 6 ++---- + drivers/rtc/rtc-tps6586x.c | 5 ++--- + drivers/rtc/rtc-twl.c | 6 ++---- + drivers/rtc/rtc-vt8500.c | 6 ++---- + drivers/rtc/rtc-wm8350.c | 6 ++---- + drivers/rtc/rtc-xgene.c | 5 ++--- + drivers/rtc/rtc-zynqmp.c | 6 ++---- + 62 files changed, 115 insertions(+), 188 deletions(-) +Merging nvdimm/libnvdimm-for-next (305a72efa791c Merge branch 'for-6.1/nvdimm' into libnvdimm-for-next) +$ 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 +Already up to date. +Merging at24/at24/for-next (fe15c26ee26ef Linux 6.3-rc1) +$ git merge -m Merge branch 'at24/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (942cc9ceccb61 ntb: intel: Remove redundant pci_clear_master) +$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + drivers/ntb/hw/amd/ntb_hw_amd.c | 9 ++++++--- + drivers/ntb/hw/epf/ntb_hw_epf.c | 12 ++++-------- + drivers/ntb/hw/idt/ntb_hw_idt.c | 24 +++++++++++------------- + drivers/ntb/hw/intel/ntb_hw_gen1.c | 9 ++++++--- + drivers/ntb/ntb_transport.c | 2 +- + drivers/ntb/test/ntb_tool.c | 2 ++ + drivers/pci/endpoint/functions/pci-epf-vntb.c | 1 + + 8 files changed, 32 insertions(+), 29 deletions(-) +Merging seccomp/for-next/seccomp (0fb0624b15d21 seccomp: fix kernel-doc function name warning) +$ git merge -m Merge branch 'for-next/seccomp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git seccomp/for-next/seccomp +Already up to date. +Merging fsi/next (35af9fb49bc5c fsi: core: Check error number after calling ida_simple_get) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git fsi/next +Already up to date. +Merging slimbus/for-next (fe15c26ee26ef Linux 6.3-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 (3d1431431ce29 nvmem: layouts: sl28vpd: set varaiable sl28vpd_layout storage-class-specifier to static) +$ 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 include/linux/of_device.h +Auto-merging include/linux/of.h +CONFLICT (content): Merge conflict in include/linux/of.h +Auto-merging drivers/usb/common/ulpi.c +Auto-merging drivers/spi/spi.c +Auto-merging drivers/of/base.c +Auto-merging drivers/of/Makefile +CONFLICT (content): Merge conflict in drivers/of/Makefile +Auto-merging drivers/nvmem/core.c +Auto-merging drivers/i2c/i2c-core-of.c +Auto-merging drivers/gpu/drm/drm_mipi_dsi.c +Auto-merging drivers/acpi/bus.c +Auto-merging MAINTAINERS +Resolved 'drivers/of/Makefile' using previous resolution. +Resolved 'include/linux/of.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 4f9e64cbfd9dc] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git +$ git diff -M --stat --summary HEAD^.. + +Merging xarray/main (69cb69ea55420 ida: Remove assertions that an ID was allocated) +$ git merge -m Merge branch 'main' of git://git.infradead.org/users/willy/xarray.git xarray/main +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 5899 and retry the command. +Merge made by the 'recursive' strategy. + lib/idr.c | 14 ++++---------- + 1 file changed, 4 insertions(+), 10 deletions(-) +Merging hyperv/hyperv-next (a494aef23dfc7 PCI: hv: Replace retarget_msi_interrupt_params with hyperv_pcpu_input_arg) +$ 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 kernel/dma/swiotlb.c +Auto-merging include/linux/swiotlb.h +Auto-merging include/linux/acpi.h +Auto-merging drivers/hv/vmbus_drv.c +Auto-merging arch/x86/include/asm/mshyperv.h +Auto-merging arch/x86/hyperv/ivm.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/bus/microsoft,vmbus.yaml | 54 ++++ + MAINTAINERS | 1 + + arch/x86/hyperv/Makefile | 1 + + arch/x86/hyperv/hv_apic.c | 12 +- + arch/x86/hyperv/hv_init.c | 7 +- + arch/x86/hyperv/hv_vtl.c | 227 +++++++++++++++ + arch/x86/hyperv/ivm.c | 28 -- + arch/x86/hyperv/mmu.c | 11 +- + arch/x86/include/asm/hyperv-tlfs.h | 78 +++++ + arch/x86/include/asm/mshyperv.h | 15 + + arch/x86/include/asm/x86_init.h | 2 + + arch/x86/kernel/cpu/mshyperv.c | 13 +- + arch/x86/kernel/x86_init.c | 4 +- + drivers/clocksource/hyperv_timer.c | 21 +- + drivers/hv/Kconfig | 30 +- + drivers/hv/channel_mgmt.c | 2 +- + drivers/hv/connection.c | 113 ++------ + drivers/hv/hv.c | 79 ++--- + drivers/hv/hv_common.c | 242 +++++++++++++++- + drivers/hv/hyperv_vmbus.h | 6 - + drivers/hv/ring_buffer.c | 62 ++-- + drivers/hv/vmbus_drv.c | 321 ++++++--------------- + drivers/net/hyperv/hyperv_net.h | 2 - + drivers/net/hyperv/netvsc.c | 48 +-- + drivers/pci/controller/pci-hyperv.c | 280 +++++++++++------- + include/asm-generic/hyperv-tlfs.h | 26 ++ + include/asm-generic/mshyperv.h | 24 +- + include/linux/acpi.h | 5 + + include/linux/swiotlb.h | 2 - + kernel/dma/swiotlb.c | 45 +-- + 30 files changed, 1065 insertions(+), 696 deletions(-) + create mode 100644 Documentation/devicetree/bindings/bus/microsoft,vmbus.yaml + create mode 100644 arch/x86/hyperv/hv_vtl.c +Merging auxdisplay/auxdisplay (ddf75a86aba2c auxdisplay: hd44780: Fix potential memory leak in hd44780_remove()) +$ git merge -m Merge branch 'auxdisplay' of https://github.com/ojeda/linux.git auxdisplay/auxdisplay +Already up to date. +Merging kgdb/kgdb/for-next (c1cb81429df46 kdb: Fix the putarea helper function) +$ 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 (fe15c26ee26ef Linux 6.3-rc1) +$ git merge -m Merge branch 'hmm' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git hmm/hmm +Already up to date. +Merging cfi/cfi/next (3123109284176 Linux 5.18-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 (1d1493bdc25f4 bus: mhi: host: Use mhi_tryset_pm_state() for setting fw error state) +$ 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 (34875d6fc52d6 Add tests for memblock_alloc_node()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock/for-next +Merge made by the 'recursive' strategy. + tools/testing/memblock/tests/alloc_nid_api.c | 40 ++++++++++++++++++++++++++++ + 1 file changed, 40 insertions(+) +Merging cxl/next (bfe58458fd255 cxl/mbox: Update CMD_RC_TABLE) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl/next +Auto-merging include/linux/pci.h +Auto-merging drivers/pci/remove.c +Auto-merging drivers/pci/probe.c +Auto-merging drivers/pci/pci.h +Auto-merging .clang-format +CONFLICT (content): Merge conflict in .clang-format +Resolved '.clang-format' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 40fb06faadb77] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git +$ git diff -M --stat --summary HEAD^.. + .clang-format | 1 - + Documentation/ABI/testing/debugfs-cxl | 35 ++++ + Documentation/ABI/testing/sysfs-bus-cxl | 14 ++ + drivers/cxl/core/core.h | 11 ++ + drivers/cxl/core/mbox.c | 150 ++++++++++++++- + drivers/cxl/core/memdev.c | 227 ++++++++++++++++++++++ + drivers/cxl/core/pci.c | 137 +++++-------- + drivers/cxl/core/region.c | 124 ++++++++++++ + drivers/cxl/core/trace.c | 94 +++++++++ + drivers/cxl/core/trace.h | 103 ++++++++++ + drivers/cxl/cxlmem.h | 111 ++++++++++- + drivers/cxl/mem.c | 71 +++++++ + drivers/cxl/pci.c | 53 +----- + drivers/pci/doe.c | 328 ++++++++++++++++++++++++-------- + drivers/pci/pci.h | 11 ++ + drivers/pci/probe.c | 1 + + drivers/pci/remove.c | 1 + + include/linux/pci-doe.h | 66 +------ + include/linux/pci.h | 3 + + include/uapi/linux/cxl_mem.h | 35 +++- + tools/testing/cxl/config_check.c | 1 + + tools/testing/cxl/test/mem.c | 223 ++++++++++++++++++++++ + 22 files changed, 1506 insertions(+), 294 deletions(-) + create mode 100644 Documentation/ABI/testing/debugfs-cxl +Merging zstd/zstd-next (2aa14b1ab2c41 zstd: import usptream v1.5.2) +$ git merge -m Merge branch 'zstd-next' of https://github.com/terrelln/linux.git zstd/zstd-next +Already up to date. +Merging efi/next (026b85796ab4d efi/zboot: arm64: Grab code size from ELF symbol in payload) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next +Merge made by the 'recursive' strategy. + arch/arm64/boot/Makefile | 4 ++ + arch/arm64/kernel/efi-header.S | 71 ++++++++++++++++----------- + arch/arm64/kernel/image-vars.h | 4 ++ + drivers/firmware/efi/libstub/Makefile | 3 +- + drivers/firmware/efi/libstub/Makefile.zboot | 43 ++++++++++------ + drivers/firmware/efi/libstub/arm64.c | 19 ++++--- + drivers/firmware/efi/libstub/efistub.h | 3 +- + drivers/firmware/efi/libstub/loongarch-stub.c | 24 +++------ + drivers/firmware/efi/libstub/zboot-header.S | 51 ++++++++++++------- + drivers/firmware/efi/libstub/zboot.c | 13 ++--- + drivers/firmware/efi/libstub/zboot.lds | 7 +++ + include/linux/pe.h | 4 ++ + 12 files changed, 149 insertions(+), 97 deletions(-) +Merging unicode/for-next (b500d6d7243d2 unicode: Handle memory allocation failures in mkutf8data) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git unicode/for-next +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 7542 and retry the command. +Merge made by the 'recursive' strategy. + fs/unicode/mkutf8data.c | 38 ++++++++++++++++++++++++-------------- + 1 file changed, 24 insertions(+), 14 deletions(-) +Merging slab/for-next (ed4cdfbeb8735 Merge branch 'slab/for-6.4/slob-removal' into slab/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab/for-next +Already up to date. +Merging random/master (512dee0c00ad9 Merge tag 'x86-urgent-2023-01-04' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git random/master +Already up to date. +Merging landlock/next (ed35e2f2f0ded landlock: Clarify documentation for the LANDLOCK_ACCESS_FS_REFER right) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git landlock/next +Already up to date. +Merging rust/rust-next (ea76e08f4d901 rust: ioctl: Add ioctl number manipulation functions) +$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next +Auto-merging rust/Makefile +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + rust/.gitignore | 1 + + rust/Makefile | 28 +- + rust/alloc/vec/mod.rs | 137 +++- + rust/alloc/vec/set_len_on_drop.rs | 30 + + rust/alloc/vec/spec_extend.rs | 174 +++++ + rust/bindings/bindings_helper.h | 2 + + rust/helpers.c | 82 +++ + rust/kernel/error.rs | 137 +++- + rust/kernel/init.rs | 1427 ++++++++++++++++++++++++++++++++++++ + rust/kernel/init/__internal.rs | 235 ++++++ + rust/kernel/init/macros.rs | 971 ++++++++++++++++++++++++ + rust/kernel/ioctl.rs | 72 ++ + rust/kernel/lib.rs | 10 + + rust/kernel/prelude.rs | 8 +- + rust/kernel/sync.rs | 50 ++ + rust/kernel/sync/arc.rs | 108 ++- + rust/kernel/sync/arc/std_vendor.rs | 28 + + rust/kernel/sync/condvar.rs | 174 +++++ + rust/kernel/sync/lock.rs | 191 +++++ + rust/kernel/sync/lock/mutex.rs | 118 +++ + rust/kernel/sync/lock/spinlock.rs | 117 +++ + rust/kernel/sync/locked_by.rs | 156 ++++ + rust/kernel/task.rs | 155 ++++ + rust/kernel/types.rs | 135 ++++ + rust/macros/helpers.rs | 10 +- + rust/macros/lib.rs | 80 ++ + rust/macros/module.rs | 32 +- + rust/macros/pin_data.rs | 79 ++ + rust/macros/pinned_drop.rs | 49 ++ + rust/macros/quote.rs | 143 ++++ + rust/uapi/lib.rs | 27 + + rust/uapi/uapi_helper.h | 9 + + samples/rust/rust_print.rs | 26 + + scripts/Makefile.build | 2 +- + 35 files changed, 4980 insertions(+), 24 deletions(-) + create mode 100644 rust/alloc/vec/set_len_on_drop.rs + create mode 100644 rust/alloc/vec/spec_extend.rs + create mode 100644 rust/kernel/init.rs + create mode 100644 rust/kernel/init/__internal.rs + create mode 100644 rust/kernel/init/macros.rs + create mode 100644 rust/kernel/ioctl.rs + create mode 100644 rust/kernel/sync/arc/std_vendor.rs + create mode 100644 rust/kernel/sync/condvar.rs + create mode 100644 rust/kernel/sync/lock.rs + create mode 100644 rust/kernel/sync/lock/mutex.rs + create mode 100644 rust/kernel/sync/lock/spinlock.rs + create mode 100644 rust/kernel/sync/locked_by.rs + create mode 100644 rust/kernel/task.rs + create mode 100644 rust/macros/pin_data.rs + create mode 100644 rust/macros/pinned_drop.rs + create mode 100644 rust/macros/quote.rs + create mode 100644 rust/uapi/lib.rs + create mode 100644 rust/uapi/uapi_helper.h +$ git am -3 ../patches/0001-rust-fix-up-for-kbuild-move-core-y-and-drivers-y-to-.patch +Applying: rust: fix up for "kbuild: move core-y and drivers-y to ./Kbuild" +Using index info to reconstruct a base tree... +M Kbuild +Falling back to patching base and 3-way merge... +Auto-merging Kbuild +$ git reset HEAD^ +Unstaged changes after reset: +M Kbuild +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master a499bcdeee05d] Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git + Date: Thu Apr 27 15:55:46 2023 +0100 +Merging sysctl/sysctl-next (e3184de9d46c2 fs: fix sysctls.c built) +$ git merge -m Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git sysctl/sysctl-next +Auto-merging security/yama/yama_lsm.c +Auto-merging security/loadpin/loadpin.c +Auto-merging security/apparmor/lsm.c +Auto-merging mm/memory-failure.c +Auto-merging mm/hugetlb.c +Auto-merging mm/compaction.c +Auto-merging include/linux/userfaultfd_k.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/hugetlb.h +Auto-merging fs/userfaultfd.c +Auto-merging fs/proc/proc_sysctl.c +Auto-merging fs/Makefile +Auto-merging drivers/md/md.c +Auto-merging drivers/hv/vmbus_drv.c +CONFLICT (content): Merge conflict in drivers/hv/vmbus_drv.c +Resolved 'drivers/hv/vmbus_drv.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 083b0f2df2a1e] Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git +$ git diff -M --stat --summary HEAD^.. + arch/arm/kernel/isa.c | 18 +------ + arch/csky/abiv1/alignment.c | 15 +----- + arch/ia64/kernel/crash.c | 11 +--- + drivers/md/md.c | 22 +------- + drivers/scsi/scsi_sysctl.c | 16 +----- + drivers/xen/balloon.c | 20 +------ + fs/Makefile | 3 +- + fs/cachefiles/error_inject.c | 11 +--- + fs/coda/sysctl.c | 11 +--- + fs/ntfs/sysctl.c | 12 +---- + fs/proc/proc_sysctl.c | 88 +++++++++++++++++++----------- + fs/userfaultfd.c | 20 ++++++- + fs/xfs/xfs_sysctl.c | 20 +------ + include/linux/compaction.h | 7 --- + include/linux/hugetlb.h | 8 --- + include/linux/mm.h | 2 - + include/linux/userfaultfd_k.h | 2 - + kernel/seccomp.c | 15 +----- + kernel/sysctl.c | 122 ------------------------------------------ + kernel/utsname_sysctl.c | 11 +--- + mm/compaction.c | 80 ++++++++++++++++++++++----- + mm/hugetlb.c | 51 ++++++++++++++++-- + mm/memory-failure.c | 36 ++++++++++++- + security/apparmor/lsm.c | 8 +-- + security/loadpin/loadpin.c | 8 +-- + security/yama/yama_lsm.c | 8 +-- + 26 files changed, 243 insertions(+), 382 deletions(-) +Merging execve/for-next/execve (88603b6dc4194 Linux 6.2-rc2) +$ 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 +Already up to date. +Merging bitmap/bitmap-for-next (714f3af11b21b cpumask: fix function description kernel-doc notation) +$ git merge -m Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git bitmap/bitmap-for-next +Auto-merging include/linux/find.h +Auto-merging include/linux/cpumask.h +CONFLICT (content): Merge conflict in include/linux/cpumask.h +Resolved 'include/linux/cpumask.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 044d01e68e28d] Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git +$ git diff -M --stat --summary HEAD^.. + include/linux/bitmap.h | 54 +++++++++--------- + include/linux/cpumask.h | 140 +++++++++++++++++++++++------------------------ + include/linux/find.h | 40 +++++++------- + include/linux/nodemask.h | 88 ++++++++++++++--------------- + lib/bitmap.c | 2 +- + lib/cpumask.c | 2 +- + lib/test_bitmap.c | 18 +++++- + 7 files changed, 177 insertions(+), 167 deletions(-) +Merging hte/for-next (ca3d1a4b419ac hte: tegra-194: Use proper includes) + 902dea62b3dda ("hte: Use of_property_present() for testing DT property presence") +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git hte/for-next +Auto-merging drivers/hte/hte.c +Auto-merging drivers/hte/hte-tegra194-test.c +Auto-merging arch/arm64/boot/dts/nvidia/tegra234.dtsi +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/timestamp/nvidia,tegra194-hte.yaml | 66 +++++++- + Documentation/driver-api/hte/index.rst | 2 +- + .../hte/{tegra194-hte.rst => tegra-hte.rst} | 33 ++-- + MAINTAINERS | 3 + + arch/arm64/boot/dts/nvidia/tegra234.dtsi | 17 +++ + drivers/gpio/gpio-tegra186.c | 1 + + drivers/hte/hte-tegra194-test.c | 2 +- + drivers/hte/hte-tegra194.c | 169 +++++++++++++++++++-- + drivers/hte/hte.c | 2 +- + 9 files changed, 254 insertions(+), 41 deletions(-) + rename Documentation/driver-api/hte/{tegra194-hte.rst => tegra-hte.rst} (50%) +Merging kspp/for-next/kspp (78f7a3fd6dc66 randstruct: disable Clang 15 support) +$ 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 +Already up to date. +$ git am -3 ../patches/0001-fix-up-for-dm-Add-verity-helpers-for-LoadPin.patch +Applying: fix up for "dm: Add verity helpers for LoadPin" +Using index info to reconstruct a base tree... +M drivers/md/dm-verity-loadpin.c +Falling back to patching base and 3-way merge... +Auto-merging drivers/md/dm-verity-loadpin.c +No changes -- Patch already applied. +Merging kspp-gustavo/for-next/kspp (00168b415a60c uapi: net: ipv6: Replace fake flex-array with flex-array member) +$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git kspp-gustavo/for-next/kspp +Already up to date. +Merging iommufd/for-next (62e37c86bf071 iommufd/selftest: Cover domain unmap with huge pages and access) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd/for-next +Auto-merging samples/vfio-mdev/mtty.c +Auto-merging samples/vfio-mdev/mdpy.c +Auto-merging samples/vfio-mdev/mbochs.c +Auto-merging include/linux/vfio.h +Auto-merging drivers/vfio/vfio_main.c +Merge made by the 'recursive' strategy. + drivers/iommu/iommufd/device.c | 205 +++++++++------------ + drivers/iommu/iommufd/hw_pagetable.c | 70 ++++++-- + drivers/iommu/iommufd/ioas.c | 14 +- + drivers/iommu/iommufd/iommufd_private.h | 39 +++- + drivers/iommu/iommufd/iommufd_test.h | 2 +- + drivers/iommu/iommufd/selftest.c | 219 +++++++++++++++++++---- + drivers/iommu/iommufd/vfio_compat.c | 2 +- + drivers/vfio/iommufd.c | 37 ++-- + drivers/vfio/vfio_main.c | 5 +- + include/linux/iommufd.h | 5 +- + include/linux/vfio.h | 1 - + samples/vfio-mdev/mbochs.c | 3 + + samples/vfio-mdev/mdpy.c | 3 + + samples/vfio-mdev/mtty.c | 3 + + tools/testing/selftests/iommu/iommufd.c | 104 +++++++---- + tools/testing/selftests/iommu/iommufd_fail_nth.c | 38 ++-- + tools/testing/selftests/iommu/iommufd_utils.h | 16 +- + 17 files changed, 494 insertions(+), 272 deletions(-) diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..4ea629f2de9a --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20230427 |