diff options
| -rw-r--r-- | Next/SHA1s | 365 | ||||
| -rw-r--r-- | Next/Trees | 367 | ||||
| -rw-r--r-- | Next/merge.log | 5405 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 6138 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..baf14e4941a3 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,365 @@ +Name SHA1 +---- ---- +origin 4d6d4c7f541d7027beed4fb86eb2c451bd8d6fff +fixes ac9a78681b921877518763ba0e89202254349d1b +mm-hotfixes dac9689998e82b899d550aec5e5dea0ef2e822a3 +kbuild-current f1fcbaa18b28dec10281551dfe6ed3a3ed80e3d6 +arc-current 30a0b95b1335e12efef89dd78518ed3e4a71a763 +arm-current 2b951b0efbaa6c805854b60c11f08811054d50cd +arm64-fixes fd2d1cb8c5454888f67aba4c6218e30106862070 +arm-soc-fixes d75eecc3d170d8963ae554a774b8af1f4e1246da +davinci-current ac9a78681b921877518763ba0e89202254349d1b +drivers-memory-fixes ac9a78681b921877518763ba0e89202254349d1b +tee-fixes ceaa837f96adb69c0df0397937cd74991d5d821a +m68k-current aaee8c7f2a17d2dd015dc97c113c9ea0cc97272a +powerpc-fixes 1f7aacc5eb9ed2cc17be7a90da5cd559effb9d59 +s390-fixes 0f1cbf941d5949110adf70725a9614e622de8d99 +sparc 2d2b17d08bfc3d98cf93622e8c6543eaaf02dabe +fscrypt-current 4bcf6f827a79c59806c695dc280e763c5b6a6813 +fsverity-current a075bacde257f755bea0e53400c9f1cdd1b8e8e6 +net 225c657945c4a6307741cb3cc89467eadcc26e9b +bpf a820ca1a739b7e3ee0ddb48bdfa3c09dc7cd4302 +ipsec 8680407b6f8f5fba59e8f1d63c869abc280f04df +netfilter 7fb0269720d7d5359bc8349eef908a1c96866b65 +ipvs 225c657945c4a6307741cb3cc89467eadcc26e9b +wireless 212457ccbd60dba34f965e4ffbe62f0e4f970538 +wpan bd4e3d82f4ccb422672029b099e402e5b3acd5ee +rdma-fixes 866422cdddcdf59d8c68e9472d49ba1be29b5fcf +sound-current dc4f2ccaedddb489a83e7b12ebbdc347272aacc9 +sound-asoc-fixes 9be0b3a0074a61df1c94c37faea35ec8b9ea130b +regmap-fixes 70a640c0efa7667453c3911b13335304ce46ad8b +regulator-fixes 2bf1c45be3b8f3a3f898d0756c1282f09719debd +spi-fixes 445164e8c136f1445caf735d6d268c948e71caf1 +pci-current 3b8803494a0612acdeee714cb72aa142b1e05ce5 +driver-core.current f1fcbaa18b28dec10281551dfe6ed3a3ed80e3d6 +tty.current 8fb9ea65c9d1338b0d2bb0a9122dc942cdd32357 +usb.current 1e94be78ec1556e90056ac038b15231723d315a9 +usb-serial-fixes 09a9639e56c01c7a00d6c0ca63f4c7c41abe075d +phy 2a881183dc5ab2474ef602e48fe7af34db460d95 +staging.current b3dad076a058916c443c93074dc3ee80baaff4ea +iio-fixes 55720d242052e860b9fde445e302e0425722e7f1 +counter-current ac9a78681b921877518763ba0e89202254349d1b +char-misc.current 0fa53349c3acba0239369ba4cd133740a408d246 +soundwire-fixes ac9a78681b921877518763ba0e89202254349d1b +thunderbolt-fixes c4af8e3fecd03b0aedcd38145955605cfebe7e3a +input-current 7b63a88bb62ba2ddf5fcd956be85fe46624628b9 +crypto-current b8969a1b69672b163d057e7745ebc915df689211 +vfio-fixes 4928f67bc911e46a43004251a4d7eb2259ba6077 +kselftest-fixes dbcf76390eb9a65d5d0c37b0cd57335218564e37 +modules-fixes f412eef03938d3a40d4f6f5a79d0f98ed89b596d +dmaengine-fixes 38de368a66360f1859428d5e191b45bd01c20786 +backlight-fixes 88603b6dc419445847923fcb7fe5080067a30f98 +mtd-fixes 93942b70461574ca7fc3d91494ca89b16a4c64c7 +mfd-fixes 88603b6dc419445847923fcb7fe5080067a30f98 +v4l-dvb-fixes 280a8ab81733da8bc442253c700a52c4c0886ffd +reset-fixes 3a2390c6777e3f6662980c6cfc25cafe9e4fef98 +mips-fixes ac9a78681b921877518763ba0e89202254349d1b +at91-fixes fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +omap-fixes 2a906db2824b75444982f5e9df870106982afca8 +kvm-fixes 39428f6ea9eace95011681628717062ff7f5eb5f +kvms390-fixes 21f27df854008b86349a203bf97fef79bb11f53e +hwmon-fixes ac9a78681b921877518763ba0e89202254349d1b +nvdimm-fixes c91d713630848460de8669e6570307b7e559863b +cxl-fixes 764d102ef94e880ca834a7fe3968a00a05b1fb12 +btrfs-fixes 7f6d8752b79e7d1dbd3c0e93916654bf57b17861 +vfs-fixes 609d54441493c99f21c1823dfd66fa7f4c512ff4 +dma-mapping-fixes bbb73a103fbbed6f63cb738d3783261c4241b4b2 +drivers-x86-fixes 95e4b25192e9238fd2dbe85d96dd2f8fd1ce9d14 +samsung-krzk-fixes ac9a78681b921877518763ba0e89202254349d1b +pinctrl-samsung-fixes ac9a78681b921877518763ba0e89202254349d1b +devicetree-fixes 6997f847cbb72082a2e9aa0fef8ebfcc3bd4ddc5 +dt-krzk-fixes 8bbec86ce6d66fb33530c679f7bb3a123fc9e7da +scsi-fixes 09e797c8641f6ad435c33ae24c223351197ea29a +drm-fixes f1fcbaa18b28dec10281551dfe6ed3a3ed80e3d6 +drm-intel-fixes 5896f2d363d5cfb7510856c90d5e0ed934a1d340 +mmc-fixes 81dce1490e28439c3cd8a8650b862a712f3061ba +rtc-fixes 08279468a294d8c996a657ecc9e51bd5c084c75d +gnss-fixes 1b929c02afd37871d5afb9d498426f83432e71c2 +hyperv-fixes ec97e112985c2581ee61854a4b74f080f6cdfc2c +soc-fsl-fixes 4b0986a3613c92f4ec1bdc7f60ec66fea135991f +risc-v-fixes 3b90b09af5be42491a8a74a549318cfa265b3029 +riscv-dt-fixes ac9a78681b921877518763ba0e89202254349d1b +riscv-soc-fixes a7a041f2ddf300817ee6010f643424ef5efd2739 +fpga-fixes 3c66c757bfb10ef90ca3424da8c6f6adad4152a2 +spdx ac9a78681b921877518763ba0e89202254349d1b +gpio-brgl-fixes 7dd3d9bd873f138675cb727eaa51a498d99f0e89 +gpio-intel-fixes fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +pinctrl-intel-fixes f1fcbaa18b28dec10281551dfe6ed3a3ed80e3d6 +erofs-fixes ae0bac79926330a0b0f25649079ba935d9be0194 +kunit-fixes ac9a78681b921877518763ba0e89202254349d1b +ubifs-fixes 2241ab53cbb5cdb08a6b2d4688feb13971058f65 +memblock-fixes 647037adcad00f2bab8828d3d41cd0553d41f3bd +nfsd-fixes 8ae72e5fd95a777aca023160615969f77554b31e +irqchip-fixes cddb536a73ef2c82ce04059dc61c65e85a355561 +renesas-fixes ab2866f12ca18747413ba41409231d44e0c6149b +broadcom-fixes 9abf2313adc1ca1b6180c508c25f22f9395cc780 +perf-current 1b5f159ce8751b61aea426293cd71a510a081939 +efi-fixes 0b1d9debe30304f35c1211e6dcdca1935ce67240 +zstd-fixes 6906598f1ce93761716d780b6e3f171e13f0f4ce +battery-fixes 95339f40a8b652b5b1773def31e63fc53c26378a +uml-fixes 73a23d7710331a530e972903318528b75e5a5f58 +asahi-soc-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +iommufd-fixes f1fcbaa18b28dec10281551dfe6ed3a3ed80e3d6 +rust-fixes ac9a78681b921877518763ba0e89202254349d1b +v9fs-fixes 36896bc97c0e5fe9f52f578ac7986bf4a9cdfd71 +w1-fixes ac9a78681b921877518763ba0e89202254349d1b +drm-misc-fixes 1aa7f416175619e0286fddc5fc44e968b06bf2aa +mm-stable ac9a78681b921877518763ba0e89202254349d1b +mm-nonmm-stable ac9a78681b921877518763ba0e89202254349d1b +mm 88b7d333e56bda595ddbb93f29f93ca2b19a5664 +kbuild f1fcbaa18b28dec10281551dfe6ed3a3ed80e3d6 +clang-format 781121a7f6d11d7cae44982f174ea82adeec7db0 +perf c0d68601cbcefaf69018b3e7aff2687316950ace +compiler-attributes eeac8ede17557680855031c6f305ece2378af326 +dma-mapping ec274aff21b6a94c7973384ca80a503c1bc3b173 +asm-generic f1fcbaa18b28dec10281551dfe6ed3a3ed80e3d6 +arc f2906aa863381afb0015a9eb7fefad885d4e5a56 +arm fc6750b0d4a9942f85625aab5ae788ae9cf1030c +arm64 0fddb79bf283a561eb81f09d01f5ac8f61bf8966 +arm-perf 257aedb72e731082ab514058e57b132f0b29d707 +arm-soc 8ecfe9a0e657e78ad5187f7142418f7631458ded +amlogic 0618cb14da6af881c13c4eaede6b7ec2dad97cf2 +asahi-soc f41aba1578192bf08a82d741e001a7c01907c9cb +aspeed 7d4f0b0df7c5ec0cec834f87591423a7bbd1bab2 +at91 ad5125686a4f16ecf73cb8795329e195efd0d2b7 +broadcom bba5ad8482de5bf3389fe61356992410b96fe7f9 +davinci ac9a78681b921877518763ba0e89202254349d1b +drivers-memory 3d56c7364389fce14547803fef56d6f2cab5d366 +imx-mxs efdde75fee54667153a5fa236907b55452fddbfa +mediatek e586dd4471725f33b002316c9bc2d88b283f028e +mvebu 64687391f64d581584034fdef080b0f007385fa3 +omap c45167f4f5cfdfaddbae941545187906e8658c5f +qcom 4272e06e19f388ccfe1f04f19060ea84d2a19a8b +renesas 21330625d0f5970080f69db3d7634441d6484a07 +reset afb39e2bd36af1d80913bb6851caece829526217 +rockchip e11ff0914d61df18310aba0fa69b20041e96cf42 +samsung-krzk 5b248db78d1aa679009efa4763794890572e63fb +scmi e06854e84add15564e90cdc57bdab5e0348e9b34 +stm32 3b1583868691b6fb7d5f7452711cba0481e72292 +sunxi 7081db38231a48b1ff590d9d16dfa06c1f8d148f +tee 86dfcfab4fe0c2c591bd43b038ae73ec9ce7567b +tegra d52733725601d919286a3c0f6a67c9ea47a22d0c +ti 6bb0b834e3c2f49dba3d8858fe50bf0409ed31af +xilinx 12ac543351cccb09584211b6e17c69b4188886cb +clk be2033a8660cf034dec905d4a7f8fcfb235663e7 +clk-imx ac9a78681b921877518763ba0e89202254349d1b +clk-renesas 7f91fe3a71aa43700eac2650e3b01d50cbbb6f48 +clk-samsung b35f27fe73d8c86fe40125e063b28007e961b862 +csky ac9a78681b921877518763ba0e89202254349d1b +loongarch f1fcbaa18b28dec10281551dfe6ed3a3ed80e3d6 +m68k 4decdb267a4712b4cb56f9bd8cdcd6d9af1c3352 +m68knommu f1fcbaa18b28dec10281551dfe6ed3a3ed80e3d6 +microblaze fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +mips ac9a78681b921877518763ba0e89202254349d1b +openrisc c91b4a07655d5ba67962a08dfac8bd7f45ad049c +parisc-hd 7ee7b97c40072b0426a45ad049c6998477895f73 +powerpc f1fcbaa18b28dec10281551dfe6ed3a3ed80e3d6 +soc-fsl 4b0986a3613c92f4ec1bdc7f60ec66fea135991f +risc-v ac9a78681b921877518763ba0e89202254349d1b +riscv-dt 6361b7de262aca8704abfaade5166a940f7cc571 +riscv-soc ac9a78681b921877518763ba0e89202254349d1b +s390 00e1d14a1eab4e4dc2ce1feee570759197dec201 +sh bc9d1f0cecd2407cfb2364a7d4be2f52d1d46a9d +uml 6032aca0deb9c138df122192f8ef02de1fdccf25 +xtensa d0f94ebe18641ae0449993293d3943d5ad48a40d +pidfd ac9a78681b921877518763ba0e89202254349d1b +vfs-idmapping ac9a78681b921877518763ba0e89202254349d1b +fscrypt 83e57e47906ce0e99bd61c70fae514e69960d274 +fscache 0885eacdc81f920c3e0554d5615e69a66504a28d +afs 0a278bc196e784b4849c1581266421adbca1989f +btrfs d3f0936c54ee5b29a9199053d028013f4ce3369e +ceph a12e5342fa27b194286026750af92a3ac91b8897 +cifs 59a556aebc43dded08535fe97d94ca3f657915e4 +configfs 77992f896745c63ae64bfccfdc429ab7b3d88da5 +ecryptfs a3d78fe3e1ae8c6a1901635c54a1a799656f72c8 +erofs ac9a78681b921877518763ba0e89202254349d1b +exfat fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +ext3 df9c5af6a4efea4d04377f74a9766bc87fa34198 +ext4 2a534e1d0d1591e951f9ece2fb460b2ff92edabd +f2fs 08c3eab525efb31406494282552a23f33a8a921a +fsverity e08e901faa8f007b0ad011c8a538df7fe947e408 +fuse c68ea140050e631d24d61b6e399ca8224a4a2219 +gfs2 6ddd5e9eaadfbecae0367dfe5d03787ac5df5c39 +jfs fad376fce0af58deebc5075b8539dc05bf639af3 +ksmbd e7b8b8ed9960bf699bf4029f482d9e869c094ed6 +nfs e8d018dd0257f744ca50a729e3d042cf2ec9da65 +nfs-anna fbd2a05f29a95d5b42b294bf47e55a711424965b +nfsd 8c49a0ffaed015e0e7762e3a17cb6fe72552074e +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 48f2c681df4329b50fc92516c10e0398ca127242 +hid d777b19c63562199b640fd5129e7916a5b7cd240 +i2c 03230ddddf9de50caab7d15d72c510a9009680ea +i3c 6b496a94c5905fca7879bc0dc438a47de40b7d4f +dmi 13a0ac816d22aa47d6c393f14a99f39e49b960df +hwmon-staging 92613681c0090612f0368dcebdcc232af9d74ae8 +jc_docs bd415b5c9552d44069d4e7c1e018b6d42f25af9e +v4l-dvb ac9a78681b921877518763ba0e89202254349d1b +v4l-dvb-next a23a3041c733e068bed5ece88acb45fe0edf0413 +pm a3c2d8b60e2f540d2be15247beb23d60872eafa1 +cpufreq-arm 11a3b0ac33d95aa84be426e801f800997262a225 +cpupower c2adb1877b76fc81ae041e1db1a6ed2078c6746b +devfreq 376b1446153ca67e7028e6b9555d9b17477f568b +opp ac9a78681b921877518763ba0e89202254349d1b +thermal 2afa82d1fc648c8d4c2ef9e876626abb1089f9ab +dlm 7a40f1f18a88c6d43c8725d7f45146480a79fde1 +rdma f1fcbaa18b28dec10281551dfe6ed3a3ed80e3d6 +net-next af2eab1a824349cfb0f6a720ad06eea48e9e6b74 +bpf-next effcf62416240e5ec0eded0ea2644c48d2c7c9f1 +ipsec-next b2cbac9b9b28730e9e53be20b6cdf979d3b9f27e +mlx5-next 77f7eb9f3416aace703971156133926e44e2195b +netfilter-next 677fb7525331375ba2f90f4bc94a80b9b6e697a3 +ipvs-next e641577eb6e82cbb89dde7cfc44ef2541c42278c +bluetooth fd4fbf8cd81fdeca250d57ebb9efc5cd2d816ed5 +wireless-next 156d3008429511234df7f2ff504eef19d66042dd +wpan-next 1af3de62f03f651c5e50c0e00f8fed34d07b9df3 +wpan-staging 1af3de62f03f651c5e50c0e00f8fed34d07b9df3 +mtd 7227aacb62aeb59b007a6d3489b11f78fa332696 +nand ec185b18c22323cb0cde0319fa90b3e467b1ed2d +spi-nor df6def86b9dcbc3e8ed4964c7b79b70c9b0c3040 +crypto ac52578d6e8d300dd50f790f29a24169b1edd26c +drm f1fcbaa18b28dec10281551dfe6ed3a3ed80e3d6 +drm-misc f47d6140b7a4c858d82d263e7577ff6fb5279a9c +amdgpu d3295311e589a14a7496f0e14b5be6c3b5d9e134 +drm-intel 9c3a985f88fa4de82bf4bda906095ce6444e9039 +drm-tegra 2429b3c529da29d4277d519bd66d034842dcd70c +drm-msm ac7e7c9c65ecfb1fcc99de91cfd6b17a8d4cb9c1 +drm-msm-lumag ac7e7c9c65ecfb1fcc99de91cfd6b17a8d4cb9c1 +imx-drm 927d8fd465adbaaad6cce82f840d489d7c378f29 +etnaviv 4c22c61e429f004d84eba72d7195bccef33ea0ec +fbdev ac9a78681b921877518763ba0e89202254349d1b +regmap 7e5a77cccd1f08dc5be3733c50b1a4531db07b8f +sound 9fe0731bc345230e8ce125056b9407c63960f74e +ieee1394 ac9a78681b921877518763ba0e89202254349d1b +sound-asoc d1b1112234a50c676bea873f2c4b03cc0e9e6717 +modules 0b891c83d8c54cb70e186456c2191adb5fd98c56 +input d8bde56dfd86a0bba9206de8574e58c8aaac4f0f +block 617bfe921735b0bc1daf54311b86d7b39a0eb149 +device-mapper 38d11da522aacaa05898c734a1cec86f1e611129 +libata f19c694f744f5efd68d0b9ed9e0728a093d43393 +pcmcia 15e74c6c1ce2d388e967f32cdaa83ca034fa6452 +mmc d4ebc9419afbac330e9ec0d2936108742aa4d97a +mfd 9bdc4322bbd17047e014795aacc4e1eaff682cba +backlight fb200218b40b7864f64f1a47de61e035d8934e92 +battery eae36cb82440bc14e3299e46efdf2bdcc381880c +regulator dd5250193155c4ad3350239c709a96d4e2c59df5 +security ac9a78681b921877518763ba0e89202254349d1b +apparmor 0bb84cff96af29d8531a1a2bee04e521cdfe35ce +integrity 644f17412f5acf01a19af9d04a921937a2bc86c6 +safesetid 64b634830c919979de4b18163e15d30df66e64a8 +selinux c52df19e3759055cf07d1c0030c46ea958163aa9 +smack 2c085f3a8f23c9b444e8b99d93c15d7ce870fc4e +tomoyo 933fd4391e3def39551e26d2f8bfff4063278993 +tpmdd e7d3e5c4b1dd50a70b31524c3228c62bb41bbab2 +watchdog fc4354c6e5c21257cf4a50b32f7c11c7d65c55b3 +iommu e51b4198396cd715b140c0e8b259680429ff0cfb +audit e455ca40dbcf2cd50d1e59bf4b2752b300bcdad4 +devicetree c50eb01940c75b848e0257cea3b521a6d4150c5d +dt-krzk 0ff3c07556e6316c3f87d2e2462002adb01a681d +mailbox d396133dced4cbaa52581d0e9c4aea8e04b8db10 +spi 5e41763e97db00125dec847e54a1827436d34cd3 +tip f81d8f759e7f80c643027e631c586369836aac90 +clockevents 158009f1b4a33bc0f354b994eea361362bd83226 +edac 6c79e42169fe10308d72051950c411b3524c7aa9 +irqchip 2ff1b0839ddd514be4752c64c1c6facf91ff3a56 +ftrace 3862f86c1529fa0016de6344eb974877b4cd3838 +rcu d6e962af2fdd2d10b19d962039238f94d483354b +kvm 39428f6ea9eace95011681628717062ff7f5eb5f +kvm-arm 801d857f9811ed4fa87ed5693d572f75a5426b22 +kvms390 8a46df7cd135fe576c18efa418cd1549e51f2732 +kvm-riscv 2f4d58f7635aec014428e73ef6120c4d0377c430 +kvm-x86 5c291b93e5d665380dbecc6944973583f9565ee5 +xen-tip cbfac7707ba16619006a4fd60faac46303fd2f3e +percpu b9819165bb455bfdce37086c622a18cce2dd2f5e +workqueues 4d19140f762c316298ec693edf813ec245513ff3 +drivers-x86 f5a08ed51ed780a312fa07daaf1edb92b78e06f8 +chrome-platform ac9a78681b921877518763ba0e89202254349d1b +hsi ac9a78681b921877518763ba0e89202254349d1b +leds 1b929c02afd37871d5afb9d498426f83432e71c2 +leds-lj 7a9496d0feb5fefdc9a556ce189f8a7326e40625 +ipmi d08076678ce72140a40553d226f90d189fbe06d1 +driver-core f1fcbaa18b28dec10281551dfe6ed3a3ed80e3d6 +usb a4422ff221429c600c3dc5d0394fb3738b89d040 +thunderbolt f1fcbaa18b28dec10281551dfe6ed3a3ed80e3d6 +usb-serial a095edfc15f0832e046ae23964e249ef5c95af87 +tty d5b3d02d0b107345f2a6ecb5b06f98356f5c97ab +char-misc c21c0f9a20a963f5a1874657a4e3d657503f7815 +accel e8478792ca56840a14bc2c8888b3f1f1df66b538 +coresight 18996a113f2567aef3057e300e3193ce2df1684c +fastrpc 3f6b4c6f0bd0126f673f3578429239ae3860718b +fpga da4da5b2d70809e34bb020179602f2d67baf76fd +icc b7590f3841f47d5c6732db9a6d6474162109f487 +iio a508fbfed333aea05e4ac42d98803a031cda8ce8 +phy-next 8d087a09c7017f1425f3f1d36807eb4988410942 +soundwire 9420c9719f03d9c42b79fe8080fbd81900032087 +extcon 4e30418def07f8359c7927d5815788043afbb482 +gnss 1b929c02afd37871d5afb9d498426f83432e71c2 +vfio 705b004ee377b789e39ae237519bab714297ac83 +w1 b332af5398a3aa1a2fdd69bb6968a8f866cc39aa +staging 1f3413dc8eb0de023c5ec5994aef8225262d0f19 +counter-next 228354ed692faa08f40f2630658c0771f77da457 +mux ea327624ae52936b2c0eccffd9369983ca2d08e3 +dmaengine 1c677f238f92ba0a329b7c13220f38b396872806 +cgroup 2ef269ef1ac006acf974793d975539244d77b28f +scsi d8975ee303e6ad1aeee8a69ff78faf07b402b6c4 +scsi-mkp 16853cd8f6d44d774f683d670be38c7d91eb32b8 +vhost ebddc00f450de4f54a591bd5670016562eade445 +rpmsg de598695a2adc2affe7ce2e8787b5c01ce3aa661 +gpio ac9a78681b921877518763ba0e89202254349d1b +gpio-brgl 2c99754ea0f90ed4a7ab0db9879e57a266b01bfc +gpio-intel 782eea0c89f7d071d6b56ecfa1b8b0c81164b9be +pinctrl 4ca235d2898e7b809fab5fb2766a26b50acf05cf +pinctrl-intel f1fcbaa18b28dec10281551dfe6ed3a3ed80e3d6 +pinctrl-renesas 5d32cead772c3d074947cb7277dea7532133037b +pinctrl-samsung ac9a78681b921877518763ba0e89202254349d1b +pwm 247ee6c780406513c6031a7f4ea41f1648b03295 +userns 05bd6e0242b4c059ec6797e3d721ecca6d15ff8d +ktest 7dc8e24f0e09834341f84d37433840b353d64bc8 +kselftest 3ecb4a459a1eeab1ad135f87057aa3ea4c9af1b8 +kunit ac9a78681b921877518763ba0e89202254349d1b +kunit-next a5ce66ad292b681ffe245e1c0e8840484da76784 +livepatching 5e36be5973b6ac66198220365bffb7a3641038f9 +rtc e99ab4abebf825de2ce65f6c6c32ee30e00bb077 +nvdimm 305a72efa791c826fe84768ca55e31adc4113ea8 +at24 a3c10035d12f5ec10915d5c00c2e8f7d7c066182 +ntb 942cc9ceccb6178b56bf712b94d76190d8759823 +seccomp 0fb0624b15d21622c214617fda5c05a203b04564 +fsi 35af9fb49bc5c6d61ef70b501c3a56fe161cce3e +slimbus ac9a78681b921877518763ba0e89202254349d1b +nvmem ac9a78681b921877518763ba0e89202254349d1b +xarray 69cb69ea55420388b444ee30b1530ec15ab584f7 +hyperv a494aef23dfc732945cb42e22246a5c31174e4a5 +auxdisplay ddf75a86aba2cfb7ec4497e8692b60c8c8fe0ee7 +kgdb c1cb81429df462eca1b6ba615cddd21dd3103c46 +hmm ac9a78681b921877518763ba0e89202254349d1b +cfi 3123109284176b1532874591f7c81f3837bbdc17 +mhi 1d1493bdc25f498468a606a4ece947d155cfa3a9 +memblock e4bfeb6d6f39ff8998f269644d049a49bb7971c9 +cxl bfe58458fd2557c9a81b89bc0ff10eb03d6c0745 +zstd 2aa14b1ab2c41a4fe41efae80d58bb77da91f19f +efi d86ff3333cb1d5f42d8898fb5fdb304e143c0237 +unicode b500d6d7243d2e0807a39a09c52fbe668b59b2c1 +slab ed4cdfbeb8735c36a2e31009866dfc2dfa26db3f +random 512dee0c00ad9e9c7ae9f11fc6743702ea40caff +landlock ed35e2f2f0ded15df313ae6f8da21e85c8e1e493 +rust ac9a78681b921877518763ba0e89202254349d1b +sysctl 1685b445d7787f89175d3891421348bd782fe5a0 +execve 60592fb6b67c653beaa2e7acad9a9d7aa0b71dff +bitmap 714f3af11b21b15d4bab91045928a8498bbbffa1 +hte ac9a78681b921877518763ba0e89202254349d1b +kspp 55c84a5cf2c72a821719823ef2ebef01b119025b +kspp-gustavo 00168b415a60cec7558608efb4fc50f2a73daae2 +iommufd f1fcbaa18b28dec10281551dfe6ed3a3ed80e3d6 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..09e7190a9101 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,367 @@ +Trees included into this release: + +Name Type Url +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master +fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#fixes +mm-hotfixes git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-hotfixes-unstable +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#fixes +arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current git git://git.armlinux.org.uk/~rmk/linux-arm.git#fixes +arm64-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/fixes +arm-soc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#arm/fixes +davinci-current git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#davinci/for-current +drivers-memory-fixes git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#fixes +tee-fixes git https://git.linaro.org/people/jens.wiklander/linux-tee.git#fixes +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +powerpc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes +s390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#fixes +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master +fscrypt-current git git://git.kernel.org/pub/scm/fs/fscrypt/linux.git#for-current +fsverity-current git git://git.kernel.org/pub/scm/fs/fsverity/linux.git#for-current +net git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git#main +bpf git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git#master +ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master +netfilter git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git#master +ipvs git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git#main +wireless git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git#for-next +wpan git git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan.git#master +rdma-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-rc +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus +sound-asoc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-linus +regmap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-linus +regulator-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-linus +spi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git#for-linus +driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-linus +tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus +usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus +usb-serial-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-linus +phy git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#fixes +staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus +iio-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#fixes-togreg +counter-current git git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git#counter-current +char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus +soundwire-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#fixes +thunderbolt-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#fixes +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master +vfio-fixes git git://github.com/awilliam/linux-vfio.git#for-linus +kselftest-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes +modules-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#modules-linus +dmaengine-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#fixes +backlight-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-fixes +mtd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/fixes +mfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-fixes +v4l-dvb-fixes git git://linuxtv.org/mchehab/media-next.git#fixes +reset-fixes git https://git.pengutronix.de/git/pza/linux#reset/fixes +mips-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-fixes +at91-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-fixes +omap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#fixes +kvm-fixes git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#master +kvms390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#master +hwmon-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon +nvdimm-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-fixes +cxl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#fixes +btrfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#next-fixes +vfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#fixes +dma-mapping-fixes git git://git.infradead.org/users/hch/dma-mapping.git#for-linus +drivers-x86-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#fixes +samsung-krzk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#fixes +pinctrl-samsung-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#fixes +devicetree-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#dt/linus +dt-krzk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git#fixes +scsi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#fixes +drm-fixes git git://git.freedesktop.org/git/drm/drm.git#drm-fixes +drm-intel-fixes git git://anongit.freedesktop.org/drm-intel#for-linux-next-fixes +mmc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#fixes +rtc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-fixes +gnss-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-linus +hyperv-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-fixes +soc-fsl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#fix +risc-v-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#fixes +riscv-dt-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-dt-fixes +riscv-soc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-soc-fixes +fpga-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git#fixes +spdx git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git#spdx-linus +gpio-brgl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-current +gpio-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#fixes +pinctrl-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#fixes +erofs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#fixes +kunit-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit-fixes +ubifs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#fixes +memblock-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#fixes +nfsd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#nfsd-fixes +irqchip-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-fixes +renesas-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#fixes +broadcom-fixes git https://github.com/Broadcom/stblinux.git#fixes +perf-current git git://git.kernel.org/pub/scm/linux/kernel/git/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 +wpan-staging git git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git#staging +mtd git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/next +nand git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#nand/next +spi-nor git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#spi-nor/next +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +drm git git://git.freedesktop.org/git/drm/drm.git#drm-next +drm-misc git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next +amdgpu git https://gitlab.freedesktop.org/agd5f/linux#drm-next +drm-intel git git://anongit.freedesktop.org/drm-intel#for-linux-next +drm-tegra git https://gitlab.freedesktop.org/drm/tegra.git#for-next +drm-msm git https://gitlab.freedesktop.org/drm/msm.git#msm-next +drm-msm-lumag git https://gitlab.freedesktop.org/lumag/msm.git#msm-next-lumag +imx-drm git https://git.pengutronix.de/git/pza/linux#imx-drm/next +etnaviv git https://git.pengutronix.de/git/lst/linux#etnaviv/next +fbdev git git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git#for-next +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +ieee1394 git https://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#modules-next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +block git git://git.kernel.dk/linux-block.git#for-next +device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +libata git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git#for-next +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git#pcmcia-next +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next +backlight git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next +battery git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#for-next +regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git#next +apparmor git git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor#apparmor-next +integrity git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next-integrity +safesetid git https://github.com/micah-morton/linux.git#safesetid-next +selinux git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#next +smack git git://github.com/cschaufler/smack-next#next +tomoyo git https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git#master +tpmdd git git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git#next +watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next +audit git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git#next +devicetree git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next +dt-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git#for-next +mailbox git git://git.linaro.org/landing-teams/working/fujitsu/integration.git#mailbox-for-next +spi git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#master +clockevents git git://git.linaro.org/people/daniel.lezcano/linux.git#timers/drivers/next +edac git git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git#edac-for-next +irqchip git git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#for-next +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next +kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#next +kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next +kvms390 git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#next +kvm-riscv git https://github.com/kvm-riscv/linux.git#riscv_kvm_next +kvm-x86 git https://github.com/kvm-x86/linux.git#next +xen-tip git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +drivers-x86 git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#for-next +chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git#for-next +hsi git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next +leds git git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git#for-next +leds-lj git git://git.kernel.org/pub/scm/linux/kernel/git/lee/leds.git#for-leds-next +ipmi git git://github.com/cminyard/linux-ipmi.git#for-next +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next +usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next +thunderbolt git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#next +usb-serial git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next +char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next +accel git git://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux.git#habanalabs-next +coresight git git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git#next +fastrpc git git://git.kernel.org/pub/scm/linux/kernel/git/srini/fastrpc.git#for-next +fpga git git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git#for-next +icc git git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git#icc-next +iio git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#togreg +phy-next git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#next +soundwire git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#next +extcon git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next +gnss git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-next +vfio git git://github.com/awilliam/linux-vfio.git#next +w1 git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git#for-next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +counter-next git git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git#counter-next +mux git https://gitlab.com/peda-linux/mux.git#for-next +dmaengine git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#next +cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next +scsi-mkp git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +rpmsg git git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git#for-next +gpio git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next +gpio-brgl git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-next +gpio-intel git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#for-next +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +pinctrl-intel git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#for-next +pinctrl-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-pinctrl +pinctrl-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#for-next +pwm git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git#for-next +userns git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git#for-next +ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next +kunit git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#test +kunit-next git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit +livepatching git git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching#for-next +rtc git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next +nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +at24 git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#at24/for-next +ntb git https://github.com/jonmason/ntb.git#ntb-next +seccomp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/seccomp +fsi git git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git#next +slimbus git git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git#for-next +nvmem git git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git#for-next +xarray git git://git.infradead.org/users/willy/xarray.git#main +hyperv git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-next +auxdisplay git https://github.com/ojeda/linux.git#auxdisplay +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git#kgdb/for-next +hmm git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#hmm +cfi git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#cfi/next +mhi git git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git#mhi-next +memblock git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#for-next +cxl git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#next +zstd git https://github.com/terrelln/linux.git#zstd-next +efi git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#next +unicode git git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git#for-next +slab git git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git#for-next +random git git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git#master +landlock git git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git#next +rust git https://github.com/Rust-for-Linux/linux.git#rust-next +sysctl git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#sysctl-next +execve git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/execve +bitmap git https://github.com/norov/linux.git#bitmap-for-next +hte git git://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git#for-next +kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +kspp-gustavo git git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git#for-next/kspp +iommufd git git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git#for-next diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..83a985e9b2df --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,5405 @@ +$ date -R +Thu, 18 May 2023 08:42:21 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at f1fcbaa18b28 Linux 6.4-rc2 +Merging origin/master (4d6d4c7f541d Merge tag 'linux-kselftest-fixes-6.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating f1fcbaa18b28..4d6d4c7f541d +Fast-forward (no commit created; -m option ignored) + drivers/char/tpm/tpm-chip.c | 4 ++ + drivers/char/tpm/tpm-interface.c | 10 ++++ + drivers/char/tpm/tpm_tis.c | 16 +++++++ + drivers/char/tpm/tpm_tis_core.c | 43 ++++++++---------- + fs/lockd/svc.c | 2 +- + fs/nfsd/nfsctl.c | 25 +++++----- + fs/nfsd/trace.h | 6 +-- + include/linux/compiler.h | 5 +- + include/linux/sunrpc/svc_rdma.h | 2 +- + include/linux/sunrpc/svc_xprt.h | 2 +- + include/linux/tpm.h | 1 + + net/sunrpc/auth_gss/gss_krb5_crypto.c | 10 ++++ + net/sunrpc/svc.c | 19 +++++--- + 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 +- + 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 + + 21 files changed, 208 insertions(+), 95 deletions(-) + create mode 100755 tools/testing/selftests/ftrace/ftracetest-ktap +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 (dac9689998e8 radix-tree: move declarations to header) +$ git merge -m Merge branch 'mm-hotfixes-unstable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-hotfixes/mm-hotfixes-unstable +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Resolved 'MAINTAINERS' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master ae0572e987c5] Merge branch 'mm-hotfixes-unstable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 7 +-- + fs/nilfs2/btnode.c | 12 +++++- + fs/nilfs2/inode.c | 18 ++++++++ + fs/userfaultfd.c | 108 ++++++++++++++++++++++++++--------------------- + include/linux/shrinker.h | 13 +++++- + lib/maple_tree.c | 12 ++---- + lib/radix-tree.c | 2 + + lib/radix-tree.h | 8 ++++ + lib/xarray.c | 6 +-- + mm/kfence/kfence.h | 2 +- + mm/memory.c | 3 ++ + mm/rmap.c | 6 +-- + mm/shmem.c | 17 +++++++- + mm/shrinker_debug.c | 15 ++++--- + mm/vmscan.c | 5 ++- + mm/zsmalloc.c | 36 ++++------------ + mm/zswap.c | 16 +++++++ + 17 files changed, 176 insertions(+), 110 deletions(-) + create mode 100644 lib/radix-tree.h +Merging kbuild-current/fixes (f1fcbaa18b28 Linux 6.4-rc2) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (30a0b95b1335 Linux 6.1-rc3) +$ git merge -m Merge branch 'for-curr' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc-current/for-curr +Already up to date. +Merging arm-current/fixes (2b951b0efbaa ARM: 9297/1: vfp: avoid unbalanced stack on 'success' return path) +$ git merge -m Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm-current/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (fd2d1cb8c545 arm64: Make the ARCH_FORCE_MAX_ORDER config input prompt unconditional) +$ 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 +Merge made by the 'ort' strategy. + arch/arm/include/asm/arm_pmuv3.h | 6 +++--- + arch/arm64/Kconfig | 2 +- + arch/arm64/include/asm/arm_pmuv3.h | 6 +++--- + arch/arm64/kernel/mte.c | 7 ++----- + arch/arm64/kernel/vdso.c | 2 +- + arch/arm64/mm/copypage.c | 5 +++-- + arch/arm64/mm/fault.c | 4 ++-- + 7 files changed, 15 insertions(+), 17 deletions(-) +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 (ac9a78681b92 Linux 6.4-rc1) +$ git merge -m Merge branch 'davinci/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git davinci-current/davinci/for-current +Already up to date. +Merging drivers-memory-fixes/fixes (ac9a78681b92 Linux 6.4-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory-fixes/fixes +Already up to date. +Merging tee-fixes/fixes (ceaa837f96ad Linux 6.2-rc8) +$ git merge -m Merge branch 'fixes' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee-fixes/fixes +Already up to date. +Merging m68k-current/for-linus (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 (1f7aacc5eb9e powerpc/iommu: Incorrect DDW Table is referenced for SR-IOV device) +$ 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/boot/Makefile | 6 +++-- + arch/powerpc/crypto/Kconfig | 2 +- + arch/powerpc/include/asm/iommu.h | 5 ----- + arch/powerpc/kernel/dma-iommu.c | 4 +++- + arch/powerpc/kernel/iommu.c | 28 ++++++----------------- + arch/powerpc/kernel/isa-bridge.c | 5 +++-- + arch/powerpc/mm/book3s64/radix_pgtable.c | 4 ++-- + arch/powerpc/net/bpf_jit_comp.c | 2 ++ + arch/powerpc/platforms/Kconfig | 1 + + arch/powerpc/platforms/powernv/pci.c | 25 --------------------- + arch/powerpc/platforms/pseries/iommu.c | 38 ++++++++------------------------ + 11 files changed, 32 insertions(+), 88 deletions(-) +Merging s390-fixes/fixes (0f1cbf941d59 s390/iommu: get rid of S390_CCW_IOMMU and S390_AP_IOMMU) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390-fixes/fixes +Merge made by the 'ort' strategy. + Documentation/s390/vfio-ap.rst | 1 - + arch/s390/Kconfig | 11 +---------- + arch/s390/configs/debug_defconfig | 3 +-- + arch/s390/configs/defconfig | 3 +-- + arch/s390/configs/zfcpdump_defconfig | 1 + + arch/s390/crypto/chacha-glue.c | 2 +- + arch/s390/include/asm/compat.h | 2 +- + arch/s390/include/uapi/asm/statfs.h | 4 ++-- + arch/s390/kernel/ipl.c | 3 +-- + arch/s390/kernel/topology.c | 32 +++++++++++++++++--------------- + drivers/iommu/Kconfig | 16 ---------------- + drivers/s390/cio/device.c | 2 ++ + drivers/s390/cio/qdio.h | 2 +- + drivers/s390/crypto/pkey_api.c | 3 +++ + fs/statfs.c | 4 ++-- + 15 files changed, 34 insertions(+), 55 deletions(-) +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 (ab87603b2511 net: wwan: t7xx: Ensure init is completed before system sleep) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/main +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .mailmap | 5 ++ + CREDITS | 4 ++ + .../bindings/net/can/st,stm32-bxcan.yaml | 19 +++-- + MAINTAINERS | 6 +- + arch/arm/boot/dts/stm32f429.dtsi | 1 + + arch/arm/boot/dts/stm32f7-pinctrl.dtsi | 82 +++++++++++++++++++++ + arch/arm/boot/dts/stm32f746.dtsi | 47 ++++++++++++ + drivers/net/can/Kconfig | 2 +- + drivers/net/can/bxcan.c | 34 ++++++--- + drivers/net/can/dev/skb.c | 3 +- + drivers/net/dsa/mv88e6xxx/port.h | 2 +- + drivers/net/dsa/rzn1_a5psw.c | 83 +++++++++++++++++----- + drivers/net/dsa/rzn1_a5psw.h | 3 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 8 ++- + drivers/net/ethernet/freescale/fec_main.c | 16 +++-- + .../hisilicon/hns3/hns3_common/hclge_comm_cmd.c | 25 +++++-- + .../hisilicon/hns3/hns3_common/hclge_comm_cmd.h | 8 ++- + drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c | 2 +- + drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.h | 1 + + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 15 ++-- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 4 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.h | 5 ++ + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 5 +- + drivers/net/ethernet/intel/iavf/iavf_virtchnl.c | 5 -- + drivers/net/ethernet/intel/ice/ice_dcb_lib.c | 5 +- + drivers/net/ethernet/intel/ice/ice_lib.c | 5 ++ + drivers/net/ethernet/intel/ice/ice_sriov.c | 8 +-- + drivers/net/ethernet/intel/ice/ice_txrx.c | 8 +-- + drivers/net/ethernet/intel/ice/ice_txrx.h | 9 +-- + drivers/net/ethernet/intel/ice/ice_vf_lib.c | 19 +++++ + drivers/net/ethernet/intel/ice/ice_vf_lib.h | 1 + + drivers/net/ethernet/intel/ice/ice_virtchnl.c | 1 + + drivers/net/ethernet/intel/igb/e1000_mac.c | 4 +- + drivers/net/ethernet/netronome/nfp/nic/main.h | 2 +- + drivers/net/ethernet/sfc/ef100_netdev.c | 4 +- + drivers/net/ethernet/sun/cassini.c | 2 + + drivers/net/mdio/mdio-i2c.c | 15 ++-- + drivers/net/pcs/pcs-xpcs.c | 2 +- + drivers/net/phy/dp83867.c | 22 +++++- + drivers/net/phy/phylink.c | 8 +-- + drivers/net/tun.c | 15 ++++ + drivers/net/virtio_net.c | 61 +++++++++++----- + drivers/net/wwan/iosm/iosm_ipc_imem.c | 27 +++++-- + drivers/net/wwan/iosm/iosm_ipc_imem_ops.c | 12 ++-- + drivers/net/wwan/iosm/iosm_ipc_imem_ops.h | 6 +- + drivers/net/wwan/t7xx/t7xx_pci.c | 18 +++++ + drivers/net/wwan/t7xx/t7xx_pci.h | 1 + + include/net/nexthop.h | 23 ------ + net/8021q/vlan_dev.c | 4 +- + net/can/isotp.c | 2 +- + net/can/j1939/socket.c | 2 +- + net/devlink/core.c | 16 ++--- + net/devlink/devl_internal.h | 1 - + net/devlink/leftover.c | 5 +- + net/ipv4/tcp_ipv4.c | 5 +- + net/ipv6/ip6_fib.c | 16 ++--- + net/ipv6/ip6_gre.c | 13 ++-- + net/key/af_key.c | 12 ++-- + net/nsh/nsh.c | 8 +-- + net/tipc/bearer.c | 17 ++++- + net/tipc/bearer.h | 3 + + net/tipc/link.c | 9 ++- + net/tipc/udp_media.c | 5 +- + net/vmw_vsock/af_vsock.c | 2 +- + net/xfrm/xfrm_device.c | 2 +- + net/xfrm/xfrm_interface_core.c | 54 ++------------ + net/xfrm/xfrm_policy.c | 20 ++---- + net/xfrm/xfrm_user.c | 15 ++-- + tools/testing/selftests/net/fib_nexthops.sh | 2 +- + .../selftests/net/srv6_end_dt4_l3vpn_test.sh | 17 +++-- + 70 files changed, 613 insertions(+), 280 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at f41cfa7747c5 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git +Merging next-20230517 version of net +$ git merge -m next-20230517/net 225c657945c4a6307741cb3cc89467eadcc26e9b +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + CREDITS | 4 ++ + MAINTAINERS | 6 +- + drivers/net/dsa/rzn1_a5psw.c | 83 +++++++++++++++++----- + drivers/net/dsa/rzn1_a5psw.h | 3 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 8 ++- + drivers/net/ethernet/freescale/fec_main.c | 16 +++-- + .../hisilicon/hns3/hns3_common/hclge_comm_cmd.c | 25 +++++-- + .../hisilicon/hns3/hns3_common/hclge_comm_cmd.h | 8 ++- + drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c | 2 +- + drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.h | 1 + + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 15 ++-- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 4 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.h | 5 ++ + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 5 +- + drivers/net/ethernet/intel/ice/ice_dcb_lib.c | 5 +- + drivers/net/ethernet/intel/ice/ice_txrx.c | 8 +-- + drivers/net/ethernet/intel/ice/ice_txrx.h | 9 +-- + drivers/net/ethernet/netronome/nfp/nic/main.h | 2 +- + drivers/net/ethernet/sfc/ef100_netdev.c | 4 +- + drivers/net/mdio/mdio-i2c.c | 15 ++-- + drivers/net/phy/dp83867.c | 22 +++++- + drivers/net/phy/phylink.c | 8 +-- + drivers/net/virtio_net.c | 61 +++++++++++----- + include/net/nexthop.h | 23 ------ + net/devlink/core.c | 16 ++--- + net/devlink/devl_internal.h | 1 - + net/devlink/leftover.c | 5 +- + net/ipv4/tcp_ipv4.c | 5 +- + net/ipv6/ip6_fib.c | 16 ++--- + net/ipv6/ip6_gre.c | 13 ++-- + net/nsh/nsh.c | 8 +-- + net/tipc/bearer.c | 17 ++++- + net/tipc/bearer.h | 3 + + net/tipc/link.c | 9 ++- + net/tipc/udp_media.c | 5 +- + net/vmw_vsock/af_vsock.c | 2 +- + .../selftests/net/srv6_end_dt4_l3vpn_test.sh | 17 +++-- + 37 files changed, 300 insertions(+), 159 deletions(-) +Merging bpf/master (a820ca1a739b samples/bpf: Drop unnecessary fallthrough) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git bpf/master +Merge made by the 'ort' strategy. + kernel/bpf/offload.c | 2 +- + samples/bpf/hbm.c | 1 - + tools/testing/selftests/bpf/Makefile | 2 +- + 3 files changed, 2 insertions(+), 3 deletions(-) +Merging ipsec/master (8680407b6f8f xfrm: Check if_id in inbound policy/secpath match) +$ 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/key/af_key.c | 12 ++++++---- + net/xfrm/xfrm_device.c | 2 +- + net/xfrm/xfrm_interface_core.c | 54 ++++-------------------------------------- + net/xfrm/xfrm_policy.c | 20 +++++----------- + net/xfrm/xfrm_user.c | 15 ++++++++---- + 5 files changed, 29 insertions(+), 74 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 (61ae320a29b0 netfilter: nft_set_rbtree: fix null deref on element insertion) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git ipvs/main +Merge made by the 'ort' strategy. + .mailmap | 5 ++ + .../bindings/net/can/st,stm32-bxcan.yaml | 19 +++-- + arch/arm/boot/dts/stm32f429.dtsi | 1 + + arch/arm/boot/dts/stm32f7-pinctrl.dtsi | 82 ++++++++++++++++++++++ + arch/arm/boot/dts/stm32f746.dtsi | 47 +++++++++++++ + drivers/net/can/Kconfig | 2 +- + drivers/net/can/bxcan.c | 34 ++++++--- + drivers/net/can/dev/skb.c | 3 +- + drivers/net/dsa/mv88e6xxx/port.h | 2 +- + drivers/net/ethernet/intel/iavf/iavf_virtchnl.c | 5 -- + drivers/net/ethernet/intel/ice/ice_lib.c | 5 ++ + drivers/net/ethernet/intel/ice/ice_sriov.c | 8 +-- + drivers/net/ethernet/intel/ice/ice_vf_lib.c | 19 +++++ + drivers/net/ethernet/intel/ice/ice_vf_lib.h | 1 + + drivers/net/ethernet/intel/ice/ice_virtchnl.c | 1 + + drivers/net/ethernet/intel/igb/e1000_mac.c | 4 +- + drivers/net/ethernet/sun/cassini.c | 2 + + drivers/net/pcs/pcs-xpcs.c | 2 +- + drivers/net/tun.c | 15 ++++ + drivers/net/wwan/iosm/iosm_ipc_imem.c | 27 +++++-- + drivers/net/wwan/iosm/iosm_ipc_imem_ops.c | 12 ++-- + drivers/net/wwan/iosm/iosm_ipc_imem_ops.h | 6 +- + drivers/net/wwan/t7xx/t7xx_pci.c | 18 +++++ + drivers/net/wwan/t7xx/t7xx_pci.h | 1 + + net/8021q/vlan_dev.c | 4 +- + net/can/isotp.c | 2 +- + net/can/j1939/socket.c | 2 +- + net/devlink/core.c | 2 +- + net/netfilter/nf_conntrack_netlink.c | 4 ++ + net/netfilter/nf_tables_api.c | 4 +- + net/netfilter/nft_set_rbtree.c | 20 ++++-- + tools/testing/selftests/net/fib_nexthops.sh | 2 +- + 32 files changed, 303 insertions(+), 58 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at 142122e2a3d3 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git +Merging next-20230517 version of ipvs +$ git merge -m next-20230517/ipvs 225c657945c4a6307741cb3cc89467eadcc26e9b +Already up to date. +Merging wireless/for-next (212457ccbd60 wifi: b43: fix incorrect __packed annotation) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/for-next +Merge made by the 'ort' strategy. + drivers/net/wireless/broadcom/b43/b43.h | 2 +- + .../net/wireless/broadcom/b43legacy/b43legacy.h | 2 +- + .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 5 ++ + .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 11 ++++ + .../net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 11 ++++ + drivers/net/wireless/intel/iwlwifi/fw/acpi.c | 2 +- + drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 19 +++--- + .../net/wireless/intel/iwlwifi/mvm/ftm-initiator.c | 5 ++ + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 5 +- + drivers/net/wireless/intel/iwlwifi/mvm/link.c | 12 ++-- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 55 ++++++++-------- + .../net/wireless/intel/iwlwifi/mvm/mld-mac80211.c | 9 +-- + drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c | 14 ++-- + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 1 + + drivers/net/wireless/intel/iwlwifi/mvm/nvm.c | 10 +++ + drivers/net/wireless/intel/iwlwifi/mvm/rfi.c | 16 ++++- + drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 3 + + drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 9 ++- + drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 13 ++-- + drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 2 +- + .../net/wireless/mediatek/mt76/mt76_connac2_mac.h | 2 +- + .../net/wireless/mediatek/mt76/mt76_connac_mac.c | 3 +- + drivers/net/wireless/mediatek/mt76/mt7996/mac.c | 2 +- + drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 1 + + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 4 +- + drivers/net/wireless/realtek/rtw88/mac80211.c | 2 +- + drivers/net/wireless/realtek/rtw88/main.c | 15 +++++ + drivers/net/wireless/realtek/rtw88/main.h | 3 + + drivers/net/wireless/realtek/rtw88/sdio.c | 8 --- + drivers/net/wireless/realtek/rtw88/usb.h | 2 +- + drivers/net/wireless/realtek/rtw89/mac.c | 4 ++ + drivers/net/wireless/realtek/rtw89/mac.h | 2 + + drivers/net/wireless/realtek/rtw89/rtw8852b.c | 28 ++++---- + drivers/net/wireless/virtual/mac80211_hwsim.c | 3 +- + net/mac80211/cfg.c | 7 +- + net/mac80211/chan.c | 75 ++++++++++++++-------- + net/mac80211/ieee80211_i.h | 3 +- + net/mac80211/trace.h | 2 +- + net/mac80211/tx.c | 5 +- + net/mac80211/util.c | 2 +- + net/wireless/scan.c | 6 +- + 41 files changed, 249 insertions(+), 136 deletions(-) +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 (866422cdddcd RDMA/efa: Fix unsupported page sizes in device) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma-fixes/for-rc +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 2 +- + drivers/infiniband/hw/bnxt_re/qplib_res.c | 12 ++-------- + drivers/infiniband/hw/bnxt_re/qplib_sp.c | 7 +++--- + drivers/infiniband/hw/efa/efa_verbs.c | 2 +- + drivers/infiniband/sw/rxe/rxe_comp.c | 26 +++++++++++++--------- + drivers/infiniband/sw/rxe/rxe_net.c | 7 +++--- + drivers/infiniband/sw/rxe/rxe_qp.c | 37 ++++++++++++++++++++----------- + drivers/infiniband/sw/rxe/rxe_recv.c | 9 ++++---- + drivers/infiniband/sw/rxe/rxe_req.c | 30 ++++++++++++++----------- + drivers/infiniband/sw/rxe/rxe_resp.c | 14 +++++++----- + drivers/infiniband/sw/rxe/rxe_verbs.c | 25 +++++++++++---------- + 11 files changed, 94 insertions(+), 77 deletions(-) +Merging sound-current/for-linus (dc4f2ccaeddd ALSA: hda: Add NVIDIA codec IDs a3 through a7 to patch table) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/sound/tas2562.yaml | 6 +- + .../devicetree/bindings/sound/tas2770.yaml | 6 +- + .../devicetree/bindings/sound/tas27xx.yaml | 6 +- + MAINTAINERS | 4 +- + include/sound/hda-mlink.h | 14 ++++ + include/uapi/sound/sof/tokens.h | 3 +- + sound/core/oss/pcm_plugin.h | 16 ++-- + sound/firewire/digi00x/digi00x-stream.c | 4 +- + sound/pci/cs46xx/cs46xx_lib.c | 2 +- + sound/pci/hda/hda_generic.c | 7 +- + sound/pci/hda/patch_hdmi.c | 5 ++ + sound/pci/hda/patch_realtek.c | 34 +++++++- + sound/soc/amd/yc/acp6x-mach.c | 7 ++ + sound/soc/codecs/cs35l56.c | 3 +- + sound/soc/codecs/ssm2602.c | 15 ++++ + sound/soc/dwc/dwc-i2s.c | 4 +- + sound/soc/fsl/fsl_micfil.c | 14 +++- + sound/soc/jz4740/jz4740-i2s.c | 54 +++++++++++- + sound/soc/mediatek/mt8186/mt8186-afe-clk.c | 6 -- + sound/soc/mediatek/mt8186/mt8186-afe-clk.h | 1 - + sound/soc/mediatek/mt8186/mt8186-afe-pcm.c | 4 - + sound/soc/mediatek/mt8186/mt8186-audsys-clk.c | 46 ++++++----- + sound/soc/mediatek/mt8186/mt8186-audsys-clk.h | 1 - + sound/soc/sof/amd/acp-ipc.c | 7 +- + sound/soc/sof/debug.c | 4 +- + sound/soc/sof/intel/hda-mlink.c | 96 ++++++++++++++++++++-- + sound/soc/sof/ipc3-topology.c | 7 +- + sound/soc/sof/ipc4-topology.c | 4 +- + sound/soc/sof/pcm.c | 17 ++-- + sound/soc/sof/pm.c | 14 +++- + sound/soc/sof/sof-client-probes.c | 14 ++-- + sound/soc/sof/topology.c | 6 +- + sound/usb/format.c | 1 + + 33 files changed, 333 insertions(+), 99 deletions(-) +Merging sound-asoc-fixes/for-linus (9be0b3a0074a ASoC: SOF: Intel: hda-mlink: fixes and extensions) +$ 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 +Already up to date. +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 (2bf1c45be3b8 regulator: Fix error checking for debugfs_create_dir) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus +Merge made by the 'ort' strategy. + drivers/regulator/core.c | 4 ++-- + drivers/regulator/pca9450-regulator.c | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) +Merging spi-fixes/for-linus (445164e8c136 spi: dw: Replace spi->chip_select references with function calls) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi-fixes/for-linus +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 1 - + drivers/spi/spi-cadence.c | 53 ++++++++++++++++++--------------------------- + drivers/spi/spi-dw-mmio.c | 8 +++---- + drivers/spi/spi-geni-qcom.c | 2 ++ + 4 files changed, 27 insertions(+), 37 deletions(-) +Merging pci-current/for-linus (3b8803494a06 PCI/DPC: Quirk PIO log size for Intel Ice Lake Root Ports) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci-current/for-linus +Merge made by the 'ort' strategy. + drivers/pci/quirks.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) +Merging driver-core.current/driver-core-linus (f1fcbaa18b28 Linux 6.4-rc2) +$ 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 (8fb9ea65c9d1 vc_screen: reload load of struct vc_data pointer in vcs_write() to avoid UAF) +$ git merge -m Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty.current/tty-linus +Merge made by the 'ort' strategy. + drivers/tty/serial/8250/8250_bcm7271.c | 7 +++++-- + drivers/tty/serial/8250/8250_exar.c | 17 +++++++++++++++++ + drivers/tty/serial/8250/8250_pci.c | 5 +++++ + drivers/tty/serial/8250/8250_port.c | 1 + + drivers/tty/serial/arc_uart.c | 7 ++++--- + drivers/tty/serial/qcom_geni_serial.c | 9 ++++----- + drivers/tty/vt/vc_screen.c | 11 +++++++++-- + 7 files changed, 45 insertions(+), 12 deletions(-) +Merging usb.current/usb-linus (1e94be78ec15 Merge tag 'thunderbolt-for-v6.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt into usb-linus) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus +Merge made by the 'ort' strategy. + drivers/thunderbolt/nhi.c | 29 ++++- + drivers/thunderbolt/nhi_regs.h | 2 + + drivers/usb/class/usbtmc.c | 2 + + drivers/usb/dwc3/core.c | 2 +- + drivers/usb/dwc3/core.h | 2 + + drivers/usb/dwc3/debugfs.c | 109 ++++++++++++++++++ + drivers/usb/dwc3/gadget.c | 79 +++++++------ + drivers/usb/gadget/function/u_ether.c | 3 + + drivers/usb/gadget/udc/core.c | 187 ++++++++++--------------------- + drivers/usb/host/uhci-pci.c | 10 +- + drivers/usb/host/xhci-pci.c | 12 +- + drivers/usb/host/xhci-ring.c | 29 ++++- + drivers/usb/host/xhci.h | 2 +- + drivers/usb/storage/scsiglue.c | 28 +++-- + drivers/usb/typec/altmodes/displayport.c | 4 + + drivers/usb/typec/tipd/core.c | 3 + + include/linux/usb/composite.h | 2 +- + 17 files changed, 324 insertions(+), 181 deletions(-) +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 (2a881183dc5a phy: qcom-snps: correct struct qcom_snps_hsphy kerneldoc) +$ 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/amlogic/phy-meson-g12a-mipi-dphy-analog.c | 2 +- + drivers/phy/mediatek/phy-mtk-hdmi-mt8195.c | 10 +++++----- + drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 5 +++-- + drivers/phy/qualcomm/phy-qcom-qmp-pcie-msm8996.c | 5 +++-- + drivers/phy/qualcomm/phy-qcom-snps-femto-v2.c | 2 +- + 5 files changed, 13 insertions(+), 11 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 (55720d242052 dt-bindings: iio: adc: renesas,rcar-gyroadc: Fix adi,ad7476 compatible value) +$ 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 +++ + .../bindings/iio/adc/renesas,rcar-gyroadc.yaml | 2 +- + drivers/iio/accel/kionix-kx022a.c | 2 +- + 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/dac/Makefile | 2 +- + drivers/iio/dac/mcp4725.c | 16 +++++- + drivers/iio/industrialio-gts-helper.c | 42 +++++++++++---- + drivers/iio/light/rohm-bu27034.c | 26 ++++++--- + drivers/iio/light/vcnl4035.c | 3 ++ + drivers/iio/magnetometer/tmag5273.c | 5 +- + include/linux/iio/iio-gts-helper.h | 2 +- + 19 files changed, 195 insertions(+), 79 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 (0fa53349c3ac binder: add lockless binder_alloc_(set|get)_vma()) +$ 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 +Merge made by the 'ort' strategy. + drivers/android/binder.c | 28 +++++++++--- + drivers/android/binder_alloc.c | 58 +++++++++++------------- + drivers/android/binder_alloc.h | 4 +- + drivers/android/binder_alloc_selftest.c | 2 +- + drivers/hwtracing/coresight/coresight-etm-perf.c | 1 + + drivers/hwtracing/coresight/coresight-tmc-etr.c | 2 +- + 6 files changed, 52 insertions(+), 43 deletions(-) +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 +Already up to date. +Merging input-current/for-linus (7b63a88bb62b Input: psmouse - fix OOB access in Elantech protocol) +$ 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/misc/soc_button_array.c | 30 ++++++++++++++++++++++++++++++ + drivers/input/mouse/elantech.c | 9 +++++---- + drivers/input/touchscreen/cyttsp5.c | 2 +- + 4 files changed, 37 insertions(+), 6 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 (dbcf76390eb9 selftests/ftrace: Improve integration with kselftest runner) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest-fixes/fixes +Already up to date. +Merging modules-fixes/modules-linus (f412eef03938 Documentation: livepatch: module-elf-format: Remove local klp_modinfo definition) +$ git merge -m Merge branch 'modules-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules-fixes/modules-linus +Already up to date. +Merging dmaengine-fixes/fixes (38de368a6636 dmaengine: ti: k3-udma: annotate pm function with __maybe_unused) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine-fixes/fixes +Merge made by the 'ort' strategy. + drivers/dma/idxd/cdev.c | 1 - + drivers/dma/ti/k3-udma.c | 4 ++-- + 2 files changed, 2 insertions(+), 3 deletions(-) +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 (280a8ab81733 media: dvb-core: Fix use-after-free due to race condition at dvb_ca_en50221) +$ git merge -m Merge branch 'fixes' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-fixes/fixes +Merge made by the 'ort' strategy. + drivers/media/dvb-core/dvb_ca_en50221.c | 49 +++++++++++-- + drivers/media/dvb-core/dvb_demux.c | 4 +- + drivers/media/dvb-core/dvb_frontend.c | 69 ++++++++++++++---- + drivers/media/dvb-core/dvb_net.c | 38 +++++++++- + drivers/media/dvb-core/dvbdev.c | 84 ++++++++++++++++------ + drivers/media/dvb-frontends/mn88443x.c | 2 +- + drivers/media/pci/netup_unidvb/netup_unidvb_core.c | 19 ++--- + drivers/media/usb/dvb-usb-v2/ce6230.c | 8 +++ + drivers/media/usb/dvb-usb-v2/ec168.c | 12 ++++ + drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 20 ++++++ + drivers/media/usb/dvb-usb/az6027.c | 12 ++++ + drivers/media/usb/dvb-usb/digitv.c | 4 ++ + drivers/media/usb/dvb-usb/dw2102.c | 2 +- + drivers/media/usb/pvrusb2/Kconfig | 1 + + drivers/media/usb/ttusb-dec/ttusb_dec.c | 3 +- + include/media/dvb_frontend.h | 6 +- + include/media/dvb_net.h | 4 ++ + include/media/dvbdev.h | 15 ++++ + 18 files changed, 293 insertions(+), 59 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 (39428f6ea9ea Merge tag 'kvmarm-fixes-6.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm-fixes/master +Merge made by the 'ort' strategy. + arch/arm64/include/asm/cputype.h | 8 +++++++ + 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/vgic/vgic-v3.c | 4 ++++ + arch/arm64/kvm/vmid.c | 7 +++--- + 8 files changed, 76 insertions(+), 25 deletions(-) +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 (764d102ef94e cxl: Add missing return to cdat read error path) +$ 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 (7f6d8752b79e 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/block-group.c | 14 ++++++++++++-- + fs/btrfs/disk-io.c | 9 +++++++++ + fs/btrfs/file-item.c | 4 +++- + fs/btrfs/scrub.c | 9 ++++++++- + 4 files changed, 32 insertions(+), 4 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 (95e4b25192e9 platform/mellanox: mlxbf-pmc: fix sscanf() error checking) +$ 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-pmc.c | 5 ++--- + drivers/platform/x86/amd/pmf/core.c | 34 ++++++++++++++++++++++++++-------- + drivers/platform/x86/asus-nb-wmi.c | 2 ++ + 3 files changed, 30 insertions(+), 11 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 +Already up to date. +Merging scsi-fixes/fixes (09e797c8641f scsi: core: Decrease scsi_device's iorequest_cnt if dispatch failed) +$ 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/scsi/scsi_lib.c | 5 ++++- + drivers/scsi/storvsc_drv.c | 8 ++++---- + drivers/ufs/core/ufs-mcq.c | 5 +++-- + drivers/ufs/core/ufshcd.c | 10 +++++----- + include/ufs/ufshcd.h | 2 +- + 5 files changed, 17 insertions(+), 13 deletions(-) +Merging drm-fixes/drm-fixes (f1fcbaa18b28 Linux 6.4-rc2) +$ 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 (5896f2d363d5 drm/i915/hdcp: Check if media_gt exists) +$ 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_hdcp.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 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 (3b90b09af5be riscv: Fix orphan section warnings caused by kernel/pi) +$ 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 (3c66c757bfb1 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 +CONFLICT (content): Merge conflict in MAINTAINERS +Resolved 'MAINTAINERS' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 14beccf3fc00] Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git +$ git diff -M --stat --summary HEAD^.. + 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 (7dd3d9bd873f gpiolib: fix allocation of mixed dynamic/static GPIOs) +$ 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 +Merge made by the 'ort' strategy. + drivers/gpio/gpio-mockup.c | 2 +- + drivers/gpio/gpiolib.c | 2 ++ + tools/gpio/lsgpio.c | 2 +- + tools/testing/selftests/gpio/gpio-sim.sh | 3 +++ + 4 files changed, 7 insertions(+), 2 deletions(-) +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 (f1fcbaa18b28 Linux 6.4-rc2) +$ 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 (ae0bac799263 erofs: avoid pcpubuf.c inclusion if CONFIG_EROFS_FS_ZIP is off) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs-fixes/fixes +Merge made by the 'ort' strategy. + fs/erofs/Makefile | 4 ++-- + fs/erofs/internal.h | 13 +++++++------ + fs/erofs/xattr.c | 2 +- + 3 files changed, 10 insertions(+), 9 deletions(-) +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 (8ae72e5fd95a nfsd: make a copy of struct iattr before calling notify_change) +$ git merge -m Merge branch 'nfsd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd-fixes/nfsd-fixes +Merge made by the 'ort' strategy. + fs/nfsd/vfs.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) +Merging irqchip-fixes/irq/irqchip-fixes (cddb536a73ef irqchip/mbigen: Unify the error handling in mbigen_of_create_domain()) +$ git merge -m Merge branch 'irq/irqchip-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git irqchip-fixes/irq/irqchip-fixes +Merge made by the 'ort' strategy. + .../bindings/interrupt-controller/arm,gic-v3.yaml | 6 ++++ + drivers/irqchip/irq-gic-common.c | 8 ++++-- + drivers/irqchip/irq-gic-common.h | 1 + + drivers/irqchip/irq-gic-v3.c | 20 ++++++++++++++ + drivers/irqchip/irq-mbigen.c | 31 ++++++++++++--------- + drivers/irqchip/irq-meson-gpio.c | 2 +- + drivers/irqchip/irq-mips-gic.c | 32 ++++++++++++---------- + 7 files changed, 69 insertions(+), 31 deletions(-) +Merging renesas-fixes/fixes (ab2866f12ca1 arm64: dts: renesas: r8a779g0: Fix HSCIF0 interrupt number) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas-fixes/fixes +Already up to date. +Merging broadcom-fixes/fixes (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'fixes' of https://github.com/Broadcom/stblinux.git broadcom-fixes/fixes +Already up to date. +Merging perf-current/perf/urgent (1b5f159ce875 tools headers disabled-features: Sync with the kernel sources) +$ git merge -m Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git perf-current/perf/urgent +Merge made by the 'ort' strategy. + tools/arch/arm64/include/uapi/asm/kvm.h | 36 ++++++++++++++ + tools/arch/x86/include/asm/cpufeatures.h | 26 ++++++++-- + tools/arch/x86/include/asm/disabled-features.h | 8 ++- + tools/arch/x86/include/asm/msr-index.h | 2 + + tools/arch/x86/include/uapi/asm/kvm.h | 3 ++ + tools/arch/x86/include/uapi/asm/prctl.h | 8 +++ + tools/arch/x86/lib/memcpy_64.S | 34 ++++--------- + tools/arch/x86/lib/memset_64.S | 47 +++++------------- + tools/include/asm/alternative.h | 3 +- + tools/include/uapi/drm/drm.h | 57 +++++++++++++++++++++- + tools/include/uapi/drm/i915_drm.h | 25 +++++++++- + tools/include/uapi/linux/const.h | 2 +- + tools/include/uapi/linux/in.h | 1 + + tools/include/uapi/linux/kvm.h | 12 ++++- + tools/include/uapi/linux/prctl.h | 2 + + tools/include/uapi/sound/asound.h | 14 ++++-- + tools/perf/Makefile.config | 6 +++ + tools/perf/Makefile.perf | 22 ++++++++- + tools/perf/arch/arm/util/cs-etm.c | 9 ++-- + tools/perf/arch/arm64/util/header.c | 4 +- + tools/perf/arch/arm64/util/pmu.c | 2 +- + tools/perf/arch/s390/entry/syscalls/syscall.tbl | 2 +- + tools/perf/bench/mem-memcpy-x86-64-asm-def.h | 4 -- + tools/perf/bench/mem-memcpy-x86-64-asm.S | 2 +- + tools/perf/bench/mem-memset-x86-64-asm-def.h | 4 -- + tools/perf/bench/mem-memset-x86-64-asm.S | 2 +- + tools/perf/builtin-script.c | 7 +++ + tools/perf/builtin-stat.c | 38 +++++++++++---- + .../pmu-events/arch/x86/alderlake/adl-metrics.json | 26 ++++++++++ + .../arch/x86/alderlaken/adln-metrics.json | 14 ++++++ + .../pmu-events/arch/x86/broadwell/bdw-metrics.json | 12 +++++ + .../arch/x86/broadwellde/bdwde-metrics.json | 12 +++++ + .../arch/x86/broadwellx/bdx-metrics.json | 12 +++++ + .../arch/x86/cascadelakex/clx-metrics.json | 12 +++++ + .../pmu-events/arch/x86/haswell/hsw-metrics.json | 12 +++++ + .../pmu-events/arch/x86/haswellx/hsx-metrics.json | 12 +++++ + .../pmu-events/arch/x86/icelake/icl-metrics.json | 12 +++++ + .../pmu-events/arch/x86/icelakex/icx-metrics.json | 12 +++++ + .../pmu-events/arch/x86/ivybridge/ivb-metrics.json | 12 +++++ + .../pmu-events/arch/x86/ivytown/ivt-metrics.json | 12 +++++ + .../pmu-events/arch/x86/jaketown/jkt-metrics.json | 12 +++++ + .../arch/x86/sandybridge/snb-metrics.json | 12 +++++ + .../arch/x86/sapphirerapids/spr-metrics.json | 12 +++++ + .../pmu-events/arch/x86/skylake/skl-metrics.json | 12 +++++ + .../pmu-events/arch/x86/skylakex/skx-metrics.json | 12 +++++ + .../pmu-events/arch/x86/tigerlake/tgl-metrics.json | 12 +++++ + tools/perf/pmu-events/jevents.py | 4 +- + tools/perf/pmu-events/pmu-events.h | 1 + + tools/perf/tests/expr.c | 3 +- + tools/perf/tests/parse-metric.c | 1 + + tools/perf/tests/shell/stat.sh | 13 +++++ + tools/perf/tests/shell/test_intel_pt.sh | 7 +++ + tools/perf/tests/shell/test_java_symbol.sh | 2 +- + tools/perf/trace/beauty/arch_prctl.c | 2 + + tools/perf/trace/beauty/x86_arch_prctl.sh | 1 + + tools/perf/util/bpf_skel/lock_contention.bpf.c | 2 + + tools/perf/util/bpf_skel/vmlinux.h | 1 + + tools/perf/util/evsel.c | 37 +++++++++----- + tools/perf/util/evsel.h | 1 + + tools/perf/util/expr.y | 6 ++- + tools/perf/util/metricgroup.c | 10 ++-- + tools/perf/util/parse-events.c | 23 ++++++--- + tools/perf/util/stat-display.c | 2 +- + tools/perf/util/stat-shadow.c | 25 +++++++--- + 64 files changed, 610 insertions(+), 145 deletions(-) +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 (95339f40a8b6 power: supply: Fix logic checking if system is running from battery) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery-fixes/fixes +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/mt6360_charger.c | 4 +- + drivers/power/supply/power_supply_core.c | 15 ++- + drivers/power/supply/power_supply_leds.c | 5 +- + drivers/power/supply/power_supply_sysfs.c | 3 +- + drivers/power/supply/rt9467-charger.c | 2 +- + drivers/power/supply/sbs-charger.c | 2 +- + drivers/power/supply/sc27xx_fuel_gauge.c | 9 +- + include/linux/power/bq27xxx_battery.h | 4 + + 15 files changed, 136 insertions(+), 112 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 (f1fcbaa18b28 Linux 6.4-rc2) +$ 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 (1aa7f4161756 drm: panel-orientation-quirks: Change Air's quirk to support Air Plus) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm/drm-misc drm-misc-fixes/for-linux-next-fixes +Merge made by the 'ort' strategy. + drivers/accel/qaic/qaic_drv.c | 2 +- + drivers/gpu/drm/drm_panel_orientation_quirks.c | 2 +- + drivers/gpu/drm/mgag200/mgag200_mode.c | 5 +++++ + drivers/gpu/drm/pl111/pl111_display.c | 2 +- + drivers/gpu/drm/pl111/pl111_drm.h | 4 ++-- + drivers/gpu/drm/pl111/pl111_drv.c | 8 ++++---- + drivers/gpu/drm/pl111/pl111_versatile.c | 10 +++++----- + 7 files changed, 19 insertions(+), 14 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 (88b7d333e56b Merge branch 'mm-nonmm-unstable' into mm-everything) +$ git merge -m Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm/mm-everything +Auto-merging MAINTAINERS +Auto-merging arch/arm64/kernel/mte.c +Auto-merging arch/arm64/mm/fault.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 2 +- + MAINTAINERS | 7 + + arch/alpha/kernel/syscalls/syscall.tbl | 1 + + arch/arm/tools/syscall.tbl | 1 + + arch/arm64/include/asm/unistd.h | 2 +- + arch/arm64/include/asm/unistd32.h | 2 + + arch/arm64/kernel/mte.c | 17 +- + arch/arm64/kernel/traps.c | 2 +- + arch/arm64/mm/fault.c | 2 +- + arch/arm64/mm/init.c | 2 - + arch/ia64/kernel/syscalls/syscall.tbl | 1 + + arch/m68k/kernel/syscalls/syscall.tbl | 1 + + arch/microblaze/kernel/syscalls/syscall.tbl | 1 + + arch/mips/include/asm/fw/cfe/cfe_api.h | 3 - + arch/mips/kernel/syscalls/syscall_n32.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n64.tbl | 1 + + arch/mips/kernel/syscalls/syscall_o32.tbl | 1 + + arch/parisc/kernel/syscalls/syscall.tbl | 1 + + arch/powerpc/kernel/syscalls/syscall.tbl | 1 + + arch/powerpc/mm/book3s64/iommu_api.c | 2 +- + arch/s390/kernel/syscalls/syscall.tbl | 1 + + arch/s390/kvm/interrupt.c | 2 +- + arch/sh/kernel/syscalls/syscall.tbl | 1 + + arch/sparc/kernel/syscalls/syscall.tbl | 1 + + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + arch/x86/kernel/cpu/sgx/ioctl.c | 2 +- + arch/xtensa/kernel/syscalls/syscall.tbl | 1 + + drivers/dma-buf/heaps/system_heap.c | 5 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 2 +- + drivers/infiniband/hw/qib/qib_user_pages.c | 2 +- + drivers/infiniband/hw/usnic/usnic_uiom.c | 2 +- + drivers/infiniband/sw/siw/siw_mem.c | 2 +- + drivers/iommu/iommufd/pages.c | 4 +- + drivers/media/v4l2-core/videobuf-dma-sg.c | 2 +- + drivers/misc/sgi-gru/grufault.c | 2 +- + drivers/vdpa/vdpa_user/vduse_dev.c | 2 +- + drivers/vfio/vfio_iommu_type1.c | 2 +- + drivers/vhost/vdpa.c | 2 +- + fs/exec.c | 2 +- + fs/fs-writeback.c | 16 +- + fs/hugetlbfs/inode.c | 5 +- + fs/ntfs/mft.c | 38 +- + fs/proc/kcore.c | 2 +- + fs/proc/task_mmu.c | 12 +- + fs/squashfs/block.c | 115 +- + fs/squashfs/squashfs_fs_sb.h | 1 + + fs/squashfs/super.c | 12 + + include/linux/cgroup.h | 1 - + include/linux/dma-map-ops.h | 6 - + include/linux/fault-inject.h | 9 + + include/linux/gfp.h | 15 +- + include/linux/hugetlb.h | 23 +- + include/linux/kasan.h | 2 +- + include/linux/maple_tree.h | 130 ++- + include/linux/memcontrol.h | 5 - + include/linux/memory_hotplug.h | 3 - + include/linux/mm.h | 152 ++- + include/linux/mmdebug.h | 14 + + include/linux/mmzone.h | 21 - + include/linux/pagemap.h | 2 - + include/linux/stackdepot.h | 8 + + include/linux/suspend.h | 9 +- + include/linux/swap.h | 1 + + include/linux/syscalls.h | 5 + + include/linux/types.h | 1 + + include/uapi/asm-generic/unistd.h | 5 +- + include/uapi/linux/mman.h | 14 + + init/Kconfig | 10 + + io_uring/rsrc.c | 34 +- + kernel/cgroup/rstat.c | 26 +- + kernel/dma/Kconfig | 6 +- + kernel/dma/contiguous.c | 8 +- + kernel/events/uprobes.c | 13 +- + kernel/fork.c | 10 +- + kernel/kthread.c | 4 +- + kernel/power/main.c | 27 + + kernel/power/power.h | 5 + + kernel/power/snapshot.c | 52 + + kernel/sys_ni.c | 1 + + kernel/sysctl.c | 67 -- + kernel/trace/trace_events_user.c | 2 +- + lib/Kconfig.debug | 10 +- + lib/Makefile | 2 +- + lib/maple_tree.c | 1218 +++++++++++--------- + lib/show_mem.c | 37 - + lib/stackdepot.c | 128 +- + lib/test_maple_tree.c | 865 ++++++++++++-- + lib/zstd/common/zstd_deps.h | 18 - + mm/Makefile | 4 +- + mm/compaction.c | 72 +- + mm/debug.c | 9 + + mm/debug_page_alloc.c | 59 + + mm/dmapool.c | 10 +- + mm/fail_page_alloc.c | 66 ++ + mm/filemap.c | 201 +++- + mm/gup.c | 255 ++-- + mm/gup_test.c | 14 +- + mm/hugetlb.c | 24 +- + mm/hugetlb_vmemmap.c | 11 +- + mm/internal.h | 41 +- + mm/kasan/common.c | 2 +- + mm/kasan/generic.c | 72 +- + mm/kasan/kasan.h | 143 +-- + mm/kasan/report.c | 17 +- + mm/kasan/report_generic.c | 12 +- + mm/kasan/report_hw_tags.c | 2 +- + mm/kasan/report_sw_tags.c | 2 +- + mm/kasan/shadow.c | 36 +- + mm/kasan/sw_tags.c | 20 +- + mm/memcontrol.c | 192 ++- + mm/memory-failure.c | 11 +- + mm/memory.c | 20 +- + mm/memory_hotplug.c | 4 +- + mm/migrate.c | 159 +-- + mm/mm_init.c | 32 + + mm/mmap.c | 169 +-- + mm/oom_kill.c | 8 +- + mm/page_alloc.c | 848 +++----------- + mm/page_owner.c | 54 + + mm/process_vm_access.c | 2 +- + mm/rmap.c | 2 +- + mm/secretmem.c | 2 +- + mm/show_mem.c | 429 +++++++ + mm/swapfile.c | 1 + + mm/vmscan.c | 2 +- + mm/workingset.c | 148 ++- + mm/zsmalloc.c | 12 +- + net/xdp/xdp_umem.c | 2 +- + scripts/spelling.txt | 22 + + security/tomoyo/domain.c | 2 +- + tools/testing/radix-tree/linux/init.h | 1 + + tools/testing/radix-tree/maple.c | 160 +-- + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/cachestat/.gitignore | 2 + + tools/testing/selftests/cachestat/Makefile | 8 + + tools/testing/selftests/cachestat/test_cachestat.c | 269 +++++ + virt/kvm/async_pf.c | 3 +- + virt/kvm/kvm_main.c | 2 +- + 139 files changed, 4400 insertions(+), 2499 deletions(-) + delete mode 100644 lib/show_mem.c + create mode 100644 mm/debug_page_alloc.c + create mode 100644 mm/fail_page_alloc.c + create mode 100644 mm/show_mem.c + create mode 100644 tools/testing/selftests/cachestat/.gitignore + create mode 100644 tools/testing/selftests/cachestat/Makefile + create mode 100644 tools/testing/selftests/cachestat/test_cachestat.c +$ git am -3 ../patches/0001-fix-for-mm-page_owner-add-page_owner_stacks-file-to-.patch +Applying: fix for "mm, page_owner: add page_owner_stacks file to print out only stacks and their counte" +$ git reset HEAD^ +Unstaged changes after reset: +M include/linux/stackdepot.h +$ git add -A . +$ git commit -v -a --amend +[master 9852054c4d83] Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm + Date: Thu May 18 09:31:00 2023 +1000 +Merging kbuild/for-next (f1fcbaa18b28 Linux 6.4-rc2) +$ 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 (c0d68601cbce perf test: Add cputype testing to perf stat) +$ 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/util/metricgroup.c +Merge made by the 'ort' strategy. + tools/perf/Documentation/perf-script.txt | 2 +- + tools/perf/arch/common.c | 18 + + tools/perf/arch/x86/include/arch-tests.h | 1 + + tools/perf/arch/x86/tests/Build | 1 + + tools/perf/arch/x86/tests/arch-tests.c | 10 + + tools/perf/arch/x86/tests/hybrid.c | 287 +++++++ + tools/perf/arch/x86/util/evlist.c | 4 +- + tools/perf/builtin-list.c | 21 +- + tools/perf/builtin-record.c | 13 +- + tools/perf/builtin-script.c | 60 +- + tools/perf/builtin-stat.c | 43 +- + tools/perf/builtin-top.c | 5 +- + tools/perf/builtin-trace.c | 5 +- + .../pmu-events/arch/x86/alderlake/adl-metrics.json | 249 +++--- + .../arch/x86/alderlaken/adln-metrics.json | 6 +- + .../pmu-events/arch/x86/icelake/icl-metrics.json | 11 + + .../pmu-events/arch/x86/icelakex/icx-metrics.json | 11 + + .../arch/x86/sapphirerapids/spr-metrics.json | 11 + + .../pmu-events/arch/x86/tigerlake/tgl-metrics.json | 11 + + tools/perf/pmu-events/jevents.py | 8 +- + tools/perf/pmu-events/metric.py | 28 +- + tools/perf/pmu-events/metric_test.py | 6 +- + tools/perf/pmu-events/pmu-events.h | 1 + + tools/perf/tests/evsel-roundtrip-name.c | 121 ++- + tools/perf/tests/parse-events.c | 900 +++++++++++---------- + tools/perf/tests/pmu-events.c | 12 +- + tools/perf/tests/shell/stat.sh | 44 + + tools/perf/util/Build | 1 - + tools/perf/util/dso.c | 33 + + tools/perf/util/dso.h | 8 +- + tools/perf/util/evlist.h | 1 - + 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 + + tools/perf/util/metricgroup.c | 105 ++- + tools/perf/util/metricgroup.h | 3 +- + tools/perf/util/parse-events-hybrid.c | 214 ----- + tools/perf/util/parse-events-hybrid.h | 25 - + tools/perf/util/parse-events.c | 695 ++++++---------- + tools/perf/util/parse-events.h | 63 +- + tools/perf/util/parse-events.l | 108 +-- + tools/perf/util/parse-events.y | 232 +++--- + tools/perf/util/pmu-hybrid.c | 20 - + tools/perf/util/pmu-hybrid.h | 1 - + tools/perf/util/pmu.c | 16 +- + tools/perf/util/pmu.h | 3 + + tools/perf/util/pmus.c | 25 +- + tools/perf/util/pmus.h | 3 + + tools/perf/util/print-events.c | 125 +-- + tools/perf/util/setup.py | 4 + + 51 files changed, 1883 insertions(+), 1741 deletions(-) + create mode 100644 tools/perf/arch/x86/tests/hybrid.c + delete mode 100644 tools/perf/util/parse-events-hybrid.c + delete mode 100644 tools/perf/util/parse-events-hybrid.h +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 (f1fcbaa18b28 Linux 6.4-rc2) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git asm-generic/master +Already up to date. +Merging arc/for-next (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 (fc6750b0d4a9 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 (ac9a78681b92 Linux 6.4-rc1) +$ git merge -m Merge branch 'davinci/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git davinci/davinci/for-next +Already up to date. +Merging drivers-memory/for-next (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 (efdde75fee54 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. + Documentation/devicetree/bindings/arm/fsl.yaml | 13 + + .../devicetree/bindings/usb/cdns,usb3.yaml | 2 +- + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/imx23.dtsi | 2 +- + arch/arm/boot/dts/imx28-cfa10049.dts | 10 +- + arch/arm/boot/dts/imx28-cfa10055.dts | 6 +- + arch/arm/boot/dts/imx28-cfa10056.dts | 6 +- + arch/arm/boot/dts/imx28-tx28.dts | 6 +- + arch/arm/boot/dts/imx28.dtsi | 2 +- + arch/arm/boot/dts/imx51-zii-rdu1.dts | 8 +- + arch/arm/boot/dts/imx51-zii-scu2-mezz.dts | 2 +- + arch/arm/boot/dts/imx51-zii-scu3-esb.dts | 1 - + arch/arm/boot/dts/imx6qdl-gw5904.dtsi | 7 +- + arch/arm/boot/dts/imx6qdl-mba6.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl.dtsi | 2 +- + arch/arm/boot/dts/imx6sx.dtsi | 2 +- + arch/arm/boot/dts/imx6ul-14x14-evk.dtsi | 4 +- + arch/arm/boot/dts/imx6ul-tx6ul.dtsi | 6 +- + arch/arm/boot/dts/imx6ul.dtsi | 14 +- + arch/arm/boot/dts/imx6ull-dhcom-som.dtsi | 2 - + arch/arm/boot/dts/imx6ull-dhcor-maveo-box.dts | 359 +++++++++++++++++++++ + arch/arm/boot/dts/imx6ull-dhcor-som.dtsi | 12 + + arch/arm/boot/dts/imx7d-sdb.dts | 4 +- + arch/arm/boot/dts/imx7s.dtsi | 2 +- + arch/arm/boot/dts/imx7ulp.dtsi | 2 + + arch/arm/boot/dts/mba6ulx.dtsi | 4 + + arch/arm/boot/dts/vf610-zii-dev-rev-b.dts | 6 +- + arch/arm/configs/imx_v6_v7_defconfig | 2 - + arch/arm64/boot/dts/freescale/Makefile | 2 + + arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 1 + + arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 1 + + arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 1 + + arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi | 4 + + arch/arm64/boot/dts/freescale/fsl-ls2088a.dtsi | 4 + + arch/arm64/boot/dts/freescale/imx8-ss-conn.dtsi | 1 + + arch/arm64/boot/dts/freescale/imx8dxl.dtsi | 1 + + .../boot/dts/freescale/imx8mm-emtop-baseboard.dts | 15 + + .../arm64/boot/dts/freescale/imx8mm-emtop-som.dtsi | 261 +++++++++++++++ + arch/arm64/boot/dts/freescale/imx8mm-evkb.dts | 128 ++++++++ + .../dts/freescale/imx8mn-beacon-baseboard.dtsi | 66 ++++ + arch/arm64/boot/dts/freescale/imx8mn-var-som.dtsi | 14 +- + arch/arm64/boot/dts/freescale/imx8mn.dtsi | 88 ++++- + arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 80 +++++ + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 285 +++++++++++++++- + .../boot/dts/freescale/imx8mq-mnt-reform2.dts | 2 +- + .../arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx8ulp.dtsi | 1 + + .../boot/dts/freescale/imx8x-colibri-eval-v3.dtsi | 6 + + .../boot/dts/freescale/imx8x-colibri-iris.dtsi | 3 +- + arch/arm64/boot/dts/freescale/imx8x-colibri.dtsi | 14 +- + arch/arm64/boot/dts/freescale/imx93-11x11-evk.dts | 4 + + arch/arm64/boot/dts/freescale/imx93.dtsi | 128 ++++++-- + arch/arm64/configs/defconfig | 4 + + 55 files changed, 1495 insertions(+), 113 deletions(-) + create mode 100644 arch/arm/boot/dts/imx6ull-dhcor-maveo-box.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-emtop-baseboard.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-emtop-som.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-evkb.dts +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 (64687391f64d Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git mvebu/for-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'ort' strategy. + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/armada-388-clearfog.dts | 7 +- + arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts | 4 +- + arch/arm/boot/dts/kirkwood-4i-edge-200.dts | 205 +++++++++++++++++++++ + arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi | 1 + + arch/arm64/boot/dts/marvell/armada-ap806-dual.dtsi | 1 + + arch/arm64/boot/dts/marvell/armada-ap806-quad.dtsi | 2 + + arch/arm64/boot/dts/marvell/armada-ap807-quad.dtsi | 2 + + 8 files changed, 220 insertions(+), 3 deletions(-) + create mode 100644 arch/arm/boot/dts/kirkwood-4i-edge-200.dts +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 (4272e06e19f3 Merge branches 'arm64-defconfig-for-6.5', 'arm64-fixes-for-6.4', 'arm64-for-6.5', 'drivers-fixes-for-6.4' and 'drivers-for-6.5' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git qcom/for-next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/qcom.yaml | 5 + + .../bindings/soc/qcom/qcom,aoss-qmp.yaml | 1 + + arch/arm64/boot/dts/qcom/Makefile | 1 + + arch/arm64/boot/dts/qcom/ipq9574.dtsi | 25 ++ + arch/arm64/boot/dts/qcom/sa8540p-ride.dts | 238 +++++++++++ + arch/arm64/boot/dts/qcom/sa8775p-pmics.dtsi | 23 +- + arch/arm64/boot/dts/qcom/sa8775p-ride.dts | 111 +++++ + arch/arm64/boot/dts/qcom/sa8775p.dtsi | 445 ++++++++++++++++++++- + arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 67 +++- + arch/arm64/boot/dts/qcom/sm6115-fxtec-pro1x.dts | 250 ++++++++++++ + arch/arm64/boot/dts/qcom/sm8150.dtsi | 9 +- + arch/arm64/configs/defconfig | 1 + + drivers/soc/qcom/icc-bwmon.c | 4 +- + drivers/soc/qcom/rpmh-rsc.c | 2 +- + 14 files changed, 1168 insertions(+), 14 deletions(-) + create mode 100644 arch/arm64/boot/dts/qcom/sm6115-fxtec-pro1x.dts +Merging renesas/next (21330625d0f5 Merge branches 'renesas-arm-defconfig-for-v6.5' and 'renesas-drivers-for-v6.5' into renesas-next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas/next +Merge made by the 'ort' strategy. + arch/arm/configs/shmobile_defconfig | 3 +- + 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 ++++++++ + drivers/soc/renesas/rcar-rst.c | 15 +- + 11 files changed, 574 insertions(+), 4 deletions(-) + 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 (e11ff0914d61 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 +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/rockchip.yaml | 13 + + .../devicetree/bindings/soc/rockchip/grf.yaml | 2 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + arch/arm64/boot/dts/rockchip/Makefile | 4 + + arch/arm64/boot/dts/rockchip/rk3308.dtsi | 1 + + .../boot/dts/rockchip/rk3328-nanopi-r2c-plus.dts | 33 ++ + arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 14 +- + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 1 + + .../boot/dts/rockchip/rk3566-anbernic-rg353ps.dts | 116 +++++ + .../boot/dts/rockchip/rk3566-anbernic-rgxx3.dtsi | 39 +- + .../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/rk3568-nanopi-r5c.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dts | 1 - + arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 88 ++++ + drivers/soc/rockchip/dtpm.c | 54 +-- + drivers/soc/rockchip/pm_domains.c | 160 +++++-- + 20 files changed, 1084 insertions(+), 116 deletions(-) + create mode 100644 arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2c-plus.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353ps.dts + 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 (5b248db78d1a Merge branch 'next/dt64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk/for-next +Merge made by the 'ort' strategy. + .../bindings/arm/samsung/samsung-boards.yaml | 10 + + .../bindings/clock/samsung,exynos-clock.yaml | 1 + + .../devicetree/bindings/media/s5p-mfc.txt | 78 --- + .../devicetree/bindings/media/samsung,s5p-mfc.yaml | 184 ++++++ + .../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 - + arch/arm64/boot/dts/exynos/exynos850.dtsi | 1 - + 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 | 15 +- + 29 files changed, 1135 insertions(+), 754 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/samsung,s5p-mfc.yaml + 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 + + .../arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts | 1 + + drivers/firmware/arm_ffa/bus.c | 21 ++++++++++++++++----- + drivers/firmware/arm_ffa/driver.c | 9 ++++++++- + drivers/firmware/arm_scmi/raw_mode.c | 2 +- + include/linux/arm_ffa.h | 1 + + 8 files changed, 30 insertions(+), 7 deletions(-) +Merging stm32/stm32-next (3b1583868691 ARM: dts: stm32: fix m4_rproc references to use SCMI for stm32mp15) +$ git merge -m Merge branch 'stm32-next' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/stm32/stm32.yaml | 6 + + arch/arm/boot/dts/Makefile | 3 +- + arch/arm/boot/dts/stm32f746.dtsi | 2 +- + arch/arm/boot/dts/stm32h750i-art-pi.dts | 2 +- + arch/arm/boot/dts/stm32mp15-pinctrl.dtsi | 231 +++++++++ + arch/arm/boot/dts/stm32mp151.dtsi | 5 +- + arch/arm/boot/dts/stm32mp157a-dk1-scmi.dts | 7 +- + arch/arm/boot/dts/stm32mp157a-stinger96.dtsi | 4 +- + arch/arm/boot/dts/stm32mp157c-dk2-scmi.dts | 7 +- + arch/arm/boot/dts/stm32mp157c-ed1-scmi.dts | 7 +- + arch/arm/boot/dts/stm32mp157c-ev1-scmi.dts | 7 +- + .../boot/dts/stm32mp157c-phycore-stm32mp1-3.dts | 60 +++ + .../dts/stm32mp157c-phycore-stm32mp15-som.dtsi | 577 +++++++++++++++++++++ + arch/arm/boot/dts/stm32mp15xx-dhcor-avenger96.dtsi | 8 +- + .../boot/dts/stm32mp15xx-dhcor-drc-compact.dtsi | 6 + + arch/arm/boot/dts/stm32mp15xx-dhcor-som.dtsi | 6 - + arch/arm/boot/dts/stm32mp15xx-dhcor-testbench.dtsi | 8 + + arch/arm/boot/dts/stm32mp15xx-dkx.dtsi | 10 +- + 18 files changed, 930 insertions(+), 26 deletions(-) + create mode 100644 arch/arm/boot/dts/stm32mp157c-phycore-stm32mp1-3.dts + create mode 100644 arch/arm/boot/dts/stm32mp157c-phycore-stm32mp15-som.dtsi +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 (86dfcfab4fe0 Merge branch 'optee_fix_async_notif_for-v6.3' 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. + drivers/tee/optee/smc_abi.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) +Merging tegra/for-next (d52733725601 Merge branch for-6.5/arm64/dt into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra/for-next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/tegra.yaml | 5 + + arch/arm64/boot/dts/nvidia/Makefile | 2 + + .../arm64/boot/dts/nvidia/tegra234-p3701-0008.dtsi | 111 ++++ + .../dts/nvidia/tegra234-p3740-0002+p3701-0008.dts | 154 ++++++ + .../arm64/boot/dts/nvidia/tegra234-p3740-0002.dtsi | 137 +++++ + arch/arm64/boot/dts/nvidia/tegra234.dtsi | 276 ++++++++++ + drivers/memory/tegra/mc.c | 24 + + drivers/memory/tegra/mc.h | 1 + + drivers/memory/tegra/tegra186-emc.c | 133 +++++ + drivers/memory/tegra/tegra234.c | 595 ++++++++++++++++++++- + drivers/pci/controller/dwc/pcie-tegra194.c | 44 +- + drivers/soc/tegra/fuse/tegra-apbmisc.c | 3 +- + include/dt-bindings/memory/tegra234-mc.h | 5 + + include/linux/tegra-icc.h | 65 +++ + include/soc/tegra/fuse.h | 3 +- + include/soc/tegra/mc.h | 8 + + 16 files changed, 1555 insertions(+), 11 deletions(-) + create mode 100644 arch/arm64/boot/dts/nvidia/tegra234-p3701-0008.dtsi + create mode 100644 arch/arm64/boot/dts/nvidia/tegra234-p3740-0002+p3701-0008.dts + create mode 100644 arch/arm64/boot/dts/nvidia/tegra234-p3740-0002.dtsi + create mode 100644 include/linux/tegra-icc.h +Merging ti/ti-next (6bb0b834e3c2 Merge branch 'ti-drivers-soc-next' into ti-next) +$ git merge -m Merge branch 'ti-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git ti/ti-next +Merge made by the 'ort' strategy. + arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts | 2 +- + arch/arm64/boot/dts/ti/k3-am62a7-sk.dts | 40 +++- + arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi | 27 ++- + arch/arm64/boot/dts/ti/k3-am64.dtsi | 16 -- + arch/arm64/boot/dts/ti/k3-am642-evm.dts | 56 ++++- + arch/arm64/boot/dts/ti/k3-am642-sk.dts | 40 +++- + arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi | 3 +- + arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 30 +-- + arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi | 7 +- + arch/arm64/boot/dts/ti/k3-am65.dtsi | 17 -- + arch/arm64/boot/dts/ti/k3-am654-base-board.dts | 57 ++++- + arch/arm64/boot/dts/ti/k3-am654.dtsi | 1 + + .../boot/dts/ti/k3-am6548-iot2050-advanced-m2.dts | 4 +- + .../boot/dts/ti/k3-j7200-common-proc-board.dts | 29 ++- + arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi | 6 +- + arch/arm64/boot/dts/ti/k3-j7200.dtsi | 1 + + .../boot/dts/ti/k3-j721e-common-proc-board.dts | 1 - + arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 4 +- + arch/arm64/boot/dts/ti/k3-j721e-sk.dts | 1 - + arch/arm64/boot/dts/ti/k3-j721e.dtsi | 1 + + .../boot/dts/ti/k3-j721s2-common-proc-board.dts | 1 - + arch/arm64/boot/dts/ti/k3-j721s2.dtsi | 1 + + drivers/remoteproc/pru_rproc.c | 15 -- + drivers/soc/ti/Kconfig | 2 +- + drivers/soc/ti/pruss.c | 263 ++++++++++++++++++++- + drivers/soc/ti/pruss.h | 88 +++++++ + drivers/soc/ti/smartreflex.c | 4 +- + include/linux/pruss_driver.h | 123 ++++++++++ + 28 files changed, 706 insertions(+), 134 deletions(-) + create mode 100644 drivers/soc/ti/pruss.h +Merging xilinx/for-next (12ac543351cc Merge branch 'zynqmp/dt' 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/arm/xilinx.yaml | 6 +- + .../devicetree/bindings/gpu/arm,mali-utgard.yaml | 1 + + arch/arm/boot/dts/zynq-7000.dtsi | 2 + + arch/arm/boot/dts/zynq-zc702.dts | 19 ++- + arch/arm64/boot/dts/xilinx/Makefile | 18 +-- + arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi | 19 ++- + .../boot/dts/xilinx/zynqmp-sck-kv-g-revA.dtso | 12 +- + .../boot/dts/xilinx/zynqmp-sck-kv-g-revB.dtso | 12 +- + arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts | 168 ++++++++++++++++++++- + .../boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts | 3 + + .../boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts | 2 - + .../boot/dts/xilinx/zynqmp-zc1751-xm018-dc4.dts | 4 + + arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts | 23 +++ + arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts | 16 ++ + arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts | 16 ++ + arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts | 16 ++ + arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts | 4 + + arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts | 4 + + ...qmp-zc1275-revA.dts => zynqmp-zcu1275-revA.dts} | 4 +- + arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 34 ++++- + drivers/firmware/xilinx/zynqmp.c | 12 +- + drivers/soc/xilinx/xlnx_event_manager.c | 6 +- + drivers/soc/xilinx/zynqmp_power.c | 4 +- + 23 files changed, 366 insertions(+), 39 deletions(-) + rename arch/arm64/boot/dts/xilinx/{zynqmp-zc1275-revA.dts => zynqmp-zcu1275-revA.dts} (87%) +Merging clk/clk-next (be2033a8660c Merge branch 'clk-i2cid' into clk-next) +$ git merge -m Merge branch 'clk-next' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk/clk-next +Merge made by the 'ort' strategy. + drivers/clk/clk-cdce706.c | 2 +- + drivers/clk/clk-cdce925.c | 2 +- + drivers/clk/clk-cs2000-cp.c | 2 +- + drivers/clk/clk-max9485.c | 2 +- + drivers/clk/clk-renesas-pcie.c | 6 +++--- + drivers/clk/clk-si514.c | 2 +- + drivers/clk/clk-si5341.c | 2 +- + drivers/clk/clk-si5351.c | 2 +- + drivers/clk/clk-si544.c | 2 +- + drivers/clk/clk-si570.c | 2 +- + drivers/clk/clk-versaclock5.c | 18 +++++++++--------- + drivers/clk/clk-versaclock7.c | 4 ++-- + drivers/clk/mediatek/Kconfig | 12 ++++++++++++ + drivers/clk/mediatek/clk-mt2701-aud.c | 6 +++--- + drivers/clk/mediatek/clk-mt2701-bdp.c | 2 +- + drivers/clk/mediatek/clk-mt2701-eth.c | 2 +- + drivers/clk/mediatek/clk-mt2701-g3d.c | 2 +- + drivers/clk/mediatek/clk-mt2701-hif.c | 2 +- + drivers/clk/mediatek/clk-mt2701-img.c | 2 +- + drivers/clk/mediatek/clk-mt2701-mm.c | 2 +- + drivers/clk/mediatek/clk-mt2701-vdec.c | 2 +- + drivers/clk/mediatek/clk-mt2712-apmixedsys.c | 6 ++---- + drivers/clk/mediatek/clk-mt2712-bdp.c | 2 +- + drivers/clk/mediatek/clk-mt2712-img.c | 2 +- + drivers/clk/mediatek/clk-mt2712-jpgdec.c | 2 +- + drivers/clk/mediatek/clk-mt2712-mfg.c | 2 +- + drivers/clk/mediatek/clk-mt2712-mm.c | 2 +- + drivers/clk/mediatek/clk-mt2712-vdec.c | 2 +- + drivers/clk/mediatek/clk-mt2712-venc.c | 2 +- + drivers/clk/mediatek/clk-mt2712.c | 2 +- + drivers/clk/mediatek/clk-mt6765-audio.c | 2 +- + drivers/clk/mediatek/clk-mt6765-cam.c | 2 +- + drivers/clk/mediatek/clk-mt6765-img.c | 2 +- + drivers/clk/mediatek/clk-mt6765-mipi0a.c | 2 +- + drivers/clk/mediatek/clk-mt6765-mm.c | 2 +- + drivers/clk/mediatek/clk-mt6765-vcodec.c | 2 +- + drivers/clk/mediatek/clk-mt6779-aud.c | 2 +- + drivers/clk/mediatek/clk-mt6779-cam.c | 2 +- + drivers/clk/mediatek/clk-mt6779-img.c | 2 +- + drivers/clk/mediatek/clk-mt6779-ipe.c | 2 +- + drivers/clk/mediatek/clk-mt6779-mfg.c | 2 +- + drivers/clk/mediatek/clk-mt6779-mm.c | 2 +- + drivers/clk/mediatek/clk-mt6779-vdec.c | 2 +- + drivers/clk/mediatek/clk-mt6779-venc.c | 2 +- + drivers/clk/mediatek/clk-mt6779.c | 2 +- + drivers/clk/mediatek/clk-mt6795-apmixedsys.c | 6 ++---- + drivers/clk/mediatek/clk-mt6795-infracfg.c | 6 ++---- + drivers/clk/mediatek/clk-mt6795-mfg.c | 2 +- + drivers/clk/mediatek/clk-mt6795-mm.c | 2 +- + drivers/clk/mediatek/clk-mt6795-pericfg.c | 6 ++---- + drivers/clk/mediatek/clk-mt6795-topckgen.c | 2 +- + drivers/clk/mediatek/clk-mt6795-vdecsys.c | 2 +- + drivers/clk/mediatek/clk-mt6795-vencsys.c | 2 +- + drivers/clk/mediatek/clk-mt6797-img.c | 2 +- + drivers/clk/mediatek/clk-mt6797-mm.c | 2 +- + drivers/clk/mediatek/clk-mt6797-vdec.c | 2 +- + drivers/clk/mediatek/clk-mt6797-venc.c | 2 +- + drivers/clk/mediatek/clk-mt7622-apmixedsys.c | 6 ++---- + drivers/clk/mediatek/clk-mt7622-aud.c | 6 +++--- + drivers/clk/mediatek/clk-mt7622-eth.c | 2 +- + drivers/clk/mediatek/clk-mt7622-hif.c | 2 +- + drivers/clk/mediatek/clk-mt7622-infracfg.c | 6 ++---- + drivers/clk/mediatek/clk-mt7622.c | 2 +- + drivers/clk/mediatek/clk-mt7629-hif.c | 2 +- + drivers/clk/mediatek/clk-mt7981-eth.c | 2 +- + drivers/clk/mediatek/clk-mt7981-infracfg.c | 2 +- + drivers/clk/mediatek/clk-mt7981-topckgen.c | 2 +- + drivers/clk/mediatek/clk-mt7986-eth.c | 2 +- + drivers/clk/mediatek/clk-mt7986-infracfg.c | 2 +- + drivers/clk/mediatek/clk-mt7986-topckgen.c | 2 +- + drivers/clk/mediatek/clk-mt8135-apmixedsys.c | 6 ++---- + drivers/clk/mediatek/clk-mt8135.c | 2 +- + drivers/clk/mediatek/clk-mt8167-aud.c | 2 +- + drivers/clk/mediatek/clk-mt8167-img.c | 2 +- + drivers/clk/mediatek/clk-mt8167-mfgcfg.c | 2 +- + drivers/clk/mediatek/clk-mt8167-mm.c | 2 +- + drivers/clk/mediatek/clk-mt8167-vdec.c | 2 +- + drivers/clk/mediatek/clk-mt8167.c | 2 +- + drivers/clk/mediatek/clk-mt8173-apmixedsys.c | 6 ++---- + drivers/clk/mediatek/clk-mt8173-img.c | 2 +- + drivers/clk/mediatek/clk-mt8173-infracfg.c | 6 ++---- + drivers/clk/mediatek/clk-mt8173-mm.c | 2 +- + drivers/clk/mediatek/clk-mt8173-pericfg.c | 2 +- + drivers/clk/mediatek/clk-mt8173-topckgen.c | 2 +- + drivers/clk/mediatek/clk-mt8173-vdecsys.c | 2 +- + drivers/clk/mediatek/clk-mt8173-vencsys.c | 2 +- + drivers/clk/mediatek/clk-mt8183-audio.c | 6 +++--- + drivers/clk/mediatek/clk-mt8183-cam.c | 2 +- + drivers/clk/mediatek/clk-mt8183-img.c | 2 +- + drivers/clk/mediatek/clk-mt8183-ipu0.c | 2 +- + drivers/clk/mediatek/clk-mt8183-ipu1.c | 2 +- + drivers/clk/mediatek/clk-mt8183-ipu_adl.c | 2 +- + drivers/clk/mediatek/clk-mt8183-ipu_conn.c | 2 +- + drivers/clk/mediatek/clk-mt8183-mfgcfg.c | 2 +- + drivers/clk/mediatek/clk-mt8183-mm.c | 2 +- + drivers/clk/mediatek/clk-mt8183-vdec.c | 2 +- + drivers/clk/mediatek/clk-mt8183-venc.c | 2 +- + drivers/clk/mediatek/clk-mt8183.c | 2 +- + drivers/clk/mediatek/clk-mt8186-apmixedsys.c | 6 ++---- + drivers/clk/mediatek/clk-mt8186-cam.c | 2 +- + drivers/clk/mediatek/clk-mt8186-img.c | 2 +- + drivers/clk/mediatek/clk-mt8186-imp_iic_wrap.c | 2 +- + drivers/clk/mediatek/clk-mt8186-infra_ao.c | 2 +- + drivers/clk/mediatek/clk-mt8186-ipe.c | 2 +- + drivers/clk/mediatek/clk-mt8186-mcu.c | 2 +- + drivers/clk/mediatek/clk-mt8186-mdp.c | 2 +- + drivers/clk/mediatek/clk-mt8186-mfg.c | 2 +- + drivers/clk/mediatek/clk-mt8186-mm.c | 2 +- + drivers/clk/mediatek/clk-mt8186-topckgen.c | 2 +- + drivers/clk/mediatek/clk-mt8186-vdec.c | 2 +- + drivers/clk/mediatek/clk-mt8186-venc.c | 2 +- + drivers/clk/mediatek/clk-mt8186-wpe.c | 2 +- + drivers/clk/mediatek/clk-mt8188-adsp_audio26m.c | 2 +- + drivers/clk/mediatek/clk-mt8188-apmixedsys.c | 6 ++---- + drivers/clk/mediatek/clk-mt8188-cam.c | 2 +- + drivers/clk/mediatek/clk-mt8188-ccu.c | 2 +- + drivers/clk/mediatek/clk-mt8188-img.c | 2 +- + drivers/clk/mediatek/clk-mt8188-imp_iic_wrap.c | 2 +- + drivers/clk/mediatek/clk-mt8188-infra_ao.c | 2 +- + drivers/clk/mediatek/clk-mt8188-ipe.c | 2 +- + drivers/clk/mediatek/clk-mt8188-mfg.c | 2 +- + drivers/clk/mediatek/clk-mt8188-peri_ao.c | 2 +- + drivers/clk/mediatek/clk-mt8188-topckgen.c | 6 ++---- + drivers/clk/mediatek/clk-mt8188-vdec.c | 2 +- + drivers/clk/mediatek/clk-mt8188-vdo0.c | 2 +- + drivers/clk/mediatek/clk-mt8188-vdo1.c | 2 +- + drivers/clk/mediatek/clk-mt8188-venc.c | 2 +- + drivers/clk/mediatek/clk-mt8188-vpp0.c | 2 +- + drivers/clk/mediatek/clk-mt8188-vpp1.c | 2 +- + drivers/clk/mediatek/clk-mt8188-wpe.c | 2 +- + drivers/clk/mediatek/clk-mt8192-apmixedsys.c | 6 ++---- + drivers/clk/mediatek/clk-mt8192-aud.c | 6 +++--- + drivers/clk/mediatek/clk-mt8192-cam.c | 2 +- + drivers/clk/mediatek/clk-mt8192-img.c | 2 +- + drivers/clk/mediatek/clk-mt8192-imp_iic_wrap.c | 2 +- + drivers/clk/mediatek/clk-mt8192-ipe.c | 2 +- + drivers/clk/mediatek/clk-mt8192-mdp.c | 2 +- + drivers/clk/mediatek/clk-mt8192-mfg.c | 2 +- + drivers/clk/mediatek/clk-mt8192-mm.c | 2 +- + drivers/clk/mediatek/clk-mt8192-msdc.c | 2 +- + drivers/clk/mediatek/clk-mt8192-scp_adsp.c | 2 +- + drivers/clk/mediatek/clk-mt8192-vdec.c | 2 +- + drivers/clk/mediatek/clk-mt8192-venc.c | 2 +- + drivers/clk/mediatek/clk-mt8192.c | 2 +- + drivers/clk/mediatek/clk-mt8195-apmixedsys.c | 6 ++---- + drivers/clk/mediatek/clk-mt8195-apusys_pll.c | 6 ++---- + drivers/clk/mediatek/clk-mt8195-cam.c | 2 +- + drivers/clk/mediatek/clk-mt8195-ccu.c | 2 +- + drivers/clk/mediatek/clk-mt8195-img.c | 2 +- + drivers/clk/mediatek/clk-mt8195-imp_iic_wrap.c | 2 +- + drivers/clk/mediatek/clk-mt8195-infra_ao.c | 2 +- + drivers/clk/mediatek/clk-mt8195-ipe.c | 2 +- + drivers/clk/mediatek/clk-mt8195-mfg.c | 2 +- + drivers/clk/mediatek/clk-mt8195-peri_ao.c | 2 +- + drivers/clk/mediatek/clk-mt8195-scp_adsp.c | 2 +- + drivers/clk/mediatek/clk-mt8195-topckgen.c | 6 ++---- + drivers/clk/mediatek/clk-mt8195-vdec.c | 2 +- + drivers/clk/mediatek/clk-mt8195-vdo0.c | 2 +- + drivers/clk/mediatek/clk-mt8195-vdo1.c | 2 +- + drivers/clk/mediatek/clk-mt8195-venc.c | 2 +- + drivers/clk/mediatek/clk-mt8195-vpp0.c | 2 +- + drivers/clk/mediatek/clk-mt8195-vpp1.c | 2 +- + drivers/clk/mediatek/clk-mt8195-wpe.c | 2 +- + drivers/clk/mediatek/clk-mt8365-apu.c | 2 +- + drivers/clk/mediatek/clk-mt8365-cam.c | 2 +- + drivers/clk/mediatek/clk-mt8365-mfg.c | 2 +- + drivers/clk/mediatek/clk-mt8365-mm.c | 2 +- + drivers/clk/mediatek/clk-mt8365-vdec.c | 2 +- + drivers/clk/mediatek/clk-mt8365-venc.c | 2 +- + drivers/clk/mediatek/clk-mt8365.c | 2 +- + drivers/clk/mediatek/clk-mt8516-aud.c | 2 +- + drivers/clk/mediatek/clk-mt8516.c | 2 +- + drivers/clk/mediatek/clk-mtk.c | 12 +++++------- + drivers/clk/mediatek/clk-mtk.h | 4 ++-- + 174 files changed, 225 insertions(+), 247 deletions(-) +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 (ac9a78681b92 Linux 6.4-rc1) +$ 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 (f1fcbaa18b28 Linux 6.4-rc2) +$ 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 (4decdb267a47 nubus: Remove proc entries before adding them) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k/for-next +Merge made by the 'ort' strategy. + drivers/nubus/proc.c | 25 ++++++++++++++++++++----- + 1 file changed, 20 insertions(+), 5 deletions(-) +Merging m68knommu/for-next (f1fcbaa18b28 Linux 6.4-rc2) +$ 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 (7ee7b97c4007 parisc: Flush gatt writes and adjust gatt mask in parisc_agp_mask_memory()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git parisc-hd/for-next +Merge made by the 'ort' strategy. + arch/parisc/include/asm/pdc.h | 4 ++-- + arch/parisc/kernel/firmware.c | 21 ++++++++++++++------- + arch/parisc/kernel/pci-dma.c | 18 +++++++++++++++++- + drivers/char/agp/parisc-agp.c | 15 ++++++++++++++- + drivers/video/console/sticore.c | 2 +- + 5 files changed, 48 insertions(+), 12 deletions(-) +Merging powerpc/next (f1fcbaa18b28 Linux 6.4-rc2) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next +Already up to date. +Merging soc-fsl/next (4b0986a3613c Linux 5.18) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl/next +Already up to date. +Merging risc-v/for-next (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 (6361b7de262a riscv: dts: starfive: jh7110: Add watchdog 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/jh7100.dtsi | 10 ++++++++++ + arch/riscv/boot/dts/starfive/jh7110.dtsi | 17 +++++++++++++++++ + 3 files changed, 29 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 (00e1d14a1eab 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. + arch/s390/Kconfig | 1 + + arch/s390/include/asm/asm-prototypes.h | 4 +++ + arch/s390/kernel/perf_pai_crypto.c | 19 +++++----- + arch/s390/kernel/perf_pai_ext.c | 23 +++++++------ + arch/s390/lib/Makefile | 2 +- + arch/s390/lib/tishift.S | 63 ++++++++++++++++++++++++++++++++++ + 6 files changed, 93 insertions(+), 19 deletions(-) + create mode 100644 arch/s390/lib/tishift.S +Merging sh/for-next (bc9d1f0cecd2 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 (d0f94ebe1864 xtensa: add asm-prototypes.h) +$ git merge -m Merge branch 'xtensa-for-next' of git://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next +Auto-merging arch/xtensa/Kconfig +Merge made by the 'ort' strategy. + arch/xtensa/Kconfig | 1 + + arch/xtensa/include/asm/asm-prototypes.h | 22 ++++++++++++++++++++ + arch/xtensa/kernel/signal.c | 35 ++++++++++++++++++++++++-------- + arch/xtensa/kernel/xtensa_ksyms.c | 16 +++------------ + arch/xtensa/lib/Makefile | 2 +- + arch/xtensa/lib/bswapdi2.S | 21 +++++++++++++++++++ + arch/xtensa/lib/bswapsi2.S | 16 +++++++++++++++ + 7 files changed, 91 insertions(+), 22 deletions(-) + create mode 100644 arch/xtensa/include/asm/asm-prototypes.h + create mode 100644 arch/xtensa/lib/bswapdi2.S + create mode 100644 arch/xtensa/lib/bswapsi2.S +Merging pidfd/for-next (ac9a78681b92 Linux 6.4-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git pidfd/for-next +Already up to date. +Merging vfs-idmapping/for-next (ac9a78681b92 Linux 6.4-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/idmapping.git vfs-idmapping/for-next +Already up to date. +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 (d3f0936c54ee Merge branch 'for-next-next-v6.4-20230517' into for-next-20230517) + 192c01142492 ("btrfs: handle memory allocation failure in btrfs_csum_one_bio") + 458e1ab626a5 ("btrfs: use nofs when cleaning up aborted transactions") + 5e66bf75ae50 ("btrfs: use nofs when cleaning up aborted transactions") + 7ebc3af5dcc0 ("btrfs: handle memory allocation failure in btrfs_csum_one_bio") +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/btrfs/file-item.c +Merge made by the 'ort' strategy. + fs/btrfs/bio.c | 32 +-- + fs/btrfs/block-rsv.c | 19 ++ + fs/btrfs/block-rsv.h | 2 + + fs/btrfs/btrfs_inode.h | 19 -- + fs/btrfs/check-integrity.c | 2 +- + fs/btrfs/compression.c | 6 +- + fs/btrfs/compression.h | 2 +- + fs/btrfs/ctree.c | 200 ++++++++------- + fs/btrfs/ctree.h | 6 +- + fs/btrfs/discard.c | 34 +-- + fs/btrfs/discard.h | 1 - + fs/btrfs/disk-io.c | 361 ++++---------------------- + fs/btrfs/disk-io.h | 7 +- + fs/btrfs/extent-tree.c | 142 +++++----- + fs/btrfs/extent-tree.h | 2 +- + fs/btrfs/extent_io.c | 614 +++++++++++--------------------------------- + fs/btrfs/extent_io.h | 6 +- + fs/btrfs/file-item.c | 4 +- + fs/btrfs/file.c | 9 - + fs/btrfs/free-space-cache.c | 122 +++++---- + fs/btrfs/free-space-cache.h | 2 - + fs/btrfs/fs.h | 1 - + fs/btrfs/inode-item.h | 16 ++ + fs/btrfs/inode.c | 202 ++++++++++++++- + fs/btrfs/ioctl.c | 16 +- + fs/btrfs/messages.h | 7 + + 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 | 77 ++---- + fs/btrfs/subpage.c | 22 -- + fs/btrfs/super.c | 1 - + fs/btrfs/transaction.c | 11 - + fs/btrfs/transaction.h | 3 - + fs/btrfs/tree-checker.c | 158 ++++++++---- + fs/btrfs/tree-checker.h | 29 ++- + fs/btrfs/volumes.c | 2 +- + fs/btrfs/volumes.h | 1 - + fs/btrfs/zoned.c | 40 +-- + fs/btrfs/zoned.h | 2 - + 44 files changed, 1000 insertions(+), 1289 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 (59a556aebc43 SMB3: drop reference to cfile before sending oplock break) +$ 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/cifsglob.h | 4 ++-- + fs/cifs/file.c | 26 +++++++++++++------------- + fs/cifs/smb1ops.c | 9 ++++----- + fs/cifs/smb2ops.c | 7 +++---- + 4 files changed, 22 insertions(+), 24 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 (ac9a78681b92 Linux 6.4-rc1) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs/dev +Already up to date. +Merging exfat/dev (fe15c26ee26e Linux 6.3-rc1) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev +Already up to date. +Merging ext3/for_next (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 ++++++------ + include/linux/buffer_head.h | 4 ++ + 9 files changed, 356 insertions(+), 41 deletions(-) + create mode 100644 fs/ext2/trace.c + create mode 100644 fs/ext2/trace.h +Merging ext4/dev (2a534e1d0d15 ext4: bail out of ext4_xattr_ibody_get() fails for any reason) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev +Already up to date. +Merging f2fs/dev (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 (e08e901faa8f fsverity: use shash API instead of ahash API) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity/for-next +Merge made by the 'ort' strategy. + fs/verity/enable.c | 19 ++----- + fs/verity/fsverity_private.h | 13 +---- + fs/verity/hash_algs.c | 131 +++++++------------------------------------ + fs/verity/verify.c | 106 ++++++++++++++-------------------- + 4 files changed, 70 insertions(+), 199 deletions(-) +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 (6ddd5e9eaadf gfs2: Don't remember delete unless it's successful) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next +Merge made by the 'ort' strategy. + fs/gfs2/bmap.c | 4 ++-- + fs/gfs2/lock_dlm.c | 23 ++++++++++------------- + fs/gfs2/quota.c | 1 + + fs/gfs2/rgrp.c | 2 +- + fs/gfs2/super.c | 10 ++++------ + 5 files changed, 18 insertions(+), 22 deletions(-) +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 (e7b8b8ed9960 ksmbd: smb2: Allow messages padded to 8byte boundary) +$ 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/oplock.c | 5 +++-- + fs/ksmbd/oplock.h | 2 +- + fs/ksmbd/smb2misc.c | 5 ++++- + fs/ksmbd/smb2pdu.c | 19 +++++++++---------- + 5 files changed, 19 insertions(+), 15 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 (8c49a0ffaed0 NFSD: trace nfsctl operations) +$ git merge -m Merge branch 'nfsd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/nfsd-next +Auto-merging fs/nfsd/nfsctl.c +Auto-merging fs/nfsd/trace.h +Auto-merging fs/nfsd/vfs.c +Auto-merging net/sunrpc/svc_xprt.c +Auto-merging net/sunrpc/svcsock.c +Merge made by the 'ort' strategy. + fs/nfsd/nfsctl.c | 83 ++++++++------ + fs/nfsd/trace.h | 259 ++++++++++++++++++++++++++++++++++++++++++ + fs/nfsd/vfs.c | 4 +- + include/trace/events/sunrpc.h | 41 ++++--- + net/sunrpc/svc_xprt.c | 3 - + net/sunrpc/svcsock.c | 38 +++---- + 6 files changed, 357 insertions(+), 71 deletions(-) +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 +Already up to date. +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 +Auto-merging drivers/pci/quirks.c +Auto-merging include/linux/pci_ids.h +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 | 62 +++-- + 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, 199 insertions(+), 238 deletions(-) +Merging pstore/for-next/pstore (48f2c681df43 pstore/ram: Convert to platform remove callback returning void) +$ 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 +Merge made by the 'ort' strategy. + fs/pstore/ram.c | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) +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 | 73 +++++++++++++++++++++++++-------- + 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, 284 insertions(+), 190 deletions(-) +Merging jc_docs/docs-next (bd415b5c9552 Documentation/filesystems: ramfs-rootfs-initramfs: use :Author:) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Merge made by the 'ort' strategy. + .../admin-guide/quickly-build-trimmed-linux.rst | 49 ++++++++++++---------- + Documentation/cdrom/index.rst | 6 +-- + .../filesystems/ramfs-rootfs-initramfs.rst | 3 +- + Documentation/filesystems/sharedsubtree.rst | 4 ++ + Documentation/fpga/index.rst | 2 +- + Documentation/locking/index.rst | 2 +- + Documentation/pcmcia/index.rst | 2 +- + Documentation/staging/crc32.rst | 2 +- + Documentation/timers/index.rst | 2 +- + 9 files changed, 40 insertions(+), 32 deletions(-) +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 (a23a3041c733 Merge tag 'v6.4-rc2' into media_stage) +$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master +Merge made by the 'ort' strategy. + drivers/media/dvb-core/dvbdev.c | 157 ++++++++++----------- + .../platform/st/sti/c8sectpfe/c8sectpfe-core.c | 4 +- + drivers/media/usb/dvb-usb/af9005-fe.c | 3 +- + drivers/media/usb/dvb-usb/az6027.c | 34 ++--- + drivers/media/usb/dvb-usb/dtt200u-fe.c | 2 +- + drivers/media/usb/dvb-usb/dw2102.c | 26 ++-- + drivers/media/usb/dvb-usb/opera1.c | 3 +- + drivers/media/usb/dvb-usb/pctv452e.c | 20 +-- + include/media/dvbdev.h | 6 +- + include/uapi/linux/dvb/frontend.h | 8 ++ + include/uapi/linux/dvb/version.h | 2 +- + 11 files changed, 129 insertions(+), 136 deletions(-) +Merging pm/linux-next (a3c2d8b60e2f Merge branch 'pm-cpufreq' into linux-next) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next +Merge made by the 'ort' strategy. + drivers/acpi/resource.c | 12 ++++++++++++ + drivers/cpufreq/acpi-cpufreq.c | 2 +- + drivers/cpufreq/pcc-cpufreq.c | 2 +- + 3 files changed, 14 insertions(+), 2 deletions(-) +Merging cpufreq-arm/cpufreq/arm/linux-next (11a3b0ac33d9 cpufreq: imx6q: don't warn for disabling a non-existing frequency) +$ 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 +Merge made by the 'ort' strategy. + drivers/cpufreq/cpufreq-dt-platdev.c | 2 ++ + drivers/cpufreq/imx6q-cpufreq.c | 30 ++++++++++--------- + drivers/cpufreq/sparc-us2e-cpufreq.c | 58 +++++++++++------------------------- + drivers/cpufreq/sparc-us3-cpufreq.c | 58 +++++++++++------------------------- + drivers/cpufreq/tegra194-cpufreq.c | 6 ++-- + 5 files changed, 56 insertions(+), 98 deletions(-) +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 (ac9a78681b92 Linux 6.4-rc1) +$ 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 (f1fcbaa18b28 Linux 6.4-rc2) +$ 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 (af2eab1a8243 dt-bindings: net: nxp,sja1105: document spi-cpol/cpha) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/main +Auto-merging MAINTAINERS +Auto-merging drivers/net/ethernet/freescale/fec_main.c +CONFLICT (content): Merge conflict in drivers/net/ethernet/freescale/fec_main.c +Auto-merging drivers/net/phy/phylink.c +Auto-merging drivers/net/virtio_net.c +Auto-merging drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h +Auto-merging drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +Auto-merging drivers/net/wireless/realtek/rtw88/mac80211.c +Auto-merging drivers/net/wireless/realtek/rtw89/mac.c +Auto-merging drivers/net/wireless/realtek/rtw89/mac.h +Auto-merging drivers/net/wireless/realtek/rtw89/rtw8852b.c +Auto-merging net/ipv4/tcp_ipv4.c +Resolved 'drivers/net/ethernet/freescale/fec_main.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 304351257019] Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git +$ git diff -M --stat --summary HEAD^.. + Documentation/bpf/kfuncs.rst | 23 +- + Documentation/bpf/llvm_reloc.rst | 16 +- + Documentation/bpf/map_hash.rst | 53 +- + Documentation/bpf/map_lru_hash_update.dot | 172 ++ + Documentation/bpf/prog_cgroup_sockopt.rst | 57 +- + .../devicetree/bindings/net/dsa/nxp,sja1105.yaml | 32 +- + Documentation/netlink/specs/handshake.yaml | 4 + + .../device_drivers/ethernet/marvell/octeontx2.rst | 45 + + Documentation/networking/ip-sysctl.rst | 17 +- + Documentation/networking/tls-handshake.rst | 5 + + MAINTAINERS | 6 + + arch/arm64/net/bpf_jit_comp.c | 55 +- + drivers/net/Kconfig | 1 - + drivers/net/bonding/bond_main.c | 11 +- + drivers/net/bonding/bonding_priv.h | 4 +- + drivers/net/can/at91_can.c | 6 +- + drivers/net/can/bxcan.c | 17 +- + drivers/net/can/c_can/c_can_platform.c | 6 +- + drivers/net/can/cc770/cc770_isa.c | 6 +- + drivers/net/can/cc770/cc770_platform.c | 6 +- + drivers/net/can/ctucanfd/ctucanfd_platform.c | 6 +- + drivers/net/can/flexcan/flexcan-core.c | 6 +- + drivers/net/can/grcan.c | 6 +- + drivers/net/can/ifi_canfd/ifi_canfd.c | 6 +- + drivers/net/can/janz-ican3.c | 6 +- + drivers/net/can/m_can/m_can_platform.c | 6 +- + drivers/net/can/mscan/mpc5xxx_can.c | 6 +- + drivers/net/can/rcar/rcar_can.c | 5 +- + drivers/net/can/rcar/rcar_canfd.c | 6 +- + drivers/net/can/sja1000/sja1000_isa.c | 6 +- + drivers/net/can/sja1000/sja1000_platform.c | 6 +- + drivers/net/can/softing/softing_main.c | 5 +- + drivers/net/can/sun4i_can.c | 6 +- + drivers/net/can/ti_hecc.c | 6 +- + drivers/net/can/usb/Kconfig | 12 + + drivers/net/can/usb/Makefile | 1 + + drivers/net/can/usb/f81604.c | 1201 +++++++++++++ + drivers/net/can/xilinx_can.c | 6 +- + drivers/net/ethernet/8390/8390.h | 2 + + drivers/net/ethernet/8390/apne.c | 7 +- + drivers/net/ethernet/8390/axnet_cs.c | 6 +- + drivers/net/ethernet/8390/hydra.c | 6 +- + drivers/net/ethernet/8390/lib8390.c | 5 +- + drivers/net/ethernet/8390/mac8390.c | 6 +- + drivers/net/ethernet/8390/mcf8390.c | 4 +- + drivers/net/ethernet/8390/ne.c | 4 +- + drivers/net/ethernet/8390/ne2k-pci.c | 1 + + drivers/net/ethernet/8390/pcnet_cs.c | 5 +- + drivers/net/ethernet/8390/smc-ultra.c | 4 +- + drivers/net/ethernet/8390/stnic.c | 5 +- + drivers/net/ethernet/8390/wd.c | 4 +- + drivers/net/ethernet/8390/zorro8390.c | 7 +- + drivers/net/ethernet/aquantia/atlantic/aq_macsec.c | 40 +- + drivers/net/ethernet/aquantia/atlantic/aq_ring.c | 6 +- + drivers/net/ethernet/broadcom/bnx2.c | 1 - + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 10 +- + drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c | 14 + + drivers/net/ethernet/cadence/macb.h | 1 + + drivers/net/ethernet/cadence/macb_main.c | 12 +- + drivers/net/ethernet/cavium/liquidio/lio_main.c | 18 +- + drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 15 +- + drivers/net/ethernet/chelsio/cxgb3/sge.c | 5 +- + drivers/net/ethernet/emulex/benet/be_main.c | 32 +- + drivers/net/ethernet/freescale/enetc/enetc.c | 5 +- + drivers/net/ethernet/freescale/fec_main.c | 6 +- + drivers/net/ethernet/fungible/funeth/funeth_rx.c | 5 +- + drivers/net/ethernet/i825xx/82596.c | 5 +- + drivers/net/ethernet/i825xx/lasi_82596.c | 5 +- + drivers/net/ethernet/i825xx/lib82596.c | 5 +- + drivers/net/ethernet/i825xx/sun3_82586.c | 1 + + drivers/net/ethernet/i825xx/sun3_82586.h | 1 + + drivers/net/ethernet/intel/ice/Makefile | 1 + + drivers/net/ethernet/intel/ice/ice.h | 24 +- + drivers/net/ethernet/intel/ice/ice_arfs.c | 5 +- + drivers/net/ethernet/intel/ice/ice_base.c | 50 +- + drivers/net/ethernet/intel/ice/ice_ethtool.c | 2 +- + drivers/net/ethernet/intel/ice/ice_idc.c | 52 +- + drivers/net/ethernet/intel/ice/ice_irq.c | 378 +++++ + drivers/net/ethernet/intel/ice/ice_irq.h | 25 + + drivers/net/ethernet/intel/ice/ice_lib.c | 288 +--- + drivers/net/ethernet/intel/ice/ice_lib.h | 5 - + drivers/net/ethernet/intel/ice/ice_main.c | 266 +-- + drivers/net/ethernet/intel/ice/ice_ptp.c | 2 +- + drivers/net/ethernet/intel/ice/ice_sriov.c | 43 +- + drivers/net/ethernet/intel/ice/ice_vf_lib.c | 32 + + drivers/net/ethernet/intel/ice/ice_vf_lib.h | 7 + + drivers/net/ethernet/intel/ice/ice_xsk.c | 5 +- + drivers/net/ethernet/intel/igc/igc.h | 35 + + drivers/net/ethernet/intel/igc/igc_main.c | 116 +- + drivers/net/ethernet/marvell/mvneta.c | 171 +- + drivers/net/ethernet/marvell/octeontx2/af/common.h | 2 +- + .../ethernet/marvell/octeontx2/af/rvu_debugfs.c | 5 + + .../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 45 + + .../net/ethernet/marvell/octeontx2/nic/Makefile | 2 +- + .../ethernet/marvell/octeontx2/nic/cn10k_macsec.c | 135 +- + .../ethernet/marvell/octeontx2/nic/otx2_common.c | 121 +- + .../ethernet/marvell/octeontx2/nic/otx2_common.h | 88 +- + .../ethernet/marvell/octeontx2/nic/otx2_ethtool.c | 29 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 114 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_reg.h | 13 + + .../net/ethernet/marvell/octeontx2/nic/otx2_tc.c | 29 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.c | 24 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.h | 3 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 14 +- + drivers/net/ethernet/marvell/octeontx2/nic/qos.c | 1363 +++++++++++++++ + drivers/net/ethernet/marvell/octeontx2/nic/qos.h | 69 + + .../net/ethernet/marvell/octeontx2/nic/qos_sq.c | 296 ++++ + drivers/net/ethernet/mellanox/mlx5/core/en/qos.c | 7 +- + .../ethernet/mellanox/mlx5/core/en_accel/macsec.c | 9 - + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 4 +- + drivers/net/ethernet/microchip/enc28j60.c | 28 +- + .../net/ethernet/microchip/lan966x/lan966x_main.h | 3 + + .../net/ethernet/microchip/lan966x/lan966x_regs.h | 15 + + .../ethernet/microchip/lan966x/lan966x_tc_flower.c | 61 + + .../microchip/lan966x/lan966x_vcap_ag_api.c | 264 ++- + .../microchip/lan966x/lan966x_vcap_debugfs.c | 23 + + .../ethernet/microchip/lan966x/lan966x_vcap_impl.c | 82 + + drivers/net/ethernet/microchip/vcap/vcap_ag_api.h | 67 +- + drivers/net/ethernet/microchip/vcap/vcap_api.c | 8 +- + .../net/ethernet/netronome/nfp/nfp_net_ethtool.c | 32 +- + .../net/ethernet/netronome/nfp/nfpcore/nfp_nsp.h | 7 +- + .../ethernet/netronome/nfp/nfpcore/nfp_nsp_eth.c | 54 +- + drivers/net/ethernet/samsung/sxgbe/sxgbe_common.h | 2 +- + drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 4 +- + .../net/ethernet/samsung/sxgbe/sxgbe_platform.c | 5 +- + drivers/net/ethernet/sfc/mae.c | 28 +- + drivers/net/ethernet/sfc/mae.h | 1 + + drivers/net/ethernet/sfc/tc.c | 205 ++- + drivers/net/ethernet/sfc/tc.h | 27 + + .../net/ethernet/stmicro/stmmac/dwmac-anarion.c | 2 +- + .../ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c | 6 +- + .../net/ethernet/stmicro/stmmac/dwmac-generic.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c | 2 +- + .../net/ethernet/stmicro/stmmac/dwmac-ingenic.c | 2 +- + .../net/ethernet/stmicro/stmmac/dwmac-intel-plat.c | 9 +- + .../net/ethernet/stmicro/stmmac/dwmac-ipq806x.c | 2 +- + .../net/ethernet/stmicro/stmmac/dwmac-lpc18xx.c | 2 +- + .../net/ethernet/stmicro/stmmac/dwmac-mediatek.c | 9 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c | 2 +- + .../net/ethernet/stmicro/stmmac/dwmac-meson8b.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-oxnas.c | 2 +- + .../ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 15 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 6 +- + .../net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 2 +- + .../net/ethernet/stmicro/stmmac/dwmac-starfive.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c | 6 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c | 6 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 6 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-tegra.c | 6 +- + .../net/ethernet/stmicro/stmmac/dwmac-visconti.c | 19 +- + drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c | 2 + + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 4 +- + .../net/ethernet/stmicro/stmmac/stmmac_platform.h | 2 +- + drivers/net/ethernet/sun/cassini.c | 8 +- + drivers/net/ipvlan/ipvlan_core.c | 3 +- + drivers/net/phy/bcm-phy-lib.c | 212 +++ + drivers/net/phy/bcm-phy-lib.h | 5 + + drivers/net/phy/broadcom.c | 126 +- + drivers/net/phy/dp83869.c | 13 +- + drivers/net/phy/phy_device.c | 5 +- + drivers/net/phy/phylink.c | 11 +- + drivers/net/ppp/Kconfig | 34 + + drivers/net/ppp/pppoe.c | 2 +- + drivers/net/veth.c | 26 +- + drivers/net/virtio_net.c | 667 +++++--- + drivers/net/vmxnet3/vmxnet3_drv.c | 4 +- + drivers/net/vxlan/vxlan_core.c | 21 +- + drivers/net/wireless/marvell/mwifiex/11n.h | 4 +- + drivers/net/wireless/marvell/mwifiex/scan.c | 6 +- + drivers/net/wireless/marvell/mwifiex/wmm.h | 15 - + drivers/net/wireless/mediatek/mt7601u/debugfs.c | 2 - + drivers/net/wireless/microchip/wilc1000/hif.c | 8 +- + drivers/net/wireless/microchip/wilc1000/hif.h | 2 - + drivers/net/wireless/microchip/wilc1000/wlan_cfg.h | 2 +- + drivers/net/wireless/microchip/wilc1000/wlan_if.h | 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 | 463 +++-- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h | 5 + + drivers/net/wireless/realtek/rtw88/debug.c | 59 +- + drivers/net/wireless/realtek/rtw88/mac80211.c | 4 +- + drivers/net/wireless/realtek/rtw89/Makefile | 3 +- + drivers/net/wireless/realtek/rtw89/acpi.c | 52 + + drivers/net/wireless/realtek/rtw89/acpi.h | 21 + + drivers/net/wireless/realtek/rtw89/core.c | 131 +- + drivers/net/wireless/realtek/rtw89/core.h | 76 +- + 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 | 126 +- + drivers/net/wireless/realtek/rtw89/mac.h | 3 + + drivers/net/wireless/realtek/rtw89/mac80211.c | 7 +- + drivers/net/wireless/realtek/rtw89/pci.c | 13 +- + drivers/net/wireless/realtek/rtw89/pci.h | 1 + + 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/regd.c | 61 + + drivers/net/wireless/realtek/rtw89/rtw8851b.c | 174 ++ + 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 | 12 +- + drivers/net/wireless/realtek/rtw89/rtw8852b.c | 6 +- + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 6 +- + drivers/net/wireless/realtek/rtw89/ser.c | 43 +- + drivers/net/wireless/realtek/rtw89/txrx.h | 19 +- + drivers/net/wireless/realtek/rtw89/wow.c | 2 +- + drivers/net/wwan/iosm/iosm_ipc_imem.h | 13 - + drivers/net/wwan/iosm/iosm_ipc_mux.h | 4 - + drivers/net/wwan/iosm/iosm_ipc_wwan.c | 2 - + drivers/net/xen-netback/netback.c | 4 +- + include/linux/bpf.h | 3 +- + include/linux/bpf_verifier.h | 27 +- + include/linux/brcmphy.h | 55 + + include/linux/can/length.h | 3 + + include/linux/phy.h | 4 + + include/linux/phylink.h | 9 +- + include/linux/skbuff.h | 51 +- + include/net/bonding.h | 4 +- + include/net/handshake.h | 1 + + include/net/macsec.h | 10 + + include/net/netns/ipv4.h | 1 + + include/net/pkt_cls.h | 1 + + include/net/vxlan.h | 4 +- + include/net/xsk_buff_pool.h | 2 +- + include/uapi/linux/handshake.h | 1 + + include/uapi/linux/if_link.h | 1 + + kernel/bpf/bpf_lru_list.c | 21 +- + kernel/bpf/bpf_lru_list.h | 7 +- + kernel/bpf/cgroup.c | 15 + + kernel/bpf/helpers.c | 123 +- + kernel/bpf/syscall.c | 3 +- + kernel/bpf/trampoline.c | 32 +- + kernel/bpf/verifier.c | 793 ++++++--- + kernel/trace/bpf_trace.c | 4 +- + net/bpf/test_run.c | 3 +- + net/core/filter.c | 2 + + net/core/gro.c | 4 +- + net/core/pktgen.c | 13 +- + net/core/skbuff.c | 24 +- + net/handshake/handshake.h | 1 + + net/handshake/netlink.c | 12 +- + net/handshake/request.c | 4 + + net/handshake/tlshd.c | 8 + + net/ipv4/ipconfig.c | 10 +- + net/ipv4/ping.c | 41 +- + net/ipv4/sysctl_net_ipv4.c | 10 + + net/ipv4/tcp.c | 12 +- + net/ipv4/tcp_ipv4.c | 1 + + net/ipv4/tcp_timer.c | 17 +- + net/ipv6/exthdrs.c | 3 - + net/ipv6/seg6_iptunnel.c | 3 +- + net/nfc/llcp_commands.c | 3 +- + net/sched/sch_htb.c | 7 +- + net/sctp/socket.c | 18 + + net/sctp/stream_sched.c | 9 +- + net/tls/tls_device.c | 10 +- + net/xdp/xsk_buff_pool.c | 7 +- + net/xfrm/xfrm_ipcomp.c | 5 +- + samples/bpf/tcp_basertt_kern.c | 2 +- + scripts/pahole-flags.sh | 3 + + tools/bpf/bpftool/feature.c | 24 +- + tools/bpf/bpftool/link.c | 10 +- + tools/bpf/bpftool/map.c | 12 +- + tools/lib/bpf/bpf_helpers.h | 15 +- + tools/lib/bpf/bpf_tracing.h | 3 +- + tools/lib/bpf/btf_dump.c | 22 +- + tools/testing/selftests/bpf/DENYLIST.aarch64 | 83 +- + tools/testing/selftests/bpf/DENYLIST.s390x | 1 + + tools/testing/selftests/bpf/bpf_kfuncs.h | 6 + + .../testing/selftests/bpf/prog_tests/arg_parsing.c | 68 + + .../bpf/prog_tests/cgroup_getset_retval.c | 20 + + tools/testing/selftests/bpf/prog_tests/dynptr.c | 8 + + tools/testing/selftests/bpf/prog_tests/sockopt.c | 96 +- + .../selftests/bpf/prog_tests/sockopt_inherit.c | 61 +- + .../selftests/bpf/prog_tests/sockopt_multi.c | 108 +- + .../selftests/bpf/prog_tests/sockopt_qos_to_cc.c | 2 + + .../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 + + .../bpf/progs/cgroup_getset_retval_getsockopt.c | 13 + + .../bpf/progs/cgroup_getset_retval_setsockopt.c | 17 + + 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 +- + .../testing/selftests/bpf/progs/sockopt_inherit.c | 18 +- + tools/testing/selftests/bpf/progs/sockopt_multi.c | 26 +- + .../selftests/bpf/progs/sockopt_qos_to_cc.c | 10 +- + tools/testing/selftests/bpf/progs/sockopt_sk.c | 25 +- + .../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 | 225 ++- + 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 + + .../drivers/net/bonding/bond-eth-type-change.sh | 1 - + tools/testing/selftests/net/Makefile | 1 + + tools/testing/selftests/net/fcnal-test.sh | 87 + + tools/testing/selftests/net/nettest.c | 46 +- + .../selftests/net/test_vxlan_nolocalbypass.sh | 240 +++ + 309 files changed, 13363 insertions(+), 2817 deletions(-) + create mode 100644 Documentation/bpf/map_lru_hash_update.dot + create mode 100644 drivers/net/can/usb/f81604.c + create mode 100644 drivers/net/ethernet/intel/ice/ice_irq.c + create mode 100644 drivers/net/ethernet/intel/ice/ice_irq.h + create mode 100644 drivers/net/ethernet/marvell/octeontx2/nic/qos.c + create mode 100644 drivers/net/ethernet/marvell/octeontx2/nic/qos.h + create mode 100644 drivers/net/ethernet/marvell/octeontx2/nic/qos_sq.c + create mode 100644 drivers/net/wireless/realtek/rtw89/acpi.c + create mode 100644 drivers/net/wireless/realtek/rtw89/acpi.h + 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 + 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 + create mode 100755 tools/testing/selftests/net/test_vxlan_nolocalbypass.sh +Merging bpf-next/for-next (effcf6241624 selftests/bpf: Make bpf_dynptr_is_rdonly() prototyype consistent with kernel) +$ 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 tools/testing/selftests/bpf/Makefile +Merge made by the 'ort' strategy. + Documentation/bpf/instruction-set.rst | 9 +- + kernel/bpf/log.c | 3 - + net/bpf/test_run.c | 201 ------ + tools/bpf/bpftool/common.c | 9 +- + tools/bpf/bpftool/iter.c | 2 +- + tools/bpf/bpftool/main.h | 2 +- + tools/bpf/bpftool/prog.c | 2 +- + tools/bpf/bpftool/struct_ops.c | 2 +- + tools/lib/bpf/gen_loader.c | 14 +- + tools/testing/selftests/bpf/Makefile | 3 +- + tools/testing/selftests/bpf/bpf_kfuncs.h | 4 +- + .../selftests/bpf/bpf_testmod/bpf_testmod.c | 166 +++++ + .../selftests/bpf/bpf_testmod/bpf_testmod_kfunc.h | 100 +++ + .../selftests/bpf/prog_tests/bpf_mod_race.c | 34 +- + .../selftests/bpf/prog_tests/module_attach.c | 12 +- + tools/testing/selftests/bpf/prog_tests/netcnt.c | 4 +- + tools/testing/selftests/bpf/progs/cb_refs.c | 4 +- + tools/testing/selftests/bpf/progs/dynptr_fail.c | 1 + + tools/testing/selftests/bpf/progs/dynptr_success.c | 1 + + tools/testing/selftests/bpf/progs/jit_probe_mem.c | 4 +- + .../selftests/bpf/progs/kfunc_call_destructive.c | 3 +- + .../testing/selftests/bpf/progs/kfunc_call_fail.c | 9 +- + .../testing/selftests/bpf/progs/kfunc_call_race.c | 3 +- + .../testing/selftests/bpf/progs/kfunc_call_test.c | 17 +- + .../selftests/bpf/progs/kfunc_call_test_subprog.c | 9 +- + .../testing/selftests/bpf/progs/local_kptr_stash.c | 5 +- + tools/testing/selftests/bpf/progs/map_kptr.c | 5 +- + tools/testing/selftests/bpf/progs/map_kptr_fail.c | 4 +- + .../testing/selftests/bpf/progs/test_sock_fields.c | 5 +- + .../testing/selftests/bpf/progs/test_xdp_dynptr.c | 1 + + tools/testing/selftests/bpf/test_progs.c | 76 +- + tools/testing/selftests/bpf/test_progs.h | 1 - + tools/testing/selftests/bpf/test_verifier.c | 170 ++++- + tools/testing/selftests/bpf/test_xsk.sh | 10 +- + tools/testing/selftests/bpf/testing_helpers.c | 61 ++ + tools/testing/selftests/bpf/testing_helpers.h | 9 + + tools/testing/selftests/bpf/xsk.h | 5 + + tools/testing/selftests/bpf/xskxceiver.c | 769 ++++++++++----------- + tools/testing/selftests/bpf/xskxceiver.h | 31 +- + 39 files changed, 927 insertions(+), 843 deletions(-) + create mode 100644 tools/testing/selftests/bpf/bpf_testmod/bpf_testmod_kfunc.h +Merging ipsec-next/master (b2cbac9b9b28 net: Remove low_thresh in ip defrag) +$ 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 (e641577eb6e8 Merge branch 'spdx-conversion-for-bonding-8390-and-i825xx-drivers') +$ 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 (fd4fbf8cd81f Bluetooth: Check for ISO support in controller) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master +Merge made by the 'ort' strategy. + drivers/bluetooth/btrtl.c | 18 ++++++++-- + drivers/bluetooth/btusb.c | 2 ++ + include/net/bluetooth/hci.h | 1 + + include/net/bluetooth/hci_core.h | 3 +- + include/net/bluetooth/mgmt.h | 2 ++ + net/bluetooth/hci_conn.c | 77 +++++++++++++++++++++------------------- + net/bluetooth/mgmt.c | 6 ++++ + 7 files changed, 70 insertions(+), 39 deletions(-) +Merging wireless-next/for-next (156d30084295 Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git wireless-next/for-next +Auto-merging drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h +Auto-merging drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +Auto-merging drivers/net/wireless/realtek/rtw89/mac.h +Auto-merging drivers/net/wireless/realtek/rtw89/rtw8852b.c +Merge made by the 'ort' strategy. + drivers/net/wireless/ath/ath10k/core.c | 3 + + drivers/net/wireless/ath/ath10k/core.h | 3 + + drivers/net/wireless/ath/ath10k/debug.c | 4 +- + drivers/net/wireless/ath/ath10k/mac.c | 6 +- + drivers/net/wireless/ath/ath10k/wmi.c | 34 +- + drivers/net/wireless/ath/ath10k/wmi.h | 2 - + drivers/net/wireless/ath/ath11k/hw.c | 3 + + drivers/net/wireless/ath/ath11k/hw.h | 1 + + drivers/net/wireless/ath/ath11k/mac.c | 419 +++- + drivers/net/wireless/ath/ath11k/wmi.c | 50 +- + drivers/net/wireless/ath/ath11k/wmi.h | 48 +- + drivers/net/wireless/ath/ath12k/core.c | 1 + + drivers/net/wireless/ath/ath12k/core.h | 1 + + drivers/net/wireless/ath/ath12k/dp_rx.c | 19 +- + drivers/net/wireless/ath/ath12k/hw.c | 6 + + drivers/net/wireless/ath/ath12k/hw.h | 2 + + drivers/net/wireless/ath/ath12k/mac.c | 49 +- + drivers/net/wireless/ath/ath12k/qmi.c | 6 +- + drivers/net/wireless/ath/ath12k/qmi.h | 1 + + drivers/net/wireless/ath/ath12k/wmi.c | 8 +- + drivers/net/wireless/ath/ath12k/wmi.h | 2 +- + drivers/net/wireless/ath/ath9k/ar9003_hw.c | 27 +- + drivers/net/wireless/ath/ath9k/wmi.c | 4 + + .../broadcom/brcm80211/brcmfmac/wcc/core.c | 4 +- + drivers/net/wireless/realtek/rtl8xxxu/Kconfig | 3 +- + drivers/net/wireless/realtek/rtl8xxxu/Makefile | 2 +- + drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 47 + + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188f.c | 23 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c | 28 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192f.c | 2090 ++++++++++++++++++++ + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8710b.c | 37 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c | 5 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 110 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h | 47 +- + drivers/net/wireless/realtek/rtw89/coex.c | 7 + + drivers/net/wireless/realtek/rtw89/core.h | 9 + + drivers/net/wireless/realtek/rtw89/efuse.c | 21 + + drivers/net/wireless/realtek/rtw89/efuse.h | 1 + + drivers/net/wireless/realtek/rtw89/mac.h | 2 + + drivers/net/wireless/realtek/rtw89/phy.c | 1 + + drivers/net/wireless/realtek/rtw89/reg.h | 54 + + drivers/net/wireless/realtek/rtw89/rtw8851b.c | 1659 ++++++++++++++++ + drivers/net/wireless/realtek/rtw89/rtw8851b.h | 61 + + drivers/net/wireless/realtek/rtw89/rtw8851b_rfk.c | 1776 +++++++++++++++++ + drivers/net/wireless/realtek/rtw89/rtw8851b_rfk.h | 8 + + drivers/net/wireless/realtek/rtw89/rtw8852a.c | 1 + + drivers/net/wireless/realtek/rtw89/rtw8852b.c | 1 + + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 1 + + 48 files changed, 6462 insertions(+), 235 deletions(-) + create mode 100644 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192f.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 wpan-staging/staging (1af3de62f03f ieee802154: ca8210: Flag the driver as being limited) +$ git merge -m Merge branch 'staging' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git wpan-staging/staging +Already up to date. +Merging mtd/mtd/next (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 (ac52578d6e8d hwrng: virtio - Fix race on data_avail and actual data) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git crypto/master +Merge made by the 'ort' strategy. + arch/arm/crypto/sha1_neon_glue.c | 12 +- + arch/arm/crypto/sha256_neon_glue.c | 12 +- + arch/arm/crypto/sha512-neon-glue.c | 12 +- + crypto/Kconfig | 21 ++ + crypto/Makefile | 1 + + crypto/ahash.c | 9 +- + crypto/jitterentropy-kcapi.c | 192 ++++++++++++-- + crypto/jitterentropy-testing.c | 294 +++++++++++++++++++++ + crypto/jitterentropy.c | 143 ++++------ + crypto/jitterentropy.h | 20 +- + drivers/char/hw_random/Kconfig | 25 +- + drivers/char/hw_random/Makefile | 1 + + .../trng/trng-stb.c => char/hw_random/histb-rng.c} | 83 +++--- + drivers/char/hw_random/virtio-rng.c | 10 +- + drivers/crypto/caam/ctrl.c | 205 +++++++------- + drivers/crypto/caam/intern.h | 1 + + drivers/crypto/hisilicon/Kconfig | 7 - + drivers/crypto/hisilicon/Makefile | 2 +- + drivers/crypto/hisilicon/trng/Makefile | 3 - + drivers/crypto/intel/ixp4xx/ixp4xx_crypto.c | 2 +- + drivers/crypto/marvell/octeontx2/otx2_cpt_common.h | 15 ++ + .../marvell/octeontx2/otx2_cpt_mbox_common.c | 3 + + drivers/crypto/marvell/octeontx2/otx2_cptlf.c | 34 +-- + drivers/crypto/marvell/octeontx2/otx2_cptlf.h | 33 ++- + drivers/crypto/marvell/octeontx2/otx2_cptpf.h | 7 + + drivers/crypto/marvell/octeontx2/otx2_cptpf_main.c | 41 +++ + drivers/crypto/marvell/octeontx2/otx2_cptpf_mbox.c | 247 ++++++++++++++++- + .../crypto/marvell/octeontx2/otx2_cptpf_ucode.c | 10 +- + drivers/crypto/marvell/octeontx2/otx2_cptvf.h | 1 + + drivers/crypto/marvell/octeontx2/otx2_cptvf_main.c | 8 +- + include/crypto/engine.h | 2 +- + include/crypto/hash.h | 3 +- + include/crypto/internal/hash.h | 12 + + 33 files changed, 1125 insertions(+), 346 deletions(-) + create mode 100644 crypto/jitterentropy-testing.c + rename drivers/{crypto/hisilicon/trng/trng-stb.c => char/hw_random/histb-rng.c} (53%) +Merging drm/drm-next (f1fcbaa18b28 Linux 6.4-rc2) +$ 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 (f47d6140b7a4 drm/bridge: tc358767: Switch to devm MIPI-DSI helpers) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc drm-misc/for-linux-next +Auto-merging MAINTAINERS +Auto-merging drivers/gpu/drm/drm_fb_helper.c +Auto-merging drivers/gpu/drm/scheduler/sched_main.c +Auto-merging drivers/video/fbdev/arcfb.c +Auto-merging drivers/video/fbdev/stifb.c +CONFLICT (content): Merge conflict in drivers/video/fbdev/stifb.c +Auto-merging drivers/video/fbdev/vfb.c +Auto-merging drivers/video/sticore.c +Auto-merging include/drm/display/drm_dp.h +Resolved 'drivers/video/fbdev/stifb.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 8416c21c6d1f] Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc +$ git diff -M --stat --summary HEAD^.. + .../bindings/display/bridge/fsl,ldb.yaml | 5 +- + .../bindings/display/bridge/toshiba,tc358767.yaml | 14 +- + .../bindings/display/panel/novatek,nt36523.yaml | 16 +- + .../bindings/display/panel/panel-simple.yaml | 4 + + .../display/panel/rocktech,jh057n00900.yaml | 2 + + Documentation/gpu/rfc/index.rst | 4 + + Documentation/gpu/rfc/xe.rst | 235 +++++++++ + Documentation/gpu/todo.rst | 7 +- + Documentation/gpu/vkms.rst | 7 +- + MAINTAINERS | 2 + + arch/arc/include/asm/fb.h | 16 +- + arch/arm/include/asm/fb.h | 15 +- + arch/arm64/include/asm/fb.h | 15 +- + arch/ia64/include/asm/fb.h | 11 +- + arch/loongarch/include/asm/fb.h | 15 +- + arch/m68k/include/asm/fb.h | 24 +- + arch/mips/include/asm/fb.h | 10 +- + arch/parisc/Makefile | 4 +- + arch/parisc/include/asm/fb.h | 20 +- + arch/parisc/video/Makefile | 3 + + arch/parisc/video/fbdev.c | 27 + + arch/powerpc/include/asm/fb.h | 8 +- + arch/sh/include/asm/fb.h | 15 +- + arch/sparc/Makefile | 1 + + arch/sparc/include/asm/fb.h | 33 +- + arch/sparc/video/Makefile | 3 + + arch/sparc/video/fbdev.c | 24 + + arch/x86/include/asm/fb.h | 21 +- + arch/x86/video/fbdev.c | 30 +- + drivers/auxdisplay/cfag12864bfb.c | 2 +- + drivers/auxdisplay/ht16k33.c | 2 +- + drivers/dma-buf/dma-resv.c | 2 +- + drivers/firmware/sysfb.c | 2 +- + drivers/gpu/drm/arm/hdlcd_drv.c | 2 +- + drivers/gpu/drm/armada/Makefile | 3 +- + drivers/gpu/drm/armada/armada_drm.h | 10 +- + drivers/gpu/drm/armada/armada_drv.c | 14 +- + drivers/gpu/drm/armada/armada_fb.c | 1 - + drivers/gpu/drm/armada/armada_fbdev.c | 129 +++-- + drivers/gpu/drm/bridge/analogix/anx7625.c | 1 - + drivers/gpu/drm/bridge/fsl-ldb.c | 14 +- + drivers/gpu/drm/bridge/ite-it6505.c | 3 +- + drivers/gpu/drm/bridge/lontium-lt9211.c | 4 +- + drivers/gpu/drm/bridge/lontium-lt9611.c | 4 +- + drivers/gpu/drm/bridge/samsung-dsim.c | 1 - + drivers/gpu/drm/bridge/tc358767.c | 4 +- + drivers/gpu/drm/bridge/tc358768.c | 97 +++- + drivers/gpu/drm/bridge/ti-sn65dsi83.c | 1 + + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 19 + + drivers/gpu/drm/drm_aperture.c | 11 +- + drivers/gpu/drm/drm_atomic_helper.c | 13 +- + drivers/gpu/drm/drm_drv.c | 4 +- + drivers/gpu/drm/drm_fb_helper.c | 174 +------ + drivers/gpu/drm/drm_gem_framebuffer_helper.c | 9 + + drivers/gpu/drm/drm_gem_vram_helper.c | 6 +- + drivers/gpu/drm/drm_sysfs.c | 51 ++ + drivers/gpu/drm/gma500/psb_drv.c | 43 +- + drivers/gpu/drm/hyperv/hyperv_drm_drv.c | 1 - + drivers/gpu/drm/imx/lcdc/imx-lcdc.c | 4 +- + drivers/gpu/drm/meson/meson_drv.c | 2 +- + drivers/gpu/drm/meson/meson_venc.c | 32 +- + drivers/gpu/drm/msm/msm_drv.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_debugfs.c | 19 +- + .../drm/nouveau/nvkm/subdev/bios/power_budget.c | 3 +- + drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pci/pcie.c | 7 +- + drivers/gpu/drm/nouveau/nvkm/subdev/therm/fanpwm.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/therm/fantog.c | 2 +- + drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c | 404 +++++++++------ + drivers/gpu/drm/panel/panel-novatek-nt36523.c | 569 ++++++++++++++++++++- + drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c | 43 +- + drivers/gpu/drm/panel/panel-simple.c | 69 +++ + drivers/gpu/drm/panel/panel-sitronix-st7703.c | 102 +++- + drivers/gpu/drm/rockchip/cdn-dp-core.c | 5 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 8 +- + drivers/gpu/drm/scheduler/sched_entity.c | 49 +- + drivers/gpu/drm/scheduler/sched_fence.c | 4 +- + drivers/gpu/drm/scheduler/sched_main.c | 22 +- + drivers/gpu/drm/solomon/ssd130x.h | 6 +- + drivers/gpu/drm/sti/sti_dvo.c | 2 +- + drivers/gpu/drm/sti/sti_hdmi.c | 11 +- + drivers/gpu/drm/sti/sti_hdmi.h | 2 - + drivers/gpu/drm/stm/drv.c | 2 +- + drivers/gpu/drm/sun4i/Makefile | 2 +- + drivers/gpu/drm/sun4i/sun4i_drv.c | 2 +- + drivers/gpu/drm/sun4i/sun4i_tcon.c | 65 ++- + .../sun4i/{sun4i_dotclock.c => sun4i_tcon_dclk.c} | 2 +- + .../sun4i/{sun4i_dotclock.h => sun4i_tcon_dclk.h} | 0 + drivers/gpu/drm/tegra/drm.c | 2 +- + drivers/gpu/drm/tests/drm_rect_test.c | 315 ++++++++++++ + drivers/gpu/drm/ttm/ttm_device.c | 2 +- + drivers/gpu/drm/tve200/tve200_drv.c | 4 +- + drivers/gpu/drm/udl/udl_main.c | 2 +- + drivers/gpu/drm/vc4/tests/vc4_mock.h | 3 + + drivers/gpu/drm/vc4/tests/vc4_mock_output.c | 4 +- + drivers/gpu/drm/vc4/vc4_dpi.c | 7 +- + drivers/gpu/drm/vc4/vc4_drv.c | 2 +- + drivers/gpu/drm/vc4/vc4_drv.h | 65 +-- + drivers/gpu/drm/vc4/vc4_dsi.c | 17 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 336 ++++++++++-- + drivers/gpu/drm/vc4/vc4_hdmi.h | 25 +- + drivers/gpu/drm/vc4/vc4_kms.c | 16 +- + drivers/gpu/drm/vc4/vc4_plane.c | 3 +- + drivers/gpu/drm/vc4/vc4_txp.c | 12 +- + drivers/gpu/drm/vc4/vc4_vec.c | 14 +- + drivers/gpu/drm/vkms/vkms_composer.c | 38 +- + drivers/gpu/drm/vkms/vkms_crtc.c | 5 +- + drivers/gpu/drm/vkms/vkms_drv.c | 6 +- + drivers/gpu/drm/vkms/vkms_drv.h | 6 +- + drivers/gpu/drm/vkms/vkms_formats.c | 149 +++--- + drivers/gpu/drm/vkms/vkms_formats.h | 2 +- + drivers/gpu/drm/vkms/vkms_plane.c | 50 +- + drivers/hid/hid-picolcd_fb.c | 4 +- + drivers/media/pci/ivtv/ivtvfb.c | 4 +- + drivers/video/Kconfig | 7 + + drivers/video/Makefile | 1 + + drivers/video/aperture.c | 70 ++- + drivers/video/console/Kconfig | 1 + + drivers/video/console/Makefile | 4 +- + drivers/video/console/sticon.c | 6 +- + drivers/video/fbdev/Kconfig | 3 +- + drivers/video/fbdev/arcfb.c | 11 +- + drivers/video/fbdev/au1200fb.c | 2 +- + drivers/video/fbdev/broadsheetfb.c | 16 +- + drivers/video/fbdev/cobalt_lcdfb.c | 6 + + drivers/video/fbdev/core/Makefile | 2 +- + drivers/video/fbdev/core/fb_io_fops.c | 133 +++++ + drivers/video/fbdev/core/fb_sys_fops.c | 36 +- + drivers/video/fbdev/core/fbmem.c | 111 +--- + drivers/video/fbdev/hecubafb.c | 12 +- + drivers/video/fbdev/hyperv_fb.c | 2 +- + drivers/video/fbdev/metronomefb.c | 16 +- + drivers/video/fbdev/ps3fb.c | 4 +- + drivers/video/fbdev/pvr2fb.c | 3 + + drivers/video/fbdev/sm712fb.c | 10 +- + drivers/video/fbdev/smscufx.c | 14 +- + drivers/video/fbdev/ssd1307fb.c | 3 + + drivers/video/fbdev/stifb.c | 8 +- + drivers/video/fbdev/udlfb.c | 12 +- + drivers/video/fbdev/vfb.c | 2 +- + drivers/video/fbdev/xen-fbfront.c | 2 +- + drivers/video/{console => }/sticore.c | 123 ++--- + include/asm-generic/fb.h | 24 +- + include/drm/display/drm_dp.h | 3 + + include/drm/drm_aperture.h | 7 +- + include/drm/drm_connector.h | 5 + + include/drm/drm_fixed.h | 6 + + include/drm/gpu_scheduler.h | 5 +- + include/drm/ttm/ttm_device.h | 4 +- + include/linux/aperture.h | 16 +- + include/linux/fb.h | 10 + + include/uapi/drm/drm_mode.h | 5 + + {drivers/video/fbdev => include/video}/sticore.h | 16 +- + 154 files changed, 3080 insertions(+), 1398 deletions(-) + create mode 100644 Documentation/gpu/rfc/xe.rst + create mode 100644 arch/parisc/video/Makefile + create mode 100644 arch/parisc/video/fbdev.c + create mode 100644 arch/sparc/video/Makefile + create mode 100644 arch/sparc/video/fbdev.c + rename drivers/gpu/drm/sun4i/{sun4i_dotclock.c => sun4i_tcon_dclk.c} (99%) + rename drivers/gpu/drm/sun4i/{sun4i_dotclock.h => sun4i_tcon_dclk.h} (100%) + create mode 100644 drivers/video/fbdev/core/fb_io_fops.c + rename drivers/video/{console => }/sticore.c (95%) + rename {drivers/video/fbdev => include/video}/sticore.h (99%) +Merging amdgpu/drm-next (d3295311e589 drm/amdgpu/display: Enable DC_FP for LoongArch) +$ 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/amdgpu_gfx.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v9_0.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/Kconfig +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/Kconfig +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/amdgpu_dm/dc_fpu.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/dc_fpu.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/dcn314/dcn314_hwseq.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn314/dcn314_init.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/dml/dcn32/display_mode_vba_32.c +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 +CONFLICT (content): Merge conflict in include/drm/display/drm_dp.h +Resolved 'drivers/gpu/drm/amd/display/Kconfig' using previous resolution. +Resolved 'drivers/gpu/drm/amd/display/amdgpu_dm/dc_fpu.c' using previous resolution. +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. +Resolved 'include/drm/display/drm_dp.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 47e5254cc595] 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 | 43 +- + 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 | 65 +- + 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 | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.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 | 2830 +++++++++++++++++++- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.h | 3 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_2.c | 545 ++-- + 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/nbio_v7_9.c | 2 +- + drivers/gpu/drm/amd/amdgpu/nv.c | 8 +- + 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/Kconfig | 2 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 76 +- + .../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 +- + drivers/gpu/drm/amd/display/amdgpu_dm/dc_fpu.c | 6 +- + .../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 | 66 +- + 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 | 225 +- + 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 | 84 +- + drivers/gpu/drm/amd/display/dc/dc_stream.h | 8 + + drivers/gpu/drm/amd/display/dc/dc_types.h | 3 +- + drivers/gpu/drm/amd/display/dc/dce/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c | 294 +- + 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 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h | 2 + + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 4 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.c | 11 + + 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_hubp.c | 6 + + 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 | 15 + + .../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 | 9 + + drivers/gpu/drm/amd/display/dc/dm_services_types.h | 6 + + drivers/gpu/drm/amd/display/dc/dml/Makefile | 5 + + .../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 | 100 +- + .../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 | 3 + + .../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/ttm/ttm_tt.h | 2 +- + include/uapi/drm/amdgpu_drm.h | 22 + + 176 files changed, 5745 insertions(+), 2022 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 (9c3a985f88fa Merge drm/drm-next into drm-intel-next) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/display/intel_atomic_plane.c +Auto-merging drivers/gpu/drm/i915/display/intel_dp.c +Auto-merging drivers/gpu/drm/i915/display/intel_hdcp.c +Auto-merging drivers/gpu/drm/i915/i915_pci.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/i915/Makefile | 7 + + drivers/gpu/drm/i915/display/g4x_dp.c | 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_plane.c | 2 +- + 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_bios.c | 251 +- + drivers/gpu/drm/i915/display/intel_bios.h | 2 +- + 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 | 491 +++- + drivers/gpu/drm/i915/display/intel_crt.c | 21 +- + drivers/gpu/drm/i915/display/intel_crtc.c | 18 +- + 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 | 492 +++- + drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c | 80 +- + drivers/gpu/drm/i915/display/intel_display.c | 1134 +------- + drivers/gpu/drm/i915/display/intel_display.h | 59 +- + .../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_irq.c | 1668 +++++++++++ + drivers/gpu/drm/i915/display/intel_display_irq.h | 81 + + drivers/gpu/drm/i915/display/intel_display_power.c | 38 +- + .../gpu/drm/i915/display/intel_display_power_map.c | 92 +- + .../drm/i915/display/intel_display_power_well.c | 5 +- + .../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 | 66 +- + 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 | 336 ++- + drivers/gpu/drm/i915/display/intel_dp.h | 3 + + drivers/gpu/drm/i915/display/intel_dp_aux.c | 45 +- + drivers/gpu/drm/i915/display/intel_dp_aux.h | 3 + + drivers/gpu/drm/i915/display/intel_dp_aux_regs.h | 62 +- + .../gpu/drm/i915/display/intel_dp_link_training.c | 433 ++- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 5 +- + drivers/gpu/drm/i915/display/intel_dpll.c | 37 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 92 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 3 + + drivers/gpu/drm/i915/display/intel_dvo.c | 1 + + drivers/gpu/drm/i915/display/intel_fb.c | 42 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 1 + + drivers/gpu/drm/i915/display/intel_fdi.c | 9 +- + drivers/gpu/drm/i915/display/intel_fifo_underrun.c | 2 + + drivers/gpu/drm/i915/display/intel_gmbus.c | 5 + + drivers/gpu/drm/i915/display/intel_gmbus.h | 2 + + drivers/gpu/drm/i915/display/intel_hdcp.c | 144 +- + drivers/gpu/drm/i915/display/intel_hdcp.h | 6 +- + drivers/gpu/drm/i915/display/intel_hdcp_gsc.c | 2 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 113 +- + drivers/gpu/drm/i915/display/intel_hdmi.h | 9 +- + drivers/gpu/drm/i915/display/intel_hotplug.c | 1 + + drivers/gpu/drm/i915/display/intel_hotplug_irq.c | 1442 ++++++++++ + drivers/gpu/drm/i915/display/intel_hotplug_irq.h | 35 + + 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_lock.c | 50 + + drivers/gpu/drm/i915/display/intel_modeset_lock.h | 33 + + drivers/gpu/drm/i915/display/intel_modeset_setup.c | 324 ++- + .../gpu/drm/i915/display/intel_modeset_verify.c | 36 +- + drivers/gpu/drm/i915/display/intel_overlay.c | 16 +- + drivers/gpu/drm/i915/display/intel_panel.c | 117 +- + drivers/gpu/drm/i915/display/intel_pch_display.c | 20 +- + drivers/gpu/drm/i915/display/intel_pipe_crc.c | 1 + + drivers/gpu/drm/i915/display/intel_pps.c | 16 +- + 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 | 7 +- + 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 | 416 ++- + drivers/gpu/drm/i915/display/intel_tc.h | 5 +- + drivers/gpu/drm/i915/display/intel_tv.c | 20 +- + 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 | 66 +- + 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 | 16 +- + drivers/gpu/drm/i915/display/skl_universal_plane.c | 24 +- + drivers/gpu/drm/i915/display/vlv_dsi.c | 1 + + drivers/gpu/drm/i915/display/vlv_dsi_pll.c | 2 +- + drivers/gpu/drm/i915/gt/intel_gt_irq.c | 1 + + drivers/gpu/drm/i915/gt/intel_gt_regs.h | 5 +- + drivers/gpu/drm/i915/gt/intel_reset.c | 7 +- + drivers/gpu/drm/i915/gt/intel_rps.c | 2 + + drivers/gpu/drm/i915/gt/selftest_rps.c | 1 + + drivers/gpu/drm/i915/gt/uc/intel_guc.c | 1 + + drivers/gpu/drm/i915/gvt/edid.c | 10 +- + drivers/gpu/drm/i915/gvt/handlers.c | 2 +- + drivers/gpu/drm/i915/i915_debugfs.c | 1 + + drivers/gpu/drm/i915/i915_driver.c | 63 +- + drivers/gpu/drm/i915/i915_drv.h | 7 - + drivers/gpu/drm/i915/i915_irq.c | 2658 +----------------- + drivers/gpu/drm/i915/i915_irq.h | 48 +- + drivers/gpu/drm/i915/i915_pci.c | 4 +- + drivers/gpu/drm/i915/i915_reg.h | 454 +-- + 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 + + include/uapi/drm/drm_fourcc.h | 43 + + 119 files changed, 12085 insertions(+), 5550 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_irq.c + create mode 100644 drivers/gpu/drm/i915/display/intel_display_irq.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_hotplug_irq.c + create mode 100644 drivers/gpu/drm/i915/display/intel_hotplug_irq.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 + create mode 100644 drivers/gpu/drm/i915/display/intel_modeset_lock.c + create mode 100644 drivers/gpu/drm/i915/display/intel_modeset_lock.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 (ac9a78681b92 Linux 6.4-rc1) +$ 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 (7e5a77cccd1f 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 | 267 +++++++------------------------------- + drivers/base/regmap/regmap-mmio.c | 2 +- + drivers/gpio/gpio-104-dio-48e.c | 37 ++++-- + include/linux/regmap.h | 33 +---- + 4 files changed, 73 insertions(+), 266 deletions(-) +Merging sound/for-next (9fe0731bc345 ALSA: emu10k1: remove runtime 64-bit divisions) +$ 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. + Documentation/sound/cards/audigy-mixer.rst | 38 +- + Documentation/sound/cards/sb-live-mixer.rst | 2 +- + include/sound/core.h | 2 +- + include/sound/emu10k1.h | 194 ++-- + include/uapi/sound/asound.h | 4 + + include/uapi/sound/emu10k1.h | 8 +- + sound/core/control_compat.c | 14 +- + sound/pci/emu10k1/emu10k1.c | 8 +- + sound/pci/emu10k1/emu10k1_main.c | 296 +----- + sound/pci/emu10k1/emufx.c | 762 +++++++-------- + sound/pci/emu10k1/emumixer.c | 1342 ++++++++++++++------------- + sound/pci/emu10k1/emupcm.c | 174 ++-- + sound/pci/emu10k1/emuproc.c | 24 +- + sound/pci/emu10k1/io.c | 141 +-- + sound/pci/emu10k1/timer.c | 6 - + 15 files changed, 1385 insertions(+), 1630 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 (d1b1112234a5 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 +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Resolved 'MAINTAINERS' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 216ef294a1dd] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/sound/adi,ssm2518.yaml | 47 + + .../devicetree/bindings/sound/adi,ssm3515.yaml | 49 + + .../bindings/sound/google,sc7180-trogdor.yaml | 3 +- + .../devicetree/bindings/sound/ingenic,aic.yaml | 1 + + .../bindings/sound/mediatek,mt8188-afe.yaml | 66 +- + .../devicetree/bindings/sound/nau8315.txt | 24 - + .../devicetree/bindings/sound/nau8540.txt | 16 - + .../devicetree/bindings/sound/nau8810.txt | 17 - + .../devicetree/bindings/sound/nau8824.txt | 88 -- + .../devicetree/bindings/sound/nau8825.txt | 111 -- + .../devicetree/bindings/sound/nuvoton,nau8315.yaml | 44 + + .../devicetree/bindings/sound/nuvoton,nau8540.yaml | 40 + + .../devicetree/bindings/sound/nuvoton,nau8810.yaml | 45 + + .../devicetree/bindings/sound/nuvoton,nau8824.yaml | 182 +++ + .../devicetree/bindings/sound/nuvoton,nau8825.yaml | 239 +++ + .../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/ssm2518.txt | 20 - + .../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 +- + MAINTAINERS | 2 + + include/dt-bindings/sound/qcom,q6dsp-lpass-ports.h | 8 + + include/sound/simple_card_utils.h | 1 - + include/sound/soc-acpi-intel-match.h | 2 + + include/sound/soc-component.h | 4 + + 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 | 65 +- + sound/soc/amd/ps/ps-pdm-dma.c | 63 +- + sound/soc/amd/yc/acp6x-mach.c | 7 + + sound/soc/atmel/atmel-classd.c | 8 +- + sound/soc/atmel/atmel-pdmic.c | 8 +- + sound/soc/codecs/Kconfig | 13 + + sound/soc/codecs/Makefile | 4 + + 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 | 13 +- + 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/ssm3515.c | 448 ++++++ + 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/codecs/wm_adsp.c | 20 +- + 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 | 21 +- + sound/soc/intel/boards/sof_pcm512x.c | 3 +- + sound/soc/intel/boards/sof_rt5682.c | 14 +- + sound/soc/intel/boards/sof_sdw.c | 62 +- + sound/soc/intel/boards/sof_ssp_amp.c | 18 +- + sound/soc/intel/common/Makefile | 1 + + sound/soc/intel/common/soc-acpi-intel-lnl-match.c | 72 + + sound/soc/intel/common/soc-acpi-intel-mtl-match.c | 57 + + sound/soc/intel/common/soc-acpi-intel-rpl-match.c | 12 + + sound/soc/jz4740/jz4740-i2s.c | 9 + + sound/soc/mediatek/mt8188/mt8188-afe-clk.c | 150 +- + sound/soc/mediatek/mt8188/mt8188-afe-clk.h | 15 + + sound/soc/mediatek/mt8188/mt8188-afe-pcm.c | 113 +- + sound/soc/mediatek/mt8188/mt8188-dai-adda.c | 37 - + sound/soc/mediatek/mt8188/mt8188-dai-etdm.c | 922 +++++++----- + sound/soc/mediatek/mt8188/mt8188-reg.h | 2 + + 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/qcom/qdsp6/audioreach.c | 75 + + sound/soc/qcom/qdsp6/audioreach.h | 12 + + sound/soc/qcom/qdsp6/q6afe-dai.c | 34 +- + sound/soc/qcom/qdsp6/q6apm-lpass-dais.c | 39 + + sound/soc/qcom/qdsp6/q6dsp-common.c | 35 + + sound/soc/qcom/qdsp6/q6dsp-common.h | 1 + + sound/soc/qcom/qdsp6/q6dsp-lpass-ports.c | 43 +- + sound/soc/soc-component.c | 22 + + sound/soc/soc-topology.c | 22 +- + sound/soc/soc-utils.c | 7 + + sound/soc/sof/intel/Kconfig | 3 +- + sound/soc/sof/intel/hda-bus.c | 11 +- + sound/soc/sof/intel/hda-dai-ops.c | 73 +- + sound/soc/sof/intel/hda-dai.c | 104 +- + sound/soc/sof/intel/hda.h | 2 +- + sound/soc/sof/ipc4-pcm.c | 4 +- + sound/soc/sof/ipc4-topology.c | 382 +++-- + sound/soc/sof/mediatek/mt8186/mt8186.c | 36 +- + sound/soc/sof/mediatek/mt8195/mt8195.c | 36 +- + sound/soc/sof/nocodec.c | 8 +- + sound/soc/sof/pcm.c | 2 +- + sound/soc/tegra/tegra210_adx.c | 2 +- + sound/soc/ti/omap-hdmi.c | 8 +- + 290 files changed, 5590 insertions(+), 1709 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/adi,ssm2518.yaml + create mode 100644 Documentation/devicetree/bindings/sound/adi,ssm3515.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/nau8315.txt + delete mode 100644 Documentation/devicetree/bindings/sound/nau8540.txt + delete mode 100644 Documentation/devicetree/bindings/sound/nau8810.txt + delete mode 100644 Documentation/devicetree/bindings/sound/nau8824.txt + delete mode 100644 Documentation/devicetree/bindings/sound/nau8825.txt + create mode 100644 Documentation/devicetree/bindings/sound/nuvoton,nau8315.yaml + create mode 100644 Documentation/devicetree/bindings/sound/nuvoton,nau8540.yaml + create mode 100644 Documentation/devicetree/bindings/sound/nuvoton,nau8810.yaml + create mode 100644 Documentation/devicetree/bindings/sound/nuvoton,nau8824.yaml + create mode 100644 Documentation/devicetree/bindings/sound/nuvoton,nau8825.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/ssm2518.txt + 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 + create mode 100644 sound/soc/codecs/ssm3515.c + create mode 100644 sound/soc/intel/common/soc-acpi-intel-lnl-match.c +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 (d8bde56dfd86 Input: Switch i2c drivers back to use .probe()) +$ 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 +Auto-merging drivers/input/touchscreen/goodix.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/input/atmel,maxtouch.yaml | 7 ++ + .../devicetree/bindings/input/cypress,cyapa.txt | 42 ----------- + .../devicetree/bindings/input/cypress,cyapa.yaml | 49 ++++++++++++ + .../devicetree/bindings/input/pwm-vibrator.yaml | 2 + + .../input/touchscreen/cypress,tt21000.yaml | 2 + + drivers/input/Kconfig | 2 +- + drivers/input/input.c | 6 +- + drivers/input/joystick/as5011.c | 2 +- + drivers/input/joystick/qwiic-joystick.c | 2 +- + drivers/input/keyboard/adp5588-keys.c | 2 +- + drivers/input/keyboard/adp5589-keys.c | 2 +- + drivers/input/keyboard/cap11xx.c | 2 +- + drivers/input/keyboard/cypress-sf.c | 2 +- + drivers/input/keyboard/dlink-dir685-touchkeys.c | 2 +- + drivers/input/keyboard/lm8323.c | 2 +- + drivers/input/keyboard/lm8333.c | 2 +- + drivers/input/keyboard/max7359_keypad.c | 2 +- + drivers/input/keyboard/mcs_touchkey.c | 2 +- + drivers/input/keyboard/mpr121_touchkey.c | 2 +- + drivers/input/keyboard/pinephone-keyboard.c | 2 +- + drivers/input/keyboard/qt1050.c | 2 +- + drivers/input/keyboard/qt1070.c | 2 +- + drivers/input/keyboard/qt2160.c | 2 +- + drivers/input/keyboard/tca6416-keypad.c | 2 +- + drivers/input/keyboard/tca8418_keypad.c | 2 +- + drivers/input/keyboard/tm2-touchkey.c | 2 +- + drivers/input/misc/ad714x-i2c.c | 2 +- + drivers/input/misc/adxl34x-i2c.c | 2 +- + drivers/input/misc/adxl34x.c | 3 +- + drivers/input/misc/apanel.c | 2 +- + drivers/input/misc/atmel_captouch.c | 2 +- + drivers/input/misc/bma150.c | 2 +- + drivers/input/misc/cma3000_d0x_i2c.c | 2 +- + drivers/input/misc/da7280.c | 2 +- + drivers/input/misc/drv260x.c | 58 +++------------ + drivers/input/misc/drv2665.c | 2 +- + drivers/input/misc/drv2667.c | 2 +- + drivers/input/misc/ibm-panel.c | 2 +- + drivers/input/misc/iqs269a.c | 2 +- + drivers/input/misc/iqs626a.c | 2 +- + drivers/input/misc/iqs7222.c | 2 +- + drivers/input/misc/kxtj9.c | 2 +- + drivers/input/misc/mma8450.c | 2 +- + drivers/input/misc/pcf8574_keypad.c | 2 +- + drivers/input/misc/pwm-vibra.c | 36 ++++++--- + drivers/input/misc/uinput.c | 34 +++++++++ + drivers/input/mouse/cyapa.c | 2 +- + drivers/input/mouse/elan_i2c_core.c | 2 +- + drivers/input/mouse/synaptics_i2c.c | 2 +- + drivers/input/rmi4/rmi_i2c.c | 2 +- + drivers/input/rmi4/rmi_smbus.c | 2 +- + drivers/input/tests/input_test.c | 6 +- + drivers/input/touchscreen/ad7879-i2c.c | 2 +- + drivers/input/touchscreen/ar1021_i2c.c | 2 +- + drivers/input/touchscreen/atmel_mxt_ts.c | 87 +++++++++++++++++++++- + drivers/input/touchscreen/auo-pixcir-ts.c | 2 +- + drivers/input/touchscreen/bu21013_ts.c | 2 +- + drivers/input/touchscreen/bu21029_ts.c | 2 +- + drivers/input/touchscreen/chipone_icn8318.c | 2 +- + drivers/input/touchscreen/chipone_icn8505.c | 2 +- + drivers/input/touchscreen/cy8ctma140.c | 2 +- + drivers/input/touchscreen/cy8ctmg110_ts.c | 2 +- + drivers/input/touchscreen/cyttsp4_core.c | 3 +- + drivers/input/touchscreen/cyttsp4_i2c.c | 2 +- + drivers/input/touchscreen/cyttsp5.c | 84 +++++++++++++++++++-- + drivers/input/touchscreen/cyttsp_i2c.c | 2 +- + drivers/input/touchscreen/edt-ft5x06.c | 3 +- + drivers/input/touchscreen/eeti_ts.c | 2 +- + drivers/input/touchscreen/egalax_ts.c | 2 +- + drivers/input/touchscreen/ektf2127.c | 2 +- + drivers/input/touchscreen/elants_i2c.c | 2 +- + drivers/input/touchscreen/exc3000.c | 2 +- + drivers/input/touchscreen/goodix.c | 2 +- + drivers/input/touchscreen/hideep.c | 2 +- + drivers/input/touchscreen/himax_hx83112b.c | 2 +- + drivers/input/touchscreen/hycon-hy46xx.c | 2 +- + drivers/input/touchscreen/hynitron_cstxxx.c | 2 +- + drivers/input/touchscreen/ili210x.c | 38 ++++++---- + drivers/input/touchscreen/ilitek_ts_i2c.c | 2 +- + drivers/input/touchscreen/imagis.c | 2 +- + drivers/input/touchscreen/iqs5xx.c | 2 +- + drivers/input/touchscreen/max11801_ts.c | 2 +- + drivers/input/touchscreen/mcs5000_ts.c | 2 +- + drivers/input/touchscreen/melfas_mip4.c | 2 +- + drivers/input/touchscreen/migor_ts.c | 2 +- + drivers/input/touchscreen/mms114.c | 2 +- + drivers/input/touchscreen/msg2638.c | 2 +- + drivers/input/touchscreen/novatek-nvt-ts.c | 2 +- + drivers/input/touchscreen/pixcir_i2c_ts.c | 2 +- + drivers/input/touchscreen/raydium_i2c_ts.c | 2 +- + drivers/input/touchscreen/rohm_bu21023.c | 2 +- + drivers/input/touchscreen/s6sy761.c | 2 +- + drivers/input/touchscreen/silead.c | 2 +- + drivers/input/touchscreen/sis_i2c.c | 2 +- + drivers/input/touchscreen/st1232.c | 2 +- + drivers/input/touchscreen/stmfts.c | 2 +- + drivers/input/touchscreen/sx8654.c | 2 +- + drivers/input/touchscreen/tsc2004.c | 2 +- + drivers/input/touchscreen/tsc2007_core.c | 2 +- + drivers/input/touchscreen/wacom_i2c.c | 2 +- + drivers/input/touchscreen/wdt87xx_i2c.c | 2 +- + drivers/input/touchscreen/zet6223.c | 2 +- + drivers/input/touchscreen/zforce_ts.c | 2 +- + drivers/input/touchscreen/zinitix.c | 2 +- + include/linux/i8042.h | 1 + + 105 files changed, 418 insertions(+), 219 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/input/cypress,cyapa.txt + create mode 100644 Documentation/devicetree/bindings/input/cypress,cyapa.yaml +Merging block/for-next (617bfe921735 Merge branch 'for-6.5/io_uring' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next +Merge made by the 'ort' strategy. + block/fops.c | 5 +- + drivers/block/brd.c | 93 ++++++-------------- + include/linux/io_uring_types.h | 10 +++ + include/uapi/linux/io_uring.h | 16 +++- + io_uring/io_uring.c | 189 ++++++++++++++++++++++++++++++----------- + io_uring/io_uring.h | 3 + + io_uring/net.c | 49 ++++++----- + io_uring/tctx.c | 41 +++++---- + net/socket.c | 1 + + 9 files changed, 247 insertions(+), 160 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 (f19c694f744f ata: pata_parport: Fix frpw module code indentation and style) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git libata/for-next +Merge made by the 'ort' strategy. + drivers/ata/ahci_brcm.c | 6 +- + drivers/ata/ahci_ceva.c | 2 +- + drivers/ata/ahci_da850.c | 2 +- + drivers/ata/ahci_dm816.c | 2 +- + drivers/ata/ahci_dwc.c | 2 +- + drivers/ata/ahci_imx.c | 2 +- + drivers/ata/ahci_mtk.c | 2 +- + drivers/ata/ahci_mvebu.c | 2 +- + drivers/ata/ahci_platform.c | 2 +- + drivers/ata/ahci_qoriq.c | 2 +- + drivers/ata/ahci_seattle.c | 2 +- + drivers/ata/ahci_st.c | 2 +- + drivers/ata/ahci_sunxi.c | 2 +- + drivers/ata/ahci_tegra.c | 2 +- + drivers/ata/ahci_xgene.c | 2 +- + drivers/ata/libata-core.c | 10 +- + drivers/ata/pata_ixp4xx_cf.c | 2 +- + drivers/ata/pata_of_platform.c | 2 +- + drivers/ata/pata_parport/bpck.c | 466 +++++++++++++++++++++++----------------- + drivers/ata/pata_parport/frpw.c | 382 ++++++++++++++++---------------- + drivers/ata/pata_platform.c | 2 +- + drivers/ata/sata_highbank.c | 2 +- + include/linux/libata.h | 2 +- + 23 files changed, 488 insertions(+), 414 deletions(-) +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 (d4ebc9419afb Merge branch 'fixes' into next) +$ 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/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 +- + 8 files changed, 56 insertions(+), 28 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/mmc/brcm,kona-sdhci.txt + create mode 100644 Documentation/devicetree/bindings/mmc/brcm,kona-sdhci.yaml +Merging mfd/for-mfd-next (9bdc4322bbd1 mfd: Remove redundant dev_set_drvdata() from I2C drivers) +$ 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 +Auto-merging sound/soc/codecs/Kconfig +Merge made by the 'ort' strategy. + .../devicetree/bindings/mfd/rockchip,rk806.yaml | 406 ++++++++++++++++++++ + drivers/clk/Kconfig | 2 +- + drivers/clk/clk-rk808.c | 34 +- + drivers/fpga/intel-m10-bmc-sec-update.c | 47 ++- + drivers/hwmon/intel-m10-bmc-hwmon.c | 1 + + drivers/input/misc/Kconfig | 2 +- + drivers/mfd/88pm80x.c | 1 - + drivers/mfd/88pm860x-core.c | 1 - + drivers/mfd/Kconfig | 21 +- + drivers/mfd/Makefile | 4 +- + drivers/mfd/aat2870-core.c | 2 - + drivers/mfd/axp20x-i2c.c | 2 + + drivers/mfd/axp20x.c | 78 +++- + drivers/mfd/dln2.c | 1 - + drivers/mfd/intel-m10-bmc-core.c | 90 ++++- + drivers/mfd/intel-m10-bmc-pmci.c | 1 + + drivers/mfd/intel-m10-bmc-spi.c | 15 + + drivers/mfd/lm3533-core.c | 2 - + drivers/mfd/max8907.c | 2 - + drivers/mfd/max8925-i2c.c | 1 - + drivers/mfd/rc5t583-irq.c | 2 +- + drivers/mfd/{rk808.c => rk8xx-core.c} | 352 ++++++----------- + drivers/mfd/rk8xx-i2c.c | 185 +++++++++ + drivers/mfd/rk8xx-spi.c | 124 ++++++ + drivers/mfd/wm831x-core.c | 2 +- + drivers/mfd/wm8400-core.c | 2 - + drivers/mfd/wm8994-core.c | 2 - + drivers/pinctrl/Kconfig | 2 +- + drivers/pinctrl/pinctrl-rk805.c | 189 ++++++++-- + drivers/power/supply/Kconfig | 2 +- + drivers/regulator/Kconfig | 2 +- + drivers/rtc/Kconfig | 2 +- + include/linux/mfd/axp20x.h | 32 ++ + include/linux/mfd/intel-m10-bmc.h | 45 ++- + include/linux/mfd/rk808.h | 417 ++++++++++++++++++++- + sound/soc/codecs/Kconfig | 2 +- + 36 files changed, 1741 insertions(+), 334 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mfd/rockchip,rk806.yaml + rename drivers/mfd/{rk808.c => rk8xx-core.c} (71%) + create mode 100644 drivers/mfd/rk8xx-i2c.c + create mode 100644 drivers/mfd/rk8xx-spi.c +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 (eae36cb82440 power: reset: add HAS_IOPORT dependencies) +$ 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 ++ + .../supply/x-powers,axp20x-usb-power-supply.yaml | 1 + + drivers/power/reset/Kconfig | 1 + + drivers/power/reset/gpio-restart.c | 7 +- + drivers/power/supply/axp20x_usb_power.c | 307 ++++++++++----------- + 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 +- + 14 files changed, 283 insertions(+), 205 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 (dd5250193155 Merge remote-tracking branch 'regulator/for-6.5' into regulator-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next +Auto-merging drivers/regulator/Kconfig +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 (2c085f3a8f23 smack: Record transmuting in smk_transmuted) +$ git merge -m Merge branch 'next' of git://github.com/cschaufler/smack-next smack/next +Merge made by the 'ort' strategy. + security/smack/smack.h | 1 + + security/smack/smack_lsm.c | 63 ++++++++++++++++++++++++++++++++++------------ + 2 files changed, 48 insertions(+), 16 deletions(-) +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 (e7d3e5c4b1dd tpm/tpm_tis: Disable interrupts for more Lenovo devices) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tpmdd/next +Already up to date. +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 (e455ca40dbcf audit: avoid missing-prototype warnings) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git audit/next +Merge made by the 'ort' strategy. + include/linux/audit.h | 2 -- + include/linux/audit_arch.h | 2 ++ + kernel/audit.h | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) +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 (0ff3c07556e6 Merge branch 'next/dt64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk/for-next +Auto-merging arch/arm/boot/dts/mba6ulx.dtsi +Merge made by the 'ort' strategy. + .../bindings/pinctrl/qcom,ipq9574-tlmm.yaml | 11 +-------- + .../bindings/pinctrl/qcom,qcm2290-tlmm.yaml | 11 +-------- + .../bindings/pinctrl/qcom,sc8280xp-tlmm.yaml | 12 +--------- + .../bindings/pinctrl/qcom,sm7150-tlmm.yaml | 11 +-------- + arch/arm/boot/dts/en7523.dtsi | 2 ++ + arch/arm/boot/dts/mba6ulx.dtsi | 2 +- + arch/arm/boot/dts/ste-dbx5x0.dtsi | 6 ++--- + arch/arm/boot/dts/ste-href.dtsi | 6 ++--- + arch/arm/boot/dts/ste-hrefprev60.dtsi | 2 +- + arch/arm/boot/dts/ste-nomadik-nhk15.dts | 2 +- + arch/arm/boot/dts/ste-nomadik-s8815.dts | 2 +- + arch/arm/boot/dts/ste-nomadik-stn8815.dtsi | 6 ++--- + arch/arm/boot/dts/ste-snowball.dts | 6 ++--- + arch/arm/boot/dts/ste-ux500-samsung-codina-tmo.dts | 6 ++--- + arch/arm/boot/dts/ste-ux500-samsung-codina.dts | 6 ++--- + arch/arm/boot/dts/ste-ux500-samsung-gavini.dts | 6 ++--- + arch/arm/boot/dts/ste-ux500-samsung-golden.dts | 6 ++--- + arch/arm/boot/dts/ste-ux500-samsung-janice.dts | 6 ++--- + arch/arm/boot/dts/ste-ux500-samsung-kyle.dts | 6 ++--- + arch/arm/boot/dts/ste-ux500-samsung-skomer.dts | 6 ++--- + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 1 + + arch/arm64/boot/dts/amazon/alpine-v3.dtsi | 4 ++++ + arch/arm64/boot/dts/apm/apm-shadowcat.dtsi | 8 +++++++ + arch/arm64/boot/dts/apm/apm-storm.dtsi | 8 +++++++ + arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 2 ++ + arch/arm64/boot/dts/hisilicon/hi6220.dtsi | 2 ++ + arch/arm64/boot/dts/hisilicon/hip05.dtsi | 4 ++++ + arch/arm64/boot/dts/hisilicon/hip06.dtsi | 4 ++++ + arch/arm64/boot/dts/hisilicon/hip07.dtsi | 16 +++++++++++++ + arch/arm64/boot/dts/microchip/sparx5.dtsi | 10 +++++---- + .../boot/dts/microchip/sparx5_pcb134_board.dtsi | 26 +++++++++++----------- + .../boot/dts/microchip/sparx5_pcb135_board.dtsi | 10 ++++----- + .../boot/dts/microchip/sparx5_pcb_common.dtsi | 12 ++++++++++ + arch/arm64/boot/dts/realtek/rtd1293.dtsi | 2 ++ + arch/arm64/boot/dts/realtek/rtd1295.dtsi | 2 ++ + arch/arm64/boot/dts/realtek/rtd1296.dtsi | 2 ++ + arch/arm64/boot/dts/realtek/rtd1395.dtsi | 2 ++ + arch/arm64/boot/dts/realtek/rtd16xx.dtsi | 4 ++++ + arch/arm64/boot/dts/synaptics/berlin4ct.dtsi | 2 ++ + 39 files changed, 142 insertions(+), 100 deletions(-) +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 (5e41763e97db Merge remote-tracking branch 'spi/for-6.5' into spi-next) +$ 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/allwinner,sun6i-a31-spi.yaml | 10 + + .../devicetree/bindings/spi/cdns,qspi-nor.yaml | 18 +- + .../bindings/spi/qcom,spi-qcom-qspi.yaml | 3 + + .../devicetree/bindings/spi/spi-zynqmp-qspi.yaml | 6 + + drivers/spi/spi-cadence-quadspi.c | 19 ++ + drivers/spi/spi-dw-core.c | 5 +- + drivers/spi/spi-dw-dma.c | 76 +++++-- + drivers/spi/spi-dw.h | 1 + + 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 ++++++-- + drivers/spi/spi-sun6i.c | 131 +++++++++---- + include/linux/platform_data/spi-s3c64xx.h | 1 + + 14 files changed, 497 insertions(+), 80 deletions(-) +Merging tip/master (f81d8f759e7f Merge x86/cpu 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 CREDITS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging arch/arm64/Kconfig +Auto-merging tools/perf/arch/x86/include/arch-tests.h +CONFLICT (content): Merge conflict in tools/perf/arch/x86/include/arch-tests.h +Auto-merging tools/perf/arch/x86/tests/Build +Auto-merging tools/perf/arch/x86/tests/arch-tests.c +CONFLICT (content): Merge conflict in tools/perf/arch/x86/tests/arch-tests.c +Resolved 'tools/perf/arch/x86/include/arch-tests.h' using previous resolution. +Resolved 'tools/perf/arch/x86/tests/arch-tests.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 5125bee3d5f9] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git +$ git diff -M --stat --summary HEAD^.. + CREDITS | 6 + + Documentation/admin-guide/kernel-parameters.txt | 20 +- + Documentation/core-api/cpu_hotplug.rst | 13 +- + Documentation/process/maintainer-tip.rst | 3 + + MAINTAINERS | 6 +- + arch/Kconfig | 23 + + arch/arm/Kconfig | 1 + + arch/arm/include/asm/smp.h | 2 +- + arch/arm/kernel/smp.c | 18 +- + arch/arm64/Kconfig | 1 + + arch/arm64/include/asm/smp.h | 2 +- + arch/arm64/kernel/smp.c | 14 +- + arch/csky/Kconfig | 1 + + arch/csky/include/asm/smp.h | 2 +- + arch/csky/kernel/smp.c | 8 +- + arch/mips/Kconfig | 1 + + arch/mips/cavium-octeon/smp.c | 1 + + arch/mips/include/asm/smp-ops.h | 1 + + arch/mips/kernel/smp-bmips.c | 1 + + arch/mips/kernel/smp-cps.c | 14 +- + arch/mips/kernel/smp.c | 8 + + arch/mips/loongson64/smp.c | 1 + + arch/parisc/Kconfig | 1 + + arch/parisc/kernel/process.c | 4 +- + arch/parisc/kernel/smp.c | 7 +- + arch/riscv/Kconfig | 1 + + arch/riscv/include/asm/smp.h | 2 +- + arch/riscv/kernel/cpu-hotplug.c | 14 +- + arch/x86/Kconfig | 57 +-- + arch/x86/Kconfig.cpu | 2 +- + arch/x86/boot/Makefile | 2 - + arch/x86/boot/cpu.c | 13 - + arch/x86/coco/core.c | 10 +- + arch/x86/coco/tdx/tdx.c | 2 +- + arch/x86/events/amd/core.c | 2 +- + arch/x86/events/amd/ibs.c | 53 ++- + arch/x86/events/intel/core.c | 18 +- + arch/x86/hyperv/ivm.c | 2 +- + arch/x86/include/asm/apic.h | 5 +- + arch/x86/include/asm/apicdef.h | 5 +- + arch/x86/include/asm/coco.h | 19 +- + arch/x86/include/asm/cpu.h | 5 +- + arch/x86/include/asm/cpufeature.h | 5 - + arch/x86/include/asm/cpumask.h | 5 - + arch/x86/include/asm/perf_event.h | 12 + + arch/x86/include/asm/pgtable_64.h | 4 +- + arch/x86/include/asm/processor.h | 1 - + arch/x86/include/asm/realmode.h | 3 + + arch/x86/include/asm/sev.h | 11 +- + arch/x86/include/asm/smp.h | 24 +- + arch/x86/include/asm/topology.h | 22 +- + arch/x86/include/asm/tsc.h | 2 - + arch/x86/kernel/acpi/sleep.c | 9 +- + arch/x86/kernel/alternative.c | 455 ++++++++++++------- + arch/x86/kernel/apic/apic.c | 26 +- + arch/x86/kernel/callthunks.c | 4 +- + arch/x86/kernel/cpu/Makefile | 4 +- + arch/x86/kernel/cpu/cacheinfo.c | 21 +- + arch/x86/kernel/cpu/common.c | 54 +-- + arch/x86/kernel/cpu/mce/core.c | 2 +- + arch/x86/kernel/cpu/microcode/amd.c | 11 +- + arch/x86/kernel/head_32.S | 14 - + arch/x86/kernel/head_64.S | 85 +++- + arch/x86/kernel/itmt.c | 23 +- + arch/x86/kernel/sev.c | 7 +- + arch/x86/kernel/smp.c | 3 +- + arch/x86/kernel/smpboot.c | 548 ++++++++--------------- + arch/x86/kernel/topology.c | 98 +--- + arch/x86/kernel/tsc.c | 20 +- + arch/x86/kernel/tsc_sync.c | 36 +- + arch/x86/kernel/vmlinux.lds.S | 4 + + arch/x86/lib/memmove_64.S | 13 +- + arch/x86/lib/retpoline.S | 2 +- + arch/x86/mm/mem_encrypt_identity.c | 2 +- + arch/x86/power/cpu.c | 37 -- + arch/x86/realmode/init.c | 3 + + arch/x86/realmode/rm/trampoline_64.S | 23 +- + arch/x86/xen/enlighten_hvm.c | 11 +- + arch/x86/xen/smp_hvm.c | 16 +- + arch/x86/xen/smp_pv.c | 56 +-- + drivers/acpi/processor_idle.c | 4 - + drivers/ras/debugfs.c | 2 +- + include/linux/cpu.h | 4 - + include/linux/cpuhotplug.h | 17 + + include/linux/lockdep.h | 14 + + include/linux/lockdep_types.h | 1 + + include/linux/perf_event.h | 10 + + include/linux/sched/sd_flags.h | 5 +- + kernel/cgroup/cgroup.c | 12 + + kernel/cpu.c | 416 +++++++++++++++-- + kernel/events/core.c | 114 +++-- + kernel/locking/lockdep.c | 28 +- + kernel/sched/debug.c | 2 +- + kernel/sched/fair.c | 218 ++++----- + kernel/sched/psi.c | 4 +- + kernel/sched/sched.h | 22 +- + kernel/sched/topology.c | 7 +- + kernel/smp.c | 2 +- + kernel/smpboot.c | 163 ------- + kernel/softirq.c | 22 +- + lib/debugobjects.c | 15 +- + tools/arch/x86/kcpuid/.gitignore | 1 + + tools/arch/x86/kcpuid/kcpuid.c | 7 +- + tools/objtool/arch/x86/special.c | 8 +- + tools/perf/arch/x86/include/arch-tests.h | 1 + + tools/perf/arch/x86/tests/Build | 1 + + tools/perf/arch/x86/tests/amd-ibs-via-core-pmu.c | 71 +++ + tools/perf/arch/x86/tests/arch-tests.c | 2 + + 108 files changed, 1693 insertions(+), 1527 deletions(-) + create mode 100644 tools/arch/x86/kcpuid/.gitignore + create mode 100644 tools/perf/arch/x86/tests/amd-ibs-via-core-pmu.c +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 (6c79e42169fe EDAC/amd64: Add support for ECC on family 19h model 60h-7Fh) +$ 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. + drivers/edac/amd64_edac.c | 12 +++++++++--- + drivers/edac/amd64_edac.h | 1 - + 2 files changed, 9 insertions(+), 4 deletions(-) +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 (d6e962af2fdd Merge branch 'atomicdoc.2023.05.11a' into HEAD) +$ git merge -m Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git rcu/rcu/next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../RCU/Design/Requirements/Requirements.rst | 36 +- + Documentation/RCU/whatisRCU.rst | 1 - + Documentation/admin-guide/kernel-parameters.txt | 140 +-- + Documentation/core-api/kernel-api.rst | 12 + + Documentation/driver-api/basics.rst | 3 + + MAINTAINERS | 2 +- + arch/x86/include/asm/atomic.h | 76 +- + include/linux/atomic/atomic-arch-fallback.h | 1094 +++++++++++++++++++- + include/linux/rcupdate.h | 54 +- + 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 | 127 ++- + kernel/rcu/tree_exp.h | 2 +- + kernel/rcu/tree_nocb.h | 56 +- + kernel/rcu/tree_plugin.h | 4 +- + scripts/atomic/acqrel.sh | 67 ++ + scripts/atomic/chkdup.sh | 27 + + scripts/atomic/fallbacks/acquire | 7 +- + scripts/atomic/fallbacks/add_negative | 10 +- + scripts/atomic/fallbacks/add_unless | 9 +- + scripts/atomic/fallbacks/andnot | 13 + + scripts/atomic/fallbacks/dec | 12 + + scripts/atomic/fallbacks/dec_and_test | 9 +- + scripts/atomic/fallbacks/dec_if_positive | 16 + + scripts/atomic/fallbacks/dec_unless_positive | 13 + + scripts/atomic/fallbacks/fence | 5 + + scripts/atomic/fallbacks/fetch_add_unless | 7 +- + scripts/atomic/fallbacks/inc | 12 + + scripts/atomic/fallbacks/inc_and_test | 9 +- + scripts/atomic/fallbacks/inc_not_zero | 9 +- + scripts/atomic/fallbacks/inc_unless_negative | 13 + + scripts/atomic/fallbacks/read_acquire | 12 + + scripts/atomic/fallbacks/release | 5 + + scripts/atomic/fallbacks/set_release | 12 + + scripts/atomic/fallbacks/sub_and_test | 9 +- + scripts/atomic/fallbacks/try_cmpxchg | 17 + + scripts/atomic/gen-atomic-fallback.sh | 20 + + scripts/atomic/gen-atomic-instrumented.sh | 20 + + scripts/atomic/gen-atomics.sh | 4 + + tools/include/nolibc/arch-aarch64.h | 32 +- + tools/include/nolibc/arch-arm.h | 44 +- + tools/include/nolibc/arch-i386.h | 40 +- + tools/include/nolibc/arch-loongarch.h | 38 +- + tools/include/nolibc/arch-mips.h | 54 +- + tools/include/nolibc/arch-riscv.h | 36 +- + tools/include/nolibc/arch-s390.h | 11 +- + tools/include/nolibc/arch-x86_64.h | 34 +- + tools/include/nolibc/nolibc.h | 2 +- + tools/include/nolibc/stackprotector.h | 4 +- + tools/include/nolibc/stdio.h | 95 +- + tools/include/nolibc/stdlib.h | 18 +- + tools/include/nolibc/string.h | 4 +- + tools/include/nolibc/sys.h | 34 +- + tools/include/nolibc/types.h | 8 - + tools/testing/selftests/nolibc/.gitignore | 1 + + tools/testing/selftests/nolibc/Makefile | 8 +- + tools/testing/selftests/nolibc/nolibc-test.c | 131 ++- + .../testing/selftests/rcutorture/bin/functions.sh | 2 +- + .../rcutorture/configs/rcu/BUSTED-BOOST.boot | 2 +- + .../selftests/rcutorture/configs/rcu/TREE03.boot | 2 +- + 64 files changed, 2182 insertions(+), 656 deletions(-) + create mode 100644 scripts/atomic/acqrel.sh + create mode 100644 scripts/atomic/chkdup.sh +$ 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 10cadbbb5c8c] Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git + Date: Thu May 18 11:00:53 2023 +1000 +Merging kvm/next (39428f6ea9ea Merge tag 'kvmarm-fixes-6.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm 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 (801d857f9811 Merge branch kvm-arm64/eager-page-splitting into kvmarm/next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm/next +Auto-merging arch/arm64/include/asm/kvm_pgtable.h +Auto-merging arch/arm64/kvm/hyp/pgtable.c +Auto-merging virt/kvm/kvm_main.c +Merge made by the 'ort' strategy. + Documentation/virt/kvm/api.rst | 27 +++++ + arch/arm64/include/asm/kvm_asm.h | 4 + + arch/arm64/include/asm/kvm_host.h | 15 +++ + arch/arm64/include/asm/kvm_mmu.h | 1 + + arch/arm64/include/asm/kvm_pgtable.h | 79 ++++++++++++- + arch/arm64/kvm/arm.c | 28 +++++ + arch/arm64/kvm/hyp/nvhe/hyp-main.c | 10 ++ + arch/arm64/kvm/hyp/nvhe/mem_protect.c | 6 +- + arch/arm64/kvm/hyp/nvhe/tlb.c | 52 +++++++++ + arch/arm64/kvm/hyp/pgtable.c | 201 +++++++++++++++++++++++++++++--- + arch/arm64/kvm/hyp/vhe/tlb.c | 32 ++++++ + arch/arm64/kvm/mmu.c | 209 ++++++++++++++++++++++++++++------ + include/linux/kvm_host.h | 2 + + include/uapi/linux/kvm.h | 2 + + virt/kvm/kvm_main.c | 3 +- + 15 files changed, 613 insertions(+), 58 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) +$ 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 drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c +Auto-merging drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c +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 ++-- + kernel/workqueue.c | 2 ++ + 12 files changed, 22 insertions(+), 27 deletions(-) +Merging drivers-x86/for-next (f5a08ed51ed7 platform/x86: toshiba: constify pointers to hwmon_channel_info) +$ 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 +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/ABI/stable/sysfs-platform-wmi-bmof | 7 + + Documentation/ABI/testing/debugfs-dell-wmi-ddv | 29 +- + .../ABI/testing/sysfs-platform-dell-wmi-ddv | 4 +- + .../ABI/testing/sysfs-platform-mellanox-bootctl | 9 + + .../pm/intel_uncore_frequency_scaling.rst | 57 +- + Documentation/driver-api/index.rst | 1 + + Documentation/driver-api/wmi.rst | 21 + + Documentation/subsystem-apis.rst | 1 + + Documentation/wmi/acpi-interface.rst | 96 ++++ + Documentation/wmi/devices/dell-wmi-ddv.rst | 296 +++++++++++ + Documentation/wmi/devices/index.rst | 22 + + Documentation/wmi/devices/wmi-bmof.rst | 25 + + Documentation/wmi/index.rst | 19 + + MAINTAINERS | 10 + + drivers/platform/mellanox/mlxbf-bootctl.c | 144 +++++- + drivers/platform/x86/Kconfig | 10 +- + drivers/platform/x86/Makefile | 2 +- + drivers/platform/x86/amd/pmf/Kconfig | 11 + + drivers/platform/x86/amd/pmf/auto-mode.c | 143 +++++ + drivers/platform/x86/amd/pmf/cnqf.c | 75 +++ + drivers/platform/x86/amd/pmf/sps.c | 55 ++ + drivers/platform/x86/dell/dell-wmi-sysman/sysman.c | 13 +- + drivers/platform/x86/gigabyte-wmi.c | 46 +- + drivers/platform/x86/hp/hp-wmi.c | 60 ++- + .../platform/x86/intel/uncore-frequency/Kconfig | 4 + + .../platform/x86/intel/uncore-frequency/Makefile | 2 + + .../uncore-frequency/uncore-frequency-common.c | 51 +- + .../uncore-frequency/uncore-frequency-common.h | 16 +- + .../intel/uncore-frequency/uncore-frequency-tpmi.c | 413 +++++++++++++++ + .../x86/intel/uncore-frequency/uncore-frequency.c | 1 + + drivers/platform/x86/lenovo-yogabook-wmi.c | 408 --------------- + drivers/platform/x86/lenovo-yogabook.c | 573 +++++++++++++++++++++ + drivers/platform/x86/system76_acpi.c | 2 +- + drivers/platform/x86/toshiba_acpi.c | 2 +- + drivers/platform/x86/wmi.c | 104 +++- + drivers/platform/x86/x86-android-tablets/asus.c | 6 +- + drivers/platform/x86/x86-android-tablets/core.c | 32 +- + drivers/platform/x86/x86-android-tablets/dmi.c | 22 +- + drivers/platform/x86/x86-android-tablets/lenovo.c | 41 +- + drivers/platform/x86/x86-android-tablets/other.c | 112 +++- + .../x86/x86-android-tablets/x86-android-tablets.h | 5 +- + include/linux/acpi.h | 2 + + include/linux/wmi.h | 43 +- + 43 files changed, 2470 insertions(+), 525 deletions(-) + create mode 100644 Documentation/ABI/stable/sysfs-platform-wmi-bmof + create mode 100644 Documentation/driver-api/wmi.rst + create mode 100644 Documentation/wmi/acpi-interface.rst + create mode 100644 Documentation/wmi/devices/dell-wmi-ddv.rst + create mode 100644 Documentation/wmi/devices/index.rst + create mode 100644 Documentation/wmi/devices/wmi-bmof.rst + create mode 100644 Documentation/wmi/index.rst + create mode 100644 drivers/platform/x86/intel/uncore-frequency/uncore-frequency-tpmi.c + delete mode 100644 drivers/platform/x86/lenovo-yogabook-wmi.c + create mode 100644 drivers/platform/x86/lenovo-yogabook.c +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 (7a9496d0feb5 dt-bindings: leds: Drop redundant cpus enum match) +$ 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 +Auto-merging Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/leds/common.yaml | 2 - + .../devicetree/bindings/leds/leds-lp55xx.yaml | 10 ++ + .../devicetree/bindings/leds/leds-qcom-lpg.yaml | 1 + + .../devicetree/bindings/mfd/qcom,spmi-pmic.yaml | 1 + + drivers/leds/leds-lp5521.c | 11 +- + drivers/leds/leds-lp5523.c | 14 +- + drivers/leds/leds-lp55xx-common.c | 9 ++ + drivers/leds/leds-lp8501.c | 8 +- + drivers/leds/rgb/leds-qcom-lpg.c | 15 +++ + drivers/leds/trigger/ledtrig-netdev.c | 149 ++++++++------------- + include/dt-bindings/leds/leds-lp55xx.h | 10 ++ + include/linux/platform_data/leds-lp55xx.h | 3 + + 12 files changed, 126 insertions(+), 107 deletions(-) + create mode 100644 include/dt-bindings/leds/leds-lp55xx.h +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 (f1fcbaa18b28 Linux 6.4-rc2) +$ 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 (a4422ff22142 usb: typec: qcom: Add Qualcomm PMIC Type-C driver) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next +Auto-merging MAINTAINERS +Auto-merging drivers/usb/dwc3/core.c +Auto-merging drivers/usb/dwc3/core.h +Auto-merging drivers/usb/dwc3/gadget.c +CONFLICT (content): Merge conflict in drivers/usb/dwc3/gadget.c +Auto-merging drivers/usb/gadget/udc/core.c +CONFLICT (content): Merge conflict in drivers/usb/gadget/udc/core.c +Auto-merging drivers/usb/host/uhci-pci.c +Auto-merging drivers/usb/host/xhci-pci.c +Auto-merging drivers/usb/host/xhci.h +Resolved 'drivers/usb/dwc3/gadget.c' using previous resolution. +Resolved 'drivers/usb/gadget/udc/core.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 33e4acee669a] Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/usb/dwc2.yaml | 1 + + .../devicetree/bindings/usb/microchip,usb5744.yaml | 107 ++++ + .../devicetree/bindings/usb/qcom,pmic-typec.yaml | 190 +++++++ + MAINTAINERS | 10 + + drivers/usb/core/hcd-pci.c | 24 +- + drivers/usb/dwc2/params.c | 21 + + drivers/usb/dwc2/platform.c | 16 +- + drivers/usb/dwc3/core.c | 11 + + drivers/usb/dwc3/core.h | 2 + + drivers/usb/dwc3/dwc3-meson-g12a.c | 16 +- + drivers/usb/dwc3/ep0.c | 3 + + drivers/usb/dwc3/gadget.c | 9 +- + drivers/usb/gadget/udc/core.c | 20 +- + drivers/usb/host/ehci-pci.c | 3 +- + drivers/usb/host/ohci-pci.c | 8 +- + drivers/usb/host/uhci-pci.c | 7 +- + drivers/usb/host/xhci-histb.c | 2 +- + drivers/usb/host/xhci-pci.c | 4 +- + drivers/usb/host/xhci-plat.c | 8 +- + drivers/usb/host/xhci-tegra.c | 5 +- + drivers/usb/host/xhci.c | 5 +- + drivers/usb/host/xhci.h | 2 +- + drivers/usb/typec/Kconfig | 13 - + drivers/usb/typec/Makefile | 1 - + drivers/usb/typec/mux/gpio-sbu-mux.c | 5 +- + drivers/usb/typec/qcom-pmic-typec.c | 261 ---------- + drivers/usb/typec/tcpm/Kconfig | 11 + + drivers/usb/typec/tcpm/Makefile | 1 + + drivers/usb/typec/tcpm/qcom/Makefile | 6 + + drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c | 346 +++++++++++++ + .../usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.c | 528 +++++++++++++++++++ + .../usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.h | 119 +++++ + drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_port.c | 556 +++++++++++++++++++++ + drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_port.h | 195 ++++++++ + include/linux/usb/hcd.h | 2 +- + 35 files changed, 2188 insertions(+), 330 deletions(-) + create mode 100644 Documentation/devicetree/bindings/usb/microchip,usb5744.yaml + create mode 100644 Documentation/devicetree/bindings/usb/qcom,pmic-typec.yaml + delete mode 100644 drivers/usb/typec/qcom-pmic-typec.c + create mode 100644 drivers/usb/typec/tcpm/qcom/Makefile + create mode 100644 drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c + create mode 100644 drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.c + create mode 100644 drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.h + create mode 100644 drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_port.c + create mode 100644 drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_port.h +Merging thunderbolt/next (f1fcbaa18b28 Linux 6.4-rc2) +$ 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 (d5b3d02d0b10 serial: Make uart_remove_one_port() return void) +$ git merge -m Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next +Auto-merging drivers/tty/serial/8250/8250_port.c +Merge made by the 'ort' strategy. + arch/mips/alchemy/common/platform.c | 10 +- + drivers/tty/serial/8250/8250.h | 4 +- + drivers/tty/serial/8250/8250_core.c | 90 +++++++++++++----- + drivers/tty/serial/8250/8250_early.c | 21 ----- + drivers/tty/serial/8250/8250_em.c | 4 +- + drivers/tty/serial/8250/8250_of.c | 4 +- + drivers/tty/serial/8250/8250_omap.c | 141 +++++++++++++++------------- + drivers/tty/serial/8250/8250_port.c | 84 +---------------- + drivers/tty/serial/8250/8250_pxa.c | 2 +- + drivers/tty/serial/8250/8250_rt288x.c | 136 +++++++++++++++++++++++++++ + drivers/tty/serial/8250/8250_uniphier.c | 4 +- + drivers/tty/serial/8250/Makefile | 1 + + drivers/tty/serial/Makefile | 2 +- + drivers/tty/serial/amba-pl011.c | 7 ++ + drivers/tty/serial/atmel_serial.c | 5 +- + drivers/tty/serial/clps711x.c | 4 +- + drivers/tty/serial/cpm_uart/cpm_uart_core.c | 5 +- + drivers/tty/serial/fsl_lpuart.c | 50 +++++++++- + drivers/tty/serial/imx.c | 4 +- + drivers/tty/serial/lantiq.c | 4 +- + drivers/tty/serial/serial_core.c | 6 +- + drivers/tty/serial/st-asc.c | 4 +- + drivers/tty/serial/stm32-usart.c | 5 +- + drivers/tty/serial/uartlite.c | 12 +-- + drivers/tty/serial/xilinx_uartps.c | 5 +- + include/linux/serial_8250.h | 44 +++++++-- + include/linux/serial_core.h | 2 +- + 27 files changed, 420 insertions(+), 240 deletions(-) + create mode 100644 drivers/tty/serial/8250/8250_rt288x.c +Merging char-misc/char-misc-next (c21c0f9a20a9 Binder: Add async from to transaction record) +$ 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 +Auto-merging drivers/android/binder.c +Merge made by the 'ort' strategy. + drivers/android/binder.c | 15 +++++++++++---- + drivers/android/binder_internal.h | 3 +++ + 2 files changed, 14 insertions(+), 4 deletions(-) +Merging accel/habanalabs-next (e8478792ca56 accel/habanalabs: mask part of hmmu page fault captured address) +$ git merge -m Merge branch 'habanalabs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux.git accel/habanalabs-next +Merge made by the 'ort' strategy. + drivers/accel/habanalabs/common/command_buffer.c | 6 - + .../accel/habanalabs/common/command_submission.c | 184 ++++++++---- + drivers/accel/habanalabs/common/debugfs.c | 60 ++-- + drivers/accel/habanalabs/common/device.c | 94 +++--- + drivers/accel/habanalabs/common/firmware_if.c | 218 ++++++++++---- + drivers/accel/habanalabs/common/habanalabs.h | 53 ++-- + drivers/accel/habanalabs/common/habanalabs_drv.c | 6 +- + drivers/accel/habanalabs/common/habanalabs_ioctl.c | 29 +- + drivers/accel/habanalabs/common/memory.c | 104 +------ + drivers/accel/habanalabs/common/mmu/mmu.c | 56 +--- + drivers/accel/habanalabs/common/security.c | 57 ++-- + drivers/accel/habanalabs/gaudi/gaudi.c | 13 +- + drivers/accel/habanalabs/gaudi2/gaudi2.c | 324 ++++++++------------- + drivers/accel/habanalabs/gaudi2/gaudi2P.h | 2 +- + drivers/accel/habanalabs/gaudi2/gaudi2_security.c | 11 +- + drivers/accel/habanalabs/goya/goya.c | 3 - + drivers/accel/habanalabs/goya/goya_coresight.c | 9 +- + drivers/accel/habanalabs/include/common/cpucp_if.h | 22 +- + .../accel/habanalabs/include/common/hl_boot_if.h | 41 +-- + .../include/gaudi2/asic_reg/gaudi2_regs.h | 11 + + .../accel/habanalabs/include/gaudi2/gaudi2_fw_if.h | 2 +- + include/uapi/drm/habanalabs_accel.h | 1 + + 22 files changed, 617 insertions(+), 689 deletions(-) +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 fastrpc/for-next (3f6b4c6f0bd0 fastrpc: Don't assert held reservation lock for dma-buf mmapping) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/fastrpc.git fastrpc/for-next +Merge made by the 'ort' strategy. + drivers/misc/fastrpc.c | 34 +++++++++++++++++++++++----------- + 1 file changed, 23 insertions(+), 11 deletions(-) +Merging fpga/for-next (da4da5b2d708 fpga: dfl-fme: constify pointers to hwmon_channel_info) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga/for-next +Merge made by the 'ort' strategy. + drivers/fpga/dfl-fme-main.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +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 (a508fbfed333 iio: kx022a: Probe asynchronously) +$ git merge -m Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg +Auto-merging drivers/iio/accel/st_accel_core.c +Auto-merging drivers/iio/adc/palmas_gpadc.c +Auto-merging drivers/iio/adc/stm32-adc.c +Auto-merging drivers/iio/light/rohm-bu27034.c +Merge made by the 'ort' strategy. + .../bindings/iio/adc/mediatek,mt2701-auxadc.yaml | 1 + + .../bindings/iio/adc/qcom,spmi-vadc.yaml | 28 +- + .../devicetree/bindings/iio/light/ti,opt4001.yaml | 68 +++ + .../devicetree/bindings/iio/st,st-sensors.yaml | 1 + + drivers/iio/accel/bma400_core.c | 3 +- + drivers/iio/accel/kionix-kx022a-i2c.c | 1 + + drivers/iio/accel/kionix-kx022a-spi.c | 1 + + drivers/iio/accel/st_accel_core.c | 1 + + drivers/iio/adc/palmas_gpadc.c | 1 - + drivers/iio/adc/stm32-adc.c | 2 + + drivers/iio/imu/st_lsm9ds0/Kconfig | 3 +- + drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_i2c.c | 12 + + drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_spi.c | 5 + + drivers/iio/industrialio-buffer.c | 98 ++--- + drivers/iio/light/Kconfig | 11 + + drivers/iio/light/Makefile | 1 + + drivers/iio/light/al3320a.c | 8 + + drivers/iio/light/opt4001.c | 467 +++++++++++++++++++++ + drivers/iio/light/rohm-bu27034.c | 1 + + drivers/iio/magnetometer/st_magn_core.c | 1 + + include/linux/iio/common/st_sensors.h | 1 + + include/linux/platform_data/st_sensors_pdata.h | 2 +- + 22 files changed, 650 insertions(+), 67 deletions(-) + create mode 100644 Documentation/devicetree/bindings/iio/light/ti,opt4001.yaml + create mode 100644 drivers/iio/light/opt4001.c +Merging phy-next/next (8d087a09c701 phy: ti: gmii-sel: Enable USXGMII mode for J784S4) +$ 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 + + .../devicetree/bindings/phy/qcom,qusb2-phy.yaml | 3 +- + .../bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml | 4 +- + .../phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml | 45 +- + .../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/freescale/phy-fsl-imx8m-pcie.c | 4 +- + drivers/phy/hisilicon/Kconfig | 2 +- + drivers/phy/hisilicon/phy-hisi-inno-usb2.c | 60 +- + 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 | 160 +++++ + drivers/phy/qualcomm/phy-qcom-qusb2.c | 3 + + drivers/phy/samsung/Kconfig | 2 +- + drivers/phy/ti/phy-gmii-sel.c | 34 +- + 20 files changed, 1256 insertions(+), 405 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 ee9f3f32f433] 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 | 157 +++++++-- + drivers/extcon/extcon.c | 368 ++++++++++++--------- + drivers/extcon/extcon.h | 8 +- + 8 files changed, 356 insertions(+), 199 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 (b332af5398a3 w1: Replace usage of found with dedicated list iterator variable) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git w1/for-next +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 | 55 +++++++++++++++++-------------------------- + 5 files changed, 42 insertions(+), 58 deletions(-) +Merging staging/staging-next (1f3413dc8eb0 staging: rtl8192e: Refactor tmp_ofdm_index variable assignment) +$ 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_dm.c | 68 +++++++++++++------------- + 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 | 50 ++++++------------- + 12 files changed, 82 insertions(+), 160 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 (1c677f238f92 MAINTAINERS: Add Manivannan to DW eDMA driver maintainers list) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next +Auto-merging MAINTAINERS +Auto-merging drivers/dma/ti/k3-udma.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/dma/stericsson,dma40.yaml | 36 ++- + .../devicetree/bindings/dma/ti/k3-bcdma.yaml | 30 +- + .../bindings/dma/xilinx/xlnx,zynqmp-dpdma.yaml | 6 + + MAINTAINERS | 3 +- + drivers/dma/Kconfig | 1 + + drivers/dma/ste_dma40.c | 332 +++++++++------------ + .../dma-ste-dma40.h => drivers/dma/ste_dma40.h | 101 +------ + drivers/dma/ste_dma40_ll.c | 3 +- + drivers/dma/ti/k3-psil-j721s2.c | 11 + + drivers/dma/ti/k3-udma.c | 25 ++ + 10 files changed, 254 insertions(+), 294 deletions(-) + rename include/linux/platform_data/dma-ste-dma40.h => drivers/dma/ste_dma40.h (51%) +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 +Auto-merging kernel/cgroup/cgroup.c +Auto-merging kernel/sched/core.c +Auto-merging kernel/sched/sched.h +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 (d8975ee303e6 Merge branch 'fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi/for-next +Merge made by the 'ort' strategy. + drivers/scsi/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 | 46 +-- + drivers/scsi/lpfc/lpfc_scsi.c | 3 +- + drivers/scsi/lpfc/lpfc_sli.c | 390 ++++++++++++++++--------- + 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 scsi-mkp/for-next (16853cd8f6d4 scsi: dc395x: Documentation: Reword original driver attribution) +$ 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 MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/scsi/dc395x.rst | 11 ++++------ + MAINTAINERS | 13 +++++++++--- + drivers/scsi/bfa/bfa_fcbuild.c | 4 ++-- + drivers/scsi/bfa/bfa_fcs.c | 4 ++-- + drivers/scsi/bfa/bfa_fcs_lport.c | 20 +++++++++--------- + drivers/scsi/bfa/bfa_ioc.c | 2 +- + drivers/scsi/bfa/bfa_svc.c | 2 +- + drivers/scsi/bfa/bfad.c | 10 ++++----- + drivers/scsi/bfa/bfad_attr.c | 2 +- + drivers/scsi/bfa/bfad_bsg.c | 4 ++-- + drivers/scsi/bfa/bfad_im.c | 2 +- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 28 ++++++++++++++++++-------- + drivers/scsi/megaraid/megaraid_sas.h | 8 +++----- + drivers/scsi/qla2xxx/qla_init.c | 8 ++++---- + drivers/scsi/qla2xxx/qla_mr.c | 20 +++++++++--------- + drivers/scsi/qla4xxx/ql4_mbx.c | 8 ++++---- + drivers/scsi/qla4xxx/ql4_os.c | 14 ++++++------- + drivers/target/iscsi/iscsi_target_parameters.c | 4 ++-- + drivers/target/iscsi/iscsi_target_util.c | 4 ++-- + drivers/target/target_core_configfs.c | 10 ++++----- + drivers/target/target_core_device.c | 6 +++--- + drivers/ufs/core/ufs-hwmon.c | 2 +- + 22 files changed, 100 insertions(+), 86 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 (de598695a2ad remoteproc: stm32: Allow hold boot management by the SCMI reset controller) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next +Auto-merging drivers/remoteproc/pru_rproc.c +Merge made by the 'ort' strategy. + .../bindings/remoteproc/st,stm32-rproc.yaml | 44 ++++++++++-- + 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 | 84 +++++++++++++++------- + drivers/remoteproc/wkup_m3_rproc.c | 6 +- + 19 files changed, 136 insertions(+), 105 deletions(-) +Merging gpio/for-next (ac9a78681b92 Linux 6.4-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git gpio/for-next +Already up to date. +Merging gpio-brgl/gpio/for-next (2c99754ea0f9 gpio: add HAS_IOPORT dependencies) +$ git merge -m Merge branch 'gpio/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl/gpio/for-next +Merge made by the 'ort' strategy. + ...cm,bcm6345-gpio.yaml => brcm,bcm63xx-gpio.yaml} | 18 +--- + .../devicetree/bindings/gpio/gpio-mmio.yaml | 117 +++++++++++++++++++++ + .../devicetree/bindings/gpio/gpio-stmpe.txt | 17 --- + .../bindings/gpio/ni,169445-nand-gpio.txt | 38 ------- + .../devicetree/bindings/gpio/st,stmpe-gpio.yaml | 53 ++++++++++ + .../devicetree/bindings/gpio/wd,mbl-gpio.txt | 38 ------- + .../bindings/mfd/brcm,bcm6318-gpio-sysctl.yaml | 4 +- + .../bindings/mfd/brcm,bcm63268-gpio-sysctl.yaml | 4 +- + .../bindings/mfd/brcm,bcm6328-gpio-sysctl.yaml | 4 +- + .../bindings/mfd/brcm,bcm6358-gpio-sysctl.yaml | 4 +- + .../bindings/mfd/brcm,bcm6362-gpio-sysctl.yaml | 4 +- + .../bindings/mfd/brcm,bcm6368-gpio-sysctl.yaml | 4 +- + drivers/gpio/Kconfig | 26 ++--- + drivers/gpio/gpio-davinci.c | 2 +- + drivers/gpio/gpio-ixp4xx.c | 4 +- + drivers/gpio/gpio-sa1100.c | 1 + + drivers/gpio/gpio-sch311x.c | 26 +---- + drivers/gpio/gpio-tpic2810.c | 25 +---- + drivers/gpio/gpio-tps65086.c | 27 +---- + drivers/gpio/gpio-twl4030.c | 23 +--- + 20 files changed, 213 insertions(+), 226 deletions(-) + rename Documentation/devicetree/bindings/gpio/{brcm,bcm6345-gpio.yaml => brcm,bcm63xx-gpio.yaml} (75%) + create mode 100644 Documentation/devicetree/bindings/gpio/gpio-mmio.yaml + delete mode 100644 Documentation/devicetree/bindings/gpio/gpio-stmpe.txt + delete mode 100644 Documentation/devicetree/bindings/gpio/ni,169445-nand-gpio.txt + create mode 100644 Documentation/devicetree/bindings/gpio/st,stmpe-gpio.yaml + delete mode 100644 Documentation/devicetree/bindings/gpio/wd,mbl-gpio.txt +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 (4ca235d2898e Merge branch 'devel' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next +Merge made by the 'ort' strategy. + .../bindings/pinctrl/qcom,pmic-gpio.yaml | 3 + + drivers/pinctrl/bcm/pinctrl-bcm2835.c | 6 +- + drivers/pinctrl/meson/pinctrl-meson-axg.c | 1 + + drivers/pinctrl/pinctrl-amd.c | 50 +- + drivers/pinctrl/pinctrl-amd.h | 1 + + drivers/pinctrl/qcom/pinctrl-apq8064.c | 104 ++-- + drivers/pinctrl/qcom/pinctrl-apq8084.c | 264 +++++----- + drivers/pinctrl/qcom/pinctrl-ipq4019.c | 104 ++-- + drivers/pinctrl/qcom/pinctrl-ipq5332.c | 206 ++++---- + drivers/pinctrl/qcom/pinctrl-ipq6018.c | 260 +++++----- + drivers/pinctrl/qcom/pinctrl-ipq8064.c | 114 ++--- + drivers/pinctrl/qcom/pinctrl-ipq8074.c | 240 +++++---- + drivers/pinctrl/qcom/pinctrl-ipq9574.c | 176 +++---- + drivers/pinctrl/qcom/pinctrl-mdm9607.c | 276 +++++----- + drivers/pinctrl/qcom/pinctrl-mdm9615.c | 90 ++-- + drivers/pinctrl/qcom/pinctrl-msm.c | 13 +- + drivers/pinctrl/qcom/pinctrl-msm.h | 42 +- + drivers/pinctrl/qcom/pinctrl-msm8226.c | 156 +++--- + drivers/pinctrl/qcom/pinctrl-msm8660.c | 252 +++++---- + drivers/pinctrl/qcom/pinctrl-msm8909.c | 268 +++++----- + drivers/pinctrl/qcom/pinctrl-msm8916.c | 556 ++++++++++---------- + drivers/pinctrl/qcom/pinctrl-msm8953.c | 424 ++++++++-------- + drivers/pinctrl/qcom/pinctrl-msm8960.c | 464 +++++++++-------- + drivers/pinctrl/qcom/pinctrl-msm8976.c | 212 ++++---- + drivers/pinctrl/qcom/pinctrl-msm8994.c | 564 ++++++++++----------- + drivers/pinctrl/qcom/pinctrl-msm8996.c | 508 +++++++++---------- + drivers/pinctrl/qcom/pinctrl-msm8998.c | 380 +++++++------- + drivers/pinctrl/qcom/pinctrl-msm8x74.c | 474 +++++++++-------- + drivers/pinctrl/qcom/pinctrl-qcm2290.c | 230 ++++----- + drivers/pinctrl/qcom/pinctrl-qcs404.c | 388 +++++++------- + drivers/pinctrl/qcom/pinctrl-qdf2xxx.c | 6 +- + drivers/pinctrl/qcom/pinctrl-qdu1000.c | 249 +++++---- + drivers/pinctrl/qcom/pinctrl-sa8775p.c | 308 ++++++----- + drivers/pinctrl/qcom/pinctrl-sc7180.c | 254 +++++----- + drivers/pinctrl/qcom/pinctrl-sc7280.c | 322 ++++++------ + drivers/pinctrl/qcom/pinctrl-sc8180x.c | 292 ++++++----- + drivers/pinctrl/qcom/pinctrl-sc8280xp.c | 358 +++++++------ + drivers/pinctrl/qcom/pinctrl-sdm660.c | 387 +++++++------- + drivers/pinctrl/qcom/pinctrl-sdm670.c | 284 +++++------ + drivers/pinctrl/qcom/pinctrl-sdm845.c | 286 +++++------ + drivers/pinctrl/qcom/pinctrl-sdx55.c | 190 ++++--- + drivers/pinctrl/qcom/pinctrl-sdx65.c | 194 ++++--- + drivers/pinctrl/qcom/pinctrl-sm6115.c | 162 +++--- + drivers/pinctrl/qcom/pinctrl-sm6125.c | 282 +++++------ + drivers/pinctrl/qcom/pinctrl-sm6350.c | 296 ++++++----- + drivers/pinctrl/qcom/pinctrl-sm6375.c | 358 +++++++------ + drivers/pinctrl/qcom/pinctrl-sm7150.c | 247 +++++---- + drivers/pinctrl/qcom/pinctrl-sm8150.c | 286 +++++------ + drivers/pinctrl/qcom/pinctrl-sm8250.c | 258 +++++----- + drivers/pinctrl/qcom/pinctrl-sm8350.c | 298 ++++++----- + drivers/pinctrl/qcom/pinctrl-sm8450.c | 300 ++++++----- + drivers/pinctrl/qcom/pinctrl-sm8550.c | 320 ++++++------ + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 2 + + 53 files changed, 6202 insertions(+), 6563 deletions(-) +Merging pinctrl-intel/for-next (f1fcbaa18b28 Linux 6.4-rc2) +$ 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 (3ecb4a459a1e selftests/ftrace: Add new test case which checks for optimized probes) +$ 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 +- + .../ftrace/test.d/kprobe/kprobe_opt_types.tc | 34 +++++++ + .../selftests/media_tests/video_device_test.c | 113 +++++++++++++++------ + .../selftests/prctl/set-anon-vma-name-test.c | 2 +- + .../selftests/vDSO/vdso_test_clock_getres.c | 4 +- + 5 files changed, 125 insertions(+), 33 deletions(-) + create mode 100644 tools/testing/selftests/ftrace/test.d/kprobe/kprobe_opt_types.tc +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 (a5ce66ad292b kunit: example: Provide example exit functions) +$ 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 ++- + Documentation/dev-tools/kunit/usage.rst | 18 +++++++++-- + include/kunit/test.h | 3 ++ + lib/kunit/kunit-example-test.c | 22 +++++++++++++ + lib/kunit/test.c | 56 ++++++++++++++++++++++++++++----- + tools/testing/kunit/kunit_kernel.py | 6 ++-- + tools/testing/kunit/mypy.ini | 6 ++++ + tools/testing/kunit/run_checks.py | 2 +- + 8 files changed, 103 insertions(+), 15 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 (a3c10035d12f eeprom: at24: Use dev_err_probe for nvmem register failure) +$ git merge -m Merge branch 'at24/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git at24/at24/for-next +Merge made by the 'ort' strategy. + drivers/misc/eeprom/at24.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +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 (ac9a78681b92 Linux 6.4-rc1) +$ git merge -m Merge branch 'hmm' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git hmm/hmm +Already up to date. +Merging cfi/cfi/next (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'cfi/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git cfi/cfi/next +Already up to date. +Merging mhi/mhi-next (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 (e4bfeb6d6f39 Fix some coding style errors in memblock.c) +$ 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. + mm/memblock.c | 6 ++--- + tools/testing/memblock/tests/alloc_nid_api.c | 40 ++++++++++++++++++++++++++++ + 2 files changed, 43 insertions(+), 3 deletions(-) +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 (d86ff3333cb1 efivarfs: expose used and total size) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next +Merge made by the 'ort' strategy. + arch/x86/platform/efi/quirks.c | 8 ++++++++ + arch/x86/platform/efi/runtime-map.c | 2 +- + drivers/firmware/efi/efi.c | 1 + + drivers/firmware/efi/esrt.c | 2 +- + drivers/firmware/efi/vars.c | 12 ++++++++++++ + fs/efivarfs/super.c | 39 ++++++++++++++++++++++++++++++++++++- + include/linux/efi.h | 11 +++++++++++ + 7 files changed, 72 insertions(+), 3 deletions(-) +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 (1685b445d778 sysctl: stop exporting register_sysctl_table) +$ git merge -m Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git sysctl/sysctl-next +Merge made by the 'ort' strategy. + drivers/parport/procfs.c | 177 +++++++++++++++++++++++++---------------------- + drivers/parport/share.c | 2 +- + fs/proc/proc_sysctl.c | 5 +- + include/linux/parport.h | 2 + + include/linux/sysctl.h | 8 +-- + 5 files changed, 99 insertions(+), 95 deletions(-) +Merging execve/for-next/execve (60592fb6b67c coredump, vmcore: Set p_align to 4 for PT_NOTE) +$ 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 +Merge made by the 'ort' strategy. + fs/binfmt_elf.c | 2 +- + fs/binfmt_elf_fdpic.c | 2 +- + fs/proc/vmcore.c | 4 ++-- + 3 files changed, 4 insertions(+), 4 deletions(-) +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 71f38de3915c] 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 (55c84a5cf2c7 fortify: strcat: Move definition to use fortified strlcat()) +$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git kspp/for-next/kspp +Auto-merging MAINTAINERS +Auto-merging lib/Kconfig.debug +Auto-merging lib/Makefile +Merge made by the 'ort' strategy. + MAINTAINERS | 1 + + include/linux/fortify-string.h | 161 +++++++++++++++++++-------- + lib/Kconfig.debug | 7 +- + lib/Kconfig.ubsan | 54 +++++---- + lib/Makefile | 1 + + lib/fortify_kunit.c | 14 +++ + lib/strcat_kunit.c | 104 +++++++++++++++++ + scripts/Makefile.ubsan | 2 +- + tools/testing/kunit/configs/all_tests.config | 2 + + tools/testing/kunit/configs/arch_uml.config | 3 + + 10 files changed, 274 insertions(+), 75 deletions(-) + create mode 100644 lib/strcat_kunit.c +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 (f1fcbaa18b28 Linux 6.4-rc2) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd/for-next +Already up to date. diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..21d3b33d1104 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20230518 |