diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2023-05-08 14:26:09 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2023-05-08 14:26:09 +1000 |
| commit | 52025ebbb518a2d876b8aba191b348ffb1cf368b (patch) | |
| tree | b21382438d06a563b87bcd08bfee3ab12a8bc120 | |
| parent | 954877552cb54586db20df68168c431728200372 (diff) | |
| download | linux-next-next-20230508.tar.gz | |
Add linux-next specific files for 20230508next-20230508
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 360 | ||||
| -rw-r--r-- | Next/Trees | 362 | ||||
| -rw-r--r-- | Next/merge.log | 3065 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 3788 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..3118510a819d --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,360 @@ +Name SHA1 +---- ---- +origin ac9a78681b921877518763ba0e89202254349d1b +fixes ac9a78681b921877518763ba0e89202254349d1b +mm-hotfixes eaf66ae3796216ed8fb9b8c804692380808105a1 +kbuild-current 58390c8ce1bddb6c623f62e7ed36383e7fa5c02f +arc-current 30a0b95b1335e12efef89dd78518ed3e4a71a763 +arm-current 46dd6078dbc7e363a8bb01209da67015a1538929 +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 27c1eaa07283b0c94becf8241f95368267cf558b +bpf 415d7a49cd796a11cfbeaa360b13721bba5117bb +ipsec 5fc46f94219d1d103ffb5f0832be9da674d85a73 +netfilter 7fb0269720d7d5359bc8349eef908a1c96866b65 +ipvs fb7cba61919ada54d088870dd173c61b6b372873 +wireless 50749f2dd6854a41830996ad302aef2ffaf011d8 +wpan bd4e3d82f4ccb422672029b099e402e5b3acd5ee +rdma-fixes aca3b0fa3d04b40c96934d86cc224cccfa7ea8e0 +sound-current ee2dd703470242f1672403e83f827391afeca808 +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 9d9ff3d2a4a567b543b71c2967d2ccc5e0ac6816 +staging.current 33afd4b76393627477e878b3b195d606e585d816 +iio-fixes 5efe05a434fa772592bd6c9f6ddcaae67c9354dd +counter-current 6a8f57ae2eb07ab39a6f0ccad60c760743051026 +char-misc.current 33afd4b76393627477e878b3b195d606e585d816 +soundwire-fixes fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +thunderbolt-fixes 457391b0380335d5e9a5babdec90ac53928b23b4 +input-current 978134c4b192ed04ecf699be3e1b4d23b5d20457 +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 1a5304fecee523060f26e2778d9d8e33c0562df3 +kvms390-fixes 21f27df854008b86349a203bf97fef79bb11f53e +hwmon-fixes 0c072385348e3ac5229145644055d3e2afb5b3db +nvdimm-fixes c91d713630848460de8669e6570307b7e559863b +cxl-fixes c841ecd8277154c9297dd9ac959494f6deb61e76 +btrfs-fixes 5369c71879c5f6e931a03a9598a078e3b23d7f95 +vfs-fixes 609d54441493c99f21c1823dfd66fa7f4c512ff4 +dma-mapping-fixes bbb73a103fbbed6f63cb738d3783261c4241b4b2 +drivers-x86-fixes 9a469c6dfab38326f99f105386db84230be09ee3 +samsung-krzk-fixes fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +pinctrl-samsung-fixes fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +devicetree-fixes 6997f847cbb72082a2e9aa0fef8ebfcc3bd4ddc5 +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 ac9a78681b921877518763ba0e89202254349d1b +riscv-soc-fixes a7a041f2ddf300817ee6010f643424ef5efd2739 +fpga-fixes 510acc93aebca559831408f2d864b7f2106e995f +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 319050d4302ee9b216fb8cea847a9c4427628a98 +irqchip-fixes 6c9f7434159b96231f5b27ab938f4766e3586b48 +renesas-fixes ab2866f12ca18747413ba41409231d44e0c6149b +broadcom-fixes 9abf2313adc1ca1b6180c508c25f22f9395cc780 +perf-current 9a2d5178b9d51e1c5f9e08989ff97fc8d4893f31 +efi-fixes 0b1d9debe30304f35c1211e6dcdca1935ce67240 +zstd-fixes 6906598f1ce93761716d780b6e3f171e13f0f4ce +battery-fixes ac9a78681b921877518763ba0e89202254349d1b +uml-fixes a3046a618a284579d1189af8711765f553eed707 +asahi-soc-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +iommufd-fixes 13a0d1ae7ee6b438f5537711a8c60cba00554943 +rust-fixes d966c3cab924fb750fefef11e77a6fa07dd5420e +v9fs-fixes 36896bc97c0e5fe9f52f578ac7986bf4a9cdfd71 +drm-misc-fixes a26cc2934331b57b5a7164bff344f0a2ec245fc0 +mm-stable ac9a78681b921877518763ba0e89202254349d1b +mm-nonmm-stable ac9a78681b921877518763ba0e89202254349d1b +mm f3bd4c78ea06354f22136822ab96b2085d0f8d96 +kbuild 58390c8ce1bddb6c623f62e7ed36383e7fa5c02f +clang-format 781121a7f6d11d7cae44982f174ea82adeec7db0 +perf 5d27a645f60940fdf589e4ff5351506a7f0fdbaa +compiler-attributes eeac8ede17557680855031c6f305ece2378af326 +dma-mapping ec274aff21b6a94c7973384ca80a503c1bc3b173 +asm-generic 5e98654e30e18bb33d21b773b75fd68fcf673bae +arc f2906aa863381afb0015a9eb7fefad885d4e5a56 +arm 592c759d56f3778a4fc33b920764d08b876a7f96 +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 43cd56460b1788db7b0b6cd3dfa3132b279dd62b +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 457391b0380335d5e9a5babdec90ac53928b23b4 +powerpc 169f8997968ab620d750d9a45e15c5288d498356 +soc-fsl 4b0986a3613c92f4ec1bdc7f60ec66fea135991f +risc-v c2d3c8441e3ddbfe41fea9282ddc6ee372e154cd +riscv-dt 6a887bcc4138de9747fdfafc4ebf0a1c6ef4b2c1 +riscv-soc ac9a78681b921877518763ba0e89202254349d1b +s390 de12921a166538a34801fd18fca166c4aeb76fa8 +sh e5c23bec0f121b4160dc8ca61e751e734652bd05 +uml 6032aca0deb9c138df122192f8ef02de1fdccf25 +xtensa e313de5b5b04176f28384b45ebebd552c0c7dae3 +pidfd 7bcf0b65b84af5e932f4f750f839ec7426f5e4ed +vfs-idmapping 4582b273464e41945b7a686f075bff3188178879 +fscrypt 83e57e47906ce0e99bd61c70fae514e69960d274 +fscache 0885eacdc81f920c3e0554d5615e69a66504a28d +afs 0a278bc196e784b4849c1581266421adbca1989f +btrfs d795a8796940c7fe89624f975440c5de321def52 +ceph db2993a423e3fd0e4878f4d3ac66fe717f5f072e +cifs 2911b796b20fde9ba974af30a94bfaf9282a6014 +configfs 77992f896745c63ae64bfccfdc429ab7b3d88da5 +ecryptfs a3d78fe3e1ae8c6a1901635c54a1a799656f72c8 +erofs 745ed7d77834048879bf24088c94e5a6462b613f +exfat fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +ext3 df9c5af6a4efea4d04377f74a9766bc87fa34198 +ext4 d4fab7b28e2f5d74790d47a8d298da0abfb5132f +f2fs b68ee1c6131c540a62ecd443be89c406401df091 +fsverity 04839139213cf60d4c5fc792214a08830e294ff8 +fuse c68ea140050e631d24d61b6e399ca8224a4a2219 +gfs2 644f6bf762fa903f64c59c2ec0f4d0d753527053 +jfs fad376fce0af58deebc5075b8539dc05bf639af3 +ksmbd 201b70446c10bc5ea7a50f1c4a7b4bc61e157308 +nfs e8d018dd0257f744ca50a729e3d042cf2ec9da65 +nfs-anna fbd2a05f29a95d5b42b294bf47e55a711424965b +nfsd 58390c8ce1bddb6c623f62e7ed36383e7fa5c02f +ntfs3 788ee1605c2e9feed39c3a749fb3e47c6e15c1b9 +orangefs 31720a2b109b3080eb77e97b8f6f50a27b4ae599 +overlayfs 4f11ada10d0ad3fd53e2bd67806351de63a4f9c3 +ubifs b5fda08ef213352ac2df7447611eb4d383cce929 +v9fs 4ec5183ec48656cec489c49f989c508b68b518e3 +v9fs-ericvh ac9a78681b921877518763ba0e89202254349d1b +xfs 2254a7396a0ca6309854948ee1c0a33fa4268cec +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 cdc822dda6f82269b94d5fa60ddc71d98c160fa0 +v4l-dvb 20af6be6bee4c3af80aac9b44b3d32d89824dde7 +v4l-dvb-next 423f331364bfbcd1212b78ac9052894ff5213ac9 +pm 7163a2111f6c030ee39635ac3334bfa1a52a3dd3 +cpufreq-arm cde3bb62bf56f34781c3a0e062630f1b7fe6d8c2 +cpupower 9f8acaf033b38f9b0784ae9bfaae2230114fe680 +devfreq 376b1446153ca67e7028e6b9555d9b17477f568b +opp 528f2d8d540a3c374d6b765c769620d91536b176 +thermal 2afa82d1fc648c8d4c2ef9e876626abb1089f9ab +dlm 7a40f1f18a88c6d43c8725d7f45146480a79fde1 +rdma 531094dc7164718d28ebb581d729807d7e846363 +net-next ed23734c23d2fc1e6a1ff80f8c2b82faeed0ed0c +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 1bef84af084e981550d9ecc3359baa22533d7b99 +drm-misc cf03e2956af307dc25e8c41fd4cffe44482a6ec1 +amdgpu e885f10b715bf63076af8e97f51005ee348c00de +drm-intel c8c2969bfcba5fcba3a5b078315c1b586d927d9f +drm-tegra 2429b3c529da29d4277d519bd66d034842dcd70c +drm-msm ac7e7c9c65ecfb1fcc99de91cfd6b17a8d4cb9c1 +drm-msm-lumag ac7e7c9c65ecfb1fcc99de91cfd6b17a8d4cb9c1 +imx-drm 927d8fd465adbaaad6cce82f840d489d7c378f29 +etnaviv 4c22c61e429f004d84eba72d7195bccef33ea0ec +fbdev 457391b0380335d5e9a5babdec90ac53928b23b4 +regmap 4a670ac3e75e517c96cbd01ef870dbd598c3ce71 +sound ee2dd703470242f1672403e83f827391afeca808 +ieee1394 02dc51a0a07a379539b4661ecb56eeb5b19b3928 +sound-asoc 9a92ef41d6c52c0b8c83dcd613ad2107d2d3a962 +modules 0b891c83d8c54cb70e186456c2191adb5fd98c56 +input e1141b0c625e495006c814edc3ffc58ef9ee86b5 +block 7d3e462a941ece63c640dfa08be36c983de27b6f +device-mapper 38d11da522aacaa05898c734a1cec86f1e611129 +libata 140b26035b2d379d94e6e3936ab2e0adf94efe46 +pcmcia 15e74c6c1ce2d388e967f32cdaa83ca034fa6452 +mmc 4eb0e7873c7159298799aabbd0f29b48689a73f0 +mfd 9e9ff39243ea8795a4833708613f884b39dc91f9 +backlight fb200218b40b7864f64f1a47de61e035d8934e92 +battery ac9a78681b921877518763ba0e89202254349d1b +regulator adc480392d1f11b0868ac482e5d0af8f21106d2f +security d82dcd9e21b77d338dc4875f3d4111f0db314a7c +apparmor 0bb84cff96af29d8531a1a2bee04e521cdfe35ce +integrity 644f17412f5acf01a19af9d04a921937a2bc86c6 +safesetid 64b634830c919979de4b18163e15d30df66e64a8 +selinux 4ce1f694eb5d8ca607fed8542d32a33b4f1217a5 +smack de93e515db306767549bb29a926f523ca2a601ab +tomoyo 15feaa096c2347b5833cb6cb576ee3f6c34bfc09 +tpmdd 7c1a4441ddf1aeba8ad4c411478eac37abcacc55 +watchdog fc4354c6e5c21257cf4a50b32f7c11c7d65c55b3 +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 7a8016d95651fecce5708ed93a24a03a9ad91c80 +kvm-arm 74819ee73f1f33ac75ae955ce0397a25ab1ec2f8 +kvms390 8a46df7cd135fe576c18efa418cd1549e51f2732 +kvm-x86 5c291b93e5d665380dbecc6944973583f9565ee5 +xen-tip cbfac7707ba16619006a4fd60faac46303fd2f3e +percpu b9819165bb455bfdce37086c622a18cce2dd2f5e +workqueues 704bc669e1dda3eb8f6d5cb462b21e85558a3912 +drivers-x86 e578c943e363ff47d08e7b4f5648f3da9db325d8 +chrome-platform d184d60aa301e424cd0cf7de90b40744710a2417 +hsi ac9a78681b921877518763ba0e89202254349d1b +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 ebddc00f450de4f54a591bd5670016562eade445 +rpmsg ac9a78681b921877518763ba0e89202254349d1b +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..a55a6455d35d --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,3065 @@ +$ date -R +Mon, 08 May 2023 10:54:15 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 78b421b6a7c6 Merge tag 'linux-watchdog-6.4-rc1' of git://www.linux-watchdog.org/linux-watchdog +Merging origin/master (ac9a78681b92 Linux 6.4-rc1) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating 78b421b6a7c6..ac9a78681b92 +Fast-forward (no commit created; -m option ignored) + .mailmap | 5 +- + CREDITS | 4 +- + Documentation/admin-guide/blockdev/nbd.rst | 2 +- + Documentation/admin-guide/mm/ksm.rst | 2 +- + Documentation/arch/x86/kernel-stacks.rst | 2 +- + .../bindings/clock/renesas,r9a06g032-sysctrl.yaml | 2 +- + .../devicetree/bindings/i2c/brcm,kona-i2c.txt | 35 - + .../devicetree/bindings/i2c/brcm,kona-i2c.yaml | 59 + + .../devicetree/bindings/i2c/renesas,rzv2m.yaml | 2 +- + .../bindings/mailbox/mediatek,gce-mailbox.yaml | 20 +- + .../bindings/mailbox/qcom,apcs-kpss-global.yaml | 31 +- + .../bindings/memory-controllers/arm,pl35x-smc.yaml | 1 - + .../bindings/mtd/arasan,nand-controller.yaml | 2 +- + .../bindings/mtd/arm,pl353-nand-r2p1.yaml | 1 - + .../devicetree/bindings/perf/riscv,pmu.yaml | 1 - + .../bindings/pinctrl/renesas,rzn1-pinctrl.yaml | 2 +- + .../bindings/pinctrl/renesas,rzv2m-pinctrl.yaml | 2 +- + Documentation/devicetree/bindings/riscv/cpus.yaml | 6 + + Documentation/power/regulator/consumer.rst | 2 +- + Documentation/sound/alsa-configuration.rst | 13 + + .../sound/kernel-api/writing-an-alsa-driver.rst | 22 +- + Documentation/timers/hrtimers.rst | 19 +- + Documentation/trace/ftrace.rst | 25 + + .../translations/it_IT/kernel-hacking/locking.rst | 2 +- + .../translations/it_IT/process/deprecated.rst | 2 +- + .../it_IT/process/submitting-patches.rst | 6 +- + Documentation/translations/ja_JP/SubmittingPatches | 2 +- + .../translations/sp_SP/process/adding-syscalls.rst | 632 + + Documentation/translations/sp_SP/process/index.rst | 1 + + .../translations/zh_CN/process/magic-number.rst | 2 +- + .../translations/zh_TW/process/magic-number.rst | 2 +- + MAINTAINERS | 8 +- + Makefile | 4 +- + arch/alpha/include/asm/cmpxchg.h | 10 +- + arch/alpha/include/asm/local.h | 12 +- + arch/arc/include/asm/cmpxchg.h | 4 +- + arch/arm/include/asm/cmpxchg.h | 7 +- + arch/arm64/include/asm/cmpxchg.h | 7 +- + arch/hexagon/include/asm/cmpxchg.h | 10 +- + arch/ia64/include/asm/cmpxchg.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/m68k/include/asm/cmpxchg.h | 6 +- + arch/mips/include/asm/cmpxchg.h | 4 +- + arch/mips/include/asm/local.h | 13 +- + arch/openrisc/include/asm/cmpxchg.h | 10 +- + arch/parisc/include/asm/cmpxchg.h | 4 +- + arch/powerpc/include/asm/cmpxchg.h | 4 +- + arch/powerpc/include/asm/local.h | 11 + + 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/atomic.h | 2 +- + arch/riscv/include/asm/cmpxchg.h | 4 +- + arch/riscv/include/asm/csr.h | 107 +- + arch/riscv/include/asm/hwcap.h | 8 + + arch/riscv/include/asm/kvm_aia.h | 127 + + arch/riscv/include/asm/kvm_host.h | 14 +- + arch/riscv/include/asm/kvm_vcpu_sbi.h | 8 +- + arch/riscv/include/asm/sbi.h | 2 +- + arch/riscv/include/asm/suspend.h | 22 + + arch/riscv/include/uapi/asm/kvm.h | 51 +- + arch/riscv/kernel/Makefile | 2 + + arch/riscv/kernel/asm-offsets.c | 5 + + arch/riscv/kernel/cpu.c | 2 + + arch/riscv/kernel/cpu_ops.c | 2 +- + arch/riscv/kernel/cpufeature.c | 3 + + 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/Kconfig | 10 +- + arch/riscv/kvm/Makefile | 1 + + arch/riscv/kvm/aia.c | 388 + + arch/riscv/kvm/main.c | 24 +- + arch/riscv/kvm/mmu.c | 28 +- + arch/riscv/kvm/vcpu.c | 194 +- + arch/riscv/kvm/vcpu_insn.c | 1 + + arch/riscv/kvm/vcpu_sbi.c | 247 +- + arch/riscv/kvm/vcpu_sbi_base.c | 2 +- + arch/riscv/kvm/vm.c | 4 + + arch/riscv/kvm/vmid.c | 4 +- + arch/riscv/mm/init.c | 6 +- + arch/riscv/mm/pageattr.c | 8 + + arch/s390/Kconfig | 1 - + arch/s390/include/asm/cmpxchg.h | 8 +- + arch/s390/kernel/uv.c | 32 +- + arch/s390/kvm/pv.c | 5 + + arch/s390/mm/gmap.c | 7 + + arch/sh/include/asm/cmpxchg.h | 4 +- + arch/sparc/include/asm/cmpxchg_32.h | 4 +- + arch/sparc/include/asm/cmpxchg_64.h | 6 +- + arch/x86/include/asm/cmpxchg.h | 6 + + arch/x86/include/asm/local.h | 13 +- + arch/x86/include/asm/uaccess.h | 90 +- + arch/x86/include/asm/uaccess_32.h | 3 + + arch/x86/include/asm/uaccess_64.h | 83 +- + arch/x86/kvm/mmu/tdp_mmu.c | 121 +- + arch/x86/mm/extable.c | 40 +- + arch/xtensa/include/asm/cmpxchg.h | 4 +- + 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 - + 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/acpi/video_detect.c | 14 - + 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 | 71 +- + drivers/block/zram/zram_drv.c | 1 - + drivers/clk/clk-sp7021.c | 2 +- + drivers/clk/imx/clk-composite-8m.c | 7 - + drivers/clk/starfive/Kconfig | 5 +- + drivers/cpuidle/cpuidle-riscv-sbi.c | 2 +- + .../crypto/allwinner/sun8i-ss/sun8i-ss-cipher.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 39 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c | 6 +- + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 1 - + drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 1 - + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 1 - + drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/nv.c | 23 +- + drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c | 2 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 25 +- + drivers/gpu/drm/amd/amdgpu/soc21.c | 23 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 34 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 1 - + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 17 +- + drivers/gpu/drm/amd/display/amdgpu_dm/dc_fpu.c | 2 + + .../amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c | 5 + + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 3 + + drivers/gpu/drm/amd/display/dc/dc.h | 1 + + drivers/gpu/drm/amd/display/dc/dc_stream.h | 2 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 19 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 9 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 25 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 4 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c | 4 + + .../gpu/drm/amd/display/dc/dcn314/dcn314_dccg.c | 2 +- + .../drm/amd/display/dc/dcn314/dcn314_resource.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c | 1 + + .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.c | 56 +- + .../drm/amd/display/dc/dcn321/dcn321_resource.c | 10 +- + .../gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 178 +- + .../gpu/drm/amd/display/dc/dml/dcn30/dcn30_fpu.c | 18 +- + .../gpu/drm/amd/display/dc/dml/dcn314/dcn314_fpu.c | 4 +- + .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 17 +- + .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.h | 2 + + .../gpu/drm/amd/display/dc/dml/dcn321/dcn321_fpu.c | 24 +- + drivers/gpu/drm/amd/display/dc/link/link_dpms.c | 5 + + .../display/dc/link/protocols/link_dp_training.c | 5 +- + .../dc/link/protocols/link_edp_panel_control.c | 1 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn32.c | 3 +- + drivers/gpu/drm/amd/display/include/signal_types.h | 1 + + 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/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/uc/intel_uc_fw.c | 20 +- + drivers/gpu/drm/i915/i915_pci.c | 2 + + 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 +- + drivers/isdn/mISDN/dsp_cmx.c | 15 +- + 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 +- + drivers/md/bcache/super.c | 1 - + drivers/md/md-bitmap.c | 6 +- + drivers/md/raid5.c | 45 +- + drivers/net/bonding/bond_main.c | 29 + + drivers/net/bonding/bond_options.c | 2 + + drivers/net/dsa/mt7530.c | 14 +- + drivers/net/dsa/mv88e6xxx/chip.c | 1 + + drivers/net/ethernet/amd/Kconfig | 2 + + drivers/net/ethernet/amd/pds_core/Makefile | 3 +- + drivers/net/ethernet/amd/pds_core/main.c | 21 +- + .../net/ethernet/aquantia/atlantic/aq_pci_func.c | 2 + + .../aquantia/atlantic/hw_atl2/hw_atl2_utils_fw.c | 4 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 1 - + drivers/net/ethernet/freescale/enetc/enetc_qos.c | 2 +- + drivers/net/ethernet/freescale/fec_main.c | 13 +- + drivers/net/ethernet/intel/ice/ice_tc_lib.c | 3 +- + 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 +- + drivers/net/virtio_net.c | 2 + + drivers/nvme/host/ioctl.c | 2 +- + drivers/of/fdt.c | 5 +- + drivers/perf/riscv_pmu_sbi.c | 2 +- + drivers/phy/mediatek/phy-mtk-hdmi-mt8195.c | 12 +- + 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/thermal/intel/intel_powerclamp.c | 4 + + drivers/ufs/core/ufs-mcq.c | 6 +- + fs/9p/Kconfig | 2 +- + fs/9p/vfs_addr.c | 1 - + fs/9p/vfs_dentry.c | 1 - + fs/9p/vfs_dir.c | 1 - + fs/9p/vfs_file.c | 1 - + fs/9p/vfs_inode.c | 1 - + fs/9p/vfs_inode_dotl.c | 1 - + fs/9p/vfs_super.c | 1 - + fs/afs/afs.h | 4 +- + fs/afs/dir_edit.c | 7 +- + fs/afs/internal.h | 2 +- + fs/afs/rxrpc.c | 8 +- + 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 | 141 +- + 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 | 21 +- + fs/fs-writeback.c | 2 +- + 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 | 18 +- + fs/ksmbd/transport_tcp.c | 2 +- + fs/nfs/dir.c | 2 +- + fs/nilfs2/bmap.c | 16 +- + fs/nilfs2/segment.c | 5 +- + fs/pipe.c | 3 + + fs/smbfs_common/smb2pdu.h | 20 + + fs/splice.c | 34 +- + include/asm-generic/local.h | 1 + + include/asm-generic/local64.h | 12 +- + include/dt-bindings/gce/mediatek,mt6795-gce.h | 123 + + include/linux/atomic/atomic-arch-fallback.h | 24 +- + include/linux/atomic/atomic-instrumented.h | 86 +- + include/linux/blkdev.h | 3 - + include/linux/ftrace.h | 4 +- + include/linux/i2c.h | 4 +- + include/linux/io_uring.h | 7 +- + include/linux/mailbox_client.h | 1 + + include/net/af_rxrpc.h | 21 +- + include/net/bonding.h | 1 + + include/net/netfilter/nf_tables.h | 1 + + include/uapi/linux/nbd.h | 25 +- + io_uring/io_uring.h | 10 + + io_uring/opdef.c | 2 +- + io_uring/rsrc.c | 7 +- + io_uring/uring_cmd.c | 12 +- + io_uring/uring_cmd.h | 8 - + kernel/locking/rwbase_rt.c | 9 - + kernel/trace/ftrace.c | 12 +- + kernel/trace/trace.c | 2 +- + lib/debugobjects.c | 21 +- + mm/dmapool.c | 407 +- + mm/filemap.c | 2 +- + mm/gup.c | 2 + + mm/mmap.c | 10 +- + mm/vmscan.c | 10 + + net/9p/Kconfig | 2 + + 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 | 9 +- + scripts/atomic/gen-atomic-fallback.sh | 4 + + scripts/atomic/gen-atomic-instrumented.sh | 8 +- + sound/core/pcm_lib.c | 105 +- + sound/core/pcm_local.h | 3 +- + sound/core/pcm_native.c | 6 +- + 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 | 5 + + 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 + + sound/usb/caiaq/input.c | 1 + + sound/usb/quirks-table.h | 58 + + 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 | 112 +- + tools/perf/Makefile.perf | 31 +- + 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 | 142 +- + tools/perf/builtin-mem.c | 12 +- + tools/perf/builtin-probe.c | 2 +- + tools/perf/builtin-record.c | 54 +- + tools/perf/builtin-report.c | 63 +- + tools/perf/builtin-sched.c | 17 +- + tools/perf/builtin-script.c | 39 +- + tools/perf/builtin-stat.c | 279 +- + tools/perf/builtin-timechart.c | 2 +- + tools/perf/builtin-top.c | 67 +- + tools/perf/builtin-trace.c | 18 +- + tools/perf/builtin-version.c | 8 +- + 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 | 2 +- + 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 | 2 +- + 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/bpf_skel/vmlinux.h | 173 + + 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 | 26 +- + 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 | 200 +- + 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 +- + .../selftests/net/srv6_end_dt46_l3vpn_test.sh | 10 +- + tools/testing/selftests/netfilter/Makefile | 7 +- + 889 files changed, 176432 insertions(+), 150438 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/i2c/brcm,kona-i2c.txt + create mode 100644 Documentation/devicetree/bindings/i2c/brcm,kona-i2c.yaml + create mode 100644 Documentation/translations/sp_SP/process/adding-syscalls.rst + create mode 100644 arch/riscv/include/asm/assembler.h + create mode 100644 arch/riscv/include/asm/kvm_aia.h + create mode 100644 arch/riscv/kernel/hibernate-asm.S + create mode 100644 arch/riscv/kernel/hibernate.c + create mode 100644 arch/riscv/kvm/aia.c + create mode 100644 include/dt-bindings/gce/mediatek,mt6795-gce.h + 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/bpf_skel/vmlinux.h + create mode 100644 tools/perf/util/demangle-cxx.cpp + create mode 100644 tools/perf/util/demangle-cxx.h +Merging fixes/fixes (ac9a78681b92 Linux 6.4-rc1) +$ 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 (eaf66ae37962 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 +Merge made by the 'ort' strategy. + include/linux/shrinker.h | 13 +++++++++++-- + lib/maple_tree.c | 12 +++--------- + mm/kfence/kfence.h | 2 +- + mm/memory.c | 3 +++ + mm/shmem.c | 17 ++++++++++++++++- + mm/shrinker_debug.c | 15 ++++++++++----- + mm/vmscan.c | 5 +++-- + mm/zsmalloc.c | 36 +++++++++--------------------------- + mm/zswap.c | 16 ++++++++++++++++ + 9 files changed, 72 insertions(+), 47 deletions(-) +Merging kbuild-current/fixes (58390c8ce1bd 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 (30a0b95b1335 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 (46dd6078dbc7 ARM: 9296/1: HP Jornada 7XX: fix kernel-doc warnings) +$ git merge -m Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm-current/fixes +Auto-merging arch/arm/mach-sa1100/jornada720_ssp.c +Merge made by the 'ort' strategy. + arch/arm/kernel/unwind.c | 25 ++++++++++++++++++++++++- + arch/arm/mach-sa1100/jornada720_ssp.c | 5 ++++- + 2 files changed, 28 insertions(+), 2 deletions(-) +Merging arm64-fixes/for-next/fixes (32d859996806 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 (d75eecc3d170 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 (fe15c26ee26e 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 (fe15c26ee26e 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 (ceaa837f96ad Linux 6.2-rc8) +$ git merge -m Merge branch 'fixes' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee-fixes/fixes +Already up to date. +Merging m68k-current/for-linus (aaee8c7f2a17 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 (b277fc793daf 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 (f9bbf25e7b2b 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 (2d2b17d08bfc 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 (4bcf6f827a79 fscrypt: check for NULL keyring in fscrypt_put_master_key_activeref()) +$ git merge -m Merge branch 'for-current' of git://git.kernel.org/pub/scm/fs/fscrypt/linux.git fscrypt-current/for-current +Already up to date. +Merging fsverity-current/for-current (a075bacde257 fsverity: don't drop pagecache at end of FS_IOC_ENABLE_VERITY) +$ git merge -m Merge branch 'for-current' of git://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity-current/for-current +Already up to date. +Merging net/main (27c1eaa07283 net: mdio: mvusb: Fix an error handling path in mvusb_mdio_probe()) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/main +Merge made by the 'ort' strategy. + drivers/net/mdio/mdio-mvusb.c | 11 ++++++++++- + net/core/skbuff.c | 4 ++-- + 2 files changed, 12 insertions(+), 3 deletions(-) +Merging bpf/master (415d7a49cd79 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 (5fc46f94219d 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 (7fb0269720d7 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 (fb7cba61919a 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 (50749f2dd685 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 (bd4e3d82f4cc 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 (aca3b0fa3d04 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 (ee2dd7034702 ALSA: pcm: use exit controlled loop in snd_pcm_playback_silence()) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus +Already up to date. +Merging sound-asoc-fixes/for-linus (9a92ef41d6c5 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. +Merging regmap-fixes/for-linus (eeac8ede1755 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 (adc480392d1f 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. +Merging spi-fixes/for-linus (cb1499966178 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 (34b62f186db9 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 (33afd4b76393 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 (33afd4b76393 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 (33afd4b76393 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 (09a9639e56c0 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 (9d9ff3d2a4a5 phy: mediatek: hdmi: mt8195: fix wrong pll calculus) +$ 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 (33afd4b76393 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 (5efe05a434fa iio: addac: ad74413: fix resistance input processing) +$ 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. + .../bindings/iio/adc/nxp,imx8qxp-adc.yaml | 7 +++ + 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/adc/stm32-adc.c | 61 ++++++++++++---------- + drivers/iio/addac/ad74413r.c | 2 +- + drivers/iio/industrialio-gts-helper.c | 42 +++++++++++---- + drivers/iio/light/rohm-bu27034.c | 14 +++-- + drivers/iio/light/vcnl4035.c | 3 ++ + drivers/iio/magnetometer/tmag5273.c | 5 +- + include/linux/iio/iio-gts-helper.h | 2 +- + 15 files changed, 167 insertions(+), 73 deletions(-) +Merging counter-current/counter-current (6a8f57ae2eb0 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 (33afd4b76393 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 (fe15c26ee26e 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 (457391b03803 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 (978134c4b192 Input: fix open count when closing inhibited device) +$ 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/input.c | 2 +- + drivers/input/touchscreen/cyttsp5.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging crypto-current/master (b8969a1b6967 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 +Already up to date. +Merging vfio-fixes/for-linus (4928f67bc911 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 (f1594bc67657 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 (f412eef03938 Documentation: livepatch: module-elf-format: Remove local klp_modinfo definition) +$ git merge -m Merge branch 'modules-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules-fixes/modules-linus +Already up to date. +Merging dmaengine-fixes/fixes (d9503be5a100 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 (88603b6dc419 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 (93942b704615 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 (88603b6dc419 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 (8df08ba4a331 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 (3a2390c6777e 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 (6dcbd0a69c84 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 (fe15c26ee26e 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 (2a906db2824b 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 (1a5304fecee5 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/virt/kvm/kvm.git kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (21f27df85400 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 (0c072385348e 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 (c91d71363084 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 (c841ecd82771 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 (5369c71879c5 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 | 17 +++++++---------- + 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(+), 19 deletions(-) +Merging vfs-fixes/fixes (609d54441493 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 (bbb73a103fbb 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 (9a469c6dfab3 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 (fe15c26ee26e 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 (fe15c26ee26e 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 (6997f847cbb7 MAINTAINERS: add Conor as a dt-bindings maintainer) +$ git merge -m Merge branch 'dt/linus' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree-fixes/dt/linus +Already up to date. +Merging dt-krzk-fixes/fixes (fe15c26ee26e 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 (c8e22b7a1694 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 (00a4bd000e78 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 (457391b03803 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 (4eb0e7873c71 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 (08279468a294 rtc: sunplus: fix format string for printing resource) +$ git merge -m Merge branch 'rtc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc-fixes/rtc-fixes +Already up to date. +Merging gnss-fixes/gnss-linus (1b929c02afd3 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 (f8acb24aaf89 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 (4b0986a3613c 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 (1b50f956c8fe 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 (ac9a78681b92 Linux 6.4-rc1) +$ 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 (a7a041f2ddf3 soc: microchip: mpfs: handle failed system service requests) +$ 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 +Merge made by the 'ort' strategy. + drivers/soc/microchip/mpfs-sys-controller.c | 6 ++++++ + 1 file changed, 6 insertions(+) +Merging fpga-fixes/fixes (510acc93aebc dt-bindings: fpga: replace Ivan Bornyakov maintainership) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga-fixes/fixes +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/fpga/lattice,sysconfig.yaml | 2 +- + Documentation/devicetree/bindings/fpga/microchip,mpf-spi-fpga-mgr.yaml | 2 +- + MAINTAINERS | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) +Merging spdx/spdx-linus (33afd4b76393 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 (2ce987d7eeb1 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 (fe15c26ee26e 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 (fe15c26ee26e 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 (3993f4f45630 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 (fe15c26ee26e 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 (2241ab53cbb5 Linux 6.2-rc5) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs-fixes/fixes +Already up to date. +Merging memblock-fixes/fixes (647037adcad0 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 (319050d4302e SUNRPC: Fix error handling in svc_setup_socket()) +$ 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 +++++++++++------ + net/sunrpc/svcsock.c | 16 ++++------------ + 5 files changed, 39 insertions(+), 31 deletions(-) +Merging irqchip-fixes/irq/irqchip-fixes (6c9f7434159b 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 (ab2866f12ca1 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 (9abf2313adc1 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 (9a2d5178b9d5 Revert "perf build: Make BUILD_BPF_SKEL default, rename to NO_BPF_SKEL") +$ git merge -m Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git perf-current/perf/urgent +Already up to date. +Merging efi-fixes/urgent (0b1d9debe303 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 (6906598f1ce9 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 (ac9a78681b92 Linux 6.4-rc1) +$ 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 (a3046a618a28 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 (568035b01cfb 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 (13a0d1ae7ee6 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 (d966c3cab924 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 (36896bc97c0e 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 (a26cc2934331 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 (ac9a78681b92 Linux 6.4-rc1) +$ git merge -m Merge branch 'mm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-stable/mm-stable +Already up to date. +Merging mm-nonmm-stable/mm-nonmm-stable (ac9a78681b92 Linux 6.4-rc1) +$ 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 (f3bd4c78ea06 Merge branch 'mm-nonmm-unstable' into mm-everything) +$ git merge -m Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm/mm-everything +Auto-merging MAINTAINERS +Auto-merging fs/fs-writeback.c +Auto-merging mm/filemap.c +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/maple_tree.h | 129 ++- + include/linux/memcontrol.h | 5 - + include/linux/mm.h | 14 + + include/linux/mmdebug.h | 14 + + 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 + + lib/Kconfig.debug | 10 +- + lib/maple_tree.c | 1175 +++++++++++--------- + lib/test_maple_tree.c | 863 ++++++++++++-- + mm/compaction.c | 12 +- + mm/debug.c | 9 + + mm/filemap.c | 171 +++ + mm/gup.c | 145 ++- + mm/internal.h | 26 +- + mm/memcontrol.c | 192 ++-- + mm/migrate.c | 49 +- + mm/mmap.c | 169 +-- + mm/page_alloc.c | 2 +- + mm/workingset.c | 150 ++- + scripts/spelling.txt | 22 + + tools/testing/radix-tree/linux/init.h | 1 + + tools/testing/radix-tree/maple.c | 164 +-- + 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 +++++ + 40 files changed, 2720 insertions(+), 1011 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 +Merging kbuild/for-next (58390c8ce1bd 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 (781121a7f6d1 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 (5d27a645f609 perf tracepoint: Fix memory leak in is_valid_tracepoint()) + 1f30bd499605 ("perf symbols: Fix return incorrect build_id size in elf_read_build_id()") + 419bd54a3875 ("perf list: Fix memory leaks in print_tracepoint_events()") + 4692917156b2 ("perf script: Print raw ip instead of binary offset for callchain") + 494fc963a281 ("perf lock contention: Fix struct rq lock access") + 4e05971903f0 ("perf unwind: Suppress massive unsupported target platform errors") + 5d27a645f609 ("perf tracepoint: Fix memory leak in is_valid_tracepoint()") + 7e5fd3db2371 ("perf lock contention: Rework offset calculation with BPF CO-RE") + aec1164e09cc ("perf script: Add new parameter in kfree_skb tracepoint to the python scripts using it") + db483eee8670 ("perf build: Fix unescaped # in perf build-test") + e7767ec67a10 ("perf cs-etm: Add fix for coresight trace for any range of CPUs") + e7cac3fd8ca6 ("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 (eeac8ede1755 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 (ec274aff21b6 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 (5e98654e30e1 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 (f2906aa86338 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 (592c759d56f3 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 +Merge made by the 'ort' strategy. +Merging arm64/for-next/core (0fddb79bf283 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 +Already up to date. +Merging arm-perf/for-next/perf (257aedb72e73 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 (8ecfe9a0e657 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 (ae68fb187b59 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 (f41aba157819 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 (7d4f0b0df7c5 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 (ad5125686a4f 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 (89ec1caa5e4a 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 (fe15c26ee26e 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 (3ec0e1ea4770 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 (159d28f66699 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 (e586dd447172 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 (12845aa04754 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 (c45167f4f5cf 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 (8358703a007e 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 (6f03a6e4e947 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 (1b929c02afd3 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 (43cd56460b17 Merge branch 'v6.5-armsoc/dts64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git rockchip/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/rockchip.yaml | 7 + + .../devicetree/bindings/soc/rockchip/grf.yaml | 2 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + arch/arm64/boot/dts/rockchip/Makefile | 2 + + arch/arm64/boot/dts/rockchip/rk3308.dtsi | 1 + + arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 14 +- + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 1 + + .../boot/dts/rockchip/rk3566-soquartz-cm4.dts | 18 +- + arch/arm64/boot/dts/rockchip/rk3566-soquartz.dtsi | 29 +- + .../boot/dts/rockchip/rk3568-fastrhino-r66s.dts | 27 ++ + .../boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi | 484 +++++++++++++++++++++ + .../boot/dts/rockchip/rk3568-fastrhino-r68s.dts | 112 +++++ + arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 34 ++ + drivers/soc/rockchip/dtpm.c | 54 +-- + drivers/soc/rockchip/pm_domains.c | 160 +++++-- + 15 files changed, 850 insertions(+), 97 deletions(-) + create mode 100644 arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r68s.dts +Merging samsung-krzk/for-next (f5391a4705ef 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 (3bd27ce7a013 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 (49f1d0b65f87 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 (7081db38231a 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 (cf1773f935d8 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 (7947eeb21f00 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 (a8fccb83f3e2 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 (ec1696c3440f 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 (31c6ed4e8918 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 +Already up to date. +Merging clk-imx/for-next (8a05f5cccdbe 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 (5e96c2e0e88d 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 (b35f27fe73d8 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 (1f62ed00a56b 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 +Already up to date. +Merging loongarch/loongarch-next (2fa5ebe3bc4e 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 +Already up to date. +Merging m68k/for-next (aaee8c7f2a17 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 (8ab89e956316 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 (fe15c26ee26e 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 (46e614cc91f7 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 (c91b4a07655d 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 (457391b03803 Linux 6.3) +$ 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 (169f8997968a 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 (4b0986a3613c 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 (c2d3c8441e3d 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 +Already up to date. +Merging riscv-dt/riscv-dt-for-next (6a887bcc4138 riscv: dts: starfive: Add PMU controller node) +$ git merge -m Merge branch 'riscv-dt-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt/riscv-dt-for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 2 ++ + arch/riscv/boot/dts/starfive/jh7110.dtsi | 7 +++++++ + 2 files changed, 9 insertions(+) +Merging riscv-soc/riscv-soc-for-next (ac9a78681b92 Linux 6.4-rc1) +$ git merge -m Merge branch 'riscv-soc-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc/riscv-soc-for-next +Already up to date. +Merging s390/for-next (de12921a1665 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 (e5c23bec0f12 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 (6032aca0deb9 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 (e313de5b5b04 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 (7bcf0b65b84a 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 (4582b273464e Merge branch 'fs.misc' into for-next) + 85ef56bc2d65 ("ocfs2: reduce ioctl stack usage") + ec30adeb289d ("pipe: set FMODE_NOWAIT on pipes") +$ 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 +Auto-merging fs/pipe.c +Auto-merging fs/splice.c +Merge made by the 'ort' strategy. + fs/fuse/dev.c | 4 ++-- + fs/pipe.c | 39 +++++++++++++++++++++++++++++++-------- + fs/splice.c | 11 +++++++---- + include/linux/pipe_fs_i.h | 8 +++++--- + 4 files changed, 45 insertions(+), 17 deletions(-) +Merging fscrypt/for-next (83e57e47906c 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 (0885eacdc81f 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. +Merging afs/afs-next (0a278bc196e7 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 (d795a8796940 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 (db2993a423e3 ceph: reorder fields in 'struct ceph_snapid_map') +$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master +Already up to date. +Merging cifs/for-next (2911b796b20f cifs: fix pcchunk length type in smb2_copychunk_range) +$ 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/smb2ops.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging configfs/for-next (77992f896745 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 (a3d78fe3e1ae fs: ecryptfs: comment typo fix) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git ecryptfs/next +Auto-merging fs/ecryptfs/crypto.c +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 (745ed7d77834 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 (fe15c26ee26e 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 (df9c5af6a4ef Merge ext2 direct IO conversion to iomap.) +$ 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/buffer.c | 70 +++++++++++++++++++ + fs/ext2/Makefile | 5 +- + fs/ext2/ext2.h | 1 + + fs/ext2/file.c | 126 ++++++++++++++++++++++++++++++++++- + fs/ext2/inode.c | 58 ++++++++++------ + fs/ext2/trace.c | 6 ++ + fs/ext2/trace.h | 94 ++++++++++++++++++++++++++ + fs/ext4/fsync.c | 33 +++++---- + fs/notify/inotify/inotify_fsnotify.c | 11 ++- + include/linux/buffer_head.h | 4 ++ + 10 files changed, 365 insertions(+), 43 deletions(-) + create mode 100644 fs/ext2/trace.c + create mode 100644 fs/ext2/trace.h +Merging ext4/dev (d4fab7b28e2f 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. +Merging f2fs/dev (b68ee1c6131c 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 (04839139213c 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 (c68ea140050e 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 (644f6bf762fa 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 (fad376fce0af 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 (201b70446c10 ksmbd: use kzalloc() instead of __GFP_ZERO) +$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next +Merge made by the 'ort' strategy. + fs/ksmbd/connection.c | 3 ++- + fs/ksmbd/mgmt/tree_connect.c | 11 ----------- + fs/ksmbd/mgmt/tree_connect.h | 3 --- + fs/ksmbd/oplock.c | 2 +- + fs/ksmbd/smb2misc.c | 5 ++++- + fs/ksmbd/smb2pdu.c | 5 ++--- + fs/ksmbd/smb_common.c | 4 ++-- + 7 files changed, 11 insertions(+), 22 deletions(-) +Merging nfs/linux-next (e8d018dd0257 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 (fbd2a05f29a9 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 (58390c8ce1bd 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 (788ee1605c2e 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 (31720a2b109b 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 (4f11ada10d0a 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 (b5fda08ef213 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 (4ec5183ec486 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 (ac9a78681b92 Linux 6.4-rc1) +$ git merge -m Merge branch 'ericvh/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git v9fs-ericvh/ericvh/for-next +Already up to date. +Merging xfs/for-next (2254a7396a0c xfs: fix xfs_inodegc_stop racing with mod_delayed_work) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next +Merge made by the 'ort' strategy. + fs/xfs/libxfs/xfs_ag.c | 19 +++++++++---------- + fs/xfs/libxfs/xfs_bmap.c | 5 +++-- + fs/xfs/scrub/bmap.c | 4 ++-- + fs/xfs/scrub/common.c | 26 -------------------------- + fs/xfs/scrub/common.h | 2 -- + fs/xfs/scrub/fscounters.c | 13 ++++++------- + fs/xfs/scrub/scrub.c | 2 -- + fs/xfs/scrub/scrub.h | 1 - + fs/xfs/scrub/trace.h | 1 - + fs/xfs/xfs_bmap_util.c | 4 +++- + fs/xfs/xfs_icache.c | 40 +++++++++++++++++++++++++++++++++------- + fs/xfs/xfs_iomap.c | 5 +++-- + fs/xfs/xfs_mount.h | 3 +++ + fs/xfs/xfs_super.c | 3 +++ + 14 files changed, 65 insertions(+), 63 deletions(-) +Merging zonefs/for-next (2b188a2cfc4d 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 (3fd41721cd5c 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 (a79168a0c00d 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 (63355b9884b3 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 (63355b9884b3 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 (cff4b23c731a 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 (16bff6f075a1 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 (34b62f186db9 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 (5239a89b06d6 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 (d777b19c6356 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 (03230ddddf9d 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. +Merging i3c/i3c/next (6b496a94c590 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 (13a0ac816d22 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 (1c19ac768b8e 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. +Merging jc_docs/docs-next (cdc822dda6f8 docs/sp_SP: Add translation of process/adding-syscalls) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Already up to date. +Merging v4l-dvb/master (20af6be6bee4 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 (423f331364bf 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 (7163a2111f6c Merge tag 'acpi-6.4-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next +Already up to date. +Merging cpufreq-arm/cpufreq/arm/linux-next (cde3bb62bf56 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 (9f8acaf033b3 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 (376b1446153c 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 (528f2d8d540a 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 (2afa82d1fc64 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 (7a40f1f18a88 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 (531094dc7164 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 (ed23734c23d2 Merge tag 'net-6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/main +Already up to date. +Merging bpf-next/for-next (6e98b09da931 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 (f4796398f21b 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 (77f7eb9f3416 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 (677fb7525331 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 (4774ad841bef 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 (e6e576ec4e72 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 (3288ee5844b7 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 (1af3de62f03f 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 (7227aacb62ae 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 (ec185b18c223 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 (df6def86b9dc 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 (482c84e906e5 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 (1bef84af084e Merge tag 'drm-intel-next-fixes-2023-05-04-1' of git://anongit.freedesktop.org/drm/drm-intel 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. +Merging drm-misc/for-linux-next (cf03e2956af3 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 (e885f10b715b drm/amdgpu: assign register address for vmhub object on each XCD) + 0886b3fdc29e ("drm/amdgpu: Fix mode2 reset for sienna cichlid") + 08c73e896836 ("drm/amd/display: remove incorrect early return") + 0c316556d124 ("drm/amd/display: Disable migration to ensure consistency of per-CPU variable") + 1fa8d710573f ("drm/amdgpu: Fix desktop freezed after gpu-reset") + 21fc0ff38f57 ("drm/amd/display: fix a divided-by-zero error") + 2314ae3c688d ("drm/amdgpu: Enable doorbell selfring after resize FB BAR") + 2c30f8555121 ("drm/amd/display: Isolate remaining FPU code in DCN32") + 3ac73f1ef2b4 ("drm/amd/display: Set min_width and min_height capability for DCN30") + 3da2e48e17d8 ("drm/amdgpu: Use the default reset when loading or reloading the driver") + 4ad3ee5ccc77 ("drm/amd/display: allow edp updates for virtual signal") + 4f01e5c85d20 ("drm/amd/display: Change default Z8 watermark values") + 72529b683c6d ("drm/amd/display: Fix hang when skipping modeset") + 751e17147953 ("drm/amd/display: Block optimize on consecutive FAMS enables") + 79b6e265d920 ("drm/amd/display: Fixes for dcn32_clk_mgr implementation") + 7ab269d54813 ("drm/amd/display: limit timing for single dimm memory") + 8b6a6aa5d6d2 ("drm/amd/display: Update bounding box values for DCN321") + 8d82edfbfdb1 ("drm/amdgpu: fix an amdgpu_irq_put() issue in gmc_v9_0_hw_fini()") + 8f7f1b020ea6 ("drm/amd/display: fix flickering caused by S/G mode") + 8fa33bd8d327 ("drm/amd/display: Do not clear GPINT register when releasing DMUB from reset") + 9a30f511cb5c ("drm/amdgpu: drop redundant sched job cleanup when cs is aborted") + a6c0c9f56197 ("drm/amd/display: Improvement for handling edp link training fails") + a890efed1dc4 ("drm/amdgpu: add a missing lock for AMDGPU_SCHED") + aa6ac247ed7d ("drm/amdgpu: fix amdgpu_irq_put call trace in gmc_v11_0_hw_fini") + b5389eca7b39 ("drm/amd/display: Lowering min Z8 residency time") + bddb55ccbdc2 ("drm/amd/display: set dcn315 lb bpp to 48") + c0162a05bd31 ("drm/amd/display: fix memleak in aconnector->timing_requested") + c18842a2e81a ("drm/amd/display: Return error code on DSC atomic check failure") + c4edb0137468 ("drm/amd/display: Reduce SubVP + DRR stretch margin") + c56edea58c31 ("drm/amdgpu: fix amdgpu_irq_put call trace in gmc_v10_0_hw_fini") + cdff36a0217a ("drm/amd/display: fix access hdcp_workqueue assert") + d63e31f66892 ("drm/amd/display: copy dmub caps to dc on dcn31") + e0a77e09c707 ("drm/amd/display: Add missing WA and MCLK validation") + e101bf95ea87 ("drm/amd/display: Do not set drr on pipe commit") + e7b1fbf91a46 ("drm/amd/display: filter out invalid bits in pipe_fuses") + f0c5f9ebbc4c ("drm/amd/display: Apply correct panel mode when reinitializing hardware") + f20b8ddbef67 ("drm/amdgpu: disable SDMA WPTR_POLL_ENABLE for SR-IOV") +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/nv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/soc15.c +Auto-merging drivers/gpu/drm/amd/amdgpu/soc21.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +Auto-merging drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/dc.h +Auto-merging drivers/gpu/drm/amd/display/dc/dc_stream.h +Auto-merging drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn321/dcn321_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c +Auto-merging drivers/gpu/drm/amd/display/dc/dml/dcn314/dcn314_fpu.c +Auto-merging drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c +Auto-merging drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.h +Auto-merging drivers/gpu/drm/amd/display/dc/link/protocols/link_edp_panel_control.c +Auto-merging drivers/gpu/drm/amd/display/dmub/src/dmub_dcn32.c +Auto-merging drivers/gpu/drm/amd/display/modules/power/power_helpers.c +Auto-merging include/drm/display/drm_dp.h +Resolved 'drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master a5ccfc7ce19e] Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 7 +- + 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_bios.c | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 39 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 47 +- + 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 | 71 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 57 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h | 2 - + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 262 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 46 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 4 +- + 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_ttm.c | 25 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 13 +- + drivers/gpu/drm/amd/amdgpu/cik.c | 4 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 222 +- + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 293 +- + 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 | 105 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 144 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.h | 2 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c | 8 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 2834 +++++++++++++++++++- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.h | 3 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 10 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_2.c | 647 +++-- + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c | 10 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_1.c | 12 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v3_0.c | 10 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v3_0_3.c | 10 +- + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 45 +- + drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 38 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 90 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 4 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/mes_v10_1.c | 25 +- + drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 29 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 10 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c | 10 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_8.c | 10 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 10 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c | 10 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v3_0.c | 10 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v3_0_1.c | 10 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v3_0_2.c | 10 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 12 +- + drivers/gpu/drm/amd/amdgpu/nv.c | 30 +- + drivers/gpu/drm/amd/amdgpu/nvd.h | 5 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 10 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_4.c | 4 + + drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c | 4 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 2 +- + drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/si.c | 4 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 8 +- + drivers/gpu/drm/amd/amdgpu/soc15.h | 2 +- + drivers/gpu/drm/amd/amdgpu/soc21.c | 8 +- + drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 8 +- + drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 2 +- + 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 | 73 +- + .../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 | 30 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 5 +- + .../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 +- + .../drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.c | 2 +- + .../amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.c | 4 +- + .../drm/amd/display/dc/clk_mgr/dcn314/dcn314_smu.c | 2 +- + .../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 | 34 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 63 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 7 +- + drivers/gpu/drm/amd/display/dc/dc.h | 19 +- + 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 | 6 + + 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 +- + .../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 | 8 +- + 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 | 16 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.c | 7 +- + .../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 | 15 +- + 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_hwseq.c | 4 +- + .../gpu/drm/amd/display/dc/dcn314/dcn314_init.c | 1 + + .../drm/amd/display/dc/dcn315/dcn315_resource.c | 97 +- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c | 20 +- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_optc.c | 11 +- + .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.c | 6 +- + .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.h | 14 + + .../amd/display/dc/dcn32/dcn32_resource_helpers.c | 15 + + .../drm/amd/display/dc/dcn321/dcn321_resource.c | 9 +- + drivers/gpu/drm/amd/display/dc/dm_services.h | 7 + + drivers/gpu/drm/amd/display/dc/dm_services_types.h | 6 + + .../gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 42 +- + .../amd/display/dc/dml/dcn21/display_mode_vba_21.c | 2 +- + .../amd/display/dc/dml/dcn30/display_mode_vba_30.c | 6 +- + .../display/dc/dml/dcn30/display_rq_dlg_calc_30.c | 4 +- + .../gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c | 25 +- + .../gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.h | 3 + + .../amd/display/dc/dml/dcn31/display_mode_vba_31.c | 43 +- + .../display/dc/dml/dcn31/display_rq_dlg_calc_31.c | 3 +- + .../gpu/drm/amd/display/dc/dml/dcn314/dcn314_fpu.c | 14 +- + .../display/dc/dml/dcn314/display_mode_vba_314.c | 4 +- + .../dc/dml/dcn314/display_rq_dlg_calc_314.c | 26 +- + .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 92 +- + .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.h | 2 + + .../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 +- + .../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 + + .../display/dc/link/protocols/link_dp_capability.c | 33 +- + .../amd/display/dc/link/protocols/link_dp_dpia.c | 2 +- + .../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 | 29 +- + 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 | 16 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn32.h | 3 + + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 42 +- + .../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/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 + + 204 files changed, 5887 insertions(+), 2235 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 (c8c2969bfcba drm/i915/dsi: Use unconditional msleep() instead of intel_dsi_msleep()) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel drm-intel/for-linux-next +Already up to date. +Merging drm-tegra/for-next (2429b3c529da drm/tegra: Avoid potential 32-bit integer overflow) +$ git merge -m Merge branch 'for-next' of https://gitlab.freedesktop.org/drm/tegra.git drm-tegra/for-next +Already up to date. +Merging drm-msm/msm-next (ac7e7c9c65ec 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 (ac7e7c9c65ec 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 (927d8fd465ad 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 (4c22c61e429f 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 (457391b03803 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 (4a670ac3e75e 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 (ee2dd7034702 ALSA: pcm: use exit controlled loop in snd_pcm_playback_silence()) +$ 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 (02dc51a0a07a 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 (9a92ef41d6c5 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. +Merging modules/modules-next (0b891c83d8c5 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 (e1141b0c625e Input: ili210x - probe even if no resolution information) +$ 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/input.c +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 | 6 +- + drivers/input/touchscreen/atmel_mxt_ts.c | 85 ++++++++++++++++++++++ + drivers/input/touchscreen/cyttsp4_core.c | 3 +- + drivers/input/touchscreen/cyttsp5.c | 82 +++++++++++++++++++-- + drivers/input/touchscreen/edt-ft5x06.c | 1 + + drivers/input/touchscreen/ili210x.c | 36 +++++---- + include/linux/i8042.h | 1 + + 13 files changed, 248 insertions(+), 73 deletions(-) +Merging block/for-next (7d3e462a941e 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 drivers/block/ublk_drv.c +CONFLICT (content): Merge conflict in drivers/block/ublk_drv.c +Recorded preimage for 'drivers/block/ublk_drv.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/block/ublk_drv.c'. +[master 4083deee2dde] Merge branch 'for-next' of git://git.kernel.dk/linux-block.git +$ git diff -M --stat --summary HEAD^.. + +$ 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 1bbb5ab85091] Merge branch 'for-next' of git://git.kernel.dk/linux-block.git + Date: Mon May 8 12:00:14 2023 +1000 +Merging device-mapper/for-next (38d11da522aa 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 (140b26035b2d 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 (15e74c6c1ce2 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 (4eb0e7873c71 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 (9e9ff39243ea 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. +Merging backlight/for-backlight-next (fb200218b40b 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 (ac9a78681b92 Linux 6.4-rc1) +$ 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 (adc480392d1f 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 (d82dcd9e21b7 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 (0bb84cff96af 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 (644f17412f5a 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 (64b634830c91 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 (4ce1f694eb5d 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 (de93e515db30 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 (15feaa096c23 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 (7c1a4441ddf1 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 (fc4354c6e5c2 Merge tag 'mm-stable-2023-05-06-10-49' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm) +$ git merge -m Merge branch 'master' of git://www.linux-watchdog.org/linux-watchdog-next.git watchdog/master +Already up to date. +Merging iommu/next (e51b4198396c 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 (fe15c26ee26e 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 (c50eb01940c7 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 8132f6671ff3] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git + Date: Mon May 8 12:18:00 2023 +1000 +Merging dt-krzk/for-next (936f3b6478b7 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 (d396133dced4 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 +Already up to date. +Merging spi/for-next (cb1499966178 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 (da1c4f07aa4d 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/internal.h +Auto-merging mm/memory.c +Auto-merging mm/migrate.c +Auto-merging mm/mmap.c +Resolved 'arch/x86/entry/syscalls/syscall_64.tbl' using previous resolution. +Resolved 'include/linux/syscalls.h' using previous resolution. +Resolved 'mm/gup.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 4f530c19a7e4] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git +$ 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/pgtable.h | 6 +- + arch/arc/include/asm/hugepage.h | 2 +- + arch/arc/include/asm/pgtable-bits-arcv2.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/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/pgtable.h | 2 +- + arch/ia64/include/asm/pgtable.h | 2 +- + arch/loongarch/include/asm/pgtable.h | 4 +- + 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/pgtable.h | 6 +- + arch/nios2/include/asm/pgtable.h | 2 +- + arch/openrisc/include/asm/pgtable.h | 2 +- + 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/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/pgtable.h | 6 +- + arch/s390/include/asm/hugetlb.h | 4 +- + arch/s390/include/asm/pgtable.h | 14 +- + arch/s390/mm/pageattr.c | 4 +- + arch/sh/include/asm/pgtable_32.h | 10 +- + 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/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/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/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/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/sys_ni.c | 1 + + lib/debugobjects.c | 15 +- + 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 +- + tools/testing/selftests/x86/Makefile | 2 +- + tools/testing/selftests/x86/test_shadow_stack.c | 695 ++++++++++++++++++++++++ + 123 files changed, 2688 insertions(+), 334 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 +Merging clockevents/timers/drivers/next (62a9488edfd7 dt-bindings: timer: rockchip: Add rk3588 compatible) + 01216c745bfd ("clocksource/drivers/exynos_mct: Explicitly return 0 for shared timer") + 12fdc0360660 ("clocksource/drivers/timer-tegra186: Convert to platform remove callback returning void") + 155713e86bb6 ("clocksource/drivers/timer-imx-gpt: Remove non-DT function") + 1685579e3b31 ("clocksource/drivers/davinci: Fix memory leak in davinci_timer_register when init fails") + 29574a9acebd ("clocksource/drivers/timer-ti-dm: Convert to platform remove callback returning void") + 2f8358e46cea ("clocksource/drivers/timer-stm32-lp: Mark driver as non-removable") + 61ff2668d3ad ("clocksource/drivers/ti: Use of_property_read_bool() for boolean properties") + 62a9488edfd7 ("dt-bindings: timer: rockchip: Add rk3588 compatible") + 67e7a94afa75 ("clocksource/drivers/sh_mtu2: Mark driver as non-removable") + 6bc2e2a00f46 ("clocksource/drivers/stm32-lp: Drop of_match_ptr for ID table") + b0856d6884bf ("clocksource/drivers/timer-ti-dm: Improve error message in .remove") + b1ba12d97c75 ("dt-bindings: timer: rockchip: Drop superfluous rk3288 compatible") + b6999fa1c847 ("clocksource/drivers/timer-ti-dm: Use of_address_to_resource()") + ca394a540eb0 ("clocksource/drivers/timer-mediatek: Split out CPUXGPT timers") + e8fb525fe931 ("clocksource/drivers/timer-ti-dm: Fix finding alwon timer") +$ 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 (d6c5e688899b 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 (2ff1b0839ddd 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 (3862f86c1529 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 (523c1335f23e 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 02b7bcec986d] Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git + Date: Mon May 8 12:20:14 2023 +1000 +Merging kvm/next (7a8016d95651 Merge tag 'kvm-s390-next-6.4-2' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/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 (74819ee73f1f 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 (8a46df7cd135 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 (5c291b93e5d6 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. +Merging xen-tip/linux-next (cbfac7707ba1 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 (b9819165bb45 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 (704bc669e1dd 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 (e578c943e363 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 (d184d60aa301 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 (ac9a78681b92 Linux 6.4-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 (1b929c02afd3 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 (8325642d2757 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 (d08076678ce7 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 (33afd4b76393 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. +Merging usb/usb-next (33afd4b76393 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 (1f15af76784c 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 (a095edfc15f0 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 (33afd4b76393 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 (33afd4b76393 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. +Merging accel/habanalabs-next (afa351a15d80 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 (18996a113f25 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 (fe15c26ee26e 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 (b7590f3841f4 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 (52cc189b4fc6 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 (a01061323721 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 (67572c8dc644 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 (4e30418def07 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 223573d006d1] 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 (1b929c02afd3 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 (705b004ee377 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 (33afd4b76393 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 (cf3600f29136 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 (ea327624ae52 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 (f2dc327131b5 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 (5199604d1ee5 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. +Merging scsi/for-next (d1316c7b9ec3 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. +Merging scsi-mkp/for-next (c5749639f2d0 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 (ebddc00f450d vhost_net: revert upend_idx only on retriable error) +$ 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/vhost/vdpa.c +Auto-merging drivers/vhost/vhost.c +Auto-merging drivers/vhost/vhost.h +Merge made by the 'ort' strategy. + 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 ++++++ + 5 files changed, 63 insertions(+), 14 deletions(-) + create mode 100644 tools/virtio/ringtest/.gitignore +Merging rpmsg/for-next (ac9a78681b92 Linux 6.4-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next +Already up to date. +Merging gpio/for-next (e73f0f0ee754 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 (8a4adcf67a39 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 (782eea0c89f7 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 (79debe43aa8b 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 +Resolved 'drivers/pinctrl/pinctrl-at91-pio4.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 10e4deb0363d] 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 (fe15c26ee26e 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 (45e6cc8ef1cd 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 (fe15c26ee26e 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 (247ee6c78040 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 (05bd6e0242b4 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 (7dc8e24f0e09 ktest: Restore stty setting at first in dodie) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git ktest/for-next +Already up to date. +Merging kselftest/next (50ad2fb7ec2b 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 (fe15c26ee26e 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 (a42077b78768 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 (5e36be5973b6 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 (e99ab4abebf8 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 (305a72efa791 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 (fe15c26ee26e 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 (942cc9ceccb6 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 (0fb0624b15d2 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 (35af9fb49bc5 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 (fe15c26ee26e 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 (3d1431431ce2 nvmem: layouts: sl28vpd: set varaiable sl28vpd_layout storage-class-specifier to static) + 16faa4d80802 ("dt-bindings: nvmem: convert amlogic-efuse.txt to dt-schema") + 1fc7a13bb731 ("dt-bindings: nvmem: Drop unneeded quotes") + 288c1a9fe80c ("nvmem: u-boot-env: post-process "ethaddr" env variable") + 2a2d632546b0 ("nvmem: mtk-efuse: Support postprocessing for GPU speed binning data") + 31041798820c ("dt-bindings: nvmem: qcom,spmi-sdam: fix example 'reg' property") + 31193db9eb5a ("MAINTAINERS: add myself as sl28vpd nvmem layout driver") + 3d1431431ce2 ("nvmem: layouts: sl28vpd: set varaiable sl28vpd_layout storage-class-specifier to static") + 3d6ee188e379 ("nvmem: core: provide own priv pointer in post process callback") + 428773c09cff ("nvmem: nintendo-otp: Use devm_platform_ioremap_resource()") + 4918e974941f ("dt-bindings: nvmem: Add compatible for SM6375") + 4976f5118fad ("nvmem: core: add per-cell post processing") + 4e0fded75a6b ("nvmem: stm32-romem: mark OF related data as maybe unused") + 4ea39c120414 ("dt-bindings: nvmem: convert amlogic-meson-mx-efuse.txt to dt-schema") + 5c859c752509 ("of: Move of_modalias() to module.c") + 5ffaa8952e8a ("of: Fix modalias string generation") + 6861ff20b635 ("MAINTAINERS: Add myself as ONIE tlv NVMEM layout maintainer") + 6c0ba03da802 ("nvmem: core: introduce NVMEM layouts") + 767af398b9b2 ("nvmem: core: allow to modify a cell before adding it") + 78872a4a8d11 ("of: Rename of_modalias_node()") + 7a7370e37795 ("nvmem: bcm-ocotp: Use devm_platform_ioremap_resource()") + 7f34d9b1e9fa ("dt-bindings: nvmem: Add compatible for SM6350") + 819e1c034bf5 ("nvmem: imx-ocotp: replace global post processing with layouts") + 8311c5234776 ("nvmem: core: support specifying both: cell raw data & post read lengths") + 85dadc8012c6 ("of: Update of_device_get_modalias()") + 93797d122cc9 ("nvmem: cell: drop global cell_post_process") + 98cc732187db ("nvmem: core: handle the absence of expected layouts") + a000203f2348 ("usb: ulpi: Use of_request_module()") + a7c3fcac3703 ("firmware: xilinx: nvmem: zynqmp: make modular") + ac9c852c8eda ("nvmem: layouts: sl28vpd: Add new layout driver") + b06041e2f94b ("nvmem: core: request layout modules loading") + c60363be9b76 ("nvmem: layouts: onie-tlv: Drop wrong module alias") + c90221f303ba ("dt-bindings: nvmem: u-boot,env: add MAC's #nvmem-cell-cells") + cd804ecf3da6 ("of: Move the request module helper logic to module.c") + ddeb62c833fb ("nvmem: layouts: onie-tlv: Add new layout driver") + e61131ac0765 ("of: device: Kill of_device_request_module()") + ed688cdd43e0 ("nvmem: layouts: sl28vpd: Use module_nvmem_layout_driver()") + f37f76f47c8e ("nvmem: layouts: onie-tlv: Use module_nvmem_layout_driver()") + f4276728c089 ("nvmem: vf610-ocotp: Use devm_platform_get_and_ioremap_resource()") + f55b96d3f8b9 ("nvmem: Add macro to register nvmem layout drivers") + f77d82b82db1 ("dt-bindings: nvmem: Fix spelling mistake "platforn" -> "platform"") +$ 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 c7295e18af42] 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 (69cb69ea5542 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 (a494aef23dfc 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 (ddf75a86aba2 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 (c1cb81429df4 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 (fe15c26ee26e 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 (312310928417 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 (1d1493bdc25f 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 (34875d6fc52d 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 (bfe58458fd25 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 (2aa14b1ab2c4 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 (026b85796ab4 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 (b500d6d7243d 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 (ed4cdfbeb873 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 (512dee0c00ad 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 (ed35e2f2f0de 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 (ea76e08f4d90 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. +Merging sysctl/sysctl-next (0199849acd07 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 (88603b6dc419 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 (714f3af11b21 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 954877552cb5] 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 (ca3d1a4b419a 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 (78f7a3fd6dc6 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. +Merging kspp-gustavo/for-next/kspp (00168b415a60 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 (62e37c86bf07 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..8e2a6e2abe00 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20230508 |