diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2023-07-05 12:53:04 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2023-07-05 12:53:04 +1000 |
| commit | e1f6a8eaf1c271a0158114a03e3605f4fba059ad (patch) | |
| tree | bd2bfe06356f7b6ca65ca9e6fc6cf7a745d534d7 | |
| parent | edc47ef600705d15d0b0b33525fb9943031676a2 (diff) | |
Add linux-next specific files for 20230705next-20230705
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 365 | ||||
| -rw-r--r-- | Next/Trees | 367 | ||||
| -rw-r--r-- | Next/merge.log | 3593 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 4326 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..be4f2500c808 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,365 @@ +Name SHA1 +---- ---- +origin d528014517f2b0531862c02865b9d4c908019dc4 +fixes ac9a78681b921877518763ba0e89202254349d1b +mm-hotfixes aa902577e9210eba0d59a4ce40a0bd0f69a03191 +kbuild-current dfab92f27c600fea3cadc6e2cb39f092024e1fef +arc-current 30a0b95b1335e12efef89dd78518ed3e4a71a763 +arm-current 2b951b0efbaa6c805854b60c11f08811054d50cd +arm64-fixes 0e2aba694866b451db0932a6706683c48379134c +arm-soc-fixes 5b017b5ed2bccfdb9a26c8ddb89f093fb8f8a94c +davinci-current ac9a78681b921877518763ba0e89202254349d1b +drivers-memory-fixes ac9a78681b921877518763ba0e89202254349d1b +tee-fixes ceaa837f96adb69c0df0397937cd74991d5d821a +m68k-current 4055eabe04a26f5d113b5a02588b20b5e166a753 +powerpc-fixes 6995e2de6891c724bfeb2db33d7b87775f913ad1 +s390-fixes ad3d770b83afffd10abf624ec80c408254343a20 +sparc 2d2b17d08bfc3d98cf93622e8c6543eaaf02dabe +fscrypt-current 4bcf6f827a79c59806c695dc280e763c5b6a6813 +fsverity-current a075bacde257f755bea0e53400c9f1cdd1b8e8e6 +net 14bb236b29922c4f57d8c05bfdbcb82677f917c9 +bpf f7306acec9aae9893d15e745c8791124d42ab10a +ipsec d1e0e61d617ba17aa516db707aa871387566bbf7 +netfilter 7fb0269720d7d5359bc8349eef908a1c96866b65 +ipvs 1a7d09a737a09297e77d9cd575cfe7d1bd14aad9 +wireless f1a0898b5d6a77d332d036da03bad6fa9770de5b +wpan 9a43827e876c9a071826cc81783aa2222b020f1d +rdma-fixes 45a3e24f65e90a047bef86f927ebdc4c710edaa1 +sound-current 72cea3a3175b50a4875b3c112fb13df20c6218a5 +sound-asoc-fixes 08a9ad10002c155d6565f2f782831f11de3c2bdf +regmap-fixes c8e796895e2310b6130e7577248da1d771431a77 +regulator-fixes 701c1cef8e02ec910fede638b02a7506608450a4 +spi-fixes d0e1c60318ac4ab2c5e275773696a9937ffe98a6 +pci-current ac9a78681b921877518763ba0e89202254349d1b +driver-core.current 24be4d0b46bb0c3c1dc7bacd30957d6144a70dfc +tty.current 24be4d0b46bb0c3c1dc7bacd30957d6144a70dfc +usb.current 24be4d0b46bb0c3c1dc7bacd30957d6144a70dfc +usb-serial-fixes 45a3e24f65e90a047bef86f927ebdc4c710edaa1 +phy 9561de3a55bed6bdd44a12820ba81ec416e705a7 +staging.current 24be4d0b46bb0c3c1dc7bacd30957d6144a70dfc +iio-fixes c57fa0037024c92c2ca34243e79e857da5d2c0a9 +counter-current 9b53a13422162feac7c7ee58e5bc0e0a80a41963 +char-misc.current 24be4d0b46bb0c3c1dc7bacd30957d6144a70dfc +soundwire-fixes 858fd168a95c5b9669aac8db6c14a9aeab446375 +thunderbolt-fixes 6995e2de6891c724bfeb2db33d7b87775f913ad1 +input-current bf4ed21778f2920ca91a32fd3a1e1130e843e98f +crypto-current 486bfb05913ac9969a3a71a4dc48f17f31cb162d +vfio-fixes 4752354af71043e6fd72ef5490ed6da39e6cab4a +kselftest-fixes dbcf76390eb9a65d5d0c37b0cd57335218564e37 +modules-fixes f412eef03938d3a40d4f6f5a79d0f98ed89b596d +dmaengine-fixes e14fd2af7a1d621c167dad761f729135a7a76ff4 +backlight-fixes 88603b6dc419445847923fcb7fe5080067a30f98 +mtd-fixes c4d28e30a8d0b979e4029465ab8f312ab6ce2644 +mfd-fixes 88603b6dc419445847923fcb7fe5080067a30f98 +v4l-dvb-fixes ec21a38df77a5aefbd2f70c48127003b6f259cf3 +reset-fixes 3a2390c6777e3f6662980c6cfc25cafe9e4fef98 +mips-fixes 4897a898a216058dec55e5e5902534e6e224fcdf +at91-fixes 6b0db163ff9200a55dc77a652dad1d4b0a853f63 +omap-fixes 2a906db2824b75444982f5e9df870106982afca8 +kvm-fixes 2623b3dc875a3c92dd0e0775cd19fbaeef0574ca +kvms390-fixes 21f27df854008b86349a203bf97fef79bb11f53e +hwmon-fixes b153a0bb4199566abd337119207f82b59a8cd1ca +nvdimm-fixes e98d14fa7315867fded127a98db355f49807dfdb +cxl-fixes a70fc4ed20a6118837b0aecbbf789074935f473b +btrfs-fixes 4d0998044f33ef997ada624dc029838432c960c0 +vfs-fixes 609d54441493c99f21c1823dfd66fa7f4c512ff4 +dma-mapping-fixes bbb73a103fbbed6f63cb738d3783261c4241b4b2 +drivers-x86-fixes 146b6f6855e7656e8329910606595220c761daac +samsung-krzk-fixes ac9a78681b921877518763ba0e89202254349d1b +pinctrl-samsung-fixes ac9a78681b921877518763ba0e89202254349d1b +devicetree-fixes c7753ed71c160f75f92ff5679e9fc22526e56fc5 +dt-krzk-fixes 8bbec86ce6d66fb33530c679f7bb3a123fc9e7da +scsi-fixes 9cefd6e7e0a77b0fbca5c793f6fb6821b0962775 +drm-fixes 9bd9be5cbaf8a8faa175ef4fba04a5623281debe +drm-intel-fixes 6995e2de6891c724bfeb2db33d7b87775f913ad1 +mmc-fixes fa700d73494abbd343c47c6f54837c9874c61bbe +rtc-fixes 08279468a294d8c996a657ecc9e51bd5c084c75d +gnss-fixes 44c026a73be8038f03dbdeef028b642880cf1511 +hyperv-fixes 55e544e1a922d272b62ec576a3de92329f838ce9 +soc-fsl-fixes 4b0986a3613c92f4ec1bdc7f60ec66fea135991f +risc-v-fixes 533925cb760431cb496a8c965cfd765a1a21d37e +riscv-dt-fixes ac9a78681b921877518763ba0e89202254349d1b +riscv-soc-fixes a7a041f2ddf300817ee6010f643424ef5efd2739 +fpga-fixes 44c026a73be8038f03dbdeef028b642880cf1511 +spdx 45a3e24f65e90a047bef86f927ebdc4c710edaa1 +gpio-brgl-fixes ff7a1790fbf92f1bdd0966d3f0da3ea808ede876 +gpio-intel-fixes ac9a78681b921877518763ba0e89202254349d1b +pinctrl-intel-fixes 7877cb91f1081754a1487c144d85dc0d2e2e7fc4 +erofs-fixes 7877cb91f1081754a1487c144d85dc0d2e2e7fc4 +kunit-fixes ac9a78681b921877518763ba0e89202254349d1b +ubifs-fixes 2241ab53cbb5cdb08a6b2d4688feb13971058f65 +memblock-fixes 647037adcad00f2bab8828d3d41cd0553d41f3bd +nfsd-fixes d7dbed457c2ef83709a2a2723a2d58de43623449 +irqchip-fixes 567f67acac94e7bbc4cb4b71ff9773555d02609a +renesas-fixes ab2866f12ca18747413ba41409231d44e0c6149b +broadcom-fixes 9abf2313adc1ca1b6180c508c25f22f9395cc780 +perf-current b6dad5178ceaf23f369c3711062ce1f2afc33644 +efi-fixes 36e4fc57fc1619f462e669e939209c45763bc8f5 +zstd-fixes 6906598f1ce93761716d780b6e3f171e13f0f4ce +battery-fixes 95339f40a8b652b5b1773def31e63fc53c26378a +uml-fixes 73a23d7710331a530e972903318528b75e5a5f58 +asahi-soc-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +iommufd-fixes dbe245cdf5189e88d680379ed13901356628b650 +rust-fixes ac9a78681b921877518763ba0e89202254349d1b +v9fs-fixes 36896bc97c0e5fe9f52f578ac7986bf4a9cdfd71 +w1-fixes ac9a78681b921877518763ba0e89202254349d1b +drm-misc-fixes f781f661e8c99b0cb34129f2e374234d61864e77 +mm-stable 5bb367dca2b9876416b99ad95a0cfff41cf74051 +mm-nonmm-stable 78502a5b68acdc6c4dfa6792c44052bfc55951f7 +mm 1e63413a4ea869071dde426a3de14f0ea761ebfb +kbuild dfab92f27c600fea3cadc6e2cb39f092024e1fef +clang-format 781121a7f6d11d7cae44982f174ea82adeec7db0 +perf b2ad9549bfd0c1f74287492a9d9a31a03c97f088 +compiler-attributes eeac8ede17557680855031c6f305ece2378af326 +dma-mapping 8ac04063354a01a484d2e55d20ed1958aa0d3392 +asm-generic 4dd595c34c4bb22c16a76206a18c13e4e194335d +arc f2906aa863381afb0015a9eb7fefad885d4e5a56 +arm 1faf70485ea9b3209620bfbdd74ccd9b49e2fdba +arm64 893b24181b4c4bf1fa2841b1ed192e5413a97cb1 +arm-perf dea0f4146f66a242450b29fae4d643bd5318c511 +arm-soc 08ff590f1ce34c789930ce1f638542907a2bc135 +amlogic 76483eaf2109fc3d94f29c68ff9dee6579e95ccf +asahi-soc eaf935fa48ec826f7c564c269a607cb4fba082b3 +aspeed 7d4f0b0df7c5ec0cec834f87591423a7bbd1bab2 +at91 20c5a786467548f7e7b5a132ad2d3101b011bad3 +broadcom df928e5b5570a4cc50ef97e76d07bb11ff094f7b +davinci ac9a78681b921877518763ba0e89202254349d1b +drivers-memory 6a66fb9ffe7b4558c04f73593c01ee484a5c9ddf +imx-mxs 89c016c82e46c2bf4d9ce1cb1f233212c7c4990d +mediatek f6925844c82ae23165097eb14e272f76b855fb5d +mvebu 703b10801b445c2334f8628dfc38cae2d2137844 +omap f581c395fcb821a0acc17c7fa8728752c021156a +qcom e62f7f072b12feceb8f350dc9f99ef189d61ffd8 +renesas 7762defcdaf029da668d5af3304d3d940d43199e +reset afb39e2bd36af1d80913bb6851caece829526217 +rockchip dd738a0f90f740e7785d4698f79cc3b057841444 +samsung-krzk 6d4e38cedf317ef83cae03eed8f99bd1677e3000 +scmi 83ff850e73baa6a5c62cf3251d609b470889f5da +stm32 c9cb7e72e293141d0d6c1d74c26788d3a0605172 +sunxi 1bcb932283c9664a2bc57bb74864b9ab0050981b +tee 6a8b7e80105416cc7324fda295608ea2d3f98862 +tegra 3281fba16642cb88fe7b051c3f95cfad0307d46b +ti b0f8e128b3b41d8feae11cb8f72689fcb27ac04d +xilinx a736607599a56ad5e96b9cee894bfd6222343c49 +clk f679e89acdd3e825995a84b1b07e2ea33ea882ee +clk-imx 878b02d5f3b56cb090dbe2c70c89273be144087f +clk-renesas 7df8eea64a417f1db6777cddc1d7eda3634b7175 +clk-samsung b35f27fe73d8c86fe40125e063b28007e961b862 +csky dd64621a2a97798d5df40028238a703d4324036b +loongarch 5ee35c769663cb1c5f26e12cad84904dc3002de8 +m68k 4055eabe04a26f5d113b5a02588b20b5e166a753 +m68knommu 858fd168a95c5b9669aac8db6c14a9aeab446375 +microblaze fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +mips 531b3d1195d096f14e030c4b01ec3a53b80276bf +openrisc 219e31a0a39b01a5e510cb84f80c80d82c657fef +parisc-hd f8a473bf5db7a6abaa7cad40303e395dff702819 +powerpc abaa02fc944f2f9f2c2e1925ddaceaf35c48528c +soc-fsl fb9c384625dd604e8a5be1f42b35e83104b90670 +risc-v 54cdede08f2f4414629001b124110d656161080a +riscv-dt 273235194e4d7682907166954bb95e5d57c8df19 +riscv-soc ac9a78681b921877518763ba0e89202254349d1b +s390 b0324ab87db7920dd880de485ed6df2840e4a3a2 +sh a8ac2961148e8c720dc760f2e06627cd5c55a154 +uml 6032aca0deb9c138df122192f8ef02de1fdccf25 +xtensa b4e8c8a6bdd29177123464afcf99aba13d0899a2 +pidfd a901a3568fd26ca9c4a82d8bc5ed5b3ed844d451 +fscrypt d617ef039fb8eec48a3424f79327220e0b7cbff7 +fscache 0885eacdc81f920c3e0554d5615e69a66504a28d +afs 0a278bc196e784b4849c1581266421adbca1989f +btrfs 20e0c0a8e8effec62213bf24565a900dad4eb05f +ceph 257e6172ab36ebbe295a6c9ee9a9dd0fe54c1dc2 +cifs 893097471043ed8eb999e525cade9446d6560dba +configfs 77992f896745c63ae64bfccfdc429ab7b3d88da5 +ecryptfs a3d78fe3e1ae8c6a1901635c54a1a799656f72c8 +erofs 8241fdd3cdfe88e31a3de09a72b5bff661e4534a +exfat fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +ext3 eccf9ae283126b6eeca01600b757d1877a870d73 +ext4 2ef6c32a914b85217b44a0a2418e830e520b085e +f2fs a6ec83786ab9f13f25fb18166dee908845713a95 +fsverity 672d6ef4c775cfcd2e00172e23df34e77e495e85 +fuse 6a567e920fd0451bf29abc418df96c3365925770 +gfs2 432928c9377959684c748a9bc6553ed2d3c2ea4f +jfs 95e2b352c03b0a86c5717ba1d24ea20969abcacc +ksmbd 8976e9d0039574b2336044fa5e3adb717f3ba54b +nfs 5b4a82a0724af1dfd1320826e0266117b6a57fbd +nfs-anna 43439d858bbae244a510de47f9a55f667ca4ed52 +nfsd 9e268189cb1474479de9f8885a1e999308de32e1 +ntfs3 44b4494d5c5971dc8f531c8783d90a637e862880 +orangefs 31720a2b109b3080eb77e97b8f6f50a27b4ae599 +overlayfs 7fb7998b599a2e1f3744fbd34a3e7145da841ed1 +ubifs b5fda08ef213352ac2df7447611eb4d383cce929 +v9fs 4ec5183ec48656cec489c49f989c508b68b518e3 +v9fs-ericvh ac9a78681b921877518763ba0e89202254349d1b +xfs 34acceaa8818a0ff4943ec5f2f8831cfa9d3fe7e +zonefs 8812387d056957355ef1d026cd38bed3830649db +iomap 447a0bc108e4bae4c1ea845aacf43c10c28814e8 +djw-vfs a79168a0c00d710420c1758f6c38df89e12f0763 +file-locks 0d6aeec73f8cd3290662748a4fb1bded1e5bb5c7 +iversion 63355b9884b3d1677de6bd1517cd2b8a9bf53978 +vfs-brauner 1617478c27e4798e9b94d1b422a31b695ed5d1f9 +vfs cff4b23c731a1cbdf39d5ce180196b8dffb6c411 +printk 16bff6f075a1055a0084c8a05fd4a0c4ab4b3607 +pci 6ecac465eee887de7ceda7ffe3bccf538eb786bc +pstore d97038d5ec2062733c1e016caf9baaf68cf64ea1 +hid 2a4b950dc6f028dad00953e4fcc307ac690c2389 +i2c e67e24a52c72847cd7327ab600a691c694c367ce +i3c 49b472ebc61de3d4aa7cc57539246bb39f6c5128 +dmi 13a0ac816d22aa47d6c393f14a99f39e49b960df +hwmon-staging 4dbbaf8fbdbd13adc80731b2452257857e4c2d8b +jc_docs 016571b6d52deb473676fb4d24baf8ed3667ae21 +v4l-dvb c61480a2ea5e5b997d10dfda556d3a63e31f87cd +v4l-dvb-next c61480a2ea5e5b997d10dfda556d3a63e31f87cd +pm e7c5bd3ce61586cf170d9e3511b715d8c90c694e +cpufreq-arm 5ee64250286e8c5162808667a9a8668488d9f577 +cpupower 25891bc945f715d2a796fc60d0000d0aaf9582a1 +devfreq a83bfdca8b2098999e3edfb87e98925e019eb818 +opp 5fb2864cbd50a84a73af4fdd900b31f2daddea34 +thermal 57c9eaa4de537e6f08819d9214de502cac5a989c +dlm fc4ea4229c2b2dca0bffc12eee6973e353c20086 +rdma 5f004bcaee4cb552cf1b46a505f18f08777db7e5 +net-next 3a8a670eeeaa40d87bd38a587438952741980c18 +bpf-next 3a8a670eeeaa40d87bd38a587438952741980c18 +ipsec-next a94fd40a18ae76ba76dbaa8eca0e3c46aa1142c1 +mlx5-next 77f7eb9f3416aace703971156133926e44e2195b +netfilter-next 677fb7525331375ba2f90f4bc94a80b9b6e697a3 +ipvs-next 61dc651cdfe85066e1371dd1bd8aee685bd6ec75 +bluetooth fd859b4a38153b4d9e1942ade471f4fdcd8d224b +wireless-next 31b5a547622b3782388eb676081da1eefe5b98d2 +wpan-next 18b849f12dcc34ec4cb9c8fadeb503b069499ba4 +wpan-staging 18b849f12dcc34ec4cb9c8fadeb503b069499ba4 +mtd cf431a5998326a0468532a188a188ac2c8e9c55d +nand ad5c18c75d2a1de9eeaed60e417d308217f35e73 +spi-nor df6def86b9dcbc3e8ed4964c7b79b70c9b0c3040 +crypto 486bfb05913ac9969a3a71a4dc48f17f31cb162d +drm 5ff2977b19769fd24b0cfbe7cbe4d5114b6106af +drm-misc 59bba51ec2a50e3dc5c3ee80f0a23207346303ff +amdgpu 8b17334d533f14bc7034990371fbab9f8df468e9 +drm-intel f6cf3883df471abbcf1553127681dc244c8ff8dd +drm-tegra 2429b3c529da29d4277d519bd66d034842dcd70c +drm-msm cd036d542afb82adfbbd43c5dbeb7010e8e91ee7 +drm-msm-lumag 452c46ccf603ab181e7d0866f3137e3ae62b5f49 +imx-drm 927d8fd465adbaaad6cce82f840d489d7c378f29 +etnaviv 295b6c02f84b81971c42b592771920783fc181cd +fbdev e15fae5e388d3b2e04e2cbfdb812ef2af9fb7e54 +regmap 1e897fca0b3b1ff7516e09f159c674b99c101d4f +sound 72cea3a3175b50a4875b3c112fb13df20c6218a5 +ieee1394 3ff256751a2853e1ffaa36958ff933ccc98c6cb5 +sound-asoc 08a9ad10002c155d6565f2f782831f11de3c2bdf +modules 0eeaf1eb40a34fddd1d568a9b32c3d6669238743 +input 8c9cce9cb81b5fdc6e66bf3f129727b89e8daab7 +block 8833cf913f441a186bda63bf7fde6c7ebc4c6d3e +device-mapper e2c789cab60a493a72b42cb53eb5fbf96d5f1ae3 +libata fd3ac6e8049799ca7dbd2738de8e149536e92a5e +pcmcia 15e74c6c1ce2d388e967f32cdaa83ca034fa6452 +mmc 06b5d4fea89cd699408af12c14b6915d77ceffb0 +mfd b05740d71bd2f8b2261930944bfe95f529190b8b +backlight a33677b9211b6c328ad359b072043af94f7c9592 +battery ef8d95b4a3af4ebfe47e3563c3bc5767dda28207 +regulator 701c1cef8e02ec910fede638b02a7506608450a4 +security 4be22f16a4a1a1667e79b52b56cca2c64b3747e2 +apparmor 97a79eea179721a324532c2b09ecd3f99d1f23a5 +integrity 95526d13038c2bbddd567a4d8e39fac42484e182 +safesetid 64b634830c919979de4b18163e15d30df66e64a8 +selinux 447a5688005e5b789633bd080016517a08f9fd8d +smack 2c085f3a8f23c9b444e8b99d93c15d7ce870fc4e +tomoyo e52fa5e9fbe1c842c6a974f9b25d0162bba778bf +tpmdd f42582c6b23a8c0c631645048a4e463f19c0b3d7 +watchdog 547cc9be86f4c51c51fd429ace6c2e1ef9050d15 +iommu a7a334076dd725b8c3b5d64f68e3992ffcfd1d25 +audit e455ca40dbcf2cd50d1e59bf4b2752b300bcdad4 +devicetree f0ac3504960616c973e65c0a4e5488ad8de60d1c +dt-krzk 0ff3c07556e6316c3f87d2e2462002adb01a681d +mailbox 1b712f18c461bd75f018033a15cf381e712806b5 +spi d0e1c60318ac4ab2c5e275773696a9937ffe98a6 +tip 12f69e4363047659c19b60c011cc5359e0a6e2f0 +clockevents 8b5bf64c89c7100c921bd807ba39b2eb003061ab +edac 852667c317ae23f366cfaade3b9269b1943888dd +irqchip a82f3119d543406ed5b242deabf83cdecb9fe523 +ftrace 61c692f56feceaa5f6bf55301f7c108ac1013e91 +rcu c70bbbbdf3a6be24047c7422c4597209afac18c2 +kvm 255006adb3da71bb75c334453786df781b415f54 +kvm-arm 192df2aa0113ddddee2a93e453ff46610807b425 +kvms390 db54dfc9f71cd2df7afd1e88535ef6099cb0333e +kvm-riscv 07f225b5842420ae9c18cba17873fc71ed69c28e +kvm-x86 88bb466c9dec4f70d682cf38c685324e7b1b3d60 +xen-tip 21a235bce12361e64adfc2ef97e4ae2e51ad63d4 +percpu b9819165bb455bfdce37086c622a18cce2dd2f5e +workqueues ee360b1c50017fa1d2a7ca84e9dfe54091d7ee85 +drivers-x86 d2a7bd3690990ab8a8239096ee432ad51985d5b6 +chrome-platform 2b8cc5858a07ab75ce98cae720e263e1c1b0d1d9 +hsi 42877c38ac78e456fd9e149842a96a3576fb36e5 +leds 1b929c02afd37871d5afb9d498426f83432e71c2 +leds-lj 877e91191ccf0782ae18c5dfa7522fb1e5bfba8c +ipmi b02bb79eee074f07acdfde540f2d4fe2a04471d8 +driver-core 24be4d0b46bb0c3c1dc7bacd30957d6144a70dfc +usb 24be4d0b46bb0c3c1dc7bacd30957d6144a70dfc +thunderbolt 481012b479fe6d8dd4e01d739c359a8d99d074a9 +usb-serial ffa5f7a3bf28c1306eef85d4056539c2d4b8eb09 +tty 24be4d0b46bb0c3c1dc7bacd30957d6144a70dfc +char-misc 24be4d0b46bb0c3c1dc7bacd30957d6144a70dfc +accel e6f49e96bc57d34fc0f617f37bfdf62a9b58d2c2 +coresight 6c50384ef8b94a527445e3694ae6549e1f15d859 +fastrpc ac9a78681b921877518763ba0e89202254349d1b +fpga 47147d56f92ee3f575e4b457413e0f2587b40e17 +icc 1400725e45152a62fa43f8275e6bee99d584c967 +iio 9e66fb52449538406cea43e9f3889c391350e76e +phy-next a454850a815e62fa5d7c1eded0e8d56742613b94 +soundwire a4857d1afdd1fa7ff763e1d07b1c2db521a5f9b1 +extcon 94da3da96c35744001adfdb65e501e633a64cb51 +gnss 44c026a73be8038f03dbdeef028b642880cf1511 +vfio ff598081e5b9d0bdd6874bfe340811bbb75b35e4 +w1 b332af5398a3aa1a2fdd69bb6968a8f866cc39aa +staging 24be4d0b46bb0c3c1dc7bacd30957d6144a70dfc +counter-next 9b53a13422162feac7c7ee58e5bc0e0a80a41963 +mux 44c026a73be8038f03dbdeef028b642880cf1511 +dmaengine 907514a7dc4c574136e8fb576b014be05d25813a +cgroup fd99fa7cff4d1676998196298f1aa08700433522 +scsi c725787c2bdfbb89cb8cc7b2b35939bdf330c7ff +scsi-mkp 24033d71cc36ae8af02b56ec22c7490779a9e39f +vhost 373abdba01d4a975390a8ef1d2265cdcaa51aa33 +rpmsg 81aceef4b71d2c93a5d28b3f9a3a9dce5fecb284 +gpio ac9a78681b921877518763ba0e89202254349d1b +gpio-brgl 0ff9f5e57c5bb45b6b807a4d466228de39d8cd2f +gpio-intel ac9a78681b921877518763ba0e89202254349d1b +pinctrl 9f0648f13e34a01f2e1a7a0d5801988a7bca6988 +pinctrl-intel 9314d0530276aba19fd7b1c62b04eccb8e5327bc +pinctrl-renesas 5d32cead772c3d074947cb7277dea7532133037b +pinctrl-samsung ac9a78681b921877518763ba0e89202254349d1b +pwm 92554cdd428fce212d2a71a06939e7cab90f7c77 +userns 05bd6e0242b4c059ec6797e3d721ecca6d15ff8d +ktest 7dc8e24f0e09834341f84d37433840b353d64bc8 +kselftest 8cd0d8633e2de4e6dd9ddae7980432e726220fdb +kunit ac9a78681b921877518763ba0e89202254349d1b +kunit-next 2e66833579ed759d7b7da1a8f07eb727ec6e80db +livepatching ac4890f972116f84253934570b2c2a74e50227f3 +rtc 1b733a9ebc3d8011ca66ec6ff17f55a440358794 +nvdimm 1ea7ca1b090145519aad998679222f0a14ab8fce +at24 a3c10035d12f5ec10915d5c00c2e8f7d7c066182 +ntb 942cc9ceccb6178b56bf712b94d76190d8759823 +seccomp f373d301908a99ec62a4e12a356b69226f7689d0 +fsi 35af9fb49bc5c6d61ef70b501c3a56fe161cce3e +slimbus ac9a78681b921877518763ba0e89202254349d1b +nvmem ac1c0d15aedc0863031bc8d678d5f96ab11d3a41 +xarray 69cb69ea55420388b444ee30b1530ec15ab584f7 +hyperv a494aef23dfc732945cb42e22246a5c31174e4a5 +auxdisplay def85dce1451ec276b8047da2010b6e6a159c2b6 +kgdb b6464883f45ae6412de33e53587974fd86ba811e +hmm ac9a78681b921877518763ba0e89202254349d1b +cfi 3123109284176b1532874591f7c81f3837bbdc17 +mhi 6bb6aba2f57ab58a8853bf09cc4e875a46646c0b +memblock de649e7f5edb2e61dbd3d64deae44cb165e657ad +cxl fe77cc2e5a6a7c85f5c6ef8a39d7694ffc7f41c9 +zstd 2aa14b1ab2c41a4fe41efae80d58bb77da91f19f +efi 2e28a798c3092ea42b968fa16ac835969d124898 +unicode b500d6d7243d2e0807a39a09c52fbe668b59b2c1 +slab 7bc162d5cc4de5c33c5570dba2719a01506a9fd0 +random 512dee0c00ad9e9c7ae9f11fc6743702ea40caff +landlock 35ca4239929737bdc021ee923f97ebe7aff8fcc4 +rust d2e3115d717197cb2bc020dd1f06b06538474ac3 +sysctl 5664eaac4dcf561ed5a39641f525587bca289007 +execve aa88054b70905069d1cf706aa5e9a3418d1d341d +bitmap 2a3110e3f97ddc0f53bb766797b926a35edd07e6 +hte ac9a78681b921877518763ba0e89202254349d1b +kspp 5e2956ee46244ffba1d345bae8115aa5dc199adc +kspp-gustavo 40ca06d71d60677a8424798610c97a46e4140a21 +iommufd f1fcbaa18b28dec10281551dfe6ed3a3ed80e3d6 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..82e603f06965 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,367 @@ +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/perf/perf-tools#perf-tools +efi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#urgent +zstd-fixes git https://github.com/terrelln/linux.git#zstd-linus +battery-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#fixes +uml-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git#fixes +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 +w1-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git#fixes +drm-misc-fixes git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next-fixes +mm-stable git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-stable +mm-nonmm-stable git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-nonmm-stable +mm git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-everything +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#for-next +clang-format git https://github.com/ojeda/linux.git#clang-format +perf git git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git#perf-tools-next +compiler-attributes git https://github.com/ojeda/linux.git#compiler-attributes +dma-mapping git git://git.infradead.org/users/hch/dma-mapping.git#for-next +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master +arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next +arm git git://git.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 +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/overlayfs/vfs.git#overlayfs-next +ubifs git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#next +v9fs git git://github.com/martinetd/linux#9p-next +v9fs-ericvh git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#ericvh/for-next +xfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#for-next +zonefs git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git#for-next +iomap git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#iomap-for-next +djw-vfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#vfs-for-next +file-locks git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#locks-next +iversion git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#iversion-next +vfs-brauner git git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git#vfs.all +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#for-next +printk git git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git#next +pstore git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/pstore +hid git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git#for-next +i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next +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 +wpan-staging git git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git#staging +mtd git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/next +nand git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#nand/next +spi-nor git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#spi-nor/next +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +drm git git://git.freedesktop.org/git/drm/drm.git#drm-next +drm-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-riscv git https://github.com/kvm-riscv/linux.git#riscv_kvm_next +kvm-x86 git https://github.com/kvm-x86/linux.git#next +xen-tip git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +drivers-x86 git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#for-next +chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git#for-next +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 +fastrpc git git://git.kernel.org/pub/scm/linux/kernel/git/srini/fastrpc.git#for-next +fpga git git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git#for-next +icc git git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git#icc-next +iio git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#togreg +phy-next git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#next +soundwire git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#next +extcon git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next +gnss git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-next +vfio git git://github.com/awilliam/linux-vfio.git#next +w1 git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git#for-next +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..7befdfbd10d4 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,3593 @@ +$ date -R +Wed, 05 Jul 2023 08:42:40 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 56cbceab928d Merge tag 'usb-6.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb +Merging origin/master (d528014517f2 Revert ".gitignore: ignore *.cover and *.mbx") +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating 56cbceab928d..d528014517f2 +Fast-forward (no commit created; -m option ignored) + .gitignore | 2 - + Documentation/arch/arm64/silicon-errata.rst | 3 + + .../devicetree/bindings/arm/atmel-sysregs.txt | 94 - + .../devicetree/bindings/clock/qcom,a53pll.yaml | 1 + + .../bindings/clock/qcom,gcc-msm8953.yaml | 73 + + .../devicetree/bindings/clock/qcom,gcc-other.yaml | 1 - + .../devicetree/bindings/clock/qcom,gcc-sc7180.yaml | 7 + + .../devicetree/bindings/clock/qcom,gcc-sc7280.yaml | 7 + + .../devicetree/bindings/clock/qcom,gcc-sm8250.yaml | 5 +- + .../devicetree/bindings/clock/qcom,gpucc.yaml | 3 + + .../bindings/clock/qcom,ipq9574-gcc.yaml | 1 + + .../devicetree/bindings/clock/qcom,mmcc.yaml | 32 +- + .../devicetree/bindings/clock/qcom,rpmhcc.yaml | 1 + + .../bindings/clock/qcom,sm6375-gpucc.yaml | 15 + + .../bindings/clock/qcom,sm8350-videocc.yaml | 68 + + .../bindings/clock/qcom,sm8450-videocc.yaml | 4 +- + .../bindings/cpufreq/qcom-cpufreq-nvmem.yaml | 1 + + .../devicetree/bindings/mfd/qcom,spmi-pmic.yaml | 1 + + .../bindings/mfd/ti,j721e-system-controller.yaml | 2 +- + .../power/reset/atmel,at91sam9260-shdwc.yaml | 82 + + .../bindings/power/reset/atmel,sama5d2-shdwc.yaml | 114 + + .../bindings/power/reset/nvmem-reboot-mode.txt | 26 - + .../bindings/power/reset/nvmem-reboot-mode.yaml | 52 + + .../devicetree/bindings/power/reset/qcom,pon.yaml | 20 +- + .../devicetree/bindings/power/supply/bq256xx.yaml | 18 + + .../power/supply/qcom,pmi8998-charger.yaml | 82 + + .../supply/x-powers,axp20x-usb-power-supply.yaml | 1 + + .../bindings/remoteproc/st,stm32-rproc.yaml | 44 +- + .../device_drivers/ethernet/amd/pds_vdpa.rst | 85 + + .../networking/device_drivers/ethernet/index.rst | 1 + + Documentation/process/maintainer-handbooks.rst | 1 + + Documentation/process/maintainer-kvm-x86.rst | 390 +++ + Documentation/process/maintainer-tip.rst | 2 + + Documentation/virt/kvm/api.rst | 27 + + Documentation/virt/kvm/x86/mmu.rst | 2 +- + MAINTAINERS | 6 + + Makefile | 6 +- + arch/arm64/Kconfig | 19 + + arch/arm64/include/asm/cpufeature.h | 6 + + arch/arm64/include/asm/el2_setup.h | 27 +- + arch/arm64/include/asm/kvm_arm.h | 7 +- + arch/arm64/include/asm/kvm_asm.h | 4 + + arch/arm64/include/asm/kvm_emulate.h | 46 +- + arch/arm64/include/asm/kvm_host.h | 61 +- + arch/arm64/include/asm/kvm_hyp.h | 37 +- + arch/arm64/include/asm/kvm_mmu.h | 4 +- + arch/arm64/include/asm/kvm_pgtable.h | 79 +- + arch/arm64/include/asm/kvm_pkvm.h | 21 + + arch/arm64/include/asm/sysreg.h | 1 + + arch/arm64/include/asm/virt.h | 12 +- + arch/arm64/kernel/cpu_errata.c | 7 + + arch/arm64/kernel/cpufeature.c | 34 +- + arch/arm64/kernel/head.S | 2 + + arch/arm64/kernel/hyp-stub.S | 10 +- + arch/arm64/kernel/idreg-override.c | 25 +- + arch/arm64/kernel/kaslr.c | 6 +- + arch/arm64/kernel/vdso32/Makefile | 2 - + arch/arm64/kvm/arch_timer.c | 14 +- + arch/arm64/kvm/arm.c | 209 +- + arch/arm64/kvm/fpsimd.c | 4 +- + arch/arm64/kvm/hyp/include/hyp/switch.h | 101 +- + arch/arm64/kvm/hyp/include/nvhe/ffa.h | 17 + + arch/arm64/kvm/hyp/include/nvhe/mem_protect.h | 3 + + arch/arm64/kvm/hyp/nvhe/Makefile | 2 +- + arch/arm64/kvm/hyp/nvhe/ffa.c | 762 +++++ + arch/arm64/kvm/hyp/nvhe/host.S | 36 +- + arch/arm64/kvm/hyp/nvhe/hyp-init.S | 32 +- + arch/arm64/kvm/hyp/nvhe/hyp-main.c | 19 +- + arch/arm64/kvm/hyp/nvhe/mem_protect.c | 74 +- + arch/arm64/kvm/hyp/nvhe/pkvm.c | 27 +- + arch/arm64/kvm/hyp/nvhe/setup.c | 11 + + arch/arm64/kvm/hyp/nvhe/switch.c | 28 +- + arch/arm64/kvm/hyp/nvhe/timer-sr.c | 16 +- + arch/arm64/kvm/hyp/nvhe/tlb.c | 52 + + arch/arm64/kvm/hyp/pgtable.c | 228 +- + arch/arm64/kvm/hyp/vhe/switch.c | 2 +- + arch/arm64/kvm/hyp/vhe/tlb.c | 32 + + arch/arm64/kvm/mmu.c | 209 +- + arch/arm64/kvm/pkvm.c | 1 + + arch/arm64/kvm/reset.c | 58 - + arch/arm64/kvm/sys_regs.c | 505 +++- + arch/arm64/kvm/sys_regs.h | 22 +- + arch/arm64/mm/fault.c | 2 - + arch/arm64/tools/cpucaps | 3 + + arch/riscv/include/asm/csr.h | 2 + + arch/riscv/include/asm/kvm_aia.h | 107 +- + arch/riscv/include/asm/kvm_aia_aplic.h | 58 + + arch/riscv/include/asm/kvm_aia_imsic.h | 38 + + arch/riscv/include/asm/kvm_host.h | 4 + + arch/riscv/include/asm/kvm_vcpu_sbi.h | 11 +- + arch/riscv/include/uapi/asm/kvm.h | 73 + + arch/riscv/kvm/Kconfig | 4 + + arch/riscv/kvm/Makefile | 3 + + arch/riscv/kvm/aia.c | 274 +- + arch/riscv/kvm/aia_aplic.c | 619 ++++ + arch/riscv/kvm/aia_device.c | 673 +++++ + arch/riscv/kvm/aia_imsic.c | 1084 +++++++ + arch/riscv/kvm/main.c | 3 +- + arch/riscv/kvm/tlb.c | 2 +- + arch/riscv/kvm/vcpu.c | 4 + + arch/riscv/kvm/vcpu_exit.c | 2 + + arch/riscv/kvm/vcpu_sbi.c | 80 +- + arch/riscv/kvm/vm.c | 118 + + arch/s390/boot/uv.c | 4 + + arch/s390/include/asm/uv.h | 32 +- + arch/s390/include/uapi/asm/uvdevice.h | 53 +- + arch/s390/kernel/uv.c | 108 +- + arch/s390/kvm/diag.c | 8 +- + arch/s390/kvm/kvm-s390.c | 4 + + arch/s390/kvm/vsie.c | 6 +- + arch/x86/include/asm/kvm-x86-pmu-ops.h | 1 - + arch/x86/include/asm/kvm_host.h | 2 +- + arch/x86/kvm/cpuid.c | 43 +- + arch/x86/kvm/i8259.c | 3 + + arch/x86/kvm/lapic.c | 5 - + arch/x86/kvm/mmu/mmu.c | 53 +- + arch/x86/kvm/mmu/tdp_mmu.c | 5 +- + arch/x86/kvm/mtrr.c | 64 +- + arch/x86/kvm/pmu.c | 92 +- + arch/x86/kvm/pmu.h | 56 +- + arch/x86/kvm/reverse_cpuid.h | 7 + + arch/x86/kvm/svm/pmu.c | 68 +- + arch/x86/kvm/svm/sev.c | 19 +- + arch/x86/kvm/svm/svm.c | 56 +- + arch/x86/kvm/svm/svm.h | 1 - + arch/x86/kvm/vmx/capabilities.h | 4 +- + arch/x86/kvm/vmx/nested.c | 7 +- + arch/x86/kvm/vmx/pmu_intel.c | 79 +- + arch/x86/kvm/vmx/sgx.c | 15 +- + arch/x86/kvm/vmx/vmenter.S | 2 +- + arch/x86/kvm/vmx/vmx.c | 77 +- + arch/x86/kvm/vmx/vmx.h | 12 - + arch/x86/kvm/x86.c | 80 +- + arch/x86/kvm/x86.h | 1 - + block/blk-cgroup.c | 6 +- + block/blk-iocost.c | 7 +- + block/blk-mq.c | 54 +- + block/blk-sysfs.c | 181 +- + block/blk-throttle.c | 6 - + block/blk-throttle.h | 9 + + block/blk-wbt.c | 21 +- + block/blk-wbt.h | 19 - + drivers/bluetooth/virtio_bt.c | 1 + + drivers/cdrom/gdrom.c | 4 +- + drivers/char/virtio_console.c | 1 + + drivers/clk/at91/at91rm9200.c | 14 +- + drivers/clk/at91/at91sam9260.c | 14 +- + drivers/clk/at91/at91sam9g45.c | 16 +- + drivers/clk/at91/at91sam9n12.c | 14 +- + drivers/clk/at91/at91sam9rl.c | 14 +- + drivers/clk/at91/at91sam9x5.c | 20 +- + drivers/clk/at91/clk-generated.c | 11 +- + drivers/clk/at91/clk-main.c | 32 +- + drivers/clk/at91/clk-master.c | 28 +- + drivers/clk/at91/clk-peripheral.c | 22 +- + drivers/clk/at91/clk-programmable.c | 11 +- + drivers/clk/at91/clk-sam9x60-pll.c | 17 +- + drivers/clk/at91/clk-system.c | 12 +- + drivers/clk/at91/clk-utmi.c | 24 +- + drivers/clk/at91/dt-compat.c | 23 +- + drivers/clk/at91/pmc.h | 36 +- + drivers/clk/at91/sam9x60.c | 20 +- + drivers/clk/at91/sama5d2.c | 20 +- + drivers/clk/at91/sama5d3.c | 16 +- + drivers/clk/at91/sama5d4.c | 18 +- + drivers/clk/at91/sama7g5.c | 782 +++--- + drivers/clk/at91/sckc.c | 75 +- + drivers/clk/qcom/Kconfig | 132 + + drivers/clk/qcom/Makefile | 7 + + drivers/clk/qcom/apss-ipq-pll.c | 19 + + drivers/clk/qcom/camcc-sc7180.c | 19 +- + drivers/clk/qcom/clk-alpha-pll.c | 21 +- + drivers/clk/qcom/clk-alpha-pll.h | 3 + + drivers/clk/qcom/clk-branch.c | 6 +- + drivers/clk/qcom/clk-rcg.h | 2 + + drivers/clk/qcom/clk-rcg2.c | 2 + + drivers/clk/qcom/clk-rpmh.c | 19 + + drivers/clk/qcom/clk-smd-rpm.c | 58 +- + drivers/clk/qcom/dispcc-qcm2290.c | 12 +- + drivers/clk/qcom/gcc-ipq5332.c | 6 +- + drivers/clk/qcom/gcc-ipq6018.c | 45 +- + drivers/clk/qcom/gcc-ipq9574.c | 506 ++-- + drivers/clk/qcom/gcc-qcm2290.c | 62 +- + drivers/clk/qcom/gcc-sc8280xp.c | 18 +- + drivers/clk/qcom/gcc-sdm660.c | 2 - + drivers/clk/qcom/gcc-sdx75.c | 2970 ++++++++++++++++++++ + drivers/clk/qcom/gcc-sm6115.c | 8 + + drivers/clk/qcom/gcc-sm8450.c | 39 + + drivers/clk/qcom/gpucc-sc8280xp.c | 19 +- + drivers/clk/qcom/gpucc-sm6375.c | 19 +- + drivers/clk/qcom/gpucc-sm8450.c | 766 +++++ + drivers/clk/qcom/gpucc-sm8550.c | 611 ++++ + drivers/clk/qcom/lpasscc-sc8280xp.c | 87 + + drivers/clk/qcom/mmcc-msm8974.c | 23 +- + drivers/clk/qcom/videocc-sm8350.c | 552 ++++ + drivers/clk/qcom/videocc-sm8450.c | 463 +++ + drivers/clk/qcom/videocc-sm8550.c | 470 ++++ + drivers/clk/tegra/clk-tegra-super-cclk.c | 15 +- + drivers/cpufreq/Kconfig | 3 +- + drivers/cpufreq/armada-8k-cpufreq.c | 16 +- + drivers/cpufreq/cpufreq-dt-platdev.c | 5 + + drivers/cpufreq/imx6q-cpufreq.c | 30 +- + drivers/cpufreq/intel_pstate.c | 58 +- + drivers/cpufreq/mediatek-cpufreq.c | 13 +- + drivers/cpufreq/qcom-cpufreq-hw.c | 2 +- + drivers/cpufreq/sparc-us2e-cpufreq.c | 58 +- + drivers/cpufreq/sparc-us3-cpufreq.c | 58 +- + drivers/cpufreq/tegra194-cpufreq.c | 6 +- + drivers/cpufreq/ti-cpufreq.c | 1 + + drivers/crypto/virtio/virtio_crypto_core.c | 1 + + drivers/dma/ioat/dma.c | 12 +- + drivers/firewire/.kunitconfig | 4 + + drivers/firewire/Kconfig | 16 + + drivers/firewire/Makefile | 3 + + drivers/firewire/core-cdev.c | 252 +- + drivers/firewire/core-device.c | 2 +- + drivers/firewire/core-topology.c | 2 +- + drivers/firewire/core-transaction.c | 93 +- + drivers/firewire/core.h | 7 + + drivers/firewire/net.c | 6 +- + drivers/firewire/ohci.c | 189 +- + drivers/firewire/uapi-test.c | 89 + + drivers/hsi/clients/ssi_protocol.c | 2 - + drivers/hsi/controllers/omap_ssi_core.c | 1 + + drivers/hsi/controllers/omap_ssi_port.c | 14 +- + drivers/hwspinlock/omap_hwspinlock.c | 2 +- + drivers/idle/intel_idle.c | 2 +- + drivers/md/bcache/super.c | 123 +- + drivers/md/md.c | 32 +- + drivers/md/md.h | 4 +- + drivers/md/raid0.c | 62 +- + drivers/md/raid0.h | 1 + + drivers/md/raid1-10.c | 2 +- + drivers/md/raid10.c | 6 +- + drivers/nvme/host/constants.c | 2 +- + drivers/nvme/host/core.c | 6 +- + drivers/nvme/host/ioctl.c | 70 +- + drivers/nvme/host/multipath.c | 10 +- + drivers/nvme/host/nvme.h | 3 +- + drivers/nvme/host/pci.c | 5 +- + drivers/nvme/target/nvmet.h | 2 +- + drivers/opp/core.c | 44 +- + drivers/opp/debugfs.c | 1 - + drivers/opp/of.c | 40 +- + drivers/opp/opp.h | 6 +- + drivers/power/reset/Kconfig | 1 + + drivers/power/reset/at91-reset.c | 9 +- + drivers/power/reset/gpio-restart.c | 7 +- + drivers/power/reset/qcom-pon.c | 22 +- + drivers/power/supply/Kconfig | 9 + + drivers/power/supply/Makefile | 1 + + drivers/power/supply/adp5061.c | 2 +- + drivers/power/supply/axp20x_usb_power.c | 307 +- + drivers/power/supply/bd99954-charger.c | 2 +- + drivers/power/supply/bq2415x_charger.c | 2 +- + drivers/power/supply/bq24190_charger.c | 2 +- + drivers/power/supply/bq24257_charger.c | 2 +- + drivers/power/supply/bq24735-charger.c | 2 +- + drivers/power/supply/bq2515x_charger.c | 2 +- + drivers/power/supply/bq256xx_charger.c | 30 +- + drivers/power/supply/bq25890_charger.c | 2 +- + drivers/power/supply/bq25980_charger.c | 2 +- + drivers/power/supply/bq27xxx_battery_i2c.c | 2 +- + drivers/power/supply/cros_peripheral_charger.c | 25 +- + drivers/power/supply/cw2015_battery.c | 2 +- + drivers/power/supply/ds2782_battery.c | 2 +- + drivers/power/supply/ip5xxx_power.c | 2 +- + drivers/power/supply/lp8727_charger.c | 2 +- + drivers/power/supply/ltc2941-battery-gauge.c | 2 +- + drivers/power/supply/ltc4162-l-charger.c | 2 +- + drivers/power/supply/max14656_charger_detector.c | 2 +- + drivers/power/supply/max17040_battery.c | 2 +- + drivers/power/supply/max17042_battery.c | 9 +- + drivers/power/supply/max77976_charger.c | 2 +- + drivers/power/supply/power_supply_hwmon.c | 2 +- + drivers/power/supply/qcom_pmi8998_charger.c | 1059 +++++++ + drivers/power/supply/rk817_charger.c | 2 +- + drivers/power/supply/rt5033_battery.c | 2 +- + drivers/power/supply/rt9455_charger.c | 2 +- + drivers/power/supply/rt9467-charger.c | 4 +- + drivers/power/supply/rt9471.c | 2 +- + drivers/power/supply/sbs-battery.c | 2 +- + drivers/power/supply/sbs-charger.c | 2 +- + drivers/power/supply/sbs-manager.c | 2 +- + drivers/power/supply/smb347-charger.c | 2 +- + drivers/power/supply/twl4030_madc_battery.c | 8 +- + drivers/power/supply/ucs1002_power.c | 2 +- + drivers/power/supply/ug3105_battery.c | 2 +- + drivers/remoteproc/da8xx_remoteproc.c | 6 +- + drivers/remoteproc/imx_dsp_rproc.c | 17 +- + drivers/remoteproc/imx_rproc.c | 6 +- + drivers/remoteproc/keystone_remoteproc.c | 6 +- + drivers/remoteproc/meson_mx_ao_arc.c | 6 +- + drivers/remoteproc/mtk_scp.c | 6 +- + drivers/remoteproc/omap_remoteproc.c | 6 +- + drivers/remoteproc/pru_rproc.c | 6 +- + drivers/remoteproc/qcom_q6v5_adsp.c | 6 +- + drivers/remoteproc/qcom_q6v5_mss.c | 6 +- + drivers/remoteproc/qcom_q6v5_pas.c | 8 +- + drivers/remoteproc/qcom_q6v5_wcss.c | 6 +- + drivers/remoteproc/qcom_wcnss.c | 6 +- + drivers/remoteproc/rcar_rproc.c | 6 +- + drivers/remoteproc/remoteproc_virtio.c | 6 +- + drivers/remoteproc/st_remoteproc.c | 6 +- + drivers/remoteproc/stm32_rproc.c | 84 +- + drivers/remoteproc/wkup_m3_rproc.c | 6 +- + drivers/s390/char/Kconfig | 2 +- + drivers/s390/char/uvdevice.c | 231 +- + drivers/vdpa/Kconfig | 10 + + drivers/vdpa/Makefile | 1 + + drivers/vdpa/ifcvf/ifcvf_base.c | 215 +- + drivers/vdpa/ifcvf/ifcvf_base.h | 48 +- + drivers/vdpa/ifcvf/ifcvf_main.c | 108 +- + drivers/vdpa/mlx5/net/mlx5_vnet.c | 165 +- + drivers/vdpa/mlx5/net/mlx5_vnet.h | 15 + + drivers/vdpa/pds/Makefile | 10 + + drivers/vdpa/pds/aux_drv.c | 140 + + drivers/vdpa/pds/aux_drv.h | 26 + + drivers/vdpa/pds/cmds.c | 185 ++ + drivers/vdpa/pds/cmds.h | 18 + + drivers/vdpa/pds/debugfs.c | 289 ++ + drivers/vdpa/pds/debugfs.h | 17 + + drivers/vdpa/pds/vdpa_dev.c | 769 +++++ + drivers/vdpa/pds/vdpa_dev.h | 49 + + drivers/vdpa/solidrun/snet_ctrl.c | 6 + + drivers/vdpa/solidrun/snet_hwmon.c | 2 +- + drivers/vdpa/solidrun/snet_main.c | 15 + + drivers/vdpa/solidrun/snet_vdpa.h | 1 + + drivers/vdpa/vdpa_user/vduse_dev.c | 6 +- + drivers/vhost/net.c | 8 +- + drivers/vhost/scsi.c | 103 +- + drivers/vhost/vhost.c | 425 ++- + drivers/vhost/vhost.h | 24 +- + drivers/vhost/vsock.c | 4 +- + drivers/virtio/virtio_pci_common.h | 7 +- + drivers/virtio/virtio_pci_modern_dev.c | 33 +- + drivers/virtio/virtio_vdpa.c | 4 +- + fs/afs/write.c | 8 +- + fs/gfs2/aops.c | 19 +- + fs/gfs2/bmap.c | 4 +- + fs/gfs2/file.c | 5 +- + fs/gfs2/glock.c | 4 +- + fs/gfs2/glops.c | 69 +- + fs/gfs2/incore.h | 12 +- + fs/gfs2/lock_dlm.c | 23 +- + fs/gfs2/log.c | 11 +- + fs/gfs2/lops.c | 21 +- + fs/gfs2/ops_fstype.c | 15 +- + fs/gfs2/quota.c | 26 +- + fs/gfs2/recovery.c | 28 +- + fs/gfs2/rgrp.c | 2 +- + fs/gfs2/super.c | 215 +- + fs/gfs2/super.h | 1 + + fs/gfs2/sys.c | 4 +- + fs/gfs2/trans.c | 3 +- + fs/gfs2/util.c | 47 +- + fs/gfs2/util.h | 3 +- + fs/overlayfs/overlayfs.h | 41 +- + fs/overlayfs/params.c | 532 +++- + fs/overlayfs/params.h | 42 + + fs/overlayfs/super.c | 530 +--- + include/dt-bindings/clock/qcom,sm8350-videocc.h | 35 + + include/dt-bindings/reset/qcom,sm8350-videocc.h | 18 + + include/kvm/arm_pmu.h | 8 +- + include/kvm/iodev.h | 6 - + include/linux/arm_ffa.h | 8 + + include/linux/blk-mq.h | 8 +- + include/linux/cleanup.h | 171 ++ + include/linux/compiler-clang.h | 9 + + include/linux/compiler_attributes.h | 6 + + include/linux/device.h | 7 + + include/linux/file.h | 6 + + include/linux/firewire.h | 82 +- + include/linux/hsi/ssi_protocol.h | 1 + + include/linux/irqflags.h | 7 + + include/linux/kdb.h | 2 + + include/linux/kgdb.h | 1 + + include/linux/kvm_host.h | 9 +- + include/linux/mutex.h | 4 + + include/linux/pds/pds_adminq.h | 247 ++ + include/linux/pds/pds_common.h | 21 +- + include/linux/percpu.h | 4 + + include/linux/preempt.h | 5 + + include/linux/rcupdate.h | 3 + + include/linux/rwsem.h | 8 + + include/linux/sched/task.h | 2 + + include/linux/slab.h | 3 + + include/linux/spinlock.h | 31 + + include/linux/srcu.h | 5 + + include/linux/virtio.h | 5 +- + include/linux/virtio_pci_modern.h | 6 + + include/rdma/uverbs_ioctl.h | 6 +- + include/uapi/linux/firewire-cdev.h | 180 +- + include/uapi/linux/io_uring.h | 2 + + include/uapi/linux/kvm.h | 6 +- + include/uapi/linux/vhost.h | 31 + + include/uapi/linux/vhost_types.h | 16 + + io_uring/io_uring.c | 49 +- + io_uring/net.c | 8 +- + kernel/debug/kdb/kdb_io.c | 16 +- + kernel/debug/kdb/kdb_keyboard.c | 2 + + kernel/debug/kdb/kdb_private.h | 1 - + kernel/module/main.c | 39 +- + mm/mmap.c | 6 +- + scripts/checkpatch.pl | 2 +- + security/apparmor/include/lib.h | 6 +- + tools/testing/selftests/kvm/Makefile | 19 +- + tools/testing/selftests/kvm/demand_paging_test.c | 32 +- + tools/testing/selftests/kvm/dirty_log_perf_test.c | 96 +- + .../testing/selftests/kvm/include/kvm_util_base.h | 1 + + tools/testing/selftests/kvm/include/memstress.h | 8 + + tools/testing/selftests/kvm/lib/kvm_util.c | 17 + + tools/testing/selftests/kvm/lib/memstress.c | 75 + + tools/testing/selftests/kvm/lib/userfaultfd_util.c | 4 +- + tools/testing/selftests/kvm/s390x/cmma_test.c | 700 +++++ + tools/testing/selftests/kvm/x86_64/cpuid_test.c | 21 + + .../kvm/x86_64/dirty_log_page_splitting_test.c | 259 ++ + .../selftests/kvm/x86_64/nx_huge_pages_test.c | 2 +- + .../kvm/x86_64/vmx_nested_tsc_scaling_test.c | 22 +- + tools/virtio/Makefile | 13 +- + virt/kvm/coalesced_mmio.c | 9 +- + virt/kvm/eventfd.c | 8 +- + virt/kvm/kvm_main.c | 51 +- + 423 files changed, 22694 insertions(+), 4272 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/qcom,gcc-msm8953.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,sm8350-videocc.yaml + create mode 100644 Documentation/devicetree/bindings/power/reset/atmel,at91sam9260-shdwc.yaml + create mode 100644 Documentation/devicetree/bindings/power/reset/atmel,sama5d2-shdwc.yaml + delete mode 100644 Documentation/devicetree/bindings/power/reset/nvmem-reboot-mode.txt + create mode 100644 Documentation/devicetree/bindings/power/reset/nvmem-reboot-mode.yaml + create mode 100644 Documentation/devicetree/bindings/power/supply/qcom,pmi8998-charger.yaml + create mode 100644 Documentation/networking/device_drivers/ethernet/amd/pds_vdpa.rst + create mode 100644 Documentation/process/maintainer-kvm-x86.rst + create mode 100644 arch/arm64/kvm/hyp/include/nvhe/ffa.h + create mode 100644 arch/arm64/kvm/hyp/nvhe/ffa.c + create mode 100644 arch/riscv/include/asm/kvm_aia_aplic.h + create mode 100644 arch/riscv/include/asm/kvm_aia_imsic.h + create mode 100644 arch/riscv/kvm/aia_aplic.c + create mode 100644 arch/riscv/kvm/aia_device.c + create mode 100644 arch/riscv/kvm/aia_imsic.c + create mode 100644 drivers/clk/qcom/gcc-sdx75.c + create mode 100644 drivers/clk/qcom/gpucc-sm8450.c + create mode 100644 drivers/clk/qcom/gpucc-sm8550.c + create mode 100644 drivers/clk/qcom/lpasscc-sc8280xp.c + create mode 100644 drivers/clk/qcom/videocc-sm8350.c + create mode 100644 drivers/clk/qcom/videocc-sm8450.c + create mode 100644 drivers/clk/qcom/videocc-sm8550.c + create mode 100644 drivers/firewire/.kunitconfig + create mode 100644 drivers/firewire/uapi-test.c + create mode 100644 drivers/power/supply/qcom_pmi8998_charger.c + create mode 100644 drivers/vdpa/pds/Makefile + create mode 100644 drivers/vdpa/pds/aux_drv.c + create mode 100644 drivers/vdpa/pds/aux_drv.h + create mode 100644 drivers/vdpa/pds/cmds.c + create mode 100644 drivers/vdpa/pds/cmds.h + create mode 100644 drivers/vdpa/pds/debugfs.c + create mode 100644 drivers/vdpa/pds/debugfs.h + create mode 100644 drivers/vdpa/pds/vdpa_dev.c + create mode 100644 drivers/vdpa/pds/vdpa_dev.h + create mode 100644 fs/overlayfs/params.h + create mode 100644 include/dt-bindings/clock/qcom,sm8350-videocc.h + create mode 100644 include/dt-bindings/reset/qcom,sm8350-videocc.h + create mode 100644 include/linux/cleanup.h + create mode 100644 tools/testing/selftests/kvm/s390x/cmma_test.c + create mode 100644 tools/testing/selftests/kvm/x86_64/dirty_log_page_splitting_test.c +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 (aa902577e921 kasan: fix type cast in memory_is_poisoned_n) +$ git merge -m Merge branch 'mm-hotfixes-unstable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-hotfixes/mm-hotfixes-unstable +Auto-merging .mailmap +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .mailmap | 7 ++++++- + Documentation/ABI/obsolete/o2cb | 4 ++-- + Documentation/ABI/removed/o2cb | 4 ++-- + Documentation/ABI/stable/o2cb | 4 ++-- + Documentation/ABI/testing/sysfs-ocfs2 | 12 ++++++------ + Documentation/filesystems/dlmfs.rst | 2 +- + Documentation/filesystems/ocfs2.rst | 2 +- + MAINTAINERS | 9 ++++++++- + fs/ocfs2/Kconfig | 6 +++--- + fs/squashfs/block.c | 27 +++++++++++++++++++++++---- + include/linux/bootmem_info.h | 2 ++ + mm/hugetlb.c | 7 ++++++- + mm/kasan/generic.c | 3 ++- + mm/memory.c | 10 ++++++++++ + mm/page-writeback.c | 8 +++++--- + mm/shmem.c | 19 ++++++++++++++++++- + 16 files changed, 97 insertions(+), 29 deletions(-) +Merging kbuild-current/fixes (dfab92f27c60 Merge tag 'nfs-for-6.5-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs) +$ 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 (2b951b0efbaa ARM: 9297/1: vfp: avoid unbalanced stack on 'success' return path) +$ git merge -m Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm-current/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (0e2aba694866 arm64: mm: pass original fault address to handle_mm_fault() in PER_VMA_LOCK block) +$ 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 (5b017b5ed2bc Merge tag 'v6.4-rockchip-dtsfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip 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 (ac9a78681b92 Linux 6.4-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 (ac9a78681b92 Linux 6.4-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 (4055eabe04a2 m68k: defconfig: Update defconfigs for v6.4-rc1) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (6995e2de6891 Linux 6.4) +$ 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 (ad3d770b83af s390/defconfigs: set CONFIG_NET_TC_SKB_EXT=y) +$ 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 (14bb236b2992 octeontx-af: fix hardware timestamp configuration) +$ 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. + Documentation/ABI/testing/sysfs-class-net-qmi | 2 +- + .../device_drivers/cellular/qualcomm/rmnet.rst | 7 +- + Documentation/process/maintainer-netdev.rst | 7 +- + drivers/bluetooth/btqca.c | 2 +- + drivers/bluetooth/btrtl.c | 18 ++++- + drivers/bluetooth/btusb.c | 5 ++ + drivers/bluetooth/hci_bcm.c | 3 +- + drivers/net/dsa/ocelot/felix.c | 12 +++ + drivers/net/dsa/sja1105/sja1105.h | 2 +- + drivers/net/dsa/sja1105/sja1105_main.c | 14 +--- + drivers/net/dsa/sja1105/sja1105_ptp.c | 48 +---------- + drivers/net/dsa/vitesse-vsc73xx-core.c | 6 +- + drivers/net/ethernet/broadcom/tg3.c | 1 + + drivers/net/ethernet/ibm/ibmvnic.c | 9 ++- + drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 33 +++++++- + drivers/net/ethernet/marvell/octeontx2/af/cgx.h | 2 + + .../ethernet/marvell/octeontx2/af/lmac_common.h | 3 + + drivers/net/ethernet/marvell/octeontx2/af/rpm.c | 32 +++++++- + drivers/net/ethernet/marvell/octeontx2/af/rpm.h | 5 +- + drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 1 + + drivers/net/ethernet/marvell/octeontx2/af/rvu.h | 12 +++ + .../net/ethernet/marvell/octeontx2/af/rvu_cgx.c | 22 +++++- + drivers/net/ethernet/mellanox/mlxsw/minimal.c | 1 + + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 4 +- + drivers/net/ethernet/microchip/lan743x_main.c | 21 ++++- + drivers/net/ethernet/mscc/ocelot.c | 1 - + drivers/net/ethernet/mscc/ocelot_ptp.c | 66 ++++++++++------ + drivers/net/ethernet/sfc/efx_devlink.c | 3 + + drivers/net/ppp/pptp.c | 31 +++++--- + drivers/net/usb/cdc_ether.c | 6 ++ + drivers/net/wireguard/netlink.c | 14 ++-- + drivers/net/wireguard/queueing.c | 1 + + drivers/net/wireguard/queueing.h | 25 +++--- + drivers/net/wireguard/receive.c | 2 +- + drivers/net/wireguard/send.c | 2 +- + drivers/net/wireguard/timers.c | 10 +-- + drivers/nvme/host/tcp.c | 2 +- + drivers/ptp/ptp_sysfs.c | 3 + + include/linux/dsa/sja1105.h | 4 - + include/net/bluetooth/bluetooth.h | 2 +- + include/net/bluetooth/mgmt.h | 1 + + include/soc/mscc/ocelot.h | 10 ++- + include/trace/events/fib.h | 2 +- + include/trace/events/fib6.h | 2 +- + include/trace/events/net.h | 3 +- + net/bluetooth/hci_conn.c | 49 +++++++++--- + net/bluetooth/hci_event.c | 63 +++++++++------ + net/bluetooth/hci_sync.c | 28 +++---- + net/bluetooth/hci_sysfs.c | 14 ++-- + net/bluetooth/iso.c | 4 +- + net/bluetooth/l2cap_core.c | 5 ++ + net/bluetooth/l2cap_sock.c | 2 + + net/bridge/br_if.c | 5 +- + net/dsa/tag_sja1105.c | 92 ++++++++-------------- + net/ipv4/tcp_input.c | 12 ++- + net/sched/act_ipt.c | 72 +++++++++++++++-- + net/sched/act_pedit.c | 1 + + net/sctp/socket.c | 4 +- + samples/pktgen/functions.sh | 13 +-- + .../pktgen/pktgen_bench_xmit_mode_netif_receive.sh | 4 + + .../pktgen/pktgen_bench_xmit_mode_queue_xmit.sh | 4 + + samples/pktgen/pktgen_sample01_simple.sh | 4 + + samples/pktgen/pktgen_sample02_multiqueue.sh | 3 + + .../pktgen/pktgen_sample03_burst_single_flow.sh | 4 + + samples/pktgen/pktgen_sample04_many_flows.sh | 4 + + samples/pktgen/pktgen_sample05_flow_per_thread.sh | 4 + + ...tgen_sample06_numa_awared_queue_irq_affinity.sh | 3 + + tools/testing/selftests/net/config | 1 + + tools/testing/selftests/wireguard/netns.sh | 30 ++++++- + 69 files changed, 583 insertions(+), 304 deletions(-) +Merging bpf/master (f7306acec9aa xsk: Honor SO_BINDTODEVICE on bind) +$ 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. + Documentation/networking/af_xdp.rst | 9 +++++++++ + kernel/bpf/btf.c | 6 ++---- + net/xdp/xsk.c | 5 +++++ + 3 files changed, 16 insertions(+), 4 deletions(-) +Merging ipsec/master (d1e0e61d617b net: xfrm: Amend XFRMA_SEC_CTX nla_policy structure) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master +Merge made by the 'ort' strategy. + net/key/af_key.c | 4 ++-- + net/xfrm/xfrm_compat.c | 2 +- + net/xfrm/xfrm_user.c | 11 ++++++++++- + 3 files changed, 13 insertions(+), 4 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 (1a7d09a737a0 Merge tag 'nf-23-06-27' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git ipvs/main +Already up to date. +Merging wireless/for-next (f1a0898b5d6a wifi: iwlwifi: mvm: spin_lock_bh() to fix lockdep regression) +$ 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 (9a43827e876c net: dpaa2-mac: add 25gbase-r support) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan.git wpan/master +Already up to date. +Merging rdma-fixes/for-rc (45a3e24f65e9 Linux 6.4-rc7) +$ 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 (72cea3a3175b ALSA: hda/realtek: Whitespace fix) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus +Merge made by the 'ort' strategy. + sound/core/pcm_memory.c | 44 ++++++++++++++++++++++++++++++++++-------- + sound/core/ump_convert.c | 2 +- + sound/firewire/fireface/ff.c | 2 +- + sound/firewire/oxfw/oxfw.c | 2 +- + sound/hda/hdac_regmap.c | 7 +++---- + sound/pci/hda/patch_realtek.c | 45 +++++++++++++++++++++++++++++++++++++++++-- + 6 files changed, 85 insertions(+), 17 deletions(-) +Merging sound-asoc-fixes/for-linus (08a9ad10002c Merge remote-tracking branch 'asoc/for-6.4' into asoc-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc-fixes/for-linus +Merge made by the 'ort' strategy. + sound/soc/amd/acp/amd.h | 7 +- + sound/soc/amd/ps/acp63.h | 22 ++++++- + sound/soc/amd/ps/ps-sdw-dma.c | 16 ++++- + sound/soc/codecs/cs43130.h | 138 +++++++++++++++++++-------------------- + sound/soc/codecs/rt5640.c | 12 ++-- + sound/soc/codecs/wcd934x.c | 8 +-- + sound/soc/codecs/wcd938x.c | 34 +++++++--- + sound/soc/qcom/qdsp6/q6apm-dai.c | 1 + + sound/soc/soc-compress.c | 1 + + sound/soc/sof/amd/acp.c | 10 ++- + sound/soc/tegra/tegra210_adx.c | 34 ++++++---- + sound/soc/tegra/tegra210_amx.c | 40 +++++++----- + sound/soc/tegra/tegra210_sfc.c | 31 ++++++++- + sound/soc/tegra/tegra210_sfc.h | 4 +- + 14 files changed, 230 insertions(+), 128 deletions(-) +Merging regmap-fixes/for-linus (c8e796895e23 regmap: spi-avmm: Fix regmap_bus max_raw_write) +$ 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 (701c1cef8e02 Merge remote-tracking branch 'regulator/for-6.4' 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 +Auto-merging drivers/regulator/Kconfig +Merge made by the 'ort' strategy. + drivers/regulator/Kconfig | 1 + + drivers/regulator/da9063-regulator.c | 9 ++++++--- + 2 files changed, 7 insertions(+), 3 deletions(-) +Merging spi-fixes/for-linus (d0e1c60318ac Merge remote-tracking branch 'spi/for-6.4' into spi-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi-fixes/for-linus +Auto-merging drivers/spi/spi-geni-qcom.c +Merge made by the 'ort' strategy. + drivers/spi/Kconfig | 2 +- + drivers/spi/spi-bcm-qspi.c | 10 +++------- + drivers/spi/spi-bcm63xx-hsspi.c | 2 +- + drivers/spi/spi-bcmbca-hsspi.c | 2 +- + drivers/spi/spi-geni-qcom.c | 6 ++++++ + drivers/spi/spi-zynqmp-gqspi.c | 12 ++++++++---- + 6 files changed, 20 insertions(+), 14 deletions(-) +Merging pci-current/for-linus (ac9a78681b92 Linux 6.4-rc1) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (24be4d0b46bb arch/arm64/mm/fault: Fix undeclared variable error in do_page_fault()) +$ 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 (24be4d0b46bb arch/arm64/mm/fault: Fix undeclared variable error in do_page_fault()) +$ 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 (24be4d0b46bb arch/arm64/mm/fault: Fix undeclared variable error in do_page_fault()) +$ 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 (45a3e24f65e9 Linux 6.4-rc7) +$ 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 (9561de3a55be Linux 6.4-rc5) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy/fixes +Already up to date. +Merging staging.current/staging-linus (24be4d0b46bb arch/arm64/mm/fault: Fix undeclared variable error in do_page_fault()) +$ 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 (c57fa0037024 meson saradc: fix clock divider mask length) +$ git merge -m Merge branch 'fixes-togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio-fixes/fixes-togreg +Already up to date. +Merging counter-current/counter-current (9b53a1342216 counter: Fix menuconfig "Counter support" submenu entries disappearance) +$ git merge -m Merge branch 'counter-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-current/counter-current +Auto-merging drivers/counter/Kconfig +Merge made by the 'ort' strategy. + drivers/counter/Kconfig | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) +Merging char-misc.current/char-misc-linus (24be4d0b46bb arch/arm64/mm/fault: Fix undeclared variable error in do_page_fault()) +$ 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 (858fd168a95c Linux 6.4-rc6) +$ 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 (6995e2de6891 Linux 6.4) +$ 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 (bf4ed21778f2 Merge branch 'next' into for-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input-current/for-linus +Already up to date. +Merging crypto-current/master (486bfb05913a crypto: akcipher - Do not copy dst if it is NULL) +$ 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 (4752354af710 vfio/type1: check pfn valid before converting to struct page) +$ 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 (dbcf76390eb9 selftests/ftrace: Improve integration with kselftest runner) +$ 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 (e14fd2af7a1d dmaengine: at_hdmac: Extend the Flow Controller bitfield to three bits) +$ 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 (c4d28e30a8d0 mtd: rawnand: marvell: don't set the NAND frequency select) +$ 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 (ec21a38df77a Revert "media: dvb-core: Fix use-after-free on race condition at dvb_frontend") +$ git merge -m Merge branch 'fixes' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-fixes/fixes +Already up to date. +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 (4897a898a216 mips: Move initrd_start check after initrd address sanitisation.) +$ 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 (6b0db163ff92 ARM: dts: at91: sama7g5ek: fix debounce delay property for shdwc) +$ 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 (2623b3dc875a Merge tag 'kvmarm-fixes-6.4-4' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (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 (b153a0bb4199 hwmon: (pmbus/adm1275) Fix problems with temperature monitoring on ADM1272) +$ 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 (e98d14fa7315 tools/testing/nvdimm: Drop empty platform remove function) +$ 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 (a70fc4ed20a6 cxl/port: Fix NULL pointer access in devm_cxl_add_port()) +$ 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 (4d0998044f33 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. +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 (146b6f6855e7 platform/x86/amd/pmf: Register notify handler only if SPS is enabled) +$ 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 (ac9a78681b92 Linux 6.4-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 (ac9a78681b92 Linux 6.4-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 (c7753ed71c16 dt-bindings: pinctrl: qcom,pmic-mpp: Fix schema for "qcom,paired") +$ 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 (8bbec86ce6d6 dt-bindings: PCI: fsl,imx6q: fix assigned-clocks warning) +$ 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 (9cefd6e7e0a7 scsi: lpfc: Fix incorrect big endian type assignment in bsg loopback path) +$ 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 (9bd9be5cbaf8 Merge tag 'drm-misc-fixes-2023-06-21' of git://anongit.freedesktop.org/drm/drm-misc 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 (6995e2de6891 Linux 6.4) +$ 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 (fa700d73494a mmc: Revert "mmc: core: Allow mmc_start_host() synchronously detect a card") +$ 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/core.c | 15 ++++----------- + 1 file changed, 4 insertions(+), 11 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 (44c026a73be8 Linux 6.4-rc3) +$ git merge -m Merge branch 'gnss-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (55e544e1a922 x86/hyperv: Improve code for referencing hyperv_pcpu_input_arg) +$ git merge -m Merge branch 'hyperv-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes +Auto-merging arch/x86/hyperv/ivm.c +Merge made by the 'ort' strategy. + arch/x86/hyperv/hv_apic.c | 4 +--- + arch/x86/hyperv/ivm.c | 7 +++---- + arch/x86/hyperv/mmu.c | 12 ++---------- + arch/x86/hyperv/nested.c | 11 ++--------- + drivers/hv/connection.c | 13 ++++++------- + drivers/hv/hv_balloon.c | 2 +- + drivers/hv/hv_common.c | 10 +++++----- + include/asm-generic/mshyperv.h | 2 +- + 8 files changed, 21 insertions(+), 40 deletions(-) +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 (533925cb7604 Merge tag 'riscv-for-linus-6.5-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux) +$ 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 (44c026a73be8 Linux 6.4-rc3) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga-fixes/fixes +Already up to date. +Merging spdx/spdx-linus (45a3e24f65e9 Linux 6.4-rc7) +$ 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 (ff7a1790fbf9 gpiolib: Fix irq_domain resource tracking for gpiochip_irqchip_add_domain()) +$ 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 (ac9a78681b92 Linux 6.4-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 (7877cb91f108 Linux 6.4-rc4) +$ 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 (7877cb91f108 Linux 6.4-rc4) +$ 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 (ac9a78681b92 Linux 6.4-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 (d7dbed457c2e nfsd: Fix creation time serialization order) +$ git merge -m Merge branch 'nfsd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd-fixes/nfsd-fixes +Already up to date. +Merging irqchip-fixes/irq/irqchip-fixes (567f67acac94 irqchip/gic-v3: Enable Rockchip 3588001 erratum workaround for RK3588S) +$ 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 +Merge made by the 'ort' strategy. + drivers/irqchip/irq-bcm6345-l1.c | 14 +++----- + drivers/irqchip/irq-gic-v3-its.c | 78 ++++++++++++++++++++++++---------------- + 2 files changed, 53 insertions(+), 39 deletions(-) +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-tools (b6dad5178cea Merge tag 'nios2_fix_v6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux) +$ git merge -m Merge branch 'perf-tools' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools perf-current/perf-tools +Already up to date. +Merging efi-fixes/urgent (36e4fc57fc16 efi: Bump stub image version for macOS HVF compatibility) +$ 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 (95339f40a8b6 power: supply: Fix logic checking if system is running from battery) +$ 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 (73a23d771033 um: harddog: fix modular build) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml-fixes/fixes +Already up to date. +Merging 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 (dbe245cdf518 iommufd: Call iopt_area_contig_done() under the lock) +$ 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 (ac9a78681b92 Linux 6.4-rc1) +$ 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 w1-fixes/fixes (ac9a78681b92 Linux 6.4-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git w1-fixes/fixes +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (f781f661e8c9 dma-buf: keep the signaling time of merged fences v3) +$ 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/bridge/synopsys/dw-hdmi.c +Auto-merging drivers/gpu/drm/bridge/ti-sn65dsi86.c +Auto-merging drivers/gpu/drm/nouveau/dispnv50/disp.c +Auto-merging drivers/gpu/drm/panel/panel-simple.c +Auto-merging drivers/gpu/drm/scheduler/sched_entity.c +Auto-merging drivers/gpu/drm/scheduler/sched_fence.c +Auto-merging drivers/gpu/drm/scheduler/sched_main.c +Auto-merging include/drm/gpu_scheduler.h +CONFLICT (content): Merge conflict in include/drm/gpu_scheduler.h +Resolved 'include/drm/gpu_scheduler.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master cd77f0c9fecc] Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm/drm-misc +$ git diff -M --stat --summary HEAD^.. + drivers/dma-buf/dma-fence-unwrap.c | 26 +++++++++++++++++--- + drivers/dma-buf/dma-fence.c | 5 ++-- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 9 ++++--- + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 35 ++++++++++++++++---------- + drivers/gpu/drm/drm_syncobj.c | 2 +- + drivers/gpu/drm/nouveau/dispnv50/disp.c | 8 ++++-- + drivers/gpu/drm/panel/panel-simple.c | 2 ++ + drivers/gpu/drm/scheduler/sched_entity.c | 41 +++++++++++++++++++++++++------ + drivers/gpu/drm/scheduler/sched_fence.c | 40 +++++++++++++++++++----------- + drivers/gpu/drm/scheduler/sched_main.c | 3 +-- + drivers/gpu/drm/ttm/ttm_bo.c | 23 ++++++++--------- + drivers/gpu/drm/ttm/ttm_resource.c | 5 +++- + include/drm/gpu_scheduler.h | 5 ++-- + include/linux/dma-fence.h | 2 +- + 14 files changed, 139 insertions(+), 67 deletions(-) +Merging mm-stable/mm-stable (5bb367dca2b9 Merge branch 'master' into mm-stable) +$ git merge -m Merge branch 'mm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-stable/mm-stable +Merge made by the 'ort' strategy. +Merging mm-nonmm-stable/mm-nonmm-stable (78502a5b68ac Merge branch 'master' into mm-nonmm-stable) +$ 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 +Merge made by the 'ort' strategy. +Merging mm/mm-everything (1e63413a4ea8 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 arch/arm64/Kconfig +Auto-merging arch/arm64/mm/fault.c +Auto-merging include/linux/mm.h +Merge made by the 'ort' strategy. + Documentation/admin-guide/cgroup-v1/memory.rst | 2 - + Documentation/admin-guide/kernel-parameters.txt | 2 +- + Documentation/admin-guide/mm/ksm.rst | 25 +- + arch/Kconfig | 13 - + arch/arm/Kconfig | 29 +-- + arch/arm64/Kconfig | 60 +---- + arch/arm64/include/asm/mte.h | 4 +- + arch/arm64/include/asm/pgtable.h | 14 +- + arch/arm64/kernel/mte.c | 37 +-- + arch/arm64/mm/fault.c | 3 +- + arch/arm64/mm/init.c | 2 - + arch/ia64/Kconfig | 30 +-- + arch/loongarch/Kconfig | 26 +- + arch/m68k/Kconfig | 19 +- + arch/mips/Kconfig | 30 +-- + arch/parisc/Kconfig | 34 +-- + arch/powerpc/Kconfig | 53 ++-- + arch/powerpc/mm/fault.c | 3 +- + arch/powerpc/xmon/xmon.c | 2 +- + arch/riscv/Kconfig | 48 ++-- + arch/s390/Kconfig | 65 ++--- + arch/s390/mm/fault.c | 3 +- + arch/sh/Kconfig | 42 +--- + arch/sparc/kernel/setup_32.c | 2 +- + arch/x86/Kconfig | 85 +------ + arch/x86/mm/fault.c | 3 +- + drivers/dma-buf/heaps/system_heap.c | 5 +- + drivers/tty/sysrq.c | 2 +- + drivers/tty/vt/keyboard.c | 2 +- + fs/9p/cache.c | 2 + + fs/Kconfig | 5 +- + fs/afs/internal.h | 2 + + fs/buffer.c | 21 +- + fs/cachefiles/namei.c | 2 + + fs/ceph/cache.c | 2 + + fs/ext4/inode.c | 4 +- + fs/ext4/move_extent.c | 19 +- + fs/nfs/fscache.c | 3 + + fs/ocfs2/file.c | 7 +- + fs/proc/base.c | 1 + + fs/smb/client/fscache.c | 2 + + fs/splice.c | 3 +- + fs/udf/file.c | 6 +- + fs/userfaultfd.c | 36 ++- + include/linux/buffer_head.h | 2 +- + include/linux/dma-map-ops.h | 6 - + include/linux/fs.h | 2 +- + include/linux/hugetlb.h | 20 +- + include/linux/ksm.h | 20 ++ + include/linux/maple_tree.h | 5 +- + include/linux/memblock.h | 4 +- + include/linux/mm.h | 54 ++-- + include/linux/mm_types.h | 12 +- + include/linux/pagemap.h | 27 +- + include/linux/seqlock.h | 2 +- + init/Kconfig | 2 + + init/initramfs.c | 2 +- + kernel/Kconfig.kexec | 110 +++++++++ + kernel/cred.c | 27 +- + kernel/dma/Kconfig | 6 +- + kernel/dma/contiguous.c | 8 +- + kernel/futex/core.c | 3 +- + kernel/panic.c | 2 +- + lib/maple_tree.c | 95 ++++--- + lib/test_hmm.c | 10 +- + lib/test_maple_tree.c | 65 +++++ + mm/Kconfig | 5 +- + mm/filemap.c | 54 ++-- + mm/gup.c | 83 ++++--- + mm/huge_memory.c | 3 +- + mm/hugetlb.c | 265 +++----------------- + mm/internal.h | 17 ++ + mm/khugepaged.c | 5 +- + mm/ksm.c | 28 ++- + mm/madvise.c | 8 +- + mm/memcontrol.c | 13 - + mm/memory-failure.c | 37 ++- + mm/memory-tiers.c | 2 +- + mm/memory.c | 72 +++--- + mm/migrate.c | 3 +- + mm/migrate_device.c | 21 +- + mm/mm_init.c | 13 +- + mm/nommu.c | 8 +- + mm/page_alloc.c | 76 ++++-- + mm/readahead.c | 10 +- + mm/shmem.c | 2 +- + mm/show_mem.c | 4 +- + mm/swap.h | 1 - + mm/swap_state.c | 12 +- + mm/swapfile.c | 16 +- + mm/truncate.c | 8 +- + mm/util.c | 6 - + mm/vmscan.c | 8 +- + mm/zsmalloc.c | 50 ++-- + mm/zswap.c | 81 ++++-- + tools/testing/radix-tree/maple.c | 75 ++++++ + tools/testing/selftests/cgroup/.gitignore | 1 + + tools/testing/selftests/cgroup/Makefile | 2 + + tools/testing/selftests/cgroup/test_zswap.c | 286 ++++++++++++++++++++++ + tools/testing/selftests/mm/ksm_functional_tests.c | 98 +++++++- + tools/testing/selftests/mm/run_vmtests.sh | 48 +++- + tools/testing/selftests/proc/proc-empty-vm.c | 23 ++ + 102 files changed, 1516 insertions(+), 1172 deletions(-) + create mode 100644 kernel/Kconfig.kexec + create mode 100644 tools/testing/selftests/cgroup/test_zswap.c +Merging kbuild/for-next (dfab92f27c60 Merge tag 'nfs-for-6.5-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs) +$ 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 (b2ad9549bfd0 perf evsel amd: Fix IBS error message) +$ git merge -m Merge branch 'perf-tools-next' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git perf/perf-tools-next +Merge made by the 'ort' strategy. + tools/perf/Documentation/perf-config.txt | 2 +- + tools/perf/Documentation/perf-lock.txt | 8 + + tools/perf/Makefile.config | 17 +- + tools/perf/Makefile.perf | 45 +- + tools/perf/arch/x86/util/evsel.c | 20 + + tools/perf/builtin-daemon.c | 2 +- + tools/perf/builtin-kallsyms.c | 1 - + tools/perf/builtin-lock.c | 385 +++-- + tools/perf/builtin-report.c | 1 - + .../pmu-events/arch/x86/alderlake/adl-metrics.json | 8 +- + .../arch/x86/cascadelakex/clx-metrics.json | 8 +- + .../pmu-events/arch/x86/cascadelakex/frontend.json | 43 +- + .../pmu-events/arch/x86/cascadelakex/pipeline.json | 17 +- + .../arch/x86/cascadelakex/uncore-interconnect.json | 2 +- + .../arch/x86/cascadelakex/uncore-memory.json | 2 +- + tools/perf/pmu-events/arch/x86/icelake/cache.json | 8 +- + .../perf/pmu-events/arch/x86/icelake/frontend.json | 32 +- + .../pmu-events/arch/x86/icelake/icl-metrics.json | 8 +- + .../perf/pmu-events/arch/x86/icelake/pipeline.json | 6 +- + .../pmu-events/arch/x86/icelakex/frontend.json | 32 +- + .../pmu-events/arch/x86/icelakex/icx-metrics.json | 8 +- + .../pmu-events/arch/x86/icelakex/pipeline.json | 4 +- + .../arch/x86/icelakex/uncore-interconnect.json | 2 +- + tools/perf/pmu-events/arch/x86/mapfile.csv | 17 +- + .../perf/pmu-events/arch/x86/meteorlake/cache.json | 811 ++++++++++ + .../arch/x86/meteorlake/floating-point.json | 143 ++ + .../pmu-events/arch/x86/meteorlake/frontend.json | 410 +++++ + .../pmu-events/arch/x86/meteorlake/memory.json | 142 +- + .../perf/pmu-events/arch/x86/meteorlake/other.json | 59 +- + .../pmu-events/arch/x86/meteorlake/pipeline.json | 1121 +++++++++++++- + .../arch/x86/meteorlake/uncore-cache.json | 18 + + .../arch/x86/meteorlake/uncore-interconnect.json | 42 + + .../arch/x86/meteorlake/uncore-memory.json | 126 ++ + .../arch/x86/meteorlake/virtual-memory.json | 257 ++++ + .../perf/pmu-events/arch/x86/rocketlake/cache.json | 894 +++++++++++ + .../arch/x86/rocketlake/floating-point.json | 105 ++ + .../pmu-events/arch/x86/rocketlake/frontend.json | 377 +++++ + .../pmu-events/arch/x86/rocketlake/memory.json | 394 +++++ + .../arch/x86/rocketlake/metricgroups.json | 113 ++ + .../perf/pmu-events/arch/x86/rocketlake/other.json | 242 +++ + .../pmu-events/arch/x86/rocketlake/pipeline.json | 801 ++++++++++ + .../arch/x86/rocketlake/rkl-metrics.json | 1571 ++++++++++++++++++++ + .../arch/x86/rocketlake/uncore-interconnect.json | 74 + + .../arch/x86/rocketlake/uncore-other.json | 9 + + .../arch/x86/rocketlake/virtual-memory.json | 165 ++ + .../arch/x86/sapphirerapids/pipeline.json | 2 +- + .../arch/x86/sapphirerapids/spr-metrics.json | 8 +- + .../arch/x86/sapphirerapids/uncore-cache.json | 308 ++++ + .../x86/sapphirerapids/uncore-interconnect.json | 2 +- + .../perf/pmu-events/arch/x86/skylake/frontend.json | 43 +- + .../perf/pmu-events/arch/x86/skylake/pipeline.json | 17 +- + .../pmu-events/arch/x86/skylake/skl-metrics.json | 8 +- + .../pmu-events/arch/x86/skylakex/frontend.json | 43 +- + .../pmu-events/arch/x86/skylakex/pipeline.json | 17 +- + .../pmu-events/arch/x86/skylakex/skx-metrics.json | 8 +- + .../arch/x86/skylakex/uncore-interconnect.json | 2 +- + .../arch/x86/skylakex/uncore-memory.json | 2 +- + .../pmu-events/arch/x86/tigerlake/frontend.json | 32 +- + .../pmu-events/arch/x86/tigerlake/pipeline.json | 6 +- + .../pmu-events/arch/x86/tigerlake/tgl-metrics.json | 8 +- + tools/perf/pmu-events/metric.py | 8 +- + tools/perf/tests/builtin-test.c | 1 - + tools/perf/tests/expr.c | 4 + + tools/perf/tests/make | 4 + + tools/perf/tests/pe-file-parsing.c | 3 +- + tools/perf/tests/shell/lock_contention.sh | 36 + + tools/perf/util/bpf_skel/.gitignore | 1 + + tools/perf/util/bpf_skel/lock_contention.bpf.c | 2 - + tools/perf/util/bpf_skel/{ => vmlinux}/vmlinux.h | 10 + + tools/perf/util/dso.c | 7 +- + tools/perf/util/dso.h | 3 +- + tools/perf/util/event.c | 7 +- + tools/perf/util/evsel.c | 30 +- + tools/perf/util/evsel.h | 1 + + tools/perf/util/expr.c | 21 + + tools/perf/util/expr.h | 1 + + tools/perf/util/expr.l | 1 + + tools/perf/util/expr.y | 8 +- + tools/perf/util/llvm-utils.c | 4 +- + tools/perf/util/map.c | 14 +- + tools/perf/util/map.h | 12 +- + tools/perf/util/perf_event_attr_fprintf.c | 186 ++- + tools/perf/util/pmu.c | 27 +- + tools/perf/util/pmu.h | 1 + + tools/perf/util/pmus.c | 7 +- + tools/perf/util/probe-event.c | 16 +- + tools/perf/util/python.c | 8 + + tools/perf/util/symbol.c | 140 +- + tools/perf/util/symbol.h | 12 +- + tools/perf/util/symbol_conf.h | 1 - + tools/perf/util/symbol_fprintf.c | 10 +- + tools/perf/util/trace-event-info.c | 12 + + tools/perf/util/trace-event.h | 6 + + tools/perf/util/unwind-libdw.c | 8 +- + 94 files changed, 9256 insertions(+), 414 deletions(-) + create mode 100644 tools/perf/pmu-events/arch/x86/meteorlake/floating-point.json + create mode 100644 tools/perf/pmu-events/arch/x86/meteorlake/uncore-cache.json + create mode 100644 tools/perf/pmu-events/arch/x86/meteorlake/uncore-interconnect.json + create mode 100644 tools/perf/pmu-events/arch/x86/meteorlake/uncore-memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/rocketlake/cache.json + create mode 100644 tools/perf/pmu-events/arch/x86/rocketlake/floating-point.json + create mode 100644 tools/perf/pmu-events/arch/x86/rocketlake/frontend.json + create mode 100644 tools/perf/pmu-events/arch/x86/rocketlake/memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/rocketlake/metricgroups.json + create mode 100644 tools/perf/pmu-events/arch/x86/rocketlake/other.json + create mode 100644 tools/perf/pmu-events/arch/x86/rocketlake/pipeline.json + create mode 100644 tools/perf/pmu-events/arch/x86/rocketlake/rkl-metrics.json + create mode 100644 tools/perf/pmu-events/arch/x86/rocketlake/uncore-interconnect.json + create mode 100644 tools/perf/pmu-events/arch/x86/rocketlake/uncore-other.json + create mode 100644 tools/perf/pmu-events/arch/x86/rocketlake/virtual-memory.json + rename tools/perf/util/bpf_skel/{ => vmlinux}/vmlinux.h (90%) +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 (8ac04063354a swiotlb: reduce the number of areas to match actual memory pool size) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping/for-next +Merge made by the 'ort' strategy. + kernel/dma/swiotlb.c | 46 +++++++++++++++++++++++++++++++++++----------- + 1 file changed, 35 insertions(+), 11 deletions(-) +Merging asm-generic/master (4dd595c34c4b syscalls: Remove file path comments from headers) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git asm-generic/master +Auto-merging arch/arm/include/asm/page.h +Auto-merging arch/arm/kernel/entry-armv.S +Auto-merging arch/arm/mach-pxa/gumstix.c +Auto-merging arch/arm/mach-sa1100/pm.c +Auto-merging arch/arm/mm/dma-mapping.c +Auto-merging arch/arm/mm/mmu.c +Auto-merging arch/arm64/include/asm/memory.h +Auto-merging arch/m68k/mm/mcfmmu.c +Auto-merging arch/riscv/mm/init.c +Auto-merging drivers/net/xen-netback/netback.c +Auto-merging fs/netfs/iterator.c +CONFLICT (content): Merge conflict in fs/netfs/iterator.c +Auto-merging fs/proc/kcore.c +Auto-merging fs/smb/client/cifsglob.h +Auto-merging fs/smb/client/smbdirect.c +Auto-merging include/linux/syscalls.h +Auto-merging include/uapi/asm-generic/unistd.h +Auto-merging kernel/sys_ni.c +Resolved 'fs/netfs/iterator.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master d9977d4bbf4d] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git +$ git diff -M --stat --summary HEAD^.. + arch/arc/mm/init.c | 2 +- + arch/arm/common/sharpsl_param.c | 2 +- + arch/arm/include/asm/delay.h | 2 +- + arch/arm/include/asm/io.h | 2 +- + arch/arm/include/asm/memory.h | 17 ++- + arch/arm/include/asm/page.h | 4 +- + arch/arm/include/asm/pgtable.h | 2 +- + arch/arm/include/asm/proc-fns.h | 2 - + arch/arm/include/asm/sparsemem.h | 2 +- + arch/arm/include/asm/uaccess-asm.h | 2 +- + arch/arm/include/asm/uaccess.h | 2 +- + arch/arm/kernel/asm-offsets.c | 2 +- + arch/arm/kernel/entry-armv.S | 2 +- + arch/arm/kernel/entry-common.S | 2 +- + arch/arm/kernel/entry-v7m.S | 2 +- + arch/arm/kernel/head-nommu.S | 3 +- + arch/arm/kernel/head.S | 2 +- + arch/arm/kernel/hibernate.c | 2 +- + arch/arm/kernel/suspend.c | 2 +- + arch/arm/kernel/tcm.c | 2 +- + arch/arm/kernel/vmlinux-xip.lds.S | 3 +- + arch/arm/kernel/vmlinux.lds.S | 3 +- + arch/arm/mach-berlin/platsmp.c | 2 +- + arch/arm/mach-keystone/keystone.c | 2 +- + arch/arm/mach-omap2/sleep33xx.S | 2 +- + arch/arm/mach-omap2/sleep43xx.S | 2 +- + arch/arm/mach-omap2/sleep44xx.S | 2 +- + arch/arm/mach-pxa/gumstix.c | 2 +- + arch/arm/mach-rockchip/sleep.S | 2 +- + arch/arm/mach-sa1100/pm.c | 2 +- + arch/arm/mach-shmobile/headsmp-scu.S | 2 +- + arch/arm/mach-shmobile/headsmp.S | 2 +- + arch/arm/mach-socfpga/headsmp.S | 2 +- + arch/arm/mach-spear/spear.h | 2 +- + arch/arm/mm/cache-fa.S | 1 - + arch/arm/mm/cache-v4wb.S | 1 - + arch/arm/mm/dma-mapping.c | 2 +- + arch/arm/mm/dump.c | 2 +- + arch/arm/mm/init.c | 2 +- + arch/arm/mm/kasan_init.c | 1 - + arch/arm/mm/mmu.c | 2 +- + arch/arm/mm/physaddr.c | 2 +- + arch/arm/mm/pmsa-v8.c | 2 +- + arch/arm/mm/proc-v7.S | 2 +- + arch/arm/mm/proc-v7m.S | 2 +- + arch/arm/mm/pv-fixup-asm.S | 2 +- + arch/arm64/include/asm/memory.h | 9 +- + arch/arm64/include/uapi/asm/bitsperlong.h | 24 ---- + arch/loongarch/include/uapi/asm/bitsperlong.h | 9 -- + arch/m68k/include/asm/mcf_pgtable.h | 3 +- + arch/m68k/include/asm/page_mm.h | 11 +- + arch/m68k/include/asm/page_no.h | 11 +- + arch/m68k/include/asm/sun3_pgtable.h | 4 +- + arch/m68k/mm/mcfmmu.c | 3 +- + arch/m68k/mm/motorola.c | 4 +- + arch/m68k/mm/sun3mmu.c | 2 +- + arch/m68k/sun3/dvma.c | 2 +- + arch/m68k/sun3x/dvma.c | 2 +- + arch/riscv/include/uapi/asm/bitsperlong.h | 14 --- + arch/riscv/mm/init.c | 4 +- + drivers/memory/ti-emif-sram-pm.S | 2 +- + drivers/net/xen-netback/netback.c | 2 +- + fs/proc/kcore.c | 2 +- + fs/smb/client/cifsglob.h | 2 +- + fs/smb/client/smbdirect.c | 2 +- + include/asm-generic/page.h | 12 +- + include/linux/compat.h | 82 ++---------- + include/linux/syscalls.h | 140 +++------------------ + include/uapi/asm-generic/bitsperlong.h | 13 +- + include/uapi/asm-generic/unistd.h | 129 +++++-------------- + kernel/sys_ni.c | 110 +--------------- + tools/arch/arm64/include/uapi/asm/bitsperlong.h | 24 ---- + tools/arch/hexagon/include/uapi/asm/bitsperlong.h | 27 ---- + .../arch/loongarch/include/uapi/asm/bitsperlong.h | 9 -- + .../arch/microblaze/include/uapi/asm/bitsperlong.h | 2 - + tools/arch/riscv/include/uapi/asm/bitsperlong.h | 14 --- + tools/include/uapi/asm-generic/bitsperlong.h | 14 ++- + tools/include/uapi/asm-generic/unistd.h | 129 +++++-------------- + tools/include/uapi/asm/bitsperlong.h | 6 - + 79 files changed, 217 insertions(+), 715 deletions(-) + delete mode 100644 arch/arm64/include/uapi/asm/bitsperlong.h + delete mode 100644 arch/loongarch/include/uapi/asm/bitsperlong.h + delete mode 100644 arch/riscv/include/uapi/asm/bitsperlong.h + delete mode 100644 tools/arch/arm64/include/uapi/asm/bitsperlong.h + delete mode 100644 tools/arch/hexagon/include/uapi/asm/bitsperlong.h + delete mode 100644 tools/arch/loongarch/include/uapi/asm/bitsperlong.h + delete mode 100644 tools/arch/microblaze/include/uapi/asm/bitsperlong.h + delete mode 100644 tools/arch/riscv/include/uapi/asm/bitsperlong.h +$ git am -3 ../patches/0001-fix-up-for-Move-netfs_extract_iter_to_sg-to-lib-scat.patch +Applying: fix up for "Move netfs_extract_iter_to_sg() to lib/scatterlist.c" +$ git reset HEAD^ +Unstaged changes after reset: +M lib/scatterlist.c +$ git add -A . +$ git commit -v -a --amend +[master f055a4a4f765] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git + Date: Wed Jul 5 09:13:34 2023 +1000 +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 (1faf70485ea9 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 (893b24181b4c arm64: sme: Use STR P to clear FFR context field in streaming SVE mode) +$ 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 (dea0f4146f66 docs: perf: Fix warning from 'make htmldocs' in hisi-pmu.rst) +$ 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 (08ff590f1ce3 soc: document merges) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + arch/arm/arm-soc-for-next-contents.txt | 213 +++++++++++++++++++++++++++++++++ + 1 file changed, 213 insertions(+) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt +Merging amlogic/for-next (76483eaf2109 Merge branch 'v6.6/arm64-dt' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git amlogic/for-next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/amlogic.yaml | 7 + + arch/arm64/boot/dts/amlogic/Makefile | 1 + + .../dts/amlogic/amlogic-t7-a311d2-khadas-vim4.dts | 54 +++++++ + arch/arm64/boot/dts/amlogic/amlogic-t7.dtsi | 155 +++++++++++++++++++++ + .../dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts | 2 +- + .../dts/amlogic/meson-g12b-odroid-go-ultra.dts | 2 +- + 6 files changed, 219 insertions(+), 2 deletions(-) + create mode 100644 arch/arm64/boot/dts/amlogic/amlogic-t7-a311d2-khadas-vim4.dts + create mode 100644 arch/arm64/boot/dts/amlogic/amlogic-t7.dtsi +Merging asahi-soc/asahi-soc/for-next (eaf935fa48ec soc: apple: mailbox: Rename config symbol to APPLE_MAILBOX) +$ git merge -m Merge branch 'asahi-soc/for-next' of https://github.com/AsahiLinux/linux.git asahi-soc/asahi-soc/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 2 - + drivers/mailbox/Kconfig | 12 - + drivers/mailbox/Makefile | 2 - + drivers/mailbox/apple-mailbox.c | 441 ------------------------------------- + drivers/soc/apple/Kconfig | 15 +- + drivers/soc/apple/Makefile | 3 + + drivers/soc/apple/mailbox.c | 436 ++++++++++++++++++++++++++++++++++++ + drivers/soc/apple/mailbox.h | 48 ++++ + drivers/soc/apple/rtkit-internal.h | 8 +- + drivers/soc/apple/rtkit.c | 133 +++-------- + include/linux/apple-mailbox.h | 19 -- + include/linux/soc/apple/rtkit.h | 18 -- + 12 files changed, 531 insertions(+), 606 deletions(-) + delete mode 100644 drivers/mailbox/apple-mailbox.c + create mode 100644 drivers/soc/apple/mailbox.c + create mode 100644 drivers/soc/apple/mailbox.h + delete mode 100644 include/linux/apple-mailbox.h +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 (20c5a7864675 Merge branch 'clk-microchip' 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. +Merging broadcom/next (df928e5b5570 Merge branch 'devicetree/next' into next) +$ git merge -m Merge branch 'next' of https://github.com/Broadcom/stblinux.git broadcom/next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/broadcom/bcm2711.dtsi | 4 ++-- + arch/arm/boot/dts/broadcom/bcm2835-common.dtsi | 2 +- + arch/arm/boot/dts/broadcom/bcm2835-rpi-a-plus.dts | 1 + + arch/arm/boot/dts/broadcom/bcm2835-rpi-a.dts | 1 + + arch/arm/boot/dts/broadcom/bcm2835-rpi-b-plus.dts | 1 + + arch/arm/boot/dts/broadcom/bcm2835-rpi-b-rev2.dts | 1 + + arch/arm/boot/dts/broadcom/bcm2835-rpi-b.dts | 1 + + arch/arm/boot/dts/broadcom/bcm2835-rpi-cm1-io1.dts | 1 + + arch/arm/boot/dts/broadcom/bcm2835-rpi-zero-w.dts | 2 ++ + arch/arm/boot/dts/broadcom/bcm2835-rpi-zero.dts | 1 + + arch/arm/boot/dts/broadcom/bcm2835-rpi.dtsi | 2 -- + arch/arm/boot/dts/broadcom/bcm2836-rpi-2-b.dts | 1 + + arch/arm/boot/dts/broadcom/bcm2837-rpi-cm3-io3.dts | 1 + + arch/arm/boot/dts/broadcom/bcm2837-rpi-zero-2-w.dts | 2 ++ + arch/arm/boot/dts/broadcom/bcm283x.dtsi | 2 +- + 15 files changed, 17 insertions(+), 6 deletions(-) +Merging davinci/davinci/for-next (ac9a78681b92 Linux 6.4-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 (6a66fb9ffe7b dt-bindings: memory-controllers: drop unneeded quotes) +$ 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 (89c016c82e46 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 (f6925844c82a Merge branch 'v6.4-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 +Auto-merging arch/arm64/boot/dts/mediatek/mt8192.dtsi +Auto-merging arch/arm64/boot/dts/mediatek/mt8195.dtsi +Merge made by the 'ort' strategy. + arch/arm64/boot/dts/mediatek/mt8192.dtsi | 2 ++ + arch/arm64/boot/dts/mediatek/mt8195.dtsi | 2 ++ + 2 files changed, 4 insertions(+) +Merging mvebu/for-next (703b10801b44 Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git mvebu/for-next +Merge made by the 'ort' strategy. +Merging omap/for-next (f581c395fcb8 Merge branches 'omap-for-v6.5/ti-sysc' and 'omap-for-v6.5/cleanup' 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. + arch/arm/mach-omap2/omap_hwmod.c | 45 ++++++--------------------------------- + arch/arm/mach-omap2/powerdomain.c | 2 +- + drivers/bus/ti-sysc.c | 2 ++ + 3 files changed, 9 insertions(+), 40 deletions(-) +Merging qcom/for-next (e62f7f072b12 Merge branches 'arm64-defconfig-for-6.5', 'arm64-fixes-for-6.4', 'arm64-fixes-for-6.5', 'clk-for-6.5', 'drivers-fixes-for-6.4', 'drivers-for-6.5', 'dts-fixes-for-6.4' and 'dts-for-6.5' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git qcom/for-next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'ort' strategy. + arch/arm64/boot/dts/qcom/sc8180x.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sm8150.dtsi | 18 +++++++++--------- + arch/arm64/boot/dts/qcom/sm8250.dtsi | 18 +++++++++--------- + arch/arm64/boot/dts/qcom/sm8350.dtsi | 4 ++++ + arch/arm64/configs/defconfig | 1 + + 5 files changed, 24 insertions(+), 19 deletions(-) +Merging renesas/next (7762defcdaf0 Merge branch 'renesas-drivers-for-v6.5' 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 (afb39e2bd36a reset: mpfs: select AUXILIARY_BUS) +$ 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 (dd738a0f90f7 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. +Merging samsung-krzk/for-next (6d4e38cedf31 Merge branch 'next/clk' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk/for-next +Merge made by the 'ort' strategy. +Merging scmi/for-linux-next (83ff850e73ba Merge tag 'scmi-updates-6.5' 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. +Merging stm32/stm32-next (c9cb7e72e293 MAINTAINERS: add entry for ARM/STM32 ARCHITECTURE) +$ 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 (1bcb932283c9 Merge branch 'sunxi/dt-for-6.5' 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 (6a8b7e801054 tee: optee: Use kmemdup() to replace kmalloc + memcpy) +$ git merge -m Merge branch 'next' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee/next +Already up to date. +Merging tegra/for-next (3281fba16642 Merge branch for-6.5/arm64/dt into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra/for-next +Merge made by the 'ort' strategy. + .../bindings/firmware/nvidia,tegra186-bpmp.yaml | 39 +++++++++++++++--- + .../nvidia,tegra264-bpmp-shmem.yaml | 47 ++++++++++++++++++++++ + 2 files changed, 81 insertions(+), 5 deletions(-) + create mode 100644 Documentation/devicetree/bindings/reserved-memory/nvidia,tegra264-bpmp-shmem.yaml +Merging ti/ti-next (b0f8e128b3b4 Merge branch 'ti-k3-config-next' into ti-next) +$ git merge -m Merge branch 'ti-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git ti/ti-next +Merge made by the 'ort' strategy. +Merging xilinx/for-next (a736607599a5 Merge 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. +Merging clk/clk-next (f679e89acdd3 clk: tegra: Avoid calling an uninitialized function) +$ 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 (878b02d5f3b5 clk: imx: clk-imx8mp: improve error handling in imx8mp_clocks_probe()) +$ 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 (7df8eea64a41 clk: renesas: rzg2l: Convert to readl_poll_timeout_atomic()) +$ 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 (dd64621a2a97 csky: uprobes: Restore thread.trap_no) +$ 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 (5ee35c769663 LoongArch: Remove five DIE_* definitions in kdebug.h) +$ 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 (4055eabe04a2 m68k: defconfig: Update defconfigs for v6.4-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k/for-next +Already up to date. +Merging m68knommu/for-next (858fd168a95c Linux 6.4-rc6) +$ 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 (531b3d1195d0 MIPS: Loongson: Fix build error when make modules_install) +$ git merge -m Merge branch 'mips-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next +Auto-merging arch/mips/Makefile +Merge made by the 'ort' strategy. + arch/mips/Makefile | 10 +++------- + arch/mips/include/asm/kvm_host.h | 6 +++--- + arch/mips/kernel/cpu-probe.c | 9 +++------ + arch/mips/kvm/emulate.c | 22 +++++++++++----------- + arch/mips/kvm/mips.c | 16 ++++++++-------- + arch/mips/kvm/trace.h | 8 ++++---- + arch/mips/kvm/vz.c | 20 ++++++++++---------- + 7 files changed, 42 insertions(+), 49 deletions(-) +Merging openrisc/for-next (219e31a0a39b openrisc: Revert adding fpcsr to sigcontext to unbreak userspace ABI) +$ git merge -m Merge branch 'for-next' of git://github.com/openrisc/linux.git openrisc/for-next +Merge made by the 'ort' strategy. + arch/openrisc/include/uapi/asm/sigcontext.h | 1 - + arch/openrisc/kernel/signal.c | 2 -- + 2 files changed, 3 deletions(-) +Merging parisc-hd/for-next (f8a473bf5db7 parisc: syscalls: Avoid compiler warnings with W=1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git parisc-hd/for-next +Merge made by the 'ort' strategy. + arch/parisc/include/asm/processor.h | 2 ++ + arch/parisc/kernel/Makefile | 3 +++ + arch/parisc/kernel/pdt.c | 1 + + arch/parisc/kernel/smp.c | 2 -- + arch/parisc/kernel/unwind.c | 5 +++-- + arch/parisc/math-emu/Makefile | 3 ++- + scripts/min-tool-version.sh | 4 ++-- + 7 files changed, 13 insertions(+), 7 deletions(-) +Merging powerpc/next (abaa02fc944f powerpc: dts: turris1x.dts: Fix PCIe MEM size for pci2 node) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next +Merge made by the 'ort' strategy. + arch/powerpc/Kconfig.debug | 2 +- + arch/powerpc/boot/dts/turris1x.dts | 6 +++--- + arch/powerpc/platforms/pseries/mobility.c | 1 + + 3 files changed, 5 insertions(+), 4 deletions(-) +Merging soc-fsl/next (fb9c384625dd bus: fsl-mc: fsl-mc-allocator: Drop a write-only variable) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl/next +Already up to date. +Merging risc-v/for-next (54cdede08f2f riscv: vdso: include vdso/vsyscall.h for vdso_data) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v/for-next +Auto-merging arch/riscv/Kconfig +CONFLICT (content): Merge conflict in arch/riscv/Kconfig +Auto-merging include/asm-generic/vmlinux.lds.h +Recorded preimage for 'arch/riscv/Kconfig' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'arch/riscv/Kconfig'. +[master 028173cd47dc] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/riscv/vector.rst | 8 +++ + arch/riscv/Kconfig | 16 ++--- + arch/riscv/include/uapi/asm/sigcontext.h | 4 ++ + arch/riscv/kernel/traps.c | 8 ++- + arch/riscv/kernel/vdso.c | 1 + + arch/riscv/kernel/vector.c | 1 + + arch/riscv/kernel/vmlinux-xip.lds.S | 6 -- + arch/riscv/kernel/vmlinux.lds.S | 6 +- + include/asm-generic/vmlinux.lds.h | 2 +- + tools/testing/selftests/riscv/vector/.gitignore | 1 + + tools/testing/selftests/riscv/vector/Makefile | 6 +- + .../selftests/riscv/vector/v_initval_nolibc.c | 68 ++++++++++++++++++++++ + 12 files changed, 108 insertions(+), 19 deletions(-) + create mode 100644 tools/testing/selftests/riscv/vector/v_initval_nolibc.c +Merging riscv-dt/riscv-dt-for-next (273235194e4d RISC-V: make ARCH_THEAD preclude XIP_KERNEL) +$ git merge -m Merge branch 'riscv-dt-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt/riscv-dt-for-next +Merge made by the 'ort' strategy. + arch/riscv/Kconfig.socs | 1 + + 1 file changed, 1 insertion(+) +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 (b0324ab87db7 Merge branch 'features' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390/for-next +Auto-merging arch/s390/kvm/kvm-s390.c +Auto-merging arch/s390/kvm/vsie.c +Auto-merging arch/s390/mm/gmap.c +Auto-merging drivers/crypto/Kconfig +Auto-merging drivers/s390/block/dcssblk.c +Auto-merging drivers/s390/net/ctcm_mpc.c +Merge made by the 'ort' strategy. + arch/s390/Makefile | 1 + + arch/s390/appldata/appldata_base.c | 4 +- + arch/s390/appldata/appldata_mem.c | 2 +- + arch/s390/boot/head.S | 16 ++--- + arch/s390/boot/head_kdump.S | 6 +- + arch/s390/crypto/crc32be-vx.S | 2 +- + arch/s390/include/asm/ap.h | 2 +- + arch/s390/include/asm/appldata.h | 2 +- + arch/s390/include/asm/asm-extable.h | 4 +- + arch/s390/include/asm/dma.h | 2 +- + arch/s390/include/asm/lowcore.h | 4 +- + arch/s390/include/asm/page.h | 6 +- + arch/s390/include/asm/ptrace.h | 52 +++++++------- + arch/s390/include/uapi/asm/cmb.h | 2 +- + arch/s390/include/uapi/asm/dasd.h | 2 +- + arch/s390/include/uapi/asm/pkey.h | 6 +- + arch/s390/include/uapi/asm/ptrace.h | 121 ++++++++++++++++----------------- + arch/s390/kernel/asm-offsets.c | 1 - + arch/s390/kernel/cpcmd.c | 2 +- + arch/s390/kernel/dis.c | 4 +- + arch/s390/kernel/entry.S | 14 ++-- + arch/s390/kernel/head64.S | 2 +- + arch/s390/kernel/kprobes_insn_page.S | 2 +- + arch/s390/kernel/nospec-branch.c | 2 +- + arch/s390/kernel/perf_cpum_cf.c | 32 +-------- + arch/s390/kernel/perf_cpum_sf.c | 58 ++++++---------- + arch/s390/kernel/perf_pai_ext.c | 4 +- + arch/s390/kernel/process.c | 2 +- + arch/s390/kernel/setup.c | 2 +- + arch/s390/kernel/smp.c | 2 +- + arch/s390/kernel/time.c | 2 +- + arch/s390/kernel/vdso32/Makefile | 6 +- + arch/s390/kernel/vdso64/Makefile | 6 +- + arch/s390/kvm/gaccess.c | 4 +- + arch/s390/kvm/intercept.c | 2 +- + arch/s390/kvm/kvm-s390.c | 2 +- + arch/s390/kvm/pci.c | 2 +- + arch/s390/kvm/priv.c | 3 +- + arch/s390/kvm/pv.c | 2 +- + arch/s390/kvm/sigp.c | 2 +- + arch/s390/kvm/vsie.c | 4 +- + arch/s390/lib/spinlock.c | 2 +- + arch/s390/mm/gmap.c | 2 +- + arch/s390/mm/maccess.c | 2 +- + arch/s390/mm/vmem.c | 4 +- + arch/s390/net/bpf_jit_comp.c | 4 +- + arch/s390/pci/pci_irq.c | 6 +- + arch/s390/purgatory/head.S | 2 +- + drivers/crypto/Kconfig | 11 --- + drivers/s390/block/dasd_diag.c | 2 +- + drivers/s390/block/dasd_eckd.c | 4 +- + drivers/s390/block/dasd_fba.c | 2 +- + drivers/s390/block/dcssblk.c | 2 +- + drivers/s390/char/con3215.c | 2 +- + drivers/s390/char/monwriter.c | 2 +- + drivers/s390/cio/ccwgroup.c | 2 +- + drivers/s390/cio/device.c | 2 +- + drivers/s390/cio/device_fsm.c | 4 +- + drivers/s390/cio/vfio_ccw_cp.c | 4 +- + drivers/s390/crypto/ap_bus.c | 4 +- + drivers/s390/crypto/ap_bus.h | 27 +------- + drivers/s390/crypto/ap_queue.c | 7 -- + drivers/s390/crypto/vfio_ap_ops.c | 4 +- + drivers/s390/crypto/zcrypt_api.c | 113 ++---------------------------- + drivers/s390/crypto/zcrypt_api.h | 3 - + drivers/s390/crypto/zcrypt_ccamisc.c | 2 +- + drivers/s390/crypto/zcrypt_ccamisc.h | 4 +- + drivers/s390/crypto/zcrypt_ep11misc.c | 2 +- + drivers/s390/crypto/zcrypt_ep11misc.h | 4 +- + drivers/s390/crypto/zcrypt_msgtype50.c | 10 --- + drivers/s390/crypto/zcrypt_msgtype6.c | 16 ++--- + drivers/s390/net/ctcm_mpc.c | 10 +-- + drivers/s390/net/netiucv.c | 2 +- + 73 files changed, 235 insertions(+), 428 deletions(-) +Merging sh/for-next (a8ac2961148e sh: Avoid using IRQ0 on SH3 and SH4) +$ git merge -m Merge branch 'for-next' of git:git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux.git sh/for-next +Merge made by the 'ort' strategy. + arch/sh/include/mach-common/mach/highlander.h | 2 +- + arch/sh/include/mach-common/mach/r2d.h | 2 +- + arch/sh/include/mach-dreamcast/mach/sysasic.h | 2 +- + arch/sh/include/mach-se/mach/se7724.h | 2 +- + arch/sh/kernel/cpu/sh2/probe.c | 2 +- + arch/sh/kernel/cpu/sh3/entry.S | 4 ++-- + include/linux/sh_intc.h | 6 +++--- + 7 files changed, 10 insertions(+), 10 deletions(-) +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 (b4e8c8a6bdd2 xtensa: ISS: fix call to split_if_spec) +$ git merge -m Merge branch 'xtensa-for-next' of git://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next +Merge made by the 'ort' strategy. + arch/xtensa/platforms/iss/network.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging pidfd/for-next (a901a3568fd2 Merge tag 'iomap-6.5-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git pidfd/for-next +Already up to date. +Merging fscrypt/for-next (d617ef039fb8 fscrypt: Replace 1-element array with flexible array) +$ 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 (20e0c0a8e8ef Merge branch 'for-next-next-v6.4-20230621' into for-next-20230621) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next +Merge made by the 'ort' strategy. + fs/btrfs/backref.c | 2 +- + fs/btrfs/ctree.c | 2 +- + fs/btrfs/defrag.c | 2 +- + fs/btrfs/delayed-inode.c | 2 +- + fs/btrfs/delayed-ref.c | 8 ++++---- + fs/btrfs/extent-io-tree.c | 2 +- + fs/btrfs/extent_io.c | 2 +- + fs/btrfs/extent_map.c | 2 +- + fs/btrfs/free-space-cache.c | 3 ++- + fs/btrfs/inode.c | 3 ++- + fs/btrfs/misc.h | 13 +++++++++++++ + fs/btrfs/ordered-data.c | 2 +- + fs/btrfs/transaction.c | 3 ++- + 13 files changed, 31 insertions(+), 15 deletions(-) +Merging ceph/master (257e6172ab36 ceph: don't let check_caps skip sending responses for revoke msgs) +$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master +Auto-merging fs/ceph/file.c +Merge made by the 'ort' strategy. + fs/ceph/addr.c | 85 +++++++++++++++++++++++++++++++++++++++++----------- + fs/ceph/caps.c | 55 +++++++++++++++++++++++++++------- + fs/ceph/dir.c | 17 ++++++----- + fs/ceph/file.c | 3 +- + fs/ceph/mds_client.c | 4 +++ + fs/ceph/metric.c | 8 +++++ + fs/ceph/snap.c | 9 ++++-- + fs/ceph/super.h | 13 ++++++++ + 8 files changed, 154 insertions(+), 40 deletions(-) +Merging cifs/for-next (893097471043 smb: add missing create options for O_DIRECT and O_SYNC flags) +$ git merge -m Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git cifs/for-next +Auto-merging fs/smb/client/cifsglob.h +Merge made by the 'ort' strategy. + fs/smb/client/cifsfs.c | 2 ++ + fs/smb/client/cifsglob.h | 1 + + fs/smb/client/connect.c | 10 +++++++--- + fs/smb/client/dfs.c | 2 -- + fs/smb/client/dir.c | 6 ++++++ + fs/smb/client/fs_context.c | 4 ++++ + fs/smb/client/fs_context.h | 2 ++ + 7 files changed, 22 insertions(+), 5 deletions(-) +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 (8241fdd3cdfe erofs: clean up zmap.c) +$ 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 (eccf9ae28312 Pull patch forbiding superblock / mount marks on internal kernel mounts.) +$ git merge -m Merge branch 'for_next' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git ext3/for_next +Merge made by the 'ort' strategy. + fs/ext2/ialloc.c | 3 - + fs/notify/fanotify/fanotify_user.c | 14 +++ + fs/quota/dquot.c | 244 +++++++++++++++++++------------------ + 3 files changed, 139 insertions(+), 122 deletions(-) +Merging ext4/dev (2ef6c32a914b ext4: avoid updating the superblock on a r/o mount if not needed) +$ 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 (a6ec83786ab9 f2fs: fix to do sanity check on direct node in truncate_dnode()) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev +Auto-merging fs/f2fs/file.c +Auto-merging fs/f2fs/namei.c +Auto-merging fs/f2fs/super.c +Merge made by the 'ort' strategy. + Documentation/filesystems/f2fs.rst | 16 +++ + fs/f2fs/checkpoint.c | 7 +- + fs/f2fs/compress.c | 41 +++++- + fs/f2fs/data.c | 71 +++++++++- + fs/f2fs/dir.c | 9 +- + fs/f2fs/f2fs.h | 124 +++++++++------- + fs/f2fs/file.c | 77 ++++++---- + fs/f2fs/gc.c | 43 ++++-- + fs/f2fs/inode.c | 207 ++++++++++++++++++--------- + fs/f2fs/iostat.c | 1 + + fs/f2fs/namei.c | 32 +++-- + fs/f2fs/node.c | 45 +++--- + fs/f2fs/node.h | 3 +- + fs/f2fs/recovery.c | 75 +++++++--- + fs/f2fs/segment.c | 162 ++++++++++++++++----- + fs/f2fs/super.c | 252 ++++++++++++++++++++++++++++----- + fs/f2fs/sysfs.c | 283 +++++++++++++++++++++++-------------- + fs/f2fs/xattr.c | 6 +- + fs/f2fs/xattr.h | 1 + + include/linux/f2fs_fs.h | 1 + + include/trace/events/f2fs.h | 24 +++- + 21 files changed, 1071 insertions(+), 409 deletions(-) +Merging fsverity/for-next (672d6ef4c775 fsverity: improve documentation for builtin signature support) +$ 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 (6a567e920fd0 fuse: ioctl: translate ENOSYS in outarg) +$ 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 | 4 +--- + fs/fuse/inode.c | 8 ++++++-- + fs/fuse/ioctl.c | 21 +++++++++++++-------- + include/uapi/linux/fuse.h | 3 +++ + 4 files changed, 23 insertions(+), 13 deletions(-) +Merging gfs2/for-next (432928c93779 gfs2: Add quota_change type) +$ 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 (95e2b352c03b FS: JFS: Check for read-only mounted filesystem in txBegin) +$ 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 (8976e9d00395 Merge tag '6.5-rc-ksmbd-server-fixes-part1' of git://git.samba.org/ksmbd) +$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next +Already up to date. +Merging nfs/linux-next (5b4a82a0724a Revert "NFSv4: Retry LOCK on OLD_STATEID during delegation return") +$ 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 (43439d858bba NFSv4.2: Fix a potential double free with 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 (9e268189cb14 SUNRPC: Remove net/sunrpc/auth_gss/gss_krb5_seqnum.c) +$ git merge -m Merge branch 'nfsd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/nfsd-next +Auto-merging fs/nfsd/nfs4xdr.c +Merge made by the 'ort' strategy. + fs/locks.c | 7 - + fs/nfsd/nfs4proc.c | 15 +- + fs/nfsd/nfs4state.c | 120 +++++++++++-- + fs/nfsd/nfs4xdr.c | 13 ++ + fs/nfsd/state.h | 3 + + fs/nfsd/stats.c | 2 + + fs/nfsd/stats.h | 7 + + fs/nfsd/trace.h | 1 + + fs/nfsd/xdr4.h | 1 + + net/sunrpc/.kunitconfig | 1 - + net/sunrpc/Kconfig | 35 ---- + net/sunrpc/auth_gss/Makefile | 2 +- + net/sunrpc/auth_gss/gss_krb5_internal.h | 23 --- + net/sunrpc/auth_gss/gss_krb5_keys.c | 84 ---------- + net/sunrpc/auth_gss/gss_krb5_mech.c | 257 +--------------------------- + net/sunrpc/auth_gss/gss_krb5_seal.c | 69 -------- + net/sunrpc/auth_gss/gss_krb5_seqnum.c | 106 ------------ + net/sunrpc/auth_gss/gss_krb5_test.c | 196 ---------------------- + net/sunrpc/auth_gss/gss_krb5_unseal.c | 77 --------- + net/sunrpc/auth_gss/gss_krb5_wrap.c | 287 -------------------------------- + 20 files changed, 151 insertions(+), 1155 deletions(-) + delete mode 100644 net/sunrpc/auth_gss/gss_krb5_seqnum.c +Merging ntfs3/master (44b4494d5c59 fs/ntfs3: Correct mode for label entry inside /proc/fs/ntfs3/) +$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master +Auto-merging fs/ntfs3/file.c +Merge made by the 'ort' strategy. + fs/ntfs3/attrib.c | 2 +- + fs/ntfs3/attrlist.c | 7 +- + fs/ntfs3/bitmap.c | 10 +- + fs/ntfs3/file.c | 6 +- + fs/ntfs3/frecord.c | 58 ++++++----- + fs/ntfs3/fslog.c | 40 ++++---- + fs/ntfs3/fsntfs.c | 99 +++++++++++++++---- + fs/ntfs3/index.c | 20 ++-- + fs/ntfs3/inode.c | 23 +++-- + fs/ntfs3/lznt.c | 6 +- + fs/ntfs3/namei.c | 31 +++--- + fs/ntfs3/ntfs.h | 117 ++++++++++++---------- + fs/ntfs3/ntfs_fs.h | 31 +++--- + fs/ntfs3/record.c | 14 ++- + fs/ntfs3/run.c | 4 +- + fs/ntfs3/super.c | 280 +++++++++++++++++++++++++++++++++++++++++++++------- + fs/ntfs3/xattr.c | 20 ++-- + 17 files changed, 531 insertions(+), 237 deletions(-) +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 (7fb7998b599a ovl: move all parameter handling into params.{c,h}) +$ git merge -m Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git overlayfs/overlayfs-next +Already up to date. +Merging ubifs/next (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 (34acceaa8818 xfs: Remove unneeded semicolon) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next +Auto-merging fs/xfs/xfs_trace.h +Merge made by the 'ort' strategy. + fs/xfs/libxfs/xfs_ag.c | 2 +- + fs/xfs/libxfs/xfs_alloc.c | 291 ++++++++++++++++++++++++------------- + fs/xfs/libxfs/xfs_alloc.h | 24 +-- + fs/xfs/libxfs/xfs_attr_leaf.c | 2 - + fs/xfs/libxfs/xfs_bmap.c | 8 +- + fs/xfs/libxfs/xfs_bmap_btree.c | 3 +- + fs/xfs/libxfs/xfs_ialloc.c | 32 ++-- + fs/xfs/libxfs/xfs_ialloc_btree.c | 3 +- + fs/xfs/libxfs/xfs_refcount.c | 22 +-- + fs/xfs/libxfs/xfs_refcount_btree.c | 8 +- + fs/xfs/libxfs/xfs_rmap.c | 10 +- + fs/xfs/libxfs/xfs_sb.c | 56 ++++++- + fs/xfs/xfs_extent_busy.c | 36 ++++- + fs/xfs/xfs_extent_busy.h | 6 +- + fs/xfs/xfs_extfree_item.c | 75 +++++++++- + fs/xfs/xfs_fsmap.c | 261 +++++++++++++++++---------------- + fs/xfs/xfs_log.c | 47 ++---- + fs/xfs/xfs_notify_failure.c | 9 +- + fs/xfs/xfs_reflink.c | 3 +- + fs/xfs/xfs_trace.h | 25 ++++ + fs/xfs/xfs_trans_ail.c | 2 +- + 21 files changed, 590 insertions(+), 335 deletions(-) +Merging zonefs/for-next (8812387d0569 zonefs: set FMODE_CAN_ODIRECT instead of a dummy direct_IO method) +$ 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 (447a0bc108e4 iomap: drop me [hch] from MAINTAINERS for iomap) +$ 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 (0d6aeec73f8c selftests: add OFD lock tests) +$ git merge -m Merge branch 'locks-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git file-locks/locks-next +Auto-merging fs/locks.c +Merge made by the 'ort' strategy. + fs/locks.c | 23 ++++- + tools/testing/selftests/filelock/Makefile | 5 ++ + tools/testing/selftests/filelock/ofdlocks.c | 132 ++++++++++++++++++++++++++++ + 3 files changed, 157 insertions(+), 3 deletions(-) + create mode 100644 tools/testing/selftests/filelock/Makefile + create mode 100644 tools/testing/selftests/filelock/ofdlocks.c +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-brauner/vfs.all (1617478c27e4 Merge branches 'vfs.readdir' and 'vfs.misc' into vfs.all) +$ git merge -m Merge branch 'vfs.all' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git vfs-brauner/vfs.all +Auto-merging fs/ecryptfs/crypto.c +Auto-merging fs/ecryptfs/read_write.c +Auto-merging fs/splice.c +Auto-merging include/linux/fs.h +Auto-merging mm/shmem.c +Merge made by the 'ort' strategy. + Documentation/filesystems/locking.rst | 2 + + Documentation/filesystems/vfs.rst | 6 +- + fs/ecryptfs/mmap.c | 4 +- + fs/ecryptfs/read_write.c | 4 +- + fs/libfs.c | 248 ++++++++++++++++++++++++++++++++++ + fs/reiserfs/journal.c | 4 +- + fs/splice.c | 46 ++++--- + include/linux/fs.h | 18 +++ + include/linux/shmem_fs.h | 1 + + mm/shmem.c | 62 +++++++-- + 10 files changed, 355 insertions(+), 40 deletions(-) +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 (6ecac465eee8 Merge branch 'pci/controller/remove-void-callbacks') +$ 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 (d97038d5ec20 pstore/ram: Add check for kstrdup) +$ 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 (2a4b950dc6f0 Merge branch 'for-6.5/wacom' 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 (e67e24a52c72 Merge branch 'i2c/for-mergewindow' into i2c/for-next) +$ git merge -m Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/i2c/for-next +Merge made by the 'ort' strategy. +Merging i3c/i3c/next (49b472ebc61d i3c: master: svc: add NACK check after start byte sent) +$ 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 (4dbbaf8fbdbd hwmon: (oxp-sensors) Add support for AOKZOE A1 PRO) +$ 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 (016571b6d52d Merge branch 'docs-mw' into docs-next) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging scripts/kernel-doc +Merge made by the 'ort' strategy. + Documentation/admin-guide/acpi/ssdt-overlays.rst | 2 +- + Documentation/admin-guide/kernel-parameters.txt | 2 +- + Documentation/process/6.Followthrough.rst | 7 ++ + .../translations/zh_CN/process/2.Process.rst | 2 +- + .../translations/zh_CN/process/3.Early-stage.rst | 2 +- + .../translations/zh_CN/process/4.Coding.rst | 2 +- + .../zh_CN/process/7.AdvancedTopics.rst | 2 +- + .../translations/zh_TW/process/2.Process.rst | 2 +- + .../translations/zh_TW/process/3.Early-stage.rst | 2 +- + .../translations/zh_TW/process/4.Coding.rst | 2 +- + .../zh_TW/process/7.AdvancedTopics.rst | 2 +- + .../virt/kvm/x86/amd-memory-encryption.rst | 2 +- + MAINTAINERS | 80 +--------------------- + scripts/kernel-doc | 3 + + tools/testing/selftests/rcutorture/bin/kvm.sh | 2 +- + 15 files changed, 24 insertions(+), 90 deletions(-) +Merging v4l-dvb/master (c61480a2ea5e media: wl128x: fix a clang warning) +$ git merge -m Merge branch 'master' of git://linuxtv.org/media_tree.git v4l-dvb/master +Auto-merging MAINTAINERS +Auto-merging drivers/media/platform/amphion/vpu_v4l2.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/media/rkisp1.rst | 4 +- + .../bindings/display/tegra/nvidia,tegra20-vi.yaml | 59 + + .../bindings/display/tegra/nvidia,tegra20-vip.yaml | 41 + + .../bindings/media/i2c/maxim,max96712.yaml | 7 + + .../bindings/media/qcom,msm8916-camss.yaml | 2 +- + .../bindings/media/qcom,msm8996-camss.yaml | 2 +- + .../bindings/media/qcom,sdm660-camss.yaml | 2 +- + .../bindings/media/qcom,sdm845-camss.yaml | 2 +- + .../devicetree/bindings/media/rockchip-vpu.yaml | 1 + + Documentation/driver-api/media/camera-sensor.rst | 22 + + .../userspace-api/media/frontend.h.rst.exceptions | 4 + + Documentation/userspace-api/media/v4l/biblio.rst | 9 + + .../userspace-api/media/v4l/ext-ctrls-camera.rst | 3 + + .../media/v4l/ext-ctrls-codec-stateless.rst | 1216 +++++- + .../userspace-api/media/v4l/meta-formats.rst | 14 +- + .../v4l/{pixfmt-meta-d4xx.rst => metafmt-d4xx.rst} | 55 +- + ...-meta-intel-ipu3.rst => metafmt-intel-ipu3.rst} | 0 + .../{pixfmt-meta-rkisp1.rst => metafmt-rkisp1.rst} | 0 + .../v4l/{pixfmt-meta-uvc.rst => metafmt-uvc.rst} | 0 + .../{pixfmt-meta-vivid.rst => metafmt-vivid.rst} | 0 + ...xfmt-meta-vsp1-hgo.rst => metafmt-vsp1-hgo.rst} | 0 + ...xfmt-meta-vsp1-hgt.rst => metafmt-vsp1-hgt.rst} | 0 + .../userspace-api/media/v4l/pixfmt-compressed.rst | 16 + + .../userspace-api/media/v4l/pixfmt-yuv-planar.rst | 16 + + .../userspace-api/media/v4l/vidioc-g-ext-ctrls.rst | 20 +- + .../userspace-api/media/v4l/vidioc-queryctrl.rst | 24 + + .../media/v4l/vidioc-subdev-g-routing.rst | 2 +- + .../userspace-api/media/videodev2.h.rst.exceptions | 4 + + MAINTAINERS | 15 +- + drivers/media/cec/i2c/Kconfig | 1 + + drivers/media/cec/i2c/ch7322.c | 2 +- + drivers/media/common/saa7146/saa7146_core.c | 6 +- + drivers/media/dvb-core/dvbdev.c | 161 +- + drivers/media/dvb-frontends/a8293.c | 2 +- + drivers/media/dvb-frontends/af9013.c | 2 +- + drivers/media/dvb-frontends/af9033.c | 2 +- + drivers/media/dvb-frontends/au8522_decoder.c | 2 +- + drivers/media/dvb-frontends/cxd2099.c | 2 +- + drivers/media/dvb-frontends/cxd2820r_core.c | 2 +- + drivers/media/dvb-frontends/dvb-pll.c | 2 +- + drivers/media/dvb-frontends/helene.c | 2 +- + drivers/media/dvb-frontends/lgdt3306a.c | 2 +- + drivers/media/dvb-frontends/lgdt330x.c | 2 +- + drivers/media/dvb-frontends/m88ds3103.c | 2 +- + drivers/media/dvb-frontends/mb86a20s.c | 5 +- + drivers/media/dvb-frontends/mn88443x.c | 2 +- + drivers/media/dvb-frontends/mn88472.c | 2 +- + drivers/media/dvb-frontends/mn88473.c | 2 +- + drivers/media/dvb-frontends/mxl692.c | 2 +- + drivers/media/dvb-frontends/rtl2830.c | 2 +- + drivers/media/dvb-frontends/rtl2832.c | 2 +- + drivers/media/dvb-frontends/si2165.c | 2 +- + drivers/media/dvb-frontends/si2168.c | 2 +- + drivers/media/dvb-frontends/sp2.c | 2 +- + drivers/media/dvb-frontends/stv090x.c | 2 +- + drivers/media/dvb-frontends/stv6110x.c | 2 +- + drivers/media/dvb-frontends/tc90522.c | 2 +- + drivers/media/dvb-frontends/tda10071.c | 2 +- + drivers/media/dvb-frontends/ts2020.c | 2 +- + drivers/media/i2c/Kconfig | 14 + + drivers/media/i2c/Makefile | 1 + + drivers/media/i2c/ad5820.c | 2 +- + drivers/media/i2c/adp1653.c | 2 +- + drivers/media/i2c/adv7170.c | 2 +- + drivers/media/i2c/adv7175.c | 2 +- + drivers/media/i2c/adv7180.c | 2 +- + drivers/media/i2c/adv7183.c | 2 +- + drivers/media/i2c/adv7343.c | 2 +- + drivers/media/i2c/adv7393.c | 2 +- + drivers/media/i2c/adv748x/adv748x-core.c | 2 +- + drivers/media/i2c/adv7511-v4l2.c | 2 +- + drivers/media/i2c/adv7604.c | 2 +- + drivers/media/i2c/adv7842.c | 2 +- + drivers/media/i2c/ak7375.c | 2 +- + drivers/media/i2c/ak881x.c | 2 +- + drivers/media/i2c/ar0521.c | 2 +- + drivers/media/i2c/bt819.c | 2 +- + drivers/media/i2c/bt856.c | 2 +- + drivers/media/i2c/bt866.c | 2 +- + drivers/media/i2c/ccs/ccs-core.c | 2 +- + drivers/media/i2c/cs3308.c | 2 +- + drivers/media/i2c/cs5345.c | 2 +- + drivers/media/i2c/cs53l32a.c | 2 +- + drivers/media/i2c/cx25840/cx25840-core.c | 2 +- + drivers/media/i2c/dw9714.c | 2 +- + drivers/media/i2c/dw9768.c | 2 +- + drivers/media/i2c/dw9807-vcm.c | 2 +- + drivers/media/i2c/et8ek8/et8ek8_driver.c | 2 +- + drivers/media/i2c/hi556.c | 2 +- + drivers/media/i2c/hi846.c | 5 +- + drivers/media/i2c/hi847.c | 2 +- + drivers/media/i2c/imx208.c | 2 +- + drivers/media/i2c/imx214.c | 2 +- + drivers/media/i2c/imx219.c | 2 +- + drivers/media/i2c/imx258.c | 2 +- + drivers/media/i2c/imx274.c | 2 +- + drivers/media/i2c/imx290.c | 4 +- + drivers/media/i2c/imx296.c | 6 +- + drivers/media/i2c/imx319.c | 2 +- + drivers/media/i2c/imx334.c | 64 +- + drivers/media/i2c/imx335.c | 2 +- + drivers/media/i2c/imx355.c | 2 +- + drivers/media/i2c/imx412.c | 2 +- + drivers/media/i2c/imx415.c | 2 +- + drivers/media/i2c/ir-kbd-i2c.c | 2 +- + drivers/media/i2c/isl7998x.c | 2 +- + drivers/media/i2c/ks0127.c | 2 +- + drivers/media/i2c/lm3560.c | 2 +- + drivers/media/i2c/lm3646.c | 2 +- + drivers/media/i2c/m52790.c | 2 +- + drivers/media/i2c/max2175.c | 2 +- + drivers/media/i2c/max9286.c | 2 +- + drivers/media/i2c/ml86v7667.c | 2 +- + drivers/media/i2c/msp3400-driver.c | 2 +- + drivers/media/i2c/mt9m001.c | 2 +- + drivers/media/i2c/mt9m111.c | 2 +- + drivers/media/i2c/mt9p031.c | 2 +- + drivers/media/i2c/mt9t112.c | 2 +- + drivers/media/i2c/mt9v011.c | 2 +- + drivers/media/i2c/mt9v032.c | 2 +- + drivers/media/i2c/mt9v111.c | 2 +- + drivers/media/i2c/og01a1b.c | 2 +- + drivers/media/i2c/ov01a10.c | 1004 +++++ + drivers/media/i2c/ov02a10.c | 4 +- + drivers/media/i2c/ov08d10.c | 2 +- + drivers/media/i2c/ov08x40.c | 2 +- + drivers/media/i2c/ov13858.c | 2 +- + drivers/media/i2c/ov13b10.c | 2 +- + drivers/media/i2c/ov2640.c | 2 +- + drivers/media/i2c/ov2659.c | 2 +- + drivers/media/i2c/ov2680.c | 2 +- + drivers/media/i2c/ov2685.c | 4 +- + drivers/media/i2c/ov2740.c | 2 +- + drivers/media/i2c/ov4689.c | 2 +- + drivers/media/i2c/ov5640.c | 21 +- + drivers/media/i2c/ov5645.c | 2 +- + drivers/media/i2c/ov5647.c | 2 +- + drivers/media/i2c/ov5648.c | 4 +- + drivers/media/i2c/ov5670.c | 2 +- + drivers/media/i2c/ov5675.c | 2 +- + drivers/media/i2c/ov5693.c | 6 +- + drivers/media/i2c/ov5695.c | 4 +- + drivers/media/i2c/ov6650.c | 2 +- + drivers/media/i2c/ov7251.c | 2 +- + drivers/media/i2c/ov7640.c | 2 +- + drivers/media/i2c/ov7670.c | 2 +- + drivers/media/i2c/ov772x.c | 2 +- + drivers/media/i2c/ov7740.c | 2 +- + drivers/media/i2c/ov8856.c | 2 +- + drivers/media/i2c/ov8858.c | 4 +- + drivers/media/i2c/ov8865.c | 4 +- + drivers/media/i2c/ov9282.c | 2 +- + drivers/media/i2c/ov9640.c | 2 +- + drivers/media/i2c/ov9650.c | 2 +- + drivers/media/i2c/ov9734.c | 2 +- + drivers/media/i2c/rdacm20.c | 2 +- + drivers/media/i2c/rdacm21.c | 2 +- + drivers/media/i2c/rj54n1cb0c.c | 2 +- + drivers/media/i2c/s5c73m3/s5c73m3-core.c | 2 +- + drivers/media/i2c/s5k5baf.c | 2 +- + drivers/media/i2c/s5k6a3.c | 2 +- + drivers/media/i2c/saa6588.c | 2 +- + drivers/media/i2c/saa6752hs.c | 2 +- + drivers/media/i2c/saa7110.c | 2 +- + drivers/media/i2c/saa7115.c | 2 +- + drivers/media/i2c/saa7127.c | 2 +- + drivers/media/i2c/saa717x.c | 2 +- + drivers/media/i2c/saa7185.c | 2 +- + drivers/media/i2c/sony-btf-mpx.c | 2 +- + drivers/media/i2c/st-mipid02.c | 17 +- + drivers/media/i2c/st-vgxy61.c | 2 +- + drivers/media/i2c/tc358743.c | 2 +- + drivers/media/i2c/tc358746.c | 2 +- + drivers/media/i2c/tda1997x.c | 2 +- + drivers/media/i2c/tda7432.c | 2 +- + drivers/media/i2c/tda9840.c | 2 +- + drivers/media/i2c/tea6415c.c | 2 +- + drivers/media/i2c/tea6420.c | 2 +- + drivers/media/i2c/ths7303.c | 2 +- + drivers/media/i2c/ths8200.c | 2 +- + drivers/media/i2c/tlv320aic23b.c | 2 +- + drivers/media/i2c/tvaudio.c | 2 +- + drivers/media/i2c/tvp514x.c | 2 +- + drivers/media/i2c/tvp5150.c | 2 +- + drivers/media/i2c/tvp7002.c | 2 +- + drivers/media/i2c/tw2804.c | 2 +- + drivers/media/i2c/tw9903.c | 2 +- + drivers/media/i2c/tw9906.c | 2 +- + drivers/media/i2c/tw9910.c | 2 +- + drivers/media/i2c/uda1342.c | 2 +- + drivers/media/i2c/upd64031a.c | 2 +- + drivers/media/i2c/upd64083.c | 2 +- + drivers/media/i2c/video-i2c.c | 4 +- + drivers/media/i2c/vp27smpx.c | 2 +- + drivers/media/i2c/vpx3220.c | 2 +- + drivers/media/i2c/wm8739.c | 2 +- + drivers/media/i2c/wm8775.c | 2 +- + drivers/media/mc/mc-entity.c | 18 +- + drivers/media/pci/bt8xx/dst_ca.c | 2 +- + drivers/media/pci/cx18/cx18-av-vbi.c | 2 +- + drivers/media/pci/cx18/cx18-dvb.c | 4 +- + drivers/media/pci/dm1105/Kconfig | 2 +- + drivers/media/pci/intel/ipu3/ipu3-cio2-main.c | 31 +- + drivers/media/pci/saa7164/saa7164-dvb.c | 4 +- + drivers/media/pci/ttpci/budget-core.c | 4 +- + drivers/media/pci/tw686x/tw686x-audio.c | 2 +- + drivers/media/platform/amphion/vdec.c | 7 +- + drivers/media/platform/amphion/venc.c | 4 +- + drivers/media/platform/amphion/vpu_malone.c | 12 + + drivers/media/platform/amphion/vpu_v4l2.c | 5 +- + drivers/media/platform/amphion/vpu_v4l2.h | 2 +- + .../media/platform/mediatek/jpeg/mtk_jpeg_core.c | 828 ++-- + .../platform/mediatek/jpeg/mtk_jpeg_dec_parse.c | 17 +- + .../media/platform/mediatek/mdp3/mtk-mdp3-comp.c | 15 +- + drivers/media/platform/mediatek/vcodec/Makefile | 8 + + .../platform/mediatek/vcodec/mtk_vcodec_dbgfs.c | 215 + + .../platform/mediatek/vcodec/mtk_vcodec_dbgfs.h | 74 + + .../platform/mediatek/vcodec/mtk_vcodec_dec_drv.c | 5 +- + .../platform/mediatek/vcodec/mtk_vcodec_dec_hw.c | 26 +- + .../mediatek/vcodec/mtk_vcodec_dec_stateless.c | 106 +- + .../platform/mediatek/vcodec/mtk_vcodec_drv.h | 8 +- + .../platform/mediatek/vcodec/mtk_vcodec_enc.c | 8 +- + .../platform/mediatek/vcodec/mtk_vcodec_enc_drv.c | 2 + + .../platform/mediatek/vcodec/mtk_vcodec_util.c | 8 + + .../platform/mediatek/vcodec/mtk_vcodec_util.h | 26 +- + .../mediatek/vcodec/vdec/vdec_av1_req_lat_if.c | 2207 ++++++++++ + .../mediatek/vcodec/vdec/vdec_h264_req_multi_if.c | 6 +- + .../mediatek/vcodec/vdec/vdec_hevc_req_multi_if.c | 1097 +++++ + .../mediatek/vcodec/vdec/vdec_vp9_req_lat_if.c | 4 +- + .../media/platform/mediatek/vcodec/vdec_drv_if.c | 8 + + .../media/platform/mediatek/vcodec/vdec_drv_if.h | 2 + + .../platform/mediatek/vcodec/vdec_msg_queue.c | 132 +- + .../platform/mediatek/vcodec/vdec_msg_queue.h | 32 +- + drivers/media/platform/mediatek/vpu/mtk_vpu.c | 7 +- + drivers/media/platform/nxp/imx7-media-csi.c | 94 +- + .../platform/nxp/imx8-isi/imx8-isi-crossbar.c | 2 +- + drivers/media/platform/qcom/camss/camss-vfe.c | 6 +- + drivers/media/platform/qcom/venus/core.h | 39 + + drivers/media/platform/qcom/venus/helpers.c | 33 +- + drivers/media/platform/qcom/venus/hfi_cmds.c | 19 +- + drivers/media/platform/qcom/venus/hfi_cmds.h | 4 +- + drivers/media/platform/qcom/venus/hfi_helper.h | 2 + + drivers/media/platform/qcom/venus/hfi_msgs.c | 34 +- + drivers/media/platform/qcom/venus/hfi_msgs.h | 14 +- + drivers/media/platform/qcom/venus/hfi_plat_bufs.h | 3 + + .../media/platform/qcom/venus/hfi_plat_bufs_v6.c | 11 +- + drivers/media/platform/qcom/venus/hfi_venus.c | 28 +- + drivers/media/platform/qcom/venus/vdec.c | 120 +- + drivers/media/platform/qcom/venus/venc.c | 37 +- + drivers/media/platform/renesas/rcar-isp.c | 1 + + .../media/platform/renesas/rcar-vin/rcar-core.c | 13 + + .../media/platform/renesas/rcar-vin/rcar-csi2.c | 100 +- + drivers/media/platform/renesas/rcar_fdp1.c | 5 + + drivers/media/platform/renesas/rcar_jpu.c | 55 +- + drivers/media/platform/renesas/renesas-ceu.c | 9 - + .../media/platform/renesas/rzg2l-cru/rzg2l-csi2.c | 8 +- + drivers/media/platform/rockchip/rga/rga.c | 9 +- + drivers/media/platform/samsung/exynos4-is/Kconfig | 2 +- + .../media/platform/samsung/exynos4-is/fimc-core.c | 2 +- + .../media/platform/samsung/exynos4-is/fimc-lite.c | 2 +- + .../media/platform/samsung/s5p-jpeg/jpeg-core.h | 12 +- + .../platform/st/sti/c8sectpfe/c8sectpfe-core.c | 37 +- + .../platform/st/sti/c8sectpfe/c8sectpfe-core.h | 4 +- + drivers/media/platform/st/sti/hva/hva-h264.c | 8 +- + drivers/media/platform/verisilicon/Makefile | 3 + + drivers/media/platform/verisilicon/hantro.h | 8 + + drivers/media/platform/verisilicon/hantro_drv.c | 68 +- + drivers/media/platform/verisilicon/hantro_hevc.c | 23 +- + drivers/media/platform/verisilicon/hantro_hw.h | 102 + + .../media/platform/verisilicon/hantro_postproc.c | 9 +- + drivers/media/platform/verisilicon/hantro_v4l2.c | 67 +- + drivers/media/platform/verisilicon/hantro_v4l2.h | 8 +- + .../verisilicon/rockchip_av1_entropymode.c | 4424 ++++++++++++++++++++ + .../verisilicon/rockchip_av1_entropymode.h | 272 ++ + .../platform/verisilicon/rockchip_av1_filmgrain.c | 401 ++ + .../platform/verisilicon/rockchip_av1_filmgrain.h | 36 + + .../verisilicon/rockchip_vpu981_hw_av1_dec.c | 2232 ++++++++++ + .../platform/verisilicon/rockchip_vpu981_regs.h | 477 +++ + .../media/platform/verisilicon/rockchip_vpu_hw.c | 134 + + drivers/media/platform/video-mux.c | 104 +- + drivers/media/radio/Kconfig | 14 +- + drivers/media/radio/radio-tea5764.c | 2 +- + drivers/media/radio/saa7706h.c | 2 +- + drivers/media/radio/si470x/radio-si470x-i2c.c | 2 +- + drivers/media/radio/si4713/si4713.c | 2 +- + drivers/media/radio/tef6862.c | 2 +- + drivers/media/radio/wl128x/fmdrv_common.c | 6 +- + drivers/media/rc/Kconfig | 6 + + drivers/media/test-drivers/vidtv/vidtv_demod.c | 2 +- + drivers/media/test-drivers/vidtv/vidtv_tuner.c | 2 +- + drivers/media/test-drivers/vivid/vivid-vid-cap.c | 49 +- + drivers/media/tuners/e4000.c | 2 +- + drivers/media/tuners/fc2580.c | 2 +- + drivers/media/tuners/m88rs6000t.c | 2 +- + drivers/media/tuners/mt2060.c | 2 +- + drivers/media/tuners/mxl301rf.c | 2 +- + drivers/media/tuners/qm1d1b0004.c | 2 +- + drivers/media/tuners/qm1d1c0042.c | 2 +- + drivers/media/tuners/si2157.c | 2 +- + drivers/media/tuners/tda18212.c | 2 +- + drivers/media/tuners/tda18250.c | 2 +- + drivers/media/tuners/tua9001.c | 2 +- + drivers/media/usb/as102/as102_usb_drv.c | 6 +- + drivers/media/usb/au0828/au0828-core.c | 2 +- + drivers/media/usb/dvb-usb-v2/az6007.c | 19 +- + drivers/media/usb/dvb-usb/af9005-fe.c | 3 +- + drivers/media/usb/dvb-usb/az6027.c | 34 +- + drivers/media/usb/dvb-usb/dtt200u-fe.c | 2 +- + drivers/media/usb/dvb-usb/dw2102.c | 26 +- + drivers/media/usb/dvb-usb/opera1.c | 3 +- + drivers/media/usb/dvb-usb/pctv452e.c | 20 +- + drivers/media/usb/go7007/s2250-board.c | 2 +- + drivers/media/usb/siano/smsusb.c | 3 +- + drivers/media/usb/stk1160/Kconfig | 12 +- + drivers/media/usb/ttusb-dec/ttusb_dec.c | 2 +- + drivers/media/usb/uvc/uvc_driver.c | 137 +- + drivers/media/usb/uvc/uvc_v4l2.c | 79 +- + drivers/media/usb/uvc/uvc_video.c | 20 +- + drivers/media/usb/uvc/uvcvideo.h | 12 +- + drivers/media/v4l2-core/tuner-core.c | 2 +- + drivers/media/v4l2-core/v4l2-common.c | 158 +- + drivers/media/v4l2-core/v4l2-ctrls-core.c | 263 ++ + drivers/media/v4l2-core/v4l2-ctrls-defs.c | 61 + + drivers/media/v4l2-core/v4l2-ioctl.c | 2 + + drivers/media/v4l2-core/v4l2-mc.c | 38 +- + drivers/phy/Kconfig | 1 + + drivers/staging/media/atomisp/Makefile | 1 + + drivers/staging/media/atomisp/TODO | 262 +- + drivers/staging/media/atomisp/i2c/atomisp-gc0310.c | 315 +- + drivers/staging/media/atomisp/i2c/atomisp-gc2235.c | 2 +- + drivers/staging/media/atomisp/i2c/atomisp-lm3554.c | 2 +- + .../staging/media/atomisp/i2c/atomisp-mt9m114.c | 2 +- + drivers/staging/media/atomisp/i2c/atomisp-ov2680.c | 252 +- + drivers/staging/media/atomisp/i2c/atomisp-ov2722.c | 2 +- + drivers/staging/media/atomisp/i2c/gc0310.h | 309 -- + drivers/staging/media/atomisp/i2c/ov2680.h | 141 +- + .../media/atomisp/i2c/ov5693/atomisp-ov5693.c | 42 +- + .../staging/media/atomisp/include/linux/atomisp.h | 127 +- + .../media/atomisp/include/linux/atomisp_platform.h | 1 + + drivers/staging/media/atomisp/pci/atomisp-regs.h | 1 - + drivers/staging/media/atomisp/pci/atomisp_cmd.c | 1036 ++--- + drivers/staging/media/atomisp/pci/atomisp_cmd.h | 28 +- + drivers/staging/media/atomisp/pci/atomisp_common.h | 4 + + drivers/staging/media/atomisp/pci/atomisp_compat.h | 41 +- + .../media/atomisp/pci/atomisp_compat_css20.c | 283 +- + .../media/atomisp/pci/atomisp_compat_ioctl32.h | 55 - + drivers/staging/media/atomisp/pci/atomisp_csi2.c | 10 +- + drivers/staging/media/atomisp/pci/atomisp_csi2.h | 94 +- + .../media/atomisp/pci/atomisp_csi2_bridge.c | 874 ++++ + drivers/staging/media/atomisp/pci/atomisp_drvfs.c | 2 +- + drivers/staging/media/atomisp/pci/atomisp_fops.c | 181 +- + drivers/staging/media/atomisp/pci/atomisp_fops.h | 3 - + .../media/atomisp/pci/atomisp_gmin_platform.c | 248 +- + .../staging/media/atomisp/pci/atomisp_internal.h | 29 +- + drivers/staging/media/atomisp/pci/atomisp_ioctl.c | 400 +- + drivers/staging/media/atomisp/pci/atomisp_ioctl.h | 5 - + drivers/staging/media/atomisp/pci/atomisp_subdev.c | 258 +- + drivers/staging/media/atomisp/pci/atomisp_subdev.h | 36 +- + drivers/staging/media/atomisp/pci/atomisp_v4l2.c | 425 +- + drivers/staging/media/atomisp/pci/atomisp_v4l2.h | 4 +- + .../pci/runtime/frame/interface/ia_css_frame.h | 2 + + .../media/atomisp/pci/runtime/frame/src/frame.c | 62 +- + drivers/staging/media/atomisp/pci/sh_css.c | 524 ++- + .../staging/media/atomisp/pci/sh_css_firmware.c | 33 +- + drivers/staging/media/atomisp/pci/sh_css_mipi.c | 56 +- + drivers/staging/media/atomisp/pci/sh_css_sp.c | 10 +- + drivers/staging/media/av7110/av7110_av.c | 4 +- + drivers/staging/media/imx/imx-media-utils.c | 2 +- + drivers/staging/media/imx/imx6-mipi-csi2.c | 45 + + drivers/staging/media/max96712/max96712.c | 40 +- + drivers/staging/media/tegra-video/Kconfig | 1 + + drivers/staging/media/tegra-video/Makefile | 2 + + drivers/staging/media/tegra-video/csi.c | 48 + + drivers/staging/media/tegra-video/csi.h | 4 - + drivers/staging/media/tegra-video/tegra20.c | 661 +++ + drivers/staging/media/tegra-video/tegra210.c | 90 + + drivers/staging/media/tegra-video/vi.c | 220 +- + drivers/staging/media/tegra-video/vi.h | 71 +- + drivers/staging/media/tegra-video/video.c | 5 + + drivers/staging/media/tegra-video/video.h | 2 +- + drivers/staging/media/tegra-video/vip.c | 287 ++ + drivers/staging/media/tegra-video/vip.h | 68 + + include/media/dvbdev.h | 6 +- + include/media/jpeg.h | 20 + + include/media/media-entity.h | 6 +- + include/media/v4l2-common.h | 2 + + include/media/v4l2-ctrls.h | 8 + + include/media/v4l2-mem2mem.h | 18 +- + include/uapi/linux/dvb/frontend.h | 8 + + include/uapi/linux/dvb/version.h | 2 +- + include/uapi/linux/media.h | 28 +- + include/uapi/linux/v4l2-controls.h | 727 +++- + include/uapi/linux/videodev2.h | 17 +- + 393 files changed, 21507 insertions(+), 5263 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-vip.yaml + rename Documentation/userspace-api/media/v4l/{pixfmt-meta-d4xx.rst => metafmt-d4xx.rst} (74%) + rename Documentation/userspace-api/media/v4l/{pixfmt-meta-intel-ipu3.rst => metafmt-intel-ipu3.rst} (100%) + rename Documentation/userspace-api/media/v4l/{pixfmt-meta-rkisp1.rst => metafmt-rkisp1.rst} (100%) + rename Documentation/userspace-api/media/v4l/{pixfmt-meta-uvc.rst => metafmt-uvc.rst} (100%) + rename Documentation/userspace-api/media/v4l/{pixfmt-meta-vivid.rst => metafmt-vivid.rst} (100%) + rename Documentation/userspace-api/media/v4l/{pixfmt-meta-vsp1-hgo.rst => metafmt-vsp1-hgo.rst} (100%) + rename Documentation/userspace-api/media/v4l/{pixfmt-meta-vsp1-hgt.rst => metafmt-vsp1-hgt.rst} (100%) + create mode 100644 drivers/media/i2c/ov01a10.c + create mode 100644 drivers/media/platform/mediatek/vcodec/mtk_vcodec_dbgfs.c + create mode 100644 drivers/media/platform/mediatek/vcodec/mtk_vcodec_dbgfs.h + create mode 100644 drivers/media/platform/mediatek/vcodec/vdec/vdec_av1_req_lat_if.c + create mode 100644 drivers/media/platform/mediatek/vcodec/vdec/vdec_hevc_req_multi_if.c + create mode 100644 drivers/media/platform/verisilicon/rockchip_av1_entropymode.c + create mode 100644 drivers/media/platform/verisilicon/rockchip_av1_entropymode.h + create mode 100644 drivers/media/platform/verisilicon/rockchip_av1_filmgrain.c + create mode 100644 drivers/media/platform/verisilicon/rockchip_av1_filmgrain.h + create mode 100644 drivers/media/platform/verisilicon/rockchip_vpu981_hw_av1_dec.c + create mode 100644 drivers/media/platform/verisilicon/rockchip_vpu981_regs.h + delete mode 100644 drivers/staging/media/atomisp/i2c/gc0310.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp_csi2_bridge.c + create mode 100644 drivers/staging/media/tegra-video/tegra20.c + create mode 100644 drivers/staging/media/tegra-video/vip.c + create mode 100644 drivers/staging/media/tegra-video/vip.h + create mode 100644 include/media/jpeg.h +Merging v4l-dvb-next/master (c61480a2ea5e media: wl128x: fix a clang warning) +$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master +Already up to date. +Merging pm/linux-next (e7c5bd3ce615 Merge branch 'pm-cpufreq' into linux-next) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next +Merge made by the 'ort' strategy. + drivers/acpi/bus.c | 6 +++--- + drivers/acpi/device_sysfs.c | 2 +- + drivers/acpi/internal.h | 4 +++- + drivers/acpi/scan.c | 2 -- + 4 files changed, 7 insertions(+), 7 deletions(-) +Merging cpufreq-arm/cpufreq/arm/linux-next (5ee64250286e cpufreq: qcom-cpufreq-hw: Use dev_err_probe() when failing to get icc paths) +$ 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 +Already up to date. +Merging cpupower/cpupower (25891bc945f7 cpupower: Bump soname version) +$ 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/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging devfreq/devfreq-next (a83bfdca8b20 PM / devfreq: mtk-cci: Fix variable deferencing before NULL check) +$ 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 (5fb2864cbd50 OPP: Properly propagate error along when failing to get icc_path) +$ 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 (57c9eaa4de53 thermal/drivers/qcom/temp-alarm: Use dev_err_probe) +$ 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 (fc4ea4229c2b fs: dlm: remove filter local comms on close) +$ 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 (5f004bcaee4c Merge tag 'v6.4' into rdma.git for-next) +$ 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 (3a8a670eeeaa Merge tag 'net-next-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/main +Already up to date. +Merging bpf-next/for-next (3a8a670eeeaa Merge tag 'net-next-6.5' 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 (a94fd40a18ae xfrm: delete not-needed clear to zero of encap_oa) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git ipsec-next/master +Auto-merging net/key/af_key.c +Merge made by the 'ort' strategy. + net/key/af_key.c | 1 - + 1 file changed, 1 deletion(-) +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 (61dc651cdfe8 Merge tag 'nf-next-23-06-26' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next) +$ 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 (fd859b4a3815 Bluetooth: hci_conn: Always allocate unique handles) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master +Auto-merging drivers/bluetooth/btrtl.c +Auto-merging drivers/bluetooth/btusb.c +Auto-merging include/net/bluetooth/bluetooth.h +Auto-merging include/net/bluetooth/mgmt.h +Auto-merging net/bluetooth/hci_conn.c +CONFLICT (content): Merge conflict in net/bluetooth/hci_conn.c +Auto-merging net/bluetooth/hci_event.c +CONFLICT (content): Merge conflict in net/bluetooth/hci_event.c +Auto-merging net/bluetooth/hci_sync.c +Auto-merging net/bluetooth/iso.c +Auto-merging net/bluetooth/l2cap_sock.c +Resolved 'net/bluetooth/hci_conn.c' using previous resolution. +Resolved 'net/bluetooth/hci_event.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 6633550eabd8] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git +$ git diff -M --stat --summary HEAD^.. + drivers/bluetooth/btintel.c | 124 ++++++++++ + drivers/bluetooth/btintel.h | 2 + + drivers/bluetooth/btmtk.c | 133 +++++++++++ + drivers/bluetooth/btmtk.h | 41 ++++ + drivers/bluetooth/btrtl.c | 163 ++++++++++--- + drivers/bluetooth/btrtl.h | 13 ++ + drivers/bluetooth/btusb.c | 275 ++++++++++++++++------ + drivers/bluetooth/hci_qca.c | 148 ++++++++---- + include/net/bluetooth/bluetooth.h | 3 + + include/net/bluetooth/hci.h | 11 + + include/net/bluetooth/hci_core.h | 49 +++- + include/net/bluetooth/hci_sync.h | 2 +- + include/net/bluetooth/mgmt.h | 2 + + net/bluetooth/af_bluetooth.c | 45 ++++ + net/bluetooth/bnep/sock.c | 10 +- + net/bluetooth/hci_conn.c | 474 ++++++++++++++++++-------------------- + net/bluetooth/hci_core.c | 38 ++- + net/bluetooth/hci_event.c | 141 ++++++++---- + net/bluetooth/hci_sock.c | 77 ++++++- + net/bluetooth/hci_sync.c | 299 +++++++++++++++++++----- + net/bluetooth/hidp/sock.c | 10 +- + net/bluetooth/iso.c | 109 ++++----- + net/bluetooth/l2cap_sock.c | 29 +-- + net/bluetooth/mgmt.c | 47 ++-- + net/bluetooth/msft.c | 414 +++++++++++++++++++++++++++++++-- + net/bluetooth/rfcomm/sock.c | 13 +- + net/bluetooth/sco.c | 10 +- + 27 files changed, 1994 insertions(+), 688 deletions(-) +$ git am -3 ../patches/0001-Revert-Bluetooth-hci_sock-Forward-credentials-to-mon.patch +Applying: Revert "Bluetooth: hci_sock: Forward credentials to monitor" +$ git reset HEAD^ +Unstaged changes after reset: +M include/net/bluetooth/bluetooth.h +M net/bluetooth/hci_sock.c +$ git add -A . +$ git commit -v -a --amend +[master f2dcc57dcc99] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git + Date: Wed Jul 5 10:05:28 2023 +1000 +Merging wireless-next/for-next (31b5a547622b wifi: ieee80211: fix erroneous NSTR bitmap size checks) +$ 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 (18b849f12dcc ieee802154: ca8210: Remove stray gpiod_unexport() call) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git wpan-next/master +Already up to date. +Merging wpan-staging/staging (18b849f12dcc ieee802154: ca8210: Remove stray gpiod_unexport() call) +$ git merge -m Merge branch 'staging' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git wpan-staging/staging +Already up to date. +Merging mtd/mtd/next (cf431a599832 Merge branch 'nand/next' 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 (ad5c18c75d2a dt-bindings: mtd: marvell-nand: Convert to YAML DT scheme) +$ 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 (486bfb05913a crypto: akcipher - Do not copy dst if it is NULL) +$ 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 (5ff2977b1976 Merge tag 'drm-intel-next-fixes-2023-06-21' 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 (59bba51ec2a5 drm/panel: Fine tune Starry-ili9882t panel HFP and HBP) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc drm-misc/for-linux-next +Merge made by the 'ort' strategy. + arch/sparc/video/fbdev.c | 3 +++ + drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c | 6 +++--- + 2 files changed, 6 insertions(+), 3 deletions(-) +Merging amdgpu/drm-next (8b17334d533f drm/amd: adjust whitespace for amdgpu_psp.h) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next +Merge made by the 'ort' strategy. + Documentation/gpu/amdgpu/flashing.rst | 33 ++++ + Documentation/gpu/amdgpu/index.rst | 1 + + drivers/gpu/drm/amd/amdgpu/Makefile | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 9 + + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 39 ++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 141 ++++++++------- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_rap.c | 2 - + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 11 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ring_mux.c | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 3 - + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 24 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.c | 13 +- + .../{aqua_vanjaram_reg_init.c => aqua_vanjaram.c} | 0 + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 41 ++++- + drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 13 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c | 18 +- + drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 5 + + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 44 ++++- + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 29 +++ + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 9 + + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 35 ++-- + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 4 + + drivers/gpu/drm/amd/amdkfd/soc15_int.h | 1 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 196 ++++++++++----------- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 6 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 170 +++++++++++++++++- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 26 +++ + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 42 +++-- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c | 3 +- + .../amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c | 43 ++++- + drivers/gpu/drm/amd/display/dc/core/dc.c | 141 ++++++++++++++- + .../gpu/drm/amd/display/dc/core/dc_hw_sequencer.c | 2 +- + drivers/gpu/drm/amd/display/dc/dc.h | 16 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 7 + + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 1 + + drivers/gpu/drm/amd/display/dc/dce/dce_abm.h | 29 ++- + .../drm/amd/display/dc/dce112/dce112_resource.c | 10 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.c | 19 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.h | 1 + + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 11 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_dwb_cm.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 2 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 6 +- + .../drm/amd/display/dc/dcn302/dcn302_resource.c | 3 +- + .../drm/amd/display/dc/dcn303/dcn303_resource.c | 1 + + .../display/dc/dcn31/dcn31_hpo_dp_stream_encoder.c | 2 +- + .../gpu/drm/amd/display/dc/dcn314/dcn314_dccg.c | 2 +- + .../gpu/drm/amd/display/dc/dcn314/dcn314_hwseq.c | 30 +--- + .../gpu/drm/amd/display/dc/dcn314/dcn314_hwseq.h | 4 +- + .../gpu/drm/amd/display/dc/dcn314/dcn314_init.c | 2 +- + .../drm/amd/display/dc/dcn314/dcn314_resource.c | 15 +- + .../drm/amd/display/dc/dcn315/dcn315_resource.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hubp.c | 1 + + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c | 18 +- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.h | 2 +- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_init.c | 1 + + .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.c | 2 + + .../amd/display/dc/dcn32/dcn32_resource_helpers.c | 3 +- + .../drm/amd/display/dc/dcn321/dcn321_resource.c | 3 + + .../amd/display/dc/dml/dcn20/display_mode_vba_20.c | 16 +- + .../gpu/drm/amd/display/dc/dml/dcn314/dcn314_fpu.c | 2 +- + .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 90 +++++++++- + .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.h | 4 - + .../gpu/drm/amd/display/dc/dml/dcn321/dcn321_fpu.c | 102 +++++++++-- + .../gpu/drm/amd/display/dc/dml/dcn321/dcn321_fpu.h | 4 - + .../drm/amd/display/dc/dml/display_mode_structs.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 1 + + .../drm/amd/display/dc/inc/hw_sequencer_private.h | 2 +- + .../dc/link/protocols/link_dp_irq_handler.c | 37 +++- + drivers/gpu/drm/amd/display/dmub/dmub_srv.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_dcn314.c | 5 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn314.h | 2 + + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 11 +- + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 81 +++++---- + drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 2 + + drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c | 48 +++++ + .../drm/amd/pm/powerplay/hwmgr/hardwaremanager.c | 4 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 2 + + .../gpu/drm/amd/pm/powerplay/hwmgr/smu_helper.c | 27 +-- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 10 ++ + .../gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c | 4 + + .../drm/amd/pm/powerplay/hwmgr/vega12_thermal.c | 4 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c | 4 + + .../drm/amd/pm/powerplay/hwmgr/vega20_thermal.c | 4 +- + drivers/gpu/drm/amd/pm/powerplay/inc/hwmgr.h | 2 + + drivers/gpu/drm/amd/pm/powerplay/inc/power_state.h | 1 + + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 34 ++++ + drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 2 + + drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 10 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 9 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 9 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 1 + + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 4 +- + 111 files changed, 1437 insertions(+), 515 deletions(-) + create mode 100644 Documentation/gpu/amdgpu/flashing.rst + rename drivers/gpu/drm/amd/amdgpu/{aqua_vanjaram_reg_init.c => aqua_vanjaram.c} (100%) +Merging drm-intel/for-linux-next (f6cf3883df47 drm/i915: use mock device info for creating mock device) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel drm-intel/for-linux-next +Merge made by the 'ort' strategy. + drivers/gpu/drm/i915/display/intel_cx0_phy.c | 3 +- + drivers/gpu/drm/i915/display/intel_display_power.h | 4 ++ + .../gpu/drm/i915/display/intel_display_power_map.c | 16 ++++---- + .../drm/i915/display/intel_display_power_well.h | 2 + + drivers/gpu/drm/i915/display/intel_hdcp.c | 2 +- + drivers/gpu/drm/i915/display/intel_psr.c | 4 +- + drivers/gpu/drm/i915/display/intel_psr_regs.h | 2 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c | 2 +- + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 45 ++++++++++++---------- + 9 files changed, 45 insertions(+), 35 deletions(-) +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 (cd036d542afb drm/msm/a6xx: Add A610 speedbin support) +$ 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 (452c46ccf603 drm/msm/dsi: split dsi_ctrl_config() function) +$ 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 (295b6c02f84b drm/etnaviv: slow down FE idle polling) +$ git merge -m Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux etnaviv/etnaviv/next +Merge made by the 'ort' strategy. + drivers/gpu/drm/etnaviv/etnaviv_buffer.c | 11 ++++++----- + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 4 +++- + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 8 ++++++++ + drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 1 + + 4 files changed, 18 insertions(+), 6 deletions(-) +Merging fbdev/for-next (e15fae5e388d fbdev: imxfb: switch to DEFINE_SIMPLE_DEV_PM_OPS) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next +Merge made by the 'ort' strategy. + drivers/video/fbdev/imxfb.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) +Merging regmap/for-next (1e897fca0b3b Merge remote-tracking branch 'regmap/for-6.5' into regmap-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap/for-next +Merge made by the 'ort' strategy. +Merging sound/for-next (72cea3a3175b ALSA: hda/realtek: Whitespace fix) +$ 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 (3ff256751a28 firewire: net: fix use after free in fwnet_finish_incoming_packet()) +$ 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 (08a9ad10002c Merge remote-tracking branch 'asoc/for-6.4' 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 (0eeaf1eb40a3 kallsyms: make kallsyms_show_value() as generic function) +$ 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 (8c9cce9cb81b Input: pm8941-powerkey - fix debounce on gen2+ PMICs) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next +Already up to date. +Merging block/for-next (8833cf913f44 Merge branch 'block-6.5' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next +Merge made by the 'ort' strategy. +Merging device-mapper/for-next (e2c789cab60a dm: get rid of GFP_NOIO workarounds for __vmalloc and kvmalloc) +$ 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 (fd3ac6e80497 dt-bindings: phy: rockchip: rk3588 has two reset lines) +$ 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 (06b5d4fea89c dt-bindings: mmc: fsl-imx-esdhc: Add imx6ul support) +$ 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 (b05740d71bd2 dt-bindings: mfd: max77541: Add ADI MAX77541/MAX77540) +$ 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 (a33677b9211b backlight: led_bl: Take led_access lock when required) +$ 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 (ef8d95b4a3af MAINTAINERS: add documentation file for Microchip SAMA5D2 shutdown controller) +$ 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 (701c1cef8e02 Merge remote-tracking branch 'regulator/for-6.4' 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 (4be22f16a4a1 device_cgroup: Fix kernel-doc warnings in device_cgroup) +$ 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 (97a79eea1797 apparmor: Fix kernel-doc header for verify_dfa_accept_index) +$ git merge -m Merge branch 'apparmor-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor apparmor/apparmor-next +Auto-merging security/apparmor/apparmorfs.c +Auto-merging security/apparmor/domain.c +Auto-merging security/apparmor/file.c +Auto-merging security/apparmor/lsm.c +Auto-merging security/apparmor/policy_compat.c +Auto-merging security/apparmor/policy_unpack.c +Merge made by the 'ort' strategy. + security/apparmor/apparmorfs.c | 3 + + security/apparmor/crypto.c | 10 ++-- + security/apparmor/domain.c | 2 +- + security/apparmor/file.c | 2 +- + security/apparmor/include/net.h | 1 - + security/apparmor/include/task.h | 2 +- + security/apparmor/lsm.c | 8 +-- + security/apparmor/policy.c | 20 +++++-- + security/apparmor/policy_compat.c | 20 +++++-- + security/apparmor/policy_unpack.c | 102 +++++++++++++++++++++------------ + security/apparmor/policy_unpack_test.c | 13 ++--- + security/apparmor/secid.c | 3 +- + security/apparmor/task.c | 5 +- + 13 files changed, 116 insertions(+), 75 deletions(-) +Merging integrity/next-integrity (95526d13038c ima: Fix build warnings) +$ 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 (447a5688005e selinux: avoid bool as identifier name) +$ 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 (2c085f3a8f23 smack: Record transmuting in smk_transmuted) +$ git merge -m Merge branch 'next' of git://github.com/cschaufler/smack-next smack/next +Already up to date. +Merging tomoyo/master (e52fa5e9fbe1 workqueue: Warn attempt to flush system-wide workqueues.) +$ 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 | 44 +++----------------------------------------- + kernel/workqueue.c | 11 +++++------ + 2 files changed, 8 insertions(+), 47 deletions(-) +Merging tpmdd/next (f42582c6b23a tpm: Switch i2c drivers back to use .probe()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tpmdd/next +Auto-merging include/crypto/public_key.h +Merge made by the 'ort' strategy. + certs/system_keyring.c | 49 ++++++++++++++++++ + crypto/asymmetric_keys/restrict.c | 44 +++++++++++++++++ + drivers/char/tpm/st33zp24/i2c.c | 2 +- + drivers/char/tpm/tpm_i2c_atmel.c | 2 +- + drivers/char/tpm/tpm_i2c_infineon.c | 2 +- + drivers/char/tpm/tpm_i2c_nuvoton.c | 2 +- + drivers/char/tpm/tpm_tis.c | 1 + + drivers/char/tpm/tpm_tis_i2c.c | 59 +++++++++++++--------- + drivers/char/tpm/tpm_tis_i2c_cr50.c | 2 +- + drivers/char/tpm/tpm_tis_spi_main.c | 99 ++++++++++++++++++++++++++++++++++++- + drivers/char/tpm/tpm_vtpm_proxy.c | 30 +++-------- + include/crypto/public_key.h | 11 +++++ + include/keys/system_keyring.h | 10 ++++ + security/integrity/digsig.c | 4 +- + security/integrity/evm/Kconfig | 3 +- + security/integrity/ima/Kconfig | 3 +- + security/keys/keyctl.c | 11 +++-- + security/keys/request_key.c | 35 ++++++++----- + security/keys/request_key_auth.c | 2 +- + 19 files changed, 300 insertions(+), 71 deletions(-) +Merging watchdog/master (547cc9be86f4 Merge tag 'perf_urgent_for_v6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) +$ 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 (a7a334076dd7 Merge branches 'iommu/fixes', 'arm/smmu', 'ppc/pamu', 'virtio', 'x86/vt-d', 'core' and 'x86/amd' 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 (e455ca40dbcf audit: avoid missing-prototype warnings) +$ 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 (f0ac35049606 dt-bindings: timestamp: restrict node name suffixes) +$ 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. + .../devicetree/bindings/slimbus/slimbus.yaml | 2 +- + .../timestamp/hardware-timestamps-common.yaml | 2 +- + .../devicetree/bindings/watchdog/brcm,kona-wdt.txt | 15 ------ + .../bindings/watchdog/brcm,kona-wdt.yaml | 41 ++++++++++++++ + .../devicetree/bindings/watchdog/cadence-wdt.txt | 23 -------- + .../bindings/watchdog/cdns,wdt-r1p2.yaml | 62 ++++++++++++++++++++++ + .../devicetree/bindings/watchdog/watchdog.yaml | 4 +- + 7 files changed, 107 insertions(+), 42 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/watchdog/brcm,kona-wdt.txt + create mode 100644 Documentation/devicetree/bindings/watchdog/brcm,kona-wdt.yaml + delete mode 100644 Documentation/devicetree/bindings/watchdog/cadence-wdt.txt + create mode 100644 Documentation/devicetree/bindings/watchdog/cdns,wdt-r1p2.yaml +Merging dt-krzk/for-next (0ff3c07556e6 Merge branch 'next/dt64' 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 (1b712f18c461 mailbox: ti-msgmgr: Fill non-message tx data fields with 0x0) +$ 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 (d0e1c60318ac Merge remote-tracking branch 'spi/for-6.4' 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 (12f69e436304 Merge branch into tip/master: 'x86/urgent') +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master +Auto-merging arch/Kconfig +Auto-merging arch/arm/include/asm/pgtable.h +Auto-merging arch/arm64/include/asm/pgtable.h +Auto-merging arch/loongarch/include/asm/pgtable.h +Auto-merging arch/m68k/include/asm/mcf_pgtable.h +Auto-merging arch/m68k/include/asm/sun3_pgtable.h +Auto-merging arch/s390/Kconfig +Auto-merging arch/sparc/kernel/signal32.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/entry/syscalls/syscall_64.tbl +CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_64.tbl +Auto-merging arch/x86/mm/fault.c +Auto-merging arch/x86/xen/mmu_pv.c +Auto-merging fs/proc/task_mmu.c +Auto-merging include/linux/mm.h +Auto-merging include/linux/pgtable.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 include/uapi/linux/elf.h +Auto-merging kernel/sys_ni.c +Auto-merging mm/debug_vm_pgtable.c +Auto-merging mm/gup.c +CONFLICT (content): Merge conflict in mm/gup.c +Auto-merging mm/huge_memory.c +Auto-merging mm/internal.h +Auto-merging mm/memory.c +Auto-merging mm/migrate.c +CONFLICT (content): Merge conflict in mm/migrate.c +Auto-merging mm/migrate_device.c +Auto-merging mm/mmap.c +Auto-merging mm/mprotect.c +Auto-merging mm/nommu.c +Auto-merging mm/userfaultfd.c +Auto-merging mm/util.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. +Resolved 'mm/migrate.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master a1038e6452d5] 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/shstk.rst | 179 +++++ + Documentation/filesystems/proc.rst | 1 + + Documentation/mm/arch_pgtable_helpers.rst | 12 +- + arch/Kconfig | 8 + + arch/alpha/include/asm/pgtable.h | 2 +- + arch/arc/include/asm/hugepage.h | 2 +- + arch/arc/include/asm/pgtable-bits-arcv2.h | 2 +- + arch/arm/include/asm/pgtable-3level.h | 2 +- + arch/arm/include/asm/pgtable.h | 2 +- + arch/arm/kernel/signal.c | 2 +- + arch/arm64/include/asm/pgtable.h | 4 +- + 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 | 2 +- + arch/m68k/include/asm/sun3_pgtable.h | 2 +- + 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 | 2 +- + 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 | 4 +- + arch/powerpc/include/asm/nohash/32/pte-8xx.h | 4 +- + arch/powerpc/include/asm/nohash/64/pgtable.h | 2 +- + arch/riscv/include/asm/pgtable.h | 6 +- + arch/s390/Kconfig | 1 + + arch/s390/include/asm/hugetlb.h | 2 +- + arch/s390/include/asm/pgtable.h | 4 +- + arch/s390/mm/pageattr.c | 4 +- + arch/sh/include/asm/pgtable_32.h | 4 +- + 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 | 302 +++++++- + arch/x86/include/asm/pgtable_types.h | 42 +- + 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/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 | 529 ++++++++++++++ + 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 | 40 ++ + 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 | 2 +- + include/linux/mm.h | 67 +- + include/linux/mman.h | 4 + + include/linux/pgtable.h | 28 + + include/linux/proc_fs.h | 1 + + include/linux/syscalls.h | 1 + + include/uapi/asm-generic/siginfo.h | 3 +- + include/uapi/linux/elf.h | 2 + + ipc/shm.c | 2 +- + kernel/irq/irqdomain.c | 4 +- + kernel/sys_ni.c | 1 + + mm/debug_vm_pgtable.c | 12 +- + mm/gup.c | 2 +- + mm/huge_memory.c | 11 +- + mm/internal.h | 4 +- + mm/memory.c | 5 +- + mm/migrate.c | 2 +- + mm/migrate_device.c | 2 +- + mm/mmap.c | 14 +- + 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 | 884 ++++++++++++++++++++++++ + 118 files changed, 2790 insertions(+), 309 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 (8b5bf64c89c7 clocksource/drivers/cadence-ttc: Fix memory leak in ttc_timer_probe) +$ git merge -m Merge branch 'timers/drivers/next' of git://git.linaro.org/people/daniel.lezcano/linux.git clockevents/timers/drivers/next +Already up to date. +Merging edac/edac-for-next (852667c317ae Merge ras/edac-drivers into for-next) +$ git merge -m Merge branch 'edac-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac/edac-for-next +Already up to date. +Merging irqchip/irq/irqchip-next (a82f3119d543 Merge branch irq/misc-6.5 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 (61c692f56fec 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 +Merge made by the 'ort' strategy. + Documentation/tools/rtla/common_options.rst | 8 + + Documentation/tools/rtla/common_timerlat_aa.rst | 7 - + .../tools/rtla/common_timerlat_options.rst | 7 + + Documentation/tools/rtla/rtla-timerlat-hist.rst | 7 +- + Documentation/tools/rtla/rtla-timerlat-top.rst | 7 + + tools/tracing/rtla/src/osnoise.c | 65 +++++ + tools/tracing/rtla/src/osnoise.h | 5 + + tools/tracing/rtla/src/osnoise_hist.c | 90 +++++- + tools/tracing/rtla/src/osnoise_top.c | 85 +++++- + tools/tracing/rtla/src/timerlat_aa.c | 35 ++- + tools/tracing/rtla/src/timerlat_aa.h | 5 +- + tools/tracing/rtla/src/timerlat_hist.c | 264 +++++++++++++++-- + tools/tracing/rtla/src/timerlat_top.c | 231 +++++++++++++-- + tools/tracing/rtla/src/timerlat_u.c | 224 ++++++++++++++ + tools/tracing/rtla/src/timerlat_u.h | 18 ++ + tools/tracing/rtla/src/utils.c | 324 +++++++++++++++++++-- + tools/tracing/rtla/src/utils.h | 7 + + 17 files changed, 1280 insertions(+), 109 deletions(-) + create mode 100644 tools/tracing/rtla/src/timerlat_u.c + create mode 100644 tools/tracing/rtla/src/timerlat_u.h +Merging rcu/rcu/next (c70bbbbdf3a6 rcutorture: Remove obsolete BOOTPARAM_HOTPLUG_CPU0 Kconfig option) +$ git merge -m Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git rcu/rcu/next +Auto-merging kernel/smp.c +Merge made by the 'ort' strategy. + kernel/smp.c | 13 +++++++++++-- + tools/testing/selftests/rcutorture/configs/rcu/TREE01 | 1 - + 2 files changed, 11 insertions(+), 3 deletions(-) +Merging kvm/next (255006adb3da Merge tag 'kvm-x86-vmx-6.5' of https://github.com/kvm-x86/linux into HEAD) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next +Already up to date. +Merging kvm-arm/next (192df2aa0113 KVM: arm64: Fix misuse of KVM_ARM_VCPU_POWER_OFF bit index) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm/next +Already up to date. +Merging kvms390/next (db54dfc9f71c s390/uv: Update query for secret-UVCs) +$ 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-riscv/riscv_kvm_next (07f225b58424 RISC-V: KVM: Remove unneeded semicolon) +$ git merge -m Merge branch 'riscv_kvm_next' of https://github.com/kvm-riscv/linux.git kvm-riscv/riscv_kvm_next +Already up to date. +Merging kvm-x86/next (88bb466c9dec Merge branches 'generic', 'misc', 'mmu', 'selftests', 'svm', 'vmx' and 'pmu') +$ git merge -m Merge branch 'next' of https://github.com/kvm-x86/linux.git kvm-x86/next +Merge made by the 'ort' strategy. +Merging xen-tip/linux-next (21a235bce123 xen/virtio: Fix NULL deref when a bridge of PCI root bus has no parent) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next +Merge made by the 'ort' strategy. + arch/x86/xen/xen-head.S | 37 +++++++++++++++++++++---------------- + drivers/xen/grant-dma-ops.c | 2 ++ + 2 files changed, 23 insertions(+), 16 deletions(-) +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 (ee360b1c5001 Merge branch 'for-6.5-cleanup-ordered' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next +Merge made by the 'ort' strategy. +Merging drivers-x86/for-next (d2a7bd369099 platform/x86:intel/pmc: Add Meteor Lake IOE-M PMC related maps) +$ 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 (2b8cc5858a07 platform/chrome: cros_ec_spi: Use %*ph for printing hexdump of a small buffer) +$ 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 (42877c38ac78 HSI: omap_ssi_port: Drop error checking for debugfs_create_dir) +$ 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 (877e91191ccf leds: leds-mt6323: Adjust return/parameter types in wled get/set callbacks) +$ 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 (b02bb79eee07 ipmi: fix potential deadlock on &kcs_bmc->lock) +$ git merge -m Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git ipmi/for-next +Merge made by the 'ort' strategy. + .../bindings/ipmi/aspeed,ast2400-kcs-bmc.yaml | 8 ++++---- + drivers/char/ipmi/ipmb_dev_int.c | 2 +- + drivers/char/ipmi/ipmi_devintf.c | 24 +++++++++++----------- + drivers/char/ipmi/ipmi_ipmb.c | 2 +- + drivers/char/ipmi/ipmi_si_intf.c | 5 +++++ + drivers/char/ipmi/ipmi_si_platform.c | 2 +- + drivers/char/ipmi/ipmi_ssif.c | 11 +++++++--- + drivers/char/ipmi/ipmi_watchdog.c | 2 +- + drivers/char/ipmi/kcs_bmc.c | 5 +++-- + drivers/char/ipmi/ssif_bmc.c | 2 +- + 10 files changed, 37 insertions(+), 26 deletions(-) +Merging driver-core/driver-core-next (24be4d0b46bb arch/arm64/mm/fault: Fix undeclared variable error in do_page_fault()) +$ 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 (24be4d0b46bb arch/arm64/mm/fault: Fix undeclared variable error in do_page_fault()) +$ 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 (481012b479fe thunderbolt: Add test case for 3 DisplayPort tunnels) +$ 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 (ffa5f7a3bf28 USB: serial: option: add LARA-R6 01B PIDs) +$ 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 (24be4d0b46bb arch/arm64/mm/fault: Fix undeclared variable error in do_page_fault()) +$ 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 (24be4d0b46bb arch/arm64/mm/fault: Fix undeclared variable error in do_page_fault()) +$ 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 (e6f49e96bc57 accel/habanalabs: refactor error info reset) +$ 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 (6c50384ef8b9 hwtracing: hisi_ptt: Fix potential sleep in atomic context) +$ 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 fastrpc/for-next (ac9a78681b92 Linux 6.4-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/fastrpc.git fastrpc/for-next +Already up to date. +Merging fpga/for-next (47147d56f92e fpga: zynq-fpga: Ensure proper xCAP interface switch) +$ 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 (1400725e4515 Merge branch 'icc-qos' into icc-next) +$ git merge -m Merge branch 'icc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git icc/icc-next +Already up to date. +Merging iio/togreg (9e66fb524495 samples: Add userspace example for TI TPS6594 PFSM) +$ 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 (a454850a815e dt-bindings: phy: brcm,brcmstb-usb-phy: Fix error in "compatible" conditional schema) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next +Auto-merging Documentation/devicetree/bindings/usb/qcom,dwc3.yaml +Auto-merging drivers/phy/cadence/phy-cadence-torrent.c +Merge made by the 'ort' strategy. + .../bindings/phy/brcm,brcmstb-usb-phy.yaml | 4 +- + .../devicetree/bindings/phy/brcm,kona-usb2-phy.txt | 15 - + .../bindings/phy/brcm,kona-usb2-phy.yaml | 36 ++ + .../devicetree/bindings/phy/cdns,salvo-phy.yaml | 6 + + .../bindings/phy/fsl,imx8mq-usb-phy.yaml | 47 ++ + .../devicetree/bindings/phy/fsl,mxs-usbphy.yaml | 128 ++++ + .../devicetree/bindings/phy/intel,combo-phy.yaml | 2 +- + .../bindings/phy/mixel,mipi-dsi-phy.yaml | 9 - + .../devicetree/bindings/phy/mxs-usb-phy.txt | 33 - + .../devicetree/bindings/phy/qcom,edp-phy.yaml | 3 + + .../bindings/phy/qcom,ipq8074-qmp-pcie-phy.yaml | 2 +- + .../bindings/phy/qcom,msm8996-qmp-ufs-phy.yaml | 18 +- + .../bindings/phy/qcom,msm8996-qmp-usb3-phy.yaml | 27 - + .../devicetree/bindings/phy/qcom,qusb2-phy.yaml | 3 +- + .../bindings/phy/qcom,sa8775p-dwmac-sgmii-phy.yaml | 55 ++ + .../bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml | 4 +- + .../phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml | 65 +- + .../phy/qcom,sc8280xp-qmp-usb43dp-phy.yaml | 51 ++ + .../devicetree/bindings/phy/qcom,usb-hs-phy.yaml | 5 +- + .../bindings/phy/qcom,usb-snps-femto-v2.yaml | 1 + + .../devicetree/bindings/usb/qcom,dwc3.yaml | 21 + + drivers/phy/amlogic/phy-meson-g12a-usb2.c | 15 +- + drivers/phy/broadcom/phy-brcm-usb-init-synopsys.c | 15 +- + drivers/phy/broadcom/phy-brcm-usb-init.c | 34 + + drivers/phy/broadcom/phy-brcm-usb-init.h | 8 + + drivers/phy/cadence/phy-cadence-salvo.c | 95 ++- + drivers/phy/cadence/phy-cadence-torrent.c | 720 +++++++++++++++------ + drivers/phy/freescale/phy-fsl-imx8m-pcie.c | 4 +- + drivers/phy/freescale/phy-fsl-imx8mq-usb.c | 218 +++++++ + drivers/phy/hisilicon/Kconfig | 2 +- + drivers/phy/hisilicon/phy-hisi-inno-usb2.c | 60 +- + drivers/phy/mediatek/phy-mtk-tphy.c | 356 ++++++++++ + drivers/phy/microchip/sparx5_serdes.c | 426 +++++++----- + drivers/phy/microchip/sparx5_serdes.h | 1 - + drivers/phy/microchip/sparx5_serdes_regs.h | 106 +++ + drivers/phy/phy-core.c | 14 + + drivers/phy/qualcomm/Kconfig | 12 + + drivers/phy/qualcomm/Makefile | 3 +- + drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 263 ++++++-- + drivers/phy/qualcomm/phy-qcom-qmp-usb.c | 182 ++++++ + drivers/phy/qualcomm/phy-qcom-qusb2.c | 3 + + drivers/phy/qualcomm/phy-qcom-sgmii-eth.c | 451 +++++++++++++ + drivers/phy/samsung/Kconfig | 2 +- + drivers/phy/tegra/xusb.c | 4 + + drivers/phy/ti/phy-gmii-sel.c | 34 +- + include/linux/phy/phy.h | 2 + + 46 files changed, 3005 insertions(+), 560 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/phy/brcm,kona-usb2-phy.txt + create mode 100644 Documentation/devicetree/bindings/phy/brcm,kona-usb2-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/fsl,mxs-usbphy.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/mxs-usb-phy.txt + create mode 100644 Documentation/devicetree/bindings/phy/qcom,sa8775p-dwmac-sgmii-phy.yaml + create mode 100644 drivers/phy/qualcomm/phy-qcom-sgmii-eth.c +Merging soundwire/next (a4857d1afdd1 soundwire: stream: Make master_list ordered to prevent deadlocks) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next +Auto-merging sound/soc/sof/intel/hda.c +Merge made by the 'ort' strategy. + .../bindings/soundwire/qcom,soundwire.yaml | 39 +- + drivers/soundwire/Kconfig | 1 + + drivers/soundwire/Makefile | 3 +- + drivers/soundwire/amd_manager.c | 9 +- + drivers/soundwire/bus.c | 30 +- + drivers/soundwire/cadence_master.c | 50 ++- + drivers/soundwire/cadence_master.h | 5 + + drivers/soundwire/debugfs.c | 12 +- + drivers/soundwire/generic_bandwidth_allocation.c | 10 +- + drivers/soundwire/intel.c | 57 +-- + drivers/soundwire/intel.h | 16 + + drivers/soundwire/intel_ace2x.c | 393 ++++++++++++++++ + drivers/soundwire/intel_ace2x_debugfs.c | 147 ++++++ + drivers/soundwire/intel_auxdevice.c | 17 + + drivers/soundwire/intel_bus_common.c | 96 ++-- + drivers/soundwire/intel_init.c | 21 +- + drivers/soundwire/qcom.c | 500 ++++++++++++++------- + drivers/soundwire/stream.c | 161 ++++--- + include/linux/soundwire/sdw.h | 6 +- + include/linux/soundwire/sdw_intel.h | 94 +++- + sound/soc/sof/intel/hda.c | 33 +- + sound/soc/sof/intel/shim.h | 1 + + 22 files changed, 1293 insertions(+), 408 deletions(-) + create mode 100644 drivers/soundwire/intel_ace2x.c + create mode 100644 drivers/soundwire/intel_ace2x_debugfs.c +Merging extcon/extcon-next (94da3da96c35 dt-bindings: extcon: wlf,arizona: drop unneeded quotes) +$ git merge -m Merge branch 'extcon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon/extcon-next +Already up to date. +Merging gnss/gnss-next (44c026a73be8 Linux 6.4-rc3) +$ git merge -m Merge branch 'gnss-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss/gnss-next +Already up to date. +Merging vfio/next (ff598081e5b9 vfio/mdev: Move the compat_class initialization to module init) +$ git merge -m Merge branch 'next' of git://github.com/awilliam/linux-vfio.git vfio/next +Already up to date. +Merging w1/for-next (b332af5398a3 w1: Replace usage of found with dedicated list iterator variable) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git w1/for-next +Already up to date. +Merging staging/staging-next (24be4d0b46bb arch/arm64/mm/fault: Fix undeclared variable error in do_page_fault()) +$ 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 (9b53a1342216 counter: Fix menuconfig "Counter support" submenu entries disappearance) +$ git merge -m Merge branch 'counter-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-next/counter-next +Already up to date. +Merging mux/for-next (44c026a73be8 Linux 6.4-rc3) +$ git merge -m Merge branch 'for-next' of https://gitlab.com/peda-linux/mux.git mux/for-next +Already up to date. +Merging dmaengine/next (907514a7dc4c dmaengine: sprd: Don't set chancnt) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next +Auto-merging MAINTAINERS +Auto-merging drivers/dma/ti/k3-udma.c +Auto-merging drivers/pci/controller/dwc/pcie-designware.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/dma/stericsson,dma40.yaml | 36 ++- + .../devicetree/bindings/dma/ti/k3-bcdma.yaml | 30 +- + .../bindings/dma/xilinx/xlnx,zynqmp-dpdma.yaml | 6 + + MAINTAINERS | 4 +- + drivers/dma/Kconfig | 1 + + drivers/dma/dma-axi-dmac.c | 1 - + drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 1 - + drivers/dma/dw-edma/Makefile | 8 +- + drivers/dma/dw-edma/dw-edma-core.c | 88 ++---- + drivers/dma/dw-edma/dw-edma-core.h | 58 ++++ + drivers/dma/dw-edma/dw-edma-pcie.c | 4 +- + drivers/dma/dw-edma/dw-edma-v0-core.c | 85 +++++- + drivers/dma/dw-edma/dw-edma-v0-core.h | 14 +- + drivers/dma/dw-edma/dw-hdma-v0-core.c | 296 ++++++++++++++++++ + drivers/dma/dw-edma/dw-hdma-v0-core.h | 17 ++ + drivers/dma/dw-edma/dw-hdma-v0-debugfs.c | 170 +++++++++++ + drivers/dma/dw-edma/dw-hdma-v0-debugfs.h | 22 ++ + drivers/dma/dw-edma/dw-hdma-v0-regs.h | 129 ++++++++ + drivers/dma/plx_dma.c | 1 - + drivers/dma/qcom/Kconfig | 1 + + drivers/dma/qcom/bam_dma.c | 18 +- + drivers/dma/qcom/hidma.c | 1 - + drivers/dma/sprd-dma.c | 1 - + drivers/dma/ste_dma40.c | 334 +++++++++------------ + .../dma-ste-dma40.h => drivers/dma/ste_dma40.h | 101 +------ + drivers/dma/ste_dma40_ll.c | 3 +- + drivers/dma/ti/k3-psil-j721s2.c | 11 + + drivers/dma/ti/k3-udma.c | 25 ++ + drivers/pci/controller/dwc/pcie-designware.c | 2 +- + include/linux/dma/edma.h | 7 +- + 30 files changed, 1074 insertions(+), 401 deletions(-) + create mode 100644 drivers/dma/dw-edma/dw-hdma-v0-core.c + create mode 100644 drivers/dma/dw-edma/dw-hdma-v0-core.h + create mode 100644 drivers/dma/dw-edma/dw-hdma-v0-debugfs.c + create mode 100644 drivers/dma/dw-edma/dw-hdma-v0-debugfs.h + create mode 100644 drivers/dma/dw-edma/dw-hdma-v0-regs.h + rename include/linux/platform_data/dma-ste-dma40.h => drivers/dma/ste_dma40.h (51%) +Merging cgroup/for-next (fd99fa7cff4d Merge branch 'for-6.5' 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 (c725787c2bdf Merge branch 'misc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi/for-next +Auto-merging drivers/scsi/smartpqi/smartpqi_init.c +Merge made by the 'ort' strategy. + drivers/scsi/lpfc/lpfc_hw.h | 10 +++++----- + drivers/scsi/ncr53c8xx.c | 2 +- + drivers/scsi/smartpqi/smartpqi.h | 4 ++-- + drivers/scsi/smartpqi/smartpqi_init.c | 5 ++--- + drivers/target/target_core_user.c | 4 ++-- + 5 files changed, 12 insertions(+), 13 deletions(-) +Merging scsi-mkp/for-next (24033d71cc36 scsi: ufs: core: Remove unused function declaration) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-mkp/for-next +Auto-merging drivers/target/target_core_iblock.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/ufs/qcom,ufs.yaml | 9 +- + Documentation/target/scripts.rst | 6 - + Documentation/target/tcm_mod_builder.py | 656 --------------------- + drivers/scsi/isci/scu_task_context.h | 2 +- + drivers/scsi/scsi.c | 37 +- + drivers/target/target_core_iblock.c | 2 +- + drivers/ufs/core/ufshcd-priv.h | 1 - + 7 files changed, 20 insertions(+), 693 deletions(-) + delete mode 100755 Documentation/target/tcm_mod_builder.py +Merging vhost/linux-next (373abdba01d4 vdpa_sim: offer VHOST_BACKEND_F_ENABLE_AFTER_DRIVER_OK) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next +Auto-merging drivers/net/virtio_net.c +CONFLICT (content): Merge conflict in drivers/net/virtio_net.c +Auto-merging drivers/vhost/vdpa.c +Resolved 'drivers/net/virtio_net.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master a6bd0e00558f] Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git +$ git diff -M --stat --summary HEAD^.. + drivers/net/virtio_net.c | 163 +++++++++++-- + drivers/vdpa/vdpa_sim/vdpa_sim.c | 8 + + drivers/vhost/vdpa.c | 15 +- + drivers/virtio/virtio_ring.c | 491 ++++++++++++++++++++++++++++++++++----- + include/linux/vdpa.h | 4 + + include/linux/virtio.h | 34 +++ + include/uapi/linux/vhost_types.h | 4 + + 7 files changed, 641 insertions(+), 78 deletions(-) +Merging rpmsg/for-next (81aceef4b71d Merge branches 'hwspinlock-next' and 'rproc-next' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next +Merge made by the 'ort' strategy. +Merging gpio/for-next (ac9a78681b92 Linux 6.4-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 (0ff9f5e57c5b of: unittest: drop assertions for GPIO hog messages) +$ 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 (ac9a78681b92 Linux 6.4-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel/for-next +Already up to date. +Merging pinctrl/for-next (9f0648f13e34 Merge tag 'intel-pinctrl-v6.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel into devel) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next +Already up to date. +Merging pinctrl-intel/for-next (9314d0530276 pinctrl: cherryview: Drop goto label) +$ 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 (5d32cead772c pinctrl: renesas: Fix spaces followed by tabs) +$ 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 (ac9a78681b92 Linux 6.4-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 (92554cdd428f dt-bindings: pwm: convert pwm-bcm2835 bindings to YAML) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git pwm/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/pwm/imx-pwm.yaml | 4 + + .../bindings/pwm/mediatek,mt2712-pwm.yaml | 1 + + .../devicetree/bindings/pwm/pwm-bcm2835.txt | 30 -- + .../devicetree/bindings/pwm/pwm-bcm2835.yaml | 43 ++ + Documentation/devicetree/bindings/pwm/pwm.yaml | 2 +- + .../devicetree/bindings/pwm/renesas,pwm-rcar.yaml | 1 + + MAINTAINERS | 1 + + drivers/pwm/Kconfig | 21 + + drivers/pwm/Makefile | 2 + + drivers/pwm/pwm-ab8500.c | 2 +- + drivers/pwm/pwm-clk.c | 12 +- + drivers/pwm/pwm-imx-tpm.c | 7 + + drivers/pwm/pwm-mediatek.c | 41 +- + drivers/pwm/pwm-meson.c | 212 ++++---- + drivers/pwm/pwm-microchip-core.c | 507 +++++++++++++++++++ + drivers/pwm/pwm-mtk-disp.c | 13 +- + drivers/pwm/pwm-pca9685.c | 2 +- + drivers/pwm/pwm-rz-mtu3.c | 551 +++++++++++++++++++++ + drivers/pwm/pwm-sifive.c | 7 +- + drivers/pwm/sysfs.c | 17 + + 20 files changed, 1303 insertions(+), 173 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/pwm/pwm-bcm2835.txt + create mode 100644 Documentation/devicetree/bindings/pwm/pwm-bcm2835.yaml + create mode 100644 drivers/pwm/pwm-microchip-core.c + create mode 100644 drivers/pwm/pwm-rz-mtu3.c +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 (8cd0d8633e2d selftests/ftace: Fix KTAP output ordering) +$ 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 (ac9a78681b92 Linux 6.4-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 (2e66833579ed MAINTAINERS: Add source tree entry for kunit) +$ 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 (ac4890f97211 Merge branch 'for-6.5/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 (1b733a9ebc3d rtc: Add rtc driver for the Loongson family chips) +$ 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 (1ea7ca1b0901 dax: enable dax fault handler to report VM_FAULT_HWPOISON) +$ 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 (a3c10035d12f eeprom: at24: Use dev_err_probe for nvmem register failure) +$ 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 +Auto-merging drivers/pci/endpoint/functions/pci-epf-vntb.c +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 (f373d301908a perf/benchmark: add a new benchmark for seccom_unotify) +$ git merge -m Merge branch 'for-next/seccomp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git seccomp/for-next/seccomp +Auto-merging kernel/sched/core.c +Auto-merging kernel/sched/fair.c +Auto-merging kernel/sched/sched.h +Auto-merging kernel/sched/wait.c +Auto-merging tools/perf/builtin-bench.c +Merge made by the 'ort' strategy. + include/linux/completion.h | 1 + + include/linux/swait.h | 2 +- + include/linux/wait.h | 3 + + include/uapi/linux/seccomp.h | 4 + + kernel/sched/completion.c | 26 ++-- + kernel/sched/core.c | 5 +- + kernel/sched/fair.c | 4 + + kernel/sched/sched.h | 13 +- + kernel/sched/swait.c | 8 +- + kernel/sched/wait.c | 5 + + kernel/seccomp.c | 72 ++++++++++- + tools/arch/x86/include/uapi/asm/unistd_32.h | 3 + + tools/arch/x86/include/uapi/asm/unistd_64.h | 3 + + tools/perf/bench/Build | 1 + + tools/perf/bench/bench.h | 1 + + tools/perf/bench/sched-seccomp-notify.c | 178 ++++++++++++++++++++++++++ + tools/perf/builtin-bench.c | 1 + + tools/testing/selftests/seccomp/seccomp_bpf.c | 55 ++++++++ + 18 files changed, 357 insertions(+), 28 deletions(-) + create mode 100644 tools/perf/bench/sched-seccomp-notify.c +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 (ac9a78681b92 Linux 6.4-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 (ac1c0d15aedc nvmem: core: add support for fixed cells *layout*) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git nvmem/for-next +Auto-merging Documentation/devicetree/bindings/nvmem/imx-ocotp.yaml +Auto-merging Documentation/devicetree/bindings/nvmem/qcom,qfprom.yaml +Merge made by the 'ort' strategy. +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 (def85dce1451 auxdisplay: Switch i2c drivers back to use .probe()) +$ git merge -m Merge branch 'auxdisplay' of https://github.com/ojeda/linux.git auxdisplay/auxdisplay +Already up to date. +Merging kgdb/kgdb/for-next (b6464883f45a kdb: move kdb_send_sig() declaration to a better header file) +$ 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 (ac9a78681b92 Linux 6.4-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 (6bb6aba2f57a bus: mhi: host: pci_generic: Add support for Quectel EM160R-GL modem) +$ git merge -m Merge branch 'mhi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git mhi/mhi-next +Merge made by the 'ort' strategy. + drivers/bus/mhi/host/pci_generic.c | 28 ++++++++++++++++++++++++---- + drivers/bus/mhi/host/pm.c | 5 +++++ + 2 files changed, 29 insertions(+), 4 deletions(-) +Merging memblock/for-next (de649e7f5edb memblock: Update nid info in memblock debugfs) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock/for-next +Already up to date. +Merging cxl/next (fe77cc2e5a6a cxl: Fix one kernel-doc comment) +$ 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 (2e28a798c309 efi/libstub: Disable PCI DMA before grabbing the EFI memory map) +$ 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 (7bc162d5cc4d Merge branches 'slab/for-6.5/prandom', 'slab/for-6.5/slab_no_merge' and 'slab/for-6.5/slab-deprecate' 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 (35ca42399297 selftests/landlock: Add hostfs tests) +$ 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 (d2e3115d7171 rust: error: `impl Debug` for `Error` with `errname()` integration) +$ 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 (5664eaac4dcf sysctl: fix unused proc_cap_handler() function warning) +$ git merge -m Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git sysctl/sysctl-next +Merge made by the 'ort' strategy. +Merging execve/for-next/execve (aa88054b7090 binfmt_elf: fix comment typo s/reset/regset/) +$ 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 (2a3110e3f97d MAINTAINERS: Add bitfield.h to the BITMAP API record) +$ git merge -m Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git bitmap/bitmap-for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 6 ++++++ + include/linux/bitmap.h | 8 +++----- + include/linux/nodemask.h | 2 +- + lib/bitmap.c | 2 +- + lib/cpumask.c | 2 +- + lib/test_bitmap.c | 18 +++++++++++++++--- + 6 files changed, 27 insertions(+), 11 deletions(-) +Merging hte/for-next (ac9a78681b92 Linux 6.4-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git hte/for-next +Already up to date. +Merging kspp/for-next/kspp (5e2956ee4624 Revert "fortify: Allow KUnit test to build without FORTIFY") +$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git kspp/for-next/kspp +Auto-merging lib/Kconfig.debug +Merge made by the 'ort' strategy. + drivers/md/dm-verity-loadpin.c | 3 +++ + lib/Kconfig.debug | 2 +- + lib/fortify_kunit.c | 14 -------------- + 3 files changed, 4 insertions(+), 15 deletions(-) +Merging kspp-gustavo/for-next/kspp (40ca06d71d60 uapi: wireless: Replace zero-length array with flexible-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 (f1fcbaa18b28 Linux 6.4-rc2) +$ 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..cd817667c2f9 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20230705 |