diff options
| -rw-r--r-- | Next/SHA1s | 363 | ||||
| -rw-r--r-- | Next/Trees | 365 | ||||
| -rw-r--r-- | Next/merge.log | 2968 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 3697 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..85cd1e533018 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,363 @@ +Name SHA1 +---- ---- +origin 16a8829130ca22666ac6236178a6233208d425c3 +fixes ac9a78681b921877518763ba0e89202254349d1b +mm-hotfixes 7dc8c1c1244271a36706af6b8c498910397bb3c4 +kbuild-current 58390c8ce1bddb6c623f62e7ed36383e7fa5c02f +arc-current 30a0b95b1335e12efef89dd78518ed3e4a71a763 +arm-current 46dd6078dbc7e363a8bb01209da67015a1538929 +arm64-fixes 32d85999680601d01b2a36713c9ffd7397c8688b +arm-soc-fixes d75eecc3d170d8963ae554a774b8af1f4e1246da +davinci-current fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +drivers-memory-fixes ac9a78681b921877518763ba0e89202254349d1b +tee-fixes ceaa837f96adb69c0df0397937cd74991d5d821a +m68k-current aaee8c7f2a17d2dd015dc97c113c9ea0cc97272a +powerpc-fixes 536d948a8dee21166d9c5b5a4189af56beba16e3 +s390-fixes ac9a78681b921877518763ba0e89202254349d1b +sparc 2d2b17d08bfc3d98cf93622e8c6543eaaf02dabe +fscrypt-current 4bcf6f827a79c59806c695dc280e763c5b6a6813 +fsverity-current a075bacde257f755bea0e53400c9f1cdd1b8e8e6 +net 162bd18eb55adf464a0fa2b4144b8d61c75ff7c2 +bpf 415d7a49cd796a11cfbeaa360b13721bba5117bb +ipsec 5fc46f94219d1d103ffb5f0832be9da674d85a73 +netfilter 7fb0269720d7d5359bc8349eef908a1c96866b65 +ipvs fb7cba61919ada54d088870dd173c61b6b372873 +wireless 50749f2dd6854a41830996ad302aef2ffaf011d8 +wpan bd4e3d82f4ccb422672029b099e402e5b3acd5ee +rdma-fixes ac9a78681b921877518763ba0e89202254349d1b +sound-current 90670ef774a8b6700c38ce1222e6aa263be54d5f +sound-asoc-fixes 051d71e073614a72ad423d6dacba37a7eeff274d +regmap-fixes 70a640c0efa7667453c3911b13335304ce46ad8b +regulator-fixes ac9a78681b921877518763ba0e89202254349d1b +spi-fixes ac9a78681b921877518763ba0e89202254349d1b +pci-current ac9a78681b921877518763ba0e89202254349d1b +driver-core.current ac9a78681b921877518763ba0e89202254349d1b +tty.current ac9a78681b921877518763ba0e89202254349d1b +usb.current ac9a78681b921877518763ba0e89202254349d1b +usb-serial-fixes 09a9639e56c01c7a00d6c0ca63f4c7c41abe075d +phy e42f110700ed7293700c26145e1ed07ea05ac3f6 +staging.current b3dad076a058916c443c93074dc3ee80baaff4ea +iio-fixes 5efe05a434fa772592bd6c9f6ddcaae67c9354dd +counter-current ac9a78681b921877518763ba0e89202254349d1b +char-misc.current ac9a78681b921877518763ba0e89202254349d1b +soundwire-fixes ac9a78681b921877518763ba0e89202254349d1b +thunderbolt-fixes c4af8e3fecd03b0aedcd38145955605cfebe7e3a +input-current 978134c4b192ed04ecf699be3e1b4d23b5d20457 +crypto-current b8969a1b69672b163d057e7745ebc915df689211 +vfio-fixes 4928f67bc911e46a43004251a4d7eb2259ba6077 +kselftest-fixes d7eafa64a158cc9f1d26b3c615d4ada3c17c02ee +modules-fixes f412eef03938d3a40d4f6f5a79d0f98ed89b596d +dmaengine-fixes ac9a78681b921877518763ba0e89202254349d1b +backlight-fixes 88603b6dc419445847923fcb7fe5080067a30f98 +mtd-fixes 93942b70461574ca7fc3d91494ca89b16a4c64c7 +mfd-fixes 88603b6dc419445847923fcb7fe5080067a30f98 +v4l-dvb-fixes 6b854bb90d232c4fda36f0f45ddec9c8350acc47 +reset-fixes 3a2390c6777e3f6662980c6cfc25cafe9e4fef98 +mips-fixes ac9a78681b921877518763ba0e89202254349d1b +at91-fixes fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +omap-fixes 2a906db2824b75444982f5e9df870106982afca8 +kvm-fixes 1a5304fecee523060f26e2778d9d8e33c0562df3 +kvms390-fixes 21f27df854008b86349a203bf97fef79bb11f53e +hwmon-fixes ac9a78681b921877518763ba0e89202254349d1b +nvdimm-fixes c91d713630848460de8669e6570307b7e559863b +cxl-fixes c841ecd8277154c9297dd9ac959494f6deb61e76 +btrfs-fixes b05999d8cdb2308e8e83c34fd7e9a3f1b3c834dd +vfs-fixes 609d54441493c99f21c1823dfd66fa7f4c512ff4 +dma-mapping-fixes bbb73a103fbbed6f63cb738d3783261c4241b4b2 +drivers-x86-fixes 3d43f9f639542fadfb28f40b509bf147a6624d48 +samsung-krzk-fixes ac9a78681b921877518763ba0e89202254349d1b +pinctrl-samsung-fixes ac9a78681b921877518763ba0e89202254349d1b +devicetree-fixes 6997f847cbb72082a2e9aa0fef8ebfcc3bd4ddc5 +dt-krzk-fixes 8bbec86ce6d66fb33530c679f7bb3a123fc9e7da +scsi-fixes 1a7edd041f2d252f251523ba3f2eaead076a8f8d +drm-fixes ac9a78681b921877518763ba0e89202254349d1b +drm-intel-fixes 0bfa9c40559f8b19f84eb706d00dd44502cae7cc +mmc-fixes 81dce1490e28439c3cd8a8650b862a712f3061ba +rtc-fixes 08279468a294d8c996a657ecc9e51bd5c084c75d +gnss-fixes 1b929c02afd37871d5afb9d498426f83432e71c2 +hyperv-fixes ec97e112985c2581ee61854a4b74f080f6cdfc2c +soc-fsl-fixes 4b0986a3613c92f4ec1bdc7f60ec66fea135991f +risc-v-fixes ac9a78681b921877518763ba0e89202254349d1b +riscv-dt-fixes ac9a78681b921877518763ba0e89202254349d1b +riscv-soc-fixes a7a041f2ddf300817ee6010f643424ef5efd2739 +fpga-fixes 510acc93aebca559831408f2d864b7f2106e995f +spdx ac9a78681b921877518763ba0e89202254349d1b +gpio-brgl-fixes 2ce987d7eeb168b749494694ae3666de87fc356e +gpio-intel-fixes fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +pinctrl-intel-fixes ac9a78681b921877518763ba0e89202254349d1b +erofs-fixes 3993f4f456309580445bb515fbc609d995b6a3ae +kunit-fixes ac9a78681b921877518763ba0e89202254349d1b +ubifs-fixes 2241ab53cbb5cdb08a6b2d4688feb13971058f65 +memblock-fixes 647037adcad00f2bab8828d3d41cd0553d41f3bd +nfsd-fixes 48e2e2f7fcfd9ebc08e4971662aa513b7855fef4 +irqchip-fixes 6c9f7434159b96231f5b27ab938f4766e3586b48 +renesas-fixes ab2866f12ca18747413ba41409231d44e0c6149b +broadcom-fixes 9abf2313adc1ca1b6180c508c25f22f9395cc780 +perf-current 9a2d5178b9d51e1c5f9e08989ff97fc8d4893f31 +efi-fixes 0b1d9debe30304f35c1211e6dcdca1935ce67240 +zstd-fixes 6906598f1ce93761716d780b6e3f171e13f0f4ce +battery-fixes 44c524b642996148a8e94f1a1b8751076edcf577 +uml-fixes 73a23d7710331a530e972903318528b75e5a5f58 +asahi-soc-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +iommufd-fixes 13a0d1ae7ee6b438f5537711a8c60cba00554943 +rust-fixes ac9a78681b921877518763ba0e89202254349d1b +v9fs-fixes 36896bc97c0e5fe9f52f578ac7986bf4a9cdfd71 +w1-fixes ac9a78681b921877518763ba0e89202254349d1b +drm-misc-fixes a26cc2934331b57b5a7164bff344f0a2ec245fc0 +mm-stable ac9a78681b921877518763ba0e89202254349d1b +mm-nonmm-stable ac9a78681b921877518763ba0e89202254349d1b +mm 7684b6c4b31556e55e685b89e9b481c1a2db0e34 +kbuild 58390c8ce1bddb6c623f62e7ed36383e7fa5c02f +clang-format 781121a7f6d11d7cae44982f174ea82adeec7db0 +perf 5d27a645f60940fdf589e4ff5351506a7f0fdbaa +compiler-attributes eeac8ede17557680855031c6f305ece2378af326 +dma-mapping ec274aff21b6a94c7973384ca80a503c1bc3b173 +asm-generic 5e98654e30e18bb33d21b773b75fd68fcf673bae +arc f2906aa863381afb0015a9eb7fefad885d4e5a56 +arm 592c759d56f3778a4fc33b920764d08b876a7f96 +arm64 0fddb79bf283a561eb81f09d01f5ac8f61bf8966 +arm-perf 257aedb72e731082ab514058e57b132f0b29d707 +arm-soc 8ecfe9a0e657e78ad5187f7142418f7631458ded +amlogic 0618cb14da6af881c13c4eaede6b7ec2dad97cf2 +asahi-soc f41aba1578192bf08a82d741e001a7c01907c9cb +aspeed 7d4f0b0df7c5ec0cec834f87591423a7bbd1bab2 +at91 ad5125686a4f16ecf73cb8795329e195efd0d2b7 +broadcom bba5ad8482de5bf3389fe61356992410b96fe7f9 +davinci fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +drivers-memory 3d56c7364389fce14547803fef56d6f2cab5d366 +imx-mxs 159d28f66699094d3b9dd65a621ae7834d3f8134 +mediatek e586dd4471725f33b002316c9bc2d88b283f028e +mvebu 12845aa04754ae39a40b730b7f58bc11ac98e8fa +omap c45167f4f5cfdfaddbae941545187906e8658c5f +qcom ac9a78681b921877518763ba0e89202254349d1b +renesas be43a9462ec2358f9bdc10832c2cf0f5a5e944c2 +reset afb39e2bd36af1d80913bb6851caece829526217 +rockchip 43cd56460b1788db7b0b6cd3dfa3132b279dd62b +samsung-krzk 27d31255d0007972f837e33030b76c6edf5d6880 +scmi e06854e84add15564e90cdc57bdab5e0348e9b34 +stm32 49f1d0b65f87692a11386a8b8cd3a4aa3a1d0daa +sunxi 7081db38231a48b1ff590d9d16dfa06c1f8d148f +tee cf1773f935d8f32938ede6a4fdf54c75dd7d534a +tegra 7947eeb21f00599b19b4fcf9c280c71f3b4a2c12 +ti ac9a78681b921877518763ba0e89202254349d1b +xilinx ec1696c3440f1abb40f87ef998405515464188af +clk ac9a78681b921877518763ba0e89202254349d1b +clk-imx ac9a78681b921877518763ba0e89202254349d1b +clk-renesas 7f91fe3a71aa43700eac2650e3b01d50cbbb6f48 +clk-samsung b35f27fe73d8c86fe40125e063b28007e961b862 +csky 1f62ed00a56bf01becaccd81bf30f2fcb0322fd2 +loongarch 2fa5ebe3bc4e31e07a99196455498472417842f2 +m68k aaee8c7f2a17d2dd015dc97c113c9ea0cc97272a +m68knommu ac9a78681b921877518763ba0e89202254349d1b +microblaze fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +mips ac9a78681b921877518763ba0e89202254349d1b +openrisc c91b4a07655d5ba67962a08dfac8bd7f45ad049c +parisc-hd cc719a9ce7a455bef132e0211437847bcd89b4ef +powerpc 3af77224c09d79e03e34e7412f88692483054fed +soc-fsl 4b0986a3613c92f4ec1bdc7f60ec66fea135991f +risc-v ac9a78681b921877518763ba0e89202254349d1b +riscv-dt 6a887bcc4138de9747fdfafc4ebf0a1c6ef4b2c1 +riscv-soc ac9a78681b921877518763ba0e89202254349d1b +s390 de12921a166538a34801fd18fca166c4aeb76fa8 +sh 7ae6521b12b0271adda377f09d39789c82fc841a +uml 6032aca0deb9c138df122192f8ef02de1fdccf25 +xtensa e313de5b5b04176f28384b45ebebd552c0c7dae3 +pidfd 7bcf0b65b84af5e932f4f750f839ec7426f5e4ed +vfs-idmapping 4582b273464e41945b7a686f075bff3188178879 +fscrypt 83e57e47906ce0e99bd61c70fae514e69960d274 +fscache 0885eacdc81f920c3e0554d5615e69a66504a28d +afs 0a278bc196e784b4849c1581266421adbca1989f +btrfs bfb41d71540e91ac9c2c3ac8a25fc742daa2b326 +ceph a12e5342fa27b194286026750af92a3ac91b8897 +cifs 716a3cf317456fa01d54398bb14ab354f50ed6a2 +configfs 77992f896745c63ae64bfccfdc429ab7b3d88da5 +ecryptfs a3d78fe3e1ae8c6a1901635c54a1a799656f72c8 +erofs 745ed7d77834048879bf24088c94e5a6462b613f +exfat fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +ext3 df9c5af6a4efea4d04377f74a9766bc87fa34198 +ext4 b5f9cca1feade4c1910e79731536e022da38c9d9 +f2fs 08c3eab525efb31406494282552a23f33a8a921a +fsverity 04839139213cf60d4c5fc792214a08830e294ff8 +fuse c68ea140050e631d24d61b6e399ca8224a4a2219 +gfs2 644f6bf762fa903f64c59c2ec0f4d0d753527053 +jfs fad376fce0af58deebc5075b8539dc05bf639af3 +ksmbd 201b70446c10bc5ea7a50f1c4a7b4bc61e157308 +nfs e8d018dd0257f744ca50a729e3d042cf2ec9da65 +nfs-anna fbd2a05f29a95d5b42b294bf47e55a711424965b +nfsd 58390c8ce1bddb6c623f62e7ed36383e7fa5c02f +ntfs3 1f60ec8881023e21be22d75e5b5bdc111465700f +orangefs 31720a2b109b3080eb77e97b8f6f50a27b4ae599 +overlayfs 4f11ada10d0ad3fd53e2bd67806351de63a4f9c3 +ubifs b5fda08ef213352ac2df7447611eb4d383cce929 +v9fs 4ec5183ec48656cec489c49f989c508b68b518e3 +v9fs-ericvh ac9a78681b921877518763ba0e89202254349d1b +xfs 2254a7396a0ca6309854948ee1c0a33fa4268cec +zonefs 2b188a2cfc4d8f319ad23832ec1390bdae52daf6 +iomap 3fd41721cd5c30af37c860e6201c98db0a568fd2 +djw-vfs a79168a0c00d710420c1758f6c38df89e12f0763 +file-locks 63355b9884b3d1677de6bd1517cd2b8a9bf53978 +iversion 63355b9884b3d1677de6bd1517cd2b8a9bf53978 +vfs cff4b23c731a1cbdf39d5ce180196b8dffb6c411 +printk 16bff6f075a1055a0084c8a05fd4a0c4ab4b3607 +pci 174977dc80b75a490369800ecb05d525b91a59d4 +pstore 5239a89b06d6b199f133bf0ffea421683187f257 +hid d777b19c63562199b640fd5129e7916a5b7cd240 +i2c 03230ddddf9de50caab7d15d72c510a9009680ea +i3c 6b496a94c5905fca7879bc0dc438a47de40b7d4f +dmi 13a0ac816d22aa47d6c393f14a99f39e49b960df +hwmon-staging 92613681c0090612f0368dcebdcc232af9d74ae8 +jc_docs cdc822dda6f82269b94d5fa60ddc71d98c160fa0 +v4l-dvb ac9a78681b921877518763ba0e89202254349d1b +v4l-dvb-next 6b854bb90d232c4fda36f0f45ddec9c8350acc47 +pm ac9a78681b921877518763ba0e89202254349d1b +cpufreq-arm cde3bb62bf56f34781c3a0e062630f1b7fe6d8c2 +cpupower c2adb1877b76fc81ae041e1db1a6ed2078c6746b +devfreq 376b1446153ca67e7028e6b9555d9b17477f568b +opp 528f2d8d540a3c374d6b765c769620d91536b176 +thermal 2afa82d1fc648c8d4c2ef9e876626abb1089f9ab +dlm 7a40f1f18a88c6d43c8725d7f45146480a79fde1 +rdma ac9a78681b921877518763ba0e89202254349d1b +net-next 94e86ef1b801d213dfb8543633dec86abb1a457d +bpf-next 6e61c5fa4d43d4c3f780f74ba6b08dba80bd653a +ipsec-next f4796398f21b9844017a2dac883b1dd6ad6edd60 +mlx5-next 77f7eb9f3416aace703971156133926e44e2195b +netfilter-next 677fb7525331375ba2f90f4bc94a80b9b6e697a3 +ipvs-next 4774ad841bef97cc51df90195338c5b2573dd4cb +bluetooth e6e576ec4e728b201a801374b0cec649a4473908 +wireless-next f3dc7bb037d813ab7da84f488dd485f0fce66347 +wpan-next 1af3de62f03f651c5e50c0e00f8fed34d07b9df3 +mtd 7227aacb62aeb59b007a6d3489b11f78fa332696 +nand ec185b18c22323cb0cde0319fa90b3e467b1ed2d +spi-nor df6def86b9dcbc3e8ed4964c7b79b70c9b0c3040 +crypto 482c84e906e535072c55395acabd3a58e9443d12 +drm ac9a78681b921877518763ba0e89202254349d1b +drm-misc cf03e2956af307dc25e8c41fd4cffe44482a6ec1 +amdgpu 4d309c9e6d22efd9e63341d5a618ff37b2413b72 +drm-intel 3312bb4ad09ca6423bd4a5b15a94588a8962fb8e +drm-tegra 2429b3c529da29d4277d519bd66d034842dcd70c +drm-msm ac7e7c9c65ecfb1fcc99de91cfd6b17a8d4cb9c1 +drm-msm-lumag ac7e7c9c65ecfb1fcc99de91cfd6b17a8d4cb9c1 +imx-drm 927d8fd465adbaaad6cce82f840d489d7c378f29 +etnaviv 4c22c61e429f004d84eba72d7195bccef33ea0ec +fbdev 457391b0380335d5e9a5babdec90ac53928b23b4 +regmap 1bab2184cb389946e9ff4c95f1798cea80bd52cd +sound a4bb75c4f19db711676e6bf6a278d932a5e7667b +ieee1394 ac9a78681b921877518763ba0e89202254349d1b +sound-asoc 5498bb522b5d181c3a080936c7e04c16309a373d +modules 0b891c83d8c54cb70e186456c2191adb5fd98c56 +input bcf784985e35fc39d682f0dde750162e7f54a1f0 +block 92f55959eee490f8b3fdda3197367f6cead6c33d +device-mapper 38d11da522aacaa05898c734a1cec86f1e611129 +libata 140b26035b2d379d94e6e3936ab2e0adf94efe46 +pcmcia 15e74c6c1ce2d388e967f32cdaa83ca034fa6452 +mmc 4eb0e7873c7159298799aabbd0f29b48689a73f0 +mfd 9e9ff39243ea8795a4833708613f884b39dc91f9 +backlight fb200218b40b7864f64f1a47de61e035d8934e92 +battery 67fce5963b202acc410776cc180c307192dca9d2 +regulator cf27b7d9a574f3383be0ed1953cceda9a715eb51 +security ac9a78681b921877518763ba0e89202254349d1b +apparmor 0bb84cff96af29d8531a1a2bee04e521cdfe35ce +integrity 644f17412f5acf01a19af9d04a921937a2bc86c6 +safesetid 64b634830c919979de4b18163e15d30df66e64a8 +selinux c52df19e3759055cf07d1c0030c46ea958163aa9 +smack de93e515db306767549bb29a926f523ca2a601ab +tomoyo 933fd4391e3def39551e26d2f8bfff4063278993 +tpmdd 7c1a4441ddf1aeba8ad4c411478eac37abcacc55 +watchdog fc4354c6e5c21257cf4a50b32f7c11c7d65c55b3 +iommu e51b4198396cd715b140c0e8b259680429ff0cfb +audit ac9a78681b921877518763ba0e89202254349d1b +devicetree c50eb01940c75b848e0257cea3b521a6d4150c5d +dt-krzk 8bbec86ce6d66fb33530c679f7bb3a123fc9e7da +mailbox d396133dced4cbaa52581d0e9c4aea8e04b8db10 +spi 057e1ae7443cefb4c59923a574512b7bc69683f8 +tip d40dcfe0eed0cd08748af969af8b71e517fd569a +clockevents 158009f1b4a33bc0f354b994eea361362bd83226 +edac d6c5e688899b09dc8c17c665c403cdc23de220f3 +irqchip 2ff1b0839ddd514be4752c64c1c6facf91ff3a56 +ftrace 3862f86c1529fa0016de6344eb974877b4cd3838 +rcu 2983876f3aa4a460c6f3832057defdfad0e7c09a +kvm 7a8016d95651fecce5708ed93a24a03a9ad91c80 +kvm-arm 74819ee73f1f33ac75ae955ce0397a25ab1ec2f8 +kvms390 8a46df7cd135fe576c18efa418cd1549e51f2732 +kvm-riscv 2f4d58f7635aec014428e73ef6120c4d0377c430 +kvm-x86 5c291b93e5d665380dbecc6944973583f9565ee5 +xen-tip cbfac7707ba16619006a4fd60faac46303fd2f3e +percpu b9819165bb455bfdce37086c622a18cce2dd2f5e +workqueues 4d19140f762c316298ec693edf813ec245513ff3 +drivers-x86 ac9a78681b921877518763ba0e89202254349d1b +chrome-platform ac9a78681b921877518763ba0e89202254349d1b +hsi ac9a78681b921877518763ba0e89202254349d1b +leds 1b929c02afd37871d5afb9d498426f83432e71c2 +leds-lj 8325642d2757eba80210dec727bb0bcffb837ff1 +ipmi d08076678ce72140a40553d226f90d189fbe06d1 +driver-core ac9a78681b921877518763ba0e89202254349d1b +usb 986866c3dfb0f930c5cc109a6c509c1391d96b5f +thunderbolt ac9a78681b921877518763ba0e89202254349d1b +usb-serial a095edfc15f0832e046ae23964e249ef5c95af87 +tty ac9a78681b921877518763ba0e89202254349d1b +char-misc ac9a78681b921877518763ba0e89202254349d1b +accel afa351a15d80993f8ba6ae28652cc23127237e37 +coresight 18996a113f2567aef3057e300e3193ce2df1684c +fpga fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +icc b7590f3841f47d5c6732db9a6d6474162109f487 +iio 52cc189b4fc6af6accc45fe7b7053d76d8724059 +phy-next 7a503071e06db4409b7066b8ecca9f3da03dd3b1 +soundwire 9420c9719f03d9c42b79fe8080fbd81900032087 +extcon 4e30418def07f8359c7927d5815788043afbb482 +gnss 1b929c02afd37871d5afb9d498426f83432e71c2 +vfio 705b004ee377b789e39ae237519bab714297ac83 +w1 0df2a5e99d0cb10a3da93fd71dd6753af5adc79f +staging e7e444dfc2fa195deb4ae5cc5d67de51caa98fc4 +counter-next 228354ed692faa08f40f2630658c0771f77da457 +mux ea327624ae52936b2c0eccffd9369983ca2d08e3 +dmaengine ac9a78681b921877518763ba0e89202254349d1b +cgroup 2ef269ef1ac006acf974793d975539244d77b28f +scsi 1a7edd041f2d252f251523ba3f2eaead076a8f8d +scsi-mkp 44ef1604ae9492a7d9238ea79aa0cc7b4c4de860 +vhost ebddc00f450de4f54a591bd5670016562eade445 +rpmsg 47f64e7ef95a58e5c56f2ec62cbadbe868661149 +gpio e73f0f0ee7541171d89f2e2491130c7771ba58d3 +gpio-brgl 8a4adcf67a39b3f308bb8cf686e41c0e26aa12e8 +gpio-intel 782eea0c89f7d071d6b56ecfa1b8b0c81164b9be +pinctrl cbbe077815144ad98fd2ea724d9ec3dade09ca92 +pinctrl-intel ac9a78681b921877518763ba0e89202254349d1b +pinctrl-renesas 5d32cead772c3d074947cb7277dea7532133037b +pinctrl-samsung ac9a78681b921877518763ba0e89202254349d1b +pwm 247ee6c780406513c6031a7f4ea41f1648b03295 +userns 05bd6e0242b4c059ec6797e3d721ecca6d15ff8d +ktest 7dc8e24f0e09834341f84d37433840b353d64bc8 +kselftest f8424c54d04125d4c9521c14daba3e88655df2a9 +kunit ac9a78681b921877518763ba0e89202254349d1b +kunit-next 78227fa03c6854e8ca23911309c763d909653c6e +livepatching 5e36be5973b6ac66198220365bffb7a3641038f9 +rtc e99ab4abebf825de2ce65f6c6c32ee30e00bb077 +nvdimm 305a72efa791c826fe84768ca55e31adc4113ea8 +at24 fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +ntb 942cc9ceccb6178b56bf712b94d76190d8759823 +seccomp 0fb0624b15d21622c214617fda5c05a203b04564 +fsi 35af9fb49bc5c6d61ef70b501c3a56fe161cce3e +slimbus ac9a78681b921877518763ba0e89202254349d1b +nvmem ac9a78681b921877518763ba0e89202254349d1b +xarray 69cb69ea55420388b444ee30b1530ec15ab584f7 +hyperv a494aef23dfc732945cb42e22246a5c31174e4a5 +auxdisplay ddf75a86aba2cfb7ec4497e8692b60c8c8fe0ee7 +kgdb c1cb81429df462eca1b6ba615cddd21dd3103c46 +hmm fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +cfi 3123109284176b1532874591f7c81f3837bbdc17 +mhi 1d1493bdc25f498468a606a4ece947d155cfa3a9 +memblock 34875d6fc52d6dfafe2fc8840e1294bb118ea745 +cxl bfe58458fd2557c9a81b89bc0ff10eb03d6c0745 +zstd 2aa14b1ab2c41a4fe41efae80d58bb77da91f19f +efi 026b85796ab4d52af56f8a1c60d2613983ecd845 +unicode b500d6d7243d2e0807a39a09c52fbe668b59b2c1 +slab ed4cdfbeb8735c36a2e31009866dfc2dfa26db3f +random 512dee0c00ad9e9c7ae9f11fc6743702ea40caff +landlock ed35e2f2f0ded15df313ae6f8da21e85c8e1e493 +rust ac9a78681b921877518763ba0e89202254349d1b +sysctl 0199849acd07d07e2a8e42757653ca8b14a122f5 +execve 88603b6dc419445847923fcb7fe5080067a30f98 +bitmap 714f3af11b21b15d4bab91045928a8498bbbffa1 +hte ac9a78681b921877518763ba0e89202254349d1b +kspp 78f7a3fd6dc66cb788c21d7705977ed13c879351 +kspp-gustavo 00168b415a60cec7558608efb4fc50f2a73daae2 +iommufd 62e37c86bf0718e1ec0156c7a88a43ced6cdf201 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..2bcc9bc483c7 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,365 @@ +Trees included into this release: + +Name Type Url +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master +fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#fixes +mm-hotfixes git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-hotfixes-unstable +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#fixes +arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current git git://git.armlinux.org.uk/~rmk/linux-arm.git#fixes +arm64-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/fixes +arm-soc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#arm/fixes +davinci-current git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#davinci/for-current +drivers-memory-fixes git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#fixes +tee-fixes git https://git.linaro.org/people/jens.wiklander/linux-tee.git#fixes +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +powerpc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes +s390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#fixes +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master +fscrypt-current git git://git.kernel.org/pub/scm/fs/fscrypt/linux.git#for-current +fsverity-current git git://git.kernel.org/pub/scm/fs/fsverity/linux.git#for-current +net git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git#main +bpf git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git#master +ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master +netfilter git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git#master +ipvs git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git#main +wireless git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git#for-next +wpan git git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan.git#master +rdma-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-rc +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus +sound-asoc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-linus +regmap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-linus +regulator-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-linus +spi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git#for-linus +driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-linus +tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus +usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus +usb-serial-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-linus +phy git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#fixes +staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus +iio-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#fixes-togreg +counter-current git git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git#counter-current +char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus +soundwire-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#fixes +thunderbolt-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#fixes +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master +vfio-fixes git git://github.com/awilliam/linux-vfio.git#for-linus +kselftest-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes +modules-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#modules-linus +dmaengine-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#fixes +backlight-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-fixes +mtd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/fixes +mfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-fixes +v4l-dvb-fixes git git://linuxtv.org/mchehab/media-next.git#fixes +reset-fixes git https://git.pengutronix.de/git/pza/linux#reset/fixes +mips-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-fixes +at91-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-fixes +omap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#fixes +kvm-fixes git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#master +kvms390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#master +hwmon-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon +nvdimm-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-fixes +cxl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#fixes +btrfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#next-fixes +vfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#fixes +dma-mapping-fixes git git://git.infradead.org/users/hch/dma-mapping.git#for-linus +drivers-x86-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#fixes +samsung-krzk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#fixes +pinctrl-samsung-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#fixes +devicetree-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#dt/linus +dt-krzk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git#fixes +scsi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#fixes +drm-fixes git git://git.freedesktop.org/git/drm/drm.git#drm-fixes +drm-intel-fixes git git://anongit.freedesktop.org/drm-intel#for-linux-next-fixes +mmc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#fixes +rtc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-fixes +gnss-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-linus +hyperv-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-fixes +soc-fsl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#fix +risc-v-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#fixes +riscv-dt-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-dt-fixes +riscv-soc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-soc-fixes +fpga-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git#fixes +spdx git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git#spdx-linus +gpio-brgl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-current +gpio-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#fixes +pinctrl-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#fixes +erofs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#fixes +kunit-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit-fixes +ubifs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#fixes +memblock-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#fixes +nfsd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#nfsd-fixes +irqchip-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-fixes +renesas-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#fixes +broadcom-fixes git https://github.com/Broadcom/stblinux.git#fixes +perf-current git git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git#perf/urgent +efi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#urgent +zstd-fixes git https://github.com/terrelln/linux.git#zstd-linus +battery-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#fixes +uml-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git#fixes +asahi-soc-fixes git https://github.com/AsahiLinux/linux.git#asahi-soc/fixes +iommufd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git#for-rc +rust-fixes git https://github.com/Rust-for-Linux/linux.git#rust-fixes +v9fs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#fixes/next +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/acme/linux.git#perf-tools-next +compiler-attributes git https://github.com/ojeda/linux.git#compiler-attributes +dma-mapping git git://git.infradead.org/users/hch/dma-mapping.git#for-next +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master +arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next +arm git git://git.armlinux.org.uk/~rmk/linux-arm.git#for-next +arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core +arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf +arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#for-next +amlogic git git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git#for-next +asahi-soc git https://github.com/AsahiLinux/linux.git#asahi-soc/for-next +aspeed git git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git#for-next +at91 git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-next +broadcom git https://github.com/Broadcom/stblinux.git#next +davinci git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#davinci/for-next +drivers-memory git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#for-next +imx-mxs git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next +mediatek git git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git#for-next +mvebu git git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git#for-next +omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#for-next +qcom git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git#for-next +renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#next +reset git https://git.pengutronix.de/git/pza/linux#reset/next +rockchip git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next +samsung-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next +scmi git git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git#for-linux-next +stm32 git git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git#stm32-next +sunxi git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git#sunxi/for-next +tee git https://git.linaro.org/people/jens.wiklander/linux-tee.git#next +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next +ti git git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git#ti-next +xilinx git git://github.com/Xilinx/linux-xlnx.git#for-next +clk git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next +clk-imx git git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git#for-next +clk-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-clk +clk-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git#for-next +csky git git://github.com/c-sky/csky-linux.git#linux-next +loongarch git git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git#loongarch-next +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-next +openrisc git git://github.com/openrisc/linux.git#for-next +parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next +soc-fsl git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#next +risc-v git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#for-next +riscv-dt git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-dt-for-next +riscv-soc git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-soc-for-next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#for-next +sh git git:git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux.git#for-next +uml git git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git#next +xtensa git git://github.com/jcmvbkbc/linux-xtensa.git#xtensa-for-next +pidfd git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#for-next +vfs-idmapping git git://git.kernel.org/pub/scm/linux/kernel/git/vfs/idmapping.git#for-next +fscrypt git git://git.kernel.org/pub/scm/fs/fscrypt/linux.git#for-next +fscache git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#fscache-next +afs git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#afs-next +btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next +ceph git git://github.com/ceph/ceph-client.git#master +cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next +configfs git git://git.infradead.org/users/hch/configfs.git#for-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next +erofs git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#dev +exfat git git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git#dev +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev +f2fs git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev +fsverity git git://git.kernel.org/pub/scm/fs/fsverity/linux.git#for-next +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next +jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next +ksmbd git https://github.com/smfrench/smb3-kernel.git#ksmbd-for-next +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfs-anna git git://git.linux-nfs.org/projects/anna/linux-nfs.git#linux-next +nfsd git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#nfsd-next +ntfs3 git https://github.com/Paragon-Software-Group/linux-ntfs3.git#master +orangefs git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux#for-next +overlayfs git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#overlayfs-next +ubifs git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#next +v9fs git git://github.com/martinetd/linux#9p-next +v9fs-ericvh git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#ericvh/for-next +xfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#for-next +zonefs git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git#for-next +iomap git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#iomap-for-next +djw-vfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#vfs-for-next +file-locks git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#locks-next +iversion git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#iversion-next +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#for-next +printk git git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git#next +pstore git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/pstore +hid git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git#for-next +i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next +i3c git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/next +dmi git git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git#dmi-for-next +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +jc_docs git git://git.lwn.net/linux.git#docs-next +v4l-dvb git git://linuxtv.org/media_tree.git#master +v4l-dvb-next git git://linuxtv.org/mchehab/media-next.git#master +pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +cpufreq-arm git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#cpufreq/arm/linux-next +cpupower git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#cpupower +devfreq git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git#devfreq-next +opp git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#opp/linux-next +thermal git git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git#thermal/linux-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +rdma git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git#main +bpf-next git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git#for-next +ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master +mlx5-next git git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git#mlx5-next +netfilter-next git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git#master +ipvs-next git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#main +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +wireless-next git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git#for-next +wpan-next git git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git#master +mtd git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/next +nand git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#nand/next +spi-nor git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#spi-nor/next +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +drm git git://git.freedesktop.org/git/drm/drm.git#drm-next +drm-misc git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next +amdgpu git https://gitlab.freedesktop.org/agd5f/linux#drm-next +drm-intel git git://anongit.freedesktop.org/drm-intel#for-linux-next +drm-tegra git https://gitlab.freedesktop.org/drm/tegra.git#for-next +drm-msm git https://gitlab.freedesktop.org/drm/msm.git#msm-next +drm-msm-lumag git https://gitlab.freedesktop.org/lumag/msm.git#msm-next-lumag +imx-drm git https://git.pengutronix.de/git/pza/linux#imx-drm/next +etnaviv git https://git.pengutronix.de/git/lst/linux#etnaviv/next +fbdev git git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git#for-next +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +ieee1394 git https://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#modules-next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +block git git://git.kernel.dk/linux-block.git#for-next +device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +libata git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git#for-next +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git#pcmcia-next +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next +backlight git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next +battery git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#for-next +regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git#next +apparmor git git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor#apparmor-next +integrity git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next-integrity +safesetid git https://github.com/micah-morton/linux.git#safesetid-next +selinux git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#next +smack git git://github.com/cschaufler/smack-next#next +tomoyo git https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git#master +tpmdd git git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git#next +watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next +audit git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git#next +devicetree git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next +dt-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git#for-next +mailbox git git://git.linaro.org/landing-teams/working/fujitsu/integration.git#mailbox-for-next +spi git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#master +clockevents git git://git.linaro.org/people/daniel.lezcano/linux.git#timers/drivers/next +edac git git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git#edac-for-next +irqchip git git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#for-next +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next +kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#next +kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next +kvms390 git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#next +kvm-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 +fpga git git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git#for-next +icc git git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git#icc-next +iio git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#togreg +phy-next git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#next +soundwire git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#next +extcon git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next +gnss git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-next +vfio git git://github.com/awilliam/linux-vfio.git#next +w1 git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git#for-next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +counter-next git git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git#counter-next +mux git https://gitlab.com/peda-linux/mux.git#for-next +dmaengine git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#next +cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next +scsi-mkp git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +rpmsg git git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git#for-next +gpio git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next +gpio-brgl git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-next +gpio-intel git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#for-next +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +pinctrl-intel git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#for-next +pinctrl-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-pinctrl +pinctrl-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#for-next +pwm git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git#for-next +userns git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git#for-next +ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next +kunit git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#test +kunit-next git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit +livepatching git git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching#for-next +rtc git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next +nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +at24 git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#at24/for-next +ntb git https://github.com/jonmason/ntb.git#ntb-next +seccomp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/seccomp +fsi git git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git#next +slimbus git git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git#for-next +nvmem git git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git#for-next +xarray git git://git.infradead.org/users/willy/xarray.git#main +hyperv git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-next +auxdisplay git https://github.com/ojeda/linux.git#auxdisplay +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git#kgdb/for-next +hmm git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#hmm +cfi git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#cfi/next +mhi git git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git#mhi-next +memblock git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#for-next +cxl git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#next +zstd git https://github.com/terrelln/linux.git#zstd-next +efi git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#next +unicode git git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git#for-next +slab git git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git#for-next +random git git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git#master +landlock git git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git#next +rust git https://github.com/Rust-for-Linux/linux.git#rust-next +sysctl git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#sysctl-next +execve git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/execve +bitmap git https://github.com/norov/linux.git#bitmap-for-next +hte git git://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git#for-next +kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +kspp-gustavo git git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git#for-next/kspp +iommufd git git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git#for-next diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..5a50cb77f4d8 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,2968 @@ +$ date -R +Wed, 10 May 2023 09:30:48 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at ba0ad6ed89fd media: nxp: imx8-isi: fix buiding on 32-bit +Merging origin/master (16a8829130ca nfs: fix another case of NULL/IS_ERR confusion wrt folio pointers) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating ba0ad6ed89fd..16a8829130ca +Fast-forward (no commit created; -m option ignored) + fs/btrfs/block-rsv.c | 3 ++- + fs/btrfs/ctree.c | 38 +++++++++++++++++++++++++++++++++++++- + fs/btrfs/file-item.c | 5 +++-- + fs/btrfs/ioctl.c | 4 +++- + fs/btrfs/super.c | 7 ++++++- + fs/btrfs/volumes.c | 1 + + fs/btrfs/zoned.c | 6 +++--- + fs/nfs/dir.c | 2 +- + 8 files changed, 56 insertions(+), 10 deletions(-) +Merging fixes/fixes (ac9a78681b92 Linux 6.4-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git fixes/fixes +Already up to date. +Merging mm-hotfixes/mm-hotfixes-unstable (7dc8c1c12442 mm/shmem: fix race in shmem_undo_range w/THP) +$ git merge -m Merge branch 'mm-hotfixes-unstable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-hotfixes/mm-hotfixes-unstable +Merge made by the 'ort' strategy. + include/linux/shrinker.h | 13 +++++++++++-- + lib/maple_tree.c | 12 +++--------- + mm/kfence/kfence.h | 2 +- + mm/memory.c | 3 +++ + mm/shmem.c | 17 ++++++++++++++++- + mm/shrinker_debug.c | 15 ++++++++++----- + mm/vmscan.c | 5 +++-- + mm/zsmalloc.c | 36 +++++++++--------------------------- + mm/zswap.c | 16 ++++++++++++++++ + 9 files changed, 72 insertions(+), 47 deletions(-) +Merging kbuild-current/fixes (58390c8ce1bd Merge tag 'iommu-updates-v6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (30a0b95b1335 Linux 6.1-rc3) +$ git merge -m Merge branch 'for-curr' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc-current/for-curr +Already up to date. +Merging arm-current/fixes (46dd6078dbc7 ARM: 9296/1: HP Jornada 7XX: fix kernel-doc warnings) +$ git merge -m Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm-current/fixes +Auto-merging arch/arm/mach-sa1100/jornada720_ssp.c +Merge made by the 'ort' strategy. + arch/arm/kernel/unwind.c | 25 ++++++++++++++++++++++++- + arch/arm/mach-sa1100/jornada720_ssp.c | 5 ++++- + 2 files changed, 28 insertions(+), 2 deletions(-) +Merging arm64-fixes/for-next/fixes (32d859996806 arm64: compat: Work around uninitialized variable warning) +$ git merge -m Merge branch 'for-next/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64-fixes/for-next/fixes +Already up to date. +Merging arm-soc-fixes/arm/fixes (d75eecc3d170 Merge tag 'qcom-arm64-fixes-for-6.3-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/fixes) +$ git merge -m Merge branch 'arm/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc-fixes/arm/fixes +Already up to date. +Merging davinci-current/davinci/for-current (fe15c26ee26e Linux 6.3-rc1) +$ git merge -m Merge branch 'davinci/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git davinci-current/davinci/for-current +Already up to date. +Merging drivers-memory-fixes/fixes (ac9a78681b92 Linux 6.4-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory-fixes/fixes +Already up to date. +Merging tee-fixes/fixes (ceaa837f96ad Linux 6.2-rc8) +$ git merge -m Merge branch 'fixes' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee-fixes/fixes +Already up to date. +Merging m68k-current/for-linus (aaee8c7f2a17 m68k: kexec: Include <linux/reboot.h>) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (536d948a8dee powerpc/fsl_uli1575: fix kconfig warnings and build errors) +$ 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/kernel/isa-bridge.c | 5 +++-- + arch/powerpc/platforms/Kconfig | 1 + + 2 files changed, 4 insertions(+), 2 deletions(-) +Merging s390-fixes/fixes (ac9a78681b92 Linux 6.4-rc1) +$ 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 (162bd18eb55a linux/dim: Do nothing if no time delta between samples) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/main +Merge made by the 'ort' strategy. + drivers/net/mdio/mdio-mvusb.c | 11 ++++++++++- + include/linux/dim.h | 3 ++- + lib/dim/dim.c | 5 +++-- + lib/dim/net_dim.c | 3 ++- + lib/dim/rdma_dim.c | 3 ++- + net/core/skbuff.c | 4 ++-- + 6 files changed, 21 insertions(+), 8 deletions(-) +Merging bpf/master (415d7a49cd79 selftests/bpf: Fix pkg-config call building sign-file) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git bpf/master +Merge made by the 'ort' strategy. + tools/testing/selftests/bpf/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging ipsec/master (5fc46f94219d Revert "Fix XFRM-I support for nested ESP tunnels") +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master +Auto-merging net/xfrm/xfrm_device.c +Auto-merging net/xfrm/xfrm_user.c +Merge made by the 'ort' strategy. + net/xfrm/xfrm_device.c | 2 +- + net/xfrm/xfrm_interface_core.c | 54 ++++-------------------------------------- + net/xfrm/xfrm_policy.c | 9 ------- + net/xfrm/xfrm_user.c | 1 + + 4 files changed, 6 insertions(+), 60 deletions(-) +Merging netfilter/master (7fb0269720d7 Merge tag 'for-net-2022-05-23' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git netfilter/master +Already up to date. +Merging ipvs/main (fb7cba61919a Merge branch 'rxrpc-timeout-fixes') +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git ipvs/main +Already up to date. +Merging wireless/for-next (50749f2dd685 tcp/udp: Fix memleaks of sk and zerocopy skbs with TX timestamp.) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/for-next +Already up to date. +Merging wpan/master (bd4e3d82f4cc MAINTAINERS: Add wpan patchwork) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan.git wpan/master +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 5 +++-- + drivers/net/ieee802154/mac802154_hwsim.c | 6 ++++-- + 2 files changed, 7 insertions(+), 4 deletions(-) +Merging rdma-fixes/for-rc (ac9a78681b92 Linux 6.4-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 (90670ef774a8 ALSA: hda/realtek: Add a quirk for HP EliteDesk 805) +$ 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/pci/hda/patch_realtek.c | 3 +++ + 1 file changed, 3 insertions(+) +Merging sound-asoc-fixes/for-linus (051d71e07361 ASoC: SOF: amd: Fix NULL pointer crash in acp_sof_ipc_msg_data function) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc-fixes/for-linus +Merge made by the 'ort' strategy. + sound/soc/amd/yc/acp6x-mach.c | 7 +++++++ + sound/soc/dwc/dwc-i2s.c | 4 ++-- + sound/soc/fsl/fsl_micfil.c | 14 +++++++++++++- + sound/soc/sof/amd/acp-ipc.c | 7 ++++++- + 4 files changed, 28 insertions(+), 4 deletions(-) +Merging regmap-fixes/for-linus (70a640c0efa7 regmap: REGMAP_KUNIT should not select REGMAP) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap-fixes/for-linus +Merge made by the 'ort' strategy. + drivers/base/regmap/Kconfig | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) +Merging regulator-fixes/for-linus (ac9a78681b92 Linux 6.4-rc1) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus +Already up to date. +Merging spi-fixes/for-linus (ac9a78681b92 Linux 6.4-rc1) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi-fixes/for-linus +Already up to date. +Merging pci-current/for-linus (ac9a78681b92 Linux 6.4-rc1) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (ac9a78681b92 Linux 6.4-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 (ac9a78681b92 Linux 6.4-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 (ac9a78681b92 Linux 6.4-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 (09a9639e56c0 Linux 6.3-rc6) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial-fixes/usb-linus +Already up to date. +Merging phy/fixes (e42f110700ed phy: qcom-qmp-pcie-msm8996: fix init-count imbalance) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy/fixes +Merge made by the 'ort' strategy. + drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 5 +++-- + drivers/phy/qualcomm/phy-qcom-qmp-pcie-msm8996.c | 5 +++-- + 2 files changed, 6 insertions(+), 4 deletions(-) +Merging staging.current/staging-linus (b3dad076a058 staging: octeon: delete my name from TODO contact) +$ git merge -m Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging.current/staging-linus +Merge made by the 'ort' strategy. + drivers/staging/octeon/TODO | 1 - + 1 file changed, 1 deletion(-) +Merging iio-fixes/fixes-togreg (5efe05a434fa iio: addac: ad74413: fix resistance input processing) +$ git merge -m Merge branch 'fixes-togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio-fixes/fixes-togreg +Merge made by the 'ort' strategy. + .../bindings/iio/adc/nxp,imx8qxp-adc.yaml | 7 +++ + drivers/iio/accel/st_accel_core.c | 4 +- + drivers/iio/adc/ad4130.c | 12 ++++- + drivers/iio/adc/ad7192.c | 8 +-- + drivers/iio/adc/imx93_adc.c | 7 ++- + drivers/iio/adc/mt6370-adc.c | 53 ++++++++++++++++++- + drivers/iio/adc/mxs-lradc-adc.c | 10 ++-- + drivers/iio/adc/palmas_gpadc.c | 10 ++-- + drivers/iio/adc/stm32-adc.c | 61 ++++++++++++---------- + drivers/iio/addac/ad74413r.c | 2 +- + drivers/iio/industrialio-gts-helper.c | 42 +++++++++++---- + drivers/iio/light/rohm-bu27034.c | 14 +++-- + drivers/iio/light/vcnl4035.c | 3 ++ + drivers/iio/magnetometer/tmag5273.c | 5 +- + include/linux/iio/iio-gts-helper.h | 2 +- + 15 files changed, 167 insertions(+), 73 deletions(-) +Merging counter-current/counter-current (ac9a78681b92 Linux 6.4-rc1) +$ git merge -m Merge branch 'counter-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-current/counter-current +Already up to date. +Merging char-misc.current/char-misc-linus (ac9a78681b92 Linux 6.4-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 (ac9a78681b92 Linux 6.4-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (c4af8e3fecd0 thunderbolt: Clear registers properly when auto clear isn't in use) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt-fixes/fixes +Merge made by the 'ort' strategy. + drivers/thunderbolt/nhi.c | 29 ++++++++++++++++++++++++----- + drivers/thunderbolt/nhi_regs.h | 2 ++ + 2 files changed, 26 insertions(+), 5 deletions(-) +Merging input-current/for-linus (978134c4b192 Input: fix open count when closing inhibited device) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input-current/for-linus +Merge made by the 'ort' strategy. + drivers/input/input.c | 2 +- + drivers/input/touchscreen/cyttsp5.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging crypto-current/master (b8969a1b6967 crypto: api - Fix CRYPTO_USER checks for report function) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git crypto-current/master +Already up to date. +Merging vfio-fixes/for-linus (4928f67bc911 vfio/mlx5: Fix the report of dirty_bytes upon pre-copy) +$ git merge -m Merge branch 'for-linus' of git://github.com/awilliam/linux-vfio.git vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (d7eafa64a158 tools/nolibc: Fix build of stdio.h due to header ordering) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest-fixes/fixes +Merge made by the 'ort' strategy. + tools/include/nolibc/nolibc.h | 2 +- + tools/testing/selftests/ftrace/Makefile | 3 +- + tools/testing/selftests/ftrace/ftracetest | 63 ++++++++++++++++++++++++-- + tools/testing/selftests/ftrace/ftracetest-ktap | 8 ++++ + tools/testing/selftests/sgx/Makefile | 1 + + 5 files changed, 72 insertions(+), 5 deletions(-) + create mode 100755 tools/testing/selftests/ftrace/ftracetest-ktap +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 (ac9a78681b92 Linux 6.4-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 (93942b704615 mtd: rawnand: meson: fix bitmask for length in command word) +$ git merge -m Merge branch 'mtd/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd-fixes/mtd/fixes +Already up to date. +Merging mfd-fixes/for-mfd-fixes (88603b6dc419 Linux 6.2-rc2) +$ git merge -m Merge branch 'for-mfd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (6b854bb90d23 media: platform: mtk-mdp3: work around unused-variable warning) +$ git merge -m Merge branch 'fixes' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-fixes/fixes +Merge made by the 'ort' strategy. + .../media/platform/mediatek/mdp3/mtk-mdp3-comp.c | 3 +-- + drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c | 6 +++--- + drivers/media/platform/renesas/rcar-vin/rcar-dma.c | 21 +++++++++++++++------ + 3 files changed, 19 insertions(+), 11 deletions(-) +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 (ac9a78681b92 Linux 6.4-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 (fe15c26ee26e Linux 6.3-rc1) +$ git merge -m Merge branch 'at91-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (2a906db2824b Merge branch 'am5748-fix' into fixes) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap-fixes/fixes +Already up to date. +Merging kvm-fixes/master (1a5304fecee5 Merge tag 'parisc-for-6.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (21f27df85400 KVM: s390: pv: fix external interruption loop not always detected) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390-fixes/master +Already up to date. +Merging hwmon-fixes/hwmon (ac9a78681b92 Linux 6.4-rc1) +$ git merge -m Merge branch 'hwmon' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon +Already up to date. +Merging nvdimm-fixes/libnvdimm-fixes (c91d71363084 nvdimm: Support sizeof(struct page) > MAX_STRUCT_PAGE_SIZE) +$ git merge -m Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging cxl-fixes/fixes (c841ecd82771 cxl/hdm: Add more HDM decoder debug messages at startup) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl-fixes/fixes +Already up to date. +Merging btrfs-fixes/next-fixes (b05999d8cdb2 Merge branch 'misc-6.4' into next-fixes) +$ git merge -m Merge branch 'next-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs-fixes/next-fixes +Merge made by the 'ort' strategy. + fs/btrfs/backref.c | 19 ++++++++++--------- + fs/btrfs/backref.h | 6 ++++++ + fs/btrfs/free-space-cache.c | 7 ++++--- + fs/btrfs/print-tree.c | 6 +++--- + fs/btrfs/relocation.c | 2 +- + 5 files changed, 24 insertions(+), 16 deletions(-) +Merging vfs-fixes/fixes (609d54441493 fs: prevent out-of-bounds array speculation when closing a file descriptor) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs-fixes/fixes +Already up to date. +Merging dma-mapping-fixes/for-linus (bbb73a103fbb swiotlb: fix a braino in the alignment check fix) +$ git merge -m Merge branch 'for-linus' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping-fixes/for-linus +Already up to date. +Merging drivers-x86-fixes/fixes (3d43f9f63954 platform/mellanox: fix potential race in mlxbf-tmfifo driver) +$ 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. + drivers/platform/mellanox/mlxbf-tmfifo.c | 11 ++++-- + drivers/platform/x86/hp/hp-wmi.c | 1 + + .../uncore-frequency/uncore-frequency-common.c | 6 +++- + drivers/platform/x86/intel_scu_pcidrv.c | 1 + + drivers/platform/x86/thinkpad_acpi.c | 24 ++++++++++--- + drivers/platform/x86/touchscreen_dmi.c | 41 ++++++++++++++++++++++ + 6 files changed, 76 insertions(+), 8 deletions(-) +Merging samsung-krzk-fixes/fixes (ac9a78681b92 Linux 6.4-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/fixes (ac9a78681b92 Linux 6.4-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung-fixes/fixes +Already up to date. +Merging devicetree-fixes/dt/linus (6997f847cbb7 MAINTAINERS: add Conor as a dt-bindings maintainer) +$ git merge -m Merge branch 'dt/linus' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree-fixes/dt/linus +Already up to date. +Merging dt-krzk-fixes/fixes (8bbec86ce6d6 dt-bindings: PCI: fsl,imx6q: fix assigned-clocks warning) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk-fixes/fixes +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/media/i2c/ovti,ov2685.yaml | 1 + + .../bindings/pci/fsl,imx6q-pcie-common.yaml | 13 +--- + .../devicetree/bindings/pci/fsl,imx6q-pcie-ep.yaml | 38 +++++++++++ + .../devicetree/bindings/pci/fsl,imx6q-pcie.yaml | 77 ++++++++++++++++++++++ + MAINTAINERS | 2 +- + 5 files changed, 119 insertions(+), 12 deletions(-) +Merging scsi-fixes/fixes (1a7edd041f2d scsi: ufs: core: Fix I/O hang that occurs when BKOPS fails in W-LUN suspend) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-fixes/fixes +Merge made by the 'ort' strategy. + drivers/ufs/core/ufshcd.c | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) +Merging drm-fixes/drm-fixes (ac9a78681b92 Linux 6.4-rc1) +$ 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 (0bfa9c40559f drm/i915/dp: prevent potential div-by-zero) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm-intel drm-intel-fixes/for-linux-next-fixes +Merge made by the 'ort' strategy. + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 4 +-- + drivers/gpu/drm/i915/display/intel_dp.c | 5 +++ + drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c | 35 +++++++++++++++++++++ + drivers/gpu/drm/i915/gt/uc/intel_guc_capture.c | 7 +++-- + drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c | 38 ++++++++++++++++------- + drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.h | 1 + + drivers/gpu/drm/i915/gt/uc/intel_guc_slpc_types.h | 1 + + 7 files changed, 76 insertions(+), 15 deletions(-) +Merging mmc-fixes/fixes (81dce1490e28 mmc: sdhci-esdhc-imx: make "no-mmc-hs400" works) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes +Merge made by the 'ort' strategy. + drivers/mmc/core/block.c | 5 +++++ + drivers/mmc/host/sdhci-cadence.c | 8 +++++--- + drivers/mmc/host/sdhci-esdhc-imx.c | 18 ++++++++++-------- + 3 files changed, 20 insertions(+), 11 deletions(-) +Merging rtc-fixes/rtc-fixes (08279468a294 rtc: sunplus: fix format string for printing resource) +$ git merge -m Merge branch 'rtc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc-fixes/rtc-fixes +Already up to date. +Merging gnss-fixes/gnss-linus (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'gnss-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (ec97e112985c Drivers: hv: vmbus: Call hv_synic_free() if hv_synic_alloc() fails) +$ git merge -m Merge branch 'hyperv-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes +Merge made by the 'ort' strategy. + arch/x86/hyperv/hv_vtl.c | 2 ++ + drivers/hv/vmbus_drv.c | 5 ++--- + 2 files changed, 4 insertions(+), 3 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 (ac9a78681b92 Linux 6.4-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 (ac9a78681b92 Linux 6.4-rc1) +$ git merge -m Merge branch 'riscv-dt-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt-fixes/riscv-dt-fixes +Already up to date. +Merging riscv-soc-fixes/riscv-soc-fixes (a7a041f2ddf3 soc: microchip: mpfs: handle failed system service requests) +$ git merge -m Merge branch 'riscv-soc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc-fixes/riscv-soc-fixes +Merge made by the 'ort' strategy. + drivers/soc/microchip/mpfs-sys-controller.c | 6 ++++++ + 1 file changed, 6 insertions(+) +Merging fpga-fixes/fixes (510acc93aebc dt-bindings: fpga: replace Ivan Bornyakov maintainership) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga-fixes/fixes +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/fpga/lattice,sysconfig.yaml | 2 +- + Documentation/devicetree/bindings/fpga/microchip,mpf-spi-fpga-mgr.yaml | 2 +- + MAINTAINERS | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) +Merging spdx/spdx-linus (ac9a78681b92 Linux 6.4-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 (2ce987d7eeb1 gpio: 104-idi-48: Enable use_raw_spinlock for idi48_regmap_config) +$ git merge -m Merge branch 'gpio/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl-fixes/gpio/for-current +Already up to date. +Merging gpio-intel-fixes/fixes (fe15c26ee26e Linux 6.3-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel-fixes/fixes +Already up to date. +Merging pinctrl-intel-fixes/fixes (ac9a78681b92 Linux 6.4-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel-fixes/fixes +Already up to date. +Merging erofs-fixes/fixes (3993f4f45630 erofs: use wrapper i_blocksize() in erofs_file_read_iter()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs-fixes/fixes +Already up to date. +Merging kunit-fixes/kunit-fixes (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 (48e2e2f7fcfd SUNRPC: always free ctxt when freeing deferred request) +$ git merge -m Merge branch 'nfsd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd-fixes/nfsd-fixes +Auto-merging fs/lockd/svc.c +Merge made by the 'ort' strategy. + fs/lockd/svc.c | 2 +- + fs/nfsd/nfsctl.c | 25 ++++++++--------- + include/linux/sunrpc/svc_rdma.h | 2 +- + include/linux/sunrpc/svc_xprt.h | 2 +- + net/sunrpc/auth_gss/gss_krb5_crypto.c | 10 +++++++ + net/sunrpc/svc.c | 17 +++++++----- + net/sunrpc/svc_xprt.c | 24 ++++++++++++----- + net/sunrpc/svcsock.c | 46 ++++++++++++++------------------ + net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 11 ++++---- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 2 +- + 10 files changed, 81 insertions(+), 60 deletions(-) +Merging irqchip-fixes/irq/irqchip-fixes (6c9f7434159b irqchip: IMX_MU_MSI should depend on ARCH_MXC) +$ git merge -m Merge branch 'irq/irqchip-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git irqchip-fixes/irq/irqchip-fixes +Already up to date. +Merging renesas-fixes/fixes (ab2866f12ca1 arm64: dts: renesas: r8a779g0: Fix HSCIF0 interrupt number) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas-fixes/fixes +Already up to date. +Merging broadcom-fixes/fixes (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'fixes' of https://github.com/Broadcom/stblinux.git broadcom-fixes/fixes +Already up to date. +Merging perf-current/perf/urgent (9a2d5178b9d5 Revert "perf build: Make BUILD_BPF_SKEL default, rename to NO_BPF_SKEL") +$ git merge -m Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git perf-current/perf/urgent +Already up to date. +Merging efi-fixes/urgent (0b1d9debe303 efi/libstub: randomalloc: Return EFI_OUT_OF_RESOURCES on failure) +$ git merge -m Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-fixes/urgent +Already up to date. +Merging zstd-fixes/zstd-linus (6906598f1ce9 zstd: Fix definition of assert()) +$ git merge -m Merge branch 'zstd-linus' of https://github.com/terrelln/linux.git zstd-fixes/zstd-linus +Already up to date. +Merging battery-fixes/fixes (44c524b64299 power: supply: Fix power_supply_get_battery_info() if parent is NULL) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery-fixes/fixes +Merge made by the 'ort' strategy. + drivers/power/supply/ab8500_btemp.c | 6 +- + drivers/power/supply/ab8500_fg.c | 6 +- + drivers/power/supply/axp288_fuel_gauge.c | 2 +- + drivers/power/supply/bq24190_charger.c | 1 + + drivers/power/supply/bq25890_charger.c | 5 +- + drivers/power/supply/bq27xxx_battery.c | 181 ++++++++++++++++------------- + drivers/power/supply/bq27xxx_battery_i2c.c | 3 +- + drivers/power/supply/power_supply_core.c | 7 +- + drivers/power/supply/power_supply_leds.c | 5 +- + drivers/power/supply/sc27xx_fuel_gauge.c | 9 +- + include/linux/power/bq27xxx_battery.h | 4 + + 11 files changed, 123 insertions(+), 106 deletions(-) +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 +Merge made by the 'ort' strategy. + arch/um/drivers/Makefile | 4 +++- + arch/um/drivers/harddog.h | 9 +++++++++ + arch/um/drivers/harddog_kern.c | 7 +------ + arch/um/drivers/harddog_user.c | 1 + + arch/um/drivers/harddog_user_exp.c | 9 +++++++++ + 5 files changed, 23 insertions(+), 7 deletions(-) + create mode 100644 arch/um/drivers/harddog.h + create mode 100644 arch/um/drivers/harddog_user_exp.c +Merging asahi-soc-fixes/asahi-soc/fixes (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'asahi-soc/fixes' of https://github.com/AsahiLinux/linux.git asahi-soc-fixes/asahi-soc/fixes +Already up to date. +Merging iommufd-fixes/for-rc (13a0d1ae7ee6 iommufd: Do not corrupt the pfn list when doing batch carry) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd-fixes/for-rc +Already up to date. +Merging rust-fixes/rust-fixes (ac9a78681b92 Linux 6.4-rc1) +$ git merge -m Merge branch 'rust-fixes' of https://github.com/Rust-for-Linux/linux.git rust-fixes/rust-fixes +Already up to date. +Merging v9fs-fixes/fixes/next (36896bc97c0e fs/9p: Fix a datatype used with V9FS_DIRECT_IO) +$ git merge -m Merge branch 'fixes/next' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git v9fs-fixes/fixes/next +Merge made by the 'ort' strategy. + fs/9p/v9fs.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging w1-fixes/fixes (ac9a78681b92 Linux 6.4-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git w1-fixes/fixes +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (a26cc2934331 drm/mipi-dsi: Set the fwnode for mipi_dsi_device) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm/drm-misc drm-misc-fixes/for-linux-next-fixes +Auto-merging drivers/gpu/drm/ast/ast_main.c +Auto-merging drivers/gpu/drm/drm_fb_helper.c +Auto-merging drivers/gpu/drm/drm_mipi_dsi.c +Auto-merging include/drm/display/drm_dp.h +Auto-merging include/drm/display/drm_dp_helper.h +Merge made by the 'ort' strategy. + drivers/firmware/sysfb_simplefb.c | 4 +++- + drivers/gpu/drm/ast/ast_main.c | 9 +++++---- + drivers/gpu/drm/drm_fb_helper.c | 16 ++++++++++++---- + drivers/gpu/drm/drm_mipi_dsi.c | 2 +- + drivers/gpu/drm/nouveau/include/nvif/if0012.h | 4 +++- + drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.h | 3 ++- + drivers/gpu/drm/nouveau/nvkm/engine/disp/uoutp.c | 2 +- + include/drm/display/drm_dp.h | 5 ++--- + include/drm/display/drm_dp_helper.h | 5 ++--- + 9 files changed, 31 insertions(+), 19 deletions(-) +Merging mm-stable/mm-stable (ac9a78681b92 Linux 6.4-rc1) +$ git merge -m Merge branch 'mm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-stable/mm-stable +Already up to date. +Merging mm-nonmm-stable/mm-nonmm-stable (ac9a78681b92 Linux 6.4-rc1) +$ git merge -m Merge branch 'mm-nonmm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-nonmm-stable/mm-nonmm-stable +Already up to date. +Merging mm/mm-everything (7684b6c4b315 Merge branch 'mm-nonmm-unstable' into mm-everything) +$ git merge -m Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm/mm-everything +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 7 + + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + drivers/dma-buf/heaps/system_heap.c | 5 +- + fs/fs-writeback.c | 16 +- + fs/hugetlbfs/inode.c | 5 +- + fs/ntfs/mft.c | 38 +- + include/linux/cgroup.h | 1 - + include/linux/maple_tree.h | 129 ++- + include/linux/memcontrol.h | 5 - + include/linux/mm.h | 14 + + include/linux/mmdebug.h | 14 + + include/linux/swap.h | 1 + + include/linux/syscalls.h | 5 + + include/uapi/asm-generic/unistd.h | 5 +- + include/uapi/linux/mman.h | 14 + + init/Kconfig | 10 + + kernel/cgroup/rstat.c | 26 +- + kernel/kthread.c | 4 +- + kernel/sys_ni.c | 1 + + lib/Kconfig.debug | 10 +- + lib/maple_tree.c | 1186 +++++++++++--------- + lib/test_maple_tree.c | 863 ++++++++++++-- + mm/compaction.c | 12 +- + mm/debug.c | 9 + + mm/dmapool.c | 10 +- + mm/filemap.c | 171 +++ + mm/gup.c | 150 ++- + mm/internal.h | 26 +- + mm/memcontrol.c | 192 ++-- + mm/migrate.c | 49 +- + mm/mmap.c | 169 +-- + mm/page_alloc.c | 2 +- + mm/workingset.c | 150 ++- + scripts/spelling.txt | 22 + + tools/testing/radix-tree/linux/init.h | 1 + + tools/testing/radix-tree/maple.c | 164 +-- + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/cachestat/.gitignore | 2 + + tools/testing/selftests/cachestat/Makefile | 8 + + tools/testing/selftests/cachestat/test_cachestat.c | 258 +++++ + 41 files changed, 2735 insertions(+), 1022 deletions(-) + create mode 100644 tools/testing/selftests/cachestat/.gitignore + create mode 100644 tools/testing/selftests/cachestat/Makefile + create mode 100644 tools/testing/selftests/cachestat/test_cachestat.c +Merging kbuild/for-next (58390c8ce1bd Merge tag 'iommu-updates-v6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild/for-next +Already up to date. +Merging clang-format/clang-format (781121a7f6d1 clang-format: Fix space after for_each macros) +$ git merge -m Merge branch 'clang-format' of https://github.com/ojeda/linux.git clang-format/clang-format +Already up to date. +Merging perf/perf-tools-next (5d27a645f609 perf tracepoint: Fix memory leak in is_valid_tracepoint()) +$ git merge -m Merge branch 'perf-tools-next' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git perf/perf-tools-next +Auto-merging tools/perf/arch/common.c +Auto-merging tools/perf/util/evsel_fprintf.c +Auto-merging tools/perf/util/symbol-elf.c +Merge made by the 'ort' strategy. + tools/perf/Documentation/perf-script.txt | 2 +- + tools/perf/arch/common.c | 18 ++++++++++ + tools/perf/builtin-script.c | 60 +++++++++++++------------------- + tools/perf/util/dso.c | 33 ++++++++++++++++++ + tools/perf/util/dso.h | 8 +++-- + tools/perf/util/evsel_fprintf.c | 16 ++++----- + tools/perf/util/evsel_fprintf.h | 1 + + tools/perf/util/map.c | 32 +++++++++++++++-- + tools/perf/util/map.h | 1 + + 9 files changed, 119 insertions(+), 52 deletions(-) +Merging compiler-attributes/compiler-attributes (eeac8ede1755 Linux 6.3-rc2) +$ git merge -m Merge branch 'compiler-attributes' of https://github.com/ojeda/linux.git compiler-attributes/compiler-attributes +Already up to date. +Merging dma-mapping/for-next (ec274aff21b6 swiotlb: Omit total_used and used_hiwater if !CONFIG_DEBUG_FS) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping/for-next +Already up to date. +Merging asm-generic/master (5e98654e30e1 Merge branch 'asm-generic-fixes' into asm-generic) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git asm-generic/master +Merge made by the 'ort' strategy. +Merging arc/for-next (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc/for-next +Already up to date. +Merging arm/for-next (592c759d56f3 Merge branches 'misc' and 'fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm/for-next +Merge made by the 'ort' strategy. +Merging arm64/for-next/core (0fddb79bf283 arm64: lds: move .got section out of .text) +$ git merge -m Merge branch 'for-next/core' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64/for-next/core +Already up to date. +Merging arm-perf/for-next/perf (257aedb72e73 drivers/perf: hisi: add NULL check for name) +$ git merge -m Merge branch 'for-next/perf' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git arm-perf/for-next/perf +Already up to date. +Merging arm-soc/for-next (8ecfe9a0e657 soc: document merges) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next +Merge made by the 'ort' strategy. + arch/arm/arm-soc-for-next-contents.txt | 217 +++++++++++++++++++++++++++++++++ + 1 file changed, 217 insertions(+) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt +Merging amlogic/for-next (0618cb14da6a Merge branch 'v6.5/arm-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 | 9 ++++++++- + arch/arm/boot/dts/meson8b.dtsi | 4 ++-- + arch/arm64/boot/dts/amlogic/meson-a1.dtsi | 1 + + arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 1 + + arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 1 + + arch/arm64/boot/dts/amlogic/meson-g12b.dtsi | 1 + + arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 1 + + arch/arm64/boot/dts/amlogic/meson-sm1.dtsi | 1 + + 8 files changed, 16 insertions(+), 3 deletions(-) +Merging asahi-soc/asahi-soc/for-next (f41aba157819 Merge branch 'asahi-soc/dt' into asahi-soc/for-next) +$ git merge -m Merge branch 'asahi-soc/for-next' of https://github.com/AsahiLinux/linux.git asahi-soc/asahi-soc/for-next +Merge made by the 'ort' strategy. +Merging aspeed/for-next (7d4f0b0df7c5 ARM: dts: aspeed-g6: Add UDMA node) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git aspeed/for-next +Already up to date. +Merging at91/at91-next (ad5125686a4f Merge branch 'at91-dt' into at91-next) +$ git merge -m Merge branch 'at91-next' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91/at91-next +Merge made by the 'ort' strategy. + drivers/clk/microchip/Kconfig | 4 ++-- + drivers/clk/microchip/clk-pic32mzda.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) +Merging broadcom/next (bba5ad8482de Merge branch 'devicetree/next' into next) +$ git merge -m Merge branch 'next' of https://github.com/Broadcom/stblinux.git broadcom/next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 1 + + arch/arm/boot/dts/bcm-ns.dtsi | 238 +++++++++++++++++++++ + arch/arm/boot/dts/bcm11351.dtsi | 8 +- + arch/arm/boot/dts/bcm21664-garnet.dts | 6 +- + arch/arm/boot/dts/bcm21664.dtsi | 8 +- + arch/arm/boot/dts/bcm23550.dtsi | 16 +- + arch/arm/boot/dts/bcm28155-ap.dts | 4 +- + arch/arm/boot/dts/bcm47622.dtsi | 1 + + arch/arm/boot/dts/bcm5301x.dtsi | 230 +------------------- + arch/arm/boot/dts/bcm63148.dtsi | 1 + + arch/arm/boot/dts/bcm63178.dtsi | 1 + + arch/arm/boot/dts/bcm6756.dtsi | 1 + + arch/arm/boot/dts/bcm6846.dtsi | 1 + + arch/arm/boot/dts/bcm6855.dtsi | 1 + + arch/arm/boot/dts/bcm6878.dtsi | 1 + + arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi | 1 + + arch/arm64/boot/dts/broadcom/bcmbca/bcm4912.dtsi | 1 + + arch/arm64/boot/dts/broadcom/bcmbca/bcm63146.dtsi | 1 + + arch/arm64/boot/dts/broadcom/bcmbca/bcm63158.dtsi | 1 + + arch/arm64/boot/dts/broadcom/bcmbca/bcm6813.dtsi | 1 + + arch/arm64/boot/dts/broadcom/bcmbca/bcm6856.dtsi | 1 + + arch/arm64/boot/dts/broadcom/bcmbca/bcm6858.dtsi | 1 + + arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi | 1 + + .../arm64/boot/dts/broadcom/stingray/stingray.dtsi | 4 + + 24 files changed, 280 insertions(+), 250 deletions(-) + create mode 100644 arch/arm/boot/dts/bcm-ns.dtsi +Merging davinci/davinci/for-next (fe15c26ee26e Linux 6.3-rc1) +$ git merge -m Merge branch 'davinci/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git davinci/davinci/for-next +Already up to date. +Merging drivers-memory/for-next (3d56c7364389 memory: renesas-rpc-if: Fix PHYCNT.STRTIM setting) +$ 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/renesas-rpc-if.c | 53 ++++++++++++++++++++++++++++++----------- + 1 file changed, 39 insertions(+), 14 deletions(-) +Merging imx-mxs/for-next (159d28f66699 Merge branch 'imx/defconfig' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git imx-mxs/for-next +Merge made by the 'ort' strategy. +Merging mediatek/for-next (e586dd447172 Merge branch 'v6.3-next/soc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git mediatek/for-next +Merge made by the 'ort' strategy. +Merging mvebu/for-next (12845aa04754 Merge branch 'mvebu/dt' into mvebu/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git mvebu/for-next +Merge made by the 'ort' strategy. +Merging omap/for-next (c45167f4f5cf Merge branch 'omap-for-v6.4/dt' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap/for-next +Merge made by the 'ort' strategy. +Merging qcom/for-next (ac9a78681b92 Linux 6.4-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git qcom/for-next +Already up to date. +Merging renesas/next (be43a9462ec2 Merge branch 'renesas-dts-for-v6.5' into renesas-next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas/next +Merge made by the 'ort' strategy. + arch/arm64/boot/dts/renesas/Makefile | 2 + + arch/arm64/boot/dts/renesas/r8a779a0.dtsi | 50 +++++ + arch/arm64/boot/dts/renesas/r9a07g044.dtsi | 123 +++++++++++++ + .../renesas/r9a07g044c2-smarc-cru-csi-ov5645.dtso | 21 +++ + .../renesas/r9a07g044l2-smarc-cru-csi-ov5645.dtso | 2 +- + arch/arm64/boot/dts/renesas/r9a07g054.dtsi | 203 +++++++++++++++++++++ + .../renesas/r9a07g054l2-smarc-cru-csi-ov5645.dtso | 1 + + arch/arm64/boot/dts/renesas/rzg2l-smarc.dtsi | 79 ++++++++ + arch/arm64/boot/dts/renesas/rzg2lc-smarc.dtsi | 79 ++++++++ + 9 files changed, 559 insertions(+), 1 deletion(-) + create mode 100644 arch/arm64/boot/dts/renesas/r9a07g044c2-smarc-cru-csi-ov5645.dtso + create mode 120000 arch/arm64/boot/dts/renesas/r9a07g054l2-smarc-cru-csi-ov5645.dtso +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 +Merge made by the 'ort' strategy. + .../devicetree/bindings/reset/oxnas,reset.txt | 32 ------ + drivers/reset/Kconfig | 6 +- + drivers/reset/Makefile | 1 - + drivers/reset/reset-ath79.c | 4 +- + drivers/reset/reset-axs10x.c | 4 +- + drivers/reset/reset-brcmstb-rescal.c | 4 +- + drivers/reset/reset-hsdk.c | 7 +- + drivers/reset/reset-lpc18xx.c | 4 +- + drivers/reset/reset-meson-audio-arb.c | 7 +- + drivers/reset/reset-meson.c | 4 +- + drivers/reset/reset-oxnas.c | 114 --------------------- + drivers/reset/starfive/Kconfig | 3 +- + drivers/reset/sti/Kconfig | 4 - + drivers/reset/sti/Makefile | 4 +- + drivers/reset/sti/reset-syscfg.c | 18 +--- + 15 files changed, 18 insertions(+), 198 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/reset/oxnas,reset.txt + delete mode 100644 drivers/reset/reset-oxnas.c +Merging rockchip/for-next (43cd56460b17 Merge branch 'v6.5-armsoc/dts64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git rockchip/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/rockchip.yaml | 7 + + .../devicetree/bindings/soc/rockchip/grf.yaml | 2 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + arch/arm64/boot/dts/rockchip/Makefile | 2 + + arch/arm64/boot/dts/rockchip/rk3308.dtsi | 1 + + arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 14 +- + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 1 + + .../boot/dts/rockchip/rk3566-soquartz-cm4.dts | 18 +- + arch/arm64/boot/dts/rockchip/rk3566-soquartz.dtsi | 29 +- + .../boot/dts/rockchip/rk3568-fastrhino-r66s.dts | 27 ++ + .../boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi | 484 +++++++++++++++++++++ + .../boot/dts/rockchip/rk3568-fastrhino-r68s.dts | 112 +++++ + arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 34 ++ + drivers/soc/rockchip/dtpm.c | 54 +-- + drivers/soc/rockchip/pm_domains.c | 160 +++++-- + 15 files changed, 850 insertions(+), 97 deletions(-) + create mode 100644 arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r68s.dts +Merging samsung-krzk/for-next (27d31255d000 Merge branch 'next/soc' 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. + .../bindings/arm/samsung/samsung-boards.yaml | 10 + + .../bindings/clock/samsung,exynos-clock.yaml | 1 + + .../bindings/soc/samsung/exynos-pmu.yaml | 5 + + arch/arm/boot/dts/exynos4.dtsi | 4 +- + arch/arm/boot/dts/exynos4210-trats.dts | 2 - + arch/arm/boot/dts/exynos4210-universal_c210.dts | 3 - + arch/arm/boot/dts/exynos4212.dtsi | 157 +++++ + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 2 - + arch/arm/boot/dts/exynos4412.dtsi | 644 +------------------- + ...os4412-pinctrl.dtsi => exynos4x12-pinctrl.dtsi} | 4 +- + arch/arm/boot/dts/exynos4x12.dtsi | 664 +++++++++++++++++++++ + arch/arm/boot/dts/s5pv210-pinctrl.dtsi | 2 +- + arch/arm/boot/dts/s5pv210-smdkv210.dts | 8 + + arch/arm/boot/dts/s5pv210.dtsi | 12 +- + arch/arm/mach-exynos/Kconfig | 5 + + arch/arm/mach-exynos/common.h | 8 + + arch/arm/mach-exynos/exynos.c | 2 + + arch/arm/mach-exynos/firmware.c | 8 +- + arch/arm/mach-exynos/pm.c | 2 +- + arch/arm/mach-exynos/suspend.c | 4 + + arch/arm/mach-s3c/Kconfig.s3c64xx | 6 - + drivers/clk/samsung/clk-exynos-clkout.c | 3 + + drivers/clk/samsung/clk-exynos4.c | 44 +- + drivers/soc/samsung/exynos-pmu.c | 9 + + drivers/soc/samsung/exynos-pmu.h | 2 + + drivers/soc/samsung/exynos4-pmu.c | 13 +- + 26 files changed, 950 insertions(+), 674 deletions(-) + create mode 100644 arch/arm/boot/dts/exynos4212.dtsi + rename arch/arm/boot/dts/{exynos4412-pinctrl.dtsi => exynos4x12-pinctrl.dtsi} (99%) + create mode 100644 arch/arm/boot/dts/exynos4x12.dtsi +Merging scmi/for-linux-next (e06854e84add Merge tags 'scmi-fix-6.4', 'juno-fixes-6.4' and 'ffa-fixes-6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) +$ git merge -m Merge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git scmi/for-linux-next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/vexpress-v2p-ca5s.dts | 1 + + arch/arm64/boot/dts/arm/foundation-v8.dtsi | 1 + + arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts | 1 + + arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts | 1 + + drivers/firmware/arm_ffa/bus.c | 19 +++++++++++++++---- + drivers/firmware/arm_ffa/driver.c | 9 ++++++++- + drivers/firmware/arm_scmi/raw_mode.c | 2 +- + include/linux/arm_ffa.h | 1 + + 8 files changed, 29 insertions(+), 6 deletions(-) +Merging stm32/stm32-next (49f1d0b65f87 ARM: stm32: add initial documentation for STM32MP151) +$ git merge -m Merge branch 'stm32-next' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next +Already up to date. +Merging sunxi/sunxi/for-next (7081db38231a Merge branch 'sunxi/dt-for-6.4' into sunxi/for-next) +$ git merge -m Merge branch 'sunxi/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git sunxi/sunxi/for-next +Merge made by the 'ort' strategy. +Merging tee/next (cf1773f935d8 Merge branch 'optee_load-for-v6.4' into next) +$ git merge -m Merge branch 'next' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee/next +Merge made by the 'ort' strategy. +Merging tegra/for-next (7947eeb21f00 Merge branch for-6.4/arm64/defconfig into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra/for-next +Merge made by the 'ort' strategy. +Merging ti/ti-next (ac9a78681b92 Linux 6.4-rc1) +$ git merge -m Merge branch 'ti-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git ti/ti-next +Already up to date. +Merging xilinx/for-next (ec1696c3440f Merge remote-tracking branch 'zynqmp/soc' into for-next) +$ git merge -m Merge branch 'for-next' of git://github.com/Xilinx/linux-xlnx.git xilinx/for-next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/gpu/arm,mali-utgard.yaml | 1 + + arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi | 4 ++++ + arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts | 4 ++++ + arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts | 3 +++ + arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm018-dc4.dts | 4 ++++ + arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts | 4 ++++ + arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts | 4 ++++ + arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts | 4 ++++ + arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts | 4 ++++ + arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts | 4 ++++ + arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts | 4 ++++ + arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 12 ++++++++++++ + drivers/soc/xilinx/zynqmp_power.c | 4 ++-- + 13 files changed, 54 insertions(+), 2 deletions(-) +Merging clk/clk-next (ac9a78681b92 Linux 6.4-rc1) +$ 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 (ac9a78681b92 Linux 6.4-rc1) +$ 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 (7f91fe3a71aa clk: renesas: r8a779a0: Add PWM clock) +$ git merge -m Merge branch 'renesas-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git clk-renesas/renesas-clk +Merge made by the 'ort' strategy. + drivers/clk/renesas/r8a779a0-cpg-mssr.c | 1 + + 1 file changed, 1 insertion(+) +Merging clk-samsung/for-next (b35f27fe73d8 clk: samsung: exynosautov9: add cmu_peric1 clock support) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git clk-samsung/for-next +Already up to date. +Merging csky/linux-next (1f62ed00a56b csky: mmu: Prevent spurious page faults) +$ git merge -m Merge branch 'linux-next' of git://github.com/c-sky/csky-linux.git csky/linux-next +Already up to date. +Merging loongarch/loongarch-next (2fa5ebe3bc4e tools/perf: Add basic support for LoongArch) +$ git merge -m Merge branch 'loongarch-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git loongarch/loongarch-next +Already up to date. +Merging m68k/for-next (aaee8c7f2a17 m68k: kexec: Include <linux/reboot.h>) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k/for-next +Already up to date. +Merging m68knommu/for-next (ac9a78681b92 Linux 6.4-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 (ac9a78681b92 Linux 6.4-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 (c91b4a07655d openrisc: Add floating point regset) +$ git merge -m Merge branch 'for-next' of git://github.com/openrisc/linux.git openrisc/for-next +Already up to date. +Merging parisc-hd/for-next (cc719a9ce7a4 parisc: kexec: include reboot.h) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git parisc-hd/for-next +Merge made by the 'ort' strategy. + arch/parisc/kernel/kexec.c | 2 ++ + 1 file changed, 2 insertions(+) +Merging powerpc/next (3af77224c09d powerpc/spufs: remove unneeded if-checks) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next +Merge made by the 'ort' strategy. + arch/powerpc/platforms/86xx/Kconfig | 1 - + arch/powerpc/platforms/cell/spu_base.c | 6 ------ + 2 files changed, 7 deletions(-) +Merging soc-fsl/next (4b0986a3613c Linux 5.18) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl/next +Already up to date. +Merging risc-v/for-next (ac9a78681b92 Linux 6.4-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 (6a887bcc4138 riscv: dts: starfive: Add PMU controller node) +$ git merge -m Merge branch 'riscv-dt-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt/riscv-dt-for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 2 ++ + arch/riscv/boot/dts/starfive/jh7110.dtsi | 7 +++++++ + 2 files changed, 9 insertions(+) +Merging riscv-soc/riscv-soc-for-next (ac9a78681b92 Linux 6.4-rc1) +$ git merge -m Merge branch 'riscv-soc-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc/riscv-soc-for-next +Already up to date. +Merging s390/for-next (de12921a1665 Merge branch 'features' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390/for-next +Merge made by the 'ort' strategy. +Merging sh/for-next (7ae6521b12b0 sh: j2: Use ioremap() to translate device tree address into kernel memory) +$ git merge -m Merge branch 'for-next' of git:git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux.git sh/for-next +Merge made by the 'ort' strategy. + arch/sh/kernel/cpu/sh2/probe.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging uml/next (6032aca0deb9 um: make stub data pages size tweakable) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml/next +Already up to date. +Merging xtensa/xtensa-for-next (e313de5b5b04 MAINTAINERS: xtensa: drop linux-xtensa@linux-xtensa.org mailing list) +$ git merge -m Merge branch 'xtensa-for-next' of git://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next +Already up to date. +Merging pidfd/for-next (7bcf0b65b84a Merge branch 'kernel.fork' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git pidfd/for-next +Merge made by the 'ort' strategy. +Merging vfs-idmapping/for-next (4582b273464e Merge branch 'fs.misc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/idmapping.git vfs-idmapping/for-next +Auto-merging fs/fuse/dev.c +Auto-merging fs/pipe.c +Auto-merging fs/splice.c +Merge made by the 'ort' strategy. + fs/fuse/dev.c | 4 ++-- + fs/pipe.c | 39 +++++++++++++++++++++++++++++++-------- + fs/splice.c | 11 +++++++---- + include/linux/pipe_fs_i.h | 8 +++++--- + 4 files changed, 45 insertions(+), 17 deletions(-) +Merging fscrypt/for-next (83e57e47906c fscrypt: optimize fscrypt_initialize()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/fscrypt/linux.git fscrypt/for-next +Already up to date. +Merging fscache/fscache-next (0885eacdc81f Merge tag 'nfsd-5.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux) +$ git merge -m Merge branch 'fscache-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git fscache/fscache-next +Already up to date. +Merging afs/afs-next (0a278bc196e7 afs: Automatically generate trace tag enums) +$ git merge -m Merge branch 'afs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git afs/afs-next +Merge made by the 'ort' strategy. + include/trace/events/afs.h | 475 ++++++++++++++------------------------------- + 1 file changed, 148 insertions(+), 327 deletions(-) +Merging btrfs/for-next (bfb41d71540e Merge branch 'for-next-next-v6.4-20230509' into for-next-20230509) +$ 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/bio.c | 32 +++----- + fs/btrfs/block-group.c | 14 +++- + fs/btrfs/btrfs_inode.h | 3 - + fs/btrfs/check-integrity.c | 2 +- + fs/btrfs/compression.c | 2 +- + fs/btrfs/ctree.c | 171 +++++++++++++++++++------------------- + fs/btrfs/ctree.h | 3 +- + fs/btrfs/disk-io.c | 6 +- + fs/btrfs/extent-tree.c | 135 +++++++++++++++--------------- + fs/btrfs/file-item.c | 4 +- + fs/btrfs/file.c | 9 -- + fs/btrfs/free-space-cache.c | 103 +++++++++++++++-------- + fs/btrfs/fs.h | 1 - + fs/btrfs/inode.c | 194 +++++++++++++++++++++++++++++++++++++++++++- + fs/btrfs/ioctl.c | 16 ++-- + fs/btrfs/misc.h | 20 +++++ + fs/btrfs/print-tree.c | 16 ++-- + fs/btrfs/print-tree.h | 4 +- + fs/btrfs/raid56.c | 49 ++++++++++- + fs/btrfs/raid56.h | 3 + + fs/btrfs/relocation.c | 16 ++++ + fs/btrfs/relocation.h | 1 + + fs/btrfs/scrub.c | 16 +++- + fs/btrfs/subpage.c | 22 ----- + fs/btrfs/super.c | 1 - + fs/btrfs/transaction.c | 2 - + fs/btrfs/volumes.c | 2 +- + fs/btrfs/volumes.h | 1 - + fs/btrfs/zoned.c | 12 +-- + 29 files changed, 564 insertions(+), 296 deletions(-) +Merging ceph/master (a12e5342fa27 ceph: silence smatch warning in reconnect_caps_cb()) +$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master +Merge made by the 'ort' strategy. + fs/ceph/addr.c | 28 +++++++++++++++++++++------- + fs/ceph/mds_client.c | 3 ++- + 2 files changed, 23 insertions(+), 8 deletions(-) +Merging cifs/for-next (716a3cf31745 smb3: fix problem remounting a share after shutdown) +$ git merge -m Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git cifs/for-next +Merge made by the 'ort' strategy. + fs/cifs/cifsfs.c | 3 ++- + fs/cifs/connect.c | 7 +++++++ + fs/cifs/smb2ops.c | 2 +- + fs/cifs/smb2pdu.c | 3 +++ + 4 files changed, 13 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 (745ed7d77834 erofs: cleanup i_format-related stuffs) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs/dev +Already up to date. +Merging exfat/dev (fe15c26ee26e Linux 6.3-rc1) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev +Already up to date. +Merging ext3/for_next (df9c5af6a4ef Merge ext2 direct IO conversion to iomap.) +$ git merge -m Merge branch 'for_next' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git ext3/for_next +Merge made by the 'ort' strategy. + fs/buffer.c | 70 +++++++++++++++++++ + fs/ext2/Makefile | 5 +- + fs/ext2/ext2.h | 1 + + fs/ext2/file.c | 126 ++++++++++++++++++++++++++++++++++- + fs/ext2/inode.c | 58 ++++++++++------ + fs/ext2/trace.c | 6 ++ + fs/ext2/trace.h | 94 ++++++++++++++++++++++++++ + fs/ext4/fsync.c | 33 +++++---- + fs/notify/inotify/inotify_fsnotify.c | 11 ++- + include/linux/buffer_head.h | 4 ++ + 10 files changed, 365 insertions(+), 43 deletions(-) + create mode 100644 fs/ext2/trace.c + create mode 100644 fs/ext2/trace.h +Merging ext4/dev (b5f9cca1fead ext4: fix deadlock when converting an inline directory in nojournal mode) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev +Merge made by the 'ort' strategy. + fs/ext4/balloc.c | 43 +++++++++++++++++++++++++- + fs/ext4/ext4.h | 15 ++-------- + fs/ext4/extents_status.c | 30 ++++++++----------- + fs/ext4/hash.c | 7 ++++- + fs/ext4/ialloc.c | 12 +++++--- + fs/ext4/inline.c | 3 +- + fs/ext4/inode.c | 2 +- + fs/ext4/mballoc.c | 78 ++++++++++++++++++++++++++++++++++++++++-------- + fs/ext4/mmp.c | 30 +++++++++++++------ + fs/ext4/namei.c | 53 ++++++++++++++++++++++---------- + fs/ext4/super.c | 21 ++++++++++--- + fs/ext4/xattr.c | 5 ++-- + 12 files changed, 218 insertions(+), 81 deletions(-) +Merging f2fs/dev (08c3eab525ef f2fs: remove some dead code) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev +Merge made by the 'ort' strategy. + Documentation/filesystems/f2fs.rst | 16 +++++ + fs/f2fs/checkpoint.c | 7 +- + fs/f2fs/data.c | 5 +- + fs/f2fs/f2fs.h | 20 +++++- + fs/f2fs/file.c | 11 +-- + fs/f2fs/gc.c | 2 +- + fs/f2fs/node.c | 13 ++-- + fs/f2fs/super.c | 134 ++++++++++++++++++++++++++++++++++--- + fs/f2fs/sysfs.c | 39 ++++++----- + 9 files changed, 197 insertions(+), 50 deletions(-) +Merging fsverity/for-next (04839139213c fsverity: reject FS_IOC_ENABLE_VERITY on mode 3 fds) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity/for-next +Already up to date. +Merging fuse/for-next (c68ea140050e fuse: remove duplicate check for nodeid) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next +Merge made by the 'ort' strategy. + fs/fuse/dir.c | 2 -- + fs/fuse/inode.c | 3 ++- + include/uapi/linux/fuse.h | 3 +++ + 3 files changed, 5 insertions(+), 3 deletions(-) +Merging gfs2/for-next (644f6bf762fa gfs2: gfs2_ail_empty_gl no log flush on error) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next +Already up to date. +Merging jfs/jfs-next (fad376fce0af fs/jfs: fix shift exponent db_agl2size negative) +$ git merge -m Merge branch 'jfs-next' of git://github.com/kleikamp/linux-shaggy.git jfs/jfs-next +Already up to date. +Merging ksmbd/ksmbd-for-next (201b70446c10 ksmbd: use kzalloc() instead of __GFP_ZERO) +$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next +Merge made by the 'ort' strategy. + fs/ksmbd/connection.c | 3 ++- + fs/ksmbd/mgmt/tree_connect.c | 11 ----------- + fs/ksmbd/mgmt/tree_connect.h | 3 --- + fs/ksmbd/oplock.c | 2 +- + fs/ksmbd/smb2misc.c | 5 ++++- + fs/ksmbd/smb2pdu.c | 5 ++--- + fs/ksmbd/smb_common.c | 4 ++-- + 7 files changed, 11 insertions(+), 22 deletions(-) +Merging nfs/linux-next (e8d018dd0257 Linux 6.3-rc3) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (fbd2a05f29a9 NFSv4.2: Rework scratch handling for READ_PLUS) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/anna/linux-nfs.git nfs-anna/linux-next +Already up to date. +Merging nfsd/nfsd-next (58390c8ce1bd Merge tag 'iommu-updates-v6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu) +$ git merge -m Merge branch 'nfsd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/nfsd-next +Already up to date. +Merging ntfs3/master (1f60ec888102 fs/ntfs3: Add support /proc/fs/ntfs3/<dev>/volinfo and /proc/fs/ntfs3/<dev>/label) +$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master +Merge made by the 'ort' strategy. + fs/ntfs3/attrib.c | 2 +- + fs/ntfs3/attrlist.c | 7 +- + fs/ntfs3/bitmap.c | 10 +- + fs/ntfs3/file.c | 6 +- + fs/ntfs3/frecord.c | 58 ++++++----- + fs/ntfs3/fslog.c | 40 ++++---- + fs/ntfs3/fsntfs.c | 99 +++++++++++++++---- + fs/ntfs3/index.c | 20 ++-- + fs/ntfs3/inode.c | 23 +++-- + fs/ntfs3/lznt.c | 6 +- + fs/ntfs3/namei.c | 31 +++--- + fs/ntfs3/ntfs.h | 117 ++++++++++++---------- + fs/ntfs3/ntfs_fs.h | 31 +++--- + fs/ntfs3/record.c | 14 ++- + fs/ntfs3/run.c | 4 +- + fs/ntfs3/super.c | 279 +++++++++++++++++++++++++++++++++++++++++++++------- + fs/ntfs3/xattr.c | 20 ++-- + 17 files changed, 530 insertions(+), 237 deletions(-) +Merging orangefs/for-next (31720a2b109b orangefs: Fix kmemleak in orangefs_{kernel,client}_debug_init()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (4f11ada10d0a ovl: fail on invalid uid/gid mapping at copy up) +$ git merge -m Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git overlayfs/overlayfs-next +Already up to date. +Merging ubifs/next (b5fda08ef213 ubifs: Fix memleak when insert_old_idx() failed) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs/next +Already up to date. +Merging v9fs/9p-next (4ec5183ec486 Linux 6.2-rc7) +$ git merge -m Merge branch '9p-next' of git://github.com/martinetd/linux v9fs/9p-next +Already up to date. +Merging v9fs-ericvh/ericvh/for-next (ac9a78681b92 Linux 6.4-rc1) +$ git merge -m Merge branch 'ericvh/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git v9fs-ericvh/ericvh/for-next +Already up to date. +Merging xfs/for-next (2254a7396a0c xfs: fix xfs_inodegc_stop racing with mod_delayed_work) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next +Merge made by the 'ort' strategy. + fs/xfs/libxfs/xfs_ag.c | 19 +++++++++---------- + fs/xfs/libxfs/xfs_bmap.c | 5 +++-- + fs/xfs/scrub/bmap.c | 4 ++-- + fs/xfs/scrub/common.c | 26 -------------------------- + fs/xfs/scrub/common.h | 2 -- + fs/xfs/scrub/fscounters.c | 13 ++++++------- + fs/xfs/scrub/scrub.c | 2 -- + fs/xfs/scrub/scrub.h | 1 - + fs/xfs/scrub/trace.h | 1 - + fs/xfs/xfs_bmap_util.c | 4 +++- + fs/xfs/xfs_icache.c | 40 +++++++++++++++++++++++++++++++++------- + fs/xfs/xfs_iomap.c | 5 +++-- + fs/xfs/xfs_mount.h | 3 +++ + fs/xfs/xfs_super.c | 3 +++ + 14 files changed, 65 insertions(+), 63 deletions(-) +Merging zonefs/for-next (2b188a2cfc4d zonefs: make kobj_type structure constant) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git zonefs/for-next +Already up to date. +Merging iomap/iomap-for-next (3fd41721cd5c iomap: Add DIO tracepoints) +$ git merge -m Merge branch 'iomap-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git iomap/iomap-for-next +Already up to date. +Merging djw-vfs/vfs-for-next (a79168a0c00d fs/remap_range: avoid spurious writeback on zero length request) +$ git merge -m Merge branch 'vfs-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git djw-vfs/vfs-for-next +Already up to date. +Merging file-locks/locks-next (63355b9884b3 cpumask: be more careful with 'cpumask_setall()') +$ git merge -m Merge branch 'locks-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git file-locks/locks-next +Already up to date. +Merging iversion/iversion-next (63355b9884b3 cpumask: be more careful with 'cpumask_setall()') +$ git merge -m Merge branch 'iversion-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git iversion/iversion-next +Already up to date. +Merging vfs/for-next (cff4b23c731a Merge branch 'work.lock_rename_child' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs/for-next +Merge made by the 'ort' strategy. +Merging printk/for-next (16bff6f075a1 Merge branch 'for-6.4' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git printk/for-next +Merge made by the 'ort' strategy. +Merging pci/next (174977dc80b7 Merge branch 'pci/controller/vmd') +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci/next +Merge made by the 'ort' strategy. + Documentation/PCI/endpoint/pci-ntb-howto.rst | 11 +- + Documentation/PCI/endpoint/pci-vntb-howto.rst | 13 +- + .../devicetree/bindings/pci/qcom,pcie-ep.yaml | 2 + + drivers/misc/pci_endpoint_test.c | 25 +- + drivers/pci/controller/vmd.c | 8 + + drivers/pci/endpoint/functions/Kconfig | 2 +- + drivers/pci/endpoint/functions/pci-epf-test.c | 268 +++++++++------------ + drivers/pci/endpoint/pci-ep-cfs.c | 54 +++-- + drivers/pci/endpoint/pci-epf-core.c | 32 --- + drivers/pci/quirks.c | 10 +- + include/linux/pci-epf.h | 2 - + include/linux/pci_ids.h | 2 + + 12 files changed, 195 insertions(+), 234 deletions(-) +Merging pstore/for-next/pstore (5239a89b06d6 pstore: Revert pmsg_lock back to a normal mutex) +$ git merge -m Merge branch 'for-next/pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git pstore/for-next/pstore +Already up to date. +Merging hid/for-next (d777b19c6356 Merge branch 'for-6.4/amd-sfh' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git hid/for-next +Merge made by the 'ort' strategy. +Merging i2c/i2c/for-next (03230ddddf9d Merge branch 'i2c/for-current' into i2c/for-next) +$ git merge -m Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/i2c/for-next +Merge made by the 'ort' strategy. +Merging i3c/i3c/next (6b496a94c590 i3c: ast2600: set variable ast2600_i3c_ops storage-class-specifier to static) +$ git merge -m Merge branch 'i3c/next' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c/i3c/next +Already up to date. +Merging dmi/dmi-for-next (13a0ac816d22 firmware: dmi: Fortify entry point length checks) +$ git merge -m Merge branch 'dmi-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git dmi/dmi-for-next +Already up to date. +Merging hwmon-staging/hwmon-next (92613681c009 Documentation/hwmon: Move misplaced entry in hwmon docs index) +$ 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 +Merge made by the 'ort' strategy. + Documentation/hwmon/asus_ec_sensors.rst | 1 + + Documentation/hwmon/index.rst | 2 +- + Documentation/hwmon/oxp-sensors.rst | 2 + + drivers/hwmon/ad7414.c | 2 +- + drivers/hwmon/ad7418.c | 2 +- + drivers/hwmon/adc128d818.c | 2 +- + drivers/hwmon/adm1021.c | 2 +- + drivers/hwmon/adm1025.c | 2 +- + drivers/hwmon/adm1026.c | 2 +- + drivers/hwmon/adm1029.c | 2 +- + drivers/hwmon/adm1031.c | 2 +- + drivers/hwmon/adm1177.c | 2 +- + drivers/hwmon/adm9240.c | 2 +- + drivers/hwmon/ads7828.c | 2 +- + drivers/hwmon/adt7410.c | 2 +- + drivers/hwmon/adt7411.c | 2 +- + drivers/hwmon/adt7462.c | 2 +- + drivers/hwmon/adt7470.c | 2 +- + drivers/hwmon/adt7475.c | 10 ++--- + drivers/hwmon/aht10.c | 2 +- + drivers/hwmon/amc6821.c | 2 +- + drivers/hwmon/asb100.c | 2 +- + drivers/hwmon/asc7621.c | 2 +- + drivers/hwmon/asus-ec-sensors.c | 30 +++++++++++++ + drivers/hwmon/atxp1.c | 2 +- + drivers/hwmon/dme1737.c | 2 +- + drivers/hwmon/ds1621.c | 2 +- + drivers/hwmon/ds620.c | 2 +- + drivers/hwmon/emc1403.c | 2 +- + drivers/hwmon/emc2103.c | 2 +- + drivers/hwmon/emc2305.c | 2 +- + drivers/hwmon/emc6w201.c | 2 +- + drivers/hwmon/f75375s.c | 2 +- + drivers/hwmon/fschmd.c | 2 +- + drivers/hwmon/ftsteutates.c | 2 +- + drivers/hwmon/g760a.c | 2 +- + drivers/hwmon/g762.c | 2 +- + drivers/hwmon/gl518sm.c | 2 +- + drivers/hwmon/gl520sm.c | 2 +- + drivers/hwmon/hih6130.c | 2 +- + drivers/hwmon/ina209.c | 2 +- + drivers/hwmon/ina238.c | 2 +- + drivers/hwmon/ina2xx.c | 2 +- + drivers/hwmon/ina3221.c | 2 +- + drivers/hwmon/it87.c | 75 +++++++++++++++++++++++++-------- + drivers/hwmon/jc42.c | 2 +- + drivers/hwmon/lineage-pem.c | 2 +- + drivers/hwmon/lm63.c | 2 +- + drivers/hwmon/lm73.c | 2 +- + drivers/hwmon/lm75.c | 2 +- + drivers/hwmon/lm77.c | 2 +- + drivers/hwmon/lm78.c | 2 +- + drivers/hwmon/lm80.c | 2 +- + drivers/hwmon/lm83.c | 2 +- + drivers/hwmon/lm85.c | 2 +- + drivers/hwmon/lm87.c | 2 +- + drivers/hwmon/lm90.c | 2 +- + drivers/hwmon/lm92.c | 2 +- + drivers/hwmon/lm93.c | 2 +- + drivers/hwmon/lm95234.c | 2 +- + drivers/hwmon/lm95241.c | 2 +- + drivers/hwmon/lm95245.c | 2 +- + drivers/hwmon/ltc2945.c | 2 +- + drivers/hwmon/ltc2947-i2c.c | 2 +- + drivers/hwmon/ltc2990.c | 2 +- + drivers/hwmon/ltc2992.c | 2 +- + drivers/hwmon/ltc4151.c | 2 +- + drivers/hwmon/ltc4215.c | 2 +- + drivers/hwmon/ltc4222.c | 2 +- + drivers/hwmon/ltc4245.c | 2 +- + drivers/hwmon/ltc4260.c | 2 +- + drivers/hwmon/ltc4261.c | 2 +- + drivers/hwmon/max127.c | 2 +- + drivers/hwmon/max16065.c | 2 +- + drivers/hwmon/max1619.c | 2 +- + drivers/hwmon/max1668.c | 2 +- + drivers/hwmon/max31730.c | 2 +- + drivers/hwmon/max31760.c | 2 +- + drivers/hwmon/max31790.c | 2 +- + drivers/hwmon/max6620.c | 2 +- + drivers/hwmon/max6621.c | 2 +- + drivers/hwmon/max6639.c | 2 +- + drivers/hwmon/max6642.c | 2 +- + drivers/hwmon/max6650.c | 2 +- + drivers/hwmon/max6697.c | 2 +- + drivers/hwmon/mc34vr500.c | 2 +- + drivers/hwmon/mcp3021.c | 2 +- + drivers/hwmon/nct6775-i2c.c | 2 +- + drivers/hwmon/nct7802.c | 2 +- + drivers/hwmon/nct7904.c | 2 +- + drivers/hwmon/occ/p8_i2c.c | 2 +- + drivers/hwmon/oxp-sensors.c | 32 +++++++++++--- + drivers/hwmon/pcf8591.c | 2 +- + drivers/hwmon/pmbus/acbel-fsg032.c | 2 +- + drivers/hwmon/pmbus/adm1266.c | 2 +- + drivers/hwmon/pmbus/adm1275.c | 2 +- + drivers/hwmon/pmbus/bel-pfe.c | 2 +- + drivers/hwmon/pmbus/bpa-rs600.c | 2 +- + drivers/hwmon/pmbus/delta-ahe50dc-fan.c | 2 +- + drivers/hwmon/pmbus/dps920ab.c | 2 +- + drivers/hwmon/pmbus/fsp-3y.c | 2 +- + drivers/hwmon/pmbus/ibm-cffps.c | 2 +- + drivers/hwmon/pmbus/inspur-ipsps.c | 2 +- + drivers/hwmon/pmbus/ir35221.c | 2 +- + drivers/hwmon/pmbus/ir36021.c | 2 +- + drivers/hwmon/pmbus/ir38064.c | 2 +- + drivers/hwmon/pmbus/irps5401.c | 2 +- + drivers/hwmon/pmbus/isl68137.c | 2 +- + drivers/hwmon/pmbus/lm25066.c | 2 +- + drivers/hwmon/pmbus/lt7182s.c | 2 +- + drivers/hwmon/pmbus/ltc2978.c | 2 +- + drivers/hwmon/pmbus/ltc3815.c | 2 +- + drivers/hwmon/pmbus/max15301.c | 2 +- + drivers/hwmon/pmbus/max16064.c | 2 +- + drivers/hwmon/pmbus/max16601.c | 2 +- + drivers/hwmon/pmbus/max20730.c | 2 +- + drivers/hwmon/pmbus/max20751.c | 2 +- + drivers/hwmon/pmbus/max31785.c | 2 +- + drivers/hwmon/pmbus/max34440.c | 2 +- + drivers/hwmon/pmbus/max8688.c | 2 +- + drivers/hwmon/pmbus/mp2888.c | 2 +- + drivers/hwmon/pmbus/mp2975.c | 2 +- + drivers/hwmon/pmbus/mp5023.c | 2 +- + drivers/hwmon/pmbus/mpq7932.c | 2 +- + drivers/hwmon/pmbus/pim4328.c | 2 +- + drivers/hwmon/pmbus/pli1209bc.c | 2 +- + drivers/hwmon/pmbus/pm6764tr.c | 2 +- + drivers/hwmon/pmbus/pmbus.c | 2 +- + drivers/hwmon/pmbus/pxe1610.c | 2 +- + drivers/hwmon/pmbus/q54sj108a2.c | 2 +- + drivers/hwmon/pmbus/stpddc60.c | 2 +- + drivers/hwmon/pmbus/tda38640.c | 2 +- + drivers/hwmon/pmbus/tps40422.c | 2 +- + drivers/hwmon/pmbus/tps53679.c | 2 +- + drivers/hwmon/pmbus/tps546d24.c | 2 +- + drivers/hwmon/pmbus/ucd9000.c | 2 +- + drivers/hwmon/pmbus/ucd9200.c | 2 +- + drivers/hwmon/pmbus/xdpe12284.c | 2 +- + drivers/hwmon/pmbus/xdpe152c4.c | 2 +- + drivers/hwmon/pmbus/zl6100.c | 2 +- + drivers/hwmon/powr1220.c | 2 +- + drivers/hwmon/sbrmi.c | 2 +- + drivers/hwmon/sbtsi_temp.c | 2 +- + drivers/hwmon/sht21.c | 2 +- + drivers/hwmon/sht3x.c | 2 +- + drivers/hwmon/sht4x.c | 2 +- + drivers/hwmon/shtc1.c | 2 +- + drivers/hwmon/smm665.c | 2 +- + drivers/hwmon/smsc47m192.c | 2 +- + drivers/hwmon/stts751.c | 2 +- + drivers/hwmon/tc654.c | 2 +- + drivers/hwmon/tc74.c | 2 +- + drivers/hwmon/thmc50.c | 2 +- + drivers/hwmon/tmp102.c | 2 +- + drivers/hwmon/tmp103.c | 2 +- + drivers/hwmon/tmp108.c | 2 +- + drivers/hwmon/tmp401.c | 2 +- + drivers/hwmon/tmp421.c | 2 +- + drivers/hwmon/tmp464.c | 2 +- + drivers/hwmon/tmp513.c | 2 +- + drivers/hwmon/tps23861.c | 2 +- + drivers/hwmon/w83773g.c | 2 +- + drivers/hwmon/w83781d.c | 2 +- + drivers/hwmon/w83791d.c | 2 +- + drivers/hwmon/w83792d.c | 2 +- + drivers/hwmon/w83793.c | 2 +- + drivers/hwmon/w83795.c | 2 +- + drivers/hwmon/w83l785ts.c | 2 +- + drivers/hwmon/w83l786ng.c | 2 +- + 169 files changed, 285 insertions(+), 191 deletions(-) +Merging jc_docs/docs-next (cdc822dda6f8 docs/sp_SP: Add translation of process/adding-syscalls) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Already up to date. +Merging v4l-dvb/master (ac9a78681b92 Linux 6.4-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 (6b854bb90d23 media: platform: mtk-mdp3: work around unused-variable warning) +$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master +Already up to date. +Merging pm/linux-next (ac9a78681b92 Linux 6.4-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 (cde3bb62bf56 cpufreq: dt-platdev: Add JH7110 SOC to the allowlist) +$ git merge -m Merge branch 'cpufreq/arm/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git cpufreq-arm/cpufreq/arm/linux-next +Auto-merging drivers/cpufreq/cpufreq-dt-platdev.c +Merge made by the 'ort' strategy. + drivers/cpufreq/cpufreq-dt-platdev.c | 2 ++ + 1 file changed, 2 insertions(+) +Merging cpupower/cpupower (c2adb1877b76 cpupower: Make TSC read per CPU for Mperf monitor) +$ git merge -m Merge branch 'cpupower' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git cpupower/cpupower +Merge made by the 'ort' strategy. + tools/power/cpupower/lib/powercap.c | 23 +++++++++++----- + .../cpupower/utils/idle_monitor/mperf_monitor.c | 31 ++++++++++------------ + 2 files changed, 30 insertions(+), 24 deletions(-) +Merging devfreq/devfreq-next (376b1446153c PM / devfreq: exynos-ppmu: Use devm_platform_get_and_ioremap_resource()) +$ git merge -m Merge branch 'devfreq-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git devfreq/devfreq-next +Already up to date. +Merging opp/opp/linux-next (528f2d8d540a OPP: Move required opps configuration to specialized callback) +$ git merge -m Merge branch 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git opp/opp/linux-next +Already up to date. +Merging thermal/thermal/linux-next (2afa82d1fc64 dt-bindings: thermal: qcom-tsens: Correct unit address) +$ git merge -m Merge branch 'thermal/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git thermal/thermal/linux-next +Already up to date. +Merging dlm/next (7a40f1f18a88 fs: dlm: stop unnecessarily filling zero ms_extra bytes) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm/next +Already up to date. +Merging rdma/for-next (ac9a78681b92 Linux 6.4-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 (94e86ef1b801 net: phy: dp83869: support mii mode when rgmii strap cfg is used) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/main +Merge made by the 'ort' strategy. + drivers/net/phy/dp83869.c | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) +Merging bpf-next/for-next (6e61c5fa4d43 Merge branch 'Dynptr Verifier Adjustments') +$ 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 drivers/net/ethernet/intel/igc/igc_main.c +Auto-merging kernel/trace/bpf_trace.c +Merge made by the 'ort' strategy. + Documentation/bpf/kfuncs.rst | 23 +- + Documentation/bpf/llvm_reloc.rst | 18 +- + Documentation/bpf/map_hash.rst | 53 +- + Documentation/bpf/map_lru_hash_update.dot | 172 +++++ + drivers/net/ethernet/intel/igc/igc.h | 35 + + drivers/net/ethernet/intel/igc/igc_main.c | 116 +++- + include/linux/bpf.h | 2 +- + include/linux/bpf_verifier.h | 27 +- + include/linux/skbuff.h | 2 +- + include/net/xsk_buff_pool.h | 2 +- + kernel/bpf/helpers.c | 123 +++- + kernel/bpf/syscall.c | 3 +- + kernel/bpf/verifier.c | 746 ++++++++++++++++----- + kernel/trace/bpf_trace.c | 4 +- + net/core/filter.c | 2 + + net/xdp/xsk_buff_pool.c | 7 +- + samples/bpf/tcp_basertt_kern.c | 2 +- + tools/bpf/bpftool/link.c | 10 +- + tools/bpf/bpftool/map.c | 12 +- + tools/lib/bpf/bpf_tracing.h | 3 +- + tools/lib/bpf/btf_dump.c | 22 +- + tools/testing/selftests/bpf/DENYLIST.aarch64 | 82 +-- + tools/testing/selftests/bpf/DENYLIST.s390x | 1 + + tools/testing/selftests/bpf/bpf_kfuncs.h | 6 + + .../testing/selftests/bpf/prog_tests/arg_parsing.c | 68 ++ + tools/testing/selftests/bpf/prog_tests/dynptr.c | 8 + + .../selftests/bpf/prog_tests/task_under_cgroup.c | 53 ++ + tools/testing/selftests/bpf/prog_tests/verifier.c | 2 + + tools/testing/selftests/bpf/progs/bpf_misc.h | 4 + + tools/testing/selftests/bpf/progs/dynptr_fail.c | 307 +++++++++ + tools/testing/selftests/bpf/progs/dynptr_success.c | 336 ++++++++++ + tools/testing/selftests/bpf/progs/iters.c | 26 +- + .../selftests/bpf/progs/test_global_func1.c | 2 + + .../selftests/bpf/progs/test_task_under_cgroup.c | 51 ++ + .../bpf/progs/verifier_subprog_precision.c | 536 +++++++++++++++ + .../testing/selftests/bpf/progs/xdp_hw_metadata.c | 4 +- + tools/testing/selftests/bpf/test_progs.c | 37 +- + tools/testing/selftests/bpf/testing_helpers.c | 207 ++++-- + tools/testing/selftests/bpf/testing_helpers.h | 3 + + tools/testing/selftests/bpf/verifier/precise.c | 143 ++-- + tools/testing/selftests/bpf/veristat.c | 9 + + tools/testing/selftests/bpf/xdp_hw_metadata.c | 47 +- + tools/testing/selftests/bpf/xdp_metadata.h | 1 + + 43 files changed, 2856 insertions(+), 461 deletions(-) + create mode 100644 Documentation/bpf/map_lru_hash_update.dot + create mode 100644 tools/testing/selftests/bpf/prog_tests/task_under_cgroup.c + create mode 100644 tools/testing/selftests/bpf/progs/test_task_under_cgroup.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_subprog_precision.c +Merging ipsec-next/master (f4796398f21b xfrm: Remove inner/outer modes from output path) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git ipsec-next/master +Already up to date. +Merging mlx5-next/mlx5-next (77f7eb9f3416 net/mlx5: Introduce other vport query for Q-counters) +$ git merge -m Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/master (677fb7525331 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git netfilter-next/master +Already up to date. +Merging ipvs-next/main (4774ad841bef net: phy: marvell: Fix inconsistent indenting in led_blink_set) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git ipvs-next/main +Already up to date. +Merging bluetooth/master (e6e576ec4e72 Bluetooth: Unlink CISes when LE disconnects in hci_conn_del) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master +Merge made by the 'ort' strategy. + include/net/bluetooth/hci_core.h | 2 +- + net/bluetooth/hci_conn.c | 77 +++++++++++++++++++++------------------- + 2 files changed, 42 insertions(+), 37 deletions(-) +Merging wireless-next/for-next (f3dc7bb037d8 wifi: mt7601u: delete dead code checking debugfs returns) +$ 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 +Merge made by the 'ort' strategy. + drivers/net/wireless/marvell/mwifiex/11n.h | 4 +- + drivers/net/wireless/marvell/mwifiex/wmm.h | 15 - + drivers/net/wireless/mediatek/mt7601u/debugfs.c | 2 - + drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 37 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c | 3 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188f.c | 2 + + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 457 +++-- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h | 5 + + drivers/net/wireless/realtek/rtw88/debug.c | 59 +- + drivers/net/wireless/realtek/rtw89/core.c | 121 +- + drivers/net/wireless/realtek/rtw89/core.h | 72 +- + drivers/net/wireless/realtek/rtw89/debug.c | 24 +- + drivers/net/wireless/realtek/rtw89/fw.c | 84 +- + drivers/net/wireless/realtek/rtw89/fw.h | 76 +- + drivers/net/wireless/realtek/rtw89/mac.c | 86 +- + drivers/net/wireless/realtek/rtw89/mac.h | 1 + + drivers/net/wireless/realtek/rtw89/mac80211.c | 7 +- + drivers/net/wireless/realtek/rtw89/pci.c | 4 +- + drivers/net/wireless/realtek/rtw89/phy.c | 283 +++- + drivers/net/wireless/realtek/rtw89/phy.h | 12 + + drivers/net/wireless/realtek/rtw89/reg.h | 49 +- + drivers/net/wireless/realtek/rtw89/rtw8851b.c | 173 ++ + drivers/net/wireless/realtek/rtw89/rtw8851b.h | 15 + + drivers/net/wireless/realtek/rtw89/rtw8851b_rfk.c | 1775 ++++++++++++++++++++ + drivers/net/wireless/realtek/rtw89/rtw8851b_rfk.h | 18 + + drivers/net/wireless/realtek/rtw89/rtw8851be.c | 86 + + drivers/net/wireless/realtek/rtw89/rtw8852a.c | 11 +- + drivers/net/wireless/realtek/rtw89/rtw8852b.c | 5 +- + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 5 +- + drivers/net/wireless/realtek/rtw89/txrx.h | 19 +- + drivers/net/wireless/realtek/rtw89/wow.c | 2 +- + 31 files changed, 3228 insertions(+), 284 deletions(-) + create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8851b.c + create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8851b.h + create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8851b_rfk.c + create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8851b_rfk.h + create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8851be.c +Merging wpan-next/master (1af3de62f03f ieee802154: ca8210: Flag the driver as being limited) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git wpan-next/master +Auto-merging drivers/net/ieee802154/ca8210.c +Auto-merging net/ieee802154/nl802154.c +Auto-merging net/mac802154/scan.c +Merge made by the 'ort' strategy. + drivers/net/ieee802154/ca8210.c | 3 +- + include/net/cfg802154.h | 3 ++ + include/net/ieee802154_netdev.h | 20 +++++++++++- + net/ieee802154/header_ops.c | 36 +++++++++++++++++++++ + net/ieee802154/nl802154.c | 13 +++++++- + net/mac802154/ieee802154_i.h | 21 +++++++++++++ + net/mac802154/main.c | 2 ++ + net/mac802154/rx.c | 70 ++++++++++++++++++++++++++++++++++++++++- + net/mac802154/scan.c | 68 +++++++++++++++++++++++++++++++++++---- + 9 files changed, 226 insertions(+), 10 deletions(-) +Merging mtd/mtd/next (7227aacb62ae Merge tag 'nand/for-6.4' into mtd/next) +$ git merge -m Merge branch 'mtd/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/mtd/next +Already up to date. +Merging nand/nand/next (ec185b18c223 mtd: nand: Convert to platform remove callback returning void) +$ git merge -m Merge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next +Already up to date. +Merging spi-nor/spi-nor/next (df6def86b9dc mtd: spi-nor: spansion: Add support for s25hl02gt and s25hs02gt) +$ git merge -m Merge branch 'spi-nor/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git spi-nor/spi-nor/next +Already up to date. +Merging crypto/master (482c84e906e5 i2c: designware: Add doorbell support for Mendocino) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git crypto/master +Already up to date. +Merging drm/drm-next (ac9a78681b92 Linux 6.4-rc1) +$ git merge -m Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git drm/drm-next +Already up to date. +Merging drm-misc/for-linux-next (cf03e2956af3 Merge tag 'drm-misc-next-fixes-2023-04-26' of git://anongit.freedesktop.org/drm/drm-misc into drm-next) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc drm-misc/for-linux-next +Already up to date. +Merging amdgpu/drm-next (4d309c9e6d22 drm/amdgpu: do gfxhub init for all XCDs) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/nv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/soc15.c +Auto-merging drivers/gpu/drm/amd/amdgpu/soc21.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +Auto-merging drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/dc.h +Auto-merging drivers/gpu/drm/amd/display/dc/dc_stream.h +Auto-merging drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn321/dcn321_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c +Auto-merging drivers/gpu/drm/amd/display/dc/dml/dcn314/dcn314_fpu.c +Auto-merging drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c +Auto-merging drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.h +Auto-merging drivers/gpu/drm/amd/display/dc/link/protocols/link_edp_panel_control.c +Auto-merging drivers/gpu/drm/amd/display/dmub/src/dmub_dcn32.c +Auto-merging drivers/gpu/drm/amd/display/modules/power/power_helpers.c +Auto-merging include/drm/display/drm_dp.h +Resolved 'drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master a22f322807d2] Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | 6 +- + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10_3.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v11.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 22 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 28 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 39 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 47 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 44 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 71 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 57 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h | 2 - + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 258 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 46 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 36 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.h | 6 + + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 26 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 56 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 90 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 5 + + drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.c | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 25 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 6 +- + drivers/gpu/drm/amd/amdgpu/cik.c | 4 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 216 +- + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 285 +- + drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 26 +- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 42 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 105 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 136 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.h | 2 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c | 6 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 2834 +++++++++++++++++++- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.h | 3 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_2.c | 581 ++-- + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 12 +- + drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 12 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 12 +- + drivers/gpu/drm/amd/amdgpu/mes_v10_1.c | 23 +- + drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 27 +- + drivers/gpu/drm/amd/amdgpu/nv.c | 30 +- + drivers/gpu/drm/amd/amdgpu/nvd.h | 5 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_4.c | 4 + + drivers/gpu/drm/amd/amdgpu/si.c | 4 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 8 +- + drivers/gpu/drm/amd/amdgpu/soc15.h | 2 +- + drivers/gpu/drm/amd/amdgpu/soc21.c | 8 +- + drivers/gpu/drm/amd/amdgpu/vi.c | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 4 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 73 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 31 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.h | 2 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 30 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 5 +- + .../gpu/drm/amd/display/dc/bios/command_table2.c | 25 +- + .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 4 +- + .../dc/clk_mgr/dcn30/dcn30_clk_mgr_smu_msg.c | 3 + + .../amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c | 4 +- + .../drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.c | 2 +- + .../amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.c | 4 +- + .../drm/amd/display/dc/clk_mgr/dcn314/dcn314_smu.c | 2 +- + .../amd/display/dc/clk_mgr/dcn315/dcn315_clk_mgr.c | 4 +- + .../amd/display/dc/clk_mgr/dcn316/dcn316_clk_mgr.c | 4 +- + .../amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c | 34 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 63 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 7 +- + drivers/gpu/drm/amd/display/dc/dc.h | 19 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 207 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 15 +- + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 7 + + drivers/gpu/drm/amd/display/dc/dc_dsc.h | 1 + + drivers/gpu/drm/amd/display/dc/dc_helper.c | 28 +- + drivers/gpu/drm/amd/display/dc/dc_stream.h | 6 + + drivers/gpu/drm/amd/display/dc/dc_types.h | 3 +- + drivers/gpu/drm/amd/display/dc/dce/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c | 264 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_abm_lcd.c | 252 ++ + drivers/gpu/drm/amd/display/dc/dce/dmub_abm_lcd.h | 46 + + .../gpu/drm/amd/display/dc/dce/dmub_hw_lock_mgr.c | 4 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_outbox.c | 4 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 28 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 4 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.c | 5 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 8 +- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubp.c | 7 +- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hwseq.c | 68 +- + .../display/dc/dcn30/dcn30_dio_stream_encoder.c | 15 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 16 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.c | 7 +- + .../amd/display/dc/dcn31/dcn31_dio_link_encoder.c | 8 +- + .../gpu/drm/amd/display/dc/dcn31/dcn31_hubbub.c | 1 + + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c | 15 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_init.c | 1 + + .../drm/amd/display/dc/dcn31/dcn31_panel_cntl.c | 4 +- + .../gpu/drm/amd/display/dc/dcn314/dcn314_hwseq.c | 4 +- + .../gpu/drm/amd/display/dc/dcn314/dcn314_init.c | 1 + + .../drm/amd/display/dc/dcn315/dcn315_resource.c | 97 +- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c | 20 +- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_optc.c | 11 +- + .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.c | 6 +- + .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.h | 14 + + .../amd/display/dc/dcn32/dcn32_resource_helpers.c | 15 + + .../drm/amd/display/dc/dcn321/dcn321_resource.c | 9 +- + drivers/gpu/drm/amd/display/dc/dm_services.h | 7 + + drivers/gpu/drm/amd/display/dc/dm_services_types.h | 6 + + .../gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 42 +- + .../amd/display/dc/dml/dcn21/display_mode_vba_21.c | 2 +- + .../amd/display/dc/dml/dcn30/display_mode_vba_30.c | 6 +- + .../display/dc/dml/dcn30/display_rq_dlg_calc_30.c | 4 +- + .../gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c | 25 +- + .../gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.h | 3 + + .../amd/display/dc/dml/dcn31/display_mode_vba_31.c | 43 +- + .../display/dc/dml/dcn31/display_rq_dlg_calc_31.c | 3 +- + .../gpu/drm/amd/display/dc/dml/dcn314/dcn314_fpu.c | 14 +- + .../display/dc/dml/dcn314/display_mode_vba_314.c | 4 +- + .../dc/dml/dcn314/display_rq_dlg_calc_314.c | 26 +- + .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 92 +- + .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.h | 2 + + .../amd/display/dc/dml/dcn32/display_mode_vba_32.c | 12 +- + .../dc/dml/dcn32/display_mode_vba_util_32.c | 20 +- + .../display/dc/dml/dcn32/display_rq_dlg_calc_32.c | 2 +- + .../drm/amd/display/dc/dml/display_mode_structs.h | 3 +- + .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 6 + + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 10 +- + drivers/gpu/drm/amd/display/dc/inc/hw/abm.h | 6 + + drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 1 + + .../gpu/drm/amd/display/dc/link/link_detection.c | 4 + + .../display/dc/link/protocols/link_dp_capability.c | 33 +- + .../amd/display/dc/link/protocols/link_dp_dpia.c | 2 +- + .../dc/link/protocols/link_dp_training_128b_132b.c | 10 +- + .../dc/link/protocols/link_dp_training_8b_10b.c | 4 + + .../link_dp_training_fixed_vs_pe_retimer.c | 23 +- + .../dc/link/protocols/link_edp_panel_control.c | 29 +- + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 18 +- + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 40 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.c | 5 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.h | 2 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn21.c | 6 - + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn21.h | 4 - + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c | 5 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.h | 2 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn32.c | 16 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn32.h | 3 + + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 42 +- + .../drm/amd/display/modules/freesync/freesync.c | 4 - + .../drm/amd/display/modules/power/power_helpers.c | 43 + + .../drm/amd/display/modules/power/power_helpers.h | 3 + + drivers/gpu/drm/amd/include/amd_shared.h | 1 - + drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.c | 6 +- + .../drm/amd/pm/powerplay/hwmgr/smu7_powertune.c | 12 +- + .../drm/amd/pm/powerplay/hwmgr/vega10_powertune.c | 36 +- + drivers/gpu/drm/amd/pm/powerplay/inc/hwmgr.h | 2 +- + drivers/gpu/drm/radeon/ci_dpm.c | 28 +- + drivers/gpu/drm/radeon/radeon_cs.c | 3 +- + drivers/gpu/drm/ttm/ttm_tt.c | 6 + + include/drm/display/drm_dp.h | 3 + + include/drm/ttm/ttm_tt.h | 2 +- + include/uapi/drm/amdgpu_drm.h | 22 + + 170 files changed, 5651 insertions(+), 2009 deletions(-) + create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dmub_abm_lcd.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dmub_abm_lcd.h +Merging drm-intel/for-linux-next (3312bb4ad09c drm/i915: taint kernel when force probing unsupported devices) +$ 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/icl_dsi.c +Auto-merging drivers/gpu/drm/i915/display/intel_atomic_plane.c +Auto-merging drivers/gpu/drm/i915/display/intel_ddi.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_ddi.c +Auto-merging drivers/gpu/drm/i915/display/intel_display.c +Auto-merging drivers/gpu/drm/i915/display/intel_dp.c +Auto-merging drivers/gpu/drm/i915/display/intel_dp_mst.c +Auto-merging drivers/gpu/drm/i915/display/intel_hdmi.c +Auto-merging drivers/gpu/drm/i915/display/skl_scaler.c +Auto-merging drivers/gpu/drm/i915/display/vlv_dsi.c +Auto-merging drivers/gpu/drm/i915/gt/intel_reset.c +Auto-merging drivers/gpu/drm/i915/gt/intel_rps.c +Auto-merging drivers/gpu/drm/i915/i915_debugfs.c +Auto-merging drivers/gpu/drm/i915/i915_driver.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/i915_pci.c +Auto-merging drivers/gpu/drm/i915/i915_reg.h +Auto-merging drivers/gpu/drm/i915/intel_device_info.h +Resolved 'drivers/gpu/drm/i915/display/intel_ddi.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 58f4dca6e645] Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/i915/Kconfig | 12 +- + drivers/gpu/drm/i915/Makefile | 4 + + drivers/gpu/drm/i915/display/g4x_hdmi.c | 113 + + drivers/gpu/drm/i915/display/g4x_hdmi.h | 4 + + drivers/gpu/drm/i915/display/i9xx_wm.c | 4 +- + drivers/gpu/drm/i915/display/i9xx_wm.h | 1 - + drivers/gpu/drm/i915/display/icl_dsi.c | 1 + + drivers/gpu/drm/i915/display/intel_atomic.c | 259 +- + drivers/gpu/drm/i915/display/intel_atomic.h | 4 - + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 1 + + drivers/gpu/drm/i915/display/intel_audio.c | 1 + + drivers/gpu/drm/i915/display/intel_bw.c | 3 + + drivers/gpu/drm/i915/display/intel_cdclk.c | 179 +- + drivers/gpu/drm/i915/display/intel_cdclk.h | 1 + + drivers/gpu/drm/i915/display/intel_color.c | 481 +++- + drivers/gpu/drm/i915/display/intel_crt.c | 20 +- + drivers/gpu/drm/i915/display/intel_crtc.c | 10 +- + drivers/gpu/drm/i915/display/intel_crtc.h | 10 + + .../gpu/drm/i915/display/intel_crtc_state_dump.c | 52 +- + drivers/gpu/drm/i915/display/intel_cx0_phy.c | 2963 ++++++++++++++++++++ + drivers/gpu/drm/i915/display/intel_cx0_phy.h | 50 + + drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h | 221 ++ + drivers/gpu/drm/i915/display/intel_ddi.c | 422 ++- + drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c | 80 +- + drivers/gpu/drm/i915/display/intel_display.c | 1096 +------- + drivers/gpu/drm/i915/display/intel_display.h | 36 +- + .../gpu/drm/i915/display/intel_display_debugfs.c | 3 +- + .../gpu/drm/i915/display/intel_display_driver.c | 583 ++++ + .../gpu/drm/i915/display/intel_display_driver.h | 36 + + drivers/gpu/drm/i915/display/intel_display_power.c | 1 + + .../gpu/drm/i915/display/intel_display_power_map.c | 92 +- + .../drm/i915/display/intel_display_power_well.c | 4 +- + .../drm/i915/display/intel_display_power_well.h | 2 + + drivers/gpu/drm/i915/display/intel_display_reset.c | 135 + + drivers/gpu/drm/i915/display/intel_display_reset.h | 14 + + drivers/gpu/drm/i915/display/intel_display_trace.h | 1 - + drivers/gpu/drm/i915/display/intel_display_types.h | 54 +- + drivers/gpu/drm/i915/display/intel_dkl_phy.c | 9 + + drivers/gpu/drm/i915/display/intel_dkl_phy.h | 1 + + drivers/gpu/drm/i915/display/intel_dp.c | 315 ++- + drivers/gpu/drm/i915/display/intel_dp_aux.c | 5 + + .../gpu/drm/i915/display/intel_dp_link_training.c | 57 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 1 + + drivers/gpu/drm/i915/display/intel_dpll.c | 35 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 2 +- + drivers/gpu/drm/i915/display/intel_dvo.c | 1 + + drivers/gpu/drm/i915/display/intel_fbc.c | 1 + + drivers/gpu/drm/i915/display/intel_fifo_underrun.c | 2 + + drivers/gpu/drm/i915/display/intel_hdmi.c | 107 +- + drivers/gpu/drm/i915/display/intel_hdmi.h | 9 +- + drivers/gpu/drm/i915/display/intel_load_detect.c | 225 ++ + drivers/gpu/drm/i915/display/intel_load_detect.h | 20 + + drivers/gpu/drm/i915/display/intel_lvds.c | 3 +- + drivers/gpu/drm/i915/display/intel_modeset_setup.c | 4 +- + .../gpu/drm/i915/display/intel_modeset_verify.c | 2 + + drivers/gpu/drm/i915/display/intel_overlay.c | 16 +- + drivers/gpu/drm/i915/display/intel_panel.c | 113 +- + drivers/gpu/drm/i915/display/intel_pipe_crc.c | 1 + + drivers/gpu/drm/i915/display/intel_pps.c | 9 +- + drivers/gpu/drm/i915/display/intel_psr.c | 261 +- + drivers/gpu/drm/i915/display/intel_psr_regs.h | 207 +- + drivers/gpu/drm/i915/display/intel_sdvo.c | 1 + + drivers/gpu/drm/i915/display/intel_snps_phy.c | 5 + + drivers/gpu/drm/i915/display/intel_sprite.h | 10 - + drivers/gpu/drm/i915/display/intel_sprite_uapi.c | 1 + + drivers/gpu/drm/i915/display/intel_tc.c | 255 +- + drivers/gpu/drm/i915/display/intel_tv.c | 18 +- + drivers/gpu/drm/i915/display/intel_vblank.c | 15 +- + drivers/gpu/drm/i915/display/intel_vblank.h | 3 +- + drivers/gpu/drm/i915/display/intel_vrr.c | 64 +- + drivers/gpu/drm/i915/display/intel_vrr.h | 10 +- + drivers/gpu/drm/i915/display/skl_scaler.c | 314 ++- + drivers/gpu/drm/i915/display/skl_scaler.h | 12 +- + drivers/gpu/drm/i915/display/vlv_dsi.c | 1 + + drivers/gpu/drm/i915/gt/intel_gt_irq.c | 1 + + drivers/gpu/drm/i915/gt/intel_reset.c | 7 +- + drivers/gpu/drm/i915/gt/intel_rps.c | 1 + + drivers/gpu/drm/i915/gt/selftest_rps.c | 1 + + drivers/gpu/drm/i915/gt/uc/intel_guc.c | 1 + + drivers/gpu/drm/i915/gvt/handlers.c | 2 +- + drivers/gpu/drm/i915/i915_debugfs.c | 1 + + drivers/gpu/drm/i915/i915_driver.c | 47 +- + drivers/gpu/drm/i915/i915_drv.h | 7 - + drivers/gpu/drm/i915/i915_irq.c | 588 +++- + drivers/gpu/drm/i915/i915_irq.h | 4 +- + drivers/gpu/drm/i915/i915_pci.c | 10 +- + drivers/gpu/drm/i915/i915_reg.h | 451 +-- + drivers/gpu/drm/i915/i915_reg_defs.h | 57 + + drivers/gpu/drm/i915/intel_clock_gating.c | 5 +- + drivers/gpu/drm/i915/intel_device_info.c | 29 + + drivers/gpu/drm/i915/intel_device_info.h | 2 + + 91 files changed, 8078 insertions(+), 2204 deletions(-) + create mode 100644 drivers/gpu/drm/i915/display/intel_cx0_phy.c + create mode 100644 drivers/gpu/drm/i915/display/intel_cx0_phy.h + create mode 100644 drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h + create mode 100644 drivers/gpu/drm/i915/display/intel_display_driver.c + create mode 100644 drivers/gpu/drm/i915/display/intel_display_driver.h + create mode 100644 drivers/gpu/drm/i915/display/intel_display_reset.c + create mode 100644 drivers/gpu/drm/i915/display/intel_display_reset.h + create mode 100644 drivers/gpu/drm/i915/display/intel_load_detect.c + create mode 100644 drivers/gpu/drm/i915/display/intel_load_detect.h +Merging drm-tegra/for-next (2429b3c529da drm/tegra: Avoid potential 32-bit integer overflow) +$ git merge -m Merge branch 'for-next' of https://gitlab.freedesktop.org/drm/tegra.git drm-tegra/for-next +Already up to date. +Merging drm-msm/msm-next (ac7e7c9c65ec drm/msm/dpu: drop unused macros from hw catalog) +$ git merge -m Merge branch 'msm-next' of https://gitlab.freedesktop.org/drm/msm.git drm-msm/msm-next +Already up to date. +Merging drm-msm-lumag/msm-next-lumag (ac7e7c9c65ec drm/msm/dpu: drop unused macros from hw catalog) +$ git merge -m Merge branch 'msm-next-lumag' of https://gitlab.freedesktop.org/lumag/msm.git drm-msm-lumag/msm-next-lumag +Already up to date. +Merging imx-drm/imx-drm/next (927d8fd465ad drm/imx: ipuv3-plane: Remove redundant color encoding and range initialisation) +$ git merge -m Merge branch 'imx-drm/next' of https://git.pengutronix.de/git/pza/linux imx-drm/imx-drm/next +Already up to date. +Merging etnaviv/etnaviv/next (4c22c61e429f drm/etnaviv: show number of NN cores in GPU debugfs info) +$ git merge -m Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux etnaviv/etnaviv/next +Already up to date. +Merging fbdev/for-next (457391b03803 Linux 6.3) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next +Already up to date. +Merging regmap/for-next (1bab2184cb38 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. + drivers/base/regmap/regmap-irq.c | 5 ++--- + drivers/gpio/gpio-104-dio-48e.c | 37 +++++++++++++++++++++++++------------ + include/linux/regmap.h | 3 +-- + 3 files changed, 28 insertions(+), 17 deletions(-) +Merging sound/for-next (a4bb75c4f19d ALSA: uapi: pcm: control the filling of the silence samples for drain) +$ 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/core.h | 2 +- + include/uapi/sound/asound.h | 4 +++ + sound/pci/emu10k1/emu10k1_main.c | 16 +++++----- + sound/pci/emu10k1/emufx.c | 7 ----- + sound/pci/emu10k1/emumixer.c | 68 ++++++++++++---------------------------- + sound/pci/emu10k1/emupcm.c | 2 -- + sound/pci/emu10k1/emuproc.c | 6 ---- + sound/pci/emu10k1/io.c | 25 ++++++++++----- + sound/pci/emu10k1/timer.c | 6 ---- + 9 files changed, 50 insertions(+), 86 deletions(-) +Merging ieee1394/for-next (ac9a78681b92 Linux 6.4-rc1) +$ 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 (5498bb522b5d Merge remote-tracking branch 'asoc/for-6.5' into asoc-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next +Merge made by the 'ort' strategy. + .../bindings/sound/google,sc7180-trogdor.yaml | 3 +- + .../devicetree/bindings/sound/nau8540.txt | 16 - + .../devicetree/bindings/sound/nuvoton,nau8540.yaml | 40 + + .../bindings/sound/nvidia,tegra-audio-common.yaml | 4 +- + .../devicetree/bindings/sound/qcom,q6apm-dai.yaml | 4 +- + .../bindings/sound/qcom,q6dsp-lpass-clocks.yaml | 4 +- + .../bindings/sound/qcom,q6dsp-lpass-ports.yaml | 4 +- + .../bindings/sound/snps,designware-i2s.yaml | 3 +- + .../devicetree/bindings/sound/tas2562.yaml | 4 +- + .../devicetree/bindings/sound/tas2770.yaml | 4 +- + .../devicetree/bindings/sound/tas27xx.yaml | 4 +- + .../devicetree/bindings/sound/wlf,wm8903.yaml | 4 +- + include/sound/simple_card_utils.h | 1 - + include/sound/soc.h | 1 + + sound/soc/amd/acp/acp-mach-common.c | 43 +- + sound/soc/amd/ps/acp63.h | 15 +- + sound/soc/amd/ps/pci-ps.c | 67 +- + sound/soc/amd/ps/ps-pdm-dma.c | 63 +- + sound/soc/atmel/atmel-classd.c | 8 +- + sound/soc/atmel/atmel-pdmic.c | 8 +- + sound/soc/codecs/Kconfig | 7 + + sound/soc/codecs/Makefile | 2 + + sound/soc/codecs/ad193x-i2c.c | 2 +- + sound/soc/codecs/adau1372-i2c.c | 2 +- + sound/soc/codecs/adau1373.c | 2 +- + sound/soc/codecs/adau1701.c | 2 +- + sound/soc/codecs/adau1761-i2c.c | 2 +- + sound/soc/codecs/adau1781-i2c.c | 2 +- + sound/soc/codecs/adau1977-i2c.c | 2 +- + sound/soc/codecs/adau7118-i2c.c | 2 +- + sound/soc/codecs/adav803.c | 2 +- + sound/soc/codecs/ak4118.c | 2 +- + sound/soc/codecs/ak4375.c | 2 +- + sound/soc/codecs/ak4458.c | 2 +- + sound/soc/codecs/ak4535.c | 2 +- + sound/soc/codecs/ak4613.c | 2 +- + sound/soc/codecs/ak4641.c | 2 +- + sound/soc/codecs/ak4642.c | 2 +- + sound/soc/codecs/ak4671.c | 2 +- + sound/soc/codecs/ak5558.c | 2 +- + sound/soc/codecs/alc5623.c | 2 +- + sound/soc/codecs/alc5632.c | 2 +- + sound/soc/codecs/aw88395/aw88395.c | 2 +- + sound/soc/codecs/cs35l32.c | 2 +- + sound/soc/codecs/cs35l33.c | 2 +- + sound/soc/codecs/cs35l34.c | 2 +- + sound/soc/codecs/cs35l35.c | 2 +- + sound/soc/codecs/cs35l36.c | 2 +- + sound/soc/codecs/cs35l41-i2c.c | 2 +- + sound/soc/codecs/cs35l45-i2c.c | 2 +- + sound/soc/codecs/cs4234.c | 2 +- + sound/soc/codecs/cs4265.c | 2 +- + sound/soc/codecs/cs4270.c | 2 +- + sound/soc/codecs/cs4271-i2c.c | 2 +- + sound/soc/codecs/cs42l42-i2c.c | 2 +- + sound/soc/codecs/cs42l51-i2c.c | 2 +- + sound/soc/codecs/cs42l52.c | 2 +- + sound/soc/codecs/cs42l56.c | 2 +- + sound/soc/codecs/cs42l73.c | 2 +- + sound/soc/codecs/cs42l83-i2c.c | 2 +- + sound/soc/codecs/cs42xx8-i2c.c | 2 +- + sound/soc/codecs/cs43130.c | 2 +- + sound/soc/codecs/cs4341.c | 2 +- + sound/soc/codecs/cs4349.c | 2 +- + sound/soc/codecs/cs53l30.c | 2 +- + sound/soc/codecs/cx2072x.c | 2 +- + sound/soc/codecs/da7210.c | 2 +- + sound/soc/codecs/da7213.c | 2 +- + sound/soc/codecs/da7218.c | 2 +- + sound/soc/codecs/da7219.c | 2 +- + sound/soc/codecs/da732x.c | 2 +- + sound/soc/codecs/da9055.c | 2 +- + sound/soc/codecs/es8316.c | 2 +- + sound/soc/codecs/es8326.c | 2 +- + sound/soc/codecs/es8328-i2c.c | 2 +- + sound/soc/codecs/isabelle.c | 2 +- + sound/soc/codecs/lm4857.c | 2 +- + sound/soc/codecs/lm49453.c | 2 +- + sound/soc/codecs/max9768.c | 2 +- + sound/soc/codecs/max98088.c | 2 +- + sound/soc/codecs/max98090.c | 2 +- + sound/soc/codecs/max98095.c | 2 +- + sound/soc/codecs/max98371.c | 2 +- + sound/soc/codecs/max98373-i2c.c | 2 +- + sound/soc/codecs/max98390.c | 2 +- + sound/soc/codecs/max98396.c | 2 +- + sound/soc/codecs/max9850.c | 2 +- + sound/soc/codecs/max98504.c | 2 +- + sound/soc/codecs/max98520.c | 2 +- + sound/soc/codecs/max9860.c | 2 +- + sound/soc/codecs/max9867.c | 2 +- + sound/soc/codecs/max9877.c | 2 +- + sound/soc/codecs/max98925.c | 2 +- + sound/soc/codecs/max98926.c | 2 +- + sound/soc/codecs/max98927.c | 2 +- + sound/soc/codecs/ml26124.c | 2 +- + sound/soc/codecs/mt6660.c | 2 +- + sound/soc/codecs/nau8540.c | 2 +- + sound/soc/codecs/nau8810.c | 2 +- + sound/soc/codecs/nau8821.c | 2 +- + sound/soc/codecs/nau8822.c | 2 +- + sound/soc/codecs/nau8824.c | 2 +- + sound/soc/codecs/nau8825.c | 2 +- + sound/soc/codecs/pcm1681.c | 2 +- + sound/soc/codecs/pcm1789-i2c.c | 2 +- + sound/soc/codecs/pcm179x-i2c.c | 2 +- + sound/soc/codecs/pcm186x-i2c.c | 2 +- + sound/soc/codecs/pcm3060-i2c.c | 2 +- + sound/soc/codecs/pcm3168a-i2c.c | 2 +- + sound/soc/codecs/pcm512x-i2c.c | 2 +- + sound/soc/codecs/rt1011.c | 2 +- + sound/soc/codecs/rt1015.c | 2 +- + sound/soc/codecs/rt1016.c | 2 +- + sound/soc/codecs/rt1019.c | 2 +- + sound/soc/codecs/rt1305.c | 2 +- + sound/soc/codecs/rt1308.c | 2 +- + sound/soc/codecs/rt274.c | 2 +- + sound/soc/codecs/rt286.c | 2 +- + sound/soc/codecs/rt298.c | 2 +- + sound/soc/codecs/rt5514.c | 2 +- + sound/soc/codecs/rt5616.c | 2 +- + sound/soc/codecs/rt5631.c | 2 +- + sound/soc/codecs/rt5640.c | 2 +- + sound/soc/codecs/rt5645.c | 2 +- + sound/soc/codecs/rt5651.c | 2 +- + sound/soc/codecs/rt5659.c | 2 +- + sound/soc/codecs/rt5660.c | 2 +- + sound/soc/codecs/rt5663.c | 2 +- + sound/soc/codecs/rt5665.c | 2 +- + sound/soc/codecs/rt5668.c | 2 +- + sound/soc/codecs/rt5670.c | 2 +- + sound/soc/codecs/rt5677.c | 2 +- + sound/soc/codecs/rt5682-i2c.c | 2 +- + sound/soc/codecs/rt5682-sdw.c | 2 +- + sound/soc/codecs/rt5682s.c | 4 +- + sound/soc/codecs/rt715-sdw.c | 2 +- + sound/soc/codecs/rt722-sdca-sdw.c | 510 +++++++ + sound/soc/codecs/rt722-sdca-sdw.h | 124 ++ + sound/soc/codecs/rt722-sdca.c | 1555 ++++++++++++++++++++ + sound/soc/codecs/rt722-sdca.h | 238 +++ + sound/soc/codecs/rt9120.c | 2 +- + sound/soc/codecs/sgtl5000.c | 2 +- + sound/soc/codecs/sma1303.c | 2 +- + sound/soc/codecs/src4xxx-i2c.c | 2 +- + sound/soc/codecs/ssm2518.c | 2 +- + sound/soc/codecs/ssm2602-i2c.c | 2 +- + sound/soc/codecs/ssm4567.c | 2 +- + sound/soc/codecs/sta32x.c | 2 +- + sound/soc/codecs/sta350.c | 2 +- + sound/soc/codecs/sta529.c | 2 +- + sound/soc/codecs/tas2552.c | 2 +- + sound/soc/codecs/tas2562.c | 2 +- + sound/soc/codecs/tas2764.c | 2 +- + sound/soc/codecs/tas2770.c | 2 +- + sound/soc/codecs/tas2780.c | 2 +- + sound/soc/codecs/tas5086.c | 2 +- + sound/soc/codecs/tas571x.c | 2 +- + sound/soc/codecs/tas5720.c | 2 +- + sound/soc/codecs/tas5805m.c | 2 +- + sound/soc/codecs/tas6424.c | 2 +- + sound/soc/codecs/tda7419.c | 2 +- + sound/soc/codecs/tfa9879.c | 2 +- + sound/soc/codecs/tfa989x.c | 2 +- + sound/soc/codecs/tlv320adc3xxx.c | 2 +- + sound/soc/codecs/tlv320adcx140.c | 2 +- + sound/soc/codecs/tlv320aic23-i2c.c | 2 +- + sound/soc/codecs/tlv320aic31xx.c | 2 +- + sound/soc/codecs/tlv320aic32x4-i2c.c | 2 +- + sound/soc/codecs/tlv320aic3x-i2c.c | 2 +- + sound/soc/codecs/tlv320dac33.c | 2 +- + sound/soc/codecs/tpa6130a2.c | 2 +- + sound/soc/codecs/ts3a227e.c | 2 +- + sound/soc/codecs/tscs42xx.c | 2 +- + sound/soc/codecs/tscs454.c | 2 +- + sound/soc/codecs/uda1380.c | 2 +- + sound/soc/codecs/wcd938x-sdw.c | 2 +- + sound/soc/codecs/wm1250-ev1.c | 2 +- + sound/soc/codecs/wm2000.c | 2 +- + sound/soc/codecs/wm2200.c | 2 +- + sound/soc/codecs/wm5100.c | 2 +- + sound/soc/codecs/wm8510.c | 2 +- + sound/soc/codecs/wm8523.c | 2 +- + sound/soc/codecs/wm8580.c | 2 +- + sound/soc/codecs/wm8711.c | 2 +- + sound/soc/codecs/wm8728.c | 2 +- + sound/soc/codecs/wm8731-i2c.c | 2 +- + sound/soc/codecs/wm8737.c | 2 +- + sound/soc/codecs/wm8741.c | 2 +- + sound/soc/codecs/wm8750.c | 2 +- + sound/soc/codecs/wm8753.c | 2 +- + sound/soc/codecs/wm8776.c | 2 +- + sound/soc/codecs/wm8804-i2c.c | 2 +- + sound/soc/codecs/wm8900.c | 2 +- + sound/soc/codecs/wm8903.c | 2 +- + sound/soc/codecs/wm8904.c | 2 +- + sound/soc/codecs/wm8940.c | 2 +- + sound/soc/codecs/wm8955.c | 2 +- + sound/soc/codecs/wm8960.c | 2 +- + sound/soc/codecs/wm8961.c | 2 +- + sound/soc/codecs/wm8962.c | 2 +- + sound/soc/codecs/wm8971.c | 2 +- + sound/soc/codecs/wm8974.c | 2 +- + sound/soc/codecs/wm8978.c | 2 +- + sound/soc/codecs/wm8983.c | 2 +- + sound/soc/codecs/wm8985.c | 2 +- + sound/soc/codecs/wm8988.c | 2 +- + sound/soc/codecs/wm8990.c | 2 +- + sound/soc/codecs/wm8991.c | 2 +- + sound/soc/codecs/wm8993.c | 2 +- + sound/soc/codecs/wm8995.c | 2 +- + sound/soc/codecs/wm8996.c | 2 +- + sound/soc/codecs/wm9081.c | 2 +- + sound/soc/codecs/wm9090.c | 2 +- + sound/soc/dwc/dwc-i2s.c | 33 +- + sound/soc/dwc/local.h | 1 + + sound/soc/fsl/fsl_sai.c | 24 +- + sound/soc/fsl/fsl_sai.h | 2 + + sound/soc/fsl/imx-audmix.c | 14 +- + sound/soc/fsl/imx-card.c | 11 +- + sound/soc/fsl/imx-rpmsg.c | 3 +- + sound/soc/fsl/imx-spdif.c | 8 +- + sound/soc/generic/simple-card-utils.c | 9 +- + sound/soc/intel/avs/boards/i2s_test.c | 6 +- + sound/soc/intel/boards/ehl_rt5660.c | 8 +- + sound/soc/intel/boards/skl_hda_dsp_generic.c | 8 +- + sound/soc/intel/boards/sof_cs42l42.c | 11 +- + sound/soc/intel/boards/sof_es8336.c | 11 +- + sound/soc/intel/boards/sof_nau8825.c | 11 +- + sound/soc/intel/boards/sof_pcm512x.c | 3 +- + sound/soc/intel/boards/sof_rt5682.c | 14 +- + sound/soc/intel/boards/sof_sdw.c | 13 +- + sound/soc/intel/boards/sof_ssp_amp.c | 18 +- + sound/soc/mediatek/mt8195/mt8195-afe-pcm.c | 99 +- + sound/soc/meson/axg-card.c | 8 +- + sound/soc/meson/meson-card-utils.c | 10 +- + sound/soc/qcom/common.c | 11 +- + sound/soc/soc-topology.c | 22 +- + sound/soc/soc-utils.c | 7 + + sound/soc/sof/mediatek/mt8186/mt8186.c | 36 +- + sound/soc/sof/mediatek/mt8195/mt8195.c | 36 +- + sound/soc/sof/nocodec.c | 8 +- + sound/soc/ti/omap-hdmi.c | 8 +- + 242 files changed, 2918 insertions(+), 647 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/sound/nau8540.txt + create mode 100644 Documentation/devicetree/bindings/sound/nuvoton,nau8540.yaml + create mode 100644 sound/soc/codecs/rt722-sdca-sdw.c + create mode 100644 sound/soc/codecs/rt722-sdca-sdw.h + create mode 100644 sound/soc/codecs/rt722-sdca.c + create mode 100644 sound/soc/codecs/rt722-sdca.h +Merging modules/modules-next (0b891c83d8c5 module: include internal.h in module/dups.c) +$ git merge -m Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules/modules-next +Already up to date. +Merging input/next (bcf784985e35 Input: pwm-vibra - add support for enable GPIO) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next +Auto-merging drivers/input/input.c +Auto-merging drivers/input/touchscreen/cyttsp5.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/input/atmel,maxtouch.yaml | 7 ++ + .../devicetree/bindings/input/pwm-vibrator.yaml | 2 + + .../input/touchscreen/cypress,tt21000.yaml | 2 + + drivers/input/Kconfig | 2 +- + drivers/input/input.c | 6 +- + drivers/input/misc/drv260x.c | 56 +++----------- + drivers/input/misc/pwm-vibra.c | 36 ++++++--- + drivers/input/misc/uinput.c | 34 +++++++++ + drivers/input/tests/input_test.c | 6 +- + drivers/input/touchscreen/atmel_mxt_ts.c | 85 ++++++++++++++++++++++ + drivers/input/touchscreen/cyttsp4_core.c | 3 +- + drivers/input/touchscreen/cyttsp5.c | 82 +++++++++++++++++++-- + drivers/input/touchscreen/edt-ft5x06.c | 1 + + drivers/input/touchscreen/ili210x.c | 36 +++++---- + include/linux/i8042.h | 1 + + 15 files changed, 276 insertions(+), 83 deletions(-) +Merging block/for-next (92f55959eee4 Merge branch 'fmode_nowait' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next +Auto-merging fs/pipe.c +CONFLICT (content): Merge conflict in fs/pipe.c +Recorded preimage for 'fs/pipe.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'fs/pipe.c'. +[master 5490be630d12] Merge branch 'for-next' of git://git.kernel.dk/linux-block.git +$ git diff -M --stat --summary HEAD^.. + block/fops.c | 5 ++++- + include/linux/io_uring.h | 10 +++++----- + io_uring/io_uring.c | 21 --------------------- + net/socket.c | 1 + + 4 files changed, 10 insertions(+), 27 deletions(-) +Merging device-mapper/for-next (38d11da522aa dm: don't lock fs when the map is NULL in process of resume) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git device-mapper/for-next +Already up to date. +Merging libata/for-next (140b26035b2d ata: pata_parport-bpck6: Declare mode_map as static) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git libata/for-next +Already up to date. +Merging pcmcia/pcmcia-next (15e74c6c1ce2 pcmcia: remove AT91RM9200 Compact Flash driver) +$ git merge -m Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git pcmcia/pcmcia-next +Already up to date. +Merging mmc/next (0541a5077850 dt-bindings: mmc: sdhci-msm: Document SC8280XP SDHCI) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next +Merge made by the 'ort' strategy. + .../devicetree/bindings/mmc/brcm,kona-sdhci.txt | 21 -- + .../devicetree/bindings/mmc/brcm,kona-sdhci.yaml | 48 +++++ + .../devicetree/bindings/mmc/sdhci-msm.yaml | 2 + + drivers/mmc/host/Kconfig | 2 +- + drivers/mmc/host/dw_mmc-bluefield.c | 2 +- + drivers/mmc/host/dw_mmc-k3.c | 2 +- + drivers/mmc/host/dw_mmc-pltfm.c | 5 +- + drivers/mmc/host/dw_mmc-pltfm.h | 2 +- + drivers/mmc/host/dw_mmc-starfive.c | 2 +- + drivers/mmc/host/sdhci-msm.c | 223 +++++---------------- + 10 files changed, 104 insertions(+), 205 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/mmc/brcm,kona-sdhci.txt + create mode 100644 Documentation/devicetree/bindings/mmc/brcm,kona-sdhci.yaml +$ git reset --hard HEAD^ +HEAD is now at 5490be630d12 Merge branch 'for-next' of git://git.kernel.dk/linux-block.git +Merging next-20230509 version of mmc +$ git merge -m next-20230509/mmc 4eb0e7873c7159298799aabbd0f29b48689a73f0 +Merge made by the 'ort' strategy. +Merging mfd/for-mfd-next (9e9ff39243ea dt-bindings: mfd: ti,j721e-system-controller: Add SoC chip ID) +$ git merge -m Merge branch 'for-mfd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd/for-mfd-next +Already up to date. +Merging backlight/for-backlight-next (fb200218b40b backlight: as3711: Use of_property_read_bool() for boolean properties) +$ git merge -m Merge branch 'for-backlight-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight/for-backlight-next +Already up to date. +Merging battery/for-next (67fce5963b20 power: supply: hwmon: constify pointers to hwmon_channel_info) +$ 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 +Merge made by the 'ort' strategy. + .../bindings/power/reset/nvmem-reboot-mode.txt | 26 ----------- + .../bindings/power/reset/nvmem-reboot-mode.yaml | 52 ++++++++++++++++++++++ + .../devicetree/bindings/power/reset/qcom,pon.yaml | 4 +- + .../devicetree/bindings/power/supply/bq256xx.yaml | 18 ++++++++ + drivers/power/reset/gpio-restart.c | 7 +-- + drivers/power/supply/bq256xx_charger.c | 28 ++++++++++++ + drivers/power/supply/cros_peripheral_charger.c | 25 +++++++++-- + drivers/power/supply/max17042_battery.c | 7 +-- + drivers/power/supply/power_supply_hwmon.c | 2 +- + drivers/power/supply/rk817_charger.c | 2 +- + drivers/power/supply/twl4030_madc_battery.c | 8 +--- + 11 files changed, 129 insertions(+), 50 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/power/reset/nvmem-reboot-mode.txt + create mode 100644 Documentation/devicetree/bindings/power/reset/nvmem-reboot-mode.yaml +Merging regulator/for-next (cf27b7d9a574 regulator: Add support for TPS6287x) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/regulator/ti,tps62870.yaml | 52 ++++++ + drivers/regulator/88pg86x.c | 2 +- + drivers/regulator/Kconfig | 11 ++ + drivers/regulator/Makefile | 1 + + drivers/regulator/act8865-regulator.c | 2 +- + drivers/regulator/ad5398.c | 2 +- + drivers/regulator/da9121-regulator.c | 2 +- + drivers/regulator/da9210-regulator.c | 2 +- + drivers/regulator/da9211-regulator.c | 2 +- + drivers/regulator/fan53555.c | 2 +- + drivers/regulator/fan53880.c | 2 +- + drivers/regulator/isl6271a-regulator.c | 2 +- + drivers/regulator/isl9305.c | 2 +- + drivers/regulator/lp3971.c | 2 +- + drivers/regulator/lp3972.c | 2 +- + drivers/regulator/lp872x.c | 2 +- + drivers/regulator/lp8755.c | 2 +- + drivers/regulator/ltc3589.c | 2 +- + drivers/regulator/ltc3676.c | 2 +- + drivers/regulator/max1586.c | 2 +- + drivers/regulator/max20086-regulator.c | 2 +- + drivers/regulator/max20411-regulator.c | 2 +- + drivers/regulator/max77826-regulator.c | 2 +- + drivers/regulator/max8649.c | 2 +- + drivers/regulator/max8660.c | 2 +- + drivers/regulator/max8893.c | 2 +- + drivers/regulator/max8952.c | 2 +- + drivers/regulator/max8973-regulator.c | 2 +- + drivers/regulator/mcp16502.c | 2 +- + drivers/regulator/mp5416.c | 2 +- + drivers/regulator/mp8859.c | 2 +- + drivers/regulator/mp886x.c | 2 +- + drivers/regulator/mpq7920.c | 2 +- + drivers/regulator/mt6311-regulator.c | 2 +- + drivers/regulator/pca9450-regulator.c | 2 +- + drivers/regulator/pf8x00-regulator.c | 2 +- + drivers/regulator/pfuze100-regulator.c | 2 +- + drivers/regulator/pv88060-regulator.c | 2 +- + drivers/regulator/pv88080-regulator.c | 2 +- + drivers/regulator/pv88090-regulator.c | 2 +- + drivers/regulator/rpi-panel-attiny-regulator.c | 2 +- + drivers/regulator/rt4801-regulator.c | 2 +- + drivers/regulator/rt5190a-regulator.c | 2 +- + drivers/regulator/rt5759-regulator.c | 2 +- + drivers/regulator/rt6160-regulator.c | 2 +- + drivers/regulator/rt6190-regulator.c | 2 +- + drivers/regulator/rt6245-regulator.c | 2 +- + drivers/regulator/rtmv20-regulator.c | 2 +- + drivers/regulator/rtq2134-regulator.c | 2 +- + drivers/regulator/rtq6752-regulator.c | 2 +- + drivers/regulator/slg51000-regulator.c | 2 +- + drivers/regulator/sy8106a-regulator.c | 2 +- + drivers/regulator/sy8824x.c | 2 +- + drivers/regulator/sy8827n.c | 2 +- + drivers/regulator/tps51632-regulator.c | 2 +- + drivers/regulator/tps62360-regulator.c | 2 +- + drivers/regulator/tps6286x-regulator.c | 2 +- + drivers/regulator/tps6287x-regulator.c | 188 +++++++++++++++++++++ + drivers/regulator/tps65023-regulator.c | 2 +- + drivers/regulator/tps65132-regulator.c | 2 +- + drivers/regulator/tps65219-regulator.c | 6 +- + 61 files changed, 311 insertions(+), 59 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regulator/ti,tps62870.yaml + create mode 100644 drivers/regulator/tps6287x-regulator.c +Merging security/next (ac9a78681b92 Linux 6.4-rc1) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git security/next +Already up to date. +Merging apparmor/apparmor-next (0bb84cff96af apparmor: fix missing error check for rhashtable_insert_fast) +$ git merge -m Merge branch 'apparmor-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor apparmor/apparmor-next +Auto-merging security/apparmor/domain.c +Auto-merging security/apparmor/file.c +Auto-merging security/apparmor/policy_unpack.c +Merge made by the 'ort' strategy. + security/apparmor/crypto.c | 10 +++++----- + security/apparmor/domain.c | 2 +- + security/apparmor/file.c | 2 +- + security/apparmor/include/task.h | 2 +- + security/apparmor/policy.c | 7 ++----- + security/apparmor/policy_unpack.c | 11 ++++++++--- + security/apparmor/policy_unpack_test.c | 13 ++++++------- + security/apparmor/secid.c | 3 +-- + security/apparmor/task.c | 5 +---- + 9 files changed, 26 insertions(+), 29 deletions(-) +Merging integrity/next-integrity (644f17412f5a IMA: allow/fix UML builds) +$ git merge -m Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity/next-integrity +Already up to date. +Merging safesetid/safesetid-next (64b634830c91 LSM: SafeSetID: add setgroups() testing to selftest) +$ git merge -m Merge branch 'safesetid-next' of https://github.com/micah-morton/linux.git safesetid/safesetid-next +Already up to date. +Merging selinux/next (c52df19e3759 selinux: small cleanups in selinux_audit_rule_init()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next +Merge made by the 'ort' strategy. + security/selinux/Makefile | 19 +++++++++---------- + security/selinux/avc.c | 20 -------------------- + security/selinux/hooks.c | 4 ++-- + security/selinux/ima.c | 2 +- + security/selinux/include/audit.h | 2 +- + security/selinux/include/avc.h | 3 --- + security/selinux/include/ima.h | 2 +- + security/selinux/selinuxfs.c | 4 ++-- + security/selinux/ss/avtab.c | 2 +- + security/selinux/ss/avtab.h | 2 +- + security/selinux/ss/context.h | 1 + + security/selinux/ss/policydb.c | 2 +- + security/selinux/ss/services.c | 40 +++++++++++++++++++--------------------- + 13 files changed, 39 insertions(+), 64 deletions(-) +Merging smack/next (de93e515db30 Smack: Improve mount process memory use) +$ git merge -m Merge branch 'next' of git://github.com/cschaufler/smack-next smack/next +Already up to date. +Merging tomoyo/master (933fd4391e3d workqueue: Emit runtime message when flush_scheduled_work() is called) +$ git merge -m Merge branch 'master' of https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git tomoyo/master +Merge made by the 'ort' strategy. + include/linux/workqueue.h | 2 ++ + kernel/workqueue.c | 2 ++ + 2 files changed, 4 insertions(+) +Merging tpmdd/next (7c1a4441ddf1 tpm: Prevent hwrng from activating during resume) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tpmdd/next +Merge made by the 'ort' strategy. + drivers/char/tpm/tpm-chip.c | 4 ++++ + drivers/char/tpm/tpm-interface.c | 10 ++++++++++ + drivers/char/tpm/tpm_tis_core.c | 43 ++++++++++++++++++---------------------- + include/linux/tpm.h | 1 + + 4 files changed, 34 insertions(+), 24 deletions(-) +Merging watchdog/master (fc4354c6e5c2 Merge tag 'mm-stable-2023-05-06-10-49' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm) +$ git merge -m Merge branch 'master' of git://www.linux-watchdog.org/linux-watchdog-next.git watchdog/master +Already up to date. +Merging iommu/next (e51b4198396c Merge branches 'iommu/fixes', 'arm/allwinner', 'arm/exynos', 'arm/mediatek', 'arm/omap', 'arm/renesas', 'arm/rockchip', 'arm/smmu', 'ppc/pamu', 'unisoc', 'x86/vt-d', 'x86/amd', 'core' and 'platform-remove_new' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git iommu/next +Already up to date. +Merging audit/next (ac9a78681b92 Linux 6.4-rc1) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git audit/next +Already up to date. +Merging devicetree/for-next (c50eb01940c7 Merge branch 'dt/address-cleanups' into dt/next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next +Merge made by the 'ort' strategy. +Merging dt-krzk/for-next (8bbec86ce6d6 dt-bindings: PCI: fsl,imx6q: fix assigned-clocks warning) +$ 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 (d396133dced4 dt-bindings: mailbox: qcom: add compatible for IPQ9574 SoC) +$ git merge -m Merge branch 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu/integration.git mailbox/mailbox-for-next +Already up to date. +Merging spi/for-next (057e1ae7443c spi: dw: DW SPI DMA Driver updates) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next +Merge made by the 'ort' strategy. + .../bindings/spi/qcom,spi-qcom-qspi.yaml | 3 + + .../devicetree/bindings/spi/spi-zynqmp-qspi.yaml | 6 + + drivers/spi/spi-dw-dma.c | 24 ++- + drivers/spi/spi-fsl-lpspi.c | 6 + + drivers/spi/spi-geni-qcom.c | 2 +- + drivers/spi/spi-qcom-qspi.c | 218 ++++++++++++++++++++- + drivers/spi/spi-s3c64xx.c | 81 ++++++-- + include/linux/platform_data/spi-s3c64xx.h | 1 + + 8 files changed, 312 insertions(+), 29 deletions(-) +Merging tip/master (d40dcfe0eed0 Merge x86/sev into tip/master) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master +Auto-merging include/linux/pci_ids.h +Merge made by the 'ort' strategy. + Documentation/process/maintainer-tip.rst | 3 + + arch/x86/coco/core.c | 10 +-- + arch/x86/coco/tdx/tdx.c | 2 +- + arch/x86/hyperv/ivm.c | 2 +- + arch/x86/include/asm/coco.h | 19 +---- + arch/x86/include/asm/pgtable_64.h | 4 +- + arch/x86/include/asm/sev.h | 11 +-- + arch/x86/kernel/amd_nb.c | 2 + + arch/x86/kernel/cpu/microcode/amd.c | 11 +-- + arch/x86/kernel/sev.c | 5 -- + arch/x86/mm/mem_encrypt_identity.c | 2 +- + drivers/hwmon/k10temp.c | 1 + + include/linux/lockdep.h | 14 ++++ + include/linux/lockdep_types.h | 1 + + include/linux/pci_ids.h | 1 + + kernel/locking/lockdep.c | 28 ++++++-- + kernel/time/tick-broadcast.c | 120 ++++++++++++++++++++++--------- + lib/debugobjects.c | 15 +++- + tools/arch/x86/kcpuid/.gitignore | 1 + + tools/arch/x86/kcpuid/kcpuid.c | 7 +- + 20 files changed, 170 insertions(+), 89 deletions(-) + create mode 100644 tools/arch/x86/kcpuid/.gitignore +Merging clockevents/timers/drivers/next (158009f1b4a3 timekeeping: Fix references to nonexistent ktime_get_fast_ns()) +$ 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 (d6c5e688899b Merge branch 'edac-drivers' into edac-for-next) +$ git merge -m Merge branch 'edac-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac/edac-for-next +Merge made by the 'ort' strategy. +Merging irqchip/irq/irqchip-next (2ff1b0839ddd Merge branch irq/misc-6.4 into irq/irqchip-next) +$ git merge -m Merge branch 'irq/irqchip-next' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git irqchip/irq/irqchip-next +Already up to date. +Merging ftrace/for-next (3862f86c1529 Merge tools/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git ftrace/for-next +Auto-merging kernel/trace/ftrace.c +Merge made by the 'ort' strategy. +Merging rcu/rcu/next (2983876f3aa4 Revert "rcu/kvfree: Eliminate k[v]free_rcu() single argument macro") + e85feae03a95 ("tools/nolibc: Fix build of stdio.h due to header ordering") +$ 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 MAINTAINERS +Auto-merging kernel/workqueue.c +Merge made by the 'ort' strategy. + .../RCU/Design/Requirements/Requirements.rst | 36 +--- + Documentation/RCU/whatisRCU.rst | 1 - + Documentation/admin-guide/kernel-parameters.txt | 139 +++++++------- + MAINTAINERS | 2 +- + include/linux/rcupdate.h | 25 --- + include/linux/srcu.h | 8 +- + kernel/locking/locktorture.c | 51 +++--- + kernel/rcu/Kconfig | 18 ++ + kernel/rcu/rcu.h | 6 + + kernel/rcu/rcuscale.c | 199 +++++++++++---------- + kernel/rcu/tasks.h | 12 +- + kernel/rcu/tree.c | 131 +++++++++----- + kernel/rcu/tree_exp.h | 2 +- + kernel/rcu/tree_nocb.h | 52 +++++- + kernel/rcu/tree_plugin.h | 4 +- + kernel/workqueue.c | 2 + + tools/include/nolibc/stdio.h | 95 +++++++--- + tools/include/nolibc/sys.h | 23 +++ + tools/testing/selftests/nolibc/.gitignore | 1 + + tools/testing/selftests/nolibc/Makefile | 6 + + tools/testing/selftests/nolibc/nolibc-test.c | 99 +++++++++- + .../testing/selftests/rcutorture/bin/functions.sh | 2 +- + .../rcutorture/configs/rcu/BUSTED-BOOST.boot | 2 +- + .../selftests/rcutorture/configs/rcu/TREE03.boot | 2 +- + 24 files changed, 573 insertions(+), 345 deletions(-) +$ git am -3 ../patches/0001-fixup-for-RDMA-rxe-Add-error-messages.patch +Applying: fixup for "RDMA/rxe: Add error messages" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/infiniband/sw/rxe/rxe_verbs.c +$ git add -A . +$ git commit -v -a --amend +[master 670c6e668d29] Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git + Date: Wed May 10 11:33:28 2023 +1000 +Merging kvm/next (7a8016d95651 Merge tag 'kvm-s390-next-6.4-2' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next +Already up to date. +Merging kvm-arm/next (74819ee73f1f Merge branch kvm-arm64/misc-6.4 into kvmarm-master/next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm/next +Merge made by the 'ort' strategy. + arch/arm64/include/asm/kvm_pgtable.h | 1 + + arch/arm64/kvm/fpsimd.c | 26 +++++++++++++-------- + arch/arm64/kvm/hyp/include/hyp/switch.h | 12 ++++++++-- + arch/arm64/kvm/hyp/pgtable.c | 41 +++++++++++++++++++++++++-------- + arch/arm64/kvm/inject_fault.c | 2 +- + arch/arm64/kvm/vmid.c | 7 +++--- + 6 files changed, 64 insertions(+), 25 deletions(-) +Merging kvms390/next (8a46df7cd135 KVM: s390: pci: fix virtual-physical confusion on module unload/load) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390/next +Already up to date. +Merging kvm-riscv/riscv_kvm_next (2f4d58f7635a RISC-V: KVM: Virtualize per-HART AIA CSRs) +$ 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 (5c291b93e5d6 Merge branch 'pmu') +$ git merge -m Merge branch 'next' of https://github.com/kvm-x86/linux.git kvm-x86/next +Auto-merging arch/x86/kvm/x86.c +Merge made by the 'ort' strategy. +Merging xen-tip/linux-next (cbfac7707ba1 xen/blkback: move blkif_get_x86_*_req() into blkback.c) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next +Already up to date. +Merging percpu/for-next (b9819165bb45 Merge branch 'for-6.2' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git percpu/for-next +Merge made by the 'ort' strategy. +Merging workqueues/for-next (4d19140f762c Merge branch 'for-6.5' into for-next) + 854f5cc5b735 ("Further upgrade queue_work_on() comment") +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next +Auto-merging kernel/workqueue.c +Merge made by the 'ort' strategy. + arch/powerpc/kernel/tau_6xx.c | 2 +- + arch/powerpc/platforms/pseries/dlpar.c | 3 +-- + drivers/greybus/connection.c | 4 ++-- + drivers/greybus/svc.c | 2 +- + drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 3 +-- + drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 5 ++--- + drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 13 +++++-------- + drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 5 ++--- + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 2 +- + drivers/virt/acrn/ioreq.c | 4 ++-- + drivers/xen/pvcalls-back.c | 4 ++-- + 11 files changed, 20 insertions(+), 27 deletions(-) +Merging drivers-x86/for-next (ac9a78681b92 Linux 6.4-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 (ac9a78681b92 Linux 6.4-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 (ac9a78681b92 Linux 6.4-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git hsi/for-next +Already up to date. +Merging leds/for-next (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git leds/for-next +Already up to date. +Merging leds-lj/for-leds-next (8325642d2757 leds: bd2606mvv: Driver for the Rohm 6 Channel i2c LED driver) +$ git merge -m Merge branch 'for-leds-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/leds.git leds-lj/for-leds-next +Already up to date. +Merging ipmi/for-next (d08076678ce7 ipmi:ssif: Drop if blocks with always false condition) +$ git merge -m Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git ipmi/for-next +Already up to date. +Merging driver-core/driver-core-next (ac9a78681b92 Linux 6.4-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 (986866c3dfb0 usb: typec: mux: Remove some unneeded includes) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next +Merge made by the 'ort' strategy. + drivers/usb/typec/mux/gpio-sbu-mux.c | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) +Merging thunderbolt/next (ac9a78681b92 Linux 6.4-rc1) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt/next +Already up to date. +Merging usb-serial/usb-next (a095edfc15f0 USB: serial: option: add UNISOC vendor and TOZED LT70C product) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial/usb-next +Already up to date. +Merging tty/tty-next (ac9a78681b92 Linux 6.4-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 (ac9a78681b92 Linux 6.4-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 (afa351a15d80 Merge tag 'drm-intel-next-fixes-2023-04-13' of git://anongit.freedesktop.org/drm/drm-intel into drm-next) +$ git merge -m Merge branch 'habanalabs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux.git accel/habanalabs-next +Already up to date. +Merging coresight/next (18996a113f25 coresight: etm_pmu: Set the module field) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git coresight/next +Already up to date. +Merging fpga/for-next (fe15c26ee26e Linux 6.3-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga/for-next +Already up to date. +Merging icc/icc-next (b7590f3841f4 dt-bindings: interconnect: qcom,msm8998-bwmon: Resolve MSM8998 support) +$ git merge -m Merge branch 'icc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git icc/icc-next +Already up to date. +Merging iio/togreg (52cc189b4fc6 iio: adc: palmas: don't alter event config on suspend/resume) +$ git merge -m Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg +Already up to date. +Merging phy-next/next (7a503071e06d phy: sparx5-serdes: add skip_cmu_cfg check when configuring lanes) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next +Merge made by the 'ort' strategy. + .../devicetree/bindings/phy/brcm,kona-usb2-phy.txt | 15 - + .../bindings/phy/brcm,kona-usb2-phy.yaml | 36 ++ + .../devicetree/bindings/phy/qcom,edp-phy.yaml | 3 + + .../bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml | 4 +- + .../phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml | 1 + + .../bindings/phy/qcom,usb-snps-femto-v2.yaml | 1 + + .../devicetree/bindings/usb/qcom,dwc3.yaml | 21 + + drivers/phy/amlogic/phy-meson-g12a-usb2.c | 15 +- + drivers/phy/cadence/phy-cadence-torrent.c | 720 +++++++++++++++------ + drivers/phy/microchip/sparx5_serdes.c | 426 +++++++----- + drivers/phy/microchip/sparx5_serdes.h | 1 - + drivers/phy/microchip/sparx5_serdes_regs.h | 106 +++ + drivers/phy/qualcomm/phy-qcom-qmp-usb.c | 45 ++ + 13 files changed, 1018 insertions(+), 376 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/phy/brcm,kona-usb2-phy.txt + create mode 100644 Documentation/devicetree/bindings/phy/brcm,kona-usb2-phy.yaml +Merging soundwire/next (9420c9719f03 soundwire: bus: Don't filter slave alerts) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next +Merge made by the 'ort' strategy. + .../bindings/soundwire/qcom,soundwire.yaml | 39 ++- + drivers/soundwire/bus.c | 12 +- + drivers/soundwire/qcom.c | 387 ++++++++++++++------- + 3 files changed, 291 insertions(+), 147 deletions(-) +Merging extcon/extcon-next (4e30418def07 extcon: Drop unneeded assignments) +$ git merge -m Merge branch 'extcon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon/extcon-next +Auto-merging drivers/extcon/extcon.c +CONFLICT (content): Merge conflict in drivers/extcon/extcon.c +Resolved 'drivers/extcon/extcon.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 252a233fed4c] Merge branch 'extcon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/extcon/qcom,pm8941-misc.yaml | 14 +- + drivers/extcon/Kconfig | 1 + + drivers/extcon/extcon-axp288.c | 2 +- + drivers/extcon/extcon-palmas.c | 1 - + drivers/extcon/extcon-qcom-spmi-misc.c | 4 +- + drivers/extcon/extcon-usbc-tusb320.c | 153 +++++++-- + drivers/extcon/extcon.c | 368 ++++++++++++--------- + drivers/extcon/extcon.h | 8 +- + 8 files changed, 354 insertions(+), 197 deletions(-) +Merging gnss/gnss-next (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'gnss-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss/gnss-next +Already up to date. +Merging vfio/next (705b004ee377 docs: kvm: vfio: Suggest KVM_DEV_VFIO_GROUP_ADD vs VFIO_GROUP_GET_DEVICE_FD ordering) +$ git merge -m Merge branch 'next' of git://github.com/awilliam/linux-vfio.git vfio/next +Already up to date. +Merging w1/for-next (0df2a5e99d0c w1: therm: constify pointers to hwmon_channel_info) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git w1/for-next +Merge made by the 'ort' strategy. + drivers/w1/masters/sgi_w1.c | 2 +- + drivers/w1/slaves/Kconfig | 4 ++-- + drivers/w1/slaves/w1_ds2438.c | 2 -- + drivers/w1/slaves/w1_therm.c | 37 +++++++++++++++++-------------------- + drivers/w1/w1.c | 23 +++++++---------------- + 5 files changed, 27 insertions(+), 41 deletions(-) +Merging staging/staging-next (e7e444dfc2fa staging: rtl8723bs: use tabs for indentation) +$ git merge -m Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next +Merge made by the 'ort' strategy. + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 2 +- + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 4 +- + drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 3 -- + drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 45 ---------------------- + drivers/staging/rtl8192e/rtllib.h | 2 +- + drivers/staging/rtl8192e/rtllib_rx.c | 14 ++++--- + drivers/staging/rtl8192e/rtllib_softmac.c | 4 +- + drivers/staging/rtl8192e/rtllib_tx.c | 6 +-- + drivers/staging/rtl8723bs/include/sta_info.h | 26 ++++++------- + drivers/staging/wlan-ng/p80211metastruct.h | 18 +-------- + drivers/staging/wlan-ng/prism2mgmt.c | 52 ++++++++------------------ + 11 files changed, 49 insertions(+), 127 deletions(-) +Merging counter-next/counter-next (228354ed692f tools/counter: Makefile: Remove lingering 'include' directories on make clean) +$ git merge -m Merge branch 'counter-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-next/counter-next +Merge made by the 'ort' strategy. + drivers/counter/Kconfig | 6 +++--- + drivers/counter/stm32-timer-cnt.c | 3 +++ + tools/counter/.gitignore | 2 ++ + tools/counter/Makefile | 1 + + 4 files changed, 9 insertions(+), 3 deletions(-) + create mode 100644 tools/counter/.gitignore +Merging mux/for-next (ea327624ae52 mux: mmio: drop obsolete dependency on COMPILE_TEST) +$ git merge -m Merge branch 'for-next' of https://gitlab.com/peda-linux/mux.git mux/for-next +Merge made by the 'ort' strategy. + drivers/mux/Kconfig | 2 +- + drivers/mux/mmio.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging dmaengine/next (ac9a78681b92 Linux 6.4-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 (2ef269ef1ac0 cgroup/cpuset: Free DL BW in case can_attach() fails) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git cgroup/for-next +Merge made by the 'ort' strategy. + include/linux/cpuset.h | 12 ++- + include/linux/sched.h | 4 +- + kernel/cgroup/cgroup.c | 4 + + kernel/cgroup/cpuset.c | 244 +++++++++++++++++++++++++++++++----------------- + kernel/sched/core.c | 41 ++++---- + kernel/sched/deadline.c | 67 ++++++++++--- + kernel/sched/sched.h | 2 +- + 7 files changed, 246 insertions(+), 128 deletions(-) +Merging scsi/for-next (1a7edd041f2d scsi: ufs: core: Fix I/O hang that occurs when BKOPS fails in W-LUN suspend) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi/for-next +Already up to date. +Merging scsi-mkp/for-next (44ef1604ae94 Merge patch series "smartpqi updates") +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-mkp/for-next +Auto-merging drivers/ufs/core/ufshcd.c +Merge made by the 'ort' strategy. + drivers/scsi/libsas/sas_expander.c | 124 ++++---- + drivers/scsi/lpfc/lpfc_attr.c | 4 +- + drivers/scsi/lpfc/lpfc_crtn.h | 4 +- + drivers/scsi/lpfc/lpfc_els.c | 30 +- + drivers/scsi/lpfc/lpfc_hbadisc.c | 24 +- + drivers/scsi/lpfc/lpfc_hw4.h | 11 +- + drivers/scsi/lpfc/lpfc_init.c | 26 +- + drivers/scsi/lpfc/lpfc_nvme.c | 44 +-- + drivers/scsi/lpfc/lpfc_scsi.c | 3 +- + drivers/scsi/lpfc/lpfc_sli.c | 392 ++++++++++++++++--------- + drivers/scsi/lpfc/lpfc_sli4.h | 4 +- + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/mpi3mr/mpi3mr_transport.c | 2 +- + drivers/scsi/pm8001/pm8001_init.c | 32 +- + drivers/scsi/pm8001/pm8001_sas.h | 1 + + drivers/scsi/pm8001/pm80xx_hwi.c | 126 +++++--- + drivers/scsi/qedf/qedf_main.c | 3 +- + drivers/scsi/qla2xxx/qla_attr.c | 13 + + drivers/scsi/qla2xxx/qla_def.h | 21 ++ + drivers/scsi/qla2xxx/qla_gbl.h | 2 +- + drivers/scsi/qla2xxx/qla_init.c | 256 ++++++++++++++-- + drivers/scsi/qla2xxx/qla_iocb.c | 33 ++- + drivers/scsi/qla2xxx/qla_isr.c | 64 +++- + drivers/scsi/qla2xxx/qla_os.c | 130 ++++---- + drivers/scsi/qla2xxx/qla_version.h | 4 +- + drivers/scsi/smartpqi/Kconfig | 2 +- + drivers/scsi/smartpqi/smartpqi.h | 6 +- + drivers/scsi/smartpqi/smartpqi_init.c | 284 ++++++++++-------- + drivers/scsi/smartpqi/smartpqi_sas_transport.c | 34 +-- + drivers/scsi/smartpqi/smartpqi_sis.c | 2 +- + drivers/scsi/smartpqi/smartpqi_sis.h | 2 +- + drivers/ufs/core/ufshcd.c | 20 +- + drivers/ufs/host/ufs-mediatek.c | 3 - + 33 files changed, 1087 insertions(+), 621 deletions(-) +Merging vhost/linux-next (ebddc00f450d vhost_net: revert upend_idx only on retriable error) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next +Auto-merging drivers/vhost/vdpa.c +Auto-merging drivers/vhost/vhost.c +Auto-merging drivers/vhost/vhost.h +Merge made by the 'ort' strategy. + drivers/vhost/net.c | 11 ++++++++--- + drivers/vhost/vdpa.c | 34 ++++++++++++++++++++++++++++++---- + drivers/vhost/vhost.c | 18 +++++++++++++----- + drivers/vhost/vhost.h | 8 ++++++-- + tools/virtio/ringtest/.gitignore | 6 ++++++ + 5 files changed, 63 insertions(+), 14 deletions(-) + create mode 100644 tools/virtio/ringtest/.gitignore +Merging rpmsg/for-next (47f64e7ef95a remoteproc: imx_dsp_rproc: use modern pm_ops) +$ 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. + drivers/remoteproc/da8xx_remoteproc.c | 6 ++---- + drivers/remoteproc/imx_dsp_rproc.c | 17 +++++++---------- + drivers/remoteproc/imx_rproc.c | 6 ++---- + drivers/remoteproc/keystone_remoteproc.c | 6 ++---- + drivers/remoteproc/meson_mx_ao_arc.c | 6 ++---- + drivers/remoteproc/mtk_scp.c | 6 ++---- + drivers/remoteproc/omap_remoteproc.c | 6 ++---- + drivers/remoteproc/pru_rproc.c | 6 ++---- + drivers/remoteproc/qcom_q6v5_adsp.c | 6 ++---- + drivers/remoteproc/qcom_q6v5_mss.c | 6 ++---- + drivers/remoteproc/qcom_q6v5_pas.c | 6 ++---- + drivers/remoteproc/qcom_q6v5_wcss.c | 6 ++---- + drivers/remoteproc/qcom_wcnss.c | 6 ++---- + drivers/remoteproc/rcar_rproc.c | 6 ++---- + drivers/remoteproc/remoteproc_virtio.c | 6 ++---- + drivers/remoteproc/st_remoteproc.c | 6 ++---- + drivers/remoteproc/stm32_rproc.c | 6 ++---- + drivers/remoteproc/wkup_m3_rproc.c | 6 ++---- + 18 files changed, 41 insertions(+), 78 deletions(-) +Merging gpio/for-next (e73f0f0ee754 Linux 5.14-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git gpio/for-next +Already up to date. +Merging gpio-brgl/gpio/for-next (8a4adcf67a39 gpio: gpiolib: Simplify gpiochip_add_data_with_key() fwnode) +$ git merge -m Merge branch 'gpio/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl/gpio/for-next +Already up to date. +Merging gpio-intel/for-next (782eea0c89f7 gpiolib: acpi: Add a ignore wakeup quirk for Clevo NL5xNU) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel/for-next +Already up to date. +Merging pinctrl/for-next (cbbe07781514 pinctrl: qcom: spmi-gpio: Add PM8953 support) +$ 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. + .../bindings/pinctrl/qcom,pmic-gpio.yaml | 3 ++ + drivers/pinctrl/bcm/pinctrl-bcm2835.c | 6 +-- + drivers/pinctrl/pinctrl-amd.c | 50 ++++++---------------- + drivers/pinctrl/pinctrl-amd.h | 1 + + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 2 + + 5 files changed, 21 insertions(+), 41 deletions(-) +Merging pinctrl-intel/for-next (ac9a78681b92 Linux 6.4-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel/for-next +Already up to date. +Merging pinctrl-renesas/renesas-pinctrl (5d32cead772c pinctrl: renesas: Fix spaces followed by tabs) +$ git merge -m Merge branch 'renesas-pinctrl' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git pinctrl-renesas/renesas-pinctrl +Merge made by the 'ort' strategy. + drivers/pinctrl/renesas/pfc-r8a77970.c | 2 +- + drivers/pinctrl/renesas/pfc-r8a77980.c | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) +Merging pinctrl-samsung/for-next (ac9a78681b92 Linux 6.4-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung/for-next +Already up to date. +Merging pwm/for-next (247ee6c78040 pwm: Remove unused radix tree) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git pwm/for-next +Already up to date. +Merging userns/for-next (05bd6e0242b4 Merge of unpriv-ipc-sysctls-for-v6.2, and fix-atomic_lock_inc_below-for-v6.2 for testing in linux-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git userns/for-next +Auto-merging Documentation/admin-guide/sysctl/kernel.rst +Merge made by the 'ort' strategy. + Documentation/admin-guide/sysctl/kernel.rst | 14 ++++++++--- + ipc/ipc_sysctl.c | 37 +++++++++++++++++++++++++++-- + ipc/mq_sysctl.c | 36 ++++++++++++++++++++++++++++ + kernel/ucount.c | 16 ++++++------- + 4 files changed, 89 insertions(+), 14 deletions(-) +Merging ktest/for-next (7dc8e24f0e09 ktest: Restore stty setting at first in dodie) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git ktest/for-next +Already up to date. +Merging kselftest/next (f8424c54d041 selftests/clone3: test clone3 with exit signal in flags) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next +Merge made by the 'ort' strategy. + tools/testing/selftests/clone3/clone3.c | 5 +- + .../selftests/media_tests/video_device_test.c | 111 +++++++++++++++------ + .../selftests/prctl/set-anon-vma-name-test.c | 2 +- + .../selftests/vDSO/vdso_test_clock_getres.c | 4 +- + 4 files changed, 90 insertions(+), 32 deletions(-) +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 (78227fa03c68 Documentation: kunit: Modular tests should not depend on KUNIT=y) +$ git merge -m Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-next/kunit +Merge made by the 'ort' strategy. + Documentation/dev-tools/kunit/start.rst | 5 ++++- + tools/testing/kunit/kunit_kernel.py | 6 +++--- + tools/testing/kunit/mypy.ini | 6 ++++++ + tools/testing/kunit/run_checks.py | 2 +- + 4 files changed, 14 insertions(+), 5 deletions(-) + create mode 100644 tools/testing/kunit/mypy.ini +Merging livepatching/for-next (5e36be5973b6 Merge branch 'for-6.4/core' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching livepatching/for-next +Merge made by the 'ort' strategy. +Merging rtc/rtc-next (e99ab4abebf8 rtc: armada38x: use devm_platform_ioremap_resource_byname()) +$ git merge -m Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next +Already up to date. +Merging nvdimm/libnvdimm-for-next (305a72efa791 Merge branch 'for-6.1/nvdimm' into libnvdimm-for-next) +$ git merge -m Merge branch 'libnvdimm-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm/libnvdimm-for-next +Already up to date. +Merging at24/at24/for-next (fe15c26ee26e Linux 6.3-rc1) +$ git merge -m Merge branch 'at24/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (942cc9ceccb6 ntb: intel: Remove redundant pci_clear_master) +$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 2 +- + drivers/ntb/hw/amd/ntb_hw_amd.c | 9 ++++++--- + drivers/ntb/hw/epf/ntb_hw_epf.c | 12 ++++-------- + drivers/ntb/hw/idt/ntb_hw_idt.c | 24 +++++++++++------------- + drivers/ntb/hw/intel/ntb_hw_gen1.c | 9 ++++++--- + drivers/ntb/ntb_transport.c | 2 +- + drivers/ntb/test/ntb_tool.c | 2 ++ + drivers/pci/endpoint/functions/pci-epf-vntb.c | 1 + + 8 files changed, 32 insertions(+), 29 deletions(-) +Merging seccomp/for-next/seccomp (0fb0624b15d2 seccomp: fix kernel-doc function name warning) +$ git merge -m Merge branch 'for-next/seccomp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git seccomp/for-next/seccomp +Already up to date. +Merging fsi/next (35af9fb49bc5 fsi: core: Check error number after calling ida_simple_get) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git fsi/next +Already up to date. +Merging slimbus/for-next (ac9a78681b92 Linux 6.4-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git slimbus/for-next +Already up to date. +Merging nvmem/for-next (ac9a78681b92 Linux 6.4-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 (ddf75a86aba2 auxdisplay: hd44780: Fix potential memory leak in hd44780_remove()) +$ git merge -m Merge branch 'auxdisplay' of https://github.com/ojeda/linux.git auxdisplay/auxdisplay +Already up to date. +Merging kgdb/kgdb/for-next (c1cb81429df4 kdb: Fix the putarea helper function) +$ git merge -m Merge branch 'kgdb/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git kgdb/kgdb/for-next +Already up to date. +Merging hmm/hmm (fe15c26ee26e Linux 6.3-rc1) +$ git merge -m Merge branch 'hmm' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git hmm/hmm +Already up to date. +Merging cfi/cfi/next (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'cfi/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git cfi/cfi/next +Already up to date. +Merging mhi/mhi-next (1d1493bdc25f bus: mhi: host: Use mhi_tryset_pm_state() for setting fw error state) +$ git merge -m Merge branch 'mhi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git mhi/mhi-next +Already up to date. +Merging memblock/for-next (34875d6fc52d Add tests for memblock_alloc_node()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock/for-next +Merge made by the 'ort' strategy. + tools/testing/memblock/tests/alloc_nid_api.c | 40 ++++++++++++++++++++++++++++ + 1 file changed, 40 insertions(+) +Merging cxl/next (bfe58458fd25 cxl/mbox: Update CMD_RC_TABLE) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl/next +Already up to date. +Merging zstd/zstd-next (2aa14b1ab2c4 zstd: import usptream v1.5.2) +$ git merge -m Merge branch 'zstd-next' of https://github.com/terrelln/linux.git zstd/zstd-next +Already up to date. +Merging efi/next (026b85796ab4 efi/zboot: arm64: Grab code size from ELF symbol in payload) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next +Already up to date. +Merging unicode/for-next (b500d6d7243d unicode: Handle memory allocation failures in mkutf8data) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git unicode/for-next +Merge made by the 'ort' strategy. + fs/unicode/mkutf8data.c | 38 ++++++++++++++++++++++++-------------- + 1 file changed, 24 insertions(+), 14 deletions(-) +Merging slab/for-next (ed4cdfbeb873 Merge branch 'slab/for-6.4/slob-removal' into slab/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab/for-next +Already up to date. +Merging random/master (512dee0c00ad Merge tag 'x86-urgent-2023-01-04' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git random/master +Already up to date. +Merging landlock/next (ed35e2f2f0de landlock: Clarify documentation for the LANDLOCK_ACCESS_FS_REFER right) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git landlock/next +Already up to date. +Merging rust/rust-next (ac9a78681b92 Linux 6.4-rc1) +$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next +Already up to date. +Merging sysctl/sysctl-next (0199849acd07 sysctl: remove register_sysctl_paths()) +$ git merge -m Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git sysctl/sysctl-next +Already up to date. +Merging execve/for-next/execve (88603b6dc419 Linux 6.2-rc2) +$ git merge -m Merge branch 'for-next/execve' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git execve/for-next/execve +Already up to date. +Merging bitmap/bitmap-for-next (714f3af11b21 cpumask: fix function description kernel-doc notation) +$ git merge -m Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git bitmap/bitmap-for-next +Auto-merging include/linux/cpumask.h +CONFLICT (content): Merge conflict in include/linux/cpumask.h +Auto-merging include/linux/find.h +Resolved 'include/linux/cpumask.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master ced190cdbbc8] Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git +$ git diff -M --stat --summary HEAD^.. + include/linux/bitmap.h | 54 +++++++++--------- + include/linux/cpumask.h | 140 +++++++++++++++++++++++------------------------ + include/linux/find.h | 40 +++++++------- + include/linux/nodemask.h | 88 ++++++++++++++--------------- + lib/bitmap.c | 2 +- + lib/cpumask.c | 2 +- + lib/test_bitmap.c | 18 +++++- + 7 files changed, 177 insertions(+), 167 deletions(-) +Merging hte/for-next (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 (78f7a3fd6dc6 randstruct: disable Clang 15 support) +$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git kspp/for-next/kspp +Already up to date. +Merging kspp-gustavo/for-next/kspp (00168b415a60 uapi: net: ipv6: Replace fake flex-array with flex-array member) +$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git kspp-gustavo/for-next/kspp +Already up to date. +Merging iommufd/for-next (62e37c86bf07 iommufd/selftest: Cover domain unmap with huge pages and access) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd/for-next +Already up to date. diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..c569af43ef80 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20230510 |