diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2023-07-11 12:13:24 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2023-07-11 12:13:24 +1000 |
| commit | 8e4b7f2f3d6071665b1dfd70786229c8a5d6c256 (patch) | |
| tree | be61c357bbd91281f981fe9b364f04dc6034a12f | |
| parent | c5c8a8fa4c2e8c1b8d7936fdcc62df85efc6d93c (diff) | |
Add linux-next specific files for 20230711next-20230711
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 361 | ||||
| -rw-r--r-- | Next/Trees | 363 | ||||
| -rw-r--r-- | Next/merge.log | 2572 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 3297 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..4a559fdb2a37 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,361 @@ +Name SHA1 +---- ---- +origin 3f01e9fed8454dcd89727016c3e5b2fbb8f8e50c +fixes d528014517f2b0531862c02865b9d4c908019dc4 +mm-hotfixes 9158b6f95186f2a467a5b9ce6a0944d8ce92c4b6 +kbuild-current c17414a273b81fe4e34e11d69fc30cc8b1431614 +arc-current 30a0b95b1335e12efef89dd78518ed3e4a71a763 +arm-current 2b951b0efbaa6c805854b60c11f08811054d50cd +arm64-fixes 0e2aba694866b451db0932a6706683c48379134c +arm-soc-fixes 6722e46513e0af8e2fff4698f7cb78bc50a9f13f +davinci-current 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +drivers-memory-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +tee-fixes ceaa837f96adb69c0df0397937cd74991d5d821a +m68k-current 4055eabe04a26f5d113b5a02588b20b5e166a753 +powerpc-fixes cf53564b11cef5cdfafc548b172345c9aa753f89 +s390-fixes ad3d770b83afffd10abf624ec80c408254343a20 +sparc 2d2b17d08bfc3d98cf93622e8c6543eaaf02dabe +fscrypt-current 4bcf6f827a79c59806c695dc280e763c5b6a6813 +fsverity-current a075bacde257f755bea0e53400c9f1cdd1b8e8e6 +net 9d0aba98316d00f9c0a4506fc15f5ed9241bc1fd +bpf 496720b7cfb6574a8f6f4d434f23e3d1e6cfaeb9 +ipsec d1e0e61d617ba17aa516db707aa871387566bbf7 +netfilter 9d0aba98316d00f9c0a4506fc15f5ed9241bc1fd +ipvs 1a7d09a737a09297e77d9cd575cfe7d1bd14aad9 +wireless f1a0898b5d6a77d332d036da03bad6fa9770de5b +wpan 9a43827e876c9a071826cc81783aa2222b020f1d +rdma-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +sound-current 35bc3efb3157cc5a9c3b5853591c4dcef40f6029 +sound-asoc-fixes f186c31c04a04730bac6a986933542011294b2b0 +regmap-fixes c8e796895e2310b6130e7577248da1d771431a77 +regulator-fixes 701c1cef8e02ec910fede638b02a7506608450a4 +spi-fixes d0e1c60318ac4ab2c5e275773696a9937ffe98a6 +pci-current 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +driver-core.current 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +tty.current 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +usb.current 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +usb-serial-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +phy 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +staging.current 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +iio-fixes 3af5d5b9a262ff72feb5d2178219afab9c6dfe28 +counter-current 9b53a13422162feac7c7ee58e5bc0e0a80a41963 +char-misc.current 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +soundwire-fixes a06d6088cfd49b63a2759910f2328ba28d6a342d +thunderbolt-fixes 6995e2de6891c724bfeb2db33d7b87775f913ad1 +input-current 2479191c30fe90c368fd6c8842e9846959466ccd +crypto-current 0b7ec177b589842c0abf9e91459c83ba28d32452 +vfio-fixes 4752354af71043e6fd72ef5490ed6da39e6cab4a +kselftest-fixes dbcf76390eb9a65d5d0c37b0cd57335218564e37 +modules-fixes f412eef03938d3a40d4f6f5a79d0f98ed89b596d +dmaengine-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +backlight-fixes 88603b6dc419445847923fcb7fe5080067a30f98 +mtd-fixes c4d28e30a8d0b979e4029465ab8f312ab6ce2644 +mfd-fixes 88603b6dc419445847923fcb7fe5080067a30f98 +v4l-dvb-fixes ec21a38df77a5aefbd2f70c48127003b6f259cf3 +reset-fixes 3a2390c6777e3f6662980c6cfc25cafe9e4fef98 +mips-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +at91-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +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 9ecedaf6f82acf9e0d68932da2a72aefcf0b7176 +samsung-krzk-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +pinctrl-samsung-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +devicetree-fixes 7e08baf6a89c8758050a3593aedc949f44fe3413 +dt-krzk-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +scsi-fixes 9cefd6e7e0a77b0fbca5c793f6fb6821b0962775 +drm-fixes 9bd9be5cbaf8a8faa175ef4fba04a5623281debe +drm-intel-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +mmc-fixes fa700d73494abbd343c47c6f54837c9874c61bbe +rtc-fixes 08279468a294d8c996a657ecc9e51bd5c084c75d +gnss-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +hyperv-fixes 55e544e1a922d272b62ec576a3de92329f838ce9 +soc-fsl-fixes 4b0986a3613c92f4ec1bdc7f60ec66fea135991f +risc-v-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +riscv-dt-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +riscv-soc-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +fpga-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +spdx 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +gpio-brgl-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +gpio-intel-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +pinctrl-intel-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +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 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +uml-fixes 73a23d7710331a530e972903318528b75e5a5f58 +asahi-soc-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +iommufd-fixes dbe245cdf5189e88d680379ed13901356628b650 +rust-fixes ac9a78681b921877518763ba0e89202254349d1b +v9fs-fixes 95f41d87810083d8b3dedcce46a4e356cf4a9673 +w1-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +drm-misc-fixes a2848d08742c8e8494675892c02c0d22acbe3cf8 +mm-stable fd3006d2d0e735c460f69fa0ce551530334d27f6 +mm-nonmm-stable e9be1d1c50e3572ddf0bdceee6c63911011cc835 +mm 814b54113dca3d1488a7eff0fd3bb93876135448 +kbuild c17414a273b81fe4e34e11d69fc30cc8b1431614 +clang-format 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +perf bcd981db12e6d26111609802fc7c358f30a8c72a +compiler-attributes eeac8ede17557680855031c6f305ece2378af326 +dma-mapping 8ac04063354a01a484d2e55d20ed1958aa0d3392 +asm-generic 4dd595c34c4bb22c16a76206a18c13e4e194335d +arc 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +arm 1faf70485ea9b3209620bfbdd74ccd9b49e2fdba +arm64 893b24181b4c4bf1fa2841b1ed192e5413a97cb1 +arm-perf dea0f4146f66a242450b29fae4d643bd5318c511 +arm-soc 6722e46513e0af8e2fff4698f7cb78bc50a9f13f +amlogic 76483eaf2109fc3d94f29c68ff9dee6579e95ccf +asahi-soc eaf935fa48ec826f7c564c269a607cb4fba082b3 +aspeed a43f3e970a1d8f7b2f5729fcf7af9985dd0d6a0d +at91 47508c7ba8db77b69de61aae67709799aa9c5d77 +broadcom df928e5b5570a4cc50ef97e76d07bb11ff094f7b +davinci 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +drivers-memory d1478aea649e739a0a0e4890cd8b049ae5d08c13 +imx-mxs 89c016c82e46c2bf4d9ce1cb1f233212c7c4990d +mediatek f6925844c82ae23165097eb14e272f76b855fb5d +mvebu 703b10801b445c2334f8628dfc38cae2d2137844 +omap f581c395fcb821a0acc17c7fa8728752c021156a +qcom 6faff7e892237232ddc8d6071a591198df2d9a30 +renesas b74c024d8fc777c36dfb2aa02aed3f7dc4e4bd81 +reset afb39e2bd36af1d80913bb6851caece829526217 +rockchip 37a0a70b13a35150d28edca6553daae0ef2cc537 +samsung-krzk f822ca9191811f991af0256d709942a721f6aff0 +scmi 83ff850e73baa6a5c62cf3251d609b470889f5da +stm32 f0f0682c384d81bf25e6f8b23971fb8f69122f72 +sunxi 1bcb932283c9664a2bc57bb74864b9ab0050981b +tee 6a8b7e80105416cc7324fda295608ea2d3f98862 +tegra 3281fba16642cb88fe7b051c3f95cfad0307d46b +ti b0f8e128b3b41d8feae11cb8f72689fcb27ac04d +xilinx 6008eee2c754529d16d41acb0b81d471f3ff40c6 +clk f679e89acdd3e825995a84b1b07e2ea33ea882ee +clk-imx 878b02d5f3b56cb090dbe2c70c89273be144087f +clk-renesas 63370298426b850220bba40012fb801a48c5fd14 +csky dd64621a2a97798d5df40028238a703d4324036b +loongarch 06351cc358eae676965131f8ed82b6a449918636 +m68k 4055eabe04a26f5d113b5a02588b20b5e166a753 +m68knommu 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +microblaze fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +mips 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +openrisc dceaafd668812115037fc13a1893d068b7b880f5 +parisc-hd 6995e2de6891c724bfeb2db33d7b87775f913ad1 +powerpc 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +soc-fsl fb9c384625dd604e8a5be1f42b35e83104b90670 +risc-v 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +riscv-dt 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +riscv-soc 1fcaaa1d489c33a24e297cd26646887bfab8d659 +s390 b0324ab87db7920dd880de485ed6df2840e4a3a2 +sh 7497840d462c8f54c4888c22ab3726a8cde4b9a2 +uml 6032aca0deb9c138df122192f8ef02de1fdccf25 +xtensa b4e8c8a6bdd29177123464afcf99aba13d0899a2 +pidfd a901a3568fd26ca9c4a82d8bc5ed5b3ed844d451 +fscrypt d617ef039fb8eec48a3424f79327220e0b7cbff7 +afs 0a278bc196e784b4849c1581266421adbca1989f +btrfs 20e0c0a8e8effec62213bf24565a900dad4eb05f +ceph 257e6172ab36ebbe295a6c9ee9a9dd0fe54c1dc2 +cifs d8e2fe53dbdc8b6b381401207933a72d79181782 +configfs 77992f896745c63ae64bfccfdc429ab7b3d88da5 +ecryptfs a3d78fe3e1ae8c6a1901635c54a1a799656f72c8 +erofs 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +exfat fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +ext3 eccf9ae283126b6eeca01600b757d1877a870d73 +ext4 2ef6c32a914b85217b44a0a2418e830e520b085e +f2fs 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +fsverity 672d6ef4c775cfcd2e00172e23df34e77e495e85 +fuse 6a567e920fd0451bf29abc418df96c3365925770 +gfs2 94c76955e86a5a4f16a1d690b66dcc268c156e6a +jfs 95e2b352c03b0a86c5717ba1d24ea20969abcacc +ksmbd 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +nfs 5b4a82a0724af1dfd1320826e0266117b6a57fbd +nfs-anna 43439d858bbae244a510de47f9a55f667ca4ed52 +nfsd b1c93d0e302a9fa7c3c558f7a7d13a1a71f7ba25 +ntfs3 44b4494d5c5971dc8f531c8783d90a637e862880 +orangefs 31720a2b109b3080eb77e97b8f6f50a27b4ae599 +overlayfs 0a3bf81dbcb228124c9de72c85c442a81d70ab1e +ubifs b5fda08ef213352ac2df7447611eb4d383cce929 +v9fs 4ec5183ec48656cec489c49f989c508b68b518e3 +v9fs-ericvh 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +xfs ed04a91f718e6e1ab82d47a22b26e4b50c1666f6 +zonefs 8812387d056957355ef1d026cd38bed3830649db +iomap 447a0bc108e4bae4c1ea845aacf43c10c28814e8 +djw-vfs a79168a0c00d710420c1758f6c38df89e12f0763 +file-locks 0d6aeec73f8cd3290662748a4fb1bded1e5bb5c7 +iversion 63355b9884b3d1677de6bd1517cd2b8a9bf53978 +vfs-brauner b48f591aff4a4656ac5e7b430b55deab4cbee6b8 +vfs cff4b23c731a1cbdf39d5ce180196b8dffb6c411 +printk 16bff6f075a1055a0084c8a05fd4a0c4ab4b3607 +pci 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +pstore d97038d5ec2062733c1e016caf9baaf68cf64ea1 +hid 5eb5c80feb93316ff0f659f386025ec492c6fad7 +i2c 6537ed3904a3b3720e5e238dd5d542448fcf94c2 +i3c 49b472ebc61de3d4aa7cc57539246bb39f6c5128 +dmi 13a0ac816d22aa47d6c393f14a99f39e49b960df +hwmon-staging 4dbbaf8fbdbd13adc80731b2452257857e4c2d8b +jc_docs 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +v4l-dvb 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +v4l-dvb-next 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +pm 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +cpufreq-arm 5ee64250286e8c5162808667a9a8668488d9f577 +cpupower 25891bc945f715d2a796fc60d0000d0aaf9582a1 +devfreq a83bfdca8b2098999e3edfb87e98925e019eb818 +opp 5fb2864cbd50a84a73af4fdd900b31f2daddea34 +thermal 57c9eaa4de537e6f08819d9214de502cac5a989c +dlm fc4ea4229c2b2dca0bffc12eee6973e353c20086 +rdma 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +net-next 6843306689aff3aea608e4d2630b2a5a0137f827 +bpf-next a3cbc8efc78b73c4c8839a2fc4e22607b86cc3d8 +ipsec-next a94fd40a18ae76ba76dbaa8eca0e3c46aa1142c1 +mlx5-next 77f7eb9f3416aace703971156133926e44e2195b +netfilter-next 61dc651cdfe85066e1371dd1bd8aee685bd6ec75 +ipvs-next 61dc651cdfe85066e1371dd1bd8aee685bd6ec75 +bluetooth c9a85685d0c13f9e8b52e70987a37b6871cee79b +wireless-next 31b5a547622b3782388eb676081da1eefe5b98d2 +wpan-next 18b849f12dcc34ec4cb9c8fadeb503b069499ba4 +wpan-staging 18b849f12dcc34ec4cb9c8fadeb503b069499ba4 +mtd cf431a5998326a0468532a188a188ac2c8e9c55d +nand ad5c18c75d2a1de9eeaed60e417d308217f35e73 +spi-nor df6def86b9dcbc3e8ed4964c7b79b70c9b0c3040 +crypto 486bfb05913ac9969a3a71a4dc48f17f31cb162d +drm 6725f33228077902ddac2a05e0ab361dee36e4ba +drm-misc 59bba51ec2a50e3dc5c3ee80f0a23207346303ff +amdgpu 6dda3f18bdbdc4a836980b31fdb711019a340f97 +drm-intel 8290bcee57dee29dde0ce005968691fa811d87ed +drm-tegra 2429b3c529da29d4277d519bd66d034842dcd70c +drm-msm cd036d542afb82adfbbd43c5dbeb7010e8e91ee7 +drm-msm-lumag 452c46ccf603ab181e7d0866f3137e3ae62b5f49 +etnaviv 295b6c02f84b81971c42b592771920783fc181cd +fbdev c1cd7a7a231a26c61534ae0ced078c8faa39c2a0 +regmap 1e897fca0b3b1ff7516e09f159c674b99c101d4f +sound fbb64eedf5a3a98071ee75808cfc1367d1e75783 +ieee1394 3ff256751a2853e1ffaa36958ff933ccc98c6cb5 +sound-asoc f186c31c04a04730bac6a986933542011294b2b0 +modules 9ce170cef66916526dcaa868a67cfcc0c2f0c3d6 +input dd24e202ac722b3fea1fadb7f6c0b2db61086e78 +block b6202765bf6ecf033104cf767ade76d2b3a4cdcf +device-mapper 7aa303bf1bd244cd4c6d9f2f3f543f74f033166e +libata fd3ac6e8049799ca7dbd2738de8e149536e92a5e +pcmcia 15e74c6c1ce2d388e967f32cdaa83ca034fa6452 +mmc 06b5d4fea89cd699408af12c14b6915d77ceffb0 +mfd b05740d71bd2f8b2261930944bfe95f529190b8b +backlight a33677b9211b6c328ad359b072043af94f7c9592 +battery 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +regulator 701c1cef8e02ec910fede638b02a7506608450a4 +security c31288e56c1a7bb57a1be1f9f6f3faacbeddeff6 +apparmor afad53575a938ceb557227ecfeb0dda59d668d4e +integrity 95526d13038c2bbddd567a4d8e39fac42484e182 +safesetid 64b634830c919979de4b18163e15d30df66e64a8 +selinux 5b0eea835d4e9cb5229e696c5763929fc2394f39 +smack 2c085f3a8f23c9b444e8b99d93c15d7ce870fc4e +tomoyo 1c7873e3364570ec89343ff4877e0f27a7b21a61 +tpmdd 8d83dede85aa5e201a1691313f9769fdace0617e +watchdog 2500df55a615f2f177bacf1a261f927790a137db +iommu a7a334076dd725b8c3b5d64f68e3992ffcfd1d25 +audit 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +devicetree 31e9f406efae513156c129e9f7ad16b9f0ec7a65 +dt-krzk 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +mailbox 1b712f18c461bd75f018033a15cf381e712806b5 +spi d0e1c60318ac4ab2c5e275773696a9937ffe98a6 +tip ac442f6a364dd23bc08086f07b4bc4ef8476a9fe +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 ace3c5499e61ef7c0433a7a297227a9bdde54a55 +drivers-x86 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +chrome-platform 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +hsi 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +leds 1b929c02afd37871d5afb9d498426f83432e71c2 +leds-lj 877e91191ccf0782ae18c5dfa7522fb1e5bfba8c +ipmi b02bb79eee074f07acdfde540f2d4fe2a04471d8 +driver-core 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +usb 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +thunderbolt 481012b479fe6d8dd4e01d739c359a8d99d074a9 +usb-serial 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +tty 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +char-misc 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +accel e6f49e96bc57d34fc0f617f37bfdf62a9b58d2c2 +coresight 6c50384ef8b94a527445e3694ae6549e1f15d859 +fastrpc 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +fpga e9fdc41a3d66c7602b524a248d3b4ec7c430cb92 +icc 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +iio 9e66fb52449538406cea43e9f3889c391350e76e +phy-next 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +soundwire 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +extcon 94da3da96c35744001adfdb65e501e633a64cb51 +gnss 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +vfio ff598081e5b9d0bdd6874bfe340811bbb75b35e4 +w1 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +staging 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +counter-next 9b53a13422162feac7c7ee58e5bc0e0a80a41963 +mux 44c026a73be8038f03dbdeef028b642880cf1511 +dmaengine 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +cgroup 3ae0b773211ed0231e7ee3e8d28ec4ab9bc5134b +scsi e0d21060a8f63582e15f94c9bd613d449791655c +scsi-mkp a97ccaa4f04396c594c25877fd2b78cc5baea4ed +vhost 373abdba01d4a975390a8ef1d2265cdcaa51aa33 +rpmsg 81aceef4b71d2c93a5d28b3f9a3a9dce5fecb284 +gpio ac9a78681b921877518763ba0e89202254349d1b +gpio-brgl d16e0b0e798700b036ad2701ce70525a6fbea8ea +gpio-intel 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +pinctrl 3bc551a3007a751a53bfba5b37fa16157f4fb861 +pinctrl-intel 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +pinctrl-renesas bf8da305fef96b3384194e7c14a3ce8c8a0af91b +pinctrl-samsung 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +pwm 92554cdd428fce212d2a71a06939e7cab90f7c77 +userns 05bd6e0242b4c059ec6797e3d721ecca6d15ff8d +ktest 7dc8e24f0e09834341f84d37433840b353d64bc8 +kselftest 8cd0d8633e2de4e6dd9ddae7980432e726220fdb +kunit ac9a78681b921877518763ba0e89202254349d1b +kunit-next 2e66833579ed759d7b7da1a8f07eb727ec6e80db +livepatching ac4890f972116f84253934570b2c2a74e50227f3 +rtc 1b733a9ebc3d8011ca66ec6ff17f55a440358794 +nvdimm 1ea7ca1b090145519aad998679222f0a14ab8fce +at24 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +ntb 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +seccomp f373d301908a99ec62a4e12a356b69226f7689d0 +fsi 35af9fb49bc5c6d61ef70b501c3a56fe161cce3e +slimbus 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +nvmem 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +xarray 69cb69ea55420388b444ee30b1530ec15ab584f7 +hyperv a494aef23dfc732945cb42e22246a5c31174e4a5 +auxdisplay def85dce1451ec276b8047da2010b6e6a159c2b6 +kgdb b6464883f45ae6412de33e53587974fd86ba811e +hmm 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +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 01f23c5f1526f5b6ff744887aa511b9e69d4401b +kspp-gustavo 40ca06d71d60677a8424798610c97a46e4140a21 +iommufd f1fcbaa18b28dec10281551dfe6ed3a3ed80e3d6 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..137250847e73 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,363 @@ +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/netfilter/nf.git#main +ipvs git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git#main +wireless git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git#for-next +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 +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 +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/netfilter/nf-next.git#main +ipvs-next git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#main +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +wireless-next git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git#for-next +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 +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 +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..267eb48cc029 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,2572 @@ +$ date -R +Tue, 11 Jul 2023 09:09:23 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 06c2afb862f9 Linux 6.5-rc1 +Merging origin/master (3f01e9fed845 Merge tag 'linux-watchdog-6.5-rc2' of git://www.linux-watchdog.org/linux-watchdog) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating 06c2afb862f9..3f01e9fed845 +Fast-forward (no commit created; -m option ignored) + .../bindings/watchdog/loongson,ls1x-wdt.yaml | 42 ++++++++++++++++++++++ + crypto/af_alg.c | 7 ++-- + crypto/algif_hash.c | 4 ++- + crypto/asymmetric_keys/public_key.c | 20 ++++++++--- + 4 files changed, 64 insertions(+), 9 deletions(-) + create mode 100644 Documentation/devicetree/bindings/watchdog/loongson,ls1x-wdt.yaml +Merging fixes/fixes (d528014517f2 Revert ".gitignore: ignore *.cover and *.mbx") +$ 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 (9158b6f95186 mm-shmem-fix-race-in-shmem_undo_range-w-thp-fix) +$ git merge -m Merge branch 'mm-hotfixes-unstable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-hotfixes/mm-hotfixes-unstable +Merge made by the 'ort' strategy. + kernel/sys.c | 10 +++++----- + mm/memory.c | 3 +++ + mm/shmem.c | 19 ++++++++++++++++++- + tools/testing/selftests/Makefile | 21 +-------------------- + tools/testing/selftests/lib.mk | 40 +++------------------------------------- + 5 files changed, 30 insertions(+), 63 deletions(-) +Merging kbuild-current/fixes (c17414a273b8 Merge tag 'sh-for-v6.5-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux) +$ 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 (6722e46513e0 bus: ixp4xx: fix IXP4XX_EXP_T1_MASK) +$ 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 (06c2afb862f9 Linux 6.5-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 (06c2afb862f9 Linux 6.5-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 (cf53564b11ce powerpc/mm/book3s64/hash/4k: Add pmd_same callback for 4K page size) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc-fixes/fixes +Merge made by the 'ort' strategy. + arch/powerpc/include/asm/book3s/64/hash-4k.h | 6 ----- + arch/powerpc/include/asm/book3s/64/hash-64k.h | 5 ---- + arch/powerpc/include/asm/book3s/64/hash.h | 5 ++++ + arch/powerpc/kernel/exceptions-64e.S | 31 ++++++++++++---------- + arch/powerpc/kernel/security.c | 37 ++++++++++++++------------- + arch/powerpc/mm/book3s64/hash_native.c | 13 +++++++--- + 6 files changed, 51 insertions(+), 46 deletions(-) +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 (9d0aba98316d gve: unify driver name usage) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/main +Merge made by the 'ort' strategy. + drivers/net/dsa/ocelot/felix.c | 9 +- + drivers/net/dsa/ocelot/felix.h | 1 - + drivers/net/dsa/ocelot/felix_vsc9959.c | 59 ++++--- + drivers/net/dsa/qca/qca8k-8xxx.c | 3 + + drivers/net/ethernet/broadcom/bgmac.c | 4 +- + drivers/net/ethernet/google/gve/gve.h | 1 + + drivers/net/ethernet/google/gve/gve_ethtool.c | 5 +- + drivers/net/ethernet/google/gve/gve_main.c | 11 +- + drivers/net/ethernet/intel/ice/ice_main.c | 23 ++- + drivers/net/ethernet/intel/ice/ice_tc_lib.c | 22 +-- + drivers/net/ethernet/intel/ice/ice_tc_lib.h | 1 + + drivers/net/ethernet/intel/igc/igc.h | 7 + + drivers/net/ethernet/intel/igc/igc_ethtool.c | 2 + + drivers/net/ethernet/intel/igc/igc_main.c | 74 +++++++-- + drivers/net/ethernet/intel/igc/igc_ptp.c | 25 ++- + drivers/net/ethernet/intel/igc/igc_tsn.c | 42 +++-- + drivers/net/ethernet/marvell/mvneta.c | 4 +- + drivers/net/ethernet/marvell/octeontx2/af/ptp.c | 19 ++- + drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 2 +- + .../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 11 +- + .../ethernet/marvell/octeontx2/af/rvu_npc_hash.c | 23 ++- + .../mellanox/mlx5/core/en/fs_tt_redirect.c | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c | 14 +- + drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.h | 1 + + drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c | 3 +- + .../ethernet/mellanox/mlx5/core/en_accel/fs_tcp.c | 1 + + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 44 +++--- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 3 + + drivers/net/ethernet/mellanox/mlx5/core/thermal.c | 19 ++- + drivers/net/ethernet/microchip/Kconfig | 2 +- + drivers/net/ethernet/mscc/ocelot.c | 1 - + drivers/net/ethernet/mscc/ocelot_mm.c | 14 +- + .../net/ethernet/pensando/ionic/ionic_bus_pci.c | 6 - + drivers/net/ethernet/pensando/ionic/ionic_lif.c | 5 - + drivers/net/wireless/mediatek/mt76/mt7921/dma.c | 4 - + drivers/net/wireless/mediatek/mt76/mt7921/mcu.c | 8 - + drivers/net/wireless/mediatek/mt76/mt7921/pci.c | 8 + + drivers/s390/net/ism_drv.c | 153 +++++++++--------- + include/linux/ism.h | 7 +- + include/net/netfilter/nf_conntrack_tuple.h | 3 + + include/net/netfilter/nf_tables.h | 31 +++- + include/soc/mscc/ocelot.h | 9 +- + net/core/net-traces.c | 2 + + net/core/skbuff.c | 5 + + net/ipv6/addrconf.c | 3 +- + net/ipv6/icmp.c | 5 +- + net/ipv6/udp.c | 4 +- + net/netfilter/nf_conntrack_core.c | 20 +-- + net/netfilter/nf_conntrack_helper.c | 4 + + net/netfilter/nf_conntrack_proto_gre.c | 10 +- + net/netfilter/nf_tables_api.c | 174 +++++++++++++-------- + net/netfilter/nft_byteorder.c | 14 +- + net/netfilter/nft_flow_offload.c | 6 +- + net/netfilter/nft_immediate.c | 8 +- + net/netfilter/nft_objref.c | 8 +- + net/sched/act_api.c | 2 +- + net/sched/cls_fw.c | 10 +- + 59 files changed, 595 insertions(+), 382 deletions(-) +Merging bpf/master (496720b7cfb6 Merge branch 'Fix for check_max_stack_depth') +$ 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. + kernel/bpf/verifier.c | 5 +-- + .../selftests/bpf/prog_tests/async_stack_depth.c | 9 +++++ + .../selftests/bpf/progs/async_stack_depth.c | 40 ++++++++++++++++++++++ + 3 files changed, 52 insertions(+), 2 deletions(-) + create mode 100644 tools/testing/selftests/bpf/prog_tests/async_stack_depth.c + create mode 100644 tools/testing/selftests/bpf/progs/async_stack_depth.c +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/main (9d0aba98316d gve: unify driver name usage) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git netfilter/main +Already up to date. +Merging ipvs/main (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 (06c2afb862f9 Linux 6.5-rc1) +$ 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 (35bc3efb3157 ALSA: pcmtest: Don't use static storage to track per device data) +$ 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/drivers/pcmtest.c | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) +Merging sound-asoc-fixes/for-linus (f186c31c04a0 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 +Auto-merging sound/soc/codecs/Kconfig +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/Kconfig | 1 + + sound/soc/codecs/cs43130.h | 138 +++++++++++++++++++-------------------- + sound/soc/codecs/rt5640.c | 12 ++-- + sound/soc/codecs/rt5645.c | 6 +- + sound/soc/codecs/wcd934x.c | 8 +-- + sound/soc/codecs/wcd938x.c | 40 ++++++++---- + sound/soc/qcom/qdsp6/q6afe-dai.c | 2 +- + 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 +- + 17 files changed, 240 insertions(+), 133 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 +Merge made by the 'ort' strategy. + drivers/regulator/da9063-regulator.c | 9 ++++++--- + 1 file changed, 6 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 +Merge made by the 'ort' strategy. + drivers/spi/spi-zynqmp-gqspi.c | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) +Merging pci-current/for-linus (06c2afb862f9 Linux 6.5-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 (06c2afb862f9 Linux 6.5-rc1) +$ 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 (06c2afb862f9 Linux 6.5-rc1) +$ 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 (06c2afb862f9 Linux 6.5-rc1) +$ 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 (06c2afb862f9 Linux 6.5-rc1) +$ 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 (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy/fixes +Already up to date. +Merging staging.current/staging-linus (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging.current/staging-linus +Already up to date. +Merging iio-fixes/fixes-togreg (3af5d5b9a262 iio: adc: ina2xx: avoid NULL pointer dereference on OF device match) +$ git merge -m Merge branch 'fixes-togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio-fixes/fixes-togreg +Merge made by the 'ort' strategy. + drivers/iio/adc/ad7192.c | 16 ++++++++-------- + drivers/iio/adc/ina2xx-adc.c | 9 ++++++--- + drivers/iio/light/rohm-bu27008.c | 22 +++++++++++++++++++--- + drivers/iio/light/rohm-bu27034.c | 22 +++++++++++++++++++--- + 4 files changed, 52 insertions(+), 17 deletions(-) +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 (06c2afb862f9 Linux 6.5-rc1) +$ 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 (a06d6088cfd4 soundwire: amd: Fix a check for errors in probe()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire-fixes/fixes +Merge made by the 'ort' strategy. + drivers/soundwire/amd_manager.c | 4 ++-- + drivers/soundwire/bus.c | 8 ++++---- + drivers/soundwire/qcom.c | 2 +- + 3 files changed, 7 insertions(+), 7 deletions(-) +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 (2479191c30fe Input: cpcap-pwrbutton - replace GPLv2 boilerplate with SPDX) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input-current/for-linus +Merge made by the 'ort' strategy. + drivers/input/misc/cpcap-pwrbutton.c | 12 ++---------- + drivers/input/touchscreen/exc3000.c | 10 ++++++++++ + 2 files changed, 12 insertions(+), 10 deletions(-) +Merging crypto-current/master (0b7ec177b589 crypto: algif_hash - Fix race between MORE and non-MORE sends) +$ 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 (06c2afb862f9 Linux 6.5-rc1) +$ 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 (06c2afb862f9 Linux 6.5-rc1) +$ 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 (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'at91-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (2a906db2824b Merge branch 'am5748-fix' into fixes) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap-fixes/fixes +Already up to date. +Merging kvm-fixes/master (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 (9ecedaf6f82a platform/x86: int3472/discrete: set variable skl_int3472_regulator_second_sensor storage-class-specifier to static) +$ 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 +Merge made by the 'ort' strategy. + .../platform/x86/intel/int3472/clk_and_regulator.c | 2 +- + drivers/platform/x86/intel/tpmi.c | 4 +--- + drivers/platform/x86/wmi.c | 28 ++++++++++------------ + 3 files changed, 15 insertions(+), 19 deletions(-) +Merging samsung-krzk-fixes/fixes (06c2afb862f9 Linux 6.5-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 (06c2afb862f9 Linux 6.5-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 (7e08baf6a89c of: make OF_EARLY_FLATTREE depend on HAS_IOMEM) +$ git merge -m Merge branch 'dt/linus' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree-fixes/dt/linus +Merge made by the 'ort' strategy. + drivers/of/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging dt-krzk-fixes/fixes (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk-fixes/fixes +Already up to date. +Merging scsi-fixes/fixes (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 (06c2afb862f9 Linux 6.5-rc1) +$ 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 +Already up to date. +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 (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'gnss-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (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 (06c2afb862f9 Linux 6.5-rc1) +$ 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 (06c2afb862f9 Linux 6.5-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 (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'riscv-soc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc-fixes/riscv-soc-fixes +Already up to date. +Merging fpga-fixes/fixes (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga-fixes/fixes +Already up to date. +Merging spdx/spdx-linus (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'spdx-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git spdx/spdx-linus +Already up to date. +Merging gpio-brgl-fixes/gpio/for-current (06c2afb862f9 Linux 6.5-rc1) +$ 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 (06c2afb862f9 Linux 6.5-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 (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel-fixes/fixes +Already up to date. +Merging erofs-fixes/fixes (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 (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery-fixes/fixes +Already up to date. +Merging uml-fixes/fixes (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 (95f41d878100 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 (06c2afb862f9 Linux 6.5-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 (a2848d08742c drm/ttm: never consider pinned BOs for eviction&swap) +$ 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/drm_fbdev_dma.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 920076ec8e23] Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm/drm-misc +$ git diff -M --stat --summary HEAD^.. + drivers/accel/ivpu/ivpu_drv.h | 1 + + drivers/accel/ivpu/ivpu_hw_mtl.c | 20 +++++++++------ + drivers/dma-buf/dma-fence-unwrap.c | 26 +++++++++++++++++--- + drivers/dma-buf/dma-fence.c | 7 +++--- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 9 ++++--- + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 35 ++++++++++++++++---------- + drivers/gpu/drm/drm_fbdev_dma.c | 2 +- + drivers/gpu/drm/drm_syncobj.c | 6 ++--- + 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 | 29 +++++++++++++--------- + drivers/gpu/drm/ttm/ttm_resource.c | 5 +++- + include/drm/gpu_scheduler.h | 5 ++-- + include/linux/dma-fence.h | 2 +- + 17 files changed, 163 insertions(+), 78 deletions(-) +Merging mm-stable/mm-stable (fd3006d2d0e7 Sync mm-stable with v6.5-rc1.) +$ 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 (e9be1d1c50e3 Sync mm-nonmm-stable with v6.5-rc1.) +$ git merge -m Merge branch 'mm-nonmm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-nonmm-stable/mm-nonmm-stable +Merge made by the 'ort' strategy. +Merging mm/mm-everything (814b54113dca 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 +Merge made by the 'ort' strategy. + .../ABI/testing/sysfs-memory-page-offline | 4 +- + Documentation/admin-guide/cgroup-v1/memory.rst | 2 - + Documentation/admin-guide/kernel-parameters.txt | 2 +- + Documentation/admin-guide/mm/ksm.rst | 25 +- + Documentation/admin-guide/mm/userfaultfd.rst | 15 + + arch/Kconfig | 13 - + arch/arc/Kconfig | 1 + + arch/arc/include/asm/io.h | 7 +- + arch/arc/mm/ioremap.c | 49 +--- + arch/arm/Kconfig | 29 +- + arch/arm64/Kconfig | 62 +--- + arch/arm64/include/asm/io.h | 3 +- + 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/arm64/mm/ioremap.c | 10 +- + arch/hexagon/Kconfig | 1 + + arch/hexagon/include/asm/io.h | 11 +- + arch/hexagon/kernel/hexagon_ksyms.c | 2 - + arch/hexagon/mm/Makefile | 2 +- + arch/hexagon/mm/ioremap.c | 44 --- + arch/ia64/Kconfig | 31 +- + arch/ia64/include/asm/cmpxchg.h | 17 ++ + arch/ia64/include/asm/io.h | 13 +- + arch/ia64/include/uapi/asm/cmpxchg.h | 17 -- + arch/ia64/mm/ioremap.c | 41 +-- + arch/loongarch/Kconfig | 26 +- + arch/loongarch/include/asm/io.h | 2 - + arch/m68k/Kconfig | 19 +- + arch/m68k/include/asm/io_mm.h | 2 - + arch/m68k/include/asm/kmap.h | 2 - + arch/mips/Kconfig | 30 +- + arch/mips/include/asm/io.h | 5 +- + arch/openrisc/Kconfig | 1 + + arch/openrisc/include/asm/io.h | 11 +- + arch/openrisc/mm/ioremap.c | 82 ------ + arch/parisc/Kconfig | 35 +-- + arch/parisc/include/asm/io.h | 15 +- + arch/parisc/mm/ioremap.c | 62 +--- + arch/powerpc/Kconfig | 54 ++-- + arch/powerpc/include/asm/io.h | 17 +- + arch/powerpc/include/asm/pgtable.h | 10 - + arch/powerpc/mm/fault.c | 3 +- + arch/powerpc/mm/ioremap.c | 26 +- + arch/powerpc/mm/ioremap_32.c | 19 +- + arch/powerpc/mm/ioremap_64.c | 12 +- + arch/powerpc/xmon/xmon.c | 2 +- + arch/riscv/Kconfig | 44 +-- + arch/s390/Kconfig | 70 ++--- + arch/s390/include/asm/io.h | 21 +- + arch/s390/mm/fault.c | 3 +- + arch/s390/pci/pci.c | 57 +--- + arch/sh/Kconfig | 43 +-- + arch/sh/include/asm/io.h | 65 ++-- + arch/sh/include/asm/io_noioport.h | 7 + + arch/sh/mm/ioremap.c | 65 +--- + arch/sparc/kernel/setup_32.c | 2 +- + arch/x86/Kconfig | 88 ++---- + arch/x86/include/asm/io.h | 5 - + arch/x86/mm/fault.c | 3 +- + arch/xtensa/Kconfig | 1 + + arch/xtensa/include/asm/io.h | 32 +- + arch/xtensa/mm/ioremap.c | 58 +--- + drivers/dax/kmem.c | 4 +- + drivers/dma-buf/heaps/system_heap.c | 5 +- + drivers/net/ethernet/sfc/io.h | 2 +- + drivers/net/ethernet/sfc/siena/io.h | 2 +- + 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/drop_caches.c | 2 + + fs/ext4/inode.c | 4 +- + fs/ext4/move_extent.c | 19 +- + fs/hugetlbfs/inode.c | 58 +++- + 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 | 109 ++++--- + include/asm-generic/io.h | 31 +- + include/asm-generic/iomap.h | 6 +- + include/linux/buffer_head.h | 2 +- + include/linux/dma-map-ops.h | 6 - + include/linux/fs.h | 2 +- + include/linux/hugetlb.h | 39 ++- + include/linux/ioremap.h | 30 ++ + include/linux/ksm.h | 20 ++ + include/linux/maple_tree.h | 5 +- + include/linux/memblock.h | 4 +- + include/linux/memcontrol.h | 2 - + include/linux/memory-tiers.h | 4 +- + include/linux/mm.h | 66 +++-- + include/linux/mm_inline.h | 21 ++ + include/linux/mm_types.h | 12 +- + include/linux/mmzone.h | 1 - + include/linux/pagemap.h | 27 +- + include/linux/seqlock.h | 2 +- + include/linux/swapops.h | 15 +- + include/linux/userfaultfd_k.h | 4 + + include/uapi/linux/userfaultfd.h | 25 +- + init/Kconfig | 2 + + init/initramfs.c | 2 +- + ipc/sem.c | 6 +- + kernel/Kconfig.kexec | 116 ++++++++ + kernel/acct.c | 2 +- + kernel/cred.c | 27 +- + kernel/dma/Kconfig | 6 +- + kernel/dma/contiguous.c | 8 +- + kernel/futex/core.c | 3 +- + kernel/iomem.c | 1 + + kernel/panic.c | 2 +- + kernel/signal.c | 14 +- + lib/maple_tree.c | 95 ++++-- + lib/test_hmm.c | 10 +- + lib/test_maple_tree.c | 65 ++++ + mm/Kconfig | 3 + + mm/cma.c | 4 +- + mm/compaction.c | 34 ++- + mm/filemap.c | 54 ++-- + mm/gup.c | 83 +++--- + mm/huge_memory.c | 3 +- + mm/hugetlb.c | 326 ++++++--------------- + mm/hugetlb_vmemmap.c | 34 +-- + mm/internal.h | 17 ++ + mm/ioremap.c | 43 ++- + mm/khugepaged.c | 5 +- + mm/ksm.c | 28 +- + mm/madvise.c | 10 +- + mm/memcontrol.c | 11 +- + mm/memfd.c | 57 ++-- + mm/memory-failure.c | 79 ++--- + mm/memory-tiers.c | 6 +- + mm/memory.c | 139 +++++---- + mm/migrate.c | 3 +- + mm/migrate_device.c | 21 +- + mm/mm_init.c | 15 +- + mm/mprotect.c | 4 +- + mm/nommu.c | 8 +- + mm/page_alloc.c | 76 +++-- + mm/page_vma_mapped.c | 12 +- + mm/rmap.c | 8 +- + mm/shmem.c | 6 +- + mm/show_mem.c | 4 +- + mm/sparse.c | 3 +- + mm/swap.h | 1 - + mm/swap_state.c | 12 +- + mm/swapfile.c | 18 +- + mm/truncate.c | 8 +- + mm/userfaultfd.c | 83 ++++-- + mm/util.c | 6 - + mm/vmscan.c | 8 +- + mm/zsmalloc.c | 79 ++--- + mm/zswap.c | 81 +++-- + scripts/headers_install.sh | 1 - + 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/memfd/memfd_test.c | 5 + + tools/testing/selftests/mm/.gitignore | 1 + + tools/testing/selftests/mm/Makefile | 1 + + tools/testing/selftests/mm/hugetlb-read-hwpoison.c | 322 ++++++++++++++++++++ + tools/testing/selftests/mm/ksm_functional_tests.c | 98 ++++++- + tools/testing/selftests/mm/run_vmtests.sh | 48 ++- + tools/testing/selftests/mm/uffd-common.c | 5 +- + tools/testing/selftests/mm/uffd-common.h | 3 + + tools/testing/selftests/mm/uffd-stress.c | 8 +- + tools/testing/selftests/mm/uffd-unit-tests.c | 117 ++++++++ + tools/testing/selftests/proc/proc-empty-vm.c | 23 ++ + 178 files changed, 2772 insertions(+), 2024 deletions(-) + delete mode 100644 arch/hexagon/mm/ioremap.c + create mode 100644 include/linux/ioremap.h + create mode 100644 kernel/Kconfig.kexec + create mode 100644 tools/testing/selftests/cgroup/test_zswap.c + create mode 100644 tools/testing/selftests/mm/hugetlb-read-hwpoison.c +Merging kbuild/for-next (c17414a273b8 Merge tag 'sh-for-v6.5-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux) +$ 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 (06c2afb862f9 Linux 6.5-rc1) +$ 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 (bcd981db12e6 perf test: Fix event parsing test when PERF_PMU_CAP_EXTENDED_HW_TYPE isn't supported.) +$ 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 +Already up to date. +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 +Already up to date. +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 +Already up to date. +Merging arc/for-next (06c2afb862f9 Linux 6.5-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 (6722e46513e0 bus: ixp4xx: fix IXP4XX_EXP_T1_MASK) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next +Already up to date. +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 (a43f3e970a1d ARM: dts: aspeed: Add AST2600 VUARTs) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git aspeed/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/aspeed/aspeed.yaml | 1 + + arch/arm/boot/dts/aspeed/Makefile | 1 + + .../dts/aspeed/aspeed-bmc-ampere-mtmitchell.dts | 129 ++++--- + .../arm/boot/dts/aspeed/aspeed-bmc-ibm-bonnell.dts | 20 ++ + .../dts/aspeed/aspeed-bmc-inventec-starscream.dts | 389 +++++++++++++++++++++ + arch/arm/boot/dts/aspeed/aspeed-g6.dtsi | 20 ++ + drivers/soc/aspeed/aspeed-socinfo.c | 1 + + drivers/soc/aspeed/aspeed-uart-routing.c | 2 +- + 8 files changed, 521 insertions(+), 42 deletions(-) + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-inventec-starscream.dts +Merging at91/at91-next (47508c7ba8db Merge branches 'microchip-dt64' and 'at91-dt' into at91-next) +$ git merge -m Merge branch 'at91-next' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91/at91-next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/microchip/lan966x-pcb8290.dts | 2 +- + arch/arm64/boot/dts/microchip/sparx5.dtsi | 12 ++++++------ + 2 files changed, 7 insertions(+), 7 deletions(-) +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 (06c2afb862f9 Linux 6.5-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 (d1478aea649e memory: tegra: Add dummy implementation on Tegra194) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory/for-next +Merge made by the 'ort' strategy. + drivers/memory/tegra/mc.c | 37 +++++++++++++++++++++++++++++++++++++ + drivers/memory/tegra/tegra194.c | 1 + + drivers/memory/tegra/tegra234.c | 23 +---------------------- + include/soc/tegra/mc.h | 3 +++ + 4 files changed, 42 insertions(+), 22 deletions(-) +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 (6faff7e89223 Merge branches 'arm64-defconfig-for-6.6', 'arm64-fixes-for-6.5', 'arm64-for-6.6', 'clk-for-6.6', 'drivers-for-6.6' and 'dts-for-6.6' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git qcom/for-next +Merge made by the 'ort' strategy. + .../bindings/clock/qcom,gcc-apq8064.yaml | 2 +- + .../bindings/clock/qcom,gcc-ipq4019.yaml | 2 +- + .../bindings/clock/qcom,gcc-ipq8074.yaml | 2 +- + .../bindings/clock/qcom,gcc-msm8976.yaml | 2 +- + .../bindings/clock/qcom,gcc-msm8996.yaml | 2 +- + .../bindings/clock/qcom,gcc-msm8998.yaml | 2 +- + .../devicetree/bindings/clock/qcom,gcc-other.yaml | 2 +- + .../devicetree/bindings/clock/qcom,gcc-qcs404.yaml | 2 +- + .../devicetree/bindings/clock/qcom,gcc-sc7180.yaml | 2 +- + .../devicetree/bindings/clock/qcom,gcc-sc7280.yaml | 2 +- + .../devicetree/bindings/clock/qcom,gcc-sdm845.yaml | 2 +- + .../devicetree/bindings/clock/qcom,gcc-sm8150.yaml | 2 +- + .../devicetree/bindings/clock/qcom,gcc-sm8250.yaml | 2 +- + .../devicetree/bindings/clock/qcom,gcc.yaml | 2 +- + .../devicetree/bindings/clock/qcom,gpucc.yaml | 2 +- + .../devicetree/bindings/clock/qcom,mmcc.yaml | 2 +- + .../bindings/clock/qcom,msm8998-gpucc.yaml | 2 +- + .../devicetree/bindings/clock/qcom,rpmhcc.yaml | 2 +- + .../bindings/clock/qcom,sc7180-camcc.yaml | 2 +- + .../bindings/clock/qcom,sc7180-dispcc.yaml | 2 +- + .../bindings/clock/qcom,sc7180-lpasscorecc.yaml | 2 +- + .../devicetree/bindings/clock/qcom,sc7180-mss.yaml | 2 +- + .../bindings/clock/qcom,sc7280-camcc.yaml | 2 +- + .../bindings/clock/qcom,sc7280-dispcc.yaml | 2 +- + .../bindings/clock/qcom,sc7280-lpasscc.yaml | 2 +- + .../bindings/clock/qcom,sc7280-lpasscorecc.yaml | 2 +- + .../bindings/clock/qcom,sdm845-dispcc.yaml | 2 +- + .../devicetree/bindings/clock/qcom,videocc.yaml | 2 +- + .../devicetree/bindings/firmware/qcom,scm.yaml | 1 + + .../devicetree/bindings/sram/qcom,ocmem.yaml | 26 +- + arch/arm/boot/dts/qcom/qcom-ipq4018-ap120c-ac.dtsi | 7 +- + arch/arm/boot/dts/qcom/qcom-ipq4019.dtsi | 34 +- + arch/arm/boot/dts/qcom/qcom-ipq8064-rb3011.dts | 1 - + arch/arm/boot/dts/qcom/qcom-ipq8064-v1.0.dtsi | 1 - + arch/arm/boot/dts/qcom/qcom-msm8226.dtsi | 144 ++++++++ + arch/arm/boot/dts/qcom/qcom-msm8960.dtsi | 1 - + .../dts/qcom/qcom-msm8974pro-fairphone-fp2.dts | 2 +- + arch/arm/boot/dts/qcom/qcom-sdx55.dtsi | 2 +- + arch/arm64/boot/dts/qcom/apq8016-sbc.dts | 15 +- + arch/arm64/boot/dts/qcom/apq8039-t2.dts | 2 - + arch/arm64/boot/dts/qcom/apq8096-db820c.dts | 23 +- + arch/arm64/boot/dts/qcom/ipq5332-rdp-common.dtsi | 36 ++ + arch/arm64/boot/dts/qcom/ipq5332-rdp441.dts | 26 +- + arch/arm64/boot/dts/qcom/ipq5332-rdp442.dts | 26 +- + arch/arm64/boot/dts/qcom/ipq5332-rdp468.dts | 24 +- + arch/arm64/boot/dts/qcom/ipq5332-rdp474.dts | 47 +-- + arch/arm64/boot/dts/qcom/ipq8074.dtsi | 8 +- + arch/arm64/boot/dts/qcom/ipq9574-rdp433.dts | 48 +++ + arch/arm64/boot/dts/qcom/ipq9574.dtsi | 85 +++++ + .../boot/dts/qcom/msm8916-longcheer-l8150.dts | 2 +- + arch/arm64/boot/dts/qcom/msm8916-mtp.dts | 1 + + .../boot/dts/qcom/msm8916-samsung-gt5-common.dtsi | 1 - + .../boot/dts/qcom/msm8916-samsung-serranove.dts | 70 +++- + .../dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts | 1 + + arch/arm64/boot/dts/qcom/msm8939.dtsi | 18 +- + arch/arm64/boot/dts/qcom/msm8953-xiaomi-daisy.dts | 2 +- + arch/arm64/boot/dts/qcom/msm8953-xiaomi-vince.dts | 2 +- + arch/arm64/boot/dts/qcom/msm8996-mtp.dts | 1 + + .../arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi | 8 +- + arch/arm64/boot/dts/qcom/msm8996.dtsi | 15 +- + .../boot/dts/qcom/msm8996pro-xiaomi-natrium.dts | 2 +- + arch/arm64/boot/dts/qcom/msm8998-mtp.dts | 1 + + arch/arm64/boot/dts/qcom/msm8998.dtsi | 20 +- + arch/arm64/boot/dts/qcom/pm8350.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pm8350b.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pm8953.dtsi | 33 +- + arch/arm64/boot/dts/qcom/pmk8350.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pmr735b.dtsi | 2 +- + arch/arm64/boot/dts/qcom/qcm2290.dtsi | 32 +- + arch/arm64/boot/dts/qcom/qcs404.dtsi | 8 +- + arch/arm64/boot/dts/qcom/qdu1000-idp.dts | 4 + + arch/arm64/boot/dts/qcom/qrb4210-rb2.dts | 8 + + arch/arm64/boot/dts/qcom/qrb5165-rb5.dts | 2 +- + arch/arm64/boot/dts/qcom/qru1000-idp.dts | 4 + + arch/arm64/boot/dts/qcom/sa8540p.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sa8775p-ride.dts | 109 ++++++ + arch/arm64/boot/dts/qcom/sa8775p.dtsi | 42 +++ + arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts | 6 +- + arch/arm64/boot/dts/qcom/sc7180-lite.dtsi | 10 +- + arch/arm64/boot/dts/qcom/sc7180.dtsi | 165 ++++++--- + .../qcom/sc7280-herobrine-audio-rt5682-3mic.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sc7280.dtsi | 2 +- + .../arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts | 13 +- + arch/arm64/boot/dts/qcom/sc8180x-pmics.dtsi | 24 +- + arch/arm64/boot/dts/qcom/sc8180x-primus.dts | 8 +- + arch/arm64/boot/dts/qcom/sc8180x.dtsi | 12 +- + arch/arm64/boot/dts/qcom/sc8280xp-crd.dts | 16 +- + .../dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 2 - + arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 1 + + arch/arm64/boot/dts/qcom/sdm630.dtsi | 10 +- + arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 1 + + .../boot/dts/qcom/sdm845-oneplus-enchilada.dts | 2 +- + .../boot/dts/qcom/sdm845-sony-xperia-tama.dtsi | 9 + + .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 2 +- + arch/arm64/boot/dts/qcom/sdx75.dtsi | 4 +- + arch/arm64/boot/dts/qcom/sm6115-fxtec-pro1x.dts | 2 +- + arch/arm64/boot/dts/qcom/sm6115.dtsi | 105 +++++- + arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts | 65 +++- + .../dts/qcom/sm6125-sony-xperia-seine-pdx201.dts | 2 +- + .../boot/dts/qcom/sm6125-xiaomi-laurel-sprout.dts | 2 +- + arch/arm64/boot/dts/qcom/sm6350.dtsi | 396 ++++++++++++++++++++- + arch/arm64/boot/dts/qcom/sm6375.dtsi | 127 +++++++ + arch/arm64/boot/dts/qcom/sm8150-hdk.dts | 1 + + arch/arm64/boot/dts/qcom/sm8150-mtp.dts | 1 + + .../boot/dts/qcom/sm8150-sony-xperia-kumano.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sm8150.dtsi | 22 +- + arch/arm64/boot/dts/qcom/sm8250-hdk.dts | 1 + + arch/arm64/boot/dts/qcom/sm8250-mtp.dts | 1 + + .../dts/qcom/sm8250-sony-xperia-edo-pdx203.dts | 364 +++++++++++++++++++ + .../dts/qcom/sm8250-sony-xperia-edo-pdx206.dts | 243 +++++++++++++ + .../boot/dts/qcom/sm8250-sony-xperia-edo.dtsi | 63 +++- + .../boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sm8250.dtsi | 229 ++++++------ + arch/arm64/boot/dts/qcom/sm8350-hdk.dts | 15 +- + arch/arm64/boot/dts/qcom/sm8350-mtp.dts | 1 + + arch/arm64/boot/dts/qcom/sm8350.dtsi | 243 +++++++------ + arch/arm64/boot/dts/qcom/sm8450-hdk.dts | 303 +++++++++++++++- + arch/arm64/boot/dts/qcom/sm8450-qrd.dts | 1 + + arch/arm64/boot/dts/qcom/sm8450.dtsi | 218 ++++++------ + arch/arm64/boot/dts/qcom/sm8550-mtp.dts | 1 + + arch/arm64/boot/dts/qcom/sm8550-qrd.dts | 1 + + arch/arm64/boot/dts/qcom/sm8550.dtsi | 196 +++++----- + arch/arm64/configs/defconfig | 2 + + drivers/clk/qcom/gcc-ipq9574.c | 37 ++ + drivers/clk/qcom/gcc-sc8280xp.c | 131 ++++++- + drivers/clk/qcom/gcc-sm7150.c | 1 + + drivers/clk/qcom/gpucc-sm6350.c | 18 +- + drivers/clk/qcom/mmcc-msm8974.c | 11 + + drivers/soc/qcom/cmd-db.c | 2 +- + drivers/soc/qcom/icc-bwmon.c | 28 +- + drivers/soc/qcom/ocmem.c | 67 ++-- + drivers/soc/qcom/rpmh-rsc.c | 2 +- + drivers/soc/qcom/rpmpd.c | 34 +- + drivers/soc/qcom/spm.c | 4 +- + drivers/soc/qcom/trace-rpmh.h | 16 +- + include/dt-bindings/clock/qcom,gcc-sc8280xp.h | 10 + + include/dt-bindings/clock/qcom,ipq9574-gcc.h | 2 + + 138 files changed, 3341 insertions(+), 933 deletions(-) + create mode 100644 arch/arm64/boot/dts/qcom/ipq5332-rdp-common.dtsi +Merging renesas/next (b74c024d8fc7 Merge branches 'renesas-arm-defconfig-for-v6.6' and 'renesas-dts-for-v6.6' 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 +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'ort' strategy. + .../arm/boot/dts/renesas/r9a06g032-rzn1d400-db.dts | 2 +- + arch/arm64/boot/dts/renesas/gmsl-cameras.dtsi | 4 ++-- + arch/arm64/boot/dts/renesas/r8a77970-v3msk.dts | 2 +- + arch/arm64/boot/dts/renesas/r8a77990.dtsi | 4 ++-- + arch/arm64/boot/dts/renesas/r9a09g011.dtsi | 28 ++++++++++++++++++++++ + arch/arm64/boot/dts/renesas/rz-smarc-common.dtsi | 4 ++-- + arch/arm64/boot/dts/renesas/rzg2l-smarc-som.dtsi | 22 +++++++++++++++-- + arch/arm64/boot/dts/renesas/rzg2lc-smarc-som.dtsi | 2 +- + arch/arm64/boot/dts/renesas/rzg2ul-smarc-som.dtsi | 4 ++-- + arch/arm64/configs/defconfig | 4 ++++ + 10 files changed, 63 insertions(+), 13 deletions(-) +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 (37a0a70b13a3 Merge branch 'v6.6-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. + arch/arm64/boot/dts/rockchip/px30.dtsi | 16 ++++++------- + arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts | 1 - + arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts | 1 - + arch/arm64/boot/dts/rockchip/rk3399-eaidk-610.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi | 1 - + .../boot/dts/rockchip/rk3399-rock-4c-plus.dts | 3 +-- + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi | 4 ++-- + .../boot/dts/rockchip/rk3399-rock-pi-4b-plus.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 27 ++++++++++++++++++++++ + .../boot/dts/rockchip/rk3566-anbernic-rgxx3.dtsi | 3 --- + arch/arm64/boot/dts/rockchip/rk3566-box-demo.dts | 4 ++-- + arch/arm64/boot/dts/rockchip/rk3566-lubancat-1.dts | 3 --- + arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi | 2 -- + arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts | 2 -- + arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts | 2 -- + .../boot/dts/rockchip/rk3566-radxa-cm3-io.dts | 4 ++-- + arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts | 2 -- + arch/arm64/boot/dts/rockchip/rk3566-soquartz.dtsi | 3 --- + arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts | 3 --- + arch/arm64/boot/dts/rockchip/rk3568-evb1-v10.dts | 3 --- + .../boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi | 4 ---- + arch/arm64/boot/dts/rockchip/rk3568-lubancat-2.dts | 3 --- + .../arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dtsi | 3 --- + arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts | 3 --- + .../arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi | 3 --- + arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts | 3 --- + arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 21 ++++++++--------- + .../boot/dts/rockchip/rk3588s-indiedroid-nova.dts | 8 +++---- + drivers/clk/rockchip/clk-rk3568.c | 3 ++- + 29 files changed, 60 insertions(+), 79 deletions(-) +Merging samsung-krzk/for-next (f822ca919181 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.git samsung-krzk/for-next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/samsung/exynos4210-trats.dts | 8 ++++---- + arch/arm/boot/dts/samsung/exynos4210-universal_c210.dts | 4 ++-- + arch/arm/boot/dts/samsung/exynos4412-midas.dtsi | 2 +- + arch/arm/boot/dts/samsung/s5pv210-pinctrl.dtsi | 12 ++++++------ + arch/arm64/boot/dts/exynos/exynos7.dtsi | 8 ++++---- + arch/arm64/boot/dts/exynos/exynosautov9.dtsi | 2 +- + arch/arm64/boot/dts/tesla/fsd.dtsi | 4 ++-- + 7 files changed, 20 insertions(+), 20 deletions(-) +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 (f0f0682c384d ARM: dts: stm32: remove shmem for scmi-optee on stm32mp13) +$ git merge -m Merge branch 'stm32-next' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/st/stm32mp131.dtsi | 14 -------------- + arch/arm/boot/dts/st/stm32mp15-scmi.dtsi | 16 ---------------- + 2 files changed, 30 deletions(-) +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 (6008eee2c754 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. + arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi | 4 ++++ + arch/arm64/boot/dts/xilinx/zynqmp-sck-kv-g-revA.dtso | 5 +++-- + arch/arm64/boot/dts/xilinx/zynqmp-sck-kv-g-revB.dtso | 5 +++-- + arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts | 15 +++++++++++++-- + .../boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts | 4 ++-- + .../boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts | 4 ++-- + .../boot/dts/xilinx/zynqmp-zc1751-xm019-dc5.dts | 8 ++++---- + arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts | 4 ++-- + arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts | 8 ++++---- + arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts | 4 ++-- + arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts | 4 ++-- + arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts | 8 ++++---- + arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts | 8 ++++---- + arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 20 ++++++++++++++++---- + drivers/soc/xilinx/xlnx_event_manager.c | 6 ++---- + 15 files changed, 67 insertions(+), 40 deletions(-) +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 (63370298426b clk: renesas: r9a09g011: Add CSI related clocks) +$ 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 +Merge made by the 'ort' strategy. + drivers/clk/renesas/r8a774a1-cpg-mssr.c | 2 ++ + drivers/clk/renesas/r8a774b1-cpg-mssr.c | 2 ++ + drivers/clk/renesas/r8a774e1-cpg-mssr.c | 2 ++ + drivers/clk/renesas/r9a09g011-cpg.c | 15 ++++++++++++++ + drivers/clk/renesas/rcar-gen3-cpg.c | 35 +++++++++++++++++++++++++++++---- + drivers/clk/renesas/rcar-gen3-cpg.h | 1 + + 6 files changed, 53 insertions(+), 4 deletions(-) +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 (06351cc358ea LoongArch: Fix module relocation error with binutils 2.41) +$ git merge -m Merge branch 'loongarch-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git loongarch/loongarch-next +Merge made by the 'ort' strategy. + arch/loongarch/Makefile | 2 ++ + 1 file changed, 2 insertions(+) +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 (06c2afb862f9 Linux 6.5-rc1) +$ 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 (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'mips-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next +Already up to date. +Merging openrisc/for-next (dceaafd66881 openrisc: Union fpcsr and oldmask in 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 | 6 ++++-- + arch/openrisc/kernel/signal.c | 4 ++-- + 2 files changed, 6 insertions(+), 4 deletions(-) +Merging parisc-hd/for-next (6995e2de6891 Linux 6.4) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git parisc-hd/for-next +Already up to date. +Merging powerpc/next (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next +Already up to date. +Merging soc-fsl/next (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 (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v/for-next +Already up to date. +Merging riscv-dt/riscv-dt-for-next (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'riscv-dt-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt/riscv-dt-for-next +Already up to date. +Merging riscv-soc/riscv-soc-for-next (1fcaaa1d489c riscv: Kconfig: Add select ARM_AMBA to SOC_STARFIVE) +$ 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 +Merge made by the 'ort' strategy. + arch/riscv/Kconfig.socs | 1 + + 1 file changed, 1 insertion(+) +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 +Merge made by the 'ort' strategy. +Merging sh/for-next (7497840d462c sh: Provide unxlate_dev_mem_ptr() in asm/io.h) +$ git merge -m Merge branch 'for-next' of git:git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux.git sh/for-next +Already up to date. +Merging uml/next (6032aca0deb9 um: make stub data pages size tweakable) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml/next +Already up to date. +Merging xtensa/xtensa-for-next (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 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 +Already up to date. +Merging cifs/for-next (d8e2fe53dbdc 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 +Merge made by the 'ort' strategy. + fs/smb/client/cifsfs.c | 2 ++ + fs/smb/client/cifsglob.h | 1 + + fs/smb/client/connect.c | 3 +++ + fs/smb/client/dir.c | 6 ++++++ + fs/smb/client/file.c | 4 ++-- + fs/smb/client/fs_context.c | 4 ++++ + fs/smb/client/fs_context.h | 2 ++ + 7 files changed, 20 insertions(+), 2 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 (06c2afb862f9 Linux 6.5-rc1) +$ 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/quota/dquot.c | 244 ++++++++++++++++++++++++++++--------------------------- + 2 files changed, 125 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 (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev +Already up to date. +Merging fsverity/for-next (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 (94c76955e86a Merge tag 'gfs2-v6.4-rc5-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2) +$ 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 (06c2afb862f9 Linux 6.5-rc1) +$ 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 (b1c93d0e302a NFSD: Rename struct svc_cacherep) +$ git merge -m Merge branch 'nfsd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/nfsd-next +Merge made by the 'ort' strategy. + fs/locks.c | 7 - + fs/nfsd/cache.h | 8 +- + fs/nfsd/nfs4proc.c | 15 +- + fs/nfsd/nfs4state.c | 120 +++++++++++-- + fs/nfsd/nfs4xdr.c | 13 ++ + fs/nfsd/nfscache.c | 207 ++++++++++++++--------- + fs/nfsd/nfssvc.c | 10 +- + fs/nfsd/state.h | 3 + + fs/nfsd/stats.c | 2 + + fs/nfsd/stats.h | 7 + + fs/nfsd/trace.h | 27 ++- + fs/nfsd/xdr4.h | 1 + + include/linux/sunrpc/svc.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 -------------------------------- + 24 files changed, 318 insertions(+), 1240 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 +Already up to date. +Merging orangefs/for-next (31720a2b109b orangefs: Fix kmemleak in orangefs_{kernel,client}_debug_init()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (0a3bf81dbcb2 ovl: auto generate uuid for new overlay filesystems) +$ git merge -m Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git overlayfs/overlayfs-next +Merge made by the 'ort' strategy. + Documentation/filesystems/fsverity.rst | 2 + + Documentation/filesystems/overlayfs.rst | 72 +++++++++++ + fs/overlayfs/copy_up.c | 52 +++++++- + fs/overlayfs/export.c | 26 +++- + fs/overlayfs/file.c | 8 +- + fs/overlayfs/inode.c | 2 +- + fs/overlayfs/namei.c | 87 +++++++++++-- + fs/overlayfs/overlayfs.h | 66 +++++++++- + fs/overlayfs/ovl_entry.h | 4 +- + fs/overlayfs/params.c | 92 ++++++++++++-- + fs/overlayfs/super.c | 34 ++++- + fs/overlayfs/util.c | 217 +++++++++++++++++++++++++++++++- + 12 files changed, 617 insertions(+), 45 deletions(-) +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 (06c2afb862f9 Linux 6.5-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 (ed04a91f718e xfs: fix uninit warning in xfs_growfs_data) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next +Already up to date. +Merging zonefs/for-next (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 (b48f591aff4a 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/locks.c +Auto-merging fs/smb/client/cifsfs.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 | 8 +- + Documentation/filesystems/vfs.rst | 6 +- + fs/ecryptfs/mmap.c | 4 +- + fs/ecryptfs/read_write.c | 4 +- + fs/fcntl.c | 29 ++-- + fs/libfs.c | 250 +++++++++++++++++++++++++++++++++- + fs/locks.c | 20 +-- + fs/nfs/nfs4_fs.h | 2 +- + fs/nfs/nfs4file.c | 2 +- + fs/nfs/nfs4proc.c | 4 +- + fs/notify/dnotify/dnotify.c | 4 +- + fs/pipe.c | 6 +- + fs/reiserfs/journal.c | 4 +- + fs/smb/client/cifsfs.c | 2 +- + fs/splice.c | 46 ++++--- + include/linux/dnotify.h | 4 +- + include/linux/filelock.h | 12 +- + include/linux/fs.h | 24 +++- + include/linux/pipe_fs_i.h | 4 +- + include/linux/shmem_fs.h | 1 + + mm/shmem.c | 62 +++++++-- + 21 files changed, 407 insertions(+), 91 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 (06c2afb862f9 Linux 6.5-rc1) +$ 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 (5eb5c80feb93 Merge branch 'for-6.5/upstream-fixes' 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. + drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_desc.c | 30 ++++++++++++++++++++------- + drivers/hid/hid-hyperv.c | 10 ++++----- + drivers/hid/hid-input.c | 7 ++++--- + drivers/hid/hid-logitech-hidpp.c | 2 ++ + drivers/hid/hid-nvidia-shield.c | 12 +++++------ + tools/testing/selftests/hid/vmtest.sh | 1 + + 6 files changed, 40 insertions(+), 22 deletions(-) +Merging i2c/i2c/for-next (6537ed3904a3 i2c: mpc: Drop unused variable) +$ 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 +Already up to date. +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 (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Already up to date. +Merging v4l-dvb/master (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'master' of git://linuxtv.org/media_tree.git v4l-dvb/master +Already up to date. +Merging v4l-dvb-next/master (06c2afb862f9 Linux 6.5-rc1) +$ 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 (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next +Already up to date. +Merging cpufreq-arm/cpufreq/arm/linux-next (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 (06c2afb862f9 Linux 6.5-rc1) +$ 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 (6843306689af Merge tag 'net-6.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/main +Already up to date. +Merging bpf-next/for-next (a3cbc8efc78b Merge branch 'bpftool: Fix skeletons compilation for older kernels') +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git bpf-next/for-next +Auto-merging kernel/bpf/btf.c +Merge made by the 'ort' strategy. + Documentation/bpf/bpf_devel_QA.rst | 10 +- + Documentation/bpf/btf.rst | 4 +- + Documentation/bpf/instruction-set.rst | 2 +- + Documentation/bpf/llvm_reloc.rst | 6 +- + drivers/hid/bpf/entrypoints/Makefile | 2 +- + include/linux/bpf-cgroup.h | 4 +- + include/linux/bpf.h | 30 ++ + kernel/bpf/btf.c | 2 + + kernel/bpf/hashtab.c | 22 +- + kernel/bpf/map_iter.c | 39 +- + kernel/bpf/preload/iterators/Makefile | 2 +- + kernel/bpf/preload/iterators/iterators.bpf.c | 9 +- + .../iterators/iterators.lskel-little-endian.h | 526 +++++++++++---------- + kernel/bpf/ringbuf.c | 26 +- + lib/test_bpf.c | 12 +- + net/bpf/test_run.c | 4 + + samples/bpf/Makefile | 6 +- + samples/bpf/gnu/stubs.h | 2 +- + samples/bpf/test_lwt_bpf.sh | 2 +- + samples/hid/Makefile | 6 +- + tools/bpf/bpftool/Documentation/bpftool-gen.rst | 4 +- + tools/bpf/bpftool/Makefile | 2 +- + tools/bpf/bpftool/skeleton/pid_iter.bpf.c | 26 +- + tools/bpf/bpftool/skeleton/profiler.bpf.c | 27 +- + tools/bpf/runqslower/Makefile | 2 +- + tools/build/feature/Makefile | 2 +- + tools/lib/bpf/bpf.c | 8 + + tools/lib/bpf/bpf.h | 6 + + tools/lib/bpf/libbpf.c | 243 +++++++++- + tools/lib/bpf/libbpf.h | 15 + + tools/lib/bpf/libbpf.map | 1 + + tools/testing/selftests/bpf/Makefile | 13 +- + tools/testing/selftests/bpf/bench.c | 4 + + .../testing/selftests/bpf/benchs/bench_htab_mem.c | 350 ++++++++++++++ + .../testing/selftests/bpf/benchs/bench_ringbufs.c | 2 +- + .../selftests/bpf/benchs/run_bench_htab_mem.sh | 40 ++ + tools/testing/selftests/bpf/cgroup_helpers.c | 12 + + tools/testing/selftests/bpf/cgroup_helpers.h | 1 + + tools/testing/selftests/bpf/cgroup_tcp_skb.h | 35 ++ + tools/testing/selftests/bpf/gnu/stubs.h | 2 +- + .../selftests/bpf/map_tests/map_percpu_stats.c | 447 +++++++++++++++++ + tools/testing/selftests/bpf/prog_tests/bpf_nf.c | 5 +- + .../selftests/bpf/prog_tests/cgroup_tcp_skb.c | 402 ++++++++++++++++ + .../bpf/prog_tests/netfilter_link_attach.c | 86 ++++ + .../selftests/bpf/prog_tests/tcp_hdr_options.c | 2 +- + tools/testing/selftests/bpf/prog_tests/verifier.c | 2 + + tools/testing/selftests/bpf/progs/cgroup_tcp_skb.c | 382 +++++++++++++++ + tools/testing/selftests/bpf/progs/htab_mem_bench.c | 105 ++++ + .../testing/selftests/bpf/progs/map_percpu_stats.c | 24 + + .../bpf/progs/test_netfilter_link_attach.c | 14 + + .../testing/selftests/bpf/progs/verifier_typedef.c | 23 + + tools/testing/selftests/bpf/trace_helpers.c | 5 +- + .../selftests/bpf/verifier/atomic_cmpxchg.c | 1 + + tools/testing/selftests/bpf/verifier/ctx_skb.c | 2 + + tools/testing/selftests/bpf/verifier/jmp32.c | 8 + + tools/testing/selftests/bpf/verifier/map_kptr.c | 2 + + tools/testing/selftests/bpf/verifier/precise.c | 2 +- + tools/testing/selftests/hid/Makefile | 6 +- + tools/testing/selftests/net/Makefile | 4 +- + tools/testing/selftests/tc-testing/Makefile | 2 +- + 60 files changed, 2666 insertions(+), 369 deletions(-) + create mode 100644 tools/testing/selftests/bpf/benchs/bench_htab_mem.c + create mode 100755 tools/testing/selftests/bpf/benchs/run_bench_htab_mem.sh + create mode 100644 tools/testing/selftests/bpf/cgroup_tcp_skb.h + create mode 100644 tools/testing/selftests/bpf/map_tests/map_percpu_stats.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/cgroup_tcp_skb.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/netfilter_link_attach.c + create mode 100644 tools/testing/selftests/bpf/progs/cgroup_tcp_skb.c + create mode 100644 tools/testing/selftests/bpf/progs/htab_mem_bench.c + create mode 100644 tools/testing/selftests/bpf/progs/map_percpu_stats.c + create mode 100644 tools/testing/selftests/bpf/progs/test_netfilter_link_attach.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_typedef.c +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/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/netfilter/nf-next.git netfilter-next/main +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 (c9a85685d0c1 Bluetooth: MGMT: Fix always using HCI_MAX_AD_LENGTH) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master +Merge made by the 'ort' strategy. + 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 | 282 ++++++++++++++++----- + drivers/bluetooth/hci_qca.c | 148 +++++++---- + include/net/bluetooth/bluetooth.h | 3 + + include/net/bluetooth/hci.h | 11 + + include/net/bluetooth/hci_core.h | 80 +++++- + 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 | 511 ++++++++++++++++++-------------------- + net/bluetooth/hci_core.c | 50 +++- + net/bluetooth/hci_event.c | 174 +++++++++---- + net/bluetooth/hci_sock.c | 77 +++++- + net/bluetooth/hci_sync.c | 307 ++++++++++++++++++----- + net/bluetooth/hidp/sock.c | 10 +- + net/bluetooth/iso.c | 149 ++++++----- + net/bluetooth/l2cap_sock.c | 29 +-- + net/bluetooth/mgmt.c | 53 ++-- + net/bluetooth/msft.c | 414 ++++++++++++++++++++++++++++-- + net/bluetooth/rfcomm/sock.c | 13 +- + net/bluetooth/sco.c | 10 +- + 27 files changed, 2115 insertions(+), 741 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 38abcfa8d232] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git + Date: Tue Jul 11 10:10:02 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 (6725f3322807 Merge tag 'drm-misc-next-fixes-2023-07-06' of git://anongit.freedesktop.org/drm/drm-misc into drm-next) +$ git merge -m Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git drm/drm-next +Already up to date. +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 +Already up to date. +Merging amdgpu/drm-next (6dda3f18bdbd drm/amdgpu: Fix errors & warnings in gfx_v10_0.c) +$ 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 | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 36 +++++ + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 2 + + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gc_9_4_3.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 10 -- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 135 ++++++++-------- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 18 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 2 - + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 8 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c | 59 +++++++ + .../{aqua_vanjaram_reg_init.c => aqua_vanjaram.c} | 0 + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 178 ++++++++++----------- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 36 +---- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 7 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_2.c | 4 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_1.c | 9 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v3_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v3_0_3.c | 4 +- + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 38 ++--- + drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 33 ++-- + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 52 +++--- + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 54 +++---- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 84 +++++----- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 40 +++-- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 11 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v10.c | 22 ++- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v11.c | 22 ++- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 36 ++++- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 8 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 175 ++++++++++---------- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 6 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 14 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 2 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 42 ++--- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 1 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 4 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 11 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c | 1 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 9 ++ + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 25 ++- + .../display/dc/dcn31/dcn31_hpo_dp_stream_encoder.c | 2 +- + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 3 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 2 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 2 +- + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 2 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 2 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 2 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 2 +- + 59 files changed, 732 insertions(+), 557 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 (8290bcee57de drm/i915: Don't rely that 2 VDSC engines are always enough for pixel rate) + 460dc4ba1442 ("drm/i915/psr: Fix BDW PSR AUX CH data register offsets") + 7e8d87e2da3b ("drm/i915/mtl: Fix SSC selection for MPLLA") + 86a124424efc ("drm/i915/hdcp: Assign correct hdcp content type") + ecc7a3ce078a ("drm/i915: use mock device info for creating mock device") + ef0af9db2a21 ("drm/i915/psr: Use hw.adjusted mode when calculating io/fast wake times") + f4e498eb1247 ("drm/i915/adlp+: Allow DC states along with PW2 only for PWB functionality") + f4fab137dd2b ("drm/i915: Add missing forward declarations/includes to display power headers") +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/display/intel_cx0_phy.c +Auto-merging drivers/gpu/drm/i915/display/intel_display_power.h +Auto-merging drivers/gpu/drm/i915/display/intel_display_power_well.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_display_power_well.h +Auto-merging drivers/gpu/drm/i915/display/intel_dp.c +Auto-merging drivers/gpu/drm/i915/display/intel_hdcp.c +Auto-merging drivers/gpu/drm/i915/display/intel_psr.c +Auto-merging drivers/gpu/drm/i915/display/intel_psr_regs.h +Auto-merging drivers/gpu/drm/i915/gt/uc/intel_huc.c +Auto-merging drivers/gpu/drm/i915/i915_driver.c +Auto-merging drivers/gpu/drm/i915/i915_gpu_error.c +Auto-merging drivers/gpu/drm/i915/selftests/mock_gem_device.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/selftests/mock_gem_device.c +Recorded preimage for 'drivers/gpu/drm/i915/display/intel_display_power_well.h' +Recorded preimage for 'drivers/gpu/drm/i915/selftests/mock_gem_device.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/gpu/drm/i915/display/intel_display_power_well.h'. +Recorded resolution for 'drivers/gpu/drm/i915/selftests/mock_gem_device.c'. +[master fe53749d71a4] Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel +$ git diff -M --stat --summary HEAD^.. + Documentation/gpu/rfc/i915_scheduler.rst | 4 + + drivers/gpu/drm/i915/display/g4x_dp.c | 8 + + drivers/gpu/drm/i915/display/g4x_hdmi.c | 23 ++- + drivers/gpu/drm/i915/display/icl_dsi.c | 134 ++++++++------ + drivers/gpu/drm/i915/display/icl_dsi.h | 4 +- + drivers/gpu/drm/i915/display/intel_bios.c | 188 +++++--------------- + drivers/gpu/drm/i915/display/intel_bios.h | 6 + + drivers/gpu/drm/i915/display/intel_cdclk.c | 12 +- + drivers/gpu/drm/i915/display/intel_crt.c | 2 + + drivers/gpu/drm/i915/display/intel_cx0_phy.c | 13 +- + drivers/gpu/drm/i915/display/intel_cx0_phy.h | 3 - + drivers/gpu/drm/i915/display/intel_ddi.c | 106 +++++++++-- + drivers/gpu/drm/i915/display/intel_ddi.h | 4 +- + drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c | 28 ++- + drivers/gpu/drm/i915/display/intel_display.c | 105 ++--------- + drivers/gpu/drm/i915/display/intel_display.h | 4 +- + drivers/gpu/drm/i915/display/intel_display_core.h | 11 +- + .../gpu/drm/i915/display/intel_display_device.c | 187 ++++++++++++++------ + .../gpu/drm/i915/display/intel_display_device.h | 6 + + drivers/gpu/drm/i915/display/intel_display_irq.c | 18 +- + drivers/gpu/drm/i915/display/intel_display_power.c | 47 +++-- + drivers/gpu/drm/i915/display/intel_display_power.h | 29 ++- + .../drm/i915/display/intel_display_power_well.h | 1 - + drivers/gpu/drm/i915/display/intel_dp.c | 13 +- + drivers/gpu/drm/i915/display/intel_dp_aux.c | 53 +++++- + drivers/gpu/drm/i915/display/intel_dp_aux.h | 3 + + drivers/gpu/drm/i915/display/intel_dsi.c | 20 +++ + drivers/gpu/drm/i915/display/intel_dsi.h | 2 + + drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 2 +- + drivers/gpu/drm/i915/display/intel_dvo.c | 2 + + drivers/gpu/drm/i915/display/intel_hdcp.c | 5 +- + drivers/gpu/drm/i915/display/intel_hdcp_gsc.c | 80 +++++---- + drivers/gpu/drm/i915/display/intel_hdcp_gsc.h | 3 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 72 ++++++-- + drivers/gpu/drm/i915/display/intel_psr.c | 196 +++++++++++++++++---- + drivers/gpu/drm/i915/display/intel_psr_regs.h | 16 ++ + drivers/gpu/drm/i915/display/intel_sdvo.c | 20 ++- + drivers/gpu/drm/i915/display/intel_vdsc.c | 15 +- + drivers/gpu/drm/i915/display/intel_vdsc.h | 1 + + drivers/gpu/drm/i915/display/vlv_dsi.c | 23 --- + .../gpu/drm/i915/gt/intel_execlists_submission.c | 6 +- + drivers/gpu/drm/i915/gt/intel_gt.c | 2 +- + drivers/gpu/drm/i915/gt/intel_gt_irq.c | 8 +- + drivers/gpu/drm/i915/gt/intel_sa_media.c | 2 +- + drivers/gpu/drm/i915/gt/uc/intel_gsc_uc.c | 2 +- + drivers/gpu/drm/i915/gt/uc/intel_huc.c | 4 +- + drivers/gpu/drm/i915/i915_debugfs.c | 1 + + drivers/gpu/drm/i915/i915_driver.c | 2 + + drivers/gpu/drm/i915/i915_drv.h | 11 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 6 + + drivers/gpu/drm/i915/i915_gpu_error.h | 3 + + drivers/gpu/drm/i915/i915_irq.c | 20 +-- + drivers/gpu/drm/i915/i915_pci.c | 64 +++---- + drivers/gpu/drm/i915/intel_clock_gating.c | 11 ++ + drivers/gpu/drm/i915/intel_device_info.c | 48 ++--- + drivers/gpu/drm/i915/intel_device_info.h | 11 +- + drivers/gpu/drm/i915/intel_uncore.h | 5 + + drivers/gpu/drm/i915/selftests/intel_uncore.c | 2 +- + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 4 +- + drivers/gpu/drm/i915/soc/intel_dram.c | 2 +- + drivers/gpu/drm/i915/soc/intel_gmch.c | 4 +- + 61 files changed, 1061 insertions(+), 626 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 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 (c1cd7a7a231a fbdev: imxfb: Convert to devm_platform_ioremap_resource()) +$ 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 | 20 +++++++------------- + 1 file changed, 7 insertions(+), 13 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 (fbb64eedf5a3 ALSA: emu10k1: make E-MU dock monitoring interrupt-driven) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next +Merge made by the 'ort' strategy. + include/sound/emu10k1.h | 4 +-- + sound/pci/emu10k1/emu10k1.c | 8 +----- + sound/pci/emu10k1/emu10k1_main.c | 51 ++++++++++++++++++--------------- + sound/pci/emu10k1/io.c | 2 ++ + sound/pci/emu10k1/irq.c | 7 +++++ + tools/testing/selftests/alsa/pcm-test.c | 8 ++++-- + 6 files changed, 45 insertions(+), 35 deletions(-) +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 (f186c31c04a0 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 (9ce170cef669 kernel: params: Remove unnecessary ‘0’ values from err) +$ git merge -m Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules/modules-next +Merge made by the 'ort' strategy. + include/linux/module_symbol.h | 12 +++++++++++- + kernel/module/kallsyms.c | 2 +- + kernel/params.c | 2 +- + scripts/mod/modpost.c | 2 +- + 4 files changed, 14 insertions(+), 4 deletions(-) +Merging input/next (dd24e202ac72 Input: iqs7222 - add support for Azoteq IQS7222D) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next +Auto-merging drivers/input/joystick/xpad.c +Auto-merging drivers/input/misc/Kconfig +Auto-merging drivers/input/touchscreen/exc3000.c +Auto-merging drivers/input/touchscreen/goodix.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/input/azoteq,iqs7222.yaml | 248 +++++++++-- + .../bindings/input/touchscreen/edt-ft5x06.yaml | 6 + + .../bindings/input/touchscreen/eeti,exc3000.yaml | 2 + + drivers/input/gameport/Kconfig | 4 +- + drivers/input/gameport/gameport.c | 26 +- + drivers/input/joystick/xpad.c | 25 ++ + drivers/input/keyboard/adp5588-keys.c | 17 +- + drivers/input/keyboard/bcm-keypad.c | 14 +- + drivers/input/keyboard/gpio_keys_polled.c | 8 +- + drivers/input/keyboard/pinephone-keyboard.c | 20 +- + drivers/input/keyboard/tegra-kbc.c | 2 +- + drivers/input/misc/Kconfig | 4 +- + drivers/input/misc/gpio-vibra.c | 20 +- + drivers/input/misc/iqs7222.c | 476 ++++++++++++++++++++- + drivers/input/misc/pwm-beeper.c | 19 +- + drivers/input/misc/pwm-vibra.c | 30 +- + drivers/input/misc/rotary_encoder.c | 8 +- + drivers/input/mouse/elan_i2c_core.c | 9 +- + drivers/input/touchscreen/Kconfig | 4 +- + drivers/input/touchscreen/bu21013_ts.c | 72 ++-- + drivers/input/touchscreen/bu21029_ts.c | 51 +-- + drivers/input/touchscreen/chipone_icn8318.c | 8 +- + drivers/input/touchscreen/cy8ctma140.c | 8 +- + drivers/input/touchscreen/edt-ft5x06.c | 10 +- + drivers/input/touchscreen/ektf2127.c | 8 +- + drivers/input/touchscreen/elants_i2c.c | 22 +- + drivers/input/touchscreen/exc3000.c | 7 + + drivers/input/touchscreen/goodix.c | 40 +- + drivers/input/touchscreen/melfas_mip4.c | 9 +- + drivers/input/touchscreen/novatek-nvt-ts.c | 10 +- + drivers/input/touchscreen/pixcir_i2c_ts.c | 38 +- + drivers/input/touchscreen/raydium_i2c_ts.c | 30 +- + drivers/input/touchscreen/resistive-adc-touch.c | 8 +- + drivers/input/touchscreen/silead.c | 8 +- + drivers/input/touchscreen/sis_i2c.c | 20 +- + drivers/input/touchscreen/surface3_spi.c | 13 +- + drivers/input/touchscreen/sx8654.c | 10 +- + include/linux/gameport.h | 2 +- + 38 files changed, 908 insertions(+), 408 deletions(-) +Merging block/for-next (b6202765bf6e Merge branch 'for-6.6/io_uring' 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. + include/uapi/linux/io_uring.h | 8 ++++- + io_uring/cancel.c | 76 ++++++++++++++++++++++++++++++------------- + io_uring/cancel.h | 3 +- + io_uring/poll.c | 17 ++++------ + io_uring/timeout.c | 16 +++------ + 5 files changed, 75 insertions(+), 45 deletions(-) +Merging device-mapper/for-next (7aa303bf1bd2 dm raid: protect md_stop() with 'reconfig_mutex') +$ 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 +Merge made by the 'ort' strategy. + drivers/md/dm-integrity.c | 1 + + drivers/md/dm-raid.c | 20 +++++++++----------- + drivers/md/md.c | 2 ++ + 3 files changed, 12 insertions(+), 11 deletions(-) +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 (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery/for-next +Already up to date. +Merging regulator/for-next (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 (c31288e56c1a evm: Support multiple LSMs providing an xattr) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git security/next +Merge made by the 'ort' strategy. + include/linux/evm.h | 14 ++++--- + include/linux/lsm_hook_defs.h | 6 +-- + include/linux/lsm_hooks.h | 20 ++++++++++ + security/integrity/evm/evm.h | 4 +- + security/integrity/evm/evm_crypto.c | 11 +++++- + security/integrity/evm/evm_main.c | 39 +++++++++++++++---- + security/security.c | 75 ++++++++++++++++++++++++------------- + security/selinux/hooks.c | 17 +++++---- + security/smack/smack.h | 2 +- + security/smack/smack_lsm.c | 68 +++++++++++++++++++-------------- + 10 files changed, 175 insertions(+), 81 deletions(-) +Merging apparmor/apparmor-next (afad53575a93 apparmor: use passed in gfp flags in aa_alloc_null()) +$ git merge -m Merge branch 'apparmor-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor apparmor/apparmor-next +Merge made by the 'ort' strategy. + security/apparmor/apparmorfs.c | 3 +++ + security/apparmor/domain.c | 2 +- + security/apparmor/include/net.h | 1 - + security/apparmor/include/task.h | 2 +- + security/apparmor/policy.c | 4 ++-- + security/apparmor/task.c | 5 +---- + 6 files changed, 8 insertions(+), 9 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 (5b0eea835d4e selinux: introduce an initial SID for early boot processes) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next +Auto-merging security/selinux/hooks.c +Merge made by the 'ort' strategy. + security/selinux/hooks.c | 28 +++++++++++++++++ + security/selinux/include/initial_sid_to_string.h | 2 +- + security/selinux/include/policycap.h | 1 + + security/selinux/include/policycap_names.h | 3 +- + security/selinux/include/security.h | 39 ++++++++++-------------- + security/selinux/ss/policydb.c | 27 ++++++++++++++++ + 6 files changed, 75 insertions(+), 25 deletions(-) +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 (1c7873e33645 mm: lock newly mapped VMA with corrected ordering) +$ git merge -m Merge branch 'master' of https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git tomoyo/master +Already up to date. +Merging tpmdd/next (8d83dede85aa tpm: Do not remap from ACPI resouces again for Pluton TPM) +$ 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-chip.c | 7 +++ + drivers/char/tpm/tpm_crb.c | 19 +++--- + 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 | 17 ++++++ + drivers/char/tpm/tpm_tis_core.c | 69 +++++++++++++++------ + drivers/char/tpm/tpm_tis_core.h | 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 +- + security/keys/trusted-keys/trusted_tpm2.c | 2 +- + 24 files changed, 387 insertions(+), 98 deletions(-) +Merging watchdog/master (2500df55a615 dt-bindings: watchdog: Add Loongson-1 watchdog) +$ 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 (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git audit/next +Already up to date. +Merging devicetree/for-next (31e9f406efae dt-bindings: soc: qcom: stats: Update maintainer email) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next +Already up to date. +Merging dt-krzk/for-next (06c2afb862f9 Linux 6.5-rc1) +$ 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 +Already up to date. +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 (ac442f6a364d Merge branch into tip/master: 'x86/core') +$ 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 e4cc3b9dd0a6] 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/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 ++++++++++++++++++++++++ + 117 files changed, 2789 insertions(+), 306 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. +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 (ace3c5499e61 workqueue: add cmdline parameter `workqueue.unbound_cpus` to further constrain wq_unbound_cpumask at boot time) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 7 ++++ + include/linux/workqueue.h | 44 ++----------------------- + kernel/workqueue.c | 28 ++++++++++++---- + 3 files changed, 32 insertions(+), 47 deletions(-) +Merging drivers-x86/for-next (06c2afb862f9 Linux 6.5-rc1) +$ 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 (06c2afb862f9 Linux 6.5-rc1) +$ 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 (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git hsi/for-next +Already up to date. +Merging leds/for-next (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git leds/for-next +Already up to date. +Merging leds-lj/for-leds-next (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 (06c2afb862f9 Linux 6.5-rc1) +$ 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 (06c2afb862f9 Linux 6.5-rc1) +$ 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 (06c2afb862f9 Linux 6.5-rc1) +$ 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 (06c2afb862f9 Linux 6.5-rc1) +$ 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 (06c2afb862f9 Linux 6.5-rc1) +$ 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 (06c2afb862f9 Linux 6.5-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 (e9fdc41a3d66 fpga: zynq-fpga: Convert to devm_platform_ioremap_resource()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga/for-next +Merge made by the 'ort' strategy. + drivers/fpga/altera-freeze-bridge.c | 4 +--- + drivers/fpga/dfl-fme-main.c | 17 +++++++++-------- + drivers/fpga/dfl-fme-mgr.c | 4 +--- + drivers/fpga/fpga-bridge.c | 23 ++++++++++++----------- + drivers/fpga/fpga-region.c | 14 ++++++++------ + drivers/fpga/socfpga.c | 7 ++----- + drivers/fpga/ts73xx-fpga.c | 4 +--- + drivers/fpga/xilinx-pr-decoupler.c | 4 +--- + drivers/fpga/zynq-fpga.c | 4 +--- + 9 files changed, 36 insertions(+), 45 deletions(-) +Merging icc/icc-next (06c2afb862f9 Linux 6.5-rc1) +$ 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 (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next +Already up to date. +Merging soundwire/next (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next +Already up to date. +Merging extcon/extcon-next (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 (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'gnss-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss/gnss-next +Already up to date. +Merging vfio/next (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 (06c2afb862f9 Linux 6.5-rc1) +$ 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 (06c2afb862f9 Linux 6.5-rc1) +$ 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 (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next +Already up to date. +Merging cgroup/for-next (3ae0b773211e cgroup/cpuset: Allow suppression of sched domain rebuild in update_cpumasks_hier()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git cgroup/for-next +Auto-merging MAINTAINERS +Auto-merging tools/testing/selftests/cgroup/.gitignore +CONFLICT (content): Merge conflict in tools/testing/selftests/cgroup/.gitignore +Auto-merging tools/testing/selftests/cgroup/Makefile +CONFLICT (content): Merge conflict in tools/testing/selftests/cgroup/Makefile +Recorded preimage for 'tools/testing/selftests/cgroup/.gitignore' +Recorded preimage for 'tools/testing/selftests/cgroup/Makefile' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'tools/testing/selftests/cgroup/.gitignore'. +Recorded resolution for 'tools/testing/selftests/cgroup/Makefile'. +[master a9fc5285b35e] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 2 + + kernel/cgroup/cgroup.c | 20 +- + kernel/cgroup/cpuset.c | 262 +++++++++++++-------- + tools/testing/selftests/cgroup/.gitignore | 1 + + tools/testing/selftests/cgroup/Makefile | 2 + + tools/testing/selftests/cgroup/cgroup_util.c | 2 + + tools/testing/selftests/cgroup/cgroup_util.h | 2 + + tools/testing/selftests/cgroup/test_core.c | 2 +- + tools/testing/selftests/cgroup/test_cpuset.c | 275 ++++++++++++++++++++++ + tools/testing/selftests/cgroup/test_cpuset_prs.sh | 2 +- + 10 files changed, 457 insertions(+), 113 deletions(-) + create mode 100644 tools/testing/selftests/cgroup/test_cpuset.c +Merging scsi/for-next (e0d21060a8f6 Merge branch 'misc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi/for-next +Merge made by the 'ort' strategy. +Merging scsi-mkp/for-next (a97ccaa4f043 Merge patch series "Improve checks in blk_revalidate_disk_zones()") +$ 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 block/blk-zoned.c +Auto-merging drivers/block/virtio_blk.c +Auto-merging drivers/scsi/aacraid/aacraid.h +Auto-merging drivers/scsi/qla2xxx/qla_def.h +Auto-merging drivers/scsi/qla2xxx/qla_init.c +Auto-merging drivers/ufs/core/ufshcd.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-driver-ufs | 76 +++++++++++++------------- + block/blk-zoned.c | 86 +++++++++++++++++------------- + drivers/block/null_blk/zoned.c | 16 ++---- + drivers/block/virtio_blk.c | 34 ++++++------ + drivers/nvme/host/zns.c | 9 ++-- + drivers/scsi/aacraid/aacraid.h | 2 +- + drivers/scsi/fnic/fnic_trace.c | 2 +- + drivers/scsi/lpfc/lpfc_hbadisc.c | 2 + + drivers/scsi/qla2xxx/qla_def.h | 1 - + drivers/scsi/qla2xxx/qla_init.c | 4 +- + drivers/scsi/qla2xxx/qla_iocb.c | 5 +- + drivers/scsi/scsi_debug.c | 8 --- + drivers/scsi/sd_zbc.c | 12 ++--- + drivers/ufs/core/ufshcd.c | 38 +++++++++++++ + drivers/ufs/host/Kconfig | 1 + + include/uapi/scsi/scsi_bsg_ufs.h | 25 +++++++++ + include/ufs/ufs.h | 1 + + 17 files changed, 191 insertions(+), 131 deletions(-) +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 bdbf02766b9c] 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 (d16e0b0e7987 gpio: sifive: Support IRQ wake) +$ 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 +Merge made by the 'ort' strategy. + drivers/gpio/gpio-mxc.c | 61 +++++++++++++++++++++- + drivers/gpio/gpio-sifive.c | 1 + + drivers/gpio/gpiolib-acpi.c | 2 +- + drivers/gpio/gpiolib-of.c | 6 +-- + drivers/gpio/gpiolib.c | 120 ++++++++++++++++++++++++-------------------- + drivers/gpio/gpiolib.h | 1 + + 6 files changed, 131 insertions(+), 60 deletions(-) +Merging gpio-intel/for-next (06c2afb862f9 Linux 6.5-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 (3bc551a3007a pinctrl: amd: Unify debounce handling into amd_pinconf_set()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next +Merge made by the 'ort' strategy. + drivers/pinctrl/pinctrl-amd.c | 61 ++++++++++++++++--------------------------- + drivers/pinctrl/pinctrl-amd.h | 1 - + 2 files changed, 23 insertions(+), 39 deletions(-) +Merging pinctrl-intel/for-next (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel/for-next +Already up to date. +Merging pinctrl-renesas/renesas-pinctrl (bf8da305fef9 pinctrl: renesas: rzv2m: Use devm_clk_get_enabled()) +$ 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 +Merge made by the 'ort' strategy. + drivers/pinctrl/renesas/pinctrl-rzg2l.c | 28 ++++++++++----- + drivers/pinctrl/renesas/pinctrl-rzv2m.c | 60 ++++++++++++++------------------- + 2 files changed, 45 insertions(+), 43 deletions(-) +Merging pinctrl-samsung/for-next (06c2afb862f9 Linux 6.5-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 +Already up to date. +Merging userns/for-next (05bd6e0242b4 Merge of unpriv-ipc-sysctls-for-v6.2, and fix-atomic_lock_inc_below-for-v6.2 for testing in linux-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git userns/for-next +Auto-merging Documentation/admin-guide/sysctl/kernel.rst +Merge made by the 'ort' strategy. + Documentation/admin-guide/sysctl/kernel.rst | 14 ++++++++--- + ipc/ipc_sysctl.c | 37 +++++++++++++++++++++++++++-- + ipc/mq_sysctl.c | 36 ++++++++++++++++++++++++++++ + kernel/ucount.c | 16 ++++++------- + 4 files changed, 89 insertions(+), 14 deletions(-) +Merging ktest/for-next (7dc8e24f0e09 ktest: Restore stty setting at first in dodie) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git ktest/for-next +Already up to date. +Merging kselftest/next (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 (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'at24/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next +Already up to date. +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 (06c2afb862f9 Linux 6.5-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 (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git nvmem/for-next +Already up to date. +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 (06c2afb862f9 Linux 6.5-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 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 +Already up to date. +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 (01f23c5f1526 usb: ch9: Replace bmSublinkSpeedAttr 1-element array with flexible array) +$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git kspp/for-next/kspp +Already up to date. +Merging kspp-gustavo/for-next/kspp (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..c49d89dd2e87 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20230711 |