diff options
| author | Mark Brown <broonie@kernel.org> | 2023-05-04 22:58:01 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-05-04 22:58:01 +0900 |
| commit | 145e5cddfe8b4bf607510b2dcf630d95f4db420f (patch) | |
| tree | 0d8e905f5bf9414b6786a79f76094300070fd5ad | |
| parent | 11d23e73319f9deba3214c8a81bb22257f332cfb (diff) | |
Add linux-next specific files for 20230504next-20230504
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 | 5900 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 6623 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..ddb8c6780955 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,360 @@ +Name SHA1 +---- ---- +origin 1a5304fecee523060f26e2778d9d8e33c0562df3 +fixes 1c23f9e627a7b412978b4e852793c5e3c3efc555 +mm-hotfixes 3195e7d9b9e3ff4f98585feac5516f10988e28b9 +kbuild-current 58390c8ce1bddb6c623f62e7ed36383e7fa5c02f +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 b9850ec0027ca7639141706101bce09b8e3224e6 +bpf 415d7a49cd796a11cfbeaa360b13721bba5117bb +ipsec 5fc46f94219d1d103ffb5f0832be9da674d85a73 +netfilter 7fb0269720d7d5359bc8349eef908a1c96866b65 +ipvs fb7cba61919ada54d088870dd173c61b6b372873 +wireless 50749f2dd6854a41830996ad302aef2ffaf011d8 +wpan bd4e3d82f4ccb422672029b099e402e5b3acd5ee +rdma-fixes aca3b0fa3d04b40c96934d86cc224cccfa7ea8e0 +sound-current 0d727e1856ef22dd9337199430258cb64cbbc658 +sound-asoc-fixes 9a92ef41d6c52c0b8c83dcd613ad2107d2d3a962 +regmap-fixes eeac8ede17557680855031c6f305ece2378af326 +regulator-fixes adc480392d1f11b0868ac482e5d0af8f21106d2f +spi-fixes cb1499966178ee8987dfba8258ba67c062186b2d +pci-current 34b62f186db9614e55d021f8c58d22fc44c57911 +driver-core.current 33afd4b76393627477e878b3b195d606e585d816 +tty.current 33afd4b76393627477e878b3b195d606e585d816 +usb.current 33afd4b76393627477e878b3b195d606e585d816 +usb-serial-fixes 09a9639e56c01c7a00d6c0ca63f4c7c41abe075d +phy fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +staging.current 33afd4b76393627477e878b3b195d606e585d816 +iio-fixes 7fcbd72176076c44b47e8f68f0223c02c411f420 +counter-current 6a8f57ae2eb07ab39a6f0ccad60c760743051026 +char-misc.current 33afd4b76393627477e878b3b195d606e585d816 +soundwire-fixes fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +thunderbolt-fixes 457391b0380335d5e9a5babdec90ac53928b23b4 +input-current 529de2f1ca3f0898c0d905b7d355a43dce1de7dc +crypto-current b8969a1b69672b163d057e7745ebc915df689211 +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 f8aaf4b16366ab6a735f35923b50a6aeba66ab8c +vfs-fixes 609d54441493c99f21c1823dfd66fa7f4c512ff4 +dma-mapping-fixes bbb73a103fbbed6f63cb738d3783261c4241b4b2 +drivers-x86-fixes 9a469c6dfab38326f99f105386db84230be09ee3 +samsung-krzk-fixes fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +pinctrl-samsung-fixes fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +devicetree-fixes b413281876292de44ae84e9a9ce9d62e47f266e9 +dt-krzk-fixes fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +scsi-fixes c8e22b7a1694bb8d025ea636816472739d859145 +drm-fixes 00a4bd000e78a3a898e60bdc13e2852c8044a38c +drm-intel-fixes 457391b0380335d5e9a5babdec90ac53928b23b4 +mmc-fixes 4eb0e7873c7159298799aabbd0f29b48689a73f0 +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 33afd4b76393627477e878b3b195d606e585d816 +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 29cd2927fb914cc53b5ba4f67d2b74695c994ba4 +irqchip-fixes 6c9f7434159b96231f5b27ab938f4766e3586b48 +renesas-fixes ab2866f12ca18747413ba41409231d44e0c6149b +broadcom-fixes 9abf2313adc1ca1b6180c508c25f22f9395cc780 +perf-current 1f85d016768ff19f060f3cce014a43c761de8259 +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 a26cc2934331b57b5a7164bff344f0a2ec245fc0 +mm-stable 245f0922689364b21163af4937a05ea0ba576fae +mm-nonmm-stable 22b8cc3e78f5448b4c5df00303817a9137cd663f +mm bb9a1a223096ba8d1a2445c615f0d7e92c0bcc1f +kbuild 58390c8ce1bddb6c623f62e7ed36383e7fa5c02f +clang-format 781121a7f6d11d7cae44982f174ea82adeec7db0 +perf 5d27a645f60940fdf589e4ff5351506a7f0fdbaa +compiler-attributes eeac8ede17557680855031c6f305ece2378af326 +dma-mapping ec274aff21b6a94c7973384ca80a503c1bc3b173 +asm-generic 5e98654e30e18bb33d21b773b75fd68fcf673bae +arc f2906aa863381afb0015a9eb7fefad885d4e5a56 +arm 60261442c1b91d9e0cdc611222034286aeb18946 +arm64 0fddb79bf283a561eb81f09d01f5ac8f61bf8966 +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 3bd27ce7a013ce59cab6543f8ea9bef25ef553e0 +stm32 49f1d0b65f87692a11386a8b8cd3a4aa3a1d0daa +sunxi 7081db38231a48b1ff590d9d16dfa06c1f8d148f +tee cf1773f935d8f32938ede6a4fdf54c75dd7d534a +tegra 7947eeb21f00599b19b4fcf9c280c71f3b4a2c12 +ti a8fccb83f3e25d2412c6a6557b146ac9a6dce770 +xilinx ec1696c3440f1abb40f87ef998405515464188af +clk 31c6ed4e89187beef8fe2f979c8881ca94839427 +clk-imx 8a05f5cccdbe851265bf513643ada48c26b1267f +clk-renesas 5e96c2e0e88d3617477313b071cf199bfc29d794 +clk-samsung b35f27fe73d8c86fe40125e063b28007e961b862 +csky 1f62ed00a56bf01becaccd81bf30f2fcb0322fd2 +loongarch 2fa5ebe3bc4e31e07a99196455498472417842f2 +m68k aaee8c7f2a17d2dd015dc97c113c9ea0cc97272a +m68knommu 8ab89e9563161921ffc86724eb3217d228eaad57 +microblaze fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +mips 46e614cc91f7bd6f7872e434e6bcfda44454aac3 +openrisc c91b4a07655d5ba67962a08dfac8bd7f45ad049c +parisc-hd 6e3220ba3323a2c24be834aebf5d6e9f89d0993f +powerpc 169f8997968ab620d750d9a45e15c5288d498356 +soc-fsl 4b0986a3613c92f4ec1bdc7f60ec66fea135991f +risc-v c2d3c8441e3ddbfe41fea9282ddc6ee372e154cd +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 d795a8796940c7fe89624f975440c5de321def52 +ceph db2993a423e3fd0e4878f4d3ac66fe717f5f072e +cifs 1d624ebb9c2c46865e7692b47ae069fe85adde3e +configfs 77992f896745c63ae64bfccfdc429ab7b3d88da5 +ecryptfs a3d78fe3e1ae8c6a1901635c54a1a799656f72c8 +erofs 745ed7d77834048879bf24088c94e5a6462b613f +exfat fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +ext3 915f8bcf453030f4d6e271a76bb4f28697a668bc +ext4 d4fab7b28e2f5d74790d47a8d298da0abfb5132f +f2fs b68ee1c6131c540a62ecd443be89c406401df091 +fsverity 04839139213cf60d4c5fc792214a08830e294ff8 +fuse c68ea140050e631d24d61b6e399ca8224a4a2219 +gfs2 644f6bf762fa903f64c59c2ec0f4d0d753527053 +jfs fad376fce0af58deebc5075b8539dc05bf639af3 +ksmbd eb307d09fe15844fdaebeb8cc8c9b9e925430aa5 +nfs e8d018dd0257f744ca50a729e3d042cf2ec9da65 +nfs-anna fbd2a05f29a95d5b42b294bf47e55a711424965b +nfsd 58390c8ce1bddb6c623f62e7ed36383e7fa5c02f +ntfs3 788ee1605c2e9feed39c3a749fb3e47c6e15c1b9 +orangefs 31720a2b109b3080eb77e97b8f6f50a27b4ae599 +overlayfs 4f11ada10d0ad3fd53e2bd67806351de63a4f9c3 +ubifs b5fda08ef213352ac2df7447611eb4d383cce929 +v9fs 4ec5183ec48656cec489c49f989c508b68b518e3 +v9fs-ericvh 21e26d5e54ab7cfe6b488fd27d4d70956d07e03b +xfs 9419092fb2630c30e4ffeb9ef61007ef0c61827a +zonefs 2b188a2cfc4d8f319ad23832ec1390bdae52daf6 +iomap 3fd41721cd5c30af37c860e6201c98db0a568fd2 +djw-vfs a79168a0c00d710420c1758f6c38df89e12f0763 +file-locks 63355b9884b3d1677de6bd1517cd2b8a9bf53978 +iversion 63355b9884b3d1677de6bd1517cd2b8a9bf53978 +vfs cff4b23c731a1cbdf39d5ce180196b8dffb6c411 +printk 16bff6f075a1055a0084c8a05fd4a0c4ab4b3607 +pci 34b62f186db9614e55d021f8c58d22fc44c57911 +pstore 5239a89b06d6b199f133bf0ffea421683187f257 +hid d777b19c63562199b640fd5129e7916a5b7cd240 +i2c 03230ddddf9de50caab7d15d72c510a9009680ea +i3c 6b496a94c5905fca7879bc0dc438a47de40b7d4f +dmi 13a0ac816d22aa47d6c393f14a99f39e49b960df +hwmon-staging 1c19ac768b8eeb0304c4ed7db66c2bb89c6ad226 +jc_docs 37c95f3a3d251a9319ed137ee0adf5ab9e431ce2 +v4l-dvb 20af6be6bee4c3af80aac9b44b3d32d89824dde7 +v4l-dvb-next 423f331364bfbcd1212b78ac9052894ff5213ac9 +pm ca99a450af857e8d9f1002857db125e22dd853db +cpufreq-arm cde3bb62bf56f34781c3a0e062630f1b7fe6d8c2 +cpupower 9f8acaf033b38f9b0784ae9bfaae2230114fe680 +devfreq 376b1446153ca67e7028e6b9555d9b17477f568b +opp 528f2d8d540a3c374d6b765c769620d91536b176 +thermal 2afa82d1fc648c8d4c2ef9e876626abb1089f9ab +dlm 7a40f1f18a88c6d43c8725d7f45146480a79fde1 +rdma 531094dc7164718d28ebb581d729807d7e846363 +net-next 042334a8d424a1917e916e611a8dda7f8caf1491 +bpf-next 6e98b09da931a00bf4e0477d0fa52748bf28fcce +ipsec-next f4796398f21b9844017a2dac883b1dd6ad6edd60 +mlx5-next 77f7eb9f3416aace703971156133926e44e2195b +netfilter-next 677fb7525331375ba2f90f4bc94a80b9b6e697a3 +ipvs-next 4774ad841bef97cc51df90195338c5b2573dd4cb +bluetooth e6e576ec4e728b201a801374b0cec649a4473908 +wireless-next 3288ee5844b74cebb94ed15bc9b5b9d3223ae038 +wpan-next 1af3de62f03f651c5e50c0e00f8fed34d07b9df3 +mtd 7227aacb62aeb59b007a6d3489b11f78fa332696 +nand ec185b18c22323cb0cde0319fa90b3e467b1ed2d +spi-nor df6def86b9dcbc3e8ed4964c7b79b70c9b0c3040 +crypto 482c84e906e535072c55395acabd3a58e9443d12 +drm cf03e2956af307dc25e8c41fd4cffe44482a6ec1 +drm-misc cf03e2956af307dc25e8c41fd4cffe44482a6ec1 +amdgpu 053a86bc3d2dd7e3ac357dea98f9146fa6787776 +drm-intel 9470bbb53f04788bcc9da7cd3461597e97fb7393 +drm-tegra 2429b3c529da29d4277d519bd66d034842dcd70c +drm-msm ac7e7c9c65ecfb1fcc99de91cfd6b17a8d4cb9c1 +drm-msm-lumag ac7e7c9c65ecfb1fcc99de91cfd6b17a8d4cb9c1 +imx-drm 927d8fd465adbaaad6cce82f840d489d7c378f29 +etnaviv 4c22c61e429f004d84eba72d7195bccef33ea0ec +fbdev 457391b0380335d5e9a5babdec90ac53928b23b4 +regmap 4a670ac3e75e517c96cbd01ef870dbd598c3ce71 +sound 0d727e1856ef22dd9337199430258cb64cbbc658 +ieee1394 02dc51a0a07a379539b4661ecb56eeb5b19b3928 +sound-asoc 9a92ef41d6c52c0b8c83dcd613ad2107d2d3a962 +modules 0b891c83d8c54cb70e186456c2191adb5fd98c56 +input 3516fa162a01f6611c3c129ce9529bdc720d36b7 +block 7d3e462a941ece63c640dfa08be36c983de27b6f +device-mapper 38d11da522aacaa05898c734a1cec86f1e611129 +libata 140b26035b2d379d94e6e3936ab2e0adf94efe46 +pcmcia 15e74c6c1ce2d388e967f32cdaa83ca034fa6452 +mmc 4eb0e7873c7159298799aabbd0f29b48689a73f0 +mfd 9e9ff39243ea8795a4833708613f884b39dc91f9 +backlight fb200218b40b7864f64f1a47de61e035d8934e92 +battery baba1315a74d12772d4940a05d58dc03e6ec0635 +regulator adc480392d1f11b0868ac482e5d0af8f21106d2f +security d82dcd9e21b77d338dc4875f3d4111f0db314a7c +apparmor 0bb84cff96af29d8531a1a2bee04e521cdfe35ce +integrity 644f17412f5acf01a19af9d04a921937a2bc86c6 +safesetid 64b634830c919979de4b18163e15d30df66e64a8 +selinux 4ce1f694eb5d8ca607fed8542d32a33b4f1217a5 +smack de93e515db306767549bb29a926f523ca2a601ab +tomoyo 15feaa096c2347b5833cb6cb576ee3f6c34bfc09 +tpmdd 7c1a4441ddf1aeba8ad4c411478eac37abcacc55 +watchdog 10f67d1fd275528e62109de2ece26371833638e5 +iommu e51b4198396cd715b140c0e8b259680429ff0cfb +audit fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +devicetree c50eb01940c75b848e0257cea3b521a6d4150c5d +dt-krzk 936f3b6478b7b044b3ac870bc125faa8a82d3c3b +mailbox d396133dced4cbaa52581d0e9c4aea8e04b8db10 +spi cb1499966178ee8987dfba8258ba67c062186b2d +tip da1c4f07aa4dd227a57103fef1215e7cef3f35a9 +clockevents 62a9488edfd7be490102ac6e5be3e8fcd7b0bde8 +edac d6c5e688899b09dc8c17c665c403cdc23de220f3 +irqchip 2ff1b0839ddd514be4752c64c1c6facf91ff3a56 +ftrace 3862f86c1529fa0016de6344eb974877b4cd3838 +rcu 523c1335f23e46be1df402cced7f62fb8fb9a480 +kvm b3c98052d46948a8d65d2778c7f306ff38366aac +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 8325642d2757eba80210dec727bb0bcffb837ff1 +ipmi d08076678ce72140a40553d226f90d189fbe06d1 +driver-core 33afd4b76393627477e878b3b195d606e585d816 +usb 33afd4b76393627477e878b3b195d606e585d816 +thunderbolt 1f15af76784cc902a1fe85e864c7ddf3d74b4130 +usb-serial a095edfc15f0832e046ae23964e249ef5c95af87 +tty 33afd4b76393627477e878b3b195d606e585d816 +char-misc 33afd4b76393627477e878b3b195d606e585d816 +accel afa351a15d80993f8ba6ae28652cc23127237e37 +coresight 18996a113f2567aef3057e300e3193ce2df1684c +fpga fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +icc b7590f3841f47d5c6732db9a6d6474162109f487 +iio 52cc189b4fc6af6accc45fe7b7053d76d8724059 +phy-next a0106132372120dd0abf5ad7636614e5aeb5da08 +soundwire 67572c8dc64412880b81d4bbc2f354dd5eddaa7d +extcon 4e30418def07f8359c7927d5815788043afbb482 +gnss 1b929c02afd37871d5afb9d498426f83432e71c2 +vfio 705b004ee377b789e39ae237519bab714297ac83 +staging 33afd4b76393627477e878b3b195d606e585d816 +counter-next cf3600f2913605052a37ef3e9917046ae13c41f9 +mux ea327624ae52936b2c0eccffd9369983ca2d08e3 +dmaengine f2dc327131b5cbb2cbb467cec23836f2e9d4cf46 +cgroup 5199604d1ee5513e1357e8cfe7243a36129b4ffb +scsi d1316c7b9ec3683c4ca531234998c0e5b9e9447c +scsi-mkp c5749639f2d0a1f6cbe187d05f70c2e7c544d748 +vhost bc31caabba78fa910b6e9bb5977539dd19857e17 +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 e99ab4abebf825de2ce65f6c6c32ee30e00bb077 +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 0199849acd07d07e2a8e42757653ca8b14a122f5 +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..9827da5f0862 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,5900 @@ +$ date -R +Thu, 04 May 2023 21:02:12 +0900 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 33afd4b763936 Merge tag 'mm-nonmm-stable-2023-04-27-16-01' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm +Merging origin/master (1a5304fecee52 Merge tag 'parisc-for-6.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating 33afd4b763936..1a5304fecee52 +Fast-forward (no commit created; -m option ignored) + .clang-format | 1 - + Documentation/ABI/stable/sysfs-driver-dma-idxd | 51 + + Documentation/ABI/testing/debugfs-cxl | 35 + + Documentation/ABI/testing/sysfs-bus-counter | 32 + + Documentation/ABI/testing/sysfs-bus-cxl | 14 + + .../ABI/testing/sysfs-kernel-iommu_groups | 1 - + Documentation/accounting/psi.rst | 4 + + Documentation/admin-guide/cgroup-v1/cpusets.rst | 2 +- + Documentation/admin-guide/kernel-parameters.txt | 22 +- + Documentation/admin-guide/xfs.rst | 7 +- + Documentation/arch/x86/sva.rst | 2 +- + Documentation/arch/x86/xstate.rst | 100 + + Documentation/bpf/prog_lsm.rst | 2 +- + .../devicetree/bindings/arm/msm/qcom,kpss-acc.txt | 49 - + .../devicetree/bindings/arm/msm/qcom,kpss-gcc.txt | 44 - + .../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/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 + + .../devicetree/bindings/clock/renesas,9series.yaml | 6 + + .../bindings/clock/skyworks,si521xx.yaml | 59 + + .../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 +- + .../devicetree/bindings/gpio/nxp,pcf8575.yaml | 4 + + .../bindings/i3c/aspeed,ast2600-i3c.yaml | 72 + + .../bindings/input/google,cros-ec-keyb.yaml | 2 +- + .../devicetree/bindings/input/pwm-beeper.txt | 24 - + .../devicetree/bindings/input/pwm-beeper.yaml | 41 + + .../devicetree/bindings/iommu/arm,smmu.yaml | 45 +- + .../bindings/iommu/renesas,ipmmu-vmsa.yaml | 32 +- + 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 + + .../bindings/mailbox/qcom,apcs-kpss-global.yaml | 9 +- + .../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 - + .../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/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 +- + .../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,ipq5332-tlmm.yaml | 11 +- + .../bindings/pinctrl/qcom,ipq6018-pinctrl.yaml | 10 +- + .../bindings/pinctrl/qcom,ipq8074-pinctrl.yaml | 11 +- + .../bindings/pinctrl/qcom,ipq9574-tlmm.yaml | 130 + + .../bindings/pinctrl/qcom,mdm9607-tlmm.yaml | 11 +- + .../bindings/pinctrl/qcom,mdm9615-pinctrl.yaml | 11 +- + .../bindings/pinctrl/qcom,msm8226-pinctrl.yaml | 11 +- + .../bindings/pinctrl/qcom,msm8660-pinctrl.yaml | 12 +- + .../bindings/pinctrl/qcom,msm8909-tlmm.yaml | 11 +- + .../bindings/pinctrl/qcom,msm8916-pinctrl.yaml | 11 +- + .../bindings/pinctrl/qcom,msm8953-pinctrl.yaml | 10 +- + .../bindings/pinctrl/qcom,msm8960-pinctrl.yaml | 11 +- + .../bindings/pinctrl/qcom,msm8974-pinctrl.yaml | 11 +- + .../bindings/pinctrl/qcom,msm8976-pinctrl.yaml | 11 +- + .../bindings/pinctrl/qcom,msm8994-pinctrl.yaml | 11 +- + .../bindings/pinctrl/qcom,msm8996-pinctrl.yaml | 11 +- + .../bindings/pinctrl/qcom,msm8998-pinctrl.yaml | 11 +- + .../bindings/pinctrl/qcom,pmic-gpio.yaml | 9 +- + .../devicetree/bindings/pinctrl/qcom,pmic-mpp.yaml | 4 +- + .../bindings/pinctrl/qcom,qcm2290-tlmm.yaml | 1 + + .../bindings/pinctrl/qcom,qcs404-pinctrl.yaml | 11 +- + .../bindings/pinctrl/qcom,qdu1000-tlmm.yaml | 11 +- + .../bindings/pinctrl/qcom,sa8775p-tlmm.yaml | 11 +- + .../bindings/pinctrl/qcom,sc7180-pinctrl.yaml | 11 +- + .../pinctrl/qcom,sc7280-lpass-lpi-pinctrl.yaml | 2 +- + .../bindings/pinctrl/qcom,sc7280-pinctrl.yaml | 12 +- + .../bindings/pinctrl/qcom,sc8180x-tlmm.yaml | 11 +- + .../pinctrl/qcom,sc8280xp-lpass-lpi-pinctrl.yaml | 2 +- + .../bindings/pinctrl/qcom,sc8280xp-tlmm.yaml | 1 + + .../bindings/pinctrl/qcom,sdm630-pinctrl.yaml | 11 +- + .../bindings/pinctrl/qcom,sdm670-tlmm.yaml | 12 +- + .../bindings/pinctrl/qcom,sdm845-pinctrl.yaml | 11 +- + .../bindings/pinctrl/qcom,sdx55-pinctrl.yaml | 10 +- + .../bindings/pinctrl/qcom,sdx65-tlmm.yaml | 10 +- + .../bindings/pinctrl/qcom,sm6115-tlmm.yaml | 10 +- + .../bindings/pinctrl/qcom,sm6125-tlmm.yaml | 11 +- + .../bindings/pinctrl/qcom,sm6350-tlmm.yaml | 12 +- + .../bindings/pinctrl/qcom,sm6375-tlmm.yaml | 12 +- + .../bindings/pinctrl/qcom,sm7150-tlmm.yaml | 162 + + .../bindings/pinctrl/qcom,sm8150-pinctrl.yaml | 13 +- + .../pinctrl/qcom,sm8250-lpass-lpi-pinctrl.yaml | 2 +- + .../bindings/pinctrl/qcom,sm8250-pinctrl.yaml | 11 +- + .../bindings/pinctrl/qcom,sm8350-tlmm.yaml | 13 +- + .../pinctrl/qcom,sm8450-lpass-lpi-pinctrl.yaml | 2 +- + .../bindings/pinctrl/qcom,sm8450-tlmm.yaml | 11 +- + .../pinctrl/qcom,sm8550-lpass-lpi-pinctrl.yaml | 2 +- + .../bindings/pinctrl/qcom,sm8550-tlmm.yaml | 11 +- + .../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 +- + .../bindings/power/qcom,kpss-acc-v2.yaml | 42 + + .../bindings/power/supply/adc-battery.yaml | 70 + + .../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/devicetree/bindings/riscv/cpus.yaml | 6 + + .../bindings/rtc/allwinner,sun4i-a10-rtc.yaml | 2 +- + .../bindings/rtc/allwinner,sun6i-a31-rtc.yaml | 2 +- + .../bindings/rtc/atmel,at91rm9200-rtc.yaml | 2 +- + .../bindings/rtc/atmel,at91sam9260-rtt.yaml | 2 +- + .../bindings/rtc/brcm,brcmstb-waketimer.yaml | 2 +- + .../devicetree/bindings/rtc/faraday,ftrtc010.yaml | 4 +- + .../bindings/rtc/microcrystal,rv3032.yaml | 2 +- + .../devicetree/bindings/rtc/mstar,msc313-rtc.yaml | 2 +- + .../devicetree/bindings/rtc/nuvoton,nct3018y.yaml | 2 +- + .../devicetree/bindings/rtc/nxp,pcf2127.yaml | 2 +- + Documentation/devicetree/bindings/rtc/rtc-mxc.yaml | 2 +- + .../devicetree/bindings/rtc/rtc-mxc_v2.yaml | 2 +- + .../devicetree/bindings/rtc/sa1100-rtc.yaml | 4 +- + .../devicetree/bindings/rtc/st,stm32-rtc.yaml | 2 +- + .../devicetree/bindings/rtc/ti,k3-rtc.yaml | 2 +- + .../devicetree/bindings/rtc/trivial-rtc.yaml | 2 +- + .../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 +- + .../devicetree/bindings/timer/renesas,rz-mtu3.yaml | 302 + + .../bindings/timer/rockchip,rk-timer.yaml | 2 +- + .../bindings/timestamp/nvidia,tegra194-hte.yaml | 66 +- + Documentation/driver-api/hte/index.rst | 2 +- + .../hte/{tegra194-hte.rst => tegra-hte.rst} | 33 +- + Documentation/driver-api/pwm.rst | 13 +- + .../sched/membarrier-sync-core/arch-support.txt | 4 +- + Documentation/filesystems/index.rst | 1 + + Documentation/filesystems/ntfs3.rst | 11 - + .../filesystems/xfs-online-fsck-design.rst | 5315 ++++++++++++++ + .../filesystems/xfs-self-describing-metadata.rst | 1 + + Documentation/kbuild/kbuild.rst | 1 + + Documentation/leds/index.rst | 1 + + Documentation/leds/leds-mt6370-rgb.rst | 64 + + Documentation/leds/ledtrig-oneshot.rst | 2 +- + Documentation/livepatch/reliable-stacktrace.rst | 2 +- + Documentation/riscv/hwprobe.rst | 86 + + Documentation/riscv/index.rst | 1 + + Documentation/security/lsm-development.rst | 6 +- + Documentation/security/lsm.rst | 2 +- + Documentation/tools/rtla/common_timerlat_aa.rst | 7 + + Documentation/trace/fprobe.rst | 16 +- + Documentation/trace/ftrace.rst | 6 + + Documentation/trace/user_events.rst | 167 +- + Documentation/virt/kvm/api.rst | 75 +- + Documentation/virt/kvm/devices/vfio.rst | 5 + + Documentation/virt/kvm/devices/vm.rst | 79 + + Documentation/virt/kvm/locking.rst | 2 +- + MAINTAINERS | 111 +- + Makefile | 3 +- + arch/alpha/kernel/process.c | 4 +- + arch/alpha/kernel/smp.c | 2 +- + arch/arc/kernel/smp.c | 2 +- + arch/arm/kernel/smp.c | 9 +- + arch/arm/mach-actions/platsmp.c | 2 + + arch/arm/mach-pxa/spitz.c | 1 + + arch/arm64/boot/Makefile | 4 + + arch/arm64/boot/dts/mediatek/mt8186.dtsi | 1 + + arch/arm64/boot/dts/mediatek/mt8195.dtsi | 4 +- + arch/arm64/boot/dts/nvidia/tegra234.dtsi | 17 + + arch/arm64/include/asm/exception.h | 4 +- + arch/arm64/include/asm/kvm_host.h | 29 +- + arch/arm64/include/asm/kvm_mmu.h | 4 + + arch/arm64/include/asm/mmu_context.h | 6 + + arch/arm64/include/asm/smp.h | 9 +- + arch/arm64/include/asm/sysreg.h | 3 + + arch/arm64/include/uapi/asm/kvm.h | 36 + + arch/arm64/kernel/cpufeature.c | 11 + + arch/arm64/kernel/efi-header.S | 71 +- + arch/arm64/kernel/entry-common.c | 2 +- + arch/arm64/kernel/image-vars.h | 4 + + arch/arm64/kernel/process.c | 2 +- + arch/arm64/kernel/smp.c | 15 +- + arch/arm64/kernel/traps.c | 3 +- + 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/csky/kernel/smp.c | 6 +- + arch/hexagon/kernel/smp.c | 2 +- + arch/ia64/kernel/process.c | 6 +- + arch/ia64/kernel/smp.c | 4 +- + arch/loongarch/include/asm/smp.h | 2 +- + arch/loongarch/kernel/process.c | 2 +- + arch/loongarch/kernel/smp.c | 6 +- + arch/m68k/Kconfig.machine | 17 - + arch/mips/cavium-octeon/smp.c | 1 + + arch/mips/include/asm/kvm_host.h | 2 +- + arch/mips/include/asm/mach-loongson32/platform.h | 1 - + 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/kvm/mips.c | 4 +- + arch/mips/kvm/vz.c | 2 +- + arch/mips/loongson32/common/time.c | 3 +- + arch/mips/loongson64/smp.c | 2 + + 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/smp.c | 2 +- + arch/openrisc/kernel/traps.c | 27 +- + 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/process.c | 2 +- + arch/parisc/kernel/real2.S | 5 +- + arch/parisc/kernel/smp.c | 4 +- + arch/parisc/kernel/sys_parisc.c | 166 +- + arch/powerpc/Kconfig | 22 +- + 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/powernv_defconfig | 1 + + 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 | 78 +- + 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/smp.h | 2 +- + 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/setup_64.c | 2 +- + arch/powerpc/kernel/smp.c | 8 +- + 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 | 40 +- + arch/powerpc/kvm/book3s_64_mmu_radix.c | 13 +- + arch/powerpc/kvm/book3s_64_vio.c | 4 +- + arch/powerpc/kvm/book3s_hv.c | 56 +- + 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 | 30 +- + 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 | 13 +- + 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/powernv/subcore.c | 2 + + 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/tools/relocs_check.sh | 18 +- + arch/powerpc/xmon/xmon.c | 2 + + arch/riscv/Kconfig | 80 +- + 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-hotplug.c | 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/smp.c | 4 +- + 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/kvm/vm.c | 3 +- + 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 | 206 +- + 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 + + 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/idle.c | 2 +- + 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 | 13 +- + 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/kvm/interrupt.c | 4 +- + arch/s390/kvm/kvm-s390.c | 7 +- + arch/s390/kvm/pci.c | 2 +- + arch/s390/kvm/vsie.c | 50 +- + 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 +- + arch/sh/include/asm/smp-ops.h | 5 +- + arch/sh/kernel/idle.c | 3 +- + arch/sh/kernel/smp.c | 2 +- + arch/sparc/Makefile | 15 +- + arch/sparc/include/asm/mmu_context_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/smp_32.c | 2 +- + arch/sparc/kernel/smp_64.c | 2 +- + 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/Kconfig | 11 + + 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/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/cpufeatures.h | 10 +- + arch/x86/include/asm/disabled-features.h | 8 +- + arch/x86/include/asm/intel-mid.h | 21 - + arch/x86/include/asm/kvm-x86-ops.h | 6 +- + arch/x86/include/asm/kvm_host.h | 89 +- + arch/x86/include/asm/linkage.h | 2 +- + arch/x86/include/asm/mmu.h | 18 +- + arch/x86/include/asm/mmu_context.h | 49 +- + 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/processor-flags.h | 2 + + 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/smp.h | 7 +- + arch/x86/include/asm/svm.h | 10 +- + arch/x86/include/asm/tlbflush.h | 48 +- + 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/kvm.h | 3 + + arch/x86/include/uapi/asm/prctl.h | 8 + + arch/x86/include/uapi/asm/processor-flags.h | 6 + + arch/x86/kernel/cpu/resctrl/monitor.c | 43 +- + 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/itmt.c | 11 +- + arch/x86/kernel/process.c | 11 +- + arch/x86/kernel/process_64.c | 69 +- + arch/x86/kernel/reboot.c | 2 +- + arch/x86/kernel/relocate_kernel_64.S | 10 +- + arch/x86/kernel/smpboot.c | 2 +- + arch/x86/kernel/traps.c | 8 +- + arch/x86/kernel/unwind_orc.c | 27 +- + arch/x86/kvm/cpuid.c | 18 +- + 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 | 7 +- + arch/x86/kvm/mmu.h | 28 +- + arch/x86/kvm/mmu/mmu.c | 524 +- + arch/x86/kvm/mmu/mmu_internal.h | 20 +- + arch/x86/kvm/mmu/paging_tmpl.h | 275 +- + arch/x86/kvm/mmu/spte.c | 2 +- + arch/x86/kvm/mmu/tdp_iter.h | 48 +- + arch/x86/kvm/mmu/tdp_mmu.c | 215 +- + 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 | 205 +- + arch/x86/kvm/svm/svm.h | 29 + + arch/x86/kvm/svm/svm_onhyperv.h | 5 +- + arch/x86/kvm/vmx/hyperv.c | 107 +- + arch/x86/kvm/vmx/hyperv.h | 115 +- + arch/x86/kvm/vmx/nested.c | 126 +- + arch/x86/kvm/vmx/pmu_intel.c | 135 +- + arch/x86/kvm/vmx/sgx.c | 4 +- + arch/x86/kvm/vmx/vmx.c | 96 +- + arch/x86/kvm/vmx/vmx.h | 20 +- + arch/x86/kvm/vmx/vmx_ops.h | 22 +- + arch/x86/kvm/x86.c | 258 +- + arch/x86/kvm/x86.h | 64 +- + 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/init.c | 5 + + arch/x86/mm/tlb.c | 53 +- + arch/x86/platform/pvh/head.S | 2 +- + arch/x86/power/cpu.c | 2 +- + 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 +- + arch/x86/xen/xen-asm.S | 4 +- + arch/x86/xen/xen-head.S | 4 +- + arch/xtensa/include/asm/smp.h | 2 +- + arch/xtensa/kernel/smp.c | 6 +- + drivers/acpi/power.c | 19 + + drivers/acpi/thermal.c | 45 +- + drivers/acpi/x86/apple.c | 11 +- + drivers/acpi/x86/utils.c | 10 + + drivers/char/tpm/tpm-chip.c | 22 +- + drivers/char/tpm/tpm.h | 2 +- + drivers/char/tpm/tpm_tis_core.c | 2 +- + 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/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-sc8280xp.c | 18 + + 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 +- + 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-rk3399.c | 2 +- + drivers/clk/rockchip/clk-rk3588.c | 42 +- + drivers/clk/rockchip/clk.c | 2 - + 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 +- + 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/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 +- + drivers/counter/Kconfig | 11 + + drivers/counter/Makefile | 1 + + drivers/counter/rz-mtu3-cnt.c | 906 +++ + drivers/cpuidle/cpuidle-pseries.c | 28 +- + drivers/cxl/core/core.h | 11 + + drivers/cxl/core/hdm.c | 52 +- + drivers/cxl/core/mbox.c | 151 +- + drivers/cxl/core/memdev.c | 227 + + drivers/cxl/core/pci.c | 137 +- + drivers/cxl/core/port.c | 1 - + 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/cxl/port.c | 18 +- + 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 | 121 +- + drivers/dma/idxd/idxd.h | 69 +- + drivers/dma/idxd/init.c | 93 +- + drivers/dma/idxd/irq.c | 212 +- + 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 +- + 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 + + drivers/gpio/Kconfig | 12 + + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio-ljca.c | 454 ++ + drivers/gpio/gpio-tegra186.c | 1 + + drivers/gpu/drm/amd/display/Kconfig | 2 +- + drivers/hte/hte-tegra194-test.c | 2 +- + drivers/hte/hte-tegra194.c | 169 +- + drivers/hte/hte.c | 2 +- + drivers/i3c/master.c | 36 +- + drivers/i3c/master/Kconfig | 14 + + drivers/i3c/master/Makefile | 1 + + drivers/i3c/master/ast2600-i3c-master.c | 189 + + drivers/i3c/master/dw-i3c-master.c | 435 +- + drivers/i3c/master/dw-i3c-master.h | 84 + + 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 +- + drivers/idle/intel_idle.c | 59 +- + 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 | 17 +- + drivers/infiniband/hw/efa/efa_io_defs.h | 42 +- + drivers/infiniband/hw/efa/efa_verbs.c | 11 +- + 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 | 17 +- + 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 | 19 +- + 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/input/Kconfig | 10 + + drivers/input/Makefile | 1 + + drivers/input/joystick/xpad.c | 23 +- + 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 +- + 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/Kconfig | 1 - + 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 | 68 +- + 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 +- + drivers/leds/Kconfig | 16 +- + drivers/leds/Makefile | 1 + + 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-bd2606mvv.c | 160 + + 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 + + drivers/macintosh/Kconfig | 1 + + drivers/macintosh/rack-meter.c | 2 +- + drivers/macintosh/therm_adt746x.c | 2 +- + drivers/macintosh/windfarm_smu_sat.c | 1 + + .../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 - + drivers/message/fusion/mptbase.c | 2 +- + drivers/message/fusion/mptbase.h | 2 +- + 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/misc/lkdtm/stackleak.c | 6 + + drivers/mtd/ubi/build.c | 2 +- + drivers/mtd/ubi/eba.c | 19 +- + 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 + + drivers/of/Kconfig | 4 - + drivers/of/address.c | 2 +- + drivers/of/fdt.c | 11 +- + drivers/parisc/power.c | 16 +- + drivers/pci/doe.c | 328 +- + drivers/pci/pci.h | 11 + + drivers/pci/probe.c | 1 + + drivers/pci/remove.c | 1 + + 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 +- + 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 | 42 +- + 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 +- + 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 +- + 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 +- + 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 + + 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-armada38x.c | 7 +- + 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-jz4740.c | 3 +- + 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-s5m.c | 82 +- + 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 | 9 +- + drivers/rtc/rtc-tegra.c | 6 +- + drivers/rtc/rtc-ti-k3.c | 3 +- + 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 +- + 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 +- + 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 +- + drivers/thermal/cpuidle_cooling.c | 3 - + drivers/thermal/gov_step_wise.c | 28 +- + drivers/thermal/intel/Kconfig | 9 - + drivers/thermal/intel/Makefile | 1 - + drivers/thermal/intel/intel_menlow.c | 521 -- + drivers/thermal/intel/intel_pch_thermal.c | 3 +- + drivers/thermal/mediatek/auxadc_thermal.c | 89 +- + drivers/thermal/thermal_core.c | 6 + + drivers/vfio/pci/vfio_pci_config.c | 7 + + drivers/vfio/vfio_iommu_spapr_tce.c | 96 +- + drivers/vfio/vfio_iommu_type1.c | 2 +- + drivers/vhost/vhost.c | 3 +- + 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 +- + fs/Makefile | 2 +- + fs/afs/dir.c | 4 + + fs/afs/inode.c | 10 +- + fs/cifs/cifsfs.h | 4 +- + fs/cifs/connect.c | 8 +- + fs/cifs/file.c | 16 + + fs/cifs/misc.c | 8 +- + fs/cifs/smb2pdu.c | 115 +- + fs/cifs/smb2pdu.h | 20 - + fs/exec.c | 2 + + fs/ext4/extents.c | 3 +- + fs/ext4/inode.c | 3 + + fs/ext4/mmp.c | 9 +- + fs/ext4/super.c | 77 +- + fs/hostfs/Makefile | 6 +- + fs/hostfs/hostfs_user_exp.c | 28 + + fs/internal.h | 2 - + fs/iomap/direct-io.c | 9 +- + fs/iomap/trace.c | 1 + + fs/iomap/trace.h | 78 + + fs/ksmbd/smb2pdu.c | 203 +- + fs/ksmbd/smb2pdu.h | 33 - + fs/ksmbd/vfs.c | 437 +- + fs/ksmbd/vfs.h | 19 +- + fs/ksmbd/vfs_cache.c | 5 +- + 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/namei.c | 125 +- + fs/nfs/Kconfig | 1 + + fs/nfs/dir.c | 300 +- + fs/nfs/export.c | 9 +- + fs/nfs/fscache.c | 238 +- + fs/nfs/fscache.h | 131 +- + fs/nfs/inode.c | 114 +- + fs/nfs/internal.h | 24 +- + fs/nfs/iostat.h | 17 - + fs/nfs/nfs42xdr.c | 4 +- + fs/nfs/nfs4proc.c | 17 +- + fs/nfs/nfs4state.c | 8 +- + fs/nfs/nfstrace.h | 91 - + fs/nfs/pagelist.c | 4 + + fs/nfs/read.c | 105 +- + fs/nfs/super.c | 11 - + 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 +- + 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 +- + fs/proc/array.c | 7 + + fs/proc/proc_sysctl.c | 55 +- + fs/proc/task_mmu.c | 9 +- + fs/smbfs_common/smb2pdu.h | 56 +- + fs/ubifs/compress.c | 1 - + fs/ubifs/dir.c | 7 +- + fs/ubifs/tnc.c | 142 +- + 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 + + include/clocksource/arm_arch_timer.h | 1 + + 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,dispcc-qcm2290.h | 4 + + include/dt-bindings/clock/qcom,gcc-msm8917.h | 190 + + include/dt-bindings/clock/qcom,gcc-sc8280xp.h | 2 + + include/dt-bindings/clock/qcom,sa8775p-gpucc.h | 50 + + include/dt-bindings/clock/qcom,sm7150-gcc.h | 186 + + include/dt-bindings/mfd/stm32f4-rcc.h | 1 - + include/dt-bindings/reset/bcm63268-reset.h | 4 + + include/kvm/arm_arch_timer.h | 34 +- + include/kvm/arm_hypercalls.h | 6 +- + include/kvm/arm_vgic.h | 1 + + include/linux/clk-provider.h | 21 +- + include/linux/context_tracking.h | 2 +- + include/linux/cpu.h | 2 +- + include/linux/cpuset.h | 16 +- + include/linux/dma-map-ops.h | 2 + + include/linux/dma/ti-cppi5.h | 1 + + include/linux/exportfs.h | 1 + + include/linux/fprobe.h | 10 +- + include/linux/fs.h | 14 + + include/linux/ftrace.h | 5 +- + include/linux/i3c/master.h | 5 +- + include/linux/input/matrix_keypad.h | 5 +- + include/linux/ioasid.h | 83 - + include/linux/iomap.h | 6 - + include/linux/iommu.h | 21 +- + include/linux/kvm_host.h | 7 +- + include/linux/kvm_types.h | 2 +- + include/linux/leds.h | 2 +- + include/linux/livepatch.h | 1 + + include/linux/livepatch_sched.h | 29 + + include/linux/lockd/lockd.h | 29 +- + 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 - + include/linux/mfd/stm32-timers.h | 1 + + include/linux/mlx5/mlx5_ifc.h | 31 +- + include/linux/mm.h | 11 - + include/linux/mm_types.h | 82 +- + include/linux/mmu_context.h | 14 + + include/linux/namei.h | 9 + + include/linux/nfs.h | 20 + + include/linux/nfs_fs.h | 72 +- + include/linux/nfs_iostat.h | 12 - + include/linux/nfs_page.h | 3 + + include/linux/nfs_xdr.h | 4 + + include/linux/objtool.h | 81 +- + include/linux/objtool_types.h | 57 + + include/linux/pci-doe.h | 66 +- + include/linux/pci.h | 3 + + include/linux/pe.h | 4 + + include/linux/power/generic-adc-battery.h | 23 - + include/linux/power_supply.h | 8 + + include/linux/psi.h | 2 +- + include/linux/psi_types.h | 43 +- + include/linux/pwm.h | 13 - + include/linux/sched.h | 28 +- + include/linux/sched/mm.h | 31 +- + include/linux/sched/task_stack.h | 2 +- + include/linux/seq_buf.h | 2 + + include/linux/smp.h | 15 +- + include/linux/soundwire/sdw_amd.h | 109 + + include/linux/soundwire/sdw_intel.h | 11 + + include/linux/start_kernel.h | 6 +- + include/linux/sunrpc/cache.h | 15 +- + include/linux/sunrpc/sched.h | 3 +- + include/linux/sunrpc/svc.h | 16 +- + include/linux/sunrpc/svc_xprt.h | 5 +- + include/linux/sunrpc/svcsock.h | 4 +- + include/linux/swiotlb.h | 9 + + include/linux/sysctl.h | 12 - + include/linux/thermal.h | 1 + + include/linux/tpm.h | 13 +- + include/linux/uaccess.h | 22 + + include/linux/user_events.h | 101 +- + include/linux/vfio.h | 5 + + include/linux/workqueue.h | 1 + + include/net/tls.h | 2 + + include/rdma/ib_verbs.h | 25 + + include/soc/imx/timer.h | 7 - + include/soc/starfive/reset-starfive-jh71x0.h | 17 + + include/trace/events/ipi.h | 44 + + include/trace/events/sunrpc.h | 41 +- + include/uapi/linux/cxl_mem.h | 35 +- + include/uapi/linux/idxd.h | 48 +- + include/uapi/linux/kvm.h | 14 +- + include/uapi/linux/nfsd/export.h | 13 + + include/uapi/linux/user_events.h | 81 + + include/uapi/rdma/bnxt_re-abi.h | 4 + + include/uapi/rdma/efa-abi.h | 4 +- + init/main.c | 6 +- + 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 | 62 +- + kernel/cgroup/cpuset.c | 30 +- + kernel/dma/Kconfig | 7 + + kernel/dma/debug.c | 131 +- + kernel/dma/direct.c | 15 +- + kernel/dma/mapping.c | 6 +- + kernel/dma/swiotlb.c | 97 +- + kernel/events/core.c | 4 +- + kernel/exit.c | 2 + + kernel/fork.c | 12 +- + kernel/irq_work.c | 12 +- + kernel/livepatch/core.c | 1 + + kernel/livepatch/transition.c | 122 +- + kernel/module/dups.c | 2 + + kernel/panic.c | 4 +- + kernel/pid_namespace.c | 3 +- + kernel/pid_sysctl.h | 3 +- + kernel/power/hibernate.c | 15 +- + kernel/power/power.h | 1 + + kernel/power/process.c | 2 +- + kernel/power/swap.c | 8 +- + 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/stackleak.c | 17 +- + kernel/time/timekeeping.c | 4 +- + 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 | 102 +- + 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 + + kernel/workqueue.c | 134 +- + lib/Kconfig.debug | 11 +- + lib/seq_buf.c | 32 + + lib/test_fprobe.c | 105 +- + mm/gup.c | 4 +- + mm/init-mm.c | 4 +- + mm/madvise.c | 5 +- + mm/migrate.c | 11 +- + mm/page_alloc.c | 4 +- + net/sunrpc/auth_gss/svcauth_gss.c | 12 +- + net/sunrpc/clnt.c | 3 - + net/sunrpc/sched.c | 1 - + net/sunrpc/svc.c | 49 +- + net/sunrpc/svc_xprt.c | 33 +- + net/sunrpc/svcauth_unix.c | 23 +- + net/sunrpc/svcsock.c | 174 +- + net/sunrpc/sysctl.c | 42 +- + net/sunrpc/xprtrdma/svc_rdma.c | 21 +- + net/sunrpc/xprtrdma/transport.c | 11 +- + net/sunrpc/xprtsock.c | 13 +- + 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/fprobe/fprobe_example.c | 7 +- + samples/rust/rust_print.rs | 26 + + samples/user_events/example.c | 45 +- + scripts/Makefile.build | 2 +- + scripts/Makefile.clang | 8 +- + scripts/Makefile.package | 61 +- + scripts/check-sysctl-docs | 16 - + 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/leaking_addresses.pl | 1 + + scripts/link-vmlinux.sh | 6 +- + scripts/mksysmap | 135 +- + scripts/objdump-func | 34 +- + scripts/package/builddeb | 2 +- + scripts/package/mkdebian | 2 + + scripts/package/mkspec | 7 +- + scripts/recordmcount.c | 6 +- + scripts/relocs_check.sh | 20 + + scripts/sorttable.h | 2 +- + scripts/tools-support-relr.sh | 8 +- + security/integrity/ima/Kconfig | 2 +- + tools/arch/x86/include/asm/orc_types.h | 12 +- + tools/include/linux/objtool.h | 200 - + tools/include/linux/objtool_types.h | 57 + + tools/include/uapi/linux/kvm.h | 2 +- + tools/kvm/kvm_stat/kvm_stat | 2 +- + 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/cxl/config_check.c | 1 + + tools/testing/cxl/test/mem.c | 247 + + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/cgroup/test_cpuset_prs.sh | 25 +- + tools/testing/selftests/kvm/Makefile | 2 + + 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 + + tools/testing/selftests/kvm/demand_paging_test.c | 2 +- + .../selftests/kvm/include/aarch64/processor.h | 13 + + .../testing/selftests/kvm/include/kvm_util_base.h | 1 + + .../selftests/kvm/include/x86_64/processor.h | 124 +- + .../testing/selftests/kvm/lib/aarch64/processor.c | 91 +- + 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 + + tools/testing/selftests/mm/protection_keys.c | 4 +- + 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 + + 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 + + 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/testing/selftests/x86/Makefile | 2 +- + tools/testing/selftests/x86/lam.c | 1241 ++++ + 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 +- + virt/kvm/kvm_main.c | 33 +- + 2397 files changed, 105338 insertions(+), 52419 deletions(-) + create mode 100644 Documentation/ABI/testing/debugfs-cxl + 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/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/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/clock/skyworks,si521xx.yaml + create mode 100644 Documentation/devicetree/bindings/i3c/aspeed,ast2600-i3c.yaml + delete mode 100644 Documentation/devicetree/bindings/input/pwm-beeper.txt + create mode 100644 Documentation/devicetree/bindings/input/pwm-beeper.yaml + 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/devicetree/bindings/mfd/maxim,max5970.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/ti,nspire-misc.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/intel,phy-thunderbay-emmc.yaml + 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 Documentation/devicetree/bindings/power/qcom,kpss-acc-v2.yaml + create mode 100644 Documentation/devicetree/bindings/power/supply/adc-battery.yaml + 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 Documentation/devicetree/bindings/timer/renesas,rz-mtu3.yaml + rename Documentation/driver-api/hte/{tegra194-hte.rst => tegra-hte.rst} (50%) + create mode 100644 Documentation/filesystems/xfs-online-fsck-design.rst + create mode 100644 Documentation/leds/leds-mt6370-rgb.rst + create mode 100644 Documentation/riscv/hwprobe.rst + 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 + 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 + 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 + 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 + 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 + 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 + create mode 100644 drivers/clocksource/timer-mediatek-cpux.c + create mode 100644 drivers/counter/rz-mtu3-cnt.c + create mode 100644 drivers/dma/idxd/debugfs.c + create mode 100644 drivers/dma/ti/k3-psil-j784s4.c + create mode 100644 drivers/gpio/gpio-ljca.c + create mode 100644 drivers/i3c/master/ast2600-i3c-master.c + create mode 100644 drivers/i3c/master/dw-i3c-master.h + create mode 100644 drivers/infiniband/hw/bnxt_re/qplib_tlv.h + 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 + delete mode 100644 drivers/iommu/ioasid.c + 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/leds-bd2606mvv.c + create mode 100644 drivers/leds/rgb/leds-mt6370-rgb.c + create mode 100644 drivers/mfd/rz-mtu3.c + create mode 100644 drivers/mfd/rz-mtu3.h + 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 + 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 + create mode 100644 drivers/pwm/pwm-apple.c + 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 drivers/soundwire/amd_manager.c + create mode 100644 drivers/soundwire/amd_manager.h + create mode 100644 drivers/soundwire/intel_bus_common.c + delete mode 100644 drivers/thermal/intel/intel_menlow.c + create mode 100644 fs/hostfs/hostfs_user_exp.c + create mode 100644 fs/lockd/trace.c + create mode 100644 fs/lockd/trace.h + 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 + 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/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 + delete mode 100644 include/linux/ioasid.h + create mode 100644 include/linux/livepatch_sched.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 + create mode 100644 include/linux/objtool_types.h + delete mode 100644 include/linux/power/generic-adc-battery.h + create mode 100644 include/linux/soundwire/sdw_amd.h + create mode 100644 include/soc/starfive/reset-starfive-jh71x0.h + create mode 100644 include/uapi/linux/user_events.h + 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 + create mode 100755 scripts/relocs_check.sh + delete mode 100644 tools/include/linux/objtool.h + create mode 100644 tools/include/linux/objtool_types.h + create mode 100644 tools/testing/selftests/kvm/aarch64/smccc_filter.c + create mode 100644 tools/testing/selftests/kvm/x86_64/xcr0_cpuid_test.c + delete mode 100644 tools/testing/selftests/powerpc/dscr/settings + 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 + create mode 100644 tools/testing/selftests/user_events/abi_test.c + create mode 100644 tools/testing/selftests/x86/lam.c + create mode 100644 tools/tracing/rtla/.gitignore +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 (3195e7d9b9e3f mm/shmem: fix race in shmem_undo_range w/THP) +$ git merge -m Merge branch 'mm-hotfixes-unstable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-hotfixes/mm-hotfixes-unstable +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .mailmap | 1 + + MAINTAINERS | 4 ++-- + fs/afs/dir_edit.c | 7 ++++--- + fs/nilfs2/bmap.c | 16 ++++++++++++---- + fs/nilfs2/segment.c | 5 ++++- + include/linux/shrinker.h | 13 +++++++++++-- + kernel/relay.c | 3 ++- + mm/Kconfig.debug | 10 ++++++++-- + mm/filemap.c | 10 +++++----- + mm/kasan/hw_tags.c | 4 ++-- + mm/memory.c | 3 +++ + mm/mempolicy.c | 4 +++- + mm/mmap.c | 10 +++++----- + mm/shmem.c | 17 ++++++++++++++++- + mm/shrinker_debug.c | 15 ++++++++++----- + mm/vmscan.c | 15 +++++++++++++-- + mm/zswap.c | 16 ++++++++++++++++ + 17 files changed, 117 insertions(+), 36 deletions(-) +Merging kbuild-current/fixes (58390c8ce1bdd Merge tag 'iommu-updates-v6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu) +$ 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 +Merge made by the 'ort' 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 (b9850ec0027ca Merge tag 'nf-23-05-03' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/main +Auto-merging fs/afs/internal.h +Auto-merging net/rxrpc/call_object.c +Merge made by the 'ort' strategy. + drivers/net/dsa/mv88e6xxx/chip.c | 1 + + drivers/net/ethernet/amd/Kconfig | 2 + + drivers/net/ethernet/amd/pds_core/Makefile | 3 +- + .../net/ethernet/aquantia/atlantic/aq_pci_func.c | 2 + + drivers/net/ethernet/intel/igc/igc_base.h | 11 +- + drivers/net/ethernet/intel/igc/igc_main.c | 7 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c | 3 - + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 6 +- + drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 8 ++ + drivers/net/ethernet/marvell/octeontx2/af/mbox.c | 5 +- + drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 19 +++- + 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.c | 49 ++++++-- + drivers/net/ethernet/marvell/octeontx2/af/rvu.h | 1 + + .../net/ethernet/marvell/octeontx2/af/rvu_cgx.c | 2 + + .../net/ethernet/marvell/octeontx2/af/rvu_cn10k.c | 13 ++- + .../ethernet/marvell/octeontx2/af/rvu_debugfs.c | 5 +- + .../net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c | 26 +++-- + .../net/ethernet/marvell/octeontx2/af/rvu_npc_fs.h | 4 + + .../ethernet/marvell/octeontx2/af/rvu_npc_hash.c | 125 ++++++++++++--------- + .../ethernet/marvell/octeontx2/af/rvu_npc_hash.h | 10 +- + .../ethernet/marvell/octeontx2/nic/cn10k_macsec.c | 48 +++++--- + .../ethernet/marvell/octeontx2/nic/otx2_common.h | 6 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 14 ++- + .../net/ethernet/marvell/octeontx2/nic/otx2_tc.c | 2 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 2 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 106 +++++++---------- + drivers/net/ethernet/mediatek/mtk_eth_soc.h | 1 - + .../net/ethernet/pensando/ionic/ionic_devlink.c | 2 + + .../net/ethernet/pensando/ionic/ionic_ethtool.c | 2 +- + drivers/net/ethernet/sfc/mcdi_port_common.c | 11 +- + drivers/net/usb/r8152.c | 85 +++++++++----- + fs/afs/afs.h | 4 +- + fs/afs/internal.h | 2 +- + fs/afs/rxrpc.c | 8 +- + include/net/af_rxrpc.h | 21 ++-- + include/net/netfilter/nf_tables.h | 1 + + net/core/skbuff.c | 20 +++- + net/ethtool/ioctl.c | 2 +- + net/ipv6/sit.c | 8 +- + net/ipv6/tcp_ipv6.c | 2 +- + net/ncsi/ncsi-aen.c | 1 + + net/netfilter/nf_tables_api.c | 41 +++++-- + net/netfilter/nft_ct_fast.c | 14 ++- + net/netfilter/nft_dynset.c | 2 +- + net/netfilter/nft_lookup.c | 2 +- + net/netfilter/nft_objref.c | 2 +- + net/packet/af_packet.c | 2 +- + net/rxrpc/af_rxrpc.c | 3 + + net/rxrpc/ar-internal.h | 1 + + net/rxrpc/call_object.c | 9 +- + net/rxrpc/sendmsg.c | 22 ++-- + net/sched/act_mirred.c | 2 +- + net/sched/act_pedit.c | 4 +- + net/sched/cls_api.c | 1 + + net/sched/cls_flower.c | 2 +- + .../selftests/net/srv6_end_dt46_l3vpn_test.sh | 10 +- + tools/testing/selftests/netfilter/Makefile | 7 +- + 62 files changed, 655 insertions(+), 361 deletions(-) +Merging bpf/master (415d7a49cd796 selftests/bpf: Fix pkg-config call building sign-file) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git bpf/master +Merge made by the 'ort' strategy. + tools/testing/selftests/bpf/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging ipsec/master (5fc46f94219d1 Revert "Fix XFRM-I support for nested ESP tunnels") +$ 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_device.c +Auto-merging net/xfrm/xfrm_user.c +Merge made by the 'ort' strategy. + net/xfrm/xfrm_device.c | 2 +- + net/xfrm/xfrm_interface_core.c | 54 ++++-------------------------------------- + net/xfrm/xfrm_policy.c | 9 ------- + net/xfrm/xfrm_user.c | 1 + + 4 files changed, 6 insertions(+), 60 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 (fb7cba61919ad Merge branch 'rxrpc-timeout-fixes') +$ 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 'ort' 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 (0d727e1856ef2 ALSA: caiaq: input: Add error handling for unsupported input methods in `snd_usb_caiaq_input_init`) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus +Merge made by the 'ort' strategy. + Documentation/sound/alsa-configuration.rst | 13 +++++ + .../sound/kernel-api/writing-an-alsa-driver.rst | 22 ++++---- + sound/pci/emu10k1/emu10k1_callback.c | 15 +++--- + sound/pci/emu10k1/emu10k1_main.c | 46 ++++++++--------- + sound/pci/emu10k1/emufx.c | 6 +-- + sound/pci/emu10k1/emumixer.c | 8 +-- + sound/pci/emu10k1/emupcm.c | 12 ++--- + sound/pci/emu10k1/io.c | 18 +++---- + sound/pci/emu10k1/p16v.c | 29 ++++++----- + sound/pci/hda/hda_intel.c | 21 ++++++++ + sound/pci/hda/patch_hdmi.c | 22 ++++++++ + sound/pci/hda/patch_realtek.c | 4 ++ + sound/usb/caiaq/input.c | 1 + + sound/usb/quirks-table.h | 58 ++++++++++++++++++++++ + 14 files changed, 199 insertions(+), 76 deletions(-) +Merging sound-asoc-fixes/for-linus (9a92ef41d6c52 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 +Merge made by the 'ort' strategy. + sound/soc/amd/yc/acp6x-mach.c | 14 + + sound/soc/codecs/Kconfig | 2 +- + sound/soc/codecs/wcd938x-sdw.c | 1037 ++++++++++++++++++++- + sound/soc/codecs/wcd938x.c | 1003 +------------------- + sound/soc/codecs/wcd938x.h | 1 + + sound/soc/intel/common/soc-acpi-intel-byt-match.c | 2 +- + sound/soc/intel/common/soc-acpi-intel-cht-match.c | 26 + + 7 files changed, 1072 insertions(+), 1013 deletions(-) +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 (adc480392d1f1 Merge remote-tracking branch 'regulator/for-6.3' into regulator-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus +Merge made by the 'ort' strategy. + Documentation/power/regulator/consumer.rst | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +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 +Merge made by the 'ort' strategy. +Merging pci-current/for-linus (34b62f186db96 Merge tag 'pci-v6.4-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci) +$ 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 (33afd4b763936 Merge tag 'mm-nonmm-stable-2023-04-27-16-01' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm) +$ 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 (33afd4b763936 Merge tag 'mm-nonmm-stable-2023-04-27-16-01' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm) +$ 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 (33afd4b763936 Merge tag 'mm-nonmm-stable-2023-04-27-16-01' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm) +$ 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 (33afd4b763936 Merge tag 'mm-nonmm-stable-2023-04-27-16-01' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm) +$ 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 (7fcbd72176076 iio: adc: ad7192: Change "shorted" channels to differential) +$ git merge -m Merge branch 'fixes-togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio-fixes/fixes-togreg +Merge made by the 'ort' strategy. + drivers/iio/accel/st_accel_core.c | 4 +-- + drivers/iio/adc/ad4130.c | 12 +++++++- + drivers/iio/adc/ad7192.c | 8 ++---- + drivers/iio/adc/imx93_adc.c | 7 ++--- + drivers/iio/adc/mt6370-adc.c | 53 +++++++++++++++++++++++++++++++++-- + drivers/iio/adc/mxs-lradc-adc.c | 10 +++---- + drivers/iio/adc/palmas_gpadc.c | 10 +++---- + drivers/iio/industrialio-gts-helper.c | 42 ++++++++++++++++++++------- + drivers/iio/light/rohm-bu27034.c | 14 +++++---- + drivers/iio/magnetometer/tmag5273.c | 5 ++-- + include/linux/iio/iio-gts-helper.h | 2 +- + 11 files changed, 124 insertions(+), 43 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 (33afd4b763936 Merge tag 'mm-nonmm-stable-2023-04-27-16-01' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm) +$ 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 (529de2f1ca3f0 Input: cyttsp5 - fix array length) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input-current/for-linus +Merge made by the 'ort' strategy. + drivers/input/touchscreen/cyttsp5.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging crypto-current/master (b8969a1b69672 crypto: api - Fix CRYPTO_USER checks for report function) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git crypto-current/master +Merge made by the 'ort' strategy. + crypto/acompress.c | 2 +- + crypto/aead.c | 2 +- + crypto/ahash.c | 2 +- + crypto/akcipher.c | 2 +- + crypto/algapi.c | 3 +++ + crypto/crypto_engine.c | 6 +++--- + crypto/kpp.c | 2 +- + crypto/rng.c | 2 +- + crypto/scompress.c | 2 +- + crypto/shash.c | 2 +- + crypto/skcipher.c | 2 +- + drivers/crypto/allwinner/sun8i-ss/sun8i-ss-cipher.c | 2 +- + 12 files changed, 16 insertions(+), 13 deletions(-) +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 'ort' 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 +Already up to date. +Merging btrfs-fixes/next-fixes (f8aaf4b16366a Merge branch 'misc-6.4' into next-fixes) +$ git merge -m Merge branch 'next-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs-fixes/next-fixes +Merge made by the 'ort' strategy. + fs/btrfs/backref.c | 15 +++++++-------- + fs/btrfs/block-rsv.c | 3 ++- + fs/btrfs/ctree.c | 38 +++++++++++++++++++++++++++++++++++++- + fs/btrfs/file-item.c | 5 +++-- + fs/btrfs/ioctl.c | 4 +++- + fs/btrfs/super.c | 7 ++++++- + fs/btrfs/volumes.c | 1 + + fs/btrfs/zoned.c | 6 +++--- + 8 files changed, 62 insertions(+), 17 deletions(-) +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 (b413281876292 of: fdt: Scan /memreserve/ last) +$ git merge -m Merge branch 'dt/linus' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree-fixes/dt/linus +Auto-merging Documentation/devicetree/bindings/pinctrl/renesas,rzn1-pinctrl.yaml +Auto-merging Documentation/devicetree/bindings/pinctrl/renesas,rzv2m-pinctrl.yaml +Auto-merging drivers/of/fdt.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/clock/renesas,r9a06g032-sysctrl.yaml | 2 +- + Documentation/devicetree/bindings/i2c/renesas,rzv2m.yaml | 2 +- + Documentation/devicetree/bindings/pinctrl/renesas,rzn1-pinctrl.yaml | 2 +- + Documentation/devicetree/bindings/pinctrl/renesas,rzv2m-pinctrl.yaml | 2 +- + drivers/of/fdt.c | 5 +++-- + 5 files changed, 7 insertions(+), 6 deletions(-) +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 (4eb0e7873c715 mmc: sdhci-cadence: Fix an error handling path in sdhci_cdns_probe()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes +Merge made by the 'ort' strategy. + drivers/mmc/core/block.c | 5 +++++ + drivers/mmc/host/sdhci-cadence.c | 8 +++++--- + 2 files changed, 10 insertions(+), 3 deletions(-) +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 (33afd4b763936 Merge tag 'mm-nonmm-stable-2023-04-27-16-01' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm) +$ 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 (29cd2927fb914 SUNRPC: Fix encoding of accepted but unsuccessful RPC replies) +$ git merge -m Merge branch 'nfsd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd-fixes/nfsd-fixes +Auto-merging fs/lockd/svc.c +Merge made by the 'ort' strategy. + fs/lockd/svc.c | 2 +- + fs/nfsd/nfsctl.c | 25 +++++++++++++------------ + net/sunrpc/auth_gss/gss_krb5_crypto.c | 10 ++++++++++ + net/sunrpc/svc.c | 17 +++++++++++------ + 4 files changed, 35 insertions(+), 19 deletions(-) +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 (1f85d016768ff perf test record+probe_libc_inet_pton: Fix call chain match on x86_64) +$ git merge -m Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git perf-current/perf/urgent +Auto-merging tools/perf/arch/common.c +Auto-merging tools/perf/util/symbol-elf.c +Merge made by the 'ort' 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 | 275 +- + 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/net_dropmonitor.py | 4 +- + tools/perf/scripts/python/netdev-times.py | 6 +- + 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 +- + .../tests/shell/record+probe_libc_inet_pton.sh | 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 | 568 +- + 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 | 13 +- + 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 | 50 +- + 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 | 119 +- + 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 | 94 +- + 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/tracepoint.c | 1 + + tools/perf/util/unwind-libdw.c | 20 +- + tools/perf/util/unwind-libunwind-local.c | 68 +- + tools/perf/util/unwind-libunwind.c | 39 +- + 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 +- + 513 files changed, 169251 insertions(+), 146289 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 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 'ort' strategy. + fs/9p/v9fs.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging drm-misc-fixes/for-linux-next-fixes (a26cc2934331b drm/mipi-dsi: Set the fwnode for mipi_dsi_device) +$ 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 drivers/gpu/drm/ast/ast_main.c +Auto-merging drivers/gpu/drm/drm_fb_helper.c +Auto-merging drivers/gpu/drm/drm_mipi_dsi.c +Auto-merging include/drm/display/drm_dp.h +Auto-merging include/drm/display/drm_dp_helper.h +Merge made by the 'ort' strategy. + drivers/firmware/sysfb_simplefb.c | 4 +++- + drivers/gpu/drm/ast/ast_main.c | 9 +++++---- + drivers/gpu/drm/drm_fb_helper.c | 16 ++++++++++++---- + drivers/gpu/drm/drm_mipi_dsi.c | 2 +- + drivers/gpu/drm/nouveau/include/nvif/if0012.h | 4 +++- + drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.h | 3 ++- + drivers/gpu/drm/nouveau/nvkm/engine/disp/uoutp.c | 2 +- + include/drm/display/drm_dp.h | 5 ++--- + include/drm/display/drm_dp_helper.h | 5 ++--- + 9 files changed, 31 insertions(+), 19 deletions(-) +Merging mm-stable/mm-stable (245f092268936 mm: hwpoison: coredump: support recovery from dump_user_range()) +$ git merge -m Merge branch 'mm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-stable/mm-stable +Auto-merging mm/page_alloc.c +Merge made by the 'ort' strategy. + arch/s390/mm/gmap.c | 20 +------ + fs/coredump.c | 1 + + include/linux/ksm.h | 7 +++ + include/linux/uio.h | 16 ++++++ + kernel/sys.c | 12 +--- + lib/iov_iter.c | 17 +++++- + mm/damon/paddr.c | 26 ++++----- + mm/ksm.c | 70 +++++++++++++++++++++++ + mm/page_alloc.c | 9 +++ + tools/testing/selftests/mm/ksm_functional_tests.c | 46 +++++++++++++-- + 10 files changed, 172 insertions(+), 52 deletions(-) +Merging mm-nonmm-stable/mm-nonmm-stable (22b8cc3e78f54 Merge tag 'x86_mm_for_6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) +$ git merge -m Merge branch 'mm-nonmm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-nonmm-stable/mm-nonmm-stable +Already up to date. +Merging mm/mm-everything (bb9a1a223096b Merge branch 'mm-nonmm-unstable' into mm-everything) + bdd189f2dac5d ("seq_buf: add seq_buf_do_printk() helper") + d4829ad693541 ("cpuset: clean up cpuset_node_allowed") +$ git merge -m Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm/mm-everything +Auto-merging MAINTAINERS +Auto-merging kernel/cgroup/cpuset.c +Auto-merging mm/page_alloc.c +Auto-merging tools/testing/selftests/Makefile +Merge made by the 'ort' strategy. + MAINTAINERS | 7 + + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + drivers/dma-buf/heaps/system_heap.c | 5 +- + fs/fs-writeback.c | 16 +- + fs/hugetlbfs/inode.c | 5 +- + fs/ntfs/mft.c | 38 +-- + include/linux/cgroup.h | 1 - + include/linux/memcontrol.h | 5 - + include/linux/mm.h | 1 + + include/linux/swap.h | 1 + + include/linux/syscalls.h | 5 + + include/uapi/asm-generic/unistd.h | 5 +- + include/uapi/linux/mman.h | 14 ++ + init/Kconfig | 10 + + kernel/cgroup/rstat.c | 26 +-- + kernel/kthread.c | 4 +- + kernel/sys_ni.c | 1 + + mm/compaction.c | 12 +- + mm/filemap.c | 172 ++++++++++++++ + mm/gup.c | 146 +++++++++++- + mm/memcontrol.c | 192 +++++++-------- + mm/migrate.c | 49 ++-- + mm/mmap.c | 53 +++-- + mm/page_alloc.c | 2 +- + mm/workingset.c | 150 ++++++++---- + scripts/spelling.txt | 22 ++ + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/cachestat/.gitignore | 2 + + tools/testing/selftests/cachestat/Makefile | 8 + + tools/testing/selftests/cachestat/test_cachestat.c | 258 +++++++++++++++++++++ + 31 files changed, 956 insertions(+), 257 deletions(-) + create mode 100644 tools/testing/selftests/cachestat/.gitignore + create mode 100644 tools/testing/selftests/cachestat/Makefile + create mode 100644 tools/testing/selftests/cachestat/test_cachestat.c +$ 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 +[master 6c27c05890fee] Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm + Date: Thu May 4 21:27:51 2023 +0900 + Committer: Mark Brown <broonie@finisterre.sirena.org.uk> +Your name and email address were configured automatically based +on your username and hostname. Please check that they are accurate. +You can suppress this message by setting them explicitly. Run the +following command and follow the instructions in your editor to edit +your configuration file: + + git config --global --edit + +After doing this, you may fix the identity used for this commit with: + + git commit --amend --reset-author + +Merging kbuild/for-next (58390c8ce1bdd Merge tag 'iommu-updates-v6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild/for-next +Already up to date. +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 (5d27a645f6094 perf tracepoint: Fix memory leak in is_valid_tracepoint()) + 1f30bd499605a ("perf symbols: Fix return incorrect build_id size in elf_read_build_id()") + 419bd54a38751 ("perf list: Fix memory leaks in print_tracepoint_events()") + 4692917156b2f ("perf script: Print raw ip instead of binary offset for callchain") + 494fc963a2818 ("perf lock contention: Fix struct rq lock access") + 4e05971903f08 ("perf unwind: Suppress massive unsupported target platform errors") + 5d27a645f6094 ("perf tracepoint: Fix memory leak in is_valid_tracepoint()") + 7e5fd3db2371a ("perf lock contention: Rework offset calculation with BPF CO-RE") + aec1164e09cc2 ("perf script: Add new parameter in kfree_skb tracepoint to the python scripts using it") + db483eee86707 ("perf build: Fix unescaped # in perf build-test") + e7767ec67a100 ("perf cs-etm: Add fix for coresight trace for any range of CPUs") + e7cac3fd8ca65 ("perf list: Modify the warning message about scandirat(3)") +$ 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/arch/common.c +Auto-merging tools/perf/util/evsel_fprintf.c +Auto-merging tools/perf/util/symbol-elf.c +Merge made by the 'ort' strategy. + tools/perf/Documentation/perf-script.txt | 2 +- + tools/perf/arch/common.c | 18 ++++++++++ + tools/perf/builtin-script.c | 60 +++++++++++++------------------- + tools/perf/util/dso.c | 33 ++++++++++++++++++ + tools/perf/util/dso.h | 8 +++-- + tools/perf/util/evsel_fprintf.c | 16 ++++----- + tools/perf/util/evsel_fprintf.h | 1 + + tools/perf/util/map.c | 32 +++++++++++++++-- + tools/perf/util/map.h | 1 + + 9 files changed, 119 insertions(+), 52 deletions(-) +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 +Already up to date. +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 +Merge made by the 'ort' 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 (0fddb79bf283a arm64: lds: move .got section out of .text) +$ git merge -m Merge branch 'for-next/core' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64/for-next/core +Auto-merging arch/arm64/kernel/cpufeature.c +Merge made by the 'ort' strategy. + arch/arm64/kernel/cpu-reset.S | 2 +- + arch/arm64/kernel/cpufeature.c | 12 ++++++------ + arch/arm64/kernel/head.S | 4 ++-- + arch/arm64/kernel/sleep.S | 2 +- + arch/arm64/kernel/vmlinux.lds.S | 19 +++++++++---------- + arch/arm64/mm/proc.S | 6 +++--- + 6 files changed, 22 insertions(+), 23 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 'ort' 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 +Merge made by the 'ort' 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 +Merge made by the 'ort' 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 'ort' 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 +Merge made by the 'ort' 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 +Merge made by the 'ort' 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 +Merge made by the 'ort' 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 +Merge made by the 'ort' 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 +Merge made by the 'ort' 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 +Merge made by the 'ort' strategy. +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 +Merge made by the 'ort' 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 'ort' strategy. +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 'ort' strategy. +Merging scmi/for-linux-next (3bd27ce7a013c Merge branches 'for-next/arm-ffa/fixes', 'for-next/juno/fixes' and 'for-next/scmi/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 'ort' 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 + + arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts | 1 + + drivers/firmware/arm_ffa/bus.c | 19 +++++++++++++++---- + drivers/firmware/arm_ffa/driver.c | 9 ++++++++- + drivers/firmware/arm_scmi/raw_mode.c | 2 +- + include/linux/arm_ffa.h | 1 + + 8 files changed, 29 insertions(+), 6 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 +Merge made by the 'ort' 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 +Merge made by the 'ort' 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 +Merge made by the 'ort' 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 +Merge made by the 'ort' 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 'ort' 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 (31c6ed4e89187 clk: starfive: Fix RESET_STARFIVE_JH7110 can't be selected in a specified case) +$ git merge -m Merge branch 'clk-next' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk/clk-next +Merge made by the 'ort' strategy. + drivers/clk/clk-sp7021.c | 2 +- + drivers/clk/imx/clk-composite-8m.c | 7 ------- + drivers/clk/starfive/Kconfig | 5 +---- + 3 files changed, 2 insertions(+), 12 deletions(-) +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 'ort' 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 (2fa5ebe3bc4e3 tools/perf: Add basic support for LoongArch) +$ git merge -m Merge branch 'loongarch-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git loongarch/loongarch-next +Auto-merging arch/loongarch/Kconfig +Auto-merging crypto/Kconfig +Auto-merging samples/ftrace/ftrace-direct-modify.c +CONFLICT (content): Merge conflict in samples/ftrace/ftrace-direct-modify.c +Auto-merging samples/ftrace/ftrace-direct-multi-modify.c +Auto-merging samples/ftrace/ftrace-direct-multi.c +Auto-merging samples/ftrace/ftrace-direct-too.c +CONFLICT (content): Merge conflict in samples/ftrace/ftrace-direct-too.c +Auto-merging samples/ftrace/ftrace-direct.c +CONFLICT (content): Merge conflict in samples/ftrace/ftrace-direct.c +Auto-merging tools/perf/Makefile.config +Auto-merging tools/perf/check-headers.sh +Auto-merging tools/perf/util/annotate.c +Auto-merging tools/perf/util/env.c +Resolved 'samples/ftrace/ftrace-direct-modify.c' using previous resolution. +Resolved 'samples/ftrace/ftrace-direct-too.c' using previous resolution. +Resolved 'samples/ftrace/ftrace-direct.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 20f498192101f] Merge branch 'loongarch-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git + Committer: Mark Brown <broonie@finisterre.sirena.org.uk> +Your name and email address were configured automatically based +on your username and hostname. Please check that they are accurate. +You can suppress this message by setting them explicitly. Run the +following command and follow the instructions in your editor to edit +your configuration file: + + git config --global --edit + +After doing this, you may fix the identity used for this commit with: + + git commit --amend --reset-author +$ git diff -M --stat --summary HEAD^.. + arch/loongarch/Kconfig | 5 + + arch/loongarch/Makefile | 2 + + arch/loongarch/crypto/Kconfig | 14 + + arch/loongarch/crypto/Makefile | 6 + + arch/loongarch/crypto/crc32-loongarch.c | 304 ++++++++++++++++++++ + arch/loongarch/include/asm/checksum.h | 66 +++++ + arch/loongarch/include/asm/fpu.h | 3 + + arch/loongarch/include/asm/ftrace.h | 37 +++ + arch/loongarch/include/asm/inst.h | 26 ++ + arch/loongarch/include/asm/loongarch.h | 57 ++-- + arch/loongarch/include/asm/ptrace.h | 5 + + arch/loongarch/kernel/Makefile | 2 +- + arch/loongarch/kernel/ftrace_dyn.c | 128 +++++---- + arch/loongarch/kernel/genex.S | 1 + + arch/loongarch/kernel/irq.c | 2 +- + arch/loongarch/kernel/kfpu.c | 43 +++ + arch/loongarch/kernel/mcount_dyn.S | 13 +- + arch/loongarch/kernel/perf_event.c | 2 +- + arch/loongarch/kernel/time.c | 2 +- + arch/loongarch/kernel/traps.c | 318 ++++++++++++++++++--- + arch/loongarch/lib/Makefile | 4 +- + arch/loongarch/lib/clear_user.S | 136 ++++++++- + arch/loongarch/lib/copy_user.S | 251 ++++++++++++---- + arch/loongarch/lib/csum.c | 141 +++++++++ + arch/loongarch/lib/error-inject.c | 10 + + arch/loongarch/lib/memcpy.S | 147 ++++++++-- + arch/loongarch/lib/memmove.S | 120 ++++---- + arch/loongarch/lib/memset.S | 116 ++++++-- + crypto/Kconfig | 3 + + samples/ftrace/ftrace-direct-modify.c | 34 +++ + samples/ftrace/ftrace-direct-multi-modify.c | 41 +++ + samples/ftrace/ftrace-direct-multi.c | 25 ++ + samples/ftrace/ftrace-direct-too.c | 27 ++ + samples/ftrace/ftrace-direct.c | 23 ++ + tools/arch/loongarch/include/uapi/asm/perf_regs.h | 40 +++ + tools/arch/loongarch/include/uapi/asm/unistd.h | 9 + + tools/perf/Makefile.config | 12 +- + tools/perf/arch/loongarch/Build | 1 + + tools/perf/arch/loongarch/Makefile | 28 ++ + tools/perf/arch/loongarch/annotate/instructions.c | 45 +++ + .../arch/loongarch/entry/syscalls/mksyscalltbl | 61 ++++ + .../perf/arch/loongarch/include/dwarf-regs-table.h | 16 ++ + tools/perf/arch/loongarch/include/perf_regs.h | 15 + + tools/perf/arch/loongarch/util/Build | 5 + + tools/perf/arch/loongarch/util/dwarf-regs.c | 44 +++ + tools/perf/arch/loongarch/util/perf_regs.c | 6 + + tools/perf/arch/loongarch/util/unwind-libdw.c | 56 ++++ + tools/perf/arch/loongarch/util/unwind-libunwind.c | 82 ++++++ + tools/perf/check-headers.sh | 1 + + tools/perf/util/annotate.c | 8 + + tools/perf/util/dwarf-regs.c | 7 + + tools/perf/util/env.c | 2 + + tools/perf/util/genelf.h | 3 + + tools/perf/util/perf_regs.c | 76 +++++ + tools/perf/util/syscalltbl.c | 4 + + 55 files changed, 2337 insertions(+), 298 deletions(-) + create mode 100644 arch/loongarch/crypto/Kconfig + create mode 100644 arch/loongarch/crypto/Makefile + create mode 100644 arch/loongarch/crypto/crc32-loongarch.c + create mode 100644 arch/loongarch/include/asm/checksum.h + create mode 100644 arch/loongarch/kernel/kfpu.c + create mode 100644 arch/loongarch/lib/csum.c + create mode 100644 arch/loongarch/lib/error-inject.c + create mode 100644 tools/arch/loongarch/include/uapi/asm/perf_regs.h + create mode 100644 tools/arch/loongarch/include/uapi/asm/unistd.h + create mode 100644 tools/perf/arch/loongarch/Build + create mode 100644 tools/perf/arch/loongarch/Makefile + create mode 100644 tools/perf/arch/loongarch/annotate/instructions.c + create mode 100755 tools/perf/arch/loongarch/entry/syscalls/mksyscalltbl + create mode 100644 tools/perf/arch/loongarch/include/dwarf-regs-table.h + create mode 100644 tools/perf/arch/loongarch/include/perf_regs.h + create mode 100644 tools/perf/arch/loongarch/util/Build + create mode 100644 tools/perf/arch/loongarch/util/dwarf-regs.c + create mode 100644 tools/perf/arch/loongarch/util/perf_regs.c + create mode 100644 tools/perf/arch/loongarch/util/unwind-libdw.c + create mode 100644 tools/perf/arch/loongarch/util/unwind-libunwind.c +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 +Already up to date. +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 +Already up to date. +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 +Already up to date. +Merging parisc-hd/for-next (6e3220ba3323a parisc: Fix argument pointer in real64_call_asm()) +$ 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 +Already up to date. +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 +Already up to date. +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 (c2d3c8441e3dd RISC-V: include cpufeature.h in cpufeature.c) +$ 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 arch/riscv/Kconfig +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/riscv/cpus.yaml | 6 + + arch/riscv/Kconfig | 23 +- + arch/riscv/errata/sifive/errata.c | 8 +- + arch/riscv/errata/thead/errata.c | 6 +- + arch/riscv/include/asm/assembler.h | 82 +++++ + arch/riscv/include/asm/sbi.h | 2 +- + arch/riscv/include/asm/suspend.h | 22 ++ + arch/riscv/kernel/Makefile | 2 + + arch/riscv/kernel/asm-offsets.c | 5 + + arch/riscv/kernel/cpu_ops.c | 2 +- + arch/riscv/kernel/cpufeature.c | 1 + + arch/riscv/kernel/hibernate-asm.S | 77 ++++ + arch/riscv/kernel/hibernate.c | 427 ++++++++++++++++++++++ + arch/riscv/kernel/sbi.c | 17 +- + arch/riscv/kernel/suspend.c | 4 +- + arch/riscv/kernel/suspend_entry.S | 34 +- + arch/riscv/kernel/vmlinux.lds.S | 12 +- + arch/riscv/kvm/main.c | 2 +- + arch/riscv/mm/init.c | 6 +- + arch/riscv/mm/pageattr.c | 8 + + drivers/cpuidle/cpuidle-riscv-sbi.c | 2 +- + drivers/perf/riscv_pmu_sbi.c | 2 +- + 22 files changed, 682 insertions(+), 68 deletions(-) + create mode 100644 arch/riscv/include/asm/assembler.h + create mode 100644 arch/riscv/kernel/hibernate-asm.S + create mode 100644 arch/riscv/kernel/hibernate.c +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 +Merge made by the 'ort' strategy. +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 +Already up to date. +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 +Already up to date. +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 +Merge made by the 'ort' 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 'ort' 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 'ort' strategy. + include/trace/events/afs.h | 475 ++++++++++++++------------------------------- + 1 file changed, 148 insertions(+), 327 deletions(-) +Merging btrfs/for-next (d795a8796940c Merge branch 'for-next-current-v6.3-20230428' into for-next-20230428) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next +Merge made by the 'ort' strategy. +Merging ceph/master (db2993a423e3f ceph: reorder fields in 'struct ceph_snapid_map') +$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master +Auto-merging fs/ceph/xattr.c +Merge made by the 'ort' strategy. + fs/ceph/addr.c | 11 +++++++- + fs/ceph/caps.c | 2 +- + fs/ceph/debugfs.c | 18 ++++++++---- + fs/ceph/dir.c | 13 +++++++-- + fs/ceph/mds_client.c | 78 ++++++++++++++++++++++++++++++++++------------------ + fs/ceph/mds_client.h | 5 ++-- + fs/ceph/super.h | 2 ++ + fs/ceph/xattr.c | 20 +++++++++----- + 8 files changed, 102 insertions(+), 47 deletions(-) +Merging cifs/for-next (1d624ebb9c2c4 cifs: fix sharing of DFS connections) +$ git merge -m Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git cifs/for-next +Merge made by the 'ort' strategy. + fs/cifs/cifs_debug.c | 7 ++- + fs/cifs/cifs_debug.h | 12 ++-- + fs/cifs/cifsfs.c | 14 ++--- + fs/cifs/cifsglob.h | 23 +++++--- + fs/cifs/cifsproto.h | 44 +++++++++++++- + fs/cifs/connect.c | 145 +++++++++++++++++++++++++--------------------- + fs/cifs/dfs.c | 137 +++++++++++++++++++++++++++++++++---------- + fs/cifs/dfs.h | 13 ++++- + fs/cifs/dfs_cache.c | 133 +++++++++++++++++++----------------------- + fs/cifs/dfs_cache.h | 9 +++ + fs/cifs/ioctl.c | 2 +- + fs/cifs/sess.c | 7 ++- + fs/cifs/smb2pdu.c | 19 ++++-- + fs/ksmbd/smb2pdu.h | 16 ----- + fs/smbfs_common/smb2pdu.h | 20 +++++++ + 15 files changed, 378 insertions(+), 223 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 +Merge made by the 'ort' 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 'ort' strategy. + fs/notify/inotify/inotify_fsnotify.c | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) +Merging ext4/dev (d4fab7b28e2f5 ext4: clean up error handling in __ext4_fill_super()) +$ 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 +Using index info to reconstruct a base tree... +M fs/ext4/inline.c +M fs/ext4/inode.c +M fs/ext4/verity.c +Falling back to patching base and 3-way merge... +Auto-merging fs/ext4/verity.c +CONFLICT (content): Merge conflict in fs/ext4/verity.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext4/inline.c +CONFLICT (content): Merge conflict in fs/ext4/inline.c +Recorded preimage for 'fs/ext4/inline.c' +Recorded preimage for 'fs/ext4/verity.c' +error: Failed to merge in the changes. +hint: Use 'git am --show-current-patch=diff' to see the failed patch +Patch failed at 0001 ext4: Handle error pointers being returned from __filemap_get_folio +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 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 'ort' 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 (eb307d09fe158 ksmbd: call rcu_barrier() in ksmbd_server_exit()) +$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next +Auto-merging fs/ksmbd/smb2pdu.h +Merge made by the 'ort' strategy. + fs/ksmbd/auth.c | 19 ++++---- + fs/ksmbd/connection.c | 68 +++++++++++++++++++-------- + fs/ksmbd/connection.h | 58 +++++++++++++++-------- + fs/ksmbd/mgmt/tree_connect.c | 13 +++++- + fs/ksmbd/mgmt/tree_connect.h | 3 ++ + fs/ksmbd/mgmt/user_session.c | 81 ++++++++++++++++++++++---------- + fs/ksmbd/mgmt/user_session.h | 1 + + fs/ksmbd/server.c | 4 +- + fs/ksmbd/smb2pdu.c | 109 +++++++++++++++++++++++++++++-------------- + fs/ksmbd/smb2pdu.h | 2 + + fs/ksmbd/transport_tcp.c | 2 +- + 11 files changed, 250 insertions(+), 110 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 (fbd2a05f29a95 NFSv4.2: Rework scratch handling for READ_PLUS) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/anna/linux-nfs.git nfs-anna/linux-next +Already up to date. +Merging nfsd/nfsd-next (58390c8ce1bdd Merge tag 'iommu-updates-v6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu) +$ git merge -m Merge branch 'nfsd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/nfsd-next +Already up to date. +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 +Already up to date. +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 +Already up to date. +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 (21e26d5e54ab7 fs/9p: Fix bit operation logic error) +$ 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 'ort' 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 +Already up to date. +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 +Already up to date. +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 +Merge made by the 'ort' 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 +Merge made by the 'ort' strategy. +Merging pci/next (34b62f186db96 Merge tag 'pci-v6.4-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci/next +Already up to date. +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 +Already up to date. +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 'ort' strategy. +Merging i2c/i2c/for-next (03230ddddf9de Merge branch 'i2c/for-current' into i2c/for-next) +$ git merge -m Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/i2c/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/i2c/brcm,kona-i2c.txt | 35 ------------- + .../devicetree/bindings/i2c/brcm,kona-i2c.yaml | 59 ++++++++++++++++++++++ + drivers/i2c/busses/i2c-gxp.c | 2 - + drivers/i2c/busses/i2c-imx-lpi2c.c | 4 +- + drivers/i2c/busses/i2c-omap.c | 2 +- + drivers/i2c/busses/i2c-tegra.c | 40 ++++++++++----- + include/linux/i2c.h | 4 +- + 7 files changed, 91 insertions(+), 55 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/i2c/brcm,kona-i2c.txt + create mode 100644 Documentation/devicetree/bindings/i2c/brcm,kona-i2c.yaml +Merging i3c/i3c/next (6b496a94c5905 i3c: ast2600: set variable ast2600_i3c_ops storage-class-specifier to static) +$ git merge -m Merge branch 'i3c/next' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c/i3c/next +Already up to date. +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 (37c95f3a3d251 CREDITS: Update email address for Mat Martineau) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Auto-merging CREDITS +Auto-merging Documentation/admin-guide/mm/ksm.rst +Auto-merging Documentation/translations/it_IT/process/submitting-patches.rst +Auto-merging Documentation/translations/zh_CN/process/magic-number.rst +Auto-merging Documentation/translations/zh_TW/process/magic-number.rst +Merge made by the 'ort' strategy. + CREDITS | 4 ++-- + Documentation/admin-guide/mm/ksm.rst | 2 +- + Documentation/arch/x86/kernel-stacks.rst | 2 +- + Documentation/timers/hrtimers.rst | 19 +++++++------------ + .../translations/it_IT/kernel-hacking/locking.rst | 2 +- + .../translations/it_IT/process/deprecated.rst | 2 +- + .../translations/it_IT/process/submitting-patches.rst | 6 +++--- + Documentation/translations/ja_JP/SubmittingPatches | 2 +- + .../translations/zh_CN/process/magic-number.rst | 2 +- + .../translations/zh_TW/process/magic-number.rst | 2 +- + 10 files changed, 19 insertions(+), 24 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 'ort' 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 (ca99a450af857 Merge branches 'acpi-properties', 'acpi-x86' and 'acpi-pm' 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 +Merge made by the 'ort' 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 +Auto-merging drivers/cpufreq/cpufreq-dt-platdev.c +Merge made by the 'ort' 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 'ort' 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 +Already up to date. +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 (531094dc71647 RDMA/efa: Add rdma write capability to device caps) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma/for-next +Already up to date. +Merging net-next/main (042334a8d424a atlantic:hw_atl2:hw_atl2_utils_fw: Remove unnecessary (void*) conversions) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/main +Merge made by the 'ort' strategy. + drivers/isdn/mISDN/dsp_cmx.c | 15 ++------------- + .../ethernet/aquantia/atlantic/hw_atl2/hw_atl2_utils_fw.c | 4 ++-- + 2 files changed, 4 insertions(+), 15 deletions(-) +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 (e6e576ec4e728 Bluetooth: Unlink CISes when LE disconnects in hci_conn_del) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master +Merge made by the 'ort' strategy. + include/net/bluetooth/hci_core.h | 2 +- + net/bluetooth/hci_conn.c | 77 +++++++++++++++++++++------------------- + 2 files changed, 42 insertions(+), 37 deletions(-) +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 drivers/net/ieee802154/ca8210.c +Auto-merging net/ieee802154/nl802154.c +Auto-merging net/mac802154/scan.c +Merge made by the 'ort' 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 +Already up to date. +$ 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... +No changes -- Patch already applied. +Merging drm-misc/for-linux-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 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc drm-misc/for-linux-next +Already up to date. +Merging amdgpu/drm-next (053a86bc3d2dd drm/amd/display: 3.2.234) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn314/dcn314_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c +Auto-merging drivers/gpu/drm/amd/display/modules/power/power_helpers.c +Auto-merging include/drm/display/drm_dp.h +Merge made by the 'ort' strategy. + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 5 +- + 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 | 28 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 39 +- + 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 | 44 +- + 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 | 185 +- + 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 | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h | 2 +- + 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 | 56 +- + 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_sched.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 25 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 6 +- + drivers/gpu/drm/amd/amdgpu/cik.c | 4 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 159 +- + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 229 +- + 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/sdma_v4_4.c | 4 + + drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 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/amdkfd/kfd_svm.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 | 63 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 10 +- + drivers/gpu/drm/amd/display/dc/dc.h | 20 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 207 +- + 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 +- + .../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 | 62 +- + .../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 | 19 +- + 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 | 220 +- + .../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 | 18 +- + .../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 + + .../gpu/drm/amd/display/dc/link/link_detection.c | 4 + + drivers/gpu/drm/amd/display/dc/link/link_dpms.c | 5 + + .../display/dc/link/protocols/link_dp_capability.c | 33 +- + .../amd/display/dc/link/protocols/link_dp_dpia.c | 2 +- + .../display/dc/link/protocols/link_dp_training.c | 5 +- + .../dc/link/protocols/link_dp_training_128b_132b.c | 10 +- + .../dc/link/protocols/link_dp_training_8b_10b.c | 4 + + .../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 | 40 +- + 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 +- + drivers/gpu/drm/ttm/ttm_tt.c | 6 + + include/drm/display/drm_dp.h | 3 + + include/drm/ttm/ttm_tt.h | 2 +- + include/uapi/drm/amdgpu_drm.h | 22 + + 179 files changed, 5575 insertions(+), 1758 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 (9470bbb53f047 drm/i915/guc/slpc: Provide sysfs for efficient freq) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel drm-intel/for-linux-next +Merge made by the 'ort' strategy. + drivers/gpu/drm/i915/display/icl_dsi.c | 2 +- + drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 11 ------- + drivers/gpu/drm/i915/display/intel_dsi_vbt.h | 1 - + drivers/gpu/drm/i915/display/skl_scaler.c | 17 ++++++++++ + drivers/gpu/drm/i915/display/vlv_dsi.c | 22 +++---------- + drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c | 35 +++++++++++++++++++++ + drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c | 38 ++++++++++++++++------- + drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.h | 1 + + drivers/gpu/drm/i915/gt/uc/intel_guc_slpc_types.h | 1 + + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 20 +++++++----- + drivers/gpu/drm/i915/i915_pci.c | 2 ++ + 11 files changed, 101 insertions(+), 49 deletions(-) +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 (457391b038033 Linux 6.3) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next +Already up to date. +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 (0d727e1856ef2 ALSA: caiaq: input: Add error handling for unsupported input methods in `snd_usb_caiaq_input_init`) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next +Already up to date. +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 +Already up to date. +Merging sound-asoc/for-next (9a92ef41d6c52 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 (0b891c83d8c54 module: include internal.h in module/dups.c) +$ git merge -m Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules/modules-next +Already up to date. +Merging input/next (3516fa162a01f Input: avoid calling input_set_abs_val() in the event handling core) +$ 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/cyttsp5.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/input/atmel,maxtouch.yaml | 7 ++ + .../input/touchscreen/cypress,tt21000.yaml | 2 + + drivers/input/Kconfig | 2 +- + drivers/input/input.c | 6 +- + drivers/input/misc/drv260x.c | 56 +++----------- + drivers/input/misc/uinput.c | 34 +++++++++ + drivers/input/tests/input_test.c | 4 +- + drivers/input/touchscreen/atmel_mxt_ts.c | 85 ++++++++++++++++++++++ + drivers/input/touchscreen/cyttsp4_core.c | 3 +- + drivers/input/touchscreen/cyttsp5.c | 5 -- + include/linux/i8042.h | 1 + + 11 files changed, 146 insertions(+), 59 deletions(-) +Merging block/for-next (7d3e462a941ec 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 .mailmap +Auto-merging block/blk-cgroup.c +Auto-merging block/genhd.c +Auto-merging drivers/block/drbd/drbd_receiver.c +Auto-merging drivers/block/ublk_drv.c +Auto-merging drivers/block/zram/zram_drv.c +Auto-merging fs/fs-writeback.c +Auto-merging fs/pipe.c +Auto-merging fs/splice.c +Merge made by the 'ort' strategy. + .mailmap | 5 +- + Documentation/admin-guide/blockdev/nbd.rst | 2 +- + block/bdev.c | 13 ++- + block/blk-cgroup.c | 3 + + 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/drbd/drbd_receiver.c | 2 +- + drivers/block/nbd.c | 7 +- + drivers/block/null_blk/main.c | 1 - + drivers/block/ublk_drv.c | 31 +++++ + drivers/block/zram/zram_drv.c | 1 - + drivers/md/bcache/super.c | 1 - + drivers/md/md-bitmap.c | 6 +- + drivers/md/raid5.c | 45 +++++++- + fs/fs-writeback.c | 2 +- + fs/splice.c | 34 +++++- + include/linux/blkdev.h | 3 - + include/uapi/linux/nbd.h | 25 ++++- + 21 files changed, 222 insertions(+), 174 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 +[master a750c6036a435] Merge branch 'for-next' of git://git.kernel.dk/linux-block.git + Date: Thu May 4 21:58:50 2023 +0900 + Committer: Mark Brown <broonie@finisterre.sirena.org.uk> +Your name and email address were configured automatically based +on your username and hostname. Please check that they are accurate. +You can suppress this message by setting them explicitly. Run the +following command and follow the instructions in your editor to edit +your configuration file: + + git config --global --edit + +After doing this, you may fix the identity used for this commit with: + + git commit --amend --reset-author + +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 (4eb0e7873c715 mmc: sdhci-cadence: Fix an error handling path in sdhci_cdns_probe()) +$ 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) +$ 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 +Already up to date. +$ 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 +Already up to date. +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 +Already up to date. +Merging regulator/for-next (adc480392d1f1 Merge remote-tracking branch 'regulator/for-6.3' into regulator-linus) +$ 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. +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/domain.c +Auto-merging security/apparmor/file.c +Auto-merging security/apparmor/policy_unpack.c +Merge made by the 'ort' 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 +Already up to date. +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 (15feaa096c234 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 +Auto-merging include/linux/workqueue.h +Auto-merging kernel/workqueue.c +Merge made by the 'ort' strategy. + include/linux/workqueue.h | 2 ++ + kernel/workqueue.c | 2 ++ + 2 files changed, 4 insertions(+) +Merging tpmdd/next (7c1a4441ddf1a tpm: Prevent hwrng from activating during resume) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tpmdd/next +Merge made by the 'ort' strategy. + drivers/char/tpm/tpm-chip.c | 4 ++++ + drivers/char/tpm/tpm-interface.c | 10 ++++++++++ + drivers/char/tpm/tpm_tis_core.c | 43 ++++++++++++++++++---------------------- + include/linux/tpm.h | 1 + + 4 files changed, 34 insertions(+), 24 deletions(-) +Merging watchdog/master (10f67d1fd2755 watchdog: dw_wdt: Simplify clk management) +$ git merge -m Merge branch 'master' of git://www.linux-watchdog.org/linux-watchdog-next.git watchdog/master +Auto-merging Documentation/devicetree/bindings/watchdog/arm-smc-wdt.yaml +Auto-merging Documentation/devicetree/bindings/watchdog/atmel,sama5d4-wdt.yaml +Auto-merging Documentation/devicetree/bindings/watchdog/brcm,bcm7038-wdt.yaml +Auto-merging Documentation/devicetree/bindings/watchdog/faraday,ftwdt010.yaml +Auto-merging Documentation/devicetree/bindings/watchdog/fsl-imx7ulp-wdt.yaml +Auto-merging Documentation/devicetree/bindings/watchdog/renesas,wdt.yaml +Auto-merging Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml +Auto-merging Documentation/devicetree/bindings/watchdog/st,stm32-iwdg.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/watchdog/watchdog_dev.c +Merge made by the 'ort' 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 | 55 +- + 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, 1154 insertions(+), 560 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 +Already up to date. +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 +Merge made by the 'ort' strategy. +$ git am -3 ../patches/0001-devicetree-fix-up-for-include-rationalisation.patch +Applying: devicetree: fix up for include rationalisation +Using index info to reconstruct a base tree... +M drivers/cpufreq/acpi-cpufreq.c +M drivers/cpufreq/pcc-cpufreq.c +Falling back to patching base and 3-way merge... +Auto-merging drivers/cpufreq/pcc-cpufreq.c +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/cpufreq/pcc-cpufreq.c +$ git add -A . +$ git commit -v -a --amend +[master 835269ce2ac8c] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git + Date: Thu May 4 22:14:34 2023 +0900 + Committer: Mark Brown <broonie@finisterre.sirena.org.uk> +Your name and email address were configured automatically based +on your username and hostname. Please check that they are accurate. +You can suppress this message by setting them explicitly. Run the +following command and follow the instructions in your editor to edit +your configuration file: + + git config --global --edit + +After doing this, you may fix the identity used for this commit with: + + git commit --amend --reset-author + +$ 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 'ort' strategy. +Merging mailbox/mailbox-for-next (d396133dced4c dt-bindings: mailbox: qcom: add compatible for IPQ9574 SoC) +$ git merge -m Merge branch 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu/integration.git mailbox/mailbox-for-next +Auto-merging Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml +Auto-merging drivers/mailbox/Kconfig +Auto-merging drivers/mailbox/rockchip-mailbox.c +Merge made by the 'ort' strategy. + .../bindings/mailbox/mediatek,gce-mailbox.yaml | 20 ++-- + .../bindings/mailbox/qcom,apcs-kpss-global.yaml | 31 +++--- + drivers/mailbox/Kconfig | 2 +- + drivers/mailbox/bcm-pdc-mailbox.c | 2 +- + drivers/mailbox/hi6220-mailbox.c | 5 +- + drivers/mailbox/mailbox-test.c | 8 ++ + drivers/mailbox/mailbox.c | 96 +++++++++++----- + drivers/mailbox/omap-mailbox.c | 25 +---- + drivers/mailbox/pcc.c | 84 +++++++------- + drivers/mailbox/qcom-apcs-ipc-mailbox.c | 11 +- + drivers/mailbox/rockchip-mailbox.c | 2 +- + include/dt-bindings/gce/mediatek,mt6795-gce.h | 123 +++++++++++++++++++++ + include/linux/mailbox_client.h | 1 + + 13 files changed, 288 insertions(+), 122 deletions(-) + create mode 100644 include/dt-bindings/gce/mediatek,mt6795-gce.h +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 (da1c4f07aa4dd Merge branch 'x86/shstk') +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master +Auto-merging arch/x86/entry/syscalls/syscall_64.tbl +CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_64.tbl +Auto-merging include/linux/mm.h +Auto-merging include/linux/syscalls.h +CONFLICT (content): Merge conflict in include/linux/syscalls.h +Auto-merging include/uapi/asm-generic/unistd.h +Auto-merging kernel/sys_ni.c +Auto-merging mm/gup.c +CONFLICT (content): Merge conflict in mm/gup.c +Auto-merging mm/memory.c +Auto-merging mm/migrate.c +Auto-merging mm/mmap.c +Recorded preimage for 'arch/x86/entry/syscalls/syscall_64.tbl' +Recorded preimage for 'include/linux/syscalls.h' +Recorded preimage for 'mm/gup.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'arch/x86/entry/syscalls/syscall_64.tbl'. +Recorded resolution for 'include/linux/syscalls.h'. +Recorded resolution for 'mm/gup.c'. +[master a1513d50a93be] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git + Committer: Mark Brown <broonie@finisterre.sirena.org.uk> +Your name and email address were configured automatically based +on your username and hostname. Please check that they are accurate. +You can suppress this message by setting them explicitly. Run the +following command and follow the instructions in your editor to edit +your configuration file: + + git config --global --edit + +After doing this, you may fix the identity used for this commit with: + + git commit --amend --reset-author +$ git diff -M --stat --summary HEAD^.. + Documentation/arch/x86/index.rst | 1 + + Documentation/arch/x86/microcode.rst | 14 + + Documentation/arch/x86/shstk.rst | 179 ++++++ + Documentation/filesystems/proc.rst | 1 + + Documentation/mm/arch_pgtable_helpers.rst | 9 +- + arch/alpha/include/asm/cmpxchg.h | 10 +- + arch/alpha/include/asm/local.h | 12 +- + arch/alpha/include/asm/pgtable.h | 6 +- + arch/arc/include/asm/cmpxchg.h | 4 +- + arch/arc/include/asm/hugepage.h | 2 +- + arch/arc/include/asm/pgtable-bits-arcv2.h | 7 +- + 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/arm64/include/asm/cmpxchg.h | 7 +- + arch/arm64/include/asm/pgtable.h | 9 +- + arch/arm64/kernel/signal.c | 2 +- + arch/arm64/kernel/signal32.c | 2 +- + arch/arm64/mm/trans_pgd.c | 4 +- + arch/csky/include/asm/pgtable.h | 2 +- + arch/hexagon/include/asm/cmpxchg.h | 10 +- + arch/hexagon/include/asm/pgtable.h | 2 +- + arch/ia64/include/asm/cmpxchg.h | 2 +- + arch/ia64/include/asm/pgtable.h | 2 +- + arch/ia64/include/uapi/asm/cmpxchg.h | 4 +- + arch/loongarch/include/asm/cmpxchg.h | 4 +- + arch/loongarch/include/asm/local.h | 13 +- + arch/loongarch/include/asm/pgtable.h | 4 +- + 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/include/asm/cmpxchg.h | 4 +- + arch/mips/include/asm/local.h | 13 +- + arch/mips/include/asm/pgtable.h | 6 +- + arch/nios2/include/asm/pgtable.h | 2 +- + arch/openrisc/include/asm/cmpxchg.h | 10 +- + arch/openrisc/include/asm/pgtable.h | 2 +- + arch/parisc/include/asm/cmpxchg.h | 4 +- + arch/parisc/include/asm/pgtable.h | 6 +- + 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/riscv/include/asm/atomic.h | 2 +- + arch/riscv/include/asm/cmpxchg.h | 4 +- + arch/riscv/include/asm/pgtable.h | 6 +- + arch/s390/include/asm/cmpxchg.h | 8 +- + arch/s390/include/asm/hugetlb.h | 4 +- + arch/s390/include/asm/pgtable.h | 14 +- + arch/s390/mm/pageattr.c | 4 +- + arch/sh/include/asm/cmpxchg.h | 4 +- + arch/sh/include/asm/pgtable_32.h | 10 +- + arch/sparc/include/asm/cmpxchg_32.h | 4 +- + arch/sparc/include/asm/cmpxchg_64.h | 6 +- + arch/sparc/include/asm/pgtable_32.h | 2 +- + arch/sparc/include/asm/pgtable_64.h | 6 +- + arch/sparc/kernel/signal32.c | 2 +- + arch/sparc/kernel/signal_64.c | 2 +- + arch/um/include/asm/pgtable.h | 2 +- + arch/x86/Kconfig | 24 + + arch/x86/Kconfig.assembler | 5 + + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + arch/x86/include/asm/cmpxchg.h | 6 + + arch/x86/include/asm/cpufeatures.h | 2 + + arch/x86/include/asm/disabled-features.h | 16 +- + 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/local.h | 13 +- + arch/x86/include/asm/mmu_context.h | 2 + + arch/x86/include/asm/pgtable.h | 322 +++++++++-- + arch/x86/include/asm/pgtable_types.h | 56 +- + arch/x86/include/asm/processor.h | 8 + + arch/x86/include/asm/shstk.h | 38 ++ + arch/x86/include/asm/special_insns.h | 13 + + arch/x86/include/asm/tlbflush.h | 3 +- + arch/x86/include/asm/trap_pf.h | 2 + + arch/x86/include/asm/traps.h | 12 + + arch/x86/include/uapi/asm/mman.h | 4 + + arch/x86/include/uapi/asm/prctl.h | 12 + + 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/fpu/core.c | 54 +- + arch/x86/kernel/fpu/regset.c | 81 +++ + arch/x86/kernel/fpu/xstate.c | 90 ++- + arch/x86/kernel/idt.c | 2 +- + arch/x86/kernel/process.c | 21 +- + arch/x86/kernel/process_64.c | 8 + + arch/x86/kernel/ptrace.c | 12 + + 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/sys_x86_64.c | 6 +- + arch/x86/kernel/traps.c | 87 --- + arch/x86/mm/fault.c | 22 + + arch/x86/mm/pat/set_memory.c | 4 +- + arch/x86/mm/pgtable.c | 38 ++ + arch/x86/xen/enlighten_pv.c | 2 +- + arch/x86/xen/mmu_pv.c | 2 +- + arch/x86/xen/xen-asm.S | 2 +- + arch/xtensa/include/asm/cmpxchg.h | 4 +- + arch/xtensa/include/asm/pgtable.h | 2 +- + fs/aio.c | 2 +- + fs/proc/array.c | 6 + + fs/proc/task_mmu.c | 3 + + 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/lockdep.h | 14 + + include/linux/lockdep_types.h | 1 + + include/linux/mm.h | 65 ++- + include/linux/mman.h | 4 + + include/linux/pgtable.h | 14 + + include/linux/proc_fs.h | 2 + + include/linux/syscalls.h | 1 + + include/uapi/asm-generic/siginfo.h | 3 +- + include/uapi/linux/elf.h | 2 + + ipc/shm.c | 2 +- + kernel/locking/lockdep.c | 28 +- + kernel/locking/rwbase_rt.c | 9 - + kernel/sys_ni.c | 1 + + lib/debugobjects.c | 32 +- + mm/debug_vm_pgtable.c | 16 +- + mm/gup.c | 2 +- + mm/huge_memory.c | 11 +- + mm/hugetlb.c | 4 +- + mm/internal.h | 4 +- + mm/memory.c | 5 +- + mm/migrate.c | 2 +- + 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 +- + tools/testing/selftests/x86/Makefile | 2 +- + tools/testing/selftests/x86/test_shadow_stack.c | 695 ++++++++++++++++++++++++ + 156 files changed, 2910 insertions(+), 449 deletions(-) + create mode 100644 Documentation/arch/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 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()" +Using index info to reconstruct a base tree... +M include/linux/iommu.h +Falling back to patching base and 3-way merge... +Auto-merging include/linux/iommu.h +No changes -- Patch already applied. +$ 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()" +Using index info to reconstruct a base tree... +M arch/x86/kernel/process_64.c +Falling back to patching base and 3-way merge... +Auto-merging arch/x86/kernel/process_64.c +No changes -- Patch already applied. +$ 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 +Using index info to reconstruct a base tree... +M mm/huge_memory.c +M mm/migrate.c +Falling back to patching base and 3-way merge... +Auto-merging mm/migrate.c +No changes -- Patch already applied. +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/sh_mtu2.c +Auto-merging drivers/clocksource/timer-stm32-lp.c +Auto-merging drivers/clocksource/timer-tegra186.c +Auto-merging drivers/clocksource/timer-ti-dm.c +Merge made by the 'ort' strategy. +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 +Merge made by the 'ort' 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 kernel/trace/ftrace.c +Merge made by the 'ort' strategy. +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 +Merge made by the 'ort' 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 +[master e1ec2e6b746e3] Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git + Date: Thu May 4 22:22:11 2023 +0900 + Committer: Mark Brown <broonie@finisterre.sirena.org.uk> +Your name and email address were configured automatically based +on your username and hostname. Please check that they are accurate. +You can suppress this message by setting them explicitly. Run the +following command and follow the instructions in your editor to edit +your configuration file: + + git config --global --edit + +After doing this, you may fix the identity used for this commit with: + + git commit --amend --reset-author + +Merging kvm/next (b3c98052d4694 Merge tag 'kvm-x86-vmx-6.4' of https://github.com/kvm-x86/linux into HEAD) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next +Already up to date. +Merging kvm-arm/next (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 'ort' 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 arch/x86/kvm/x86.c +Merge made by the 'ort' strategy. + arch/x86/kvm/mmu/tdp_mmu.c | 121 +++++++++++++++++++++------------------------ + 1 file changed, 56 insertions(+), 65 deletions(-) +$ 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" +Using index info to reconstruct a base tree... +M arch/x86/kvm/kvm_onhyperv.h +M arch/x86/kvm/svm/svm.c +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +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 +Already up to date. +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 +Merge made by the 'ort' 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 +Already up to date. +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 (8325642d2757e leds: bd2606mvv: Driver for the Rohm 6 Channel i2c LED driver) +$ 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 +Already up to date. +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 +Already up to date. +Merging driver-core/driver-core-next (33afd4b763936 Merge tag 'mm-nonmm-stable-2023-04-27-16-01' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm) +$ 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 +Already up to date. +$ 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" +Using index info to reconstruct a base tree... +M drivers/s390/crypto/ap_bus.c +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +Merging usb/usb-next (33afd4b763936 Merge tag 'mm-nonmm-stable-2023-04-27-16-01' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next +Already up to date. +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 (33afd4b763936 Merge tag 'mm-nonmm-stable-2023-04-27-16-01' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm) +$ git merge -m Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next +Already up to date. +Merging char-misc/char-misc-next (33afd4b763936 Merge tag 'mm-nonmm-stable-2023-04-27-16-01' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm) +$ 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 +Already up to date. +$ 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 +Using index info to reconstruct a base tree... +M drivers/cdx/cdx.c +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +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 +Already up to date. +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 +Already up to date. +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 69dd5bc9e8227] 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 +Already up to date. +Merging staging/staging-next (33afd4b763936 Merge tag 'mm-nonmm-stable-2023-04-27-16-01' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm) +$ git merge -m Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next +Already up to date. +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 'ort' strategy. + drivers/counter/Kconfig | 6 +++--- + drivers/counter/stm32-timer-cnt.c | 3 +++ + tools/counter/.gitignore | 2 ++ + tools/counter/Makefile | 1 + + 4 files changed, 9 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 +Merge made by the 'ort' 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 +Already up to date. +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 +Merge made by the 'ort' strategy. +$ 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 (d1316c7b9ec36 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 'ort' 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 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 +Already up to date. +Merging vhost/linux-next (bc31caabba78f virtio_net: suppress cpu stall when free_unused_bufs) +$ 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/net/virtio_net.c +Auto-merging drivers/vhost/vdpa.c +Auto-merging drivers/vhost/vhost.c +Auto-merging drivers/vhost/vhost.h +Merge made by the 'ort' strategy. + drivers/net/virtio_net.c | 4 ++++ + drivers/vhost/net.c | 11 ++++++++--- + drivers/vhost/vdpa.c | 34 ++++++++++++++++++++++++++++++---- + drivers/vhost/vhost.c | 18 +++++++++++++----- + drivers/vhost/vhost.h | 8 ++++++-- + tools/virtio/ringtest/.gitignore | 6 ++++++ + 6 files changed, 67 insertions(+), 14 deletions(-) + create mode 100644 tools/virtio/ringtest/.gitignore +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/qcom_glink_native.c +CONFLICT (content): Merge conflict in drivers/rpmsg/qcom_glink_native.c +Auto-merging drivers/rpmsg/rpmsg_core.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 c1a2d6156a534] 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/pinctrl-at91-pio4.c +CONFLICT (content): Merge conflict in drivers/pinctrl/pinctrl-at91-pio4.c +Recorded preimage for 'drivers/pinctrl/pinctrl-at91-pio4.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/pinctrl/pinctrl-at91-pio4.c'. +[master bd558f4d86123] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git +$ git diff -M --stat --summary HEAD^.. + +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 +Already up to date. +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 +Merge made by the 'ort' 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 +Merge made by the 'ort' strategy. +Merging rtc/rtc-next (e99ab4abebf82 rtc: armada38x: use devm_platform_ioremap_resource_byname()) +$ git merge -m Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next +Already up to date. +Merging nvdimm/libnvdimm-for-next (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 'ort' 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 MAINTAINERS +Auto-merging drivers/acpi/bus.c +Auto-merging drivers/gpu/drm/drm_mipi_dsi.c +Auto-merging drivers/i2c/i2c-core-of.c +Auto-merging drivers/nvmem/core.c +Auto-merging drivers/of/Makefile +CONFLICT (content): Merge conflict in drivers/of/Makefile +Auto-merging drivers/of/base.c +Auto-merging drivers/spi/spi.c +Auto-merging drivers/usb/common/ulpi.c +Auto-merging include/linux/of.h +CONFLICT (content): Merge conflict in include/linux/of.h +Auto-merging include/linux/of_device.h +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 5c12e3648c67c] 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 +Merge made by the 'ort' 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 +Already up to date. +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 'ort' 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 +Already up to date. +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 +Already up to date. +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 +Merge made by the 'ort' 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 +Already up to date. +$ 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 +[master 264c23434f35d] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git + Date: Thu May 4 22:46:03 2023 +0900 +Merging sysctl/sysctl-next (0199849acd07d sysctl: remove register_sysctl_paths()) +$ git merge -m Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git sysctl/sysctl-next +Already up to date. +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/cpumask.h +CONFLICT (content): Merge conflict in include/linux/cpumask.h +Auto-merging include/linux/find.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 11d23e73319f9] 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) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git hte/for-next +Already up to date. +Merging kspp/for-next/kspp (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 +Already up to date. diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..5cf777521b8e --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20230504 |