diff options
| -rw-r--r-- | Next/SHA1s | 356 | ||||
| -rw-r--r-- | Next/Trees | 358 | ||||
| -rw-r--r-- | Next/merge.log | 8921 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 9636 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..34df9c04f215 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,356 @@ +Name SHA1 +---- ---- +origin 2faac9a98f010cf5b342fa89ac489c4586364e6e +fixes 9c9155a3509a2ebdb06d77c7a621e9685c802eac +mm-hotfixes 383d91b9fcc9cd3f32f4592be1b1edb063b0dbf0 +kbuild-current a3671bd86a9770e34969522d29bb30a1b66fd88a +arc-current 30a0b95b1335e12efef89dd78518ed3e4a71a763 +arm-current 2f62847cf6ae49a54515421f67b1badffaa805f3 +arm64-fixes fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +arm-soc-fixes 9f79762ef8d90a6fab85e4ac0d153bdd8b4868ca +davinci-current fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +drivers-memory-fixes fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +tee-fixes ceaa837f96adb69c0df0397937cd74991d5d821a +m68k-current e36a82bebbf7da814530d5a179bef9df5934b717 +powerpc-fixes f2c7e3562b4c4f1699acc1538ebf3e75f5cced35 +s390-fixes d7a0bdbf17276b757d2b89f5351bbee9ecf58fe6 +sparc 2d2b17d08bfc3d98cf93622e8c6543eaaf02dabe +fscrypt-current 4bcf6f827a79c59806c695dc280e763c5b6a6813 +fsverity-current a075bacde257f755bea0e53400c9f1cdd1b8e8e6 +net f038f3917baf04835ba2b7bcf2a04ac93fbf8a9c +bpf 10ec8ca8ec1a2f04c4ed90897225231c58c124a7 +ipsec c276a706ea1f51cf9723ed8484feceaf961b8f89 +netfilter 7fb0269720d7d5359bc8349eef908a1c96866b65 +ipvs e866f29a6ff1804efb5c9cfc1e354192615dfb64 +wireless 007ae9b268ba7553e479608cf9735d3c4672a2ab +rdma-fixes eeac8ede17557680855031c6f305ece2378af326 +sound-current 8c721c53dda512fdd48eb24d6d99e56deee57898 +sound-asoc-fixes 205efd4619b860404ebb5882e5a119eb3b3b3716 +regmap-fixes eeac8ede17557680855031c6f305ece2378af326 +regulator-fixes eeac8ede17557680855031c6f305ece2378af326 +spi-fixes eeac8ede17557680855031c6f305ece2378af326 +pci-current cdce67099117ece371582f706c6eff7d3a65326d +driver-core.current 44ac5abac86b20856e6d9e5e5e40dcc2623fe330 +tty.current e8d018dd0257f744ca50a729e3d042cf2ec9da65 +usb.current bbf860ed710bacc0279c4cda2817f70e1200d04b +usb-serial-fixes 773e8e7d07b753474b2ccd605ff092faaa9e65b9 +phy fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +staging.current eeac8ede17557680855031c6f305ece2378af326 +iio-fixes 363c7dc72f79edd55bf1c4380e0fbf7f1bbc2c86 +counter-current 00f4bc5184c19cb33f468f1ea409d70d19f8f502 +char-misc.current 4dd52392b5d75d88acf0d16eb69fe30d0de8c225 +soundwire-fixes e6923fd863af1e4af1efe201b553d708d2b366b2 +thunderbolt-fixes 58cdfe6f58b35f17f56386f5fcf937168a423ad1 +input-current 754ff5060daf5a1cf4474eff9b4edeb6c17ef7ab +crypto-current 660ca9470f9c613fa2c71a123a9469c80a697ee4 +vfio-fixes 4928f67bc911e46a43004251a4d7eb2259ba6077 +kselftest-fixes 05107edc910135d27fe557267dc45be9630bf3dd +modules-fixes f412eef03938d3a40d4f6f5a79d0f98ed89b596d +dmaengine-fixes b771baf3988a094c5129b05f1e5eaa383f1ec185 +backlight-fixes 88603b6dc419445847923fcb7fe5080067a30f98 +mtd-fixes 75dce6a941e3f16c3b4878c8b2f46d5d07c619ce +mfd-fixes 88603b6dc419445847923fcb7fe5080067a30f98 +v4l-dvb-fixes 55f1ecb1199000932cf82e357841cc7498ac904f +reset-fixes 3a2390c6777e3f6662980c6cfc25cafe9e4fef98 +mips-fixes ab327f8acdf8d06601fbf058859a539a9422afff +at91-fixes fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +omap-fixes 2a906db2824b75444982f5e9df870106982afca8 +kvm-fixes f3e707413dbe3920a972d0c2b51175180e7de36b +kvms390-fixes 0dd4cdccdab3d74bd86b868768a7dca216bcce7e +hwmon-fixes 38c25fa529201c8258cc8b5d6ed34854767ad9ca +nvdimm-fixes c91d713630848460de8669e6570307b7e559863b +cxl-fixes 711442e29f16f0d39dd0e2460c9baacfccb9d5a7 +btrfs-fixes c637393d1e8f7487214612bbe54036c4e7d97702 +vfs-fixes 609d54441493c99f21c1823dfd66fa7f4c512ff4 +dma-mapping-fixes 7c3940bf81e5664cdb50c3fedfec8f0a756a34fb +drivers-x86-fixes b7c994f8c35e916e27c60803bb21457bc1373500 +samsung-krzk-fixes fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +pinctrl-samsung-fixes fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +devicetree-fixes 707344c8a188bb1d6704d3546229fc7a07c01a63 +dt-krzk-fixes fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +scsi-fixes a13faca032acbf2699293587085293bdfaafc8ae +drm-fixes e8d018dd0257f744ca50a729e3d042cf2ec9da65 +drm-intel-fixes 22aa20e4c5dcbe6fdc480eb4fb27039b1f43217f +mmc-fixes 92771cdd90de64b15e65f3c88d6c6199bd5f33f5 +rtc-fixes 08279468a294d8c996a657ecc9e51bd5c084c75d +gnss-fixes 1b929c02afd37871d5afb9d498426f83432e71c2 +hyperv-fixes f8acb24aaf89fc46cd953229462ea8abe31b395f +soc-fsl-fixes 4b0986a3613c92f4ec1bdc7f60ec66fea135991f +risc-v-fixes 47dd902aaee9b9341808a3a994793199e7eddb88 +riscv-dt-fixes fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +riscv-soc-fixes fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +fpga-fixes fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +spdx fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +gpio-brgl-fixes d49765b5f4320a402fbc4ed5edfd73d87640f27c +gpio-intel-fixes fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +pinctrl-intel-fixes fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +erofs-fixes 3993f4f456309580445bb515fbc609d995b6a3ae +kunit-fixes fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +ubifs-fixes 2241ab53cbb5cdb08a6b2d4688feb13971058f65 +memblock-fixes 647037adcad00f2bab8828d3d41cd0553d41f3bd +nfsd-fixes 27c934dd8832dd40fd34776f916dc201e18b319b +irqchip-fixes 6c9f7434159b96231f5b27ab938f4766e3586b48 +renesas-fixes ab2866f12ca18747413ba41409231d44e0c6149b +broadcom-fixes 9abf2313adc1ca1b6180c508c25f22f9395cc780 +perf-current 5b201a82cd9d0945d70562974ea6ad8e3b1861b5 +efi-fixes 5ed213dd64681f84a01ceaa82fb336cf7d59ddcf +zstd-fixes 6906598f1ce93761716d780b6e3f171e13f0f4ce +battery-fixes 06615d11cc78162dfd5116efb71f29eb29502d37 +uml-fixes bd71558d585ac61cfd799db7f25e78dca404dd7a +asahi-soc-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +iommufd-fixes fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +rust-fixes 3098cb655e7c9ea1c2919e61234f63ebaab6bb21 +drm-misc-fixes 03aecb1acbcd7a660f97d645ca6c09d9de27ff9d +mm-stable 819c2608ce2c7aa0b3a667b23c87676f10373eb4 +mm-nonmm-stable fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +mm 9f63dcd4248bf10a829de6a420588680d4312e90 +kbuild b26e7a4b4ef6110f6367ef585e428366e89b4395 +clang-format 781121a7f6d11d7cae44982f174ea82adeec7db0 +perf f9fa0778ee7349a9aa3d2ea10e9f2ab843a0b44e +compiler-attributes eeac8ede17557680855031c6f305ece2378af326 +dma-mapping 9b07d27d0fbb7f7441aa986859a0f53ec93a0335 +asm-generic a13408c205260716e925a734ef399899d69182ba +arc f2906aa863381afb0015a9eb7fefad885d4e5a56 +arm ba07b4efc9898cb2b1ee125c53d3b30711db7092 +arm64 010338d729c1090036eb40d2a60b7b7bce2445b8 +arm-perf e8a709dc2a9156f223ec953ae70a919e87ad7e9a +arm-soc 811bbcfc8ea2be3c4dc0b2a91eeb8282eb212808 +amlogic 001ba459dbecc219e45f822dc790116bfbd9bb99 +asahi-soc 22991d8d57251509b8ee5c0b3dac04506fe5ed7a +aspeed bb13bd587d53033f1151699b7522f979e2930ea6 +at91 f5200f71d92715f6402864cca4bb59cb47ee6644 +broadcom a2264238029f63c084ad78856023fa43dde30799 +davinci fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +drivers-memory 538c7b5b5d8b5364454494e5fe4125b0b47195f1 +imx-mxs a7a9bae8c567a4ff996bb33209bd292906b542b6 +mediatek 9b2797522f320d5e32e3d96998a6635987f3702b +mvebu b80b042da86099ec9a822f9c475d335617531b31 +omap f68a6fc5807388854f3b54a5331c6cb3e88cc9b4 +qcom f84f5d2e1ffd60fc887a3b197a9ef8fac5b3b8a2 +renesas 8184e7e383be876199a3be519c067b40143d8ab8 +reset 1b929c02afd37871d5afb9d498426f83432e71c2 +rockchip 6d6761582819dd36bbacffc64a2d96cac2330eb3 +samsung-krzk a81e2e2ca6ae324b48317efd77498366df0344fa +scmi 9848e199b090619f90d0d8f1523c34e78ad1eb65 +stm32 19f969c0c7388a729ec209ff74590c65a1957aab +sunxi 6aeca5d73805b9af1002fe624f29f7fbf267bee3 +tee f8502fba45bd30e1a6a354d9d898bc99d1a11e6d +tegra 9b0d904e7e49ee6e6413ca40d31b12d439c4a657 +ti 9790831f6dbfe996b8695cf824d028c3d951592f +xilinx fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +clk 61a672cbb14d55c1cee9e87179739025cefe815e +clk-imx fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +clk-renesas 72cd8436ece036294322fecf91567fef3ce3e868 +clk-samsung b35f27fe73d8c86fe40125e063b28007e961b862 +csky 4a3ec00957fdf182be705d46e77acacc430f7d65 +loongarch fc89d7fb499b0162e081f434d45e8d1b47e82ece +m68k fda1941b8eab786112afe91088fa0a1ed4880360 +m68knommu 8fc6ba5f96bcbd75b14e128c8fb460672a0771de +microblaze fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +mips a45e5fe792349315827b483eb23b307df47c6c6c +openrisc 34a0bac084e49324c29e6d0984d24096e02c6314 +parisc-hd 78339463055345f64b5ea732965eec9adcf34392 +powerpc 3c1d9f36e985af84b9ba31b850d683c81ae96e8d +soc-fsl 4b0986a3613c92f4ec1bdc7f60ec66fea135991f +risc-v 4b740779ac03f42866059a33f5454e1ac5393cdd +riscv-dt 0e9b70c1e3623fa110fb6be553e644524228ef60 +riscv-soc 49f965b6fbca63904d7397ce96066fa992f401a3 +s390 1485d9a4eecf871b032162cc1478f6b726f064a9 +sh ff30bd6a6618e979b16977617371c0f28a95036e +uml 04df97e150c83d4640540008e95d0229cb188135 +xtensa 1d3b7a788ca7435156809a6bd5b20c95b2370d45 +pidfd 5ab18f4b061ef24a71eea9ffafebd1a82ae2f514 +vfs-idmapping 9576d493741c4e7f8eebdee4e6b6fdf521f97c60 +fscrypt 704d0e7a9b7d3bfb8630f0ab735ea5330597baf7 +fscache 0885eacdc81f920c3e0554d5615e69a66504a28d +afs 0a278bc196e784b4849c1581266421adbca1989f +btrfs 80d1eec6927a616ff457bb5ae7380e2000b1a5bb +ceph f7c4d9b133c7a04ca619355574e96b6abf209fba +cifs 2f0e4f0342201fe2228fcc2301cc2b42ae04b8e3 +configfs 77992f896745c63ae64bfccfdc429ab7b3d88da5 +ecryptfs c1cc2db216078f9b1e29c991b1b9177c26757162 +erofs 4f24ebae35ff9739e963eb4a164fe97d00069dad +exfat fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +ext3 fae0a2b2077c30f567b6b32c2467e7dda8e1d270 +ext4 da8c7d2105be0c0028cfad712da9e17adf9a26eb +f2fs d15180a8d1d72c7bddcb700d2c9ffdab7d2b9481 +fsverity 2da81b8479434c62a9ae189ec24729445f74b6a9 +fuse 1cc4606d19e3710bfab3f6704b87ff9580493c69 +gfs2 c1b0c3cfcbad25d2c412863c27638c933f1d911b +jfs fad376fce0af58deebc5075b8539dc05bf639af3 +ksmbd 6686991cea8e1d73598dbcc4b29130b8c68ce618 +nfs e8d018dd0257f744ca50a729e3d042cf2ec9da65 +nfs-anna 21fd9e8700de86d1169f6336e97d7a74916ed04a +nfsd 3077f83bfb9e40371b4aa84d2dd5bfb5311ecae4 +ntfs3 2024476646ed92d5ceed55e149d0952c17d68e14 +orangefs 31720a2b109b3080eb77e97b8f6f50a27b4ae599 +overlayfs 4f11ada10d0ad3fd53e2bd67806351de63a4f9c3 +ubifs f773f0a331d6c41733b17bebbc1b6cae12e016f5 +v9fs 4ec5183ec48656cec489c49f989c508b68b518e3 +v9fs-ericvh 9d415a42534040a1b42bfef6477827b46bbf5bfb +xfs e9b60c7f97130795c7aa81a649ae4b93a172a277 +zonefs 2b188a2cfc4d8f319ad23832ec1390bdae52daf6 +iomap 471859f57d42537626a56312cfb50cd6acee09ae +djw-vfs a79168a0c00d710420c1758f6c38df89e12f0763 +file-locks 63355b9884b3d1677de6bd1517cd2b8a9bf53978 +iversion 63355b9884b3d1677de6bd1517cd2b8a9bf53978 +vfs d291d18584199786b8d2ff45836d2b44ad0ea263 +printk 10d639febe5629687dac17c4a7500a96537ce11a +pci b0d4fc005ef2baeb56f648d422d0e59810eddb96 +pstore 5239a89b06d6b199f133bf0ffea421683187f257 +hid 1b9a2a53046a57f6484d4669e2926d82ba2119a8 +i2c 7618417929c11bf1f6764f84e11e1b2f18e83a83 +i3c 2810f1de814adb7728b1068586bebcf733cf1992 +dmi 13a0ac816d22aa47d6c393f14a99f39e49b960df +hwmon-staging 593c9b978b96942bce44b5e01b362bc0eb39999c +jc_docs 10d18135135c6b203feb5978d17bc4f53d1ddf43 +v4l-dvb eeac8ede17557680855031c6f305ece2378af326 +v4l-dvb-next 71937240a472ee551ac8de0e7429b9d49884a388 +pm 8e95155f8f299d6c2941c7bfa133ae8d0242870e +cpufreq-arm b8f3a396a7ee43e6079176cc0fb8de2b95a23681 +cpupower fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +devfreq b7405e3f62d68be4cc5f4677499e1b8c13a0d216 +opp e9eadc28271940266ace3f748a1c6278bd886ea8 +thermal 6828e402d06f7c574430b61c05db784cd847b19f +dlm 1361737f102d898330fd61efa5940c1ee0812da1 +rdma f2f6e1661d38fbce6163fc321395e9de24a9529b +net-next c8384d4a51e7cb0e6587f3143f29099f202c5de1 +bpf-next 6a9f5cdba3c5b4e8c2af290fe6c9e3538652ab42 +ipsec-next f4796398f21b9844017a2dac883b1dd6ad6edd60 +mlx5-next 22551e77e5507a06114c0af2b92bbf1a66ec33c5 +netfilter-next 677fb7525331375ba2f90f4bc94a80b9b6e697a3 +ipvs-next d4671cb96fa317e2b1f410367a52f731a145e2bc +bluetooth 3e662aa4453a38568731c6319319a3a85e2f2f96 +wireless-next 70664495e3d24803ec47ccaccee9a822220558a0 +mtd 1a7537a39b06ceb5ea0f161f6adc4343b686db18 +nand 4080d536241652af43996d9ceee2b79aeca57267 +spi-nor 6afcc84080c415df81765c6d773edcba8fc30f6c +crypto e6af5c0c4d32a27e04a56f29aad587e03ff427f1 +drm c6265f5c2f502e442c4f339f121bedbc990c12e7 +drm-misc e0dfefa08d94bf548fbbbbae22e4720a652a3102 +amdgpu 27cb295ffec79b03253acb6c47921464301b08c5 +drm-intel 41b4c7fe72b6105a4b49395eea9aa40cef94288d +drm-tegra b9930311641cf2ed905a84aabe27e8f3868aee4a +drm-msm f73343fae5fb5b1c2f9ce5b861d286142283d0fa +drm-msm-lumag 0c3f3cfd8ef230269059a607c00873a028235e6b +imx-drm 927d8fd465adbaaad6cce82f840d489d7c378f29 +etnaviv 4c22c61e429f004d84eba72d7195bccef33ea0ec +fbdev b61c2c09c5a3f89ac7a2e290491f07b10a8322ae +regmap 24d80fde40c995b2e2faaf72034e12e60a416630 +sound b1e675d1b57eb991a5e194e8648477a98f612617 +sound-asoc 54c5dc1df4b078436e62e5dce4d11aa3c7ab396f +modules 3703bd54cd37e7875f51ece8df8c85c184e40bba +input 6906f5060d39f95aa0be30e998e0cc1179ba3d04 +block d78e81b3fb2f3cad3a86ed8c01b18ea415053c18 +device-mapper d3aa3e060c4a80827eb801fc448debc9daa7c46b +libata 672b7ad20f7bcf75d64b7b0ad81fcfe3ce77f11b +pcmcia 15e74c6c1ce2d388e967f32cdaa83ca034fa6452 +mmc 46d19dc62b455849c3aa8146f6f7d7d3cdbc65a9 +mfd 368eb79f738a21e16c2bdbcac2444dfa96b01aaa +backlight fb200218b40b7864f64f1a47de61e035d8934e92 +battery 2c9fafafd1866f22deb8988d9b63ff9f921ce8e3 +regulator 02ce28bc083e8196db8612adf08c1288fb198d76 +security b9b8701b43146f5ebd7fe13d89103cfc545cda34 +apparmor cb60752f0c37cba0d4a90fd62dfd3ba425df783f +integrity 644f17412f5acf01a19af9d04a921937a2bc86c6 +safesetid 64b634830c919979de4b18163e15d30df66e64a8 +selinux 79781fe466b03c98b8292cabbc57897a7623e895 +smack 502a29b04d857c28aa36f8829a5c673b9b8864a6 +tomoyo ab8527429de6a81a161e8b61bd44f0f3a9015d1e +tpmdd 3dc8b8b705a7ad8c6938cd90453fa474c668703d +watchdog cf3be7e82b129ed34f811f116f2b113f6299d449 +iommu bedd29d793da3312e1350a56245c4971a38d4453 +audit fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +devicetree c9c9d764daeeb264c647b0c6a3d2f602a7deb586 +dt-krzk efb75299863e1fc241a5a69f622b4f71d71494a6 +mailbox 6ccbe33a39523f6d62b22c5ee99c6695993c935e +spi 103c6a315bc7ae0442be683b8d725d51615d280b +tip 8a071b9c1325c6bfaf22508603b947ab75c1e9db +clockevents ab407a1919d2676ddc5761ed459d4cc5c7be18ed +edac 541a6110b6278e4e05ad027df7691f1441dca362 +irqchip a83bf176fed4ee88dad84d59f77dde153b9a442a +ftrace ca6cbe8c481a2a2d7528cb9c7246f957494948fe +rcu 86efad5f54363f5320c38fd3d524d117656c8dec +kvm d8708b80fa0e6e21bc0c9e7276ad0bccef73b6e7 +kvm-arm 96a4627dbbd48144a65af936b321701c70876026 +kvms390 5fc5b94a273655128159186c87662105db8afeb5 +kvm-x86 d8708b80fa0e6e21bc0c9e7276ad0bccef73b6e7 +xen-tip 7ad2c39860dc0ca01d2152232224d2124e160fe3 +percpu b9819165bb455bfdce37086c622a18cce2dd2f5e +workqueues cd2440d66fec7d1bdb4f605b64c27c63c9141989 +drivers-x86 fd3c3584539026a708493a49f65d8ff3eb369002 +chrome-platform db7df0cfaff3ffe5c125f8b79bcd54a4ad163b37 +hsi 1b929c02afd37871d5afb9d498426f83432e71c2 +leds 1b929c02afd37871d5afb9d498426f83432e71c2 +leds-lj 1aeff621689120db60cb7029e5a0fde7d01f7fb6 +ipmi d352cb47df7540a52bf2d0c33d90694c5cdb6cb8 +driver-core fea087fc291b102521427c26da3d0a30c329606f +usb 55b7fa634d9f5d88f008f8b785448db40a2d5229 +thunderbolt ebde5ba27c640e08e92c83fe30be0d9fa224eea9 +usb-serial eeac8ede17557680855031c6f305ece2378af326 +tty f16a70c0472ea4cda3ab53fd3b5d2fa5628fb2c7 +char-misc abae262640ef9c7f24bad65acade25b44c7ba0eb +accel 75b445753047872a69709cfba7e3939660f0ecc1 +coresight 669c4614236a7f78a2b693d0024cbdfa8536eb5a +fpga fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +icc 403ade557dd19a2a3cb1fdcf9912edd1dc0f1c1a +iio 225dc61e2fa8def14426e2a34e926a79fae6118b +phy-next 84a59a314263c21de1b308abda7f7eea92da740d +soundwire 6c469871e801ce415bd05261e6598a7b4b1c8f75 +extcon 19685ae43489c023a831d58821c297165e04dcfe +gnss 1b929c02afd37871d5afb9d498426f83432e71c2 +vfio d649c34cb916b015fdcb487e51409fcc5caeca8d +staging f4a8e711a66bd03681d61949181223c3437d5a87 +counter-next fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +mux ea327624ae52936b2c0eccffd9369983ca2d08e3 +dmaengine fe8f1a2e9b7c4519a145ab8110dec59fea3c532c +cgroup f7ac82ea4b457c02eeedf5bb9ceccc777448e1ce +scsi 2b6ac25dfa2a433f826ede9f6ac9bd7c4ac03898 +scsi-mkp e05c006dac08ef346fc5e223f6f14cc2c6c96a7b +vhost bce7bbce4c15d8b1cc1fa22fc37ed9568c440393 +rpmsg e19967994d342a5986d950a1bfddf19d7e1191b7 +gpio e73f0f0ee7541171d89f2e2491130c7771ba58d3 +gpio-brgl 03810031c91dfe448cd116ee987d5dc4139006f4 +gpio-intel d884ae2571afb7ab6363a2292279132d3340b530 +pinctrl 454c44542d3547c8088dedd3efcc94d53b21ec24 +pinctrl-intel fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +pinctrl-renesas 9d7558ed8372c51cbed011cb1dc3eb1beee212cf +pinctrl-samsung fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +pwm cf70d01a62c712ee715df1f7892b58c77474bcfb +userns 05bd6e0242b4c059ec6797e3d721ecca6d15ff8d +ktest 7dc8e24f0e09834341f84d37433840b353d64bc8 +kselftest e1e17d7debf486fd3b757df9e009b8d109e4be43 +kunit fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +kunit-next 99be6588118bedc522fa989146f35efceff07c1e +livepatching 5e36be5973b6ac66198220365bffb7a3641038f9 +rtc 0e6255fa3f649170da6bd1a544680589cfae1131 +nvdimm 305a72efa791c826fe84768ca55e31adc4113ea8 +at24 fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +ntb 0310a30a9395cb535fd47151ae18eb6891897f2d +seccomp 0fb0624b15d21622c214617fda5c05a203b04564 +fsi 35af9fb49bc5c6d61ef70b501c3a56fe161cce3e +slimbus fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +nvmem 1fc7a13bb731e2c0e71550ddd07d36abc83c5514 +xarray 69cb69ea55420388b444ee30b1530ec15ab584f7 +hyperv fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +auxdisplay ddf75a86aba2cfb7ec4497e8692b60c8c8fe0ee7 +kgdb c1cb81429df462eca1b6ba615cddd21dd3103c46 +hmm fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +cfi 3123109284176b1532874591f7c81f3837bbdc17 +mhi 14853a0676c126aad836eb249499552fa9d6e85a +memblock 34875d6fc52d6dfafe2fc8840e1294bb118ea745 +cxl e686c32590f40bffc45f105c04c836ffad3e531a +zstd 2aa14b1ab2c41a4fe41efae80d58bb77da91f19f +efi bac363715a7c961076e568609a12f62003cd17b0 +unicode b500d6d7243d2e0807a39a09c52fbe668b59b2c1 +slab ac19705397df3384c2ccdb8e69e462430585ee70 +random 512dee0c00ad9e9c7ae9f11fc6743702ea40caff +landlock ed35e2f2f0ded15df313ae6f8da21e85c8e1e493 +rust fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +sysctl 9b15aa91b3b272b758a8e3bb31f16d43d72b89c1 +execve 88603b6dc419445847923fcb7fe5080067a30f98 +bitmap 714f3af11b21b15d4bab91045928a8498bbbffa1 +hte fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +kspp 78f7a3fd6dc66cb788c21d7705977ed13c879351 +kspp-gustavo edfea16a6dae9c03bdc97babdd69960093263354 +iommufd 4ed4791afb34c61650b17407846174a72e4034f4 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..0c52f32b78a8 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,358 @@ +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 +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 +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/core +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 +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 +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#modules-next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +block git git://git.kernel.dk/linux-block.git#for-next +device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +libata git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git#for-next +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git#pcmcia-next +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next +backlight git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next +battery git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#for-next +regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git#next +apparmor git git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor#apparmor-next +integrity git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next-integrity +safesetid git https://github.com/micah-morton/linux.git#safesetid-next +selinux git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#next +smack git git://github.com/cschaufler/smack-next#next +tomoyo git https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git#master +tpmdd git git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git#next +watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next +audit git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git#next +devicetree git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next +dt-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git#for-next +mailbox git git://git.linaro.org/landing-teams/working/fujitsu/integration.git#mailbox-for-next +spi git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#master +clockevents git git://git.linaro.org/people/daniel.lezcano/linux.git#timers/drivers/next +edac git git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git#edac-for-next +irqchip git git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#for-next +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next +kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#next +kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next +kvms390 git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#next +kvm-x86 git https://github.com/kvm-x86/linux.git#next +xen-tip git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +drivers-x86 git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#for-next +chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git#for-next +hsi git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next +leds git git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git#for-next +leds-lj git git://git.kernel.org/pub/scm/linux/kernel/git/lee/leds.git#for-leds-next +ipmi git git://github.com/cminyard/linux-ipmi.git#for-next +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next +usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next +thunderbolt git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#next +usb-serial git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next +char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next +accel git git://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux.git#habanalabs-next +coresight git git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git#next +fpga git git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git#for-next +icc git git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git#icc-next +iio git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#togreg +phy-next git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#next +soundwire git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#next +extcon git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next +gnss git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-next +vfio git git://github.com/awilliam/linux-vfio.git#next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +counter-next git git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git#counter-next +mux git https://gitlab.com/peda-linux/mux.git#for-next +dmaengine git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#next +cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next +scsi-mkp git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +rpmsg git git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git#for-next +gpio git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next +gpio-brgl git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-next +gpio-intel git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#for-next +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +pinctrl-intel git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#for-next +pinctrl-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-pinctrl +pinctrl-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#for-next +pwm git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git#for-next +userns git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git#for-next +ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next +kunit git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#test +kunit-next git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit +livepatching git git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching#for-next +rtc git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next +nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +at24 git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#at24/for-next +ntb git https://github.com/jonmason/ntb.git#ntb-next +seccomp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/seccomp +fsi git git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git#next +slimbus git git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git#for-next +nvmem git git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git#for-next +xarray git git://git.infradead.org/users/willy/xarray.git#main +hyperv git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-next +auxdisplay git https://github.com/ojeda/linux.git#auxdisplay +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git#kgdb/for-next +hmm git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#hmm +cfi git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#cfi/next +mhi git git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git#mhi-next +memblock git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#for-next +cxl git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#next +zstd git https://github.com/terrelln/linux.git#zstd-next +efi git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#next +unicode git git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git#for-next +slab git git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git#for-next +random git git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git#master +landlock git git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git#next +rust git https://github.com/Rust-for-Linux/linux.git#rust-next +sysctl git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#sysctl-next +execve git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/execve +bitmap git https://github.com/norov/linux.git#bitmap-for-next +hte git git://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git#for-next +kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +kspp-gustavo git git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git#for-next/kspp +iommufd git git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git#for-next diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..6c713c050ff7 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,8921 @@ +$ date -R +Wed, 22 Mar 2023 08:02:02 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +Updating files: 79% (4528/5697)
Updating files: 80% (4558/5697)
Updating files: 81% (4615/5697)
Updating files: 82% (4672/5697)
Updating files: 83% (4729/5697)
Updating files: 84% (4786/5697)
Updating files: 85% (4843/5697)
Updating files: 86% (4900/5697)
Updating files: 87% (4957/5697)
Updating files: 88% (5014/5697)
Updating files: 89% (5071/5697)
Updating files: 90% (5128/5697)
Updating files: 91% (5185/5697)
Updating files: 92% (5242/5697)
Updating files: 93% (5299/5697)
Updating files: 94% (5356/5697)
Updating files: 95% (5413/5697)
Updating files: 96% (5470/5697)
Updating files: 97% (5527/5697)
Updating files: 98% (5584/5697)
Updating files: 99% (5641/5697)
Updating files: 100% (5697/5697)
Updating files: 100% (5697/5697), done. +HEAD is now at 7d31677bb7b1 gpu: host1x: fix uninitialized variable use +Merging origin/master (2faac9a98f01 Merge tag 'keys-fixes-20230321' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating 7d31677bb7b1..2faac9a98f01 +Fast-forward (no commit created; -m option ignored) + crypto/asymmetric_keys/pkcs7_verify.c | 10 +++++----- + crypto/asymmetric_keys/verify_pefile.c | 32 ++++++++++++++++++-------------- + fs/crypto/keyring.c | 23 +++++++++++++---------- + fs/super.c | 15 ++++++++++++--- + fs/verity/enable.c | 25 +++++++++++++------------ + fs/verity/verify.c | 12 ++++++------ + security/keys/request_key.c | 9 ++++++--- + 7 files changed, 73 insertions(+), 53 deletions(-) +Merging fixes/fixes (9c9155a3509a Merge tag 'drm-next-2022-10-14' of git://anongit.freedesktop.org/drm/drm) +$ 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 (383d91b9fcc9 mm: kfence: fix PG_slab and memcg_data clearing) + b10228d2b1b2 ("tools headers UAPI: sync linux/prctl.h with the kernel sources") +$ git merge -m Merge branch 'mm-hotfixes-unstable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-hotfixes/mm-hotfixes-unstable +Auto-merging .mailmap +Merge made by the 'ort' strategy. + .mailmap | 11 ++++++ + arch/powerpc/include/asm/kasan.h | 2 +- + arch/powerpc/include/asm/string.h | 15 ++++++-- + arch/powerpc/kernel/prom_init_check.sh | 9 ++++- + fs/nilfs2/ioctl.c | 2 +- + include/trace/events/mmap.h | 4 +- + kernel/kcsan/Makefile | 2 +- + kernel/sys.c | 69 ++++++++++++++++++++-------------- + lib/Kconfig.debug | 2 +- + lib/dhry_run.c | 6 ++- + lib/maple_tree.c | 24 +++--------- + lib/test_maple_tree.c | 48 +++++++++++++++++++++++ + mm/kfence/Makefile | 2 +- + mm/kfence/core.c | 40 +++++++++++--------- + mm/ksm.c | 11 +++++- + mm/mmap.c | 7 +--- + mm/mprotect.c | 2 +- + mm/page_alloc.c | 3 +- + mm/vmalloc.c | 28 +++++++++++--- + scripts/checksyscalls.sh | 4 +- + tools/testing/selftests/mm/mdwe_test.c | 3 +- + 21 files changed, 196 insertions(+), 98 deletions(-) +Merging kbuild-current/fixes (a3671bd86a97 Merge tag 'fbdev-for-6.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev) +$ 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 (2f62847cf6ae ARM: 9287/1: Reduce __thumb2__ definition to crypto files that require it) +$ 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 (fe15c26ee26e Linux 6.3-rc1) +$ git merge -m Merge branch 'for-next/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64-fixes/for-next/fixes +Already up to date. +Merging arm-soc-fixes/arm/fixes (9f79762ef8d9 Merge tag 'samsung-dt-fixes-6.3' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/fixes) +$ git merge -m Merge branch 'arm/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc-fixes/arm/fixes +Already up to date. +Merging davinci-current/davinci/for-current (fe15c26ee26e Linux 6.3-rc1) +$ git merge -m Merge branch 'davinci/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git davinci-current/davinci/for-current +Already up to date. +Merging drivers-memory-fixes/fixes (fe15c26ee26e Linux 6.3-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory-fixes/fixes +Already up to date. +Merging tee-fixes/fixes (ceaa837f96ad Linux 6.2-rc8) +$ git merge -m Merge branch 'fixes' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee-fixes/fixes +Already up to date. +Merging m68k-current/for-linus (e36a82bebbf7 m68k: Only force 030 bus error if PC not in exception table) +$ 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 (f2c7e3562b4c powerpc/mm: Fix false detection of read faults) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc-fixes/fixes +Already up to date. +Merging s390-fixes/fixes (d7a0bdbf1727 s390: update defconfigs) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390-fixes/fixes +Already up to date. +Merging sparc/master (2d2b17d08bfc sparc: Unbreak the build) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git sparc/master +Auto-merging arch/sparc/mm/srmmu.c +Merge made by the 'ort' strategy. +Merging fscrypt-current/for-current (4bcf6f827a79 fscrypt: check for NULL keyring in fscrypt_put_master_key_activeref()) +$ git merge -m Merge branch 'for-current' of git://git.kernel.org/pub/scm/fs/fscrypt/linux.git fscrypt-current/for-current +Already up to date. +Merging fsverity-current/for-current (a075bacde257 fsverity: don't drop pagecache at end of FS_IOC_ENABLE_VERITY) +$ git merge -m Merge branch 'for-current' of git://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity-current/for-current +Already up to date. +Merging net/main (f038f3917baf octeontx2-vf: Add missing free for alloc_percpu) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/main +Merge made by the 'ort' strategy. + drivers/net/dsa/b53/b53_mmap.c | 2 +- + drivers/net/ethernet/intel/iavf/iavf_common.c | 2 +- + drivers/net/ethernet/intel/iavf/iavf_main.c | 8 ++ + drivers/net/ethernet/intel/iavf/iavf_txrx.c | 2 +- + drivers/net/ethernet/intel/iavf/iavf_virtchnl.c | 2 - + drivers/net/ethernet/intel/igb/igb_main.c | 137 +++++++++------------ + drivers/net/ethernet/intel/igbvf/netdev.c | 8 +- + drivers/net/ethernet/intel/igbvf/vf.c | 13 +- + drivers/net/ethernet/intel/igc/igc_main.c | 20 +-- + .../net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 2 + + drivers/net/ethernet/mellanox/mlxsw/core_thermal.c | 7 +- + drivers/net/ethernet/qlogic/qed/qed_sriov.c | 5 +- + drivers/net/ethernet/qualcomm/emac/emac.c | 6 + + drivers/net/ethernet/stmicro/stmmac/common.h | 1 + + drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 4 +- + .../net/ethernet/stmicro/stmmac/dwmac-mediatek.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 30 ++--- + drivers/net/ethernet/ti/am65-cpts.c | 4 + + drivers/net/ethernet/toshiba/ps3_gelic_net.c | 41 +++--- + drivers/net/ethernet/toshiba/ps3_gelic_net.h | 5 +- + drivers/net/ethernet/xircom/xirc2ps_cs.c | 5 + + drivers/net/mdio/acpi_mdio.c | 10 +- + drivers/net/mdio/of_mdio.c | 12 +- + drivers/net/phy/mdio_devres.c | 11 +- + drivers/net/phy/phy.c | 23 ++-- + drivers/net/phy/sfp.c | 5 + + drivers/net/usb/lan78xx.c | 18 ++- + drivers/net/usb/plusb.c | 6 - + drivers/net/usb/smsc95xx.c | 6 + + include/linux/acpi_mdio.h | 9 +- + include/linux/of_mdio.h | 22 +++- + include/linux/stmmac.h | 2 +- + net/dsa/tag.c | 2 +- + 34 files changed, 255 insertions(+), 179 deletions(-) +Merging bpf/master (10ec8ca8ec1a bpf: Adjust insufficient default bpf_jit_limit) +$ 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/core.c | 2 +- + kernel/bpf/verifier.c | 11 ++- + net/xdp/xdp_umem.c | 13 +-- + tools/lib/bpf/libbpf_internal.h | 4 +- + .../selftests/bpf/prog_tests/uninit_stack.c | 9 ++ + tools/testing/selftests/bpf/progs/find_vma_fail1.c | 1 + + .../selftests/bpf/progs/test_deny_namespace.c | 10 +- + .../selftests/bpf/progs/test_global_func10.c | 8 +- + tools/testing/selftests/bpf/progs/uninit_stack.c | 87 +++++++++++++++++ + tools/testing/selftests/bpf/verifier/calls.c | 13 ++- + .../selftests/bpf/verifier/helper_access_var_len.c | 104 ++++++++++++++------- + tools/testing/selftests/bpf/verifier/int_ptr.c | 9 +- + .../selftests/bpf/verifier/search_pruning.c | 13 ++- + tools/testing/selftests/bpf/verifier/sock.c | 27 ------ + tools/testing/selftests/bpf/verifier/spill_fill.c | 7 +- + tools/testing/selftests/bpf/verifier/var_off.c | 52 ----------- + 16 files changed, 219 insertions(+), 151 deletions(-) + create mode 100644 tools/testing/selftests/bpf/prog_tests/uninit_stack.c + create mode 100644 tools/testing/selftests/bpf/progs/uninit_stack.c +Merging ipsec/master (c276a706ea1f xfrm: Allow transport-mode states with AF_UNSPEC selector) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master +Already up to date. +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 (e866f29a6ff1 Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git ipvs/main +Already up to date. +Merging wireless/for-next (007ae9b268ba wifi: mac80211: Serialize ieee80211_handle_wake_tx_queue()) +$ 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/marvell/mwifiex/pcie.c | 2 +- + drivers/net/wireless/marvell/mwifiex/sdio.c | 2 +- + drivers/net/wireless/mediatek/mt76/mac80211.c | 8 +++++ + drivers/net/wireless/mediatek/mt76/mt76.h | 1 + + .../net/wireless/mediatek/mt76/mt76_connac_mcu.c | 3 ++ + drivers/net/wireless/mediatek/mt76/mt7915/init.c | 40 ++++++++++++++++------ + net/mac80211/ieee80211_i.h | 3 ++ + net/mac80211/main.c | 2 ++ + net/mac80211/util.c | 3 ++ + 9 files changed, 52 insertions(+), 12 deletions(-) +Merging rdma-fixes/for-rc (eeac8ede1755 Linux 6.3-rc2) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (8c721c53dda5 ALSA: usb-audio: Fix recursive locking at XRUN during syncing) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus +Merge made by the 'ort' strategy. + sound/core/pcm_lib.c | 2 ++ + sound/pci/hda/patch_conexant.c | 6 +++++- + sound/pci/hda/patch_realtek.c | 4 ++++ + sound/usb/endpoint.c | 22 ++++++++++++++-------- + sound/usb/endpoint.h | 4 ++-- + sound/usb/pcm.c | 2 +- + 6 files changed, 28 insertions(+), 12 deletions(-) +Merging sound-asoc-fixes/for-linus (205efd4619b8 ASoC: amd: yc: Add DMI entries to support Victus by HP Laptop 16-e1xxx (8A22)) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc-fixes/for-linus +Merge made by the 'ort' strategy. + sound/soc/amd/yc/acp6x-mach.c | 7 +++++++ + sound/soc/intel/boards/sof_sdw.c | 11 +++++++++++ + sound/soc/intel/common/soc-acpi-intel-adl-match.c | 20 ++++++++++++++++++++ + sound/soc/soc-pcm.c | 4 ++++ + 4 files changed, 42 insertions(+) +Merging regmap-fixes/for-linus (eeac8ede1755 Linux 6.3-rc2) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (eeac8ede1755 Linux 6.3-rc2) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus +Already up to date. +Merging spi-fixes/for-linus (eeac8ede1755 Linux 6.3-rc2) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi-fixes/for-linus +Already up to date. +Merging pci-current/for-linus (cdce67099117 PCI: dwc: Fix PORT_LINK_CONTROL update when CDM check enabled) +$ 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/controller/dwc/pcie-designware.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) +Merging driver-core.current/driver-core-linus (44ac5abac86b Documentation/security-bugs: move from admin-guide/ to process/) +$ 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 +Auto-merging Documentation/process/submitting-patches.rst +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/admin-guide/index.rst | 1 - + Documentation/admin-guide/reporting-issues.rst | 4 ++-- + Documentation/process/howto.rst | 2 +- + Documentation/process/index.rst | 9 ++++++++- + Documentation/process/researcher-guidelines.rst | 2 +- + Documentation/{admin-guide => process}/security-bugs.rst | 0 + Documentation/process/stable-kernel-rules.rst | 2 +- + Documentation/process/submitting-patches.rst | 2 +- + .../translations/it_IT/admin-guide/security-bugs.rst | 2 +- + .../translations/it_IT/process/submitting-patches.rst | 2 +- + Documentation/translations/ja_JP/howto.rst | 2 +- + Documentation/translations/ko_KR/howto.rst | 2 +- + Documentation/translations/sp_SP/howto.rst | 2 +- + .../translations/sp_SP/process/submitting-patches.rst | 2 +- + .../translations/zh_CN/admin-guide/security-bugs.rst | 2 +- + Documentation/translations/zh_CN/process/howto.rst | 2 +- + .../translations/zh_TW/admin-guide/security-bugs.rst | 2 +- + Documentation/translations/zh_TW/process/howto.rst | 2 +- + MAINTAINERS | 4 ++-- + drivers/mtd/spi-nor/core.c | 14 +++++++++++++- + drivers/mtd/spi-nor/core.h | 2 ++ + drivers/mtd/spi-nor/debugfs.c | 11 ++++++++--- + 22 files changed, 49 insertions(+), 24 deletions(-) + rename Documentation/{admin-guide => process}/security-bugs.rst (100%) +Merging tty.current/tty-linus (e8d018dd0257 Linux 6.3-rc3) +$ git merge -m Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (bbf860ed710b usb: gadget: Use correct endianness of the wLength field for WebUSB) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/usb/gadget_uvc.rst | 352 ++++++++++++++++++++++++++++++++++ + Documentation/usb/index.rst | 1 + + MAINTAINERS | 1 + + drivers/usb/cdns3/cdns3-pci-wrap.c | 5 + + drivers/usb/cdns3/cdnsp-ep0.c | 19 +- + drivers/usb/cdns3/cdnsp-pci.c | 27 ++- + drivers/usb/dwc2/drd.c | 3 +- + drivers/usb/dwc3/core.h | 2 +- + drivers/usb/dwc3/gadget.c | 14 +- + drivers/usb/gadget/composite.c | 7 +- + drivers/usb/gadget/function/u_audio.c | 2 +- + drivers/usb/misc/onboard_usb_hub.c | 1 + + drivers/usb/misc/onboard_usb_hub.h | 1 + + drivers/usb/storage/unusual_uas.h | 7 + + drivers/usb/typec/tcpm/tcpm.c | 28 ++- + drivers/usb/typec/ucsi/ucsi.c | 33 ++-- + drivers/usb/typec/ucsi/ucsi_acpi.c | 2 +- + 17 files changed, 438 insertions(+), 67 deletions(-) + create mode 100644 Documentation/usb/gadget_uvc.rst +Merging usb-serial-fixes/usb-linus (773e8e7d07b7 USB: serial: option: add Telit FE990 compositions) +$ 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 +Merge made by the 'ort' strategy. + drivers/usb/serial/cp210x.c | 1 + + drivers/usb/serial/option.c | 8 ++++++++ + 2 files changed, 9 insertions(+) +Merging phy/fixes (fe15c26ee26e Linux 6.3-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy/fixes +Already up to date. +Merging staging.current/staging-linus (eeac8ede1755 Linux 6.3-rc2) +$ git merge -m Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging.current/staging-linus +Already up to date. +Merging iio-fixes/fixes-togreg (363c7dc72f79 iio: adc: ti-ads7950: Set `can_sleep` flag for GPIO chip) +$ git merge -m Merge branch 'fixes-togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio-fixes/fixes-togreg +Auto-merging drivers/iio/adc/max11410.c +Auto-merging drivers/iio/adc/qcom-spmi-adc5.c +Auto-merging drivers/iio/light/vcnl4000.c +Merge made by the 'ort' strategy. + drivers/iio/accel/kionix-kx022a.c | 2 +- + drivers/iio/adc/ad7791.c | 2 +- + drivers/iio/adc/ltc2497.c | 6 ++---- + drivers/iio/adc/max11410.c | 22 +++++++++++++++------- + drivers/iio/adc/palmas_gpadc.c | 2 +- + drivers/iio/adc/qcom-spmi-adc5.c | 10 +++++++++- + drivers/iio/adc/ti-ads7950.c | 1 + + drivers/iio/dac/cio-dac.c | 4 ++-- + drivers/iio/imu/Kconfig | 1 + + drivers/iio/industrialio-buffer.c | 21 ++++++++++++--------- + drivers/iio/light/cm32181.c | 12 ++++++++++++ + drivers/iio/light/vcnl4000.c | 3 ++- + 12 files changed, 59 insertions(+), 27 deletions(-) +Merging counter-current/counter-current (00f4bc5184c1 counter: 104-quad-8: Fix Synapse action reported for Index signals) +$ git merge -m Merge branch 'counter-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-current/counter-current +Merge made by the 'ort' strategy. + drivers/counter/104-quad-8.c | 31 +++++++++---------------------- + 1 file changed, 9 insertions(+), 22 deletions(-) +Merging char-misc.current/char-misc-linus (4dd52392b5d7 Merge tag 'coresight-fixes-v6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux into char-misc-linus) +$ 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/hwtracing/coresight/coresight-etm4x-core.c | 24 +++++++++------------- + drivers/hwtracing/coresight/coresight-etm4x.h | 20 ++++++------------ + 2 files changed, 16 insertions(+), 28 deletions(-) +Merging soundwire-fixes/fixes (e6923fd863af soundwire: qcom: correct setting ignore bit on v1.5.1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire-fixes/fixes +Merge made by the 'ort' strategy. + drivers/soundwire/qcom.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging thunderbolt-fixes/fixes (58cdfe6f58b3 thunderbolt: Rename shadowed variables bit to interrupt_bit and auto_clear_bit) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt-fixes/fixes +Merge made by the 'ort' strategy. + drivers/thunderbolt/debugfs.c | 12 +++++----- + drivers/thunderbolt/nhi.c | 49 +++++++++++++++++++++++--------------- + drivers/thunderbolt/nhi_regs.h | 6 +++-- + drivers/thunderbolt/quirks.c | 44 +++++++++++++++++++++++++++++++++++ + drivers/thunderbolt/retimer.c | 23 ++++++++++++++++-- + drivers/thunderbolt/sb_regs.h | 1 + + drivers/thunderbolt/switch.c | 4 ++-- + drivers/thunderbolt/tb.h | 15 +++++++++--- + drivers/thunderbolt/usb4.c | 53 ++++++++++++++++++++++++++++++++++++------ + 9 files changed, 166 insertions(+), 41 deletions(-) +Merging input-current/for-linus (754ff5060daf Input: alps - fix compatibility with -funsigned-char) +$ 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/joystick/xpad.c | 7 ++++--- + drivers/input/mouse/alps.c | 16 ++++++++-------- + drivers/input/mouse/focaltech.c | 8 ++++---- + drivers/input/serio/i8042-acpipnpio.h | 8 ++++++++ + drivers/input/touchscreen/goodix.c | 14 +++++++++++--- + 5 files changed, 35 insertions(+), 18 deletions(-) +Merging crypto-current/master (660ca9470f9c crypto: caam - Fix edesc/iv ordering mixup) +$ 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 +Merge made by the 'ort' strategy. + drivers/vfio/pci/mlx5/main.c | 14 ++++---------- + 1 file changed, 4 insertions(+), 10 deletions(-) +Merging kselftest-fixes/fixes (05107edc9101 selftests: sigaltstack: fix -Wuninitialized) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest-fixes/fixes +Merge made by the 'ort' strategy. + .../selftests/sigaltstack/current_stack_pointer.h | 23 ++++++++++++++++++++++ + tools/testing/selftests/sigaltstack/sas.c | 7 +------ + 2 files changed, 24 insertions(+), 6 deletions(-) + create mode 100644 tools/testing/selftests/sigaltstack/current_stack_pointer.h +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 (b771baf3988a dmaengine: xilinx: xdma: Fix some kernel-doc comments) +$ 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/dmaengine.c | 2 +- + drivers/dma/xilinx/xdma.c | 2 +- + 2 files changed, 2 insertions(+), 2 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 (75dce6a941e3 mtd: nand: mxic-ecc: Fix mxic_ecc_data_xfer_wait_for_completion() when irq is used) +$ git merge -m Merge branch 'mtd/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd-fixes/mtd/fixes +Merge made by the 'ort' strategy. + drivers/mtd/nand/ecc-mxic.c | 1 + + drivers/mtd/nand/raw/meson_nand.c | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) +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 (55f1ecb11990 media: v4l: subdev: Make link validation safer) +$ 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/i2c/imx290.c | 6 +- + drivers/media/platform/qcom/venus/firmware.c | 4 +- + drivers/media/v4l2-core/v4l2-subdev.c | 92 +++++++++++++++++++--------- + 3 files changed, 67 insertions(+), 35 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 (ab327f8acdf8 mips: bmips: BCM6358: disable RAC flush for TP1) +$ git merge -m Merge branch 'mips-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips-fixes/mips-fixes +Merge made by the 'ort' strategy. + arch/mips/bmips/dma.c | 5 +++++ + arch/mips/bmips/setup.c | 8 ++++++++ + 2 files changed, 13 insertions(+) +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 (f3e707413dbe KVM: selftests: Sync KVM exit reasons in selftests) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (0dd4cdccdab3 KVM: s390: vsie: Fix the initialization of the epoch extension (epdx) field) +$ 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 (38c25fa52920 hwmon (it87): Fix voltage scaling for chips with 10.9mV ADCs) +$ git merge -m Merge branch 'hwmon' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon +Merge made by the 'ort' strategy. + drivers/hwmon/hwmon.c | 7 +++++-- + drivers/hwmon/it87.c | 4 +++- + drivers/hwmon/peci/cputemp.c | 8 +++++++- + drivers/hwmon/xgene-hwmon.c | 14 +++++++------- + 4 files changed, 22 insertions(+), 11 deletions(-) +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 (711442e29f16 cxl/region: Fix passthrough-decoder detection) +$ 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 (c637393d1e8f Merge branch 'misc-6.3' 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 | 28 ++++++++++++---------------- + fs/btrfs/free-space-cache.c | 8 +++++++- + fs/btrfs/fs.h | 7 ++----- + fs/btrfs/inode.c | 7 ++++++- + fs/btrfs/space-info.c | 42 ++++++++++-------------------------------- + fs/btrfs/space-info.h | 2 -- + fs/btrfs/volumes.c | 3 ++- + fs/btrfs/zoned.c | 45 ++++++++++++++++++++++++++++++++------------- + 8 files changed, 71 insertions(+), 71 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 (7c3940bf81e5 swiotlb: fix the deadlock in swiotlb_do_find_slots) +$ git merge -m Merge branch 'for-linus' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping-fixes/for-linus +Merge made by the 'ort' strategy. + kernel/dma/swiotlb.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) +Merging drivers-x86-fixes/fixes (b7c994f8c35e platform/x86 (gigabyte-wmi): Add support for A320M-S2H V2) +$ 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/x86/gigabyte-wmi.c | 1 + + drivers/platform/x86/intel/tpmi.c | 23 +++++++---------------- + drivers/platform/x86/intel/vsec.c | 1 + + 3 files changed, 9 insertions(+), 16 deletions(-) +Merging samsung-krzk-fixes/fixes (fe15c26ee26e Linux 6.3-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/fixes (fe15c26ee26e Linux 6.3-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung-fixes/fixes +Already up to date. +Merging devicetree-fixes/dt/linus (707344c8a188 dt-bindings: interrupt-controller: arm,gic-v3: Fix typo in description of msi-controller property) +$ git merge -m Merge branch 'dt/linus' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree-fixes/dt/linus +Already up to date. +Merging dt-krzk-fixes/fixes (fe15c26ee26e Linux 6.3-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk-fixes/fixes +Already up to date. +Merging scsi-fixes/fixes (a13faca032ac scsi: scsi_dh_alua: Fix memleak for 'qdata' in alua_activate()) +$ 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/device_handler/scsi_dh_alua.c | 6 ++++-- + drivers/scsi/qla2xxx/qla_isr.c | 3 ++- + drivers/scsi/qla2xxx/qla_os.c | 11 +++++++++++ + drivers/scsi/scsi_devinfo.c | 1 + + 4 files changed, 18 insertions(+), 3 deletions(-) +Merging drm-fixes/drm-fixes (e8d018dd0257 Linux 6.3-rc3) +$ 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 (22aa20e4c5dc Revert "drm/i915/hwmon: Enable PL1 power limit") +$ 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_crtc.c | 8 ++++++++ + drivers/gpu/drm/i915/display/intel_display.c | 1 + + drivers/gpu/drm/i915/display/intel_dmc.c | 26 ++++++++++++++++++++----- + drivers/gpu/drm/i915/display/intel_fbdev.c | 24 +++++++++++++++++------ + drivers/gpu/drm/i915/gt/intel_gt.c | 4 ++-- + drivers/gpu/drm/i915/gt/intel_gt_pm.c | 27 -------------------------- + drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c | 2 +- + drivers/gpu/drm/i915/gt/intel_rc6.c | 8 ++++++++ + drivers/gpu/drm/i915/gt/uc/intel_guc_capture.c | 22 +++++++++++++++++++++ + drivers/gpu/drm/i915/gt/uc/intel_guc_rc.c | 13 +------------ + drivers/gpu/drm/i915/i915_active.c | 3 +-- + drivers/gpu/drm/i915/i915_hwmon.c | 5 ----- + drivers/gpu/drm/i915/i915_reg.h | 17 +++++----------- + 13 files changed, 88 insertions(+), 72 deletions(-) +Merging mmc-fixes/fixes (92771cdd90de mmc: dw_mmc-starfive: Fix initialization of prev_err) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes +Already up to date. +Merging rtc-fixes/rtc-fixes (08279468a294 rtc: sunplus: fix format string for printing resource) +$ git merge -m Merge branch 'rtc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc-fixes/rtc-fixes +Already up to date. +Merging gnss-fixes/gnss-linus (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'gnss-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (f8acb24aaf89 x86/hyperv: Block root partition functionality in a Confidential VM) +$ git merge -m Merge branch 'hyperv-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes +Merge made by the 'ort' strategy. + arch/x86/kernel/cpu/mshyperv.c | 12 ++++++++---- + drivers/hv/connection.c | 4 ++++ + 2 files changed, 12 insertions(+), 4 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 (47dd902aaee9 RISC-V: mm: Support huge page in vmalloc_fault()) +$ 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 (fe15c26ee26e Linux 6.3-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 (fe15c26ee26e Linux 6.3-rc1) +$ git merge -m Merge branch 'riscv-soc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc-fixes/riscv-soc-fixes +Already up to date. +Merging fpga-fixes/fixes (fe15c26ee26e Linux 6.3-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga-fixes/fixes +Already up to date. +Merging spdx/spdx-linus (fe15c26ee26e Linux 6.3-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 (d49765b5f432 gpio: GPIO_REGMAP: select REGMAP instead of depending on it) +$ 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/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging gpio-intel-fixes/fixes (fe15c26ee26e Linux 6.3-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel-fixes/fixes +Already up to date. +Merging pinctrl-intel-fixes/fixes (fe15c26ee26e Linux 6.3-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel-fixes/fixes +Already up to date. +Merging erofs-fixes/fixes (3993f4f45630 erofs: use wrapper i_blocksize() in erofs_file_read_iter()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs-fixes/fixes +Already up to date. +Merging kunit-fixes/kunit-fixes (fe15c26ee26e Linux 6.3-rc1) +$ git merge -m Merge branch 'kunit-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-fixes/kunit-fixes +Already up to date. +Merging ubifs-fixes/fixes (2241ab53cbb5 Linux 6.2-rc5) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs-fixes/fixes +Already up to date. +Merging memblock-fixes/fixes (647037adcad0 Revert "mm: Always release pages to the buddy allocator in memblock_free_late().") +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock-fixes/fixes +Already up to date. +Merging nfsd-fixes/nfsd-fixes (27c934dd8832 nfsd: don't replace page in rq_pages if it's a continuation of last page) +$ git merge -m Merge branch 'nfsd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd-fixes/nfsd-fixes +Auto-merging fs/nfsd/vfs.c +Merge made by the 'ort' strategy. + fs/nfs/Kconfig | 2 +- + fs/nfsd/Kconfig | 2 +- + fs/nfsd/vfs.c | 9 ++++++++- + 3 files changed, 10 insertions(+), 3 deletions(-) +Merging irqchip-fixes/irq/irqchip-fixes (6c9f7434159b irqchip: IMX_MU_MSI should depend on ARCH_MXC) +$ git merge -m Merge branch 'irq/irqchip-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git irqchip-fixes/irq/irqchip-fixes +Already up to date. +Merging renesas-fixes/fixes (ab2866f12ca1 arm64: dts: renesas: r8a779g0: Fix HSCIF0 interrupt number) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas-fixes/fixes +Already up to date. +Merging broadcom-fixes/fixes (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'fixes' of https://github.com/Broadcom/stblinux.git broadcom-fixes/fixes +Already up to date. +Merging perf-current/perf/urgent (5b201a82cd9d perf tools: Add Adrian Hunter to MAINTAINERS as a reviewer) +$ git merge -m Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git perf-current/perf/urgent +Already up to date. +Merging efi-fixes/urgent (5ed213dd6468 efi: sysfb_efi: Add quirk for Lenovo Yoga Book X91F/L) +$ git merge -m Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-fixes/urgent +Merge made by the 'ort' strategy. + arch/arm64/kernel/efi-header.S | 2 +- + drivers/firmware/efi/earlycon.c | 16 ++++++++--- + drivers/firmware/efi/efi-init.c | 3 +++ + drivers/firmware/efi/libstub/arm64-stub.c | 1 + + drivers/firmware/efi/libstub/arm64.c | 39 +++++++++++++++++++++------ + drivers/firmware/efi/libstub/efistub.h | 42 ++++++++++++++++++++++++++--- + drivers/firmware/efi/libstub/smbios.c | 15 ++++++++--- + drivers/firmware/efi/libstub/zboot-header.S | 2 +- + drivers/firmware/efi/sysfb_efi.c | 13 ++++++++- + drivers/firmware/sysfb.c | 4 ++- + drivers/firmware/sysfb_simplefb.c | 2 +- + include/linux/efi.h | 1 + + include/linux/sysfb.h | 9 +++++-- + 13 files changed, 124 insertions(+), 25 deletions(-) +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 (06615d11cc78 power: supply: da9150: Fix use after free bug in da9150_charger_remove due to race condition) +$ 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/axp288_fuel_gauge.c | 2 ++ + drivers/power/supply/bq24190_charger.c | 1 + + drivers/power/supply/cros_usbpd-charger.c | 2 +- + drivers/power/supply/da9150-charger.c | 1 + + drivers/power/supply/rk817_charger.c | 4 ---- + 5 files changed, 5 insertions(+), 5 deletions(-) +Merging uml-fixes/fixes (bd71558d585a arch: um: Mark the stack non-executable to fix a binutils warning) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml-fixes/fixes +Already up to date. +Merging asahi-soc-fixes/asahi-soc/fixes (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'asahi-soc/fixes' of https://github.com/AsahiLinux/linux.git asahi-soc-fixes/asahi-soc/fixes +Already up to date. +Merging iommufd-fixes/for-rc (fe15c26ee26e Linux 6.3-rc1) +$ 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 (3098cb655e7c rust: bindgen: Add `alt_instr` as opaque type) +$ 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 drm-misc-fixes/for-linux-next-fixes (03aecb1acbcd drm: panel-orientation-quirks: Add quirk for Lenovo Yoga Book X90F) +$ 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/gpu/drm/drm_panel_orientation_quirks.c | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) +Merging mm-stable/mm-stable (819c2608ce2c Sync mm-stable with 6.3-rc1) +$ git merge -m Merge branch 'mm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-stable/mm-stable +Merge made by the 'ort' strategy. + mm/Kconfig | 9 ++++ + mm/Makefile | 1 + + mm/dmapool_test.c | 147 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 157 insertions(+) + create mode 100644 mm/dmapool_test.c +Merging mm-nonmm-stable/mm-nonmm-stable (fe15c26ee26e Linux 6.3-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 (9f63dcd4248b Merge branch 'mm-nonmm-unstable' into mm-everything) + 9f6f2b7ec645 ("fs: prevent out-of-bounds array speculation when closing a file descriptor") +$ 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/powerpc/mm/fault.c +Auto-merging arch/powerpc/platforms/pseries/Kconfig +Auto-merging fs/ext4/inode.c +Auto-merging fs/super.c +Auto-merging include/linux/highmem.h +Auto-merging kernel/fork.c +Auto-merging kernel/sched/core.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-kernel-mm-ksm | 8 + + Documentation/ELF/ELF.rst | 28 + + Documentation/accounting/delay-accounting.rst | 14 +- + Documentation/admin-guide/kdump/vmcoreinfo.rst | 6 +- + Documentation/admin-guide/kernel-parameters.txt | 2 +- + Documentation/admin-guide/mm/ksm.rst | 56 +- + Documentation/admin-guide/mm/userfaultfd.rst | 25 + + Documentation/core-api/printk-formats.rst | 16 +- + Documentation/dev-tools/kcov.rst | 169 +- + Documentation/filesystems/tmpfs.rst | 66 +- + Documentation/mm/active_mm.rst | 6 + + Documentation/mm/arch_pgtable_helpers.rst | 2 +- + Documentation/mm/multigen_lru.rst | 44 +- + Documentation/mm/unevictable-lru.rst | 2 + + .../zh_CN/accounting/delay-accounting.rst | 10 +- + MAINTAINERS | 10 +- + arch/Kconfig | 32 + + arch/arc/Kconfig | 4 +- + arch/arm/Kconfig | 9 +- + arch/arm/configs/imx_v6_v7_defconfig | 2 +- + arch/arm/configs/milbeaut_m10v_defconfig | 2 +- + arch/arm/configs/oxnas_v6_defconfig | 2 +- + arch/arm/configs/pxa_defconfig | 2 +- + arch/arm/configs/sama7_defconfig | 2 +- + arch/arm/configs/sp7021_defconfig | 2 +- + arch/arm/mach-rpc/ecard.c | 2 +- + arch/arm64/Kconfig | 28 +- + arch/arm64/include/asm/kfence.h | 10 + + arch/arm64/include/asm/memory.h | 8 +- + arch/arm64/include/asm/mte-kasan.h | 81 + + arch/arm64/include/asm/mte.h | 12 - + arch/arm64/include/asm/percpu.h | 16 +- + arch/arm64/include/asm/pgtable.h | 2 +- + arch/arm64/include/asm/sparsemem.h | 2 +- + arch/arm64/include/asm/uaccess.h | 66 +- + arch/arm64/include/asm/word-at-a-time.h | 4 +- + arch/arm64/kvm/hyp/include/nvhe/gfp.h | 2 +- + arch/arm64/kvm/hyp/nvhe/page_alloc.c | 10 +- + arch/arm64/mm/fault.c | 36 + + arch/arm64/mm/mmu.c | 61 + + arch/arm64/mm/pageattr.c | 7 +- + arch/csky/Kconfig | 2 +- + arch/ia64/Kconfig | 8 +- + arch/ia64/include/asm/sparsemem.h | 4 +- + arch/ia64/kernel/salinfo.c | 2 +- + arch/ia64/mm/contig.c | 2 +- + arch/ia64/mm/hugetlbpage.c | 2 +- + arch/loongarch/Kconfig | 15 +- + arch/loongarch/include/asm/percpu.h | 23 +- + arch/m68k/Kconfig.cpu | 5 +- + arch/mips/Kconfig | 19 +- + arch/mips/boot/tools/relocs.c | 2 +- + arch/mips/include/asm/fixmap.h | 2 +- + arch/mips/include/asm/pgtable.h | 3 +- + arch/nios2/Kconfig | 7 +- + arch/powerpc/Kconfig | 28 +- + arch/powerpc/configs/85xx/ge_imp3a_defconfig | 2 +- + arch/powerpc/configs/fsl-emb-nonhw.config | 2 +- + arch/powerpc/include/asm/book3s/64/tlbflush.h | 3 +- + arch/powerpc/kernel/smp.c | 2 +- + arch/powerpc/mm/book3s64/iommu_api.c | 2 +- + arch/powerpc/mm/book3s64/radix_tlb.c | 4 +- + arch/powerpc/mm/fault.c | 37 + + arch/powerpc/mm/hugetlbpage.c | 2 +- + arch/powerpc/platforms/powernv/Kconfig | 1 + + arch/powerpc/platforms/powernv/pci-ioda.c | 2 +- + arch/powerpc/platforms/pseries/Kconfig | 1 + + arch/s390/Kconfig | 1 + + arch/s390/include/asm/percpu.h | 5 + + arch/s390/include/asm/pgtable.h | 12 +- + arch/s390/mm/fault.c | 24 + + arch/sh/configs/ecovec24_defconfig | 2 +- + arch/sh/mm/Kconfig | 17 +- + arch/sparc/Kconfig | 5 +- + arch/sparc/kernel/pci_sun4v.c | 2 +- + arch/sparc/kernel/traps_64.c | 2 +- + arch/sparc/mm/tsb.c | 4 +- + arch/um/os-Linux/elf_aux.c | 2 +- + arch/x86/Kconfig | 1 + + arch/x86/include/asm/percpu.h | 41 +- + arch/x86/include/asm/pgtable.h | 2 +- + arch/x86/include/asm/string_64.h | 23 +- + arch/x86/mm/fault.c | 36 + + arch/x86/mm/pat/memtype.c | 12 +- + arch/x86/tools/relocs.c | 2 +- + arch/xtensa/Kconfig | 5 +- + drivers/base/regmap/regmap-debugfs.c | 8 +- + drivers/block/floppy.c | 2 +- + drivers/crypto/ccp/sev-dev.c | 2 +- + drivers/crypto/hisilicon/sgl.c | 6 +- + drivers/dca/dca-core.c | 4 +- + drivers/dma-buf/heaps/system_heap.c | 5 +- + drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 2 +- + drivers/gpu/drm/ttm/ttm_pool.c | 22 +- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 2 +- + drivers/iommu/dma-iommu.c | 4 +- + drivers/irqchip/irq-gic-v3-its.c | 4 +- + drivers/md/dm-bufio.c | 2 +- + drivers/md/dm-cache-metadata.c | 2 +- + drivers/md/dm-thin-metadata.c | 2 +- + drivers/misc/genwqe/card_utils.c | 2 +- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 2 +- + drivers/net/ethernet/ibm/ibmvnic.h | 2 +- + drivers/remoteproc/remoteproc_coredump.c | 4 +- + drivers/remoteproc/remoteproc_elf_loader.c | 4 +- + drivers/video/fbdev/hyperv_fb.c | 4 +- + drivers/video/fbdev/vermilion/vermilion.c | 2 +- + drivers/virtio/virtio_balloon.c | 2 +- + drivers/virtio/virtio_mem.c | 12 +- + fs/afs/dir.c | 10 +- + fs/afs/dir_edit.c | 2 +- + fs/afs/write.c | 4 +- + fs/binfmt_elf.c | 2 +- + fs/binfmt_elf_fdpic.c | 2 +- + fs/exec.c | 2 +- + fs/ext4/inode.c | 2 +- + fs/ext4/move_extent.c | 8 +- + fs/hugetlbfs/inode.c | 2 +- + fs/iomap/buffered-io.c | 11 +- + fs/jfs/jfs_metapage.c | 39 +- + fs/netfs/buffered_read.c | 4 +- + fs/nfs/file.c | 4 +- + fs/nfs/nfs3acl.c | 5 +- + fs/nilfs2/page.c | 6 +- + fs/ocfs2/refcounttree.c | 9 +- + fs/proc/base.c | 7 +- + fs/proc/generic.c | 1 - + fs/proc/kcore.c | 84 +- + fs/proc/proc_sysctl.c | 1 - + fs/proc/vmcore.c | 22 +- + fs/ramfs/file-nommu.c | 2 +- + fs/super.c | 2 +- + fs/ufs/dir.c | 29 +- + fs/userfaultfd.c | 45 +- + include/asm-generic/percpu.h | 17 + + include/asm-generic/pgalloc.h | 4 +- + include/drm/ttm/ttm_pool.h | 2 +- + include/linux/cpuset.h | 16 +- + include/linux/gfp.h | 7 +- + include/linux/gfp_types.h | 30 +- + include/linux/highmem.h | 62 +- + include/linux/huge_mm.h | 2 +- + include/linux/hugetlb.h | 29 +- + include/linux/io-mapping.h | 20 +- + include/linux/ksm.h | 19 +- + include/linux/memcontrol.h | 1 + + include/linux/mm.h | 166 +- + include/linux/mm_inline.h | 6 + + include/linux/mm_types.h | 49 +- + include/linux/mmap_lock.h | 37 +- + include/linux/mmzone.h | 27 +- + include/linux/page-flags.h | 16 +- + include/linux/page_ext.h | 2 - + include/linux/pageblock-flags.h | 4 +- + include/linux/pagemap.h | 21 +- + include/linux/percpu-defs.h | 2 + + include/linux/pgtable.h | 9 +- + include/linux/sched/coredump.h | 1 + + include/linux/sched/isolation.h | 12 + + include/linux/sched/mm.h | 28 + + include/linux/shmem_fs.h | 10 +- + include/linux/slab.h | 7 +- + include/linux/swap.h | 20 +- + include/linux/userfaultfd_k.h | 92 +- + include/linux/vm_event_item.h | 6 + + include/linux/vmalloc.h | 7 +- + include/linux/vmstat.h | 10 +- + include/trace/events/huge_memory.h | 4 +- + include/trace/events/ksm.h | 251 ++ + include/trace/events/mmflags.h | 94 +- + include/trace/events/notifier.h | 69 + + include/uapi/linux/prctl.h | 2 + + include/uapi/linux/userfaultfd.h | 17 +- + init/main.c | 74 +- + kernel/cgroup/cpuset.c | 4 +- + kernel/cpu.c | 2 +- + kernel/crash_core.c | 2 +- + kernel/dma/pool.c | 6 +- + kernel/events/ring_buffer.c | 2 +- + kernel/exit.c | 2 +- + kernel/fork.c | 168 +- + kernel/hung_task.c | 10 +- + kernel/kthread.c | 22 +- + kernel/notifier.c | 6 + + kernel/sched/core.c | 15 +- + kernel/sched/fair.c | 57 + + kernel/scs.c | 2 +- + kernel/sys.c | 27 + + lib/Kconfig.debug | 10 + + lib/buildid.c | 2 +- + lib/maple_tree.c | 270 +- + lib/stackdepot.c | 12 + + lib/test_printf.c | 26 + + lib/vsprintf.c | 21 + + mm/Kconfig | 22 +- + mm/Kconfig.debug | 6 + + mm/cma.c | 21 + + mm/cma_sysfs.c | 2 +- + mm/compaction.c | 20 +- + mm/damon/paddr.c | 26 +- + mm/debug.c | 7 + + mm/debug_vm_pgtable.c | 10 +- + mm/fadvise.c | 11 +- + mm/filemap.c | 27 +- + mm/folio-compat.c | 4 +- + mm/gup.c | 2 +- + mm/huge_memory.c | 36 +- + mm/hugetlb.c | 38 +- + mm/hugetlb_vmemmap.c | 16 +- + mm/init-mm.c | 3 + + mm/internal.h | 69 +- + mm/kasan/hw_tags.c | 14 +- + mm/kasan/kasan.h | 38 +- + mm/kasan/kasan_test.c | 2 +- + mm/kasan/report.c | 59 +- + mm/kfence/core.c | 4 + + mm/khugepaged.c | 432 ++- + mm/kmsan/init.c | 6 +- + mm/kmsan/kmsan_test.c | 97 +- + mm/ksm.c | 343 ++- + mm/memblock.c | 2 +- + mm/memcontrol.c | 35 +- + mm/memory-failure.c | 2 +- + mm/memory.c | 207 +- + mm/memory_hotplug.c | 4 +- + mm/migrate.c | 1 - + mm/mincore.c | 2 +- + mm/mm_init.c | 2532 ++++++++++++++++ + mm/mmap.c | 305 +- + mm/mmu_gather.c | 2 +- + mm/mprotect.c | 51 +- + mm/mremap.c | 23 +- + mm/nommu.c | 10 +- + mm/page-writeback.c | 40 - + mm/page_alloc.c | 3161 ++------------------ + mm/page_isolation.c | 12 +- + mm/page_owner.c | 6 +- + mm/page_reporting.c | 4 +- + mm/pgtable-generic.c | 2 +- + mm/rmap.c | 38 +- + mm/shmem.c | 233 +- + mm/shrinker_debug.c | 39 +- + mm/shuffle.h | 2 +- + mm/slab.c | 2 +- + mm/slab.h | 1 + + mm/slub.c | 4 +- + mm/swap_state.c | 19 +- + mm/swapfile.c | 10 +- + mm/truncate.c | 15 +- + mm/userfaultfd.c | 209 +- + mm/util.c | 1 + + mm/vmalloc.c | 183 +- + mm/vmscan.c | 188 +- + mm/vmstat.c | 460 +-- + mm/zsmalloc.c | 358 ++- + mm/zswap.c | 16 +- + net/smc/smc_ib.c | 2 +- + scripts/checkpatch.pl | 2 + + scripts/gdb/linux/cpus.py | 24 +- + scripts/leaking_addresses.pl | 1 + + scripts/link-vmlinux.sh | 2 +- + security/integrity/ima/ima_crypto.c | 2 +- + sound/soc/codecs/rt5677.c | 2 +- + tools/accounting/getdelays.c | 24 +- + tools/bpf/resolve_btfids/main.c | 2 +- + tools/include/uapi/linux/prctl.h | 2 + + tools/kvm/kvm_stat/kvm_stat | 2 +- + tools/lib/bpf/libbpf.c | 2 +- + tools/lib/bpf/usdt.c | 2 +- + tools/perf/util/symbol-elf.c | 2 +- + tools/testing/memblock/linux/mmzone.h | 6 +- + tools/testing/radix-tree/maple.c | 16 + + tools/testing/selftests/cgroup/test_memcontrol.c | 15 + + tools/testing/selftests/mm/Makefile | 2 +- + tools/testing/selftests/mm/ksm_functional_tests.c | 96 +- + tools/testing/selftests/mm/ksm_tests.c | 254 +- + tools/testing/selftests/mm/protection_keys.c | 4 +- + tools/testing/selftests/mm/run_vmtests.sh | 8 + + tools/testing/selftests/mm/split_huge_page_test.c | 6 +- + tools/testing/selftests/mm/userfaultfd.c | 49 +- + tools/testing/selftests/mm/virtual_address_range.c | 24 +- + tools/testing/selftests/user_events/dyn_test.c | 2 +- + tools/testing/selftests/user_events/ftrace_test.c | 10 +- + tools/testing/selftests/user_events/perf_test.c | 8 +- + 284 files changed, 8249 insertions(+), 5388 deletions(-) + create mode 100644 Documentation/ELF/ELF.rst + create mode 100644 include/trace/events/ksm.h + create mode 100644 include/trace/events/notifier.h +Merging kbuild/for-next (b26e7a4b4ef6 kallsyms: expand symbol name into comment for debugging) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild/for-next +Merge made by the 'ort' strategy. + scripts/kallsyms.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +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/core (96d541699e5c perf kvm: Update documentation to reflect new changes) +$ git merge -m Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git perf/perf/core +Auto-merging tools/perf/util/symbol-elf.c +Merge made by the 'ort' strategy. + tools/build/Makefile.feature | 1 + + tools/build/feature/Makefile | 11 +- + tools/build/feature/test-cxa-demangle.cpp | 17 + + tools/build/feature/test-libbpf-bpf_map_create.c | 8 - + .../feature/test-libbpf-bpf_object__next_map.c | 8 - + .../feature/test-libbpf-bpf_object__next_program.c | 8 - + tools/build/feature/test-libbpf-bpf_prog_load.c | 9 - + .../feature/test-libbpf-bpf_program__set_insns.c | 8 - + .../test-libbpf-btf__load_from_kernel_by_id.c | 8 - + tools/build/feature/test-libbpf-btf__raw_data.c | 8 - + tools/build/feature/test-libbpf.c | 4 + + tools/lib/perf/evlist.c | 31 +- + tools/lib/perf/include/internal/evlist.h | 1 - + tools/lib/perf/include/perf/event.h | 2 + + tools/lib/perf/include/perf/evlist.h | 1 + + tools/perf/Build | 2 +- + tools/perf/Documentation/perf-kvm.txt | 9 +- + tools/perf/Documentation/perf-record.txt | 60 +- + tools/perf/Documentation/perf-stat.txt | 27 +- + tools/perf/Documentation/topdown.txt | 70 +- + tools/perf/Makefile.config | 125 +- + tools/perf/Makefile.perf | 23 +- + tools/perf/arch/arm/util/cs-etm.c | 14 +- + tools/perf/arch/arm64/util/kvm-stat.c | 1 - + tools/perf/arch/powerpc/util/header.c | 2 +- + tools/perf/arch/powerpc/util/kvm-stat.c | 3 +- + tools/perf/arch/s390/util/kvm-stat.c | 1 - + tools/perf/arch/x86/util/auxtrace.c | 4 - + tools/perf/arch/x86/util/evlist.c | 45 +- + tools/perf/arch/x86/util/kvm-stat.c | 7 +- + tools/perf/arch/x86/util/pmu.c | 8 +- + tools/perf/arch/x86/util/topdown.c | 78 +- + tools/perf/arch/x86/util/topdown.h | 1 - + tools/perf/builtin-annotate.c | 2 +- + tools/perf/builtin-c2c.c | 4 +- + tools/perf/builtin-diff.c | 4 +- + tools/perf/builtin-ftrace.c | 10 +- + tools/perf/builtin-kvm.c | 861 +++++- + tools/perf/builtin-list.c | 13 +- + tools/perf/builtin-lock.c | 48 +- + tools/perf/builtin-record.c | 56 +- + tools/perf/builtin-report.c | 2 +- + tools/perf/builtin-script.c | 11 +- + tools/perf/builtin-stat.c | 257 +- + tools/perf/builtin-trace.c | 8 +- + tools/perf/builtin-version.c | 2 +- + .../pmu-events/arch/s390/cf_z13/transaction.json | 70 + + .../pmu-events/arch/s390/cf_z14/transaction.json | 65 + + .../pmu-events/arch/s390/cf_z15/transaction.json | 65 + + .../perf/pmu-events/arch/s390/cf_z16/pai_ext.json | 178 ++ + .../pmu-events/arch/s390/cf_z16/transaction.json | 65 + + .../pmu-events/arch/x86/alderlake/adl-metrics.json | 3190 +++++++++++--------- + .../perf/pmu-events/arch/x86/alderlake/cache.json | 36 +- + .../arch/x86/alderlake/floating-point.json | 27 + + .../pmu-events/arch/x86/alderlake/frontend.json | 9 + + .../perf/pmu-events/arch/x86/alderlake/memory.json | 11 +- + .../pmu-events/arch/x86/alderlake/pipeline.json | 24 +- + .../arch/x86/alderlake/uncore-other.json | 28 +- + .../arch/x86/alderlaken/adln-metrics.json | 811 ++--- + .../pmu-events/arch/x86/alderlaken/memory.json | 7 + + .../pmu-events/arch/x86/broadwell/bdw-metrics.json | 1439 +++++---- + .../arch/x86/broadwellde/bdwde-metrics.json | 1405 +++++---- + .../arch/x86/broadwellx/bdx-metrics.json | 1626 +++++----- + .../arch/x86/broadwellx/uncore-cache.json | 74 +- + .../arch/x86/broadwellx/uncore-interconnect.json | 64 +- + .../arch/x86/broadwellx/uncore-other.json | 4 +- + .../pmu-events/arch/x86/cascadelakex/cache.json | 24 +- + .../arch/x86/cascadelakex/clx-metrics.json | 2198 +++++++------- + .../pmu-events/arch/x86/cascadelakex/frontend.json | 8 +- + .../pmu-events/arch/x86/cascadelakex/pipeline.json | 16 + + .../arch/x86/cascadelakex/uncore-memory.json | 18 +- + .../arch/x86/cascadelakex/uncore-other.json | 120 +- + .../arch/x86/cascadelakex/uncore-power.json | 8 +- + .../pmu-events/arch/x86/graniterapids/cache.json | 54 + + .../arch/x86/graniterapids/frontend.json | 10 + + .../pmu-events/arch/x86/graniterapids/memory.json | 174 ++ + .../pmu-events/arch/x86/graniterapids/other.json | 29 + + .../arch/x86/graniterapids/pipeline.json | 102 + + .../arch/x86/graniterapids/virtual-memory.json | 26 + + .../pmu-events/arch/x86/haswell/hsw-metrics.json | 1220 ++++---- + .../pmu-events/arch/x86/haswellx/hsx-metrics.json | 1397 +++++---- + tools/perf/pmu-events/arch/x86/icelake/cache.json | 16 + + .../arch/x86/icelake/floating-point.json | 31 + + .../pmu-events/arch/x86/icelake/icl-metrics.json | 1932 +++++++----- + .../perf/pmu-events/arch/x86/icelake/pipeline.json | 23 +- + .../pmu-events/arch/x86/icelake/uncore-other.json | 56 + + tools/perf/pmu-events/arch/x86/icelakex/cache.json | 8 + + .../arch/x86/icelakex/floating-point.json | 31 + + .../pmu-events/arch/x86/icelakex/icx-metrics.json | 2153 ++++++------- + .../pmu-events/arch/x86/icelakex/pipeline.json | 10 + + .../arch/x86/icelakex/uncore-memory.json | 2 +- + .../pmu-events/arch/x86/icelakex/uncore-other.json | 4 +- + .../pmu-events/arch/x86/ivybridge/ivb-metrics.json | 1270 ++++---- + .../pmu-events/arch/x86/ivytown/ivt-metrics.json | 1311 ++++---- + tools/perf/pmu-events/arch/x86/jaketown/cache.json | 6 +- + .../arch/x86/jaketown/floating-point.json | 2 +- + .../pmu-events/arch/x86/jaketown/frontend.json | 12 +- + .../pmu-events/arch/x86/jaketown/jkt-metrics.json | 602 ++-- + .../pmu-events/arch/x86/jaketown/pipeline.json | 2 +- + .../pmu-events/arch/x86/jaketown/uncore-cache.json | 22 +- + .../arch/x86/jaketown/uncore-interconnect.json | 74 +- + .../arch/x86/jaketown/uncore-memory.json | 4 +- + .../pmu-events/arch/x86/jaketown/uncore-other.json | 22 +- + .../pmu-events/arch/x86/jaketown/uncore-power.json | 8 +- + .../pmu-events/arch/x86/knightslanding/cache.json | 94 +- + .../arch/x86/knightslanding/pipeline.json | 8 +- + .../arch/x86/knightslanding/uncore-other.json | 8 +- + tools/perf/pmu-events/arch/x86/mapfile.csv | 31 +- + .../perf/pmu-events/arch/x86/meteorlake/cache.json | 8 + + .../pmu-events/arch/x86/meteorlake/frontend.json | 9 + + .../pmu-events/arch/x86/meteorlake/memory.json | 13 +- + .../perf/pmu-events/arch/x86/meteorlake/other.json | 4 +- + .../pmu-events/arch/x86/meteorlake/pipeline.json | 36 +- + .../arch/x86/meteorlake/virtual-memory.json | 4 + + .../pmu-events/arch/x86/sandybridge/cache.json | 8 +- + .../arch/x86/sandybridge/floating-point.json | 2 +- + .../pmu-events/arch/x86/sandybridge/frontend.json | 12 +- + .../pmu-events/arch/x86/sandybridge/pipeline.json | 2 +- + .../arch/x86/sandybridge/snb-metrics.json | 601 ++-- + .../pmu-events/arch/x86/sapphirerapids/cache.json | 24 +- + .../arch/x86/sapphirerapids/floating-point.json | 32 + + .../arch/x86/sapphirerapids/frontend.json | 8 + + .../arch/x86/sapphirerapids/pipeline.json | 19 +- + .../arch/x86/sapphirerapids/spr-metrics.json | 2283 +++++++------- + .../arch/x86/sapphirerapids/uncore-other.json | 60 + + .../pmu-events/arch/x86/silvermont/frontend.json | 2 +- + .../pmu-events/arch/x86/silvermont/pipeline.json | 2 +- + tools/perf/pmu-events/arch/x86/skylake/cache.json | 17 +- + .../arch/x86/skylake/floating-point.json | 15 + + .../perf/pmu-events/arch/x86/skylake/frontend.json | 8 +- + tools/perf/pmu-events/arch/x86/skylake/other.json | 1 + + .../perf/pmu-events/arch/x86/skylake/pipeline.json | 26 + + .../pmu-events/arch/x86/skylake/skl-metrics.json | 1877 +++++++----- + .../pmu-events/arch/x86/skylake/uncore-other.json | 1 + + tools/perf/pmu-events/arch/x86/skylakex/cache.json | 8 +- + .../pmu-events/arch/x86/skylakex/frontend.json | 8 +- + .../pmu-events/arch/x86/skylakex/pipeline.json | 16 + + .../pmu-events/arch/x86/skylakex/skx-metrics.json | 2097 ++++++------- + .../arch/x86/skylakex/uncore-memory.json | 2 +- + .../pmu-events/arch/x86/skylakex/uncore-other.json | 96 +- + .../pmu-events/arch/x86/skylakex/uncore-power.json | 6 +- + .../arch/x86/tigerlake/floating-point.json | 31 + + .../pmu-events/arch/x86/tigerlake/pipeline.json | 18 + + .../pmu-events/arch/x86/tigerlake/tgl-metrics.json | 1942 +++++++----- + .../arch/x86/tigerlake/uncore-other.json | 28 +- + .../pmu-events/arch/x86/westmereep-dp/cache.json | 2 +- + .../arch/x86/westmereep-dp/virtual-memory.json | 2 +- + tools/perf/pmu-events/empty-pmu-events.c | 6 +- + tools/perf/pmu-events/jevents.py | 59 +- + tools/perf/pmu-events/metric.py | 8 +- + tools/perf/pmu-events/pmu-events.h | 35 +- + tools/perf/scripts/Build | 4 +- + tools/perf/scripts/python/Perf-Trace-Util/Build | 2 +- + .../perf/scripts/python/Perf-Trace-Util/Context.c | 4 + + tools/perf/scripts/python/intel-pt-events.py | 2 +- + tools/perf/tests/bpf.c | 1 - + tools/perf/tests/expand-cgroup.c | 3 +- + tools/perf/tests/expr.c | 7 +- + tools/perf/tests/hists_link.c | 4 +- + tools/perf/tests/make | 26 +- + tools/perf/tests/parse-events.c | 24 +- + tools/perf/tests/parse-metric.c | 21 +- + tools/perf/tests/pfm.c | 12 +- + tools/perf/tests/pmu-events.c | 51 +- + tools/perf/tests/shell/record_offcpu.sh | 2 +- + tools/perf/util/Build | 19 +- + tools/perf/util/bpf-event.c | 66 - + tools/perf/util/bpf-filter.c | 197 ++ + tools/perf/util/bpf-filter.h | 49 + + tools/perf/util/bpf-filter.l | 159 + + tools/perf/util/bpf-filter.y | 78 + + tools/perf/util/bpf-loader.c | 18 - + tools/perf/util/bpf_counter.c | 21 +- + tools/perf/util/bpf_lock_contention.c | 35 +- + tools/perf/util/bpf_skel/.gitignore | 3 +- + tools/perf/util/bpf_skel/lock_contention.bpf.c | 85 +- + tools/perf/util/bpf_skel/lock_data.h | 14 + + tools/perf/util/bpf_skel/sample-filter.h | 27 + + tools/perf/util/bpf_skel/sample_filter.bpf.c | 172 ++ + tools/perf/util/cloexec.c | 13 - + tools/perf/util/cpumap.h | 3 + + tools/perf/util/cputopo.c | 14 + + tools/perf/util/cputopo.h | 5 + + tools/perf/util/demangle-cxx.cpp | 50 + + tools/perf/util/demangle-cxx.h | 16 + + tools/perf/util/evlist.c | 33 +- + tools/perf/util/evlist.h | 8 +- + tools/perf/util/evsel.c | 31 +- + tools/perf/util/evsel.h | 17 +- + tools/perf/util/expr.c | 16 +- + tools/perf/util/expr.y | 12 +- + tools/perf/util/ftrace.h | 1 - + tools/perf/util/header.c | 3 +- + tools/perf/util/hist.c | 19 +- + tools/perf/util/hist.h | 3 + + tools/perf/util/kvm-stat.h | 33 +- + tools/perf/util/metricgroup.c | 181 +- + tools/perf/util/metricgroup.h | 5 +- + tools/perf/util/parse-events.c | 283 +- + tools/perf/util/parse-events.h | 14 +- + tools/perf/util/parse-events.y | 28 +- + tools/perf/util/pfm.c | 1 - + tools/perf/util/pmu.c | 23 +- + tools/perf/util/print-events.h | 1 + + tools/perf/util/python.c | 21 +- + tools/perf/util/record.h | 1 - + tools/perf/util/scripting-engines/Build | 2 +- + .../util/scripting-engines/trace-event-python.c | 75 +- + tools/perf/util/session.c | 3 +- + tools/perf/util/smt.c | 11 +- + tools/perf/util/smt.h | 12 +- + tools/perf/util/sort.h | 1 + + tools/perf/util/stat-display.c | 117 +- + tools/perf/util/stat-shadow.c | 1287 ++------ + tools/perf/util/stat.c | 74 - + tools/perf/util/stat.h | 96 +- + tools/perf/util/symbol-elf.c | 37 +- + tools/perf/util/synthetic-events.c | 2 +- + tools/perf/util/thread.c | 25 +- + tools/perf/util/topdown.c | 68 +- + tools/perf/util/topdown.h | 11 +- + tools/perf/util/trace-event-scripting.c | 9 +- + tools/perf/util/util.c | 16 + + 223 files changed, 20966 insertions(+), 16486 deletions(-) + create mode 100644 tools/build/feature/test-cxa-demangle.cpp + delete mode 100644 tools/build/feature/test-libbpf-bpf_map_create.c + delete mode 100644 tools/build/feature/test-libbpf-bpf_object__next_map.c + delete mode 100644 tools/build/feature/test-libbpf-bpf_object__next_program.c + delete mode 100644 tools/build/feature/test-libbpf-bpf_prog_load.c + delete mode 100644 tools/build/feature/test-libbpf-bpf_program__set_insns.c + delete mode 100644 tools/build/feature/test-libbpf-btf__load_from_kernel_by_id.c + delete mode 100644 tools/build/feature/test-libbpf-btf__raw_data.c + create mode 100644 tools/perf/pmu-events/arch/s390/cf_z16/pai_ext.json + create mode 100644 tools/perf/pmu-events/arch/x86/graniterapids/cache.json + create mode 100644 tools/perf/pmu-events/arch/x86/graniterapids/frontend.json + create mode 100644 tools/perf/pmu-events/arch/x86/graniterapids/memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/graniterapids/other.json + create mode 100644 tools/perf/pmu-events/arch/x86/graniterapids/pipeline.json + create mode 100644 tools/perf/pmu-events/arch/x86/graniterapids/virtual-memory.json + create mode 100644 tools/perf/util/bpf-filter.c + create mode 100644 tools/perf/util/bpf-filter.h + create mode 100644 tools/perf/util/bpf-filter.l + create mode 100644 tools/perf/util/bpf-filter.y + create mode 100644 tools/perf/util/bpf_skel/sample-filter.h + create mode 100644 tools/perf/util/bpf_skel/sample_filter.bpf.c + create mode 100644 tools/perf/util/demangle-cxx.cpp + create mode 100644 tools/perf/util/demangle-cxx.h +$ git reset --hard HEAD^ +HEAD is now at f24222dc4327 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git +Merging next-20230316 version of perf +$ git merge -m next-20230316/perf f9fa0778ee7349a9aa3d2ea10e9f2ab843a0b44e +Already up to date. +Merging compiler-attributes/compiler-attributes (eeac8ede1755 Linux 6.3-rc2) +$ git merge -m Merge branch 'compiler-attributes' of https://github.com/ojeda/linux.git compiler-attributes/compiler-attributes +Already up to date. +Merging dma-mapping/for-next (9b07d27d0fbb swiotlb: mark swiotlb_memblock_alloc() as __init) +$ 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 (a13408c20526 char/agp: introduce asm-generic/agp.h) +$ 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 (ba07b4efc989 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 (010338d729c1 arm64: kaslr: don't pretend KASLR is enabled if offset < MIN_KIMG_ALIGN) +$ 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 (e8a709dc2a91 perf: arm_spe: Print the version of SPE detected) +$ 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 (811bbcfc8ea2 Merge branch 'soc/arm' into for-next) +$ 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 | 32 + + arch/arm/boot/dts/e60k02.dtsi | 1 + + arch/arm/boot/dts/e70k02.dtsi | 1 + + arch/arm/boot/dts/imx6sl-tolino-shine2hd.dts | 1 + + arch/arm/boot/dts/intel-ixp42x-adi-coyote.dts | 6 +- + arch/arm/boot/dts/intel-ixp42x-arcom-vulcan.dts | 6 +- + arch/arm/boot/dts/intel-ixp42x-dlink-dsm-g600.dts | 2 +- + arch/arm/boot/dts/intel-ixp42x-freecom-fsg-3.dts | 6 +- + arch/arm/boot/dts/intel-ixp42x-gateway-7001.dts | 6 +- + .../arm/boot/dts/intel-ixp42x-gateworks-gw2348.dts | 6 +- + .../arm/boot/dts/intel-ixp42x-goramo-multilink.dts | 6 +- + arch/arm/boot/dts/intel-ixp42x-iomega-nas100d.dts | 4 +- + arch/arm/boot/dts/intel-ixp42x-ixdp425.dts | 4 +- + arch/arm/boot/dts/intel-ixp42x-ixdpg425.dts | 6 +- + arch/arm/boot/dts/intel-ixp42x-linksys-nslu2.dts | 4 +- + arch/arm/boot/dts/intel-ixp42x-linksys-wrv54g.dts | 6 +- + arch/arm/boot/dts/intel-ixp42x-netgear-wg302v1.dts | 4 +- + .../arm/boot/dts/intel-ixp42x-welltech-epbx100.dts | 2 +- + .../arm/boot/dts/intel-ixp43x-gateworks-gw2358.dts | 6 +- + arch/arm/boot/dts/intel-ixp43x-kixrp435.dts | 4 +- + .../boot/dts/intel-ixp4xx-reference-design.dtsi | 2 +- + arch/arm/common/locomo.c | 6 +- + arch/arm/common/sa1111.c | 6 +- + arch/arm/common/scoop.c | 6 +- + arch/arm/mach-imx/mmdc.c | 5 +- + arch/arm/mach-mmp/Kconfig | 6 - + arch/arm/mach-omap1/omap-dma.c | 6 +- + arch/arm/mach-pxa/sharpsl_pm.c | 6 +- + arch/arm/mach-sa1100/jornada720_ssp.c | 5 +- + arch/arm/mach-sa1100/neponset.c | 6 +- + .../fsl-ls1028a-kontron-kbox-a-230-ls.dts | 12 - + .../freescale/fsl-ls1028a-kontron-sl28-var1.dts | 2 - + .../freescale/fsl-ls1028a-kontron-sl28-var2.dts | 8 - + .../freescale/fsl-ls1028a-kontron-sl28-var4.dts | 2 - + .../dts/freescale/fsl-ls1028a-kontron-sl28.dts | 17 - + arch/arm64/boot/dts/freescale/imx8-ss-lsio.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx8dxl-evk.dts | 5 +- + .../boot/dts/freescale/imx8mm-nitrogen-r2.dts | 2 +- + arch/arm64/boot/dts/freescale/imx8mn.dtsi | 5 + + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 4 +- + arch/arm64/boot/dts/freescale/imx93.dtsi | 24 +- + arch/arm64/boot/dts/nvidia/tegra194.dtsi | 2 +- + arch/arm64/boot/dts/nvidia/tegra234.dtsi | 2 +- + arch/arm64/boot/dts/sprd/Makefile | 3 +- + arch/arm64/boot/dts/sprd/ums512-1h10.dts | 61 ++ + arch/arm64/boot/dts/sprd/ums512.dtsi | 911 +++++++++++++++++++++ + arch/arm64/configs/virt.config | 21 + + drivers/bus/imx-weim.c | 2 +- + drivers/firmware/arm_scmi/bus.c | 3 +- + drivers/firmware/arm_scmi/driver.c | 14 +- + drivers/firmware/arm_scmi/mailbox.c | 37 + + drivers/tee/amdtee/core.c | 29 +- + 52 files changed, 1180 insertions(+), 155 deletions(-) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm64/boot/dts/sprd/ums512-1h10.dts + create mode 100644 arch/arm64/boot/dts/sprd/ums512.dtsi +Merging amlogic/for-next (001ba459dbec Merge branch 'v6.4/arm64-dt' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git amlogic/for-next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/amlogic.yaml | 10 + + .../soc/amlogic/amlogic,meson-gx-clk-measure.yaml | 40 ++ + .../bindings/soc/amlogic/clk-measure.txt | 21 - + arch/arm/boot/dts/meson8b.dtsi | 4 +- + arch/arm64/boot/dts/amlogic/Makefile | 3 + + arch/arm64/boot/dts/amlogic/meson-a1.dtsi | 10 + + .../dts/amlogic/meson-axg-jethome-jethub-j1xx.dtsi | 1 - + .../dts/amlogic/meson-g12b-a311d-bananapi-m2s.dts | 37 ++ + .../dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts | 165 +++++++ + .../boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi | 388 +++++++++++++++ + .../boot/dts/amlogic/meson-g12b-bananapi.dtsi | 521 +++++++++++++++++++++ + .../dts/amlogic/meson-g12b-odroid-go-ultra.dts | 2 +- + .../boot/dts/amlogic/meson-g12b-radxa-zero2.dts | 6 +- + .../dts/amlogic/meson-g12b-s922x-bananapi-m2s.dts | 14 + + arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts | 82 +++- + arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 4 +- + .../amlogic/meson-gxl-s905x-libretech-cc-v2.dts | 1 - + arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 29 +- + .../dts/amlogic/meson-gxm-s912-libretech-pc.dts | 4 + + arch/arm64/boot/dts/amlogic/meson-s4.dtsi | 2 +- + .../arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi | 4 +- + arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi | 2 +- + 22 files changed, 1290 insertions(+), 60 deletions(-) + create mode 100644 Documentation/devicetree/bindings/soc/amlogic/amlogic,meson-gx-clk-measure.yaml + delete mode 100644 Documentation/devicetree/bindings/soc/amlogic/clk-measure.txt + create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-a311d-bananapi-m2s.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi + create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi + create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-s922x-bananapi-m2s.dts +Merging asahi-soc/asahi-soc/for-next (22991d8d5725 soc: apple: rtkit: Add register dump decoding to crashlog) +$ git merge -m Merge branch 'asahi-soc/for-next' of https://github.com/AsahiLinux/linux.git asahi-soc/asahi-soc/for-next +Already up to date. +Merging aspeed/for-next (bb13bd587d53 ARM: dts: aspeed: bonnell: Update eeprom size) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git aspeed/for-next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/aspeed-bmc-ampere-mtmitchell.dts | 37 +++++++++++++++++++++- + arch/arm/boot/dts/aspeed-bmc-asrock-e3c246d4i.dts | 6 +++- + arch/arm/boot/dts/aspeed-bmc-asrock-romed8hm3.dts | 4 +-- + arch/arm/boot/dts/aspeed-bmc-ibm-bonnell.dts | 12 +------ + arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts | 6 ++++ + 5 files changed, 50 insertions(+), 15 deletions(-) +Merging at91/at91-next (f5200f71d927 clk: microchip: Use of_property_read_bool() for boolean properties) +$ 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 (a2264238029f Merge branch 'drivers/next' into next) +$ git merge -m Merge branch 'next' of https://github.com/Broadcom/stblinux.git broadcom/next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/bcm47622.dtsi | 18 + + arch/arm/boot/dts/bcm63138.dtsi | 18 + + arch/arm/boot/dts/bcm63148.dtsi | 18 + + arch/arm/boot/dts/bcm63178.dtsi | 19 + + arch/arm/boot/dts/bcm6756.dtsi | 19 + + arch/arm/boot/dts/bcm6846.dtsi | 18 + + arch/arm/boot/dts/bcm6855.dtsi | 19 + + arch/arm/boot/dts/bcm6878.dtsi | 19 + + arch/arm/boot/dts/bcm947622.dts | 4 + + arch/arm/boot/dts/bcm963138.dts | 4 + + arch/arm/boot/dts/bcm963138dvt.dts | 4 + + arch/arm/boot/dts/bcm963148.dts | 4 + + arch/arm/boot/dts/bcm963178.dts | 4 + + arch/arm/boot/dts/bcm96756.dts | 4 + + arch/arm/boot/dts/bcm96846.dts | 4 + + arch/arm/boot/dts/bcm96855.dts | 4 + + arch/arm/boot/dts/bcm96878.dts | 4 + + .../dts/broadcom/bcmbca/bcm4906-netgear-r8000p.dts | 4 + + .../bcmbca/bcm4906-tplink-archer-c2300-v1.dts | 6 +- + .../dts/broadcom/bcmbca/bcm4908-asus-gt-ac5300.dts | 10 +- + arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi | 61 +- + arch/arm64/boot/dts/broadcom/bcmbca/bcm4912.dtsi | 20 + + arch/arm64/boot/dts/broadcom/bcmbca/bcm63146.dtsi | 19 + + arch/arm64/boot/dts/broadcom/bcmbca/bcm63158.dtsi | 19 + + arch/arm64/boot/dts/broadcom/bcmbca/bcm6813.dtsi | 20 + + arch/arm64/boot/dts/broadcom/bcmbca/bcm6856.dtsi | 18 + + arch/arm64/boot/dts/broadcom/bcmbca/bcm6858.dtsi | 18 + + arch/arm64/boot/dts/broadcom/bcmbca/bcm94908.dts | 4 + + arch/arm64/boot/dts/broadcom/bcmbca/bcm94912.dts | 4 + + arch/arm64/boot/dts/broadcom/bcmbca/bcm963146.dts | 4 + + arch/arm64/boot/dts/broadcom/bcmbca/bcm963158.dts | 4 + + arch/arm64/boot/dts/broadcom/bcmbca/bcm96813.dts | 4 + + arch/arm64/boot/dts/broadcom/bcmbca/bcm96856.dts | 4 + + arch/arm64/boot/dts/broadcom/bcmbca/bcm96858.dts | 4 + + .../arm64/boot/dts/broadcom/stingray/stingray.dtsi | 2 +- + drivers/bus/brcmstb_gisb.c | 4 +- + drivers/soc/bcm/bcm2835-power.c | 1 - + drivers/soc/bcm/brcmstb/Kconfig | 4 +- + drivers/soc/bcm/brcmstb/pm/Makefile | 1 - + drivers/soc/bcm/brcmstb/pm/aon_defs.h | 105 --- + drivers/soc/bcm/brcmstb/pm/pm-arm.c | 874 --------------------- + drivers/soc/bcm/brcmstb/pm/s2-arm.S | 69 -- + drivers/soc/bcm/raspberrypi-power.c | 1 - + 43 files changed, 402 insertions(+), 1066 deletions(-) + delete mode 100644 drivers/soc/bcm/brcmstb/pm/aon_defs.h + delete mode 100644 drivers/soc/bcm/brcmstb/pm/pm-arm.c + delete mode 100644 drivers/soc/bcm/brcmstb/pm/s2-arm.S +Merging davinci/davinci/for-next (fe15c26ee26e Linux 6.3-rc1) +$ git merge -m Merge branch 'davinci/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git davinci/davinci/for-next +Already up to date. +Merging drivers-memory/for-next (538c7b5b5d8b memory: atmel-ebi: Use of_property_present() for testing DT property presence) +$ 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 +Auto-merging drivers/memory/tegra/mc.c +Merge made by the 'ort' strategy. + drivers/memory/atmel-ebi.c | 2 +- + drivers/memory/bt1-l2-ctl.c | 1 - + drivers/memory/da8xx-ddrctl.c | 1 - + drivers/memory/fsl_ifc.c | 1 - + drivers/memory/mvebu-devbus.c | 1 - + drivers/memory/tegra/mc.c | 1 - + drivers/memory/tegra/tegra186-emc.c | 1 - + 7 files changed, 1 insertion(+), 7 deletions(-) +Merging imx-mxs/for-next (a7a9bae8c567 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 +Auto-merging arch/arm/configs/imx_v6_v7_defconfig +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/fsl.yaml | 21 +- + .../soc/imx/fsl,imx8mp-media-blk-ctrl.yaml | 53 +- + arch/arm/boot/dts/imx28-apf28.dts | 96 +- + arch/arm/boot/dts/imx28-apf28dev.dts | 312 ++-- + arch/arm/boot/dts/imx28-apx4devkit.dts | 380 +++-- + arch/arm/boot/dts/imx28-cfa10036.dts | 193 ++- + arch/arm/boot/dts/imx28-cfa10049.dts | 454 +++--- + arch/arm/boot/dts/imx28-cfa10055.dts | 224 ++- + arch/arm/boot/dts/imx28-cfa10056.dts | 146 +- + arch/arm/boot/dts/imx28-cfa10057.dts | 252 ++-- + arch/arm/boot/dts/imx28-cfa10058.dts | 186 ++- + arch/arm/boot/dts/imx28-duckbill-2-485.dts | 174 +-- + arch/arm/boot/dts/imx28-duckbill-2-enocean.dts | 198 +-- + arch/arm/boot/dts/imx28-duckbill-2-spi.dts | 211 +-- + arch/arm/boot/dts/imx28-duckbill-2.dts | 256 ++-- + arch/arm/boot/dts/imx28-duckbill.dts | 196 ++- + arch/arm/boot/dts/imx28-evk.dts | 462 +++--- + arch/arm/boot/dts/imx28-m28.dtsi | 44 +- + arch/arm/boot/dts/imx28-m28cu3.dts | 354 +++-- + arch/arm/boot/dts/imx28-m28evk.dts | 420 +++--- + arch/arm/boot/dts/imx28-sps1.dts | 201 ++- + arch/arm/boot/dts/imx28-ts4600.dts | 80 +- + arch/arm/boot/dts/imx28-tx28.dts | 38 +- + arch/arm/boot/dts/imx6dl-alti6p.dts | 12 +- + arch/arm/boot/dts/imx6dl-eckelmann-ci4x10.dts | 13 +- + arch/arm/boot/dts/imx6dl-lanmcu.dts | 12 +- + arch/arm/boot/dts/imx6dl-plybas.dts | 12 +- + arch/arm/boot/dts/imx6dl-plym2m.dts | 12 +- + arch/arm/boot/dts/imx6dl-prtmvt.dts | 11 +- + arch/arm/boot/dts/imx6dl-victgo.dts | 12 +- + arch/arm/boot/dts/imx6dl-yapp4-common.dtsi | 2 +- + arch/arm/boot/dts/imx6q-prtwd2.dts | 17 +- + arch/arm/boot/dts/imx6qdl-skov-cpu.dtsi | 12 +- + arch/arm/boot/dts/imx6qdl.dtsi | 4 +- + arch/arm/boot/dts/imx6ul-prti6g.dts | 14 +- + arch/arm/boot/dts/imx6ul.dtsi | 10 +- + arch/arm/boot/dts/imx7d-remarkable2.dts | 239 ++++ + arch/arm/boot/dts/imx7d.dtsi | 9 + + arch/arm/configs/imx_v6_v7_defconfig | 5 + + arch/arm/mach-imx/gpc.c | 2 +- + arch/arm/mach-imx/mach-imx6q.c | 10 +- + arch/arm/mach-imx/mach-imx6ul.c | 20 - + arch/arm/mach-mxs/mach-mxs.c | 2 +- + arch/arm64/boot/dts/freescale/Makefile | 5 + + arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 2 +- + arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 2 +- + .../arm64/boot/dts/freescale/imx8-apalis-eval.dtsi | 144 ++ + .../boot/dts/freescale/imx8-apalis-ixora-v1.1.dtsi | 220 +++ + .../boot/dts/freescale/imx8-apalis-ixora-v1.2.dtsi | 270 ++++ + .../arm64/boot/dts/freescale/imx8-apalis-v1.1.dtsi | 1485 ++++++++++++++++++++ + arch/arm64/boot/dts/freescale/imx8-ss-dma.dtsi | 76 +- + arch/arm64/boot/dts/freescale/imx8-ss-lsio.dtsi | 48 + + arch/arm64/boot/dts/freescale/imx8dxl-evk.dts | 2 +- + arch/arm64/boot/dts/freescale/imx8dxl.dtsi | 2 +- + .../dts/freescale/imx8mm-phyboard-polis-rdk.dts | 13 + + arch/arm64/boot/dts/freescale/imx8mm.dtsi | 24 + + .../boot/dts/freescale/imx8mp-debix-model-a.dts | 59 + + .../arm64/boot/dts/freescale/imx8mp-dhcom-pdk2.dts | 30 +- + .../arm64/boot/dts/freescale/imx8mp-dhcom-som.dtsi | 52 +- + .../dts/freescale/imx8mp-tqma8mpql-mba8mpxl.dts | 2 + + .../boot/dts/freescale/imx8mp-verdin-dahlia.dtsi | 9 +- + .../boot/dts/freescale/imx8mp-verdin-dev.dtsi | 9 +- + .../boot/dts/freescale/imx8mp-verdin-wifi.dtsi | 5 + + .../boot/dts/freescale/imx8mp-verdin-yavia.dtsi | 4 +- + arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi | 15 +- + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 32 +- + arch/arm64/boot/dts/freescale/imx8mq.dtsi | 40 + + .../boot/dts/freescale/imx8qm-apalis-eval.dts | 16 + + .../dts/freescale/imx8qm-apalis-ixora-v1.1.dts | 16 + + .../boot/dts/freescale/imx8qm-apalis-v1.1-eval.dts | 16 + + .../freescale/imx8qm-apalis-v1.1-ixora-v1.1.dts | 16 + + .../freescale/imx8qm-apalis-v1.1-ixora-v1.2.dts | 16 + + .../boot/dts/freescale/imx8qm-apalis-v1.1.dtsi | 16 + + arch/arm64/boot/dts/freescale/imx8qm-apalis.dtsi | 340 +++++ + arch/arm64/boot/dts/freescale/imx8qm-ss-dma.dtsi | 44 + + arch/arm64/boot/dts/freescale/imx8qm.dtsi | 4 + + arch/arm64/boot/dts/freescale/imx8qxp-mek.dts | 2 +- + arch/arm64/boot/dts/freescale/imx93.dtsi | 47 + + arch/arm64/configs/defconfig | 1 + + drivers/bus/imx-weim.c | 19 +- + drivers/firmware/imx/imx-scu.c | 5 +- + drivers/firmware/imx/scu-pd.c | 4 + + drivers/soc/imx/Kconfig | 2 +- + drivers/soc/imx/imx8m-blk-ctrl.c | 7 +- + drivers/soc/imx/imx8mp-blk-ctrl.c | 5 +- + drivers/soc/imx/soc-imx8m.c | 1 + + 88 files changed, 5644 insertions(+), 2868 deletions(-) + create mode 100644 arch/arm64/boot/dts/freescale/imx8-apalis-eval.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8-apalis-ixora-v1.1.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8-apalis-ixora-v1.2.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8-apalis-v1.1.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8qm-apalis-eval.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8qm-apalis-ixora-v1.1.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8qm-apalis-v1.1-eval.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8qm-apalis-v1.1-ixora-v1.1.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8qm-apalis-v1.1-ixora-v1.2.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8qm-apalis-v1.1.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8qm-apalis.dtsi +Merging mediatek/for-next (9b2797522f32 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. + .../bindings/soc/mediatek/mediatek,mutex.yaml | 1 + + arch/arm/boot/dts/mt2701.dtsi | 2 +- + arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts | 6 + + arch/arm64/boot/dts/mediatek/mt2712e.dtsi | 2 +- + arch/arm64/boot/dts/mediatek/mt7622.dtsi | 2 +- + arch/arm64/boot/dts/mediatek/mt8167.dtsi | 2 +- + arch/arm64/boot/dts/mediatek/mt8195.dtsi | 26 +++- + drivers/soc/mediatek/mt8195-mmsys.h | 13 ++ + drivers/soc/mediatek/mtk-mmsys.c | 44 +++++++ + drivers/soc/mediatek/mtk-mutex.c | 135 +++++++++++++++++++-- + drivers/soc/mediatek/mtk-svs.c | 130 +++++++------------- + include/linux/soc/mediatek/mtk-mmsys.h | 6 + + include/linux/soc/mediatek/mtk-mutex.h | 35 ++++++ + 13 files changed, 306 insertions(+), 98 deletions(-) +Merging mvebu/for-next (b80b042da860 Merge branch 'mvebu/fixes' into mvebu/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git mvebu/for-next +Merge made by the 'ort' strategy. +Merging omap/for-next (f68a6fc58073 Merge branch 'omap-for-v6.3/cleanup' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap/for-next +Merge made by the 'ort' strategy. +Merging qcom/for-next (f84f5d2e1ffd Merge branches 'arm64-defconfig-for-6.4', 'arm64-fixes-for-6.3', 'arm64-for-6.4', 'clk-for-6.4', 'drivers-fixes-for-6.3', 'drivers-for-6.4', 'dts-fixes-for-6.3' and 'dts-for-6.4' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git qcom/for-next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/msm/qcom,kpss-acc.txt | 49 - + .../devicetree/bindings/arm/msm/qcom,kpss-gcc.txt | 44 - + .../devicetree/bindings/arm/msm/qcom,llcc.yaml | 128 +- + Documentation/devicetree/bindings/arm/qcom.yaml | 15 + + .../bindings/clock/qcom,gcc-ipq4019.yaml | 53 + + .../bindings/clock/qcom,gcc-msm8909.yaml | 13 +- + .../devicetree/bindings/clock/qcom,gcc-other.yaml | 2 - + .../bindings/clock/qcom,ipq5332-gcc.yaml | 53 + + .../bindings/clock/qcom,kpss-acc-v1.yaml | 72 + + .../devicetree/bindings/clock/qcom,kpss-gcc.yaml | 88 + + .../devicetree/bindings/clock/qcom,rpmcc.yaml | 2 + + .../bindings/clock/qcom,sm6115-gpucc.yaml | 58 + + .../bindings/clock/qcom,sm6125-gpucc.yaml | 64 + + .../bindings/clock/qcom,sm6375-gpucc.yaml | 60 + + .../devicetree/bindings/clock/qcom,sm7150-gcc.yaml | 52 + + .../devicetree/bindings/firmware/qcom,scm.yaml | 3 + + .../bindings/power/qcom,kpss-acc-v2.yaml | 42 + + .../bindings/soc/qcom/qcom,aoss-qmp.yaml | 1 + + .../devicetree/bindings/soc/qcom/qcom,apr.yaml | 9 +- + .../devicetree/bindings/soc/qcom/qcom,smd-rpm.yaml | 1 + + arch/arm/boot/dts/qcom-apq8026-lg-lenok.dts | 10 + + arch/arm/boot/dts/qcom-apq8064.dtsi | 27 +- + arch/arm/boot/dts/qcom-apq8084.dtsi | 8 +- + arch/arm/boot/dts/qcom-ipq4018-ap120c-ac.dtsi | 27 +- + arch/arm/boot/dts/qcom-ipq4019.dtsi | 15 +- + arch/arm/boot/dts/qcom-ipq8064.dtsi | 24 +- + arch/arm/boot/dts/qcom-mdm9615.dtsi | 2 +- + arch/arm/boot/dts/qcom-msm8226.dtsi | 6 + + arch/arm/boot/dts/qcom-msm8660.dtsi | 2 +- + arch/arm/boot/dts/qcom-msm8960.dtsi | 13 +- + arch/arm/boot/dts/qcom-msm8974.dtsi | 10 +- + arch/arm/boot/dts/qcom-sdx55-t55.dts | 50 +- + arch/arm/boot/dts/qcom-sdx55-telit-fn980-tlb.dts | 2 +- + arch/arm/boot/dts/qcom-sdx55.dtsi | 178 +- + arch/arm64/boot/dts/qcom/Makefile | 13 +- + arch/arm64/boot/dts/qcom/apq8096-db820c.dts | 60 +- + arch/arm64/boot/dts/qcom/ipq5332-mi01.2.dts | 75 + + arch/arm64/boot/dts/qcom/ipq5332.dtsi | 283 ++ + arch/arm64/boot/dts/qcom/ipq6018-cp01-c1.dts | 1 - + arch/arm64/boot/dts/qcom/ipq6018.dtsi | 4 +- + arch/arm64/boot/dts/qcom/ipq8074.dtsi | 13 +- + arch/arm64/boot/dts/qcom/msm8916-thwc-uf896.dts | 4 - + arch/arm64/boot/dts/qcom/msm8916-thwc-ufi001c.dts | 28 +- + arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi | 10 - + arch/arm64/boot/dts/qcom/msm8916.dtsi | 2 +- + arch/arm64/boot/dts/qcom/msm8953.dtsi | 5 +- + .../boot/dts/qcom/msm8956-sony-xperia-loire.dtsi | 4 + + arch/arm64/boot/dts/qcom/msm8976.dtsi | 10 +- + arch/arm64/boot/dts/qcom/msm8994.dtsi | 2 +- + .../boot/dts/qcom/msm8996-oneplus-common.dtsi | 67 +- + arch/arm64/boot/dts/qcom/msm8996-oneplus3.dts | 6 + + arch/arm64/boot/dts/qcom/msm8996-oneplus3t.dts | 6 + + .../arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi | 60 +- + arch/arm64/boot/dts/qcom/msm8996.dtsi | 45 +- + arch/arm64/boot/dts/qcom/msm8998-fxtec-pro1.dts | 4 +- + .../boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi | 4 +- + arch/arm64/boot/dts/qcom/msm8998.dtsi | 5 +- + arch/arm64/boot/dts/qcom/pm8550b.dtsi | 6 + + arch/arm64/boot/dts/qcom/pm8998.dtsi | 2 +- + arch/arm64/boot/dts/qcom/qcs404.dtsi | 4 +- + arch/arm64/boot/dts/qcom/qdu1000.dtsi | 9 +- + arch/arm64/boot/dts/qcom/sa8155p-adp.dts | 5 + + arch/arm64/boot/dts/qcom/sa8540p-ride.dts | 2 +- + arch/arm64/boot/dts/qcom/sa8775p-ride.dts | 47 + + arch/arm64/boot/dts/qcom/sa8775p.dtsi | 826 +++++ + .../boot/dts/qcom/sc7180-trogdor-kingoftown-r0.dts | 38 - + .../boot/dts/qcom/sc7180-trogdor-kingoftown-r1.dts | 17 - + ...ngoftown.dtsi => sc7180-trogdor-kingoftown.dts} | 10 +- + .../boot/dts/qcom/sc7180-trogdor-lazor-r0.dts | 34 - + .../dts/qcom/sc7180-trogdor-mrbland-rev0-auo.dts | 22 - + .../dts/qcom/sc7180-trogdor-mrbland-rev0-boe.dts | 22 - + .../boot/dts/qcom/sc7180-trogdor-mrbland-rev0.dtsi | 36 - + .../dts/qcom/sc7180-trogdor-mrbland-rev1-auo.dts | 22 - + .../dts/qcom/sc7180-trogdor-mrbland-rev1-boe.dts | 24 - + .../boot/dts/qcom/sc7180-trogdor-mrbland.dtsi | 320 -- + .../qcom/sc7180-trogdor-wormdingler-rev0-boe.dts | 22 - + .../qcom/sc7180-trogdor-wormdingler-rev0-inx.dts | 22 - + .../dts/qcom/sc7180-trogdor-wormdingler-rev0.dtsi | 36 - + arch/arm64/boot/dts/qcom/sc7180.dtsi | 12 +- + arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sc7280.dtsi | 30 +- + arch/arm64/boot/dts/qcom/sc8280xp-crd.dts | 15 + + .../dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 38 +- + arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi | 18 + + arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 63 +- + .../boot/dts/qcom/sdm630-sony-xperia-nile.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sdm630.dtsi | 1 - + arch/arm64/boot/dts/qcom/sdm670.dtsi | 109 + + arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 1 - + arch/arm64/boot/dts/qcom/sdm845.dtsi | 31 +- + arch/arm64/boot/dts/qcom/sm6115.dtsi | 194 + + arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts | 2 +- + arch/arm64/boot/dts/qcom/sm6125.dtsi | 1 - + arch/arm64/boot/dts/qcom/sm6350.dtsi | 11 +- + arch/arm64/boot/dts/qcom/sm6375.dtsi | 20 + + .../boot/dts/qcom/sm8150-sony-xperia-kumano.dtsi | 6 +- + arch/arm64/boot/dts/qcom/sm8150.dtsi | 51 +- + .../dts/qcom/sm8250-sony-xperia-edo-pdx206.dts | 2 +- + .../boot/dts/qcom/sm8250-sony-xperia-edo.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish.dts | 4 +- + arch/arm64/boot/dts/qcom/sm8250.dtsi | 201 +- + arch/arm64/boot/dts/qcom/sm8350.dtsi | 28 +- + arch/arm64/boot/dts/qcom/sm8450.dtsi | 34 +- + arch/arm64/boot/dts/qcom/sm8550-mtp.dts | 17 + + arch/arm64/boot/dts/qcom/sm8550-qrd.dts | 439 +++ + arch/arm64/boot/dts/qcom/sm8550.dtsi | 138 +- + arch/arm64/configs/defconfig | 2 + + drivers/clk/qcom/Kconfig | 53 + + drivers/clk/qcom/Makefile | 6 + + drivers/clk/qcom/apcs-msm8916.c | 6 +- + drivers/clk/qcom/apcs-sdx55.c | 6 +- + drivers/clk/qcom/clk-alpha-pll.c | 139 +- + drivers/clk/qcom/clk-alpha-pll.h | 14 +- + drivers/clk/qcom/clk-branch.c | 15 +- + drivers/clk/qcom/clk-branch.h | 44 + + drivers/clk/qcom/clk-hfpll.c | 14 +- + drivers/clk/qcom/clk-krait.c | 10 +- + drivers/clk/qcom/clk-rpm.c | 5 +- + drivers/clk/qcom/clk-smd-rpm.c | 37 + + drivers/clk/qcom/gcc-ipq4019.c | 1665 +++++---- + drivers/clk/qcom/gcc-ipq5332.c | 3824 ++++++++++++++++++++ + drivers/clk/qcom/gcc-msm8917.c | 3303 +++++++++++++++++ + drivers/clk/qcom/gcc-msm8960.c | 6 +- + drivers/clk/qcom/gcc-qcm2290.c | 3 +- + drivers/clk/qcom/gcc-sm7150.c | 3048 ++++++++++++++++ + drivers/clk/qcom/gpucc-sm6115.c | 503 +++ + drivers/clk/qcom/gpucc-sm6125.c | 424 +++ + drivers/clk/qcom/gpucc-sm6375.c | 457 +++ + drivers/edac/qcom_edac.c | 64 +- + drivers/firmware/qcom_scm.c | 14 +- + drivers/misc/fastrpc.c | 2 +- + drivers/net/wireless/ath/ath10k/qmi.c | 4 +- + drivers/remoteproc/qcom_q6v5_mss.c | 8 +- + drivers/remoteproc/qcom_q6v5_pas.c | 2 +- + drivers/soc/qcom/Kconfig | 2 +- + drivers/soc/qcom/llcc-qcom.c | 93 +- + drivers/soc/qcom/qcom_aoss.c | 2 +- + drivers/soc/qcom/qcom_gsbi.c | 2 +- + drivers/soc/qcom/rmtfs_mem.c | 12 +- + drivers/soc/qcom/rpmpd.c | 833 +++-- + drivers/soc/qcom/smem.c | 4 +- + drivers/soc/qcom/smsm.c | 2 +- + drivers/soc/qcom/socinfo.c | 16 + + include/dt-bindings/arm/qcom,ids.h | 11 + + include/dt-bindings/clock/qcom,gcc-msm8917.h | 190 + + include/dt-bindings/clock/qcom,ipq5332-gcc.h | 356 ++ + include/dt-bindings/clock/qcom,sm6115-gpucc.h | 36 + + include/dt-bindings/clock/qcom,sm6125-gpucc.h | 31 + + include/dt-bindings/clock/qcom,sm6375-gpucc.h | 36 + + include/dt-bindings/clock/qcom,sm7150-gcc.h | 186 + + include/linux/firmware/qcom/qcom_scm.h | 2 +- + include/linux/soc/qcom/geni-se.h | 42 +- + include/linux/soc/qcom/llcc-qcom.h | 6 +- + 153 files changed, 18052 insertions(+), 2380 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/arm/msm/qcom,kpss-acc.txt + delete mode 100644 Documentation/devicetree/bindings/arm/msm/qcom,kpss-gcc.txt + create mode 100644 Documentation/devicetree/bindings/clock/qcom,gcc-ipq4019.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,ipq5332-gcc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,kpss-acc-v1.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,kpss-gcc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,sm6115-gpucc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,sm6125-gpucc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,sm6375-gpucc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,sm7150-gcc.yaml + create mode 100644 Documentation/devicetree/bindings/power/qcom,kpss-acc-v2.yaml + create mode 100644 arch/arm64/boot/dts/qcom/ipq5332-mi01.2.dts + create mode 100644 arch/arm64/boot/dts/qcom/ipq5332.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sa8775p-ride.dts + create mode 100644 arch/arm64/boot/dts/qcom/sa8775p.dtsi + delete mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-kingoftown-r0.dts + delete mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-kingoftown-r1.dts + rename arch/arm64/boot/dts/qcom/{sc7180-trogdor-kingoftown.dtsi => sc7180-trogdor-kingoftown.dts} (95%) + delete mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts + delete mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-mrbland-rev0-auo.dts + delete mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-mrbland-rev0-boe.dts + delete mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-mrbland-rev0.dtsi + delete mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-mrbland-rev1-auo.dts + delete mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-mrbland-rev1-boe.dts + delete mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-mrbland.dtsi + delete mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler-rev0-boe.dts + delete mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler-rev0-inx.dts + delete mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler-rev0.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sm8550-qrd.dts + create mode 100644 drivers/clk/qcom/gcc-ipq5332.c + create mode 100644 drivers/clk/qcom/gcc-msm8917.c + create mode 100644 drivers/clk/qcom/gcc-sm7150.c + create mode 100644 drivers/clk/qcom/gpucc-sm6115.c + create mode 100644 drivers/clk/qcom/gpucc-sm6125.c + create mode 100644 drivers/clk/qcom/gpucc-sm6375.c + create mode 100644 include/dt-bindings/clock/qcom,gcc-msm8917.h + create mode 100644 include/dt-bindings/clock/qcom,ipq5332-gcc.h + create mode 100644 include/dt-bindings/clock/qcom,sm6115-gpucc.h + create mode 100644 include/dt-bindings/clock/qcom,sm6125-gpucc.h + create mode 100644 include/dt-bindings/clock/qcom,sm6375-gpucc.h + create mode 100644 include/dt-bindings/clock/qcom,sm7150-gcc.h +Merging renesas/next (8184e7e383be Merge branches 'renesas-drivers-for-v6.4' and 'renesas-dts-for-v6.4' into renesas-next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas/next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'ort' strategy. + .../devicetree/bindings/soc/renesas/renesas.yaml | 15 +- + arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 19 +- + arch/arm/configs/multi_v7_defconfig | 6 + + arch/arm/configs/shmobile_defconfig | 2 + + arch/arm64/boot/dts/renesas/Makefile | 5 +- + arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 3 - + .../arm64/boot/dts/renesas/r8a77950-salvator-x.dts | 49 -- + arch/arm64/boot/dts/renesas/r8a77950-ulcb-kf.dts | 16 - + arch/arm64/boot/dts/renesas/r8a77950-ulcb.dts | 37 - + arch/arm64/boot/dts/renesas/r8a77950.dtsi | 330 -------- + arch/arm64/boot/dts/renesas/r8a77951.dtsi | 1 - + arch/arm64/boot/dts/renesas/r8a77960.dtsi | 2 - + arch/arm64/boot/dts/renesas/r8a77961.dtsi | 2 - + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 2 - + arch/arm64/boot/dts/renesas/r8a77980-condor.dts | 8 + + arch/arm64/boot/dts/renesas/r8a77980-v3hsk.dts | 1 + + arch/arm64/boot/dts/renesas/r8a77990.dtsi | 3 - + arch/arm64/boot/dts/renesas/r8a779a0-falcon.dts | 11 +- + arch/arm64/boot/dts/renesas/r8a779a0.dtsi | 14 +- + arch/arm64/boot/dts/renesas/r8a779f0.dtsi | 17 +- + .../r8a779g0-white-hawk-ard-audio-da7212.dtso | 187 +++++ + .../dts/renesas/r8a779g0-white-hawk-csi-dsi.dtsi | 172 ++++ + .../arm64/boot/dts/renesas/r8a779g0-white-hawk.dts | 44 ++ + arch/arm64/boot/dts/renesas/r8a779g0.dtsi | 880 ++++++++++++++++++++- + arch/arm64/boot/dts/renesas/r8a779m1.dtsi | 3 + + arch/arm64/boot/dts/renesas/r8a779m3.dtsi | 3 + + arch/arm64/boot/dts/renesas/r8a779m5.dtsi | 3 + + arch/arm64/boot/dts/renesas/r9a07g043.dtsi | 19 +- + arch/arm64/boot/dts/renesas/r9a07g043u.dtsi | 13 +- + arch/arm64/boot/dts/renesas/r9a07g044.dtsi | 32 +- + arch/arm64/boot/dts/renesas/r9a07g044c1.dtsi | 7 - + arch/arm64/boot/dts/renesas/r9a07g044l1.dtsi | 7 - + arch/arm64/boot/dts/renesas/r9a07g054.dtsi | 32 +- + arch/arm64/boot/dts/renesas/r9a07g054l1.dtsi | 7 - + arch/arm64/boot/dts/renesas/r9a09g011-v2mevk2.dts | 216 +++++ + arch/arm64/boot/dts/renesas/r9a09g011.dtsi | 45 ++ + arch/arm64/boot/dts/renesas/ulcb.dtsi | 6 + + arch/arm64/configs/defconfig | 4 +- + drivers/soc/renesas/Kconfig | 7 - + drivers/soc/renesas/pwc-rzv2m.c | 2 +- + drivers/soc/renesas/r8a7795-sysc.c | 10 - + drivers/soc/renesas/renesas-soc.c | 14 +- + drivers/soc/renesas/rmobile-sysc.c | 2 +- + include/dt-bindings/power/r8a7795-sysc.h | 1 - + 44 files changed, 1679 insertions(+), 580 deletions(-) + delete mode 100644 arch/arm64/boot/dts/renesas/r8a77950-salvator-x.dts + delete mode 100644 arch/arm64/boot/dts/renesas/r8a77950-ulcb-kf.dts + delete mode 100644 arch/arm64/boot/dts/renesas/r8a77950-ulcb.dts + delete mode 100644 arch/arm64/boot/dts/renesas/r8a77950.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a779g0-white-hawk-ard-audio-da7212.dtso +Merging reset/reset/next (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'reset/next' of https://git.pengutronix.de/git/pza/linux reset/reset/next +Already up to date. +Merging rockchip/for-next (6d6761582819 Merge branch 'v6.4-armsoc/dts64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git rockchip/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/rockchip.yaml | 10 + + arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi | 6 + + arch/arm/boot/dts/rk3288-veyron.dtsi | 4 + + arch/arm/boot/dts/rk3288.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/Makefile | 2 + + arch/arm64/boot/dts/rockchip/rk3326-odroid-go3.dts | 4 +- + .../boot/dts/rockchip/rk3399-pinebook-pro.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 2 +- + .../boot/dts/rockchip/rk3566-radxa-cm3-io.dts | 8 + + arch/arm64/boot/dts/rockchip/rk3566-soquartz.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dts | 713 +++++++++++++++++++++ + .../boot/dts/rockchip/rk3588s-khadas-edge2.dts | 37 ++ + arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 15 + + drivers/clk/rockchip/clk-rk3399.c | 2 +- + 14 files changed, 803 insertions(+), 6 deletions(-) + create mode 100644 arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts +Merging samsung-krzk/for-next (a81e2e2ca6ae 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/clock/samsung,exynos850-clock.yaml | 19 ++ + .../bindings/soc/samsung/exynos-pmu.yaml | 23 ++- + arch/arm/boot/dts/exynos3250.dtsi | 11 +- + arch/arm/boot/dts/exynos4.dtsi | 13 +- + arch/arm/boot/dts/exynos4210-universal_c210.dts | 2 +- + arch/arm/boot/dts/exynos4412-itop-elite.dts | 2 +- + arch/arm/boot/dts/exynos4412-midas.dtsi | 4 +- + arch/arm/boot/dts/exynos4412-p4note.dtsi | 4 +- + arch/arm/boot/dts/exynos4412.dtsi | 2 +- + arch/arm/boot/dts/exynos5250-arndale.dts | 15 +- + arch/arm/boot/dts/exynos5250.dtsi | 24 +-- + arch/arm/boot/dts/exynos5420.dtsi | 24 +-- + arch/arm/boot/dts/s5pv210.dtsi | 2 +- + arch/arm/mach-exynos/suspend.c | 2 +- + .../boot/dts/exynos/exynos5433-tm2-common.dtsi | 5 +- + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 19 +- + arch/arm64/boot/dts/exynos/exynos7-espresso.dts | 5 +- + .../boot/dts/exynos/exynos7885-jackpotlte.dts | 1 + + arch/arm64/boot/dts/exynos/exynos850.dtsi | 9 + + drivers/clk/samsung/clk-exynos-arm64.c | 229 +++++++++++++++++++-- + drivers/clk/samsung/clk-exynos-arm64.h | 3 + + drivers/clk/samsung/clk-exynos-audss.c | 6 +- + drivers/clk/samsung/clk-exynos-clkout.c | 6 +- + drivers/clk/samsung/clk-exynos4.c | 6 +- + drivers/clk/samsung/clk-exynos4412-isp.c | 3 +- + drivers/clk/samsung/clk-exynos5250.c | 5 +- + drivers/clk/samsung/clk-exynos5420.c | 5 +- + drivers/clk/samsung/clk-exynos5433.c | 157 +------------- + drivers/clk/samsung/clk-exynos850.c | 141 ++++++++++++- + drivers/clk/samsung/clk-pll.c | 12 +- + drivers/clk/samsung/clk-pll.h | 1 + + drivers/clk/samsung/clk-s3c64xx.c | 4 +- + drivers/clk/samsung/clk-s5pv210.c | 6 +- + drivers/clk/samsung/clk.c | 64 ++++-- + drivers/clk/samsung/clk.h | 10 +- + include/dt-bindings/clock/exynos850.h | 28 ++- + 36 files changed, 570 insertions(+), 302 deletions(-) +Merging scmi/for-linux-next (9848e199b090 Merge branch 'for-next/scmi/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) +$ git merge -m Merge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git scmi/for-linux-next +Merge made by the 'ort' strategy. +Merging stm32/stm32-next (19f969c0c738 ARM: dts: stm32: Add coprocessor detach mbox on stm32mp15xx-osd32 SoM) +$ git merge -m Merge branch 'stm32-next' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/stm32mp15xx-osd32.dtsi | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging sunxi/sunxi/for-next (6aeca5d73805 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. + .../boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts | 1 + + arch/riscv/boot/dts/allwinner/sun20i-d1-nezha.dts | 72 ++++++++++++++++++++++ + arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi | 12 ++++ + drivers/soc/sunxi/sunxi_mbus.c | 2 +- + drivers/soc/sunxi/sunxi_sram.c | 1 - + 5 files changed, 86 insertions(+), 2 deletions(-) +Merging tee/next (f8502fba45bd tee: amdtee: fix race condition in amdtee_open_session) +$ git merge -m Merge branch 'next' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee/next +Already up to date. +Merging tegra/for-next (9b0d904e7e49 Merge branch for-6.3/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. +Merging ti/ti-next (9790831f6dbf Merge branches 'ti-k3-dts-next', 'ti-k3-config-next' and '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 +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/ti/k3.yaml | 1 + + .../bindings/net/ti,k3-am654-cpsw-nuss.yaml | 1 - + arch/arm64/boot/dts/ti/Makefile | 7 +- + arch/arm64/boot/dts/ti/k3-am62-main.dtsi | 49 +- + arch/arm64/boot/dts/ti/k3-am62-mcu.dtsi | 11 + + arch/arm64/boot/dts/ti/k3-am62-wakeup.dtsi | 21 + + arch/arm64/boot/dts/ti/k3-am62.dtsi | 3 +- + arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts | 757 +++++++++++++++++++++ + arch/arm64/boot/dts/ti/k3-am625.dtsi | 2 +- + arch/arm64/boot/dts/ti/k3-am62a.dtsi | 3 +- + arch/arm64/boot/dts/ti/k3-am62a7-sk.dts | 5 +- + arch/arm64/boot/dts/ti/k3-am62a7.dtsi | 2 +- + arch/arm64/boot/dts/ti/k3-am64.dtsi | 3 +- + arch/arm64/boot/dts/ti/k3-am65.dtsi | 3 +- + .../dts/ti/k3-j7200-evm-quad-port-eth-exp.dtso | 101 +++ + arch/arm64/boot/dts/ti/k3-j7200-main.dtsi | 88 +++ + arch/arm64/boot/dts/ti/k3-j7200.dtsi | 3 +- + .../dts/ti/k3-j721e-evm-quad-port-eth-exp.dtso | 133 ++++ + arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 117 +++- + arch/arm64/boot/dts/ti/k3-j721e-sk.dts | 4 - + arch/arm64/boot/dts/ti/k3-j721e.dtsi | 4 +- + .../boot/dts/ti/k3-j721s2-common-proc-board.dts | 44 ++ + arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi | 40 ++ + arch/arm64/boot/dts/ti/k3-j721s2.dtsi | 3 +- + arch/arm64/boot/dts/ti/k3-j784s4-evm.dts | 50 ++ + arch/arm64/boot/dts/ti/k3-j784s4-main.dtsi | 20 + + arch/arm64/boot/dts/ti/k3-j784s4-mcu-wakeup.dtsi | 1 + + arch/arm64/boot/dts/ti/k3-j784s4.dtsi | 3 +- + arch/arm64/boot/dts/ti/k3-pinctrl.h | 53 ++ + arch/arm64/configs/defconfig | 8 + + drivers/soc/ti/k3-ringacc.c | 7 + + drivers/soc/ti/k3-socinfo.c | 1 + + drivers/soc/ti/knav_dma.c | 4 +- + drivers/soc/ti/knav_qmss_acc.c | 2 +- + drivers/soc/ti/knav_qmss_queue.c | 4 +- + drivers/soc/ti/omap_prm.c | 2 +- + drivers/soc/ti/pm33xx.c | 5 +- + drivers/soc/ti/wkup_m3_ipc.c | 2 +- + include/dt-bindings/pinctrl/k3.h | 7 + + 39 files changed, 1543 insertions(+), 31 deletions(-) + create mode 100644 arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts + create mode 100644 arch/arm64/boot/dts/ti/k3-j7200-evm-quad-port-eth-exp.dtso + create mode 100644 arch/arm64/boot/dts/ti/k3-j721e-evm-quad-port-eth-exp.dtso + create mode 100644 arch/arm64/boot/dts/ti/k3-pinctrl.h +Merging xilinx/for-next (fe15c26ee26e Linux 6.3-rc1) +$ git merge -m Merge branch 'for-next' of git://github.com/Xilinx/linux-xlnx.git xilinx/for-next +Already up to date. +Merging clk/clk-next (61a672cbb14d Merge branch 'clk-mediatek' 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. + .../bindings/clock/mediatek,mt8186-fhctl.yaml | 7 +- + drivers/clk/at91/clk-sam9x60-pll.c | 2 +- + drivers/clk/clk-ast2600.c | 67 +- + drivers/clk/clk.c | 8 +- + drivers/clk/mediatek/Kconfig | 313 ++++-- + drivers/clk/mediatek/Makefile | 55 +- + drivers/clk/mediatek/clk-fhctl.c | 26 +- + drivers/clk/mediatek/clk-fhctl.h | 9 +- + drivers/clk/mediatek/clk-mt2701-aud.c | 45 +- + drivers/clk/mediatek/clk-mt2701-bdp.c | 25 +- + drivers/clk/mediatek/clk-mt2701-eth.c | 15 +- + drivers/clk/mediatek/clk-mt2701-g3d.c | 15 +- + drivers/clk/mediatek/clk-mt2701-hif.c | 15 +- + drivers/clk/mediatek/clk-mt2701-img.c | 15 +- + drivers/clk/mediatek/clk-mt2701-mm.c | 56 +- + drivers/clk/mediatek/clk-mt2701-vdec.c | 25 +- + drivers/clk/mediatek/clk-mt2701.c | 44 +- + drivers/clk/mediatek/clk-mt2712-apmixedsys.c | 168 ++++ + drivers/clk/mediatek/clk-mt2712-bdp.c | 15 +- + drivers/clk/mediatek/clk-mt2712-img.c | 15 +- + drivers/clk/mediatek/clk-mt2712-jpgdec.c | 15 +- + drivers/clk/mediatek/clk-mt2712-mfg.c | 15 +- + drivers/clk/mediatek/clk-mt2712-mm.c | 66 +- + drivers/clk/mediatek/clk-mt2712-vdec.c | 25 +- + drivers/clk/mediatek/clk-mt2712-venc.c | 15 +- + drivers/clk/mediatek/clk-mt2712.c | 1010 ++++++-------------- + drivers/clk/mediatek/clk-mt6765-audio.c | 25 +- + drivers/clk/mediatek/clk-mt6765-cam.c | 15 +- + drivers/clk/mediatek/clk-mt6765-img.c | 15 +- + drivers/clk/mediatek/clk-mt6765-mipi0a.c | 15 +- + drivers/clk/mediatek/clk-mt6765-mm.c | 15 +- + drivers/clk/mediatek/clk-mt6765-vcodec.c | 15 +- + drivers/clk/mediatek/clk-mt6765.c | 82 +- + drivers/clk/mediatek/clk-mt6779-aud.c | 1 + + drivers/clk/mediatek/clk-mt6779-cam.c | 1 + + drivers/clk/mediatek/clk-mt6779-img.c | 1 + + drivers/clk/mediatek/clk-mt6779-ipe.c | 1 + + drivers/clk/mediatek/clk-mt6779-mfg.c | 1 + + drivers/clk/mediatek/clk-mt6779-mm.c | 25 +- + drivers/clk/mediatek/clk-mt6779-vdec.c | 1 + + drivers/clk/mediatek/clk-mt6779-venc.c | 1 + + drivers/clk/mediatek/clk-mt6779.c | 1 + + drivers/clk/mediatek/clk-mt6795-apmixedsys.c | 64 +- + drivers/clk/mediatek/clk-mt6795-infracfg.c | 1 + + drivers/clk/mediatek/clk-mt6795-mfg.c | 1 + + drivers/clk/mediatek/clk-mt6795-mm.c | 56 +- + drivers/clk/mediatek/clk-mt6795-pericfg.c | 1 + + drivers/clk/mediatek/clk-mt6795-topckgen.c | 1 + + drivers/clk/mediatek/clk-mt6795-vdecsys.c | 1 + + drivers/clk/mediatek/clk-mt6795-vencsys.c | 1 + + drivers/clk/mediatek/clk-mt6797-img.c | 15 +- + drivers/clk/mediatek/clk-mt6797-mm.c | 56 +- + drivers/clk/mediatek/clk-mt6797-vdec.c | 25 +- + drivers/clk/mediatek/clk-mt6797-venc.c | 15 +- + drivers/clk/mediatek/clk-mt6797.c | 44 +- + drivers/clk/mediatek/clk-mt7622-apmixedsys.c | 152 +++ + drivers/clk/mediatek/clk-mt7622-aud.c | 45 +- + drivers/clk/mediatek/clk-mt7622-eth.c | 25 +- + drivers/clk/mediatek/clk-mt7622-hif.c | 25 +- + drivers/clk/mediatek/clk-mt7622-infracfg.c | 128 +++ + drivers/clk/mediatek/clk-mt7622.c | 371 ++----- + drivers/clk/mediatek/clk-mt7629-eth.c | 22 +- + drivers/clk/mediatek/clk-mt7629-hif.c | 25 +- + drivers/clk/mediatek/clk-mt7629.c | 42 +- + drivers/clk/mediatek/clk-mt7981-apmixed.c | 2 + + drivers/clk/mediatek/clk-mt7981-eth.c | 3 +- + drivers/clk/mediatek/clk-mt7981-infracfg.c | 4 +- + drivers/clk/mediatek/clk-mt7981-topckgen.c | 4 +- + drivers/clk/mediatek/clk-mt7986-apmixed.c | 8 +- + drivers/clk/mediatek/clk-mt7986-eth.c | 112 +-- + drivers/clk/mediatek/clk-mt7986-infracfg.c | 90 +- + drivers/clk/mediatek/clk-mt7986-topckgen.c | 4 +- + drivers/clk/mediatek/clk-mt8135-apmixedsys.c | 105 ++ + drivers/clk/mediatek/clk-mt8135.c | 268 ++---- + drivers/clk/mediatek/clk-mt8167-apmixedsys.c | 145 +++ + drivers/clk/mediatek/clk-mt8167-aud.c | 46 +- + drivers/clk/mediatek/clk-mt8167-img.c | 50 +- + drivers/clk/mediatek/clk-mt8167-mfgcfg.c | 50 +- + drivers/clk/mediatek/clk-mt8167-mm.c | 69 +- + drivers/clk/mediatek/clk-mt8167-vdec.c | 57 +- + drivers/clk/mediatek/clk-mt8167.c | 382 +++----- + drivers/clk/mediatek/clk-mt8173-apmixedsys.c | 66 +- + drivers/clk/mediatek/clk-mt8173-img.c | 1 + + drivers/clk/mediatek/clk-mt8173-infracfg.c | 1 + + drivers/clk/mediatek/clk-mt8173-mm.c | 82 +- + drivers/clk/mediatek/clk-mt8173-pericfg.c | 1 + + drivers/clk/mediatek/clk-mt8173-topckgen.c | 1 + + drivers/clk/mediatek/clk-mt8173-vdecsys.c | 1 + + drivers/clk/mediatek/clk-mt8173-vencsys.c | 1 + + drivers/clk/mediatek/clk-mt8183-apmixedsys.c | 195 ++++ + drivers/clk/mediatek/clk-mt8183-audio.c | 5 +- + drivers/clk/mediatek/clk-mt8183-cam.c | 5 +- + drivers/clk/mediatek/clk-mt8183-img.c | 5 +- + drivers/clk/mediatek/clk-mt8183-ipu0.c | 5 +- + drivers/clk/mediatek/clk-mt8183-ipu1.c | 5 +- + drivers/clk/mediatek/clk-mt8183-ipu_adl.c | 5 +- + drivers/clk/mediatek/clk-mt8183-ipu_conn.c | 5 +- + drivers/clk/mediatek/clk-mt8183-mfgcfg.c | 5 +- + drivers/clk/mediatek/clk-mt8183-mm.c | 29 +- + drivers/clk/mediatek/clk-mt8183-vdec.c | 5 +- + drivers/clk/mediatek/clk-mt8183-venc.c | 5 +- + drivers/clk/mediatek/clk-mt8183.c | 771 ++++----------- + drivers/clk/mediatek/clk-mt8186-apmixedsys.c | 6 +- + drivers/clk/mediatek/clk-mt8186-cam.c | 4 +- + drivers/clk/mediatek/clk-mt8186-img.c | 4 +- + drivers/clk/mediatek/clk-mt8186-imp_iic_wrap.c | 4 +- + drivers/clk/mediatek/clk-mt8186-infra_ao.c | 4 +- + drivers/clk/mediatek/clk-mt8186-ipe.c | 4 +- + drivers/clk/mediatek/clk-mt8186-mcu.c | 69 +- + drivers/clk/mediatek/clk-mt8186-mdp.c | 4 +- + drivers/clk/mediatek/clk-mt8186-mfg.c | 4 +- + drivers/clk/mediatek/clk-mt8186-mm.c | 59 +- + drivers/clk/mediatek/clk-mt8186-topckgen.c | 4 +- + drivers/clk/mediatek/clk-mt8186-vdec.c | 4 +- + drivers/clk/mediatek/clk-mt8186-venc.c | 4 +- + drivers/clk/mediatek/clk-mt8186-wpe.c | 4 +- + drivers/clk/mediatek/clk-mt8192-apmixedsys.c | 215 +++++ + drivers/clk/mediatek/clk-mt8192-aud.c | 5 +- + drivers/clk/mediatek/clk-mt8192-cam.c | 5 +- + drivers/clk/mediatek/clk-mt8192-img.c | 5 +- + drivers/clk/mediatek/clk-mt8192-imp_iic_wrap.c | 5 +- + drivers/clk/mediatek/clk-mt8192-ipe.c | 5 +- + drivers/clk/mediatek/clk-mt8192-mdp.c | 5 +- + drivers/clk/mediatek/clk-mt8192-mfg.c | 5 +- + drivers/clk/mediatek/clk-mt8192-mm.c | 34 +- + drivers/clk/mediatek/clk-mt8192-msdc.c | 5 +- + drivers/clk/mediatek/clk-mt8192-scp_adsp.c | 5 +- + drivers/clk/mediatek/clk-mt8192-vdec.c | 5 +- + drivers/clk/mediatek/clk-mt8192-venc.c | 5 +- + drivers/clk/mediatek/clk-mt8192.c | 160 +--- + drivers/clk/mediatek/clk-mt8195-apmixedsys.c | 73 +- + drivers/clk/mediatek/clk-mt8195-apusys_pll.c | 4 +- + drivers/clk/mediatek/clk-mt8195-cam.c | 4 +- + drivers/clk/mediatek/clk-mt8195-ccu.c | 4 +- + drivers/clk/mediatek/clk-mt8195-img.c | 4 +- + drivers/clk/mediatek/clk-mt8195-imp_iic_wrap.c | 4 +- + drivers/clk/mediatek/clk-mt8195-infra_ao.c | 4 +- + drivers/clk/mediatek/clk-mt8195-ipe.c | 4 +- + drivers/clk/mediatek/clk-mt8195-mfg.c | 4 +- + drivers/clk/mediatek/clk-mt8195-peri_ao.c | 4 +- + drivers/clk/mediatek/clk-mt8195-scp_adsp.c | 4 +- + drivers/clk/mediatek/clk-mt8195-topckgen.c | 4 +- + drivers/clk/mediatek/clk-mt8195-vdec.c | 4 +- + drivers/clk/mediatek/clk-mt8195-vdo0.c | 59 +- + drivers/clk/mediatek/clk-mt8195-vdo1.c | 61 +- + drivers/clk/mediatek/clk-mt8195-venc.c | 4 +- + drivers/clk/mediatek/clk-mt8195-vpp0.c | 58 +- + drivers/clk/mediatek/clk-mt8195-vpp1.c | 58 +- + drivers/clk/mediatek/clk-mt8195-wpe.c | 4 +- + drivers/clk/mediatek/clk-mt8365-apmixedsys.c | 166 ++++ + drivers/clk/mediatek/clk-mt8365-apu.c | 3 +- + drivers/clk/mediatek/clk-mt8365-cam.c | 3 +- + drivers/clk/mediatek/clk-mt8365-mfg.c | 3 +- + drivers/clk/mediatek/clk-mt8365-mm.c | 42 +- + drivers/clk/mediatek/clk-mt8365-vdec.c | 3 +- + drivers/clk/mediatek/clk-mt8365-venc.c | 3 +- + drivers/clk/mediatek/clk-mt8365.c | 606 +++--------- + drivers/clk/mediatek/clk-mt8516-apmixedsys.c | 122 +++ + drivers/clk/mediatek/clk-mt8516-aud.c | 46 +- + drivers/clk/mediatek/clk-mt8516.c | 240 ++--- + drivers/clk/mediatek/clk-mtk.c | 82 +- + drivers/clk/mediatek/clk-mtk.h | 7 +- + drivers/clk/mediatek/clk-pllfh.c | 37 +- + drivers/clk/mediatek/clk-pllfh.h | 1 + + drivers/clk/sprd/common.c | 11 +- + drivers/clk/visconti/pll.h | 1 - + include/dt-bindings/clock/ast2600-clock.h | 5 +- + 167 files changed, 3813 insertions(+), 4590 deletions(-) + create mode 100644 drivers/clk/mediatek/clk-mt2712-apmixedsys.c + create mode 100644 drivers/clk/mediatek/clk-mt7622-apmixedsys.c + create mode 100644 drivers/clk/mediatek/clk-mt7622-infracfg.c + create mode 100644 drivers/clk/mediatek/clk-mt8135-apmixedsys.c + create mode 100644 drivers/clk/mediatek/clk-mt8167-apmixedsys.c + create mode 100644 drivers/clk/mediatek/clk-mt8183-apmixedsys.c + create mode 100644 drivers/clk/mediatek/clk-mt8192-apmixedsys.c + create mode 100644 drivers/clk/mediatek/clk-mt8365-apmixedsys.c + create mode 100644 drivers/clk/mediatek/clk-mt8516-apmixedsys.c +Merging clk-imx/for-next (fe15c26ee26e Linux 6.3-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 (72cd8436ece0 clk: renesas: Convert to platform remove callback returning void) +$ 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/r8a77970-cpg-mssr.c | 1 + + drivers/clk/renesas/r8a77980-cpg-mssr.c | 17 + + drivers/clk/renesas/r8a77995-cpg-mssr.c | 2 +- + drivers/clk/renesas/r8a779g0-cpg-mssr.c | 24 + + drivers/clk/renesas/r9a06g032-clocks.c | 736 ++++++++++++++++++++++-------- + drivers/clk/renesas/rcar-usb2-clock-sel.c | 6 +- + drivers/clk/renesas/renesas-cpg-mssr.c | 8 +- + 7 files changed, 590 insertions(+), 204 deletions(-) +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 (4a3ec00957fd csky: delay: Add function alignment) +$ 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 (fc89d7fb499b Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost) +$ 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 (fda1941b8eab m68k: Remove obsolete config NO_KERNEL_MSG) +$ 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. + arch/m68k/Kconfig.debug | 5 ----- + drivers/nubus/bus.c | 6 ------ + 2 files changed, 11 deletions(-) +Merging m68knommu/for-next (8fc6ba5f96bc m68k: Kconfig.machine: remove obsolete configs ROMBASE and ROMSIZE) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git m68knommu/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 2 -- + arch/m68k/Kconfig.machine | 17 ----------------- + 2 files changed, 19 deletions(-) +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 (a45e5fe79234 MIPS: ath79: remove obsolete ATH79_DEV_* configs) +$ git merge -m Merge branch 'mips-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next +Auto-merging arch/mips/Kconfig +Merge made by the 'ort' strategy. + .../devicetree/bindings/mips/loongson/devices.yaml | 12 ++ + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + arch/mips/Kbuild.platforms | 1 - + arch/mips/Kconfig | 21 +-- + arch/mips/ath79/Kconfig | 16 --- + arch/mips/bcm47xx/board.c | 1 + + arch/mips/bcm47xx/leds.c | 8 ++ + arch/mips/include/asm/io.h | 2 +- + arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h | 1 + + arch/mips/include/asm/mach-ralink/mt7620.h | 3 +- + arch/mips/include/asm/mach-ralink/rt288x.h | 3 +- + arch/mips/include/asm/mach-ralink/rt305x.h | 3 +- + arch/mips/include/asm/mach-ralink/rt3883.h | 4 +- + arch/mips/include/asm/sibyte/board.h | 6 +- + arch/mips/include/asm/sibyte/carmel.h | 45 ------- + arch/mips/include/asm/sibyte/swarm.h | 5 - + arch/mips/loongson64/setup.c | 15 --- + arch/mips/loongson64/smp.c | 50 +++---- + arch/mips/pci/pci-lantiq.c | 2 +- + arch/mips/pci/pci-rt3883.c | 2 +- + arch/mips/ralink/Kconfig | 4 + + arch/mips/ralink/mt7620.c | 145 ++++++++++++++++---- + arch/mips/ralink/rt288x.c | 94 ++++++++++--- + arch/mips/ralink/rt305x.c | 147 +++++++++++++++++---- + arch/mips/ralink/rt3883.c | 94 ++++++++++--- + arch/mips/sibyte/Kconfig | 33 +---- + arch/mips/sibyte/Makefile | 6 - + arch/mips/sibyte/Platform | 8 -- + arch/mips/sibyte/common/bus_watcher.c | 4 +- + arch/mips/sibyte/common/cfe.c | 17 +-- + arch/mips/sibyte/common/sb_tbprof.c | 10 +- + arch/mips/sibyte/swarm/setup.c | 12 +- + 32 files changed, 469 insertions(+), 307 deletions(-) + delete mode 100644 arch/mips/include/asm/sibyte/carmel.h +Merging openrisc/for-next (34a0bac084e4 MAINTAINERS: git://github -> https://github.com for openrisc) +$ 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 (783394630553 parisc: Ensure page alignment in flush functions) +$ 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 +Auto-merging Documentation/kbuild/kbuild.rst +Merge made by the 'ort' strategy. + Documentation/kbuild/kbuild.rst | 1 + + arch/parisc/include/asm/kgdb.h | 2 ++ + arch/parisc/include/asm/pdc.h | 1 + + arch/parisc/kernel/firmware.c | 27 +++++++++++++++++++++++---- + arch/parisc/kernel/pacache.S | 2 ++ + drivers/parisc/power.c | 16 ++++++++++------ + 6 files changed, 39 insertions(+), 10 deletions(-) +Merging powerpc/next (3c1d9f36e985 powerpc: Simplify sysctl registration for nmi_wd_lpm_factor_ctl_table) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next +Auto-merging MAINTAINERS +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/powerpc/platforms/powernv/pci-ioda.c +Merge made by the 'ort' strategy. + MAINTAINERS | 5 + + arch/powerpc/Kconfig | 3 +- + arch/powerpc/Makefile | 4 +- + arch/powerpc/boot/Makefile | 6 +- + arch/powerpc/include/asm/iommu.h | 6 +- + arch/powerpc/include/asm/machdep.h | 3 +- + arch/powerpc/include/asm/pci-bridge.h | 7 + + arch/powerpc/kernel/idle.c | 10 +- + arch/powerpc/kernel/iommu.c | 246 ++++++++++++++++++++- + arch/powerpc/kernel/pci_64.c | 2 +- + arch/powerpc/kernel/process.c | 2 +- + arch/powerpc/kernel/setup-common.c | 13 +- + arch/powerpc/kernel/time.c | 6 +- + arch/powerpc/platforms/40x/ppc40x_simple.c | 1 - + arch/powerpc/platforms/44x/canyonlands.c | 10 +- + arch/powerpc/platforms/44x/ebony.c | 5 +- + arch/powerpc/platforms/44x/fsp2.c | 1 - + arch/powerpc/platforms/44x/iss4xx.c | 14 +- + arch/powerpc/platforms/44x/ppc44x_simple.c | 1 - + arch/powerpc/platforms/44x/ppc476.c | 37 ++-- + arch/powerpc/platforms/44x/sam440ep.c | 5 +- + arch/powerpc/platforms/44x/warp.c | 11 +- + arch/powerpc/platforms/512x/mpc5121_ads.c | 5 +- + arch/powerpc/platforms/512x/mpc512x_generic.c | 1 - + arch/powerpc/platforms/512x/pdm360ng.c | 5 +- + arch/powerpc/platforms/52xx/efika.c | 1 - + arch/powerpc/platforms/52xx/lite5200.c | 1 - + arch/powerpc/platforms/52xx/media5200.c | 17 +- + arch/powerpc/platforms/52xx/mpc5200_simple.c | 1 - + arch/powerpc/platforms/82xx/ep8248e.c | 11 +- + arch/powerpc/platforms/82xx/km82xx.c | 11 +- + arch/powerpc/platforms/82xx/mpc8272_ads.c | 11 +- + arch/powerpc/platforms/82xx/pq2fads.c | 11 +- + arch/powerpc/platforms/83xx/asp834x.c | 11 +- + arch/powerpc/platforms/83xx/km83xx.c | 1 - + arch/powerpc/platforms/83xx/mpc830x_rdb.c | 1 - + arch/powerpc/platforms/83xx/mpc831x_rdb.c | 1 - + arch/powerpc/platforms/83xx/mpc832x_mds.c | 11 +- + arch/powerpc/platforms/83xx/mpc832x_rdb.c | 11 +- + arch/powerpc/platforms/83xx/mpc834x_itx.c | 11 +- + arch/powerpc/platforms/83xx/mpc834x_mds.c | 11 +- + arch/powerpc/platforms/83xx/mpc836x_mds.c | 11 +- + arch/powerpc/platforms/83xx/mpc836x_rdk.c | 11 +- + arch/powerpc/platforms/83xx/mpc837x_mds.c | 11 +- + arch/powerpc/platforms/83xx/mpc837x_rdb.c | 1 - + arch/powerpc/platforms/85xx/bsc913x_qds.c | 12 +- + arch/powerpc/platforms/85xx/bsc913x_rdb.c | 12 +- + arch/powerpc/platforms/85xx/c293pcie.c | 13 +- + arch/powerpc/platforms/85xx/corenet_generic.c | 1 - + arch/powerpc/platforms/85xx/ge_imp3a.c | 11 +- + arch/powerpc/platforms/85xx/ksi8560.c | 11 +- + arch/powerpc/platforms/85xx/mpc8536_ds.c | 11 +- + arch/powerpc/platforms/85xx/mpc85xx_ads.c | 11 +- + arch/powerpc/platforms/85xx/mpc85xx_cds.c | 12 +- + arch/powerpc/platforms/85xx/mpc85xx_ds.c | 33 +-- + arch/powerpc/platforms/85xx/mpc85xx_mds.c | 25 +-- + arch/powerpc/platforms/85xx/mpc85xx_rdb.c | 91 +------- + arch/powerpc/platforms/85xx/mvme2500.c | 11 +- + arch/powerpc/platforms/85xx/p1010rdb.c | 1 - + arch/powerpc/platforms/85xx/p1022_ds.c | 11 +- + arch/powerpc/platforms/85xx/p1022_rdk.c | 11 +- + arch/powerpc/platforms/85xx/p1023_rdb.c | 17 +- + arch/powerpc/platforms/85xx/ppa8548.c | 11 +- + arch/powerpc/platforms/85xx/qemu_e500.c | 11 +- + arch/powerpc/platforms/85xx/socrates.c | 14 +- + arch/powerpc/platforms/85xx/stx_gp3.c | 11 +- + arch/powerpc/platforms/85xx/tqm85xx.c | 1 - + arch/powerpc/platforms/85xx/twr_p102x.c | 8 +- + arch/powerpc/platforms/85xx/xes_mpc85xx.c | 27 +-- + arch/powerpc/platforms/86xx/gef_ppc9a.c | 19 +- + arch/powerpc/platforms/86xx/gef_sbc310.c | 19 +- + arch/powerpc/platforms/86xx/gef_sbc610.c | 19 +- + arch/powerpc/platforms/86xx/mpc8610_hpcd.c | 14 +- + arch/powerpc/platforms/86xx/mpc86xx_hpcn.c | 15 +- + arch/powerpc/platforms/86xx/mvme7100.c | 1 - + arch/powerpc/platforms/8xx/adder875.c | 8 +- + arch/powerpc/platforms/8xx/ep88xc.c | 7 +- + arch/powerpc/platforms/8xx/mpc86xads_setup.c | 7 +- + arch/powerpc/platforms/8xx/mpc885ads_setup.c | 7 +- + arch/powerpc/platforms/8xx/tqm8xx_setup.c | 7 +- + arch/powerpc/platforms/amigaone/setup.c | 22 +- + arch/powerpc/platforms/cell/setup.c | 1 - + arch/powerpc/platforms/chrp/setup.c | 1 - + arch/powerpc/platforms/embedded6xx/gamecube.c | 10 +- + arch/powerpc/platforms/embedded6xx/holly.c | 13 +- + arch/powerpc/platforms/embedded6xx/linkstation.c | 5 +- + arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c | 13 +- + arch/powerpc/platforms/embedded6xx/mvme5100.c | 11 +- + arch/powerpc/platforms/embedded6xx/storcenter.c | 8 +- + arch/powerpc/platforms/embedded6xx/wii.c | 10 +- + arch/powerpc/platforms/maple/setup.c | 1 - + arch/powerpc/platforms/microwatt/setup.c | 8 +- + arch/powerpc/platforms/pasemi/setup.c | 1 - + arch/powerpc/platforms/powernv/pci-ioda.c | 42 +++- + arch/powerpc/platforms/powernv/setup.c | 5 +- + arch/powerpc/platforms/ps3/setup.c | 4 +- + arch/powerpc/platforms/pseries/iommu.c | 29 +++ + arch/powerpc/platforms/pseries/mobility.c | 10 +- + arch/powerpc/platforms/pseries/pseries.h | 4 + + arch/powerpc/platforms/pseries/setup.c | 4 +- + drivers/vfio/vfio_iommu_spapr_tce.c | 96 ++------ + tools/testing/selftests/powerpc/math/vmx_signal.c | 1 + + .../mmcra_thresh_marked_sample_test.c | 4 +- + 103 files changed, 481 insertions(+), 887 deletions(-) +Merging soc-fsl/next (4b0986a3613c Linux 5.18) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl/next +Already up to date. +Merging risc-v/for-next (4b740779ac03 Merge patch series "RISC-V: Apply Zicboz to clear_page") +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v/for-next +Auto-merging arch/riscv/errata/sifive/errata.c +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/riscv/cpus.yaml | 5 + + arch/riscv/Kconfig | 42 ++- + arch/riscv/{Kconfig.erratas => Kconfig.errata} | 0 + arch/riscv/errata/sifive/errata.c | 8 +- + arch/riscv/errata/thead/errata.c | 4 +- + arch/riscv/include/asm/alternative-macros.h | 72 +++--- + arch/riscv/include/asm/alternative.h | 15 +- + arch/riscv/include/asm/cacheflush.h | 3 +- + arch/riscv/include/asm/hugetlb.h | 34 ++- + arch/riscv/include/asm/hwcap.h | 2 + + arch/riscv/include/asm/insn-def.h | 4 + + arch/riscv/include/asm/page.h | 11 +- + arch/riscv/include/asm/pgtable-64.h | 34 +++ + arch/riscv/include/asm/pgtable.h | 39 ++- + arch/riscv/include/asm/vmalloc.h | 61 ++++- + arch/riscv/include/uapi/asm/kvm.h | 2 + + arch/riscv/kernel/cpu.c | 2 + + arch/riscv/kernel/cpufeature.c | 64 ++++- + arch/riscv/kernel/setup.c | 2 +- + arch/riscv/kvm/vcpu.c | 11 + + arch/riscv/lib/Makefile | 1 + + arch/riscv/lib/clear_page.S | 74 ++++++ + arch/riscv/lib/strcmp.S | 3 +- + arch/riscv/lib/strlen.S | 3 +- + arch/riscv/lib/strncmp.S | 3 +- + arch/riscv/mm/cacheflush.c | 64 +++-- + arch/riscv/mm/hugetlbpage.c | 301 ++++++++++++++++++++++ + 27 files changed, 756 insertions(+), 108 deletions(-) + rename arch/riscv/{Kconfig.erratas => Kconfig.errata} (100%) + create mode 100644 arch/riscv/lib/clear_page.S +Merging riscv-dt/riscv-dt-for-next (0e9b70c1e362 riscv: dts: microchip: add mpfs specific macb reset support) +$ git merge -m Merge branch 'riscv-dt-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt/riscv-dt-for-next +Merge made by the 'ort' strategy. + arch/riscv/boot/dts/microchip/mpfs.dtsi | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) +Merging riscv-soc/riscv-soc-for-next (49f965b6fbca soc: canaan: Make K210_SYSCTL depend on CLK_K210) +$ git merge -m Merge branch 'riscv-soc-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc/riscv-soc-for-next +Merge made by the 'ort' strategy. + drivers/soc/canaan/Kconfig | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) +Merging s390/for-next (1485d9a4eecf Merge branch 'features' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390/for-next +Auto-merging arch/s390/Kconfig +Auto-merging lib/Kconfig.debug +Merge made by the 'ort' strategy. + arch/s390/Kconfig | 2 + + arch/s390/appldata/appldata_base.c | 32 +-- + arch/s390/boot/Makefile | 2 +- + arch/s390/boot/boot.h | 39 ++- + arch/s390/boot/ipl_report.c | 106 ++++--- + arch/s390/boot/kaslr.c | 115 +------- + arch/s390/boot/mem_detect.c | 191 ------------- + arch/s390/boot/pgm_check_info.c | 5 +- + arch/s390/boot/physmem_info.c | 323 ++++++++++++++++++++++ + arch/s390/boot/startup.c | 96 ++++--- + arch/s390/boot/vmem.c | 258 +++++++++++++---- + arch/s390/boot/vmlinux.lds.S | 2 + + arch/s390/include/asm/ap.h | 152 +++++++++-- + arch/s390/include/asm/kasan.h | 31 +-- + arch/s390/include/asm/linkage.h | 2 +- + arch/s390/include/asm/mem_detect.h | 117 -------- + arch/s390/include/asm/nospec-insn.h | 3 +- + arch/s390/include/asm/physmem_info.h | 171 ++++++++++++ + arch/s390/include/asm/processor.h | 4 - + arch/s390/include/asm/setup.h | 13 +- + arch/s390/include/asm/thread_info.h | 2 - + arch/s390/kernel/debug.c | 12 +- + arch/s390/kernel/dumpstack.c | 8 +- + arch/s390/kernel/early.c | 23 +- + arch/s390/kernel/entry.S | 53 ++-- + arch/s390/kernel/ftrace.c | 20 -- + arch/s390/kernel/head64.S | 3 - + arch/s390/kernel/ipl.c | 1 - + arch/s390/kernel/mcount.S | 16 ++ + arch/s390/kernel/process.c | 10 +- + arch/s390/kernel/processor.c | 18 -- + arch/s390/kernel/setup.c | 96 +++---- + arch/s390/kernel/smp.c | 2 - + arch/s390/kernel/topology.c | 12 +- + arch/s390/kernel/vdso32/vdso_user_wrapper.S | 3 +- + arch/s390/kernel/vdso64/vdso_user_wrapper.S | 5 +- + arch/s390/kernel/vmlinux.lds.S | 7 + + arch/s390/mm/Makefile | 3 - + arch/s390/mm/cmm.c | 12 +- + arch/s390/mm/kasan_init.c | 301 -------------------- + arch/s390/mm/pageattr.c | 2 - + arch/s390/mm/pgalloc.c | 20 +- + arch/s390/mm/vmem.c | 11 + + arch/s390/pci/pci.c | 23 +- + arch/s390/pci/pci_bus.c | 11 +- + drivers/s390/char/sclp_early_core.c | 8 +- + drivers/s390/crypto/ap_bus.c | 254 ++++++++++------- + drivers/s390/crypto/ap_bus.h | 70 +++-- + drivers/s390/crypto/ap_card.c | 23 +- + drivers/s390/crypto/ap_queue.c | 410 +++++++++++++++++++++++----- + drivers/s390/crypto/vfio_ap_ops.c | 16 +- + drivers/s390/crypto/zcrypt_api.c | 60 ++-- + drivers/s390/crypto/zcrypt_card.c | 6 +- + drivers/s390/crypto/zcrypt_cex2c.c | 66 +++-- + drivers/s390/crypto/zcrypt_cex4.c | 141 +++++----- + drivers/s390/crypto/zcrypt_msgtype50.c | 15 +- + drivers/s390/crypto/zcrypt_msgtype6.c | 63 +++-- + drivers/s390/crypto/zcrypt_queue.c | 4 +- + lib/Kconfig.debug | 2 +- + 59 files changed, 1845 insertions(+), 1631 deletions(-) + delete mode 100644 arch/s390/boot/mem_detect.c + create mode 100644 arch/s390/boot/physmem_info.c + delete mode 100644 arch/s390/include/asm/mem_detect.h + create mode 100644 arch/s390/include/asm/physmem_info.h + delete mode 100644 arch/s390/mm/kasan_init.c +Merging sh/for-next (ff30bd6a6618 sh: clk: Fix clk_enable() to return 0 on NULL clk) +$ git merge -m Merge branch 'for-next' of git:git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux.git sh/for-next +Already up to date. +Merging uml/next (04df97e150c8 Documentation: rust: Fix arch support table) +$ 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 (1d3b7a788ca7 xtensa: fix KASAN report for show_stack) +$ git merge -m Merge branch 'xtensa-for-next' of git://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next +Merge made by the 'ort' strategy. + arch/xtensa/kernel/traps.c | 16 ++++++++++++---- + 1 file changed, 12 insertions(+), 4 deletions(-) +Merging pidfd/for-next (5ab18f4b061e vhost: use vhost_tasks for worker threads) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git pidfd/for-next +Auto-merging MAINTAINERS +Auto-merging init/main.c +Auto-merging kernel/fork.c +Auto-merging kernel/kthread.c +Auto-merging mm/vmscan.c +Merge made by the 'ort' strategy. + MAINTAINERS | 2 + + arch/csky/include/asm/processor.h | 2 - + drivers/vhost/Kconfig | 5 ++ + drivers/vhost/vhost.c | 124 ++++++++++++++++++-------------------- + drivers/vhost/vhost.h | 11 +++- + include/linux/sched.h | 2 +- + include/linux/sched/task.h | 13 +++- + include/linux/sched/vhost_task.h | 23 +++++++ + init/main.c | 2 +- + kernel/Makefile | 1 + + kernel/fork.c | 25 ++++++-- + kernel/kthread.c | 33 ++++------ + kernel/vhost_task.c | 117 +++++++++++++++++++++++++++++++++++ + mm/vmscan.c | 4 +- + 14 files changed, 263 insertions(+), 101 deletions(-) + create mode 100644 include/linux/sched/vhost_task.h + create mode 100644 kernel/vhost_task.c +Merging vfs-idmapping/for-next (9576d493741c Merge branch 'fs.misc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/idmapping.git vfs-idmapping/for-next +Auto-merging fs/nfs/nfs3acl.c +Auto-merging mm/shmem.c +Merge made by the 'ort' strategy. + Documentation/filesystems/idmappings.rst | 178 ++++++++++++++++++++++--------- + Documentation/filesystems/mount_api.rst | 1 - + fs/9p/xattr.c | 4 - + fs/btrfs/xattr.c | 4 - + fs/ceph/xattr.c | 4 - + fs/cifs/xattr.c | 4 - + fs/devpts/inode.c | 20 +--- + fs/ecryptfs/inode.c | 4 - + fs/erofs/xattr.c | 12 +-- + fs/erofs/xattr.h | 20 ++-- + fs/eventpoll.c | 4 +- + fs/ext2/xattr.c | 25 +++-- + fs/ext4/xattr.c | 25 +++-- + fs/f2fs/xattr.c | 24 ++--- + fs/fuse/dev.c | 4 +- + fs/gfs2/xattr.c | 2 - + fs/jffs2/xattr.c | 29 +++-- + fs/jfs/xattr.c | 4 - + fs/namespace.c | 9 +- + fs/nfs/nfs3_fs.h | 1 - + fs/nfs/nfs3acl.c | 6 -- + fs/nfs/nfs3super.c | 3 - + fs/nfs/super.c | 3 - + fs/nfsd/nfs4xdr.c | 3 +- + fs/ntfs3/xattr.c | 4 - + fs/ocfs2/xattr.c | 14 +-- + fs/orangefs/xattr.c | 2 - + fs/overlayfs/copy_up.c | 3 +- + fs/overlayfs/super.c | 8 -- + fs/pipe.c | 42 ++++++-- + fs/posix_acl.c | 61 ++++++++--- + fs/reiserfs/file.c | 7 ++ + fs/reiserfs/inode.c | 6 +- + fs/reiserfs/namei.c | 50 ++++++++- + fs/reiserfs/reiserfs.h | 2 + + fs/reiserfs/xattr.c | 55 +++++----- + fs/splice.c | 11 +- + fs/xattr.c | 124 +++++++++++---------- + fs/xfs/xfs_xattr.c | 4 - + include/linux/fs_context.h | 1 - + include/linux/pipe_fs_i.h | 8 +- + include/linux/posix_acl.h | 7 ++ + include/linux/posix_acl_xattr.h | 5 +- + include/linux/security.h | 2 +- + include/linux/xattr.h | 19 +++- + mm/shmem.c | 4 - + 46 files changed, 472 insertions(+), 360 deletions(-) +Merging fscrypt/for-next (704d0e7a9b7d fscrypt: new helper function - fscrypt_prepare_lookup_partial()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/fscrypt/linux.git fscrypt/for-next +Merge made by the 'ort' strategy. + fs/buffer.c | 4 ++-- + fs/crypto/hooks.c | 30 ++++++++++++++++++++++++++++++ + include/linux/fscrypt.h | 7 +++++++ + 3 files changed, 39 insertions(+), 2 deletions(-) +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 (80d1eec6927a Merge branch 'for-next-current-v6.2-20230221' into for-next-20230221) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next +Merge made by the 'ort' strategy. +Merging ceph/master (f7c4d9b133c7 rbd: avoid use-after-free in do_rbd_add() when rbd_dev_create() fails) +$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master +Already up to date. +Merging cifs/for-next (2f0e4f034220 cifs: check only tcon status on tcon related functions) +$ 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/connect.c | 10 +++++++--- + fs/cifs/dfs.c | 10 +++++++--- + fs/cifs/dfs_cache.c | 2 +- + fs/cifs/file.c | 8 ++++---- + 4 files changed, 19 insertions(+), 11 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 (c1cc2db21607 ecryptfs: keystore: Fix typo 'the the' in comment) +$ 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 | 8 ++++---- + fs/ecryptfs/keystore.c | 2 +- + fs/ecryptfs/read_write.c | 8 ++++---- + 3 files changed, 9 insertions(+), 9 deletions(-) +Merging erofs/dev (4f24ebae35ff erofs: support flattened block device for multi-blob images) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs/dev +Auto-merging fs/erofs/xattr.c +Auto-merging fs/erofs/xattr.h +Merge made by the 'ort' strategy. + fs/erofs/data.c | 58 +++++++++++++++++++-------------- + fs/erofs/decompressor.c | 6 ++-- + fs/erofs/decompressor_lzma.c | 4 +-- + fs/erofs/dir.c | 22 ++++++------- + fs/erofs/erofs_fs.h | 5 +-- + fs/erofs/fscache.c | 5 +-- + fs/erofs/inode.c | 23 +++++++------ + fs/erofs/internal.h | 29 +++++------------ + fs/erofs/namei.c | 14 ++++---- + fs/erofs/super.c | 77 ++++++++++++++++++++++++++++---------------- + fs/erofs/xattr.c | 40 +++++++++++------------ + fs/erofs/xattr.h | 10 +++--- + fs/erofs/zdata.c | 18 ++++++----- + fs/erofs/zmap.c | 29 +++++++++-------- + include/trace/events/erofs.h | 4 +-- + 15 files changed, 182 insertions(+), 162 deletions(-) +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 (fae0a2b2077c ext2: remove redundant assignment to pointer end) +$ git merge -m Merge branch 'for_next' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git ext3/for_next +Auto-merging fs/ext2/xattr.c +Merge made by the 'ort' strategy. + fs/ext2/ext2.h | 3 ++- + fs/ext2/super.c | 7 +++++++ + fs/ext2/xattr.c | 1 - + fs/quota/dquot.c | 24 ++---------------------- + fs/quota/quota_v1.c | 2 +- + fs/quota/quota_v2.c | 2 +- + fs/udf/inode.c | 10 +++++----- + fs/udf/truncate.c | 4 ++-- + 8 files changed, 20 insertions(+), 33 deletions(-) +Merging ext4/dev (da8c7d2105be ext4: convert some BUG_ON's in mballoc to use WARN_RATELIMITED instead) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev +Auto-merging fs/ext4/inode.c +Merge made by the 'ort' strategy. + fs/ext4/balloc.c | 124 ++++++------- + fs/ext4/bitmap.c | 8 +- + fs/ext4/ext4.h | 8 +- + fs/ext4/ialloc.c | 14 +- + fs/ext4/inode.c | 423 ++++++++++++++------------------------------ + fs/ext4/mballoc.c | 158 ++++++++--------- + fs/ext4/page-io.c | 10 +- + fs/ext4/resize.c | 7 +- + fs/ext4/super.c | 11 ++ + include/trace/events/ext4.h | 7 - + 10 files changed, 301 insertions(+), 469 deletions(-) +Merging f2fs/dev (d15180a8d1d7 f2fs: fix to handle filemap_fdatawrite() error in f2fs_ioc_decompress_file/f2fs_ioc_compress_file) +$ 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/ABI/testing/sysfs-fs-f2fs | 17 +++ + fs/f2fs/checkpoint.c | 4 +- + fs/f2fs/compress.c | 4 +- + fs/f2fs/data.c | 12 +- + fs/f2fs/debug.c | 36 ++--- + fs/f2fs/dir.c | 2 +- + fs/f2fs/extent_cache.c | 241 +++++++++--------------------- + fs/f2fs/f2fs.h | 71 +++------ + fs/f2fs/file.c | 31 ++-- + fs/f2fs/gc.c | 141 +++++++++++------- + fs/f2fs/gc.h | 14 +- + fs/f2fs/inode.c | 4 +- + fs/f2fs/node.h | 20 ++- + fs/f2fs/segment.c | 255 +++++++++++++++++++++----------- + fs/f2fs/super.c | 16 +- + fs/f2fs/sysfs.c | 20 ++- + include/linux/f2fs_fs.h | 9 +- + include/trace/events/f2fs.h | 2 +- + 18 files changed, 453 insertions(+), 446 deletions(-) +Merging fsverity/for-next (2da81b847943 fs-verity: simplify sysctls with register_sysctl()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity/for-next +Auto-merging fs/buffer.c +Merge made by the 'ort' strategy. + fs/buffer.c | 9 ++++----- + fs/verity/signature.c | 9 +-------- + 2 files changed, 5 insertions(+), 13 deletions(-) +Merging fuse/for-next (1cc4606d19e3 fuse: add inode/permission checks to fileattr_get/fileattr_set) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next +Already up to date. +Merging gfs2/for-next (c1b0c3cfcbad gfs2: Convert gfs2_page_add_databufs to folios) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next +Already up to date. +Merging jfs/jfs-next (fad376fce0af fs/jfs: fix shift exponent db_agl2size negative) +$ git merge -m Merge branch 'jfs-next' of git://github.com/kleikamp/linux-shaggy.git jfs/jfs-next +Already up to date. +Merging ksmbd/ksmbd-for-next (6686991cea8e ksmbd: set FILE_NAMED_STREAMS attribute in FS_ATTRIBUTE_INFORMATION) +$ 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/auth.c | 5 +++-- + fs/ksmbd/smb2pdu.c | 4 ++++ + 2 files changed, 7 insertions(+), 2 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 (21fd9e8700de NFS: Correct timing for assigning access cache timestamp) +$ 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 (3077f83bfb9e sunrpc: simplify two-level sysctl registration for svcrdma_parm_table) +$ git merge -m Merge branch 'nfsd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/nfsd-next +Merge made by the 'ort' strategy. + fs/lockd/Makefile | 6 +- + fs/lockd/clntlock.c | 58 +++--- + fs/lockd/clntproc.c | 42 +++- + fs/lockd/host.c | 1 + + fs/lockd/svclock.c | 21 +- + fs/lockd/trace.c | 3 + + fs/lockd/trace.h | 106 ++++++++++ + fs/nfs/export.c | 9 +- + fs/nfs/internal.h | 15 -- + fs/nfsd/export.c | 13 +- + fs/nfsd/filecache.c | 427 ++++++++++++++++---------------------- + fs/nfsd/filecache.h | 9 +- + fs/nfsd/nfs4idmap.c | 8 +- + include/linux/exportfs.h | 1 + + include/linux/lockd/lockd.h | 29 +-- + include/linux/nfs.h | 20 ++ + include/linux/sunrpc/cache.h | 15 +- + net/sunrpc/auth_gss/svcauth_gss.c | 12 +- + net/sunrpc/svcauth_unix.c | 12 +- + net/sunrpc/xprtrdma/svc_rdma.c | 21 +- + 20 files changed, 451 insertions(+), 377 deletions(-) + create mode 100644 fs/lockd/trace.c + create mode 100644 fs/lockd/trace.h +Merging ntfs3/master (2024476646ed fs/ntfs3: Fix root inode checking) +$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master +Auto-merging fs/ntfs3/file.c +CONFLICT (content): Merge conflict in fs/ntfs3/file.c +Auto-merging fs/ntfs3/inode.c +CONFLICT (content): Merge conflict in fs/ntfs3/inode.c +Auto-merging fs/ntfs3/namei.c +Auto-merging fs/ntfs3/ntfs_fs.h +CONFLICT (content): Merge conflict in fs/ntfs3/ntfs_fs.h +Auto-merging fs/ntfs3/xattr.c +CONFLICT (content): Merge conflict in fs/ntfs3/xattr.c +Resolved 'fs/ntfs3/file.c' using previous resolution. +Resolved 'fs/ntfs3/inode.c' using previous resolution. +Resolved 'fs/ntfs3/ntfs_fs.h' using previous resolution. +Resolved 'fs/ntfs3/xattr.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master b07fcaf25e38] Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/ntfs3.rst | 11 -- + fs/ntfs3/attrib.c | 17 +- + fs/ntfs3/bitmap.c | 25 +-- + fs/ntfs3/file.c | 50 +++--- + fs/ntfs3/frecord.c | 46 +++--- + fs/ntfs3/fslog.c | 83 +++++----- + fs/ntfs3/fsntfs.c | 84 +++++----- + fs/ntfs3/index.c | 81 +++++++--- + fs/ntfs3/inode.c | 134 +++++++++------- + fs/ntfs3/lznt.c | 10 +- + fs/ntfs3/namei.c | 19 ++- + fs/ntfs3/ntfs.h | 3 - + fs/ntfs3/ntfs_fs.h | 17 +- + fs/ntfs3/record.c | 15 +- + fs/ntfs3/run.c | 6 +- + fs/ntfs3/super.c | 312 +++++++++++++++++++++--------------- + fs/ntfs3/xattr.c | 70 +++----- + 17 files changed, 527 insertions(+), 456 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 (f773f0a331d6 ubi: Fix deadlock caused by recursively holding work_sem) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs/next +Merge made by the 'ort' strategy. + drivers/mtd/ubi/wl.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +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 (9d415a425340 fs/9p: Add new mount modes) +$ 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 +Merge made by the 'ort' strategy. + Documentation/filesystems/9p.rst | 2 + + fs/9p/v9fs.c | 47 +++++++++----- + fs/9p/v9fs.h | 8 ++- + fs/9p/v9fs_vfs.h | 4 -- + fs/9p/vfs_dir.c | 10 ++- + fs/9p/vfs_file.c | 131 ++++++--------------------------------- + fs/9p/vfs_inode.c | 41 ++++++------ + fs/9p/vfs_inode_dotl.c | 28 +++++++-- + fs/9p/vfs_super.c | 7 +-- + include/net/9p/9p.h | 6 ++ + net/9p/client.c | 8 +-- + 11 files changed, 122 insertions(+), 170 deletions(-) +Merging xfs/for-next (e9b60c7f9713 pcpcntr: remove percpu_counter_sum_all()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next +Auto-merging include/linux/cpumask.h +Auto-merging kernel/fork.c +Merge made by the 'ort' strategy. + fs/xfs/Makefile | 1 + + fs/xfs/libxfs/xfs_alloc.c | 36 ++- + fs/xfs/xfs_dahash_test.c | 662 +++++++++++++++++++++++++++++++++++++++++ + fs/xfs/xfs_dahash_test.h | 12 + + fs/xfs/xfs_super.c | 5 + + fs/xfs/xfs_trace.h | 7 + + include/linux/cpumask.h | 17 ++ + include/linux/find.h | 37 +++ + include/linux/percpu_counter.h | 6 - + kernel/fork.c | 5 - + lib/find_bit.c | 9 + + lib/percpu_counter.c | 37 +-- + 12 files changed, 799 insertions(+), 35 deletions(-) + create mode 100644 fs/xfs/xfs_dahash_test.c + create mode 100644 fs/xfs/xfs_dahash_test.h +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 (471859f57d42 iomap: Rename page_ops to folio_ops) +$ 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 (d291d1858419 Merge branch 'work.fd' 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 +Auto-merging fs/fuse/dev.c +Auto-merging fs/namespace.c +Auto-merging fs/ocfs2/aops.c +Auto-merging include/linux/pagemap.h +Merge made by the 'ort' strategy. + arch/nios2/include/asm/thread_info.h | 3 --- + arch/x86/kernel/cpu/sgx/main.c | 11 +++++----- + arch/x86/kvm/svm/sev.c | 26 ++++++++++++----------- + fs/direct-io.c | 9 ++------ + fs/fuse/dev.c | 41 ++++++++++++++++++------------------ + fs/namei.c | 4 ++-- + fs/namespace.c | 12 +++++------ + fs/nsfs.c | 18 ---------------- + fs/ocfs2/aops.c | 2 +- + fs/sysv/dir.c | 28 ++++++++++-------------- + fs/sysv/namei.c | 8 +++---- + fs/sysv/sysv.h | 1 - + include/linux/fs.h | 4 ++-- + include/linux/proc_ns.h | 1 - + kernel/bpf/bpf_inode_storage.c | 38 +++++++++++++-------------------- + kernel/cgroup/cgroup.c | 10 ++++----- + kernel/nsproxy.c | 17 +++++++-------- + net/core/net_namespace.c | 23 ++++++++++---------- + 18 files changed, 106 insertions(+), 150 deletions(-) +Merging printk/for-next (10d639febe56 Merge branch 'for-6.3' 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 (b0d4fc005ef2 Merge branch 'pci/controller/rcar') +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci/next +Merge made by the 'ort' strategy. + .../devicetree/bindings/pci/amlogic,axg-pcie.yaml | 134 +++++++++++++++++++++ + .../devicetree/bindings/pci/amlogic,meson-pcie.txt | 70 ----------- + drivers/firmware/efi/cper-arm.c | 1 - + drivers/pci/controller/dwc/Kconfig | 1 + + drivers/pci/controller/pcie-rcar-host.c | 4 +- + drivers/pci/controller/pcie-rcar.h | 2 +- + 6 files changed, 138 insertions(+), 74 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pci/amlogic,axg-pcie.yaml + delete mode 100644 Documentation/devicetree/bindings/pci/amlogic,meson-pcie.txt +Merging pstore/for-next/pstore (5239a89b06d6 pstore: Revert pmsg_lock back to a normal mutex) +$ git merge -m Merge branch 'for-next/pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git pstore/for-next/pstore +Merge made by the 'ort' strategy. + fs/pstore/pmsg.c | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) +Merging hid/for-next (1b9a2a53046a Merge branch 'for-6.3/upstream-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git hid/for-next +Merge made by the 'ort' strategy. + drivers/hid/Kconfig | 2 +- + drivers/hid/hid-apple.c | 16 +- + drivers/hid/hid-ids.h | 6 +- + drivers/hid/hid-input.c | 16 + + drivers/hid/hid-kye.c | 758 ++++++++++++++------------------------------- + drivers/hid/hid-nintendo.c | 95 +++++- + drivers/hid/hid-quirks.c | 6 +- + drivers/hid/hid-topre.c | 2 + + drivers/hid/wacom_wac.c | 26 ++ + drivers/hid/wacom_wac.h | 1 + + include/linux/hid.h | 1 + + 11 files changed, 379 insertions(+), 550 deletions(-) +Merging i2c/i2c/for-next (7618417929c1 Merge branch 'i2c/for-mergewindow' into i2c/for-next) +$ git merge -m Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/i2c/for-next +Merge made by the 'ort' strategy. + drivers/i2c/busses/Kconfig | 2 +- + drivers/i2c/busses/i2c-cadence.c | 7 +++---- + drivers/i2c/busses/i2c-cros-ec-tunnel.c | 4 ++-- + drivers/i2c/busses/i2c-davinci.c | 5 +---- + drivers/i2c/busses/i2c-hisi.c | 13 ++++++++++++- + drivers/i2c/busses/i2c-imx-lpi2c.c | 6 ++++++ + drivers/i2c/busses/i2c-imx.c | 12 +----------- + drivers/i2c/busses/i2c-mpc.c | 2 +- + drivers/i2c/busses/i2c-mt65xx.c | 2 +- + drivers/i2c/busses/i2c-mxs.c | 18 +++++++++++++----- + drivers/i2c/busses/i2c-owl.c | 2 +- + drivers/i2c/busses/i2c-pxa.c | 6 ++---- + drivers/i2c/busses/i2c-xgene-slimpro.c | 3 +++ + drivers/i2c/i2c-core-of.c | 2 +- + 14 files changed, 48 insertions(+), 36 deletions(-) +Merging i3c/i3c/next (2810f1de814a i3c: svc: Convert to platform remove callback returning void) +$ git merge -m Merge branch 'i3c/next' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c/i3c/next +Merge made by the 'ort' strategy. + drivers/i3c/master.c | 6 +----- + drivers/i3c/master/dw-i3c-master.c | 13 ++++--------- + drivers/i3c/master/i3c-master-cdns.c | 11 +++-------- + drivers/i3c/master/mipi-i3c-hci/core.c | 6 +++--- + drivers/i3c/master/svc-i3c-master.c | 11 +++-------- + include/linux/i3c/master.h | 5 +++-- + 6 files changed, 17 insertions(+), 35 deletions(-) +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 (593c9b978b96 hwmon: (pwm-fan) set usage_power on PWM state) +$ 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/aquacomputer_d5next.rst | 5 +- + Documentation/hwmon/ftsteutates.rst | 6 +- + Documentation/hwmon/hwmon-kernel-api.rst | 60 ++----- + Documentation/hwmon/sysfs-interface.rst | 2 +- + drivers/hwmon/aquacomputer_d5next.c | 183 +++++++++++++++---- + drivers/hwmon/g762.c | 7 +- + drivers/hwmon/gpio-fan.c | 2 +- + drivers/hwmon/ibmpowernv.c | 4 +- + drivers/hwmon/it87.c | 2 +- + drivers/hwmon/ltc4245.c | 2 +- + drivers/hwmon/nct6775-platform.c | 47 ++++- + drivers/hwmon/nzxt-smart2.c | 13 +- + drivers/hwmon/pmbus/pmbus.h | 2 +- + drivers/hwmon/pmbus/pmbus_core.c | 266 +++++++++++++++++++++------- + drivers/hwmon/pwm-fan.c | 10 +- + 15 files changed, 450 insertions(+), 161 deletions(-) +Merging jc_docs/docs-next (10d18135135c docs/mm: Physical Memory: add example of interleaving nodes) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/process/index.rst +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + CREDITS | 16 + + Documentation/admin-guide/kernel-parameters.txt | 74 ++-- + Documentation/admin-guide/unicode.rst | 9 +- + Documentation/filesystems/proc.rst | 44 +-- + Documentation/filesystems/vfs.rst | 105 +++++- + Documentation/mm/physical_memory.rst | 19 + + .../process/contribution-maturity-model.rst | 109 ++++++ + Documentation/process/index.rst | 1 + + Documentation/process/kernel-docs.rst | 36 +- + .../translations/sp_SP/process/deprecated.rst | 381 +++++++++++++++++++++ + Documentation/translations/sp_SP/process/index.rst | 1 + + MAINTAINERS | 19 +- + fs/qnx4/README | 9 - + fs/qnx6/README | 8 - + 14 files changed, 722 insertions(+), 109 deletions(-) + create mode 100644 Documentation/process/contribution-maturity-model.rst + create mode 100644 Documentation/translations/sp_SP/process/deprecated.rst + delete mode 100644 fs/qnx4/README + delete mode 100644 fs/qnx6/README +Merging v4l-dvb/master (eeac8ede1755 Linux 6.3-rc2) +$ 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 (71937240a472 media: ov2685: Select VIDEO_V4L2_SUBDEV_API) +$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/admin-guide/media/cec.rst | 70 +-- + .../bindings/media/amlogic,meson6-ir.yaml | 47 ++ + .../devicetree/bindings/media/exynos-fimc-lite.txt | 16 - + .../devicetree/bindings/media/exynos4-fimc-is.txt | 50 -- + .../bindings/media/i2c/samsung,s5k5baf.yaml | 101 ++++ + .../bindings/media/i2c/samsung,s5k6a3.yaml | 98 ++++ + .../devicetree/bindings/media/i2c/sony,imx290.yaml | 25 +- + .../devicetree/bindings/media/i2c/sony,imx334.yaml | 2 +- + .../devicetree/bindings/media/meson-ir.txt | 20 - + .../bindings/media/qcom,msm8916-venus.yaml | 86 +-- + .../bindings/media/qcom,msm8996-venus.yaml | 146 +++-- + .../bindings/media/qcom,sc7180-venus.yaml | 97 ++-- + .../bindings/media/qcom,sc7280-venus.yaml | 132 ++--- + .../bindings/media/qcom,sdm660-venus.yaml | 144 ++--- + .../bindings/media/qcom,sdm845-venus-v2.yaml | 108 ++-- + .../bindings/media/qcom,sdm845-venus.yaml | 104 ++-- + .../bindings/media/qcom,sm8250-venus.yaml | 122 ++--- + .../bindings/media/qcom,venus-common.yaml | 73 +++ + Documentation/devicetree/bindings/media/rc.yaml | 2 + + .../bindings/media/samsung,exynos4210-csis.yaml | 170 ++++++ + .../bindings/media/samsung,exynos4210-fimc.yaml | 152 ++++++ + .../bindings/media/samsung,exynos4212-fimc-is.yaml | 220 ++++++++ + .../media/samsung,exynos4212-fimc-lite.yaml | 63 +++ + .../devicetree/bindings/media/samsung,fimc.yaml | 279 ++++++++++ + .../devicetree/bindings/media/samsung,s5c73m3.yaml | 165 ++++++ + .../devicetree/bindings/media/samsung-fimc.txt | 209 -------- + .../bindings/media/samsung-mipi-csis.txt | 81 --- + .../devicetree/bindings/media/samsung-s5c73m3.txt | 97 ---- + .../devicetree/bindings/media/samsung-s5k5baf.txt | 58 -- + .../devicetree/bindings/media/samsung-s5k6a3.txt | 33 -- + Documentation/devicetree/bindings/media/si470x.txt | 26 - + .../devicetree/bindings/media/silabs,si470x.yaml | 48 ++ + .../devicetree/bindings/media/st,stm32-cec.yaml | 53 -- + .../userspace-api/media/v4l/dev-overlay.rst | 10 +- + .../userspace-api/media/v4l/vidioc-g-ext-ctrls.rst | 10 + + .../userspace-api/media/v4l/vidioc-g-fbuf.rst | 52 +- + .../media/v4l/vidioc-subdev-enum-frame-size.rst | 44 +- + .../media/v4l/vidioc-subdev-enum-mbus-code.rst | 39 +- + MAINTAINERS | 8 + + drivers/media/cec/platform/cros-ec/cros-ec-cec.c | 6 + + drivers/media/common/btcx-risc.h | 29 - + drivers/media/common/saa7146/saa7146_fops.c | 26 +- + drivers/media/common/saa7146/saa7146_hlp.c | 296 ---------- + drivers/media/common/saa7146/saa7146_video.c | 326 +---------- + drivers/media/common/videobuf2/videobuf2-v4l2.c | 5 +- + drivers/media/dvb-frontends/drx39xyj/drxj.c | 2 +- + drivers/media/dvb-frontends/drxk_hard.c | 2 +- + drivers/media/i2c/Kconfig | 1 + + drivers/media/i2c/imx258.c | 13 +- + drivers/media/i2c/imx290.c | 594 +++++++++++++++++---- + drivers/media/i2c/imx296.c | 11 +- + drivers/media/i2c/imx334.c | 322 ++++++++++- + drivers/media/i2c/max9286.c | 1 + + drivers/media/i2c/ov13b10.c | 75 ++- + drivers/media/i2c/ov2685.c | 78 ++- + drivers/media/i2c/ov5647.c | 56 +- + drivers/media/i2c/ov5670.c | 114 ++-- + drivers/media/i2c/st-vgxy61.c | 23 +- + drivers/media/i2c/tc358746.c | 4 +- + drivers/media/pci/bt8xx/Kconfig | 2 +- + drivers/media/pci/bt8xx/btcx-risc.c | 153 ------ + drivers/media/pci/bt8xx/btcx-risc.h | 9 - + drivers/media/pci/bt8xx/bttv-cards.c | 15 - + drivers/media/pci/bt8xx/bttv-driver.c | 436 +-------------- + drivers/media/pci/bt8xx/bttv-risc.c | 131 ----- + drivers/media/pci/bt8xx/bttvp.h | 28 +- + drivers/media/pci/cx18/Kconfig | 2 +- + drivers/media/pci/cx18/cx18-driver.c | 4 +- + drivers/media/pci/cx18/cx18-driver.h | 24 +- + drivers/media/pci/cx18/cx18-fileops.c | 85 +-- + drivers/media/pci/cx18/cx18-fileops.h | 3 +- + drivers/media/pci/cx18/cx18-ioctl.c | 391 ++++++-------- + drivers/media/pci/cx18/cx18-mailbox.c | 27 +- + drivers/media/pci/cx18/cx18-streams.c | 278 +++++----- + drivers/media/pci/cx23885/cx23885-core.c | 4 +- + drivers/media/pci/cx23885/cx23885-video.c | 13 +- + drivers/media/pci/saa7134/saa7134-cards.c | 1 - + drivers/media/pci/saa7134/saa7134-core.c | 32 -- + drivers/media/pci/saa7134/saa7134-video.c | 411 +------------- + drivers/media/pci/saa7134/saa7134.h | 13 - + drivers/media/pci/ttpci/budget-av.c | 1 + + drivers/media/pci/tw68/tw68-video.c | 16 +- + drivers/media/pci/zoran/zoran_device.h | 2 - + drivers/media/platform/amphion/vdec.c | 32 ++ + drivers/media/platform/amphion/vpu_codec.h | 3 +- + drivers/media/platform/amphion/vpu_malone.c | 4 +- + .../media/platform/mediatek/jpeg/mtk_jpeg_core.c | 2 +- + .../media/platform/mediatek/mdp3/mtk-mdp3-m2m.c | 8 +- + drivers/media/platform/nxp/dw100/dw100.c | 4 +- + drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c | 5 + + drivers/media/platform/renesas/rcar-isp.c | 5 +- + .../platform/samsung/exynos4-is/fimc-is-errno.c | 2 +- + .../platform/samsung/exynos4-is/fimc-is-errno.h | 2 +- + .../media/platform/samsung/exynos4-is/media-dev.c | 10 +- + drivers/media/platform/st/sti/bdisp/bdisp-v4l2.c | 2 + + drivers/media/platform/st/stm32/dma2d/dma2d.c | 5 +- + drivers/media/platform/st/stm32/dma2d/dma2d.h | 2 - + drivers/media/platform/st/stm32/stm32-dcmi.c | 1 + + drivers/media/platform/via/via-camera.c | 4 +- + drivers/media/rc/keymaps/Makefile | 2 + + drivers/media/rc/keymaps/rc-beelink-mxiii.c | 57 ++ + drivers/media/rc/keymaps/rc-dreambox.c | 151 ++++++ + drivers/media/test-drivers/vivid/vivid-core.c | 49 +- + drivers/media/test-drivers/vivid/vivid-core.h | 19 - + .../media/test-drivers/vivid/vivid-kthread-cap.c | 131 +---- + drivers/media/test-drivers/vivid/vivid-vid-cap.c | 272 ---------- + drivers/media/test-drivers/vivid/vivid-vid-cap.h | 3 - + drivers/media/test-drivers/vivid/vivid-vid-out.c | 74 --- + drivers/media/tuners/mxl5005s.c | 12 +- + drivers/media/usb/dvb-usb/pctv452e.c | 2 + + drivers/media/usb/pvrusb2/Kconfig | 2 +- + drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 85 +-- + drivers/media/v4l2-core/v4l2-dev.c | 5 +- + drivers/media/v4l2-core/v4l2-ioctl.c | 77 +-- + drivers/media/v4l2-core/v4l2-subdev.c | 45 +- + drivers/staging/media/av7110/av7110_av.c | 4 +- + drivers/staging/media/av7110/av7110_v4l.c | 17 +- + include/media/drv-intf/saa7146_vv.h | 21 - + include/media/dvb_net.h | 6 +- + include/media/rc-map.h | 2 + + include/media/tveeprom.h | 2 +- + include/media/v4l2-ctrls.h | 2 +- + include/media/v4l2-subdev.h | 32 +- + include/uapi/linux/videodev2.h | 2 + + 124 files changed, 3801 insertions(+), 4689 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/amlogic,meson6-ir.yaml + delete mode 100644 Documentation/devicetree/bindings/media/exynos-fimc-lite.txt + delete mode 100644 Documentation/devicetree/bindings/media/exynos4-fimc-is.txt + create mode 100644 Documentation/devicetree/bindings/media/i2c/samsung,s5k5baf.yaml + create mode 100644 Documentation/devicetree/bindings/media/i2c/samsung,s5k6a3.yaml + delete mode 100644 Documentation/devicetree/bindings/media/meson-ir.txt + create mode 100644 Documentation/devicetree/bindings/media/qcom,venus-common.yaml + create mode 100644 Documentation/devicetree/bindings/media/samsung,exynos4210-csis.yaml + create mode 100644 Documentation/devicetree/bindings/media/samsung,exynos4210-fimc.yaml + create mode 100644 Documentation/devicetree/bindings/media/samsung,exynos4212-fimc-is.yaml + create mode 100644 Documentation/devicetree/bindings/media/samsung,exynos4212-fimc-lite.yaml + create mode 100644 Documentation/devicetree/bindings/media/samsung,fimc.yaml + create mode 100644 Documentation/devicetree/bindings/media/samsung,s5c73m3.yaml + delete mode 100644 Documentation/devicetree/bindings/media/samsung-fimc.txt + delete mode 100644 Documentation/devicetree/bindings/media/samsung-mipi-csis.txt + delete mode 100644 Documentation/devicetree/bindings/media/samsung-s5c73m3.txt + delete mode 100644 Documentation/devicetree/bindings/media/samsung-s5k5baf.txt + delete mode 100644 Documentation/devicetree/bindings/media/samsung-s5k6a3.txt + delete mode 100644 Documentation/devicetree/bindings/media/si470x.txt + create mode 100644 Documentation/devicetree/bindings/media/silabs,si470x.yaml + delete mode 100644 Documentation/devicetree/bindings/media/st,stm32-cec.yaml + delete mode 100644 drivers/media/common/btcx-risc.h + create mode 100644 drivers/media/rc/keymaps/rc-beelink-mxiii.c + create mode 100644 drivers/media/rc/keymaps/rc-dreambox.c +Merging pm/linux-next (8e95155f8f29 Merge branches 'acpi-video' and 'acpi-resource' 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 +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging drivers/hwmon/hwmon.c +Auto-merging drivers/hwmon/pmbus/pmbus_core.c +Auto-merging drivers/net/ethernet/mellanox/mlxsw/core_thermal.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 40 +++-- + Documentation/admin-guide/pm/amd-pstate.rst | 31 +++- + drivers/acpi/cppc_acpi.c | 118 +++++++++++++- + drivers/acpi/resource.c | 7 + + drivers/acpi/thermal.c | 18 +-- + drivers/acpi/video_detect.c | 8 + + drivers/ata/ahci_imx.c | 2 +- + drivers/cpufreq/amd-pstate.c | 177 +++++++++++++++------ + drivers/cpufreq/intel_pstate.c | 11 +- + drivers/hwmon/hwmon.c | 4 +- + drivers/hwmon/pmbus/pmbus_core.c | 2 +- + drivers/hwmon/scmi-hwmon.c | 4 +- + drivers/hwmon/scpi-hwmon.c | 2 +- + drivers/iio/adc/sun4i-gpadc-iio.c | 2 +- + drivers/input/touchscreen/sun4i-ts.c | 2 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_thermal.c | 2 +- + drivers/net/ethernet/mellanox/mlxsw/core_thermal.c | 16 +- + drivers/net/wireless/intel/iwlwifi/mvm/tt.c | 4 +- + drivers/platform/x86/acerhdf.c | 19 +-- + drivers/power/supply/power_supply_core.c | 2 +- + drivers/regulator/max8973-regulator.c | 2 +- + drivers/thermal/amlogic_thermal.c | 4 +- + drivers/thermal/armada_thermal.c | 14 +- + drivers/thermal/broadcom/bcm2711_thermal.c | 3 +- + drivers/thermal/broadcom/bcm2835_thermal.c | 3 +- + drivers/thermal/broadcom/brcmstb_thermal.c | 8 +- + drivers/thermal/broadcom/ns-thermal.c | 2 +- + drivers/thermal/broadcom/sr-thermal.c | 2 +- + drivers/thermal/da9062-thermal.c | 13 +- + drivers/thermal/db8500_thermal.c | 2 +- + drivers/thermal/dove_thermal.c | 7 +- + drivers/thermal/hisi_thermal.c | 5 +- + drivers/thermal/imx8mm_thermal.c | 4 +- + drivers/thermal/imx_sc_thermal.c | 9 +- + drivers/thermal/imx_thermal.c | 47 ++---- + .../intel/int340x_thermal/int3400_thermal.c | 2 +- + .../intel/int340x_thermal/int340x_thermal_zone.c | 4 +- + .../int340x_thermal/processor_thermal_device_pci.c | 4 +- + drivers/thermal/intel/intel_pch_thermal.c | 2 +- + drivers/thermal/intel/intel_quark_dts_thermal.c | 6 +- + drivers/thermal/intel/intel_soc_dts_iosf.c | 13 +- + drivers/thermal/intel/x86_pkg_temp_thermal.c | 12 +- + drivers/thermal/k3_bandgap.c | 4 +- + drivers/thermal/k3_j72xx_bandgap.c | 2 +- + drivers/thermal/kirkwood_thermal.c | 7 +- + drivers/thermal/max77620_thermal.c | 6 +- + drivers/thermal/mediatek/auxadc_thermal.c | 4 +- + drivers/thermal/mediatek/lvts_thermal.c | 10 +- + drivers/thermal/qcom/qcom-spmi-adc-tm5.c | 6 +- + drivers/thermal/qcom/qcom-spmi-temp-alarm.c | 6 +- + drivers/thermal/qcom/tsens.c | 6 +- + drivers/thermal/qoriq_thermal.c | 4 +- + drivers/thermal/rcar_gen3_thermal.c | 5 +- + drivers/thermal/rcar_thermal.c | 8 +- + drivers/thermal/rockchip_thermal.c | 8 +- + drivers/thermal/rzg2l_thermal.c | 3 +- + drivers/thermal/samsung/exynos_tmu.c | 4 +- + drivers/thermal/spear_thermal.c | 10 +- + drivers/thermal/sprd_thermal.c | 2 +- + drivers/thermal/st/st_thermal.c | 5 +- + drivers/thermal/st/stm_thermal.c | 4 +- + drivers/thermal/sun8i_thermal.c | 4 +- + drivers/thermal/tegra/soctherm.c | 6 +- + drivers/thermal/tegra/tegra-bpmp-thermal.c | 6 +- + drivers/thermal/tegra/tegra30-tsensor.c | 31 ++-- + drivers/thermal/thermal-generic-adc.c | 7 +- + drivers/thermal/thermal_core.c | 18 +++ + drivers/thermal/thermal_helpers.c | 3 + + drivers/thermal/thermal_hwmon.c | 9 +- + drivers/thermal/thermal_hwmon.h | 4 +- + drivers/thermal/thermal_mmio.c | 2 +- + drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 10 +- + drivers/thermal/uniphier_thermal.c | 2 +- + include/acpi/cppc_acpi.h | 11 ++ + include/linux/amd-pstate.h | 2 + + include/linux/thermal.h | 19 +++ + 76 files changed, 539 insertions(+), 338 deletions(-) +Merging cpufreq-arm/cpufreq/arm/linux-next (b8f3a396a7ee cpufreq: Use of_property_present() for testing DT property presence) +$ 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. + .../bindings/cpufreq/cpufreq-qcom-hw.yaml | 1 + + drivers/cpufreq/cpufreq-dt-platdev.c | 2 +- + drivers/cpufreq/freq_table.c | 1 - + drivers/cpufreq/imx-cpufreq-dt.c | 2 +- + drivers/cpufreq/imx6q-cpufreq.c | 4 +-- + drivers/cpufreq/qcom-cpufreq-hw.c | 29 +++++----------------- + drivers/cpufreq/scmi-cpufreq.c | 2 +- + drivers/cpufreq/tegra124-cpufreq.c | 1 - + drivers/cpufreq/tegra20-cpufreq.c | 2 +- + 9 files changed, 13 insertions(+), 31 deletions(-) +Merging cpupower/cpupower (fe15c26ee26e Linux 6.3-rc1) +$ git merge -m Merge branch 'cpupower' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git cpupower/cpupower +Already up to date. +Merging devfreq/devfreq-next (b7405e3f62d6 PM / devfreq: exynos: Use of_property_present() for testing DT property presence) +$ git merge -m Merge branch 'devfreq-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git devfreq/devfreq-next +Merge made by the 'ort' strategy. + drivers/devfreq/Kconfig | 1 - + drivers/devfreq/exynos-bus.c | 4 ++-- + 2 files changed, 2 insertions(+), 3 deletions(-) +Merging opp/opp/linux-next (e9eadc282719 opp: Use of_property_present() for testing DT property presence) +$ 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 +Merge made by the 'ort' strategy. + drivers/opp/of.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging thermal/thermal/linux-next (6828e402d06f thermal/drivers/st: Remove syscfg based driver) +$ 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 (1361737f102d fs: dlm: switch lkb_sbflags to atomic ops) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm/next +Merge made by the 'ort' strategy. + fs/dlm/Kconfig | 9 - + fs/dlm/Makefile | 1 - + fs/dlm/ast.c | 11 +- + fs/dlm/config.c | 21 -- + fs/dlm/config.h | 3 - + fs/dlm/debug_fs.c | 8 +- + fs/dlm/dlm_internal.h | 154 +++++++---- + fs/dlm/lock.c | 531 ++++++++++++-------------------------- + fs/dlm/lock.h | 17 -- + fs/dlm/lockspace.c | 29 +-- + fs/dlm/lowcomms.c | 6 +- + fs/dlm/main.c | 9 +- + fs/dlm/memory.c | 2 +- + fs/dlm/netlink.c | 139 ---------- + fs/dlm/rcom.c | 2 +- + fs/dlm/recover.c | 2 +- + fs/dlm/recoverd.c | 2 - + fs/dlm/user.c | 34 +-- + include/linux/dlm.h | 3 - + include/trace/events/dlm.h | 12 +- + include/uapi/linux/dlm.h | 1 + + include/uapi/linux/dlm_netlink.h | 60 ----- + include/uapi/linux/dlmconstants.h | 5 +- + 23 files changed, 298 insertions(+), 763 deletions(-) + delete mode 100644 fs/dlm/netlink.c + delete mode 100644 include/uapi/linux/dlm_netlink.h +Merging rdma/for-next (f2f6e1661d38 IB/rdmavt: Fix target union member for rvt_post_one_wr()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma/for-next +Merge made by the 'ort' strategy. + drivers/infiniband/hw/hfi1/ipoib_tx.c | 5 ++++- + drivers/infiniband/sw/rdmavt/qp.c | 2 +- + drivers/infiniband/sw/siw/siw_qp_tx.c | 2 +- + 3 files changed, 6 insertions(+), 3 deletions(-) +Merging net-next/main (c8384d4a51e7 net: pasemi: Fix return type of pasemi_mac_start_tx()) +$ 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 Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml +Auto-merging MAINTAINERS +Auto-merging arch/mips/Kconfig +Auto-merging drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +Auto-merging drivers/net/ethernet/intel/igb/igb_main.c +Auto-merging drivers/net/ethernet/intel/igc/igc_main.c +Auto-merging drivers/net/mdio/of_mdio.c +Auto-merging drivers/net/phy/sfp.c +Auto-merging fs/dlm/lowcomms.c +Auto-merging kernel/bpf/bpf_inode_storage.c +Auto-merging net/mac80211/ieee80211_i.h +Auto-merging tools/lib/bpf/libbpf.c +Auto-merging tools/lib/bpf/usdt.c +Auto-merging tools/testing/selftests/bpf/progs/find_vma_fail1.c +Merge made by the 'ort' strategy. + Documentation/PCI/pci-error-recovery.rst | 1 - + Documentation/bpf/bpf_design_QA.rst | 4 +- + Documentation/bpf/bpf_devel_QA.rst | 14 +- + Documentation/bpf/cpumasks.rst | 4 +- + Documentation/bpf/instruction-set.rst | 40 +- + Documentation/bpf/kfuncs.rst | 41 +- + Documentation/bpf/maps.rst | 7 +- + .../bindings/arm/mediatek/mediatek,sgmiisys.txt | 27 - + .../bindings/net/dsa/mediatek,mt7530.yaml | 6 +- + .../devicetree/bindings/net/mediatek,net.yaml | 53 +- + .../bindings/net/pcs/mediatek,sgmiisys.yaml | 55 + + .../devicetree/bindings/net/qcom,ipa.yaml | 1 + + .../bindings/net/ti,k3-am654-cpsw-nuss.yaml | 24 +- + Documentation/netlink/genetlink-c.yaml | 2 +- + Documentation/netlink/genetlink-legacy.yaml | 2 +- + Documentation/netlink/genetlink.yaml | 3 + + Documentation/netlink/specs/devlink.yaml | 198 ++ + .../networking/device_drivers/ethernet/index.rst | 1 - + .../device_drivers/ethernet/intel/ixgb.rst | 468 ---- + .../ethernet/mellanox/mlx5/devlink.rst | 35 + + Documentation/networking/devlink/mlx5.rst | 12 + + MAINTAINERS | 9 +- + arch/loongarch/configs/loongson3_defconfig | 1 - + arch/loongarch/net/bpf_jit.c | 6 + + arch/mips/Kconfig | 5 +- + arch/mips/configs/loongson2k_defconfig | 1 - + arch/mips/configs/loongson3_defconfig | 1 - + arch/mips/configs/mtx1_defconfig | 1 - + arch/mips/net/bpf_jit_comp.c | 4 + + arch/mips/net/bpf_jit_comp64.c | 3 + + arch/powerpc/configs/powernv_defconfig | 1 - + arch/powerpc/configs/ppc64_defconfig | 1 - + arch/powerpc/configs/ppc64e_defconfig | 1 - + arch/powerpc/configs/ppc6xx_defconfig | 1 - + arch/powerpc/configs/pseries_defconfig | 1 - + arch/powerpc/configs/skiroot_defconfig | 1 - + arch/riscv/net/bpf_jit_comp64.c | 5 + + drivers/mfd/ocelot-core.c | 13 + + drivers/net/dsa/Kconfig | 1 + + drivers/net/dsa/b53/b53_common.c | 46 + + drivers/net/dsa/b53/b53_priv.h | 1 + + drivers/net/dsa/hirschmann/hellcreek_ptp.c | 45 +- + drivers/net/dsa/lan9303_i2c.c | 2 +- + drivers/net/dsa/lan9303_mdio.c | 2 +- + drivers/net/dsa/lantiq_gswip.c | 2 +- + drivers/net/dsa/microchip/ksz9477_i2c.c | 2 +- + drivers/net/dsa/microchip/ksz_common.c | 238 +- + drivers/net/dsa/microchip/ksz_common.h | 18 +- + drivers/net/dsa/mt7530.c | 277 +-- + drivers/net/dsa/mt7530.h | 47 +- + drivers/net/dsa/mv88e6xxx/chip.c | 383 ++-- + drivers/net/dsa/mv88e6xxx/global2.c | 20 +- + drivers/net/dsa/ocelot/felix.c | 19 + + drivers/net/dsa/ocelot/felix.h | 7 + + drivers/net/dsa/ocelot/ocelot_ext.c | 18 +- + drivers/net/dsa/ocelot/seville_vsc9953.c | 2 +- + drivers/net/dsa/qca/qca8k-8xxx.c | 1 - + drivers/net/dsa/realtek/rtl8365mb.c | 40 +- + drivers/net/ethernet/Kconfig | 2 +- + drivers/net/ethernet/atheros/alx/main.c | 4 - + drivers/net/ethernet/broadcom/bnx2.c | 21 - + drivers/net/ethernet/broadcom/bnx2.h | 1 - + drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 1 - + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 19 - + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 4 - + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 2 +- + drivers/net/ethernet/cadence/macb.h | 2 + + drivers/net/ethernet/cadence/macb_main.c | 24 +- + drivers/net/ethernet/chelsio/cxgb3/sge.c | 5 - + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 4 - + drivers/net/ethernet/emulex/benet/be_cmds.c | 27 +- + drivers/net/ethernet/emulex/benet/be_main.c | 8 - + drivers/net/ethernet/fungible/funcore/fun_dev.c | 5 - + drivers/net/ethernet/google/gve/gve.h | 112 +- + drivers/net/ethernet/google/gve/gve_adminq.c | 8 +- + drivers/net/ethernet/google/gve/gve_adminq.h | 4 +- + drivers/net/ethernet/google/gve/gve_ethtool.c | 91 +- + drivers/net/ethernet/google/gve/gve_main.c | 719 +++++- + drivers/net/ethernet/google/gve/gve_rx.c | 147 +- + drivers/net/ethernet/google/gve/gve_rx_dqo.c | 2 +- + drivers/net/ethernet/google/gve/gve_tx.c | 298 ++- + drivers/net/ethernet/google/gve/gve_utils.c | 6 +- + drivers/net/ethernet/google/gve/gve_utils.h | 3 +- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 1 - + drivers/net/ethernet/intel/Kconfig | 17 - + drivers/net/ethernet/intel/Makefile | 1 - + drivers/net/ethernet/intel/e1000e/netdev.c | 1 - + drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 1 - + drivers/net/ethernet/intel/i40e/i40e.h | 1 - + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 7 + + drivers/net/ethernet/intel/i40e/i40e_main.c | 88 +- + drivers/net/ethernet/intel/i40e/i40e_trace.h | 20 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 420 ++-- + drivers/net/ethernet/intel/i40e/i40e_txrx.h | 20 +- + drivers/net/ethernet/intel/iavf/iavf.h | 1 - + drivers/net/ethernet/intel/ice/ice.h | 1 - + drivers/net/ethernet/intel/ice/ice_main.c | 12 +- + drivers/net/ethernet/intel/ice/ice_sriov.c | 77 +- + drivers/net/ethernet/intel/ice/ice_sriov.h | 15 - + drivers/net/ethernet/intel/ice/ice_type.h | 17 +- + drivers/net/ethernet/intel/ice/ice_vf_lib.c | 15 +- + drivers/net/ethernet/intel/ice/ice_vf_lib.h | 2 +- + drivers/net/ethernet/intel/ice/ice_vf_mbx.c | 249 +-- + drivers/net/ethernet/intel/ice/ice_vf_mbx.h | 17 +- + drivers/net/ethernet/intel/ice/ice_virtchnl.c | 49 +- + drivers/net/ethernet/intel/ice/ice_virtchnl.h | 8 + + drivers/net/ethernet/intel/igb/igb_main.c | 1 - + drivers/net/ethernet/intel/igc/igc.h | 4 +- + drivers/net/ethernet/intel/igc/igc_ethtool.c | 1 + + drivers/net/ethernet/intel/igc/igc_hw.h | 1 + + drivers/net/ethernet/intel/igc/igc_main.c | 52 +- + drivers/net/ethernet/intel/igc/igc_tsn.c | 12 + + drivers/net/ethernet/intel/ixgb/Makefile | 9 - + drivers/net/ethernet/intel/ixgb/ixgb.h | 179 -- + drivers/net/ethernet/intel/ixgb/ixgb_ee.c | 580 ----- + drivers/net/ethernet/intel/ixgb/ixgb_ee.h | 79 - + drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c | 642 ------ + drivers/net/ethernet/intel/ixgb/ixgb_hw.c | 1229 ----------- + drivers/net/ethernet/intel/ixgb/ixgb_hw.h | 767 ------- + drivers/net/ethernet/intel/ixgb/ixgb_ids.h | 23 - + drivers/net/ethernet/intel/ixgb/ixgb_main.c | 2285 ------------------- + drivers/net/ethernet/intel/ixgb/ixgb_osdep.h | 39 - + drivers/net/ethernet/intel/ixgb/ixgb_param.c | 442 ---- + drivers/net/ethernet/intel/ixgbe/ixgbe.h | 1 - + drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 24 +- + .../net/ethernet/marvell/octeon_ep/octep_main.c | 4 - + drivers/net/ethernet/marvell/pxa168_eth.c | 2 +- + drivers/net/ethernet/mediatek/Kconfig | 2 + + drivers/net/ethernet/mediatek/Makefile | 2 +- + drivers/net/ethernet/mediatek/mtk_eth_path.c | 14 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 192 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.h | 118 +- + drivers/net/ethernet/mediatek/mtk_ppe.c | 114 +- + drivers/net/ethernet/mediatek/mtk_ppe.h | 25 +- + drivers/net/ethernet/mediatek/mtk_ppe_debugfs.c | 9 +- + drivers/net/ethernet/mediatek/mtk_ppe_offload.c | 8 + + drivers/net/ethernet/mediatek/mtk_ppe_regs.h | 14 + + drivers/net/ethernet/mediatek/mtk_sgmii.c | 207 -- + drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/Makefile | 1 + + drivers/net/ethernet/mellanox/mlx5/core/devlink.c | 71 + + drivers/net/ethernet/mellanox/mlx5/core/devlink.h | 2 + + drivers/net/ethernet/mellanox/mlx5/core/en.h | 17 +- + .../net/ethernet/mellanox/mlx5/core/en/params.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en/port.c | 157 +- + drivers/net/ethernet/mellanox/mlx5/core/en/port.h | 14 - + .../net/ethernet/mellanox/mlx5/core/en/rep/tc.c | 63 +- + .../ethernet/mellanox/mlx5/core/en/reporter_rx.c | 50 +- + .../ethernet/mellanox/mlx5/core/en/reporter_tx.c | 46 + + .../ethernet/mellanox/mlx5/core/en/tc/act/mirred.c | 6 +- + .../net/ethernet/mellanox/mlx5/core/en/tc_tun.h | 3 + + .../ethernet/mellanox/mlx5/core/en/tc_tun_encap.c | 32 + + .../ethernet/mellanox/mlx5/core/en/tc_tun_geneve.c | 24 +- + .../ethernet/mellanox/mlx5/core/en/tc_tun_vxlan.c | 72 +- + drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h | 2 +- + .../net/ethernet/mellanox/mlx5/core/en/xsk/setup.c | 10 +- + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 12 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 58 +- + drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/health.c | 4 + + drivers/net/ethernet/mellanox/mlx5/core/main.c | 8 +- + drivers/net/ethernet/mellanox/mlx5/core/port.c | 151 ++ + drivers/net/ethernet/mellanox/mlx5/core/thermal.c | 108 + + drivers/net/ethernet/mellanox/mlx5/core/thermal.h | 20 + + drivers/net/ethernet/microchip/lan966x/Kconfig | 1 - + .../net/ethernet/microchip/lan966x/lan966x_fdma.c | 2 +- + .../net/ethernet/microchip/lan966x/lan966x_main.c | 76 +- + .../net/ethernet/microchip/lan966x/lan966x_main.h | 43 +- + .../ethernet/microchip/lan966x/lan966x_police.c | 13 +- + .../net/ethernet/microchip/lan966x/lan966x_ptp.c | 20 +- + .../net/ethernet/microchip/lan966x/lan966x_regs.h | 36 + + .../ethernet/microchip/lan966x/lan966x_tc_flower.c | 221 +- + .../microchip/lan966x/lan966x_vcap_ag_api.c | 1402 +++++++++++- + .../microchip/lan966x/lan966x_vcap_debugfs.c | 133 +- + .../ethernet/microchip/lan966x/lan966x_vcap_impl.c | 192 +- + .../net/ethernet/microchip/sparx5/sparx5_main.c | 1 + + .../net/ethernet/microchip/sparx5/sparx5_main.h | 1 + + .../ethernet/microchip/sparx5/sparx5_tc_flower.c | 209 +- + .../microchip/sparx5/sparx5_vcap_debugfs.c | 2 +- + .../ethernet/microchip/sparx5/sparx5_vcap_impl.c | 270 +++ + .../ethernet/microchip/sparx5/sparx5_vcap_impl.h | 6 + + drivers/net/ethernet/microchip/vcap/vcap_ag_api.h | 217 +- + drivers/net/ethernet/microchip/vcap/vcap_api.c | 61 + + .../net/ethernet/microchip/vcap/vcap_api_client.h | 11 + + .../microchip/vcap/vcap_api_debugfs_kunit.c | 4 +- + drivers/net/ethernet/microsoft/mana/mana_en.c | 62 +- + drivers/net/ethernet/microsoft/mana/mana_ethtool.c | 52 +- + drivers/net/ethernet/mscc/ocelot.c | 97 + + drivers/net/ethernet/mscc/ocelot_net.c | 50 +- + drivers/net/ethernet/mscc/ocelot_vsc7514.c | 30 - + .../net/ethernet/netronome/nfp/flower/conntrack.c | 260 ++- + .../net/ethernet/netronome/nfp/flower/conntrack.h | 32 +- + .../net/ethernet/netronome/nfp/flower/offload.c | 2 +- + drivers/net/ethernet/ni/nixge.c | 2 +- + drivers/net/ethernet/pasemi/pasemi_mac.c | 2 +- + drivers/net/ethernet/qlogic/netxen/netxen_nic.h | 2 +- + .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 10 +- + drivers/net/ethernet/qlogic/qed/qed_main.c | 9 - + drivers/net/ethernet/qlogic/qede/qede.h | 2 - + drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 1 - + drivers/net/ethernet/qlogic/qede/qede_main.c | 1 - + .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 1 - + drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 4 - + drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c | 1 - + drivers/net/ethernet/realtek/r8169_main.c | 187 +- + drivers/net/ethernet/renesas/ravb_main.c | 15 - + .../net/ethernet/samsung/sxgbe/sxgbe_platform.c | 2 +- + drivers/net/ethernet/sfc/ef100.c | 3 - + drivers/net/ethernet/sfc/efx.c | 5 - + drivers/net/ethernet/sfc/falcon/efx.c | 9 - + drivers/net/ethernet/sfc/mae.c | 16 + + drivers/net/ethernet/sfc/mcdi.h | 5 + + drivers/net/ethernet/sfc/siena/efx.c | 5 - + drivers/net/ethernet/sfc/tc.c | 42 + + drivers/net/ethernet/sfc/tc.h | 4 + + drivers/net/ethernet/smsc/smc91x.c | 2 +- + .../net/ethernet/stmicro/stmmac/dwmac-generic.c | 2 +- + .../ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 2 +- + drivers/net/ethernet/ti/am65-cpsw-nuss.c | 10 +- + drivers/net/ethernet/wangxun/libwx/wx_hw.c | 21 +- + drivers/net/ethernet/wangxun/libwx/wx_hw.h | 1 + + drivers/net/ethernet/wangxun/libwx/wx_type.h | 7 +- + drivers/net/ethernet/wangxun/ngbe/ngbe_main.c | 9 +- + drivers/net/ethernet/wangxun/ngbe/ngbe_type.h | 1 - + drivers/net/ethernet/wangxun/txgbe/txgbe_main.c | 10 +- + drivers/net/ethernet/wangxun/txgbe/txgbe_type.h | 1 - + drivers/net/geneve.c | 11 +- + drivers/net/ieee802154/adf7242.c | 3 +- + drivers/net/ieee802154/at86rf230.c | 2 +- + drivers/net/ieee802154/ca8210.c | 3 +- + drivers/net/ieee802154/mcr20a.c | 2 +- + drivers/net/mdio/of_mdio.c | 4 +- + drivers/net/pcs/Kconfig | 7 + + drivers/net/pcs/Makefile | 1 + + drivers/net/pcs/pcs-lynx.c | 4 +- + drivers/net/pcs/pcs-mtk-lynxi.c | 305 +++ + drivers/net/pcs/pcs-xpcs.c | 13 +- + drivers/net/phy/Kconfig | 1 + + drivers/net/phy/at803x.c | 3 +- + drivers/net/phy/dp83867.c | 28 +- + drivers/net/phy/meson-gxl.c | 77 +- + drivers/net/phy/micrel.c | 397 +++- + drivers/net/phy/mxl-gpy.c | 35 +- + drivers/net/phy/phy_device.c | 4 +- + drivers/net/phy/sfp.c | 48 +- + drivers/net/phy/smsc.c | 53 +- + drivers/net/phy/spi_ks8995.c | 2 +- + drivers/net/tap.c | 15 +- + drivers/net/tun.c | 2 + + drivers/net/virtio_net.c | 6 +- + drivers/net/vxlan/Makefile | 2 +- + drivers/net/vxlan/vxlan_core.c | 109 +- + drivers/net/vxlan/vxlan_mdb.c | 1462 ++++++++++++ + drivers/net/vxlan/vxlan_private.h | 84 + + .../wireless/broadcom/brcm80211/brcmfmac/Makefile | 2 + + .../wireless/broadcom/brcm80211/brcmfmac/acpi.c | 51 + + .../net/wireless/broadcom/brcm80211/brcmfmac/bus.h | 1 + + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 324 ++- + .../wireless/broadcom/brcm80211/brcmfmac/chip.c | 25 +- + .../wireless/broadcom/brcm80211/brcmfmac/common.c | 118 +- + .../wireless/broadcom/brcm80211/brcmfmac/common.h | 11 + + .../wireless/broadcom/brcm80211/brcmfmac/feature.c | 49 + + .../wireless/broadcom/brcm80211/brcmfmac/feature.h | 6 +- + .../broadcom/brcm80211/brcmfmac/fwil_types.h | 157 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/of.c | 9 +- + .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 61 +- + .../broadcom/brcm80211/include/brcm_hw_ids.h | 2 + + drivers/net/wireless/intel/iwlwifi/cfg/22000.c | 12 + + drivers/net/wireless/intel/iwlwifi/fw/api/rs.h | 27 +- + drivers/net/wireless/intel/iwlwifi/fw/api/rx.h | 86 +- + drivers/net/wireless/intel/iwlwifi/fw/rs.c | 4 +- + drivers/net/wireless/intel/iwlwifi/iwl-config.h | 1 + + drivers/net/wireless/intel/iwlwifi/iwl-csr.h | 1 + + drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c | 26 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 5 + + drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 10 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 30 +- + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 5 + + drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c | 8 +- + drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 17 +- + drivers/net/wireless/intel/iwlwifi/mvm/rx.c | 8 +- + drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 601 ++++- + drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 7 +- + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 5 + + .../net/wireless/intel/iwlwifi/pcie/trans-gen2.c | 5 +- + drivers/net/wireless/mac80211_hwsim.c | 56 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c | 12 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 6 +- + .../net/wireless/realtek/rtlwifi/rtl8192ce/hw.c | 25 +- + .../net/wireless/realtek/rtlwifi/rtl8192de/hw.c | 6 - + .../net/wireless/realtek/rtlwifi/rtl8192se/hw.c | 9 - + drivers/net/wireless/realtek/rtw88/mac.c | 17 +- + drivers/net/wireless/realtek/rtw88/rtw8821c.c | 9 + + drivers/net/wireless/realtek/rtw88/rtw8821c.h | 6 + + drivers/net/wireless/realtek/rtw88/rtw8822b.c | 9 + + drivers/net/wireless/realtek/rtw88/rtw8822b.h | 8 +- + drivers/net/wireless/realtek/rtw88/rtw8822c.c | 9 + + drivers/net/wireless/realtek/rtw88/rtw8822c.h | 8 +- + drivers/net/wireless/realtek/rtw89/core.c | 35 +- + drivers/net/wireless/realtek/rtw89/core.h | 2 +- + drivers/net/wireless/realtek/rtw89/fw.c | 143 +- + drivers/net/wireless/realtek/rtw89/fw.h | 7 + + drivers/net/wireless/realtek/rtw89/mac.c | 2 +- + drivers/net/wireless/realtek/rtw89/mac80211.c | 2 +- + drivers/net/wireless/realtek/rtw89/phy.c | 72 + + drivers/net/wireless/realtek/rtw89/phy.h | 3 + + drivers/net/wireless/realtek/rtw89/rtw8852b.c | 12 +- + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 74 +- + drivers/net/wireless/realtek/rtw89/ser.c | 5 + + drivers/net/wireless/silabs/wfx/main.c | 10 +- + drivers/net/wwan/iosm/iosm_ipc_port.c | 3 +- + drivers/net/wwan/mhi_wwan_ctrl.c | 2 +- + drivers/net/wwan/rpmsg_wwan_ctrl.c | 2 +- + drivers/net/wwan/t7xx/t7xx_port_wwan.c | 36 +- + drivers/net/wwan/wwan_core.c | 58 +- + drivers/net/wwan/wwan_hwsim.c | 2 +- + drivers/nfc/nfcmrvl/i2c.c | 2 +- + drivers/nfc/nfcmrvl/main.c | 6 +- + drivers/nfc/nfcmrvl/nfcmrvl.h | 30 +- + drivers/nfc/nfcmrvl/uart.c | 11 +- + drivers/nfc/trf7970a.c | 2 +- + drivers/phy/mscc/phy-ocelot-serdes.c | 9 + + drivers/ptp/ptp_ines.c | 2 +- + drivers/ptp/ptp_kvm_arm.c | 4 + + drivers/ptp/ptp_kvm_common.c | 1 + + drivers/ptp/ptp_kvm_x86.c | 59 +- + drivers/ptp/ptp_ocp.c | 1 + + drivers/s390/net/ism_drv.c | 8 +- + drivers/usb/class/cdc-wdm.c | 3 +- + fs/dlm/lowcomms.c | 7 +- + include/linux/bpf.h | 105 +- + include/linux/bpf_local_storage.h | 1 + + include/linux/bpf_mem_alloc.h | 7 + + include/linux/bpf_verifier.h | 4 - + include/linux/btf.h | 2 +- + include/linux/btf_ids.h | 2 +- + include/linux/dccp.h | 6 +- + include/linux/filter.h | 46 + + include/linux/igmp.h | 2 +- + include/linux/ipv6.h | 5 +- + include/linux/mlx5/device.h | 6 + + include/linux/mlx5/driver.h | 3 + + include/linux/mlx5/mlx5_ifc.h | 39 +- + include/linux/mlx5/port.h | 16 + + include/linux/netdevice.h | 39 +- + include/linux/netfilter_ipv6.h | 2 + + include/linux/netlink.h | 1 - + include/linux/pcs/pcs-mtk-lynxi.h | 13 + + include/linux/phy.h | 5 +- + include/linux/platform_data/nfcmrvl.h | 48 - + include/linux/ptp_kvm.h | 1 + + include/linux/skbuff.h | 2 - + include/linux/smscphy.h | 6 + + include/linux/tcp.h | 10 +- + include/linux/udp.h | 5 +- + include/linux/wwan.h | 11 + + include/net/addrconf.h | 2 +- + include/net/af_unix.h | 6 +- + include/net/ax25.h | 5 +- + include/net/cfg80211.h | 36 +- + include/net/ieee80211_radiotap.h | 215 +- + include/net/inet_sock.h | 5 +- + include/net/ip_tunnels.h | 11 +- + include/net/mac80211.h | 92 +- + include/net/mana/mana.h | 18 + + include/net/neighbour.h | 4 +- + include/net/pkt_sched.h | 1 - + include/net/raw.h | 7 +- + include/net/rawv6.h | 2 +- + include/net/scm.h | 13 +- + include/net/sctp/stream_sched.h | 2 + + include/net/sctp/structs.h | 8 + + include/net/smc.h | 1 + + include/net/tcp.h | 2 +- + include/net/vxlan.h | 25 + + include/net/x25.h | 5 +- + include/net/xdp_sock.h | 1 + + include/soc/mscc/ocelot.h | 9 + + include/trace/events/sock.h | 4 +- + include/trace/events/tcp.h | 2 +- + include/uapi/linux/bpf.h | 33 +- + include/uapi/linux/if_bridge.h | 10 + + include/uapi/linux/netfilter/nf_tables.h | 2 + + include/uapi/linux/nl80211.h | 37 +- + include/uapi/linux/sctp.h | 4 +- + include/uapi/linux/virtio_net.h | 1 + + io_uring/rsrc.c | 3 +- + kernel/bpf/arraymap.c | 28 + + kernel/bpf/bloom_filter.c | 12 + + kernel/bpf/bpf_cgrp_storage.c | 1 + + kernel/bpf/bpf_inode_storage.c | 1 + + kernel/bpf/bpf_local_storage.c | 95 +- + kernel/bpf/bpf_struct_ops.c | 16 + + kernel/bpf/bpf_task_storage.c | 1 + + kernel/bpf/btf.c | 42 +- + kernel/bpf/cgroup.c | 53 +- + kernel/bpf/cpumap.c | 10 + + kernel/bpf/cpumask.c | 46 +- + kernel/bpf/devmap.c | 26 +- + kernel/bpf/hashtab.c | 102 +- + kernel/bpf/helpers.c | 257 ++- + kernel/bpf/local_storage.c | 7 + + kernel/bpf/lpm_trie.c | 11 + + kernel/bpf/offload.c | 6 + + kernel/bpf/queue_stack_maps.c | 10 + + kernel/bpf/reuseport_array.c | 8 + + kernel/bpf/ringbuf.c | 20 +- + kernel/bpf/stackmap.c | 14 + + kernel/bpf/syscall.c | 28 +- + kernel/bpf/verifier.c | 963 +++++--- + kernel/trace/bpf_trace.c | 4 - + lib/packing.c | 1 - + net/8021q/vlan_dev.c | 2 +- + net/atm/signaling.c | 2 +- + net/bpf/test_run.c | 3 +- + net/bridge/br_arp_nd_proxy.c | 4 +- + net/bridge/br_device.c | 3 + + net/bridge/br_mdb.c | 219 +- + net/bridge/br_netfilter_hooks.c | 3 +- + net/bridge/br_netfilter_ipv6.c | 79 +- + net/bridge/br_netlink.c | 3 - + net/bridge/br_private.h | 22 +- + net/bridge/netfilter/nft_meta_bridge.c | 71 +- + net/core/bpf_sk_storage.c | 1 + + net/core/dev.c | 20 +- + net/core/filter.c | 197 +- + net/core/neighbour.c | 59 +- + net/core/rtnetlink.c | 218 ++ + net/core/skbuff.c | 8 +- + net/core/sock_map.c | 20 + + net/dccp/ipv4.c | 12 +- + net/dccp/ipv6.c | 11 +- + net/dccp/timer.c | 2 +- + net/ipv4/af_inet.c | 2 +- + net/ipv4/arp.c | 8 +- + net/ipv4/fib_semantics.c | 4 +- + net/ipv4/igmp.c | 4 +- + net/ipv4/ip_output.c | 7 +- + net/ipv4/nexthop.c | 4 +- + net/ipv4/raw.c | 4 +- + net/ipv4/raw_diag.c | 2 +- + net/ipv4/route.c | 2 +- + net/ipv4/tcp.c | 13 +- + net/ipv4/tcp_input.c | 12 +- + net/ipv4/tcp_ipv4.c | 10 +- + net/ipv4/tcp_minisocks.c | 5 +- + net/ipv4/tcp_output.c | 11 +- + net/ipv4/tcp_recovery.c | 2 +- + net/ipv4/tcp_timer.c | 6 +- + net/ipv4/udp.c | 31 +- + net/ipv6/af_inet6.c | 2 +- + net/ipv6/inet6_connection_sock.c | 2 +- + net/ipv6/ip6_output.c | 4 +- + net/ipv6/mcast.c | 8 +- + net/ipv6/ndisc.c | 4 +- + net/ipv6/ping.c | 2 +- + net/ipv6/raw.c | 2 +- + net/ipv6/route.c | 10 +- + net/ipv6/tcp_ipv6.c | 15 +- + net/ipv6/udp.c | 6 +- + net/mac80211/agg-tx.c | 17 + + net/mac80211/cfg.c | 46 +- + net/mac80211/debugfs_netdev.c | 223 +- + net/mac80211/debugfs_netdev.h | 16 + + net/mac80211/driver-ops.c | 25 +- + net/mac80211/driver-ops.h | 16 + + net/mac80211/ieee80211_i.h | 4 + + net/mac80211/link.c | 5 + + net/mac80211/mlme.c | 6 +- + net/mac80211/rx.c | 93 +- + net/mac80211/scan.c | 8 +- + net/mac80211/tx.c | 10 + + net/mctp/af_mctp.c | 1 - + net/mptcp/pm_netlink.c | 2 +- + net/mptcp/protocol.c | 10 +- + net/mptcp/protocol.h | 9 +- + net/mptcp/sockopt.c | 2 +- + net/mptcp/subflow.c | 4 +- + net/netfilter/nf_conntrack_core.c | 2 +- + net/netfilter/nf_conntrack_ovs.c | 11 +- + net/netfilter/nf_nat_core.c | 4 +- + net/netfilter/utils.c | 52 + + net/netlink/af_netlink.c | 2 - + net/netlink/af_netlink.h | 1 - + net/packet/af_packet.c | 112 +- + net/packet/diag.c | 12 +- + net/packet/internal.h | 37 +- + net/sched/sch_api.c | 6 +- + net/sctp/Makefile | 3 +- + net/sctp/input.c | 2 +- + net/sctp/ipv6.c | 2 +- + net/sctp/stream_sched.c | 2 + + net/sctp/stream_sched_fc.c | 225 ++ + net/smc/smc.h | 5 +- + net/smc/smc_core.h | 10 +- + net/smc/smc_ism.c | 2 +- + net/smc/smc_wr.c | 35 +- + net/smc/smc_wr.h | 5 +- + net/socket.c | 2 +- + net/unix/af_unix.c | 9 +- + net/unix/garbage.c | 2 +- + net/unix/scm.c | 6 + + net/wireless/mlme.c | 55 +- + net/wireless/nl80211.c | 78 +- + net/wireless/rdev-ops.h | 17 + + net/wireless/scan.c | 38 +- + net/wireless/trace.h | 36 +- + net/xdp/xskmap.c | 13 + + security/lsm_audit.c | 6 +- + tools/arch/arm64/include/uapi/asm/bpf_perf_event.h | 9 - + tools/arch/s390/include/uapi/asm/bpf_perf_event.h | 9 - + tools/arch/s390/include/uapi/asm/ptrace.h | 458 ---- + tools/bpf/bpftool/json_writer.c | 3 - + tools/bpf/resolve_btfids/.gitignore | 1 + + tools/include/uapi/linux/bpf.h | 33 +- + tools/lib/bpf/Build | 2 +- + tools/lib/bpf/bpf.h | 69 +- + tools/lib/bpf/bpf_helpers.h | 2 +- + tools/lib/bpf/bpf_tracing.h | 3 + + tools/lib/bpf/btf.c | 2 - + tools/lib/bpf/libbpf.c | 197 +- + tools/lib/bpf/libbpf.h | 50 +- + tools/lib/bpf/linker.c | 11 +- + tools/lib/bpf/netlink.c | 8 +- + tools/lib/bpf/relo_core.c | 3 - + tools/lib/bpf/usdt.c | 196 +- + tools/lib/bpf/zip.c | 327 +++ + tools/lib/bpf/zip.h | 47 + + tools/scripts/Makefile.include | 2 + + tools/testing/selftests/bpf/DENYLIST.s390x | 2 + + tools/testing/selftests/bpf/Makefile | 7 +- + tools/testing/selftests/bpf/bpf_kfuncs.h | 38 + + tools/testing/selftests/bpf/disasm.c | 1 + + tools/testing/selftests/bpf/disasm.h | 1 + + tools/testing/selftests/bpf/prog_tests/align.c | 18 +- + .../selftests/bpf/prog_tests/attach_probe.c | 291 ++- + .../testing/selftests/bpf/prog_tests/cgrp_kfunc.c | 1 + + .../selftests/bpf/prog_tests/cgrp_local_storage.c | 14 +- + .../selftests/bpf/prog_tests/cls_redirect.c | 25 + + .../testing/selftests/bpf/prog_tests/ctx_rewrite.c | 917 ++++++++ + .../selftests/bpf/prog_tests/decap_sanity.c | 16 +- + tools/testing/selftests/bpf/prog_tests/dynptr.c | 74 +- + tools/testing/selftests/bpf/prog_tests/empty_skb.c | 25 +- + .../testing/selftests/bpf/prog_tests/fib_lookup.c | 28 +- + .../selftests/bpf/prog_tests/flow_dissector.c | 24 + + tools/testing/selftests/bpf/prog_tests/l4lb_all.c | 2 + + tools/testing/selftests/bpf/prog_tests/log_fixup.c | 2 +- + tools/testing/selftests/bpf/prog_tests/map_kptr.c | 136 +- + tools/testing/selftests/bpf/prog_tests/mptcp.c | 19 +- + .../selftests/bpf/prog_tests/parse_tcp_hdr_opt.c | 93 + + .../selftests/bpf/prog_tests/rcu_read_lock.c | 16 +- + .../testing/selftests/bpf/prog_tests/tc_redirect.c | 100 +- + tools/testing/selftests/bpf/prog_tests/test_ima.c | 29 +- + .../testing/selftests/bpf/prog_tests/test_tunnel.c | 71 +- + tools/testing/selftests/bpf/prog_tests/timer.c | 3 + + .../selftests/bpf/prog_tests/user_ringbuf.c | 2 +- + .../testing/selftests/bpf/prog_tests/xdp_attach.c | 11 +- + .../testing/selftests/bpf/prog_tests/xdp_bonding.c | 40 +- + .../selftests/bpf/prog_tests/xdp_do_redirect.c | 30 +- + .../selftests/bpf/prog_tests/xdp_metadata.c | 23 +- + .../selftests/bpf/prog_tests/xdp_synproxy.c | 41 +- + tools/testing/selftests/bpf/prog_tests/xfrm_info.c | 67 +- + tools/testing/selftests/bpf/progs/bpf_flow.c | 2 +- + tools/testing/selftests/bpf/progs/bpf_misc.h | 23 + + tools/testing/selftests/bpf/progs/cb_refs.c | 2 +- + .../selftests/bpf/progs/cgrp_kfunc_common.h | 3 +- + .../selftests/bpf/progs/cgrp_kfunc_failure.c | 2 +- + .../selftests/bpf/progs/cgrp_kfunc_success.c | 54 +- + .../selftests/bpf/progs/cgrp_ls_sleepable.c | 4 +- + tools/testing/selftests/bpf/progs/cpumask_common.h | 2 +- + .../testing/selftests/bpf/progs/cpumask_failure.c | 2 +- + tools/testing/selftests/bpf/progs/dynptr_fail.c | 287 ++- + tools/testing/selftests/bpf/progs/dynptr_success.c | 55 +- + tools/testing/selftests/bpf/progs/find_vma_fail1.c | 2 +- + tools/testing/selftests/bpf/progs/jit_probe_mem.c | 2 +- + tools/testing/selftests/bpf/progs/lru_bug.c | 2 +- + tools/testing/selftests/bpf/progs/map_kptr.c | 360 ++- + tools/testing/selftests/bpf/progs/map_kptr_fail.c | 10 +- + .../selftests/bpf/progs/nested_trust_failure.c | 2 +- + tools/testing/selftests/bpf/progs/rbtree.c | 2 +- + tools/testing/selftests/bpf/progs/rbtree_fail.c | 7 +- + tools/testing/selftests/bpf/progs/rcu_read_lock.c | 6 +- + .../selftests/bpf/progs/rcu_tasks_trace_gp.c | 36 + + .../selftests/bpf/progs/task_kfunc_common.h | 2 +- + .../bpf/progs/test_attach_kprobe_sleepable.c | 23 + + .../selftests/bpf/progs/test_attach_probe.c | 35 +- + .../selftests/bpf/progs/test_attach_probe_manual.c | 53 + + .../selftests/bpf/progs/test_cls_redirect_dynptr.c | 980 +++++++++ + .../selftests/bpf/progs/test_kfunc_dynptr_param.c | 2 +- + .../bpf/progs/test_l4lb_noinline_dynptr.c | 487 ++++ + .../selftests/bpf/progs/test_parse_tcp_hdr_opt.c | 119 + + .../bpf/progs/test_parse_tcp_hdr_opt_dynptr.c | 114 + + .../selftests/bpf/progs/test_sk_lookup_kern.c | 2 +- + .../testing/selftests/bpf/progs/test_tunnel_kern.c | 10 +- + .../testing/selftests/bpf/progs/test_xdp_dynptr.c | 257 +++ + tools/testing/selftests/bpf/progs/timer.c | 45 + + .../selftests/bpf/progs/user_ringbuf_success.c | 2 +- + tools/testing/selftests/bpf/test_loader.c | 69 +- + tools/testing/selftests/bpf/test_progs.h | 16 + + tools/testing/selftests/bpf/test_tcp_hdr_options.h | 1 + + tools/testing/selftests/bpf/test_verifier.c | 22 +- + tools/testing/selftests/bpf/verifier/calls.c | 4 +- + tools/testing/selftests/bpf/verifier/ctx.c | 11 - + tools/testing/selftests/bpf/verifier/map_kptr.c | 2 +- + tools/testing/selftests/bpf/verifier/unpriv.c | 23 + + tools/testing/selftests/net/Makefile | 2 + + tools/testing/selftests/net/big_tcp.sh | 180 ++ + tools/testing/selftests/net/config | 1 + + tools/testing/selftests/net/test_vxlan_mdb.sh | 2318 ++++++++++++++++++++ + .../tc-testing/tc-tests/infra/actions.json | 416 ++++ + 612 files changed, 24029 insertions(+), 12637 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,sgmiisys.txt + create mode 100644 Documentation/devicetree/bindings/net/pcs/mediatek,sgmiisys.yaml + create mode 100644 Documentation/netlink/specs/devlink.yaml + delete mode 100644 Documentation/networking/device_drivers/ethernet/intel/ixgb.rst + delete mode 100644 drivers/net/ethernet/intel/ixgb/Makefile + delete mode 100644 drivers/net/ethernet/intel/ixgb/ixgb.h + delete mode 100644 drivers/net/ethernet/intel/ixgb/ixgb_ee.c + delete mode 100644 drivers/net/ethernet/intel/ixgb/ixgb_ee.h + delete mode 100644 drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c + delete mode 100644 drivers/net/ethernet/intel/ixgb/ixgb_hw.c + delete mode 100644 drivers/net/ethernet/intel/ixgb/ixgb_hw.h + delete mode 100644 drivers/net/ethernet/intel/ixgb/ixgb_ids.h + delete mode 100644 drivers/net/ethernet/intel/ixgb/ixgb_main.c + delete mode 100644 drivers/net/ethernet/intel/ixgb/ixgb_osdep.h + delete mode 100644 drivers/net/ethernet/intel/ixgb/ixgb_param.c + delete mode 100644 drivers/net/ethernet/mediatek/mtk_sgmii.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/thermal.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/thermal.h + create mode 100644 drivers/net/pcs/pcs-mtk-lynxi.c + create mode 100644 drivers/net/vxlan/vxlan_mdb.c + create mode 100644 drivers/net/wireless/broadcom/brcm80211/brcmfmac/acpi.c + create mode 100644 include/linux/pcs/pcs-mtk-lynxi.h + delete mode 100644 include/linux/platform_data/nfcmrvl.h + create mode 100644 net/sctp/stream_sched_fc.c + delete mode 100644 tools/arch/arm64/include/uapi/asm/bpf_perf_event.h + delete mode 100644 tools/arch/s390/include/uapi/asm/bpf_perf_event.h + delete mode 100644 tools/arch/s390/include/uapi/asm/ptrace.h + create mode 100644 tools/lib/bpf/zip.c + create mode 100644 tools/lib/bpf/zip.h + create mode 100644 tools/testing/selftests/bpf/bpf_kfuncs.h + create mode 120000 tools/testing/selftests/bpf/disasm.c + create mode 120000 tools/testing/selftests/bpf/disasm.h + create mode 100644 tools/testing/selftests/bpf/prog_tests/ctx_rewrite.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/parse_tcp_hdr_opt.c + create mode 100644 tools/testing/selftests/bpf/progs/rcu_tasks_trace_gp.c + create mode 100644 tools/testing/selftests/bpf/progs/test_attach_kprobe_sleepable.c + create mode 100644 tools/testing/selftests/bpf/progs/test_attach_probe_manual.c + create mode 100644 tools/testing/selftests/bpf/progs/test_cls_redirect_dynptr.c + create mode 100644 tools/testing/selftests/bpf/progs/test_l4lb_noinline_dynptr.c + create mode 100644 tools/testing/selftests/bpf/progs/test_parse_tcp_hdr_opt.c + create mode 100644 tools/testing/selftests/bpf/progs/test_parse_tcp_hdr_opt_dynptr.c + create mode 100644 tools/testing/selftests/bpf/progs/test_xdp_dynptr.c + create mode 100755 tools/testing/selftests/net/big_tcp.sh + create mode 100755 tools/testing/selftests/net/test_vxlan_mdb.sh + create mode 100644 tools/testing/selftests/tc-testing/tc-tests/infra/actions.json +Merging bpf-next/for-next (6a9f5cdba3c5 Merge branch 'net: skbuff: skb bitfield compaction - bpf') +$ 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 Documentation/bpf/bpf_devel_QA.rst +CONFLICT (content): Merge conflict in Documentation/bpf/bpf_devel_QA.rst +Auto-merging include/linux/sched.h +Auto-merging include/net/xdp.h +Auto-merging kernel/bpf/bpf_inode_storage.c +Auto-merging kernel/bpf/btf.c +Auto-merging kernel/cgroup/cgroup.c +Auto-merging net/bpf/test_run.c +Auto-merging net/core/filter.c +Auto-merging net/core/xdp.c +Auto-merging tools/lib/bpf/libbpf.c +Auto-merging tools/testing/selftests/bpf/prog_tests/xdp_do_redirect.c +Resolved 'Documentation/bpf/bpf_devel_QA.rst' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 008384c6dea0] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git +$ git diff -M --stat --summary HEAD^.. + Documentation/bpf/bpf_devel_QA.rst | 20 +- + Documentation/bpf/clang-notes.rst | 6 + + Documentation/bpf/cpumasks.rst | 30 +- + Documentation/bpf/instruction-set.rst | 20 +- + Documentation/bpf/libbpf/index.rst | 25 +- + Documentation/bpf/libbpf/libbpf_overview.rst | 228 ++++++ + Documentation/bpf/linux-notes.rst | 8 + + include/linux/bpf.h | 17 +- + include/linux/bpf_local_storage.h | 12 +- + include/linux/bpf_verifier.h | 31 +- + include/linux/btf.h | 6 +- + include/linux/module.h | 8 + + include/linux/sched.h | 7 +- + include/linux/skbuff.h | 40 +- + include/net/xdp.h | 29 - + include/uapi/linux/bpf.h | 18 +- + kernel/bpf/bpf_cgrp_storage.c | 11 +- + kernel/bpf/bpf_inode_storage.c | 10 +- + kernel/bpf/bpf_iter.c | 70 ++ + kernel/bpf/bpf_local_storage.c | 202 +++-- + kernel/bpf/bpf_task_storage.c | 11 +- + kernel/bpf/btf.c | 153 +++- + kernel/bpf/cpumask.c | 38 +- + kernel/bpf/helpers.c | 16 +- + kernel/bpf/syscall.c | 30 +- + kernel/bpf/trampoline.c | 28 - + kernel/bpf/verifier.c | 815 +++++++++++++++++++-- + kernel/cgroup/cgroup.c | 14 +- + kernel/module/internal.h | 1 - + net/bpf/test_run.c | 17 +- + net/core/bpf_sk_storage.c | 12 +- + net/core/filter.c | 8 +- + net/core/xdp.c | 19 +- + samples/bpf/cpustat_kern.c | 4 +- + samples/bpf/hbm.c | 4 +- + samples/bpf/ibumad_kern.c | 4 +- + samples/bpf/lwt_len_hist.sh | 2 +- + samples/bpf/offwaketime_kern.c | 2 +- + samples/bpf/task_fd_query_user.c | 4 +- + samples/bpf/test_lwt_bpf.sh | 2 +- + samples/bpf/test_overhead_tp.bpf.c | 4 +- + tools/include/uapi/linux/bpf.h | 18 +- + tools/lib/bpf/bpf_helpers.h | 5 + + tools/lib/bpf/gen_loader.c | 10 +- + tools/lib/bpf/libbpf.c | 20 +- + tools/lib/bpf/zip.c | 6 + + tools/testing/selftests/bpf/DENYLIST.aarch64 | 1 + + tools/testing/selftests/bpf/DENYLIST.s390x | 1 + + tools/testing/selftests/bpf/Makefile | 10 +- + tools/testing/selftests/bpf/bench.c | 2 + + .../bpf/benchs/bench_local_storage_create.c | 141 ++++ + .../selftests/bpf/bpf_testmod/bpf_testmod.c | 48 +- + .../selftests/bpf/bpf_testmod/bpf_testmod.h | 6 + + tools/testing/selftests/bpf/get_cgroup_id_user.c | 9 +- + tools/testing/selftests/bpf/json_writer.c | 1 + + tools/testing/selftests/bpf/json_writer.h | 1 + + tools/testing/selftests/bpf/network_helpers.c | 2 +- + .../selftests/bpf/prog_tests/bpf_verif_scale.c | 6 + + tools/testing/selftests/bpf/prog_tests/cpumask.c | 2 +- + .../testing/selftests/bpf/prog_tests/ctx_rewrite.c | 14 +- + .../testing/selftests/bpf/prog_tests/fib_lookup.c | 12 +- + tools/testing/selftests/bpf/prog_tests/iters.c | 106 +++ + .../selftests/bpf/prog_tests/kprobe_multi_test.c | 7 +- + .../selftests/bpf/prog_tests/local_kptr_stash.c | 60 ++ + .../bpf/prog_tests/module_fentry_shadow.c | 128 ++++ + .../testing/selftests/bpf/prog_tests/send_signal.c | 6 +- + .../selftests/bpf/prog_tests/task_fd_query_tp.c | 9 +- + .../selftests/bpf/prog_tests/tcp_hdr_options.c | 4 +- + .../selftests/bpf/prog_tests/test_local_storage.c | 47 +- + .../selftests/bpf/prog_tests/tp_attach_query.c | 9 +- + .../selftests/bpf/prog_tests/trace_printk.c | 10 +- + .../selftests/bpf/prog_tests/trace_vprintk.c | 10 +- + .../selftests/bpf/prog_tests/uprobe_autoattach.c | 1 - + .../selftests/bpf/prog_tests/xdp_do_redirect.c | 7 +- + .../bpf/progs/bench_local_storage_create.c | 57 ++ + tools/testing/selftests/bpf/progs/bpf_iter_ksym.c | 1 - + .../selftests/bpf/progs/bpf_iter_setsockopt.c | 1 - + tools/testing/selftests/bpf/progs/bpf_loop.c | 2 - + tools/testing/selftests/bpf/progs/bpf_misc.h | 106 +++ + tools/testing/selftests/bpf/progs/cb_refs.c | 1 - + .../bpf/progs/cgroup_skb_sk_lookup_kern.c | 1 - + .../selftests/bpf/progs/cgrp_kfunc_failure.c | 1 + + .../selftests/bpf/progs/cgrp_ls_attach_cgroup.c | 1 - + .../selftests/bpf/progs/cgrp_ls_sleepable.c | 1 - + tools/testing/selftests/bpf/progs/connect4_prog.c | 2 +- + tools/testing/selftests/bpf/progs/core_kern.c | 2 +- + tools/testing/selftests/bpf/progs/cpumask_common.h | 7 +- + .../testing/selftests/bpf/progs/cpumask_failure.c | 71 +- + .../testing/selftests/bpf/progs/cpumask_success.c | 30 +- + tools/testing/selftests/bpf/progs/dynptr_fail.c | 5 +- + tools/testing/selftests/bpf/progs/dynptr_success.c | 5 +- + tools/testing/selftests/bpf/progs/fexit_bpf2bpf.c | 2 - + .../selftests/bpf/progs/freplace_attach_probe.c | 2 +- + tools/testing/selftests/bpf/progs/iters.c | 719 ++++++++++++++++++ + tools/testing/selftests/bpf/progs/iters_looping.c | 163 +++++ + tools/testing/selftests/bpf/progs/iters_num.c | 242 ++++++ + .../selftests/bpf/progs/iters_state_safety.c | 426 +++++++++++ + .../selftests/bpf/progs/iters_testmod_seq.c | 79 ++ + tools/testing/selftests/bpf/progs/linked_funcs1.c | 3 + + tools/testing/selftests/bpf/progs/linked_funcs2.c | 3 + + tools/testing/selftests/bpf/progs/linked_list.c | 4 - + .../testing/selftests/bpf/progs/linked_list_fail.c | 1 - + .../testing/selftests/bpf/progs/local_kptr_stash.c | 108 +++ + tools/testing/selftests/bpf/progs/local_storage.c | 30 +- + tools/testing/selftests/bpf/progs/loop6.c | 3 + + tools/testing/selftests/bpf/progs/lsm.c | 4 +- + tools/testing/selftests/bpf/progs/map_kptr.c | 3 - + tools/testing/selftests/bpf/progs/netcnt_prog.c | 1 - + .../selftests/bpf/progs/netif_receive_skb.c | 1 - + tools/testing/selftests/bpf/progs/perfbuf_bench.c | 1 - + tools/testing/selftests/bpf/progs/pyperf.h | 16 +- + tools/testing/selftests/bpf/progs/pyperf600_iter.c | 7 + + .../selftests/bpf/progs/pyperf600_nounroll.c | 3 - + .../bpf/progs/rbtree_btf_fail__wrong_node_type.c | 11 - + tools/testing/selftests/bpf/progs/rbtree_fail.c | 3 +- + tools/testing/selftests/bpf/progs/rcu_read_lock.c | 4 - + .../bpf/progs/read_bpf_task_storage_busy.c | 1 - + tools/testing/selftests/bpf/progs/recvmsg4_prog.c | 2 - + tools/testing/selftests/bpf/progs/recvmsg6_prog.c | 2 - + tools/testing/selftests/bpf/progs/sendmsg4_prog.c | 2 - + .../selftests/bpf/progs/sockmap_verdict_prog.c | 4 + + tools/testing/selftests/bpf/progs/strobemeta.h | 1 - + .../selftests/bpf/progs/tailcall_bpf2bpf3.c | 11 + + .../selftests/bpf/progs/tailcall_bpf2bpf6.c | 3 + + .../selftests/bpf/progs/task_kfunc_failure.c | 37 + + .../selftests/bpf/progs/task_kfunc_success.c | 30 +- + tools/testing/selftests/bpf/progs/test_bpf_nf.c | 1 - + .../selftests/bpf/progs/test_cls_redirect_dynptr.c | 1 - + .../bpf/progs/test_core_reloc_bitfields_probed.c | 1 - + .../selftests/bpf/progs/test_global_func1.c | 4 + + .../selftests/bpf/progs/test_global_func2.c | 4 + + .../selftests/bpf/progs/test_hash_large_key.c | 2 +- + .../bpf/progs/test_ksyms_btf_write_check.c | 1 - + .../testing/selftests/bpf/progs/test_ksyms_weak.c | 2 +- + .../selftests/bpf/progs/test_legacy_printk.c | 2 +- + tools/testing/selftests/bpf/progs/test_map_lock.c | 2 +- + tools/testing/selftests/bpf/progs/test_obj_id.c | 2 + + .../selftests/bpf/progs/test_parse_tcp_hdr_opt.c | 1 - + .../bpf/progs/test_parse_tcp_hdr_opt_dynptr.c | 2 +- + .../testing/selftests/bpf/progs/test_pkt_access.c | 5 + + tools/testing/selftests/bpf/progs/test_ringbuf.c | 1 - + .../selftests/bpf/progs/test_ringbuf_map_key.c | 1 + + .../selftests/bpf/progs/test_ringbuf_multi.c | 1 - + .../bpf/progs/test_select_reuseport_kern.c | 2 +- + tools/testing/selftests/bpf/progs/test_sk_assign.c | 4 +- + tools/testing/selftests/bpf/progs/test_sk_lookup.c | 9 +- + .../selftests/bpf/progs/test_sk_lookup_kern.c | 2 - + .../testing/selftests/bpf/progs/test_sock_fields.c | 2 +- + .../selftests/bpf/progs/test_sockmap_kern.h | 14 +- + tools/testing/selftests/bpf/progs/test_spin_lock.c | 3 + + .../selftests/bpf/progs/test_stacktrace_map.c | 2 +- + tools/testing/selftests/bpf/progs/test_tc_dtime.c | 4 +- + tools/testing/selftests/bpf/progs/test_tc_neigh.c | 4 +- + .../testing/selftests/bpf/progs/test_tcpbpf_kern.c | 2 - + .../testing/selftests/bpf/progs/test_tracepoint.c | 2 +- + .../testing/selftests/bpf/progs/test_tunnel_kern.c | 6 - + .../selftests/bpf/progs/test_usdt_multispec.c | 2 - + .../selftests/bpf/progs/test_verif_scale1.c | 2 +- + .../selftests/bpf/progs/test_verif_scale2.c | 2 +- + .../selftests/bpf/progs/test_verif_scale3.c | 2 +- + .../bpf/progs/test_xdp_adjust_tail_grow.c | 2 - + .../testing/selftests/bpf/progs/test_xdp_bpf2bpf.c | 2 - + .../selftests/bpf/progs/test_xdp_do_redirect.c | 38 +- + .../testing/selftests/bpf/progs/test_xdp_dynptr.c | 2 - + .../selftests/bpf/progs/test_xdp_noinline.c | 43 -- + tools/testing/selftests/bpf/progs/test_xdp_vlan.c | 13 - + tools/testing/selftests/bpf/progs/type_cast.c | 1 - + tools/testing/selftests/bpf/progs/udp_limit.c | 2 - + .../selftests/bpf/progs/user_ringbuf_success.c | 6 - + tools/testing/selftests/bpf/progs/xdp_features.c | 1 - + tools/testing/selftests/bpf/progs/xdping_kern.c | 2 - + tools/testing/selftests/bpf/progs/xdpwall.c | 1 - + tools/testing/selftests/bpf/test_ftrace.sh | 7 +- + tools/testing/selftests/bpf/test_progs.c | 83 ++- + tools/testing/selftests/bpf/test_progs.h | 1 + + tools/testing/selftests/bpf/test_tunnel.sh | 13 +- + tools/testing/selftests/bpf/trace_helpers.c | 8 +- + tools/testing/selftests/bpf/xdp_features.c | 67 +- + 178 files changed, 4507 insertions(+), 813 deletions(-) + create mode 100644 Documentation/bpf/libbpf/libbpf_overview.rst + create mode 100644 tools/testing/selftests/bpf/benchs/bench_local_storage_create.c + create mode 120000 tools/testing/selftests/bpf/json_writer.c + create mode 120000 tools/testing/selftests/bpf/json_writer.h + create mode 100644 tools/testing/selftests/bpf/prog_tests/iters.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/local_kptr_stash.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/module_fentry_shadow.c + create mode 100644 tools/testing/selftests/bpf/progs/bench_local_storage_create.c + create mode 100644 tools/testing/selftests/bpf/progs/iters.c + create mode 100644 tools/testing/selftests/bpf/progs/iters_looping.c + create mode 100644 tools/testing/selftests/bpf/progs/iters_num.c + create mode 100644 tools/testing/selftests/bpf/progs/iters_state_safety.c + create mode 100644 tools/testing/selftests/bpf/progs/iters_testmod_seq.c + create mode 100644 tools/testing/selftests/bpf/progs/local_kptr_stash.c + create mode 100644 tools/testing/selftests/bpf/progs/pyperf600_iter.c +$ git am -3 ../patches/0001-bpf-test_run-fix-up-for-bpf-test_run-fix-xdp_frame-m.patch +Applying: bpf, test_run: fix up for "bpf, test_run: fix &xdp_frame misplacement for LIVE_FRAMES" +$ git reset HEAD^ +Unstaged changes after reset: +M net/bpf/test_run.c +$ git add -A . +$ git commit -v -a --amend +[master 8bfdb64dac0d] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git + Date: Wed Mar 22 09:01:38 2023 +1100 +Merging ipsec-next/master (f4796398f21b xfrm: Remove inner/outer modes from output path) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git ipsec-next/master +Merge made by the 'ort' strategy. + net/xfrm/xfrm_input.c | 66 ++++++++++++++++++-------------------------------- + net/xfrm/xfrm_output.c | 33 +++++++++---------------- + 2 files changed, 34 insertions(+), 65 deletions(-) +Merging mlx5-next/mlx5-next (22551e77e550 net/mlx5: Configure IPsec steering for egress RoCEv2 traffic) +$ 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 (d4671cb96fa3 Merge branch 'lan966x-tx-rx-improve') +$ 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 (3e662aa4453a Bluetooth: NXP: Add protocol support for NXP Bluetooth chipsets) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master +Auto-merging MAINTAINERS +Auto-merging drivers/tty/serdev/core.c +Auto-merging net/bluetooth/hidp/core.c +Merge made by the 'ort' strategy. + .../bindings/net/bluetooth/nxp,88w8987-bt.yaml | 45 + + .../devicetree/bindings/net/marvell-bluetooth.yaml | 20 +- + .../devicetree/bindings/net/realtek-bluetooth.yaml | 24 +- + MAINTAINERS | 7 + + .../boot/dts/rockchip/rk3566-anbernic-rgxx3.dtsi | 2 +- + drivers/bluetooth/Kconfig | 12 + + drivers/bluetooth/Makefile | 1 + + drivers/bluetooth/btbcm.c | 2 +- + drivers/bluetooth/btintel.c | 51 +- + drivers/bluetooth/btintel.h | 7 - + drivers/bluetooth/btmrvl_sdio.c | 2 +- + drivers/bluetooth/btmtkuart.c | 6 +- + drivers/bluetooth/btnxpuart.c | 1297 ++++++++++++++++++++ + drivers/bluetooth/btqcomsmd.c | 17 +- + drivers/bluetooth/btrtl.c | 138 ++- + drivers/bluetooth/btrtl.h | 5 + + drivers/bluetooth/btsdio.c | 2 + + drivers/bluetooth/btusb.c | 28 +- + drivers/bluetooth/hci_h5.c | 4 + + drivers/bluetooth/hci_ldisc.c | 8 +- + drivers/bluetooth/hci_ll.c | 2 +- + drivers/bluetooth/hci_mrvl.c | 90 +- + drivers/bluetooth/hci_qca.c | 10 +- + drivers/tty/serdev/core.c | 17 +- + drivers/tty/serdev/serdev-ttyport.c | 16 +- + include/linux/serdev.h | 10 +- + include/net/bluetooth/hci.h | 7 + + include/net/bluetooth/hci_core.h | 3 +- + include/net/bluetooth/l2cap.h | 2 +- + include/net/bluetooth/mgmt.h | 80 +- + net/bluetooth/hci_core.c | 23 +- + net/bluetooth/hci_event.c | 9 +- + net/bluetooth/hci_sync.c | 75 +- + net/bluetooth/hidp/core.c | 2 +- + net/bluetooth/iso.c | 9 +- + net/bluetooth/l2cap_core.c | 124 +- + net/bluetooth/mgmt.c | 9 +- + net/bluetooth/msft.c | 36 +- + net/bluetooth/smp.c | 9 +- + 39 files changed, 1971 insertions(+), 240 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/bluetooth/nxp,88w8987-bt.yaml + create mode 100644 drivers/bluetooth/btnxpuart.c +Merging wireless-next/for-next (70664495e3d2 wifi: rtl8xxxu: Support new chip RTL8710BU aka RTL8188GU) +$ 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 MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 8 +- + drivers/net/wireless/Kconfig | 75 +- + drivers/net/wireless/Makefile | 11 +- + drivers/net/wireless/ath/ath.h | 12 +- + drivers/net/wireless/ath/ath10k/ce.c | 52 - + drivers/net/wireless/ath/ath10k/mac.c | 1 - + drivers/net/wireless/ath/ath10k/snoc.c | 1 + + drivers/net/wireless/ath/ath11k/ahb.c | 10 +- + drivers/net/wireless/ath/ath11k/hw.c | 1 + + drivers/net/wireless/ath/ath11k/mac.c | 255 ++- + drivers/net/wireless/ath/ath11k/peer.c | 5 +- + drivers/net/wireless/ath/ath11k/reg.c | 59 +- + drivers/net/wireless/ath/ath11k/wmi.c | 606 ++++++- + drivers/net/wireless/ath/ath11k/wmi.h | 366 +++- + drivers/net/wireless/ath/ath12k/ce.c | 2 +- + drivers/net/wireless/ath/ath12k/core.h | 2 +- + drivers/net/wireless/ath/ath12k/dp.c | 7 +- + drivers/net/wireless/ath/ath12k/dp.h | 6 +- + drivers/net/wireless/ath/ath12k/dp_mon.c | 19 +- + drivers/net/wireless/ath/ath12k/dp_rx.c | 11 +- + drivers/net/wireless/ath/ath12k/dp_tx.c | 2 +- + drivers/net/wireless/ath/ath12k/hal.c | 2 +- + drivers/net/wireless/ath/ath12k/hal.h | 12 +- + drivers/net/wireless/ath/ath12k/hal_desc.h | 10 +- + drivers/net/wireless/ath/ath12k/pci.c | 47 +- + drivers/net/wireless/ath/ath12k/pci.h | 6 + + drivers/net/wireless/ath/ath12k/rx_desc.h | 2 +- + drivers/net/wireless/ath/ath12k/wmi.c | 6 +- + drivers/net/wireless/ath/ath12k/wmi.h | 4 +- + drivers/net/wireless/ath/ath5k/ahb.c | 10 +- + drivers/net/wireless/ath/ath5k/eeprom.c | 2 +- + drivers/net/wireless/ath/ath6kl/bmi.c | 2 +- + drivers/net/wireless/ath/ath6kl/htc_pipe.c | 4 +- + drivers/net/wireless/ath/ath9k/hif_usb.c | 19 + + drivers/net/wireless/ath/key.c | 2 +- + drivers/net/wireless/ath/wcn36xx/smd.c | 4 +- + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 6 + + drivers/net/wireless/intel/ipw2x00/ipw2200.c | 7 +- + drivers/net/wireless/intel/ipw2x00/ipw2200.h | 3 +- + drivers/net/wireless/intel/iwlwifi/cfg/22000.c | 38 +- + .../net/wireless/intel/iwlwifi/fw/api/mac-cfg.h | 416 ++++- + drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 32 +- + drivers/net/wireless/intel/iwlwifi/fw/dump.c | 58 +- + drivers/net/wireless/intel/iwlwifi/fw/error-dump.h | 17 +- + drivers/net/wireless/intel/iwlwifi/fw/img.h | 4 +- + drivers/net/wireless/intel/iwlwifi/fw/pnvm.c | 20 +- + drivers/net/wireless/intel/iwlwifi/fw/runtime.h | 4 + + drivers/net/wireless/intel/iwlwifi/iwl-config.h | 3 + + drivers/net/wireless/intel/iwlwifi/iwl-devtrace.c | 3 + + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 2 +- + drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 4 + + drivers/net/wireless/intel/iwlwifi/mvm/Makefile | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 8 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 7 +- + drivers/net/wireless/intel/iwlwifi/mvm/link.c | 175 ++ + drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 359 ++-- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 304 +++- + drivers/net/wireless/intel/iwlwifi/mvm/mld-mac.c | 271 +++ + .../net/wireless/intel/iwlwifi/mvm/mld-mac80211.c | 253 +++ + drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c | 339 ++++ + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 59 +- + drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 6 + + drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 5 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 60 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.h | 25 +- + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 15 + + drivers/net/wireless/legacy/Kconfig | 55 + + drivers/net/wireless/legacy/Makefile | 6 + + drivers/net/wireless/{ => legacy}/ray_cs.c | 0 + drivers/net/wireless/{ => legacy}/ray_cs.h | 0 + drivers/net/wireless/{ => legacy}/rayctl.h | 0 + drivers/net/wireless/{ => legacy}/rndis_wlan.c | 0 + drivers/net/wireless/{ => legacy}/wl3501.h | 0 + drivers/net/wireless/{ => legacy}/wl3501_cs.c | 0 + drivers/net/wireless/quantenna/qtnfmac/commands.c | 7 +- + drivers/net/wireless/realtek/rtl8xxxu/Kconfig | 2 +- + drivers/net/wireless/realtek/rtl8xxxu/Makefile | 2 +- + drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 313 +++- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c | 5 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188f.c | 7 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192c.c | 2 + + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c | 6 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8710b.c | 1878 ++++++++++++++++++++ + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723a.c | 5 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c | 5 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 297 +++- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h | 44 + + drivers/net/wireless/realtek/rtw88/usb.c | 2 +- + drivers/net/wireless/realtek/rtw89/coex.c | 1033 +++++++++-- + drivers/net/wireless/realtek/rtw89/coex.h | 5 + + drivers/net/wireless/realtek/rtw89/core.h | 239 ++- + drivers/net/wireless/realtek/rtw89/fw.c | 142 ++ + drivers/net/wireless/realtek/rtw89/fw.h | 138 ++ + drivers/net/wireless/realtek/rtw89/mac.c | 35 +- + drivers/net/wireless/realtek/rtw89/reg.h | 2 + + drivers/net/wireless/virtual/Kconfig | 20 + + drivers/net/wireless/virtual/Makefile | 3 + + .../net/wireless/{ => virtual}/mac80211_hwsim.c | 0 + .../net/wireless/{ => virtual}/mac80211_hwsim.h | 0 + drivers/net/wireless/{ => virtual}/virt_wifi.c | 0 + 100 files changed, 7400 insertions(+), 1001 deletions(-) + create mode 100644 drivers/net/wireless/intel/iwlwifi/mvm/link.c + create mode 100644 drivers/net/wireless/intel/iwlwifi/mvm/mld-mac.c + create mode 100644 drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c + create mode 100644 drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c + create mode 100644 drivers/net/wireless/legacy/Kconfig + create mode 100644 drivers/net/wireless/legacy/Makefile + rename drivers/net/wireless/{ => legacy}/ray_cs.c (100%) + rename drivers/net/wireless/{ => legacy}/ray_cs.h (100%) + rename drivers/net/wireless/{ => legacy}/rayctl.h (100%) + rename drivers/net/wireless/{ => legacy}/rndis_wlan.c (100%) + rename drivers/net/wireless/{ => legacy}/wl3501.h (100%) + rename drivers/net/wireless/{ => legacy}/wl3501_cs.c (100%) + create mode 100644 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8710b.c + create mode 100644 drivers/net/wireless/virtual/Kconfig + create mode 100644 drivers/net/wireless/virtual/Makefile + rename drivers/net/wireless/{ => virtual}/mac80211_hwsim.c (100%) + rename drivers/net/wireless/{ => virtual}/mac80211_hwsim.h (100%) + rename drivers/net/wireless/{ => virtual}/virt_wifi.c (100%) +Merging mtd/mtd/next (1a7537a39b06 Merge tag 'mtd/core-fixes-before-nvmem-layouts-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 +Merge made by the 'ort' strategy. + drivers/mtd/mtdcore.c | 26 ++++++++++++++++---------- + drivers/mtd/parsers/bcm63xxpart.c | 1 - + 2 files changed, 16 insertions(+), 11 deletions(-) +Merging nand/nand/next (4080d5362416 mtd: parsers: remove reference to config MTD_NAND_TMIO) +$ git merge -m Merge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next +Merge made by the 'ort' strategy. + drivers/mtd/nand/raw/orion_nand.c | 4 +--- + drivers/mtd/nand/raw/qcom_nandc.c | 3 +-- + drivers/mtd/parsers/Kconfig | 2 +- + include/linux/mtd/rawnand.h | 2 +- + 4 files changed, 4 insertions(+), 7 deletions(-) +Merging spi-nor/spi-nor/next (6afcc84080c4 mtd: spi-nor: spansion: Add support for Infineon S25FS256T) +$ 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 +Merge made by the 'ort' strategy. + drivers/mtd/spi-nor/spansion.c | 70 +++++++++++++++++++++++++++++++++++++++--- + 1 file changed, 65 insertions(+), 5 deletions(-) +Merging crypto/master (e6af5c0c4d32 crypto: stm32 - Save and restore between each request) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git crypto/master +Auto-merging MAINTAINERS +Auto-merging arch/arm64/boot/dts/qcom/sm8550.dtsi +Auto-merging arch/x86/kvm/svm/sev.c +Auto-merging drivers/crypto/ccp/sev-dev.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/crypto/qcom-qce.txt | 25 - + .../devicetree/bindings/crypto/qcom-qce.yaml | 123 ++ + MAINTAINERS | 1 + + arch/arm64/boot/dts/qcom/sm8550.dtsi | 2 +- + arch/arm64/crypto/aes-neonbs-core.S | 9 +- + arch/powerpc/crypto/Kconfig | 17 + + arch/powerpc/crypto/Makefile | 13 + + arch/powerpc/crypto/aes-gcm-p10-glue.c | 345 +++++ + arch/powerpc/crypto/aes-gcm-p10.S | 1521 ++++++++++++++++++++ + arch/powerpc/crypto/aesp8-ppc.pl | 585 ++++++++ + arch/powerpc/crypto/ghashp8-ppc.pl | 370 +++++ + arch/powerpc/crypto/ppc-xlate.pl | 229 +++ + arch/x86/kvm/svm/sev.c | 1 + + crypto/acompress.c | 81 +- + crypto/aead.c | 98 +- + crypto/ahash.c | 93 +- + crypto/akcipher.c | 52 +- + crypto/algapi.c | 215 --- + crypto/compress.h | 26 + + crypto/crypto_user_stat.c | 183 +-- + crypto/fips.c | 11 +- + crypto/hash.h | 36 + + crypto/kpp.c | 53 +- + crypto/rng.c | 65 +- + crypto/scompress.c | 39 +- + crypto/shash.c | 126 +- + crypto/skcipher.c | 113 +- + crypto/testmgr.c | 266 ++-- + drivers/char/hw_random/meson-rng.c | 29 +- + drivers/char/hw_random/xgene-rng.c | 44 +- + drivers/crypto/aspeed/aspeed-acry.c | 14 +- + drivers/crypto/atmel-sha204a.c | 2 +- + drivers/crypto/caam/jr.c | 55 +- + drivers/crypto/cavium/nitrox/nitrox_main.c | 1 - + drivers/crypto/ccp/Makefile | 3 +- + drivers/crypto/ccp/platform-access.c | 232 +++ + drivers/crypto/ccp/platform-access.h | 35 + + drivers/crypto/ccp/psp-dev.c | 32 +- + drivers/crypto/ccp/psp-dev.h | 11 +- + drivers/crypto/ccp/sev-dev.c | 16 +- + drivers/crypto/ccp/sev-dev.h | 2 +- + drivers/crypto/ccp/sp-dev.h | 10 + + drivers/crypto/ccp/sp-pci.c | 9 + + drivers/crypto/ccp/tee-dev.c | 17 +- + drivers/crypto/ccree/cc_driver.c | 4 +- + drivers/crypto/hisilicon/hpre/hpre_main.c | 1 - + drivers/crypto/hisilicon/qm.c | 1 - + drivers/crypto/hisilicon/sec2/sec_main.c | 1 - + drivers/crypto/hisilicon/zip/zip_main.c | 1 - + drivers/crypto/inside-secure/safexcel.c | 39 +- + drivers/crypto/qat/qat_4xxx/adf_4xxx_hw_data.c | 62 +- + drivers/crypto/qat/qat_4xxx/adf_4xxx_hw_data.h | 9 +- + drivers/crypto/qat/qat_4xxx/adf_drv.c | 31 +- + drivers/crypto/qat/qat_c3xxx/adf_c3xxx_hw_data.c | 2 +- + drivers/crypto/qat/qat_c3xxx/adf_drv.c | 24 +- + drivers/crypto/qat/qat_c3xxxvf/adf_drv.c | 13 +- + drivers/crypto/qat/qat_c62x/adf_c62x_hw_data.c | 2 +- + drivers/crypto/qat/qat_c62x/adf_drv.c | 24 +- + drivers/crypto/qat/qat_c62xvf/adf_drv.c | 13 +- + drivers/crypto/qat/qat_common/adf_accel_devices.h | 5 +- + drivers/crypto/qat/qat_common/adf_aer.c | 39 +- + drivers/crypto/qat/qat_common/adf_common_drv.h | 10 +- + drivers/crypto/qat/qat_common/adf_ctl_drv.c | 30 +- + drivers/crypto/qat/qat_common/adf_dev_mgr.c | 2 + + drivers/crypto/qat/qat_common/adf_hw_arbiter.c | 2 +- + drivers/crypto/qat/qat_common/adf_init.c | 96 +- + drivers/crypto/qat/qat_common/adf_sriov.c | 10 +- + drivers/crypto/qat/qat_common/adf_sysfs.c | 23 +- + drivers/crypto/qat/qat_common/adf_vf_isr.c | 3 +- + drivers/crypto/qat/qat_common/qat_hal.c | 1 + + drivers/crypto/qat/qat_common/qat_uclo.c | 1 + + .../crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.c | 2 +- + drivers/crypto/qat/qat_dh895xcc/adf_drv.c | 24 +- + drivers/crypto/qat/qat_dh895xccvf/adf_drv.c | 13 +- + drivers/crypto/qce/core.c | 23 +- + drivers/crypto/qce/core.h | 1 + + drivers/crypto/stm32/stm32-hash.c | 358 ++--- + drivers/i2c/busses/i2c-designware-amdpsp.c | 18 +- + drivers/tee/amdtee/call.c | 2 +- + drivers/tee/amdtee/shm_pool.c | 2 +- + include/crypto/acompress.h | 132 +- + include/crypto/aead.h | 22 + + include/crypto/akcipher.h | 102 +- + include/crypto/algapi.h | 16 + + include/crypto/hash.h | 84 +- + include/crypto/internal/acompress.h | 43 +- + include/crypto/internal/scompress.h | 15 +- + include/crypto/kpp.h | 73 +- + include/crypto/rng.h | 65 +- + include/crypto/skcipher.h | 22 + + include/linux/crypto.h | 205 --- + include/linux/psp-platform-access.h | 64 + + include/linux/psp-sev.h | 8 - + include/linux/psp.h | 29 + + kernel/padata.c | 4 +- + 95 files changed, 5326 insertions(+), 1660 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/crypto/qcom-qce.txt + create mode 100644 Documentation/devicetree/bindings/crypto/qcom-qce.yaml + create mode 100644 arch/powerpc/crypto/aes-gcm-p10-glue.c + create mode 100644 arch/powerpc/crypto/aes-gcm-p10.S + create mode 100644 arch/powerpc/crypto/aesp8-ppc.pl + create mode 100644 arch/powerpc/crypto/ghashp8-ppc.pl + create mode 100644 arch/powerpc/crypto/ppc-xlate.pl + create mode 100644 crypto/compress.h + create mode 100644 crypto/hash.h + create mode 100644 drivers/crypto/ccp/platform-access.c + create mode 100644 drivers/crypto/ccp/platform-access.h + create mode 100644 include/linux/psp-platform-access.h + create mode 100644 include/linux/psp.h +Merging drm/drm-next (c6265f5c2f50 Merge tag 'drm-misc-next-2023-03-16' of git://anongit.freedesktop.org/drm/drm-misc into drm-next) + 0b255ab74b4e ("drm/amdkfd: fix a potential double free in pqm_create_queue") + 0fb44d54c66e ("drm/amdkfd: Get prange->offset after svm_range_vram_node_new") + 1aff0a5d71d2 ("drm/amdgpu/vcn: Disable indirect SRAM on Vangogh broken BIOSes") + 22e3d9343b82 ("drm/amdkfd: Fixed kfd_process cleanup on module exit.") + 3b4723de0d9b ("drm/amd/pm: bump SMU 13.0.4 driver_if header version") + 49017304c099 ("drm/amd/pm: Fix sienna cichlid incorrect OD volage after resume") + 566b6577849f ("drm/amd/display: Write to correct dirty_rect") + 5d04d1395447 ("drm/amd/display: Remove OTG DIV register write for Virtual signals.") + 629fcf0b687e ("drm/amdkfd: fix potential kgd_mem UAFs") + 7ee938ac0060 ("drm/amdgpu: Don't resume IOMMU after incomplete init") + 825b3772a204 ("drm/amd/display: Do not set DRR on pipe Commit") + 84b31d484eb9 ("drm/amdgpu/nv: fix codec array for SR_IOV") + 9473b6b25b83 ("drm/amdkfd: Fix BO offset for multi-VMA page migration") + c69d51395a3b ("drm/amdgpu: move poll enabled/disable into non DC path") + dcaf5000b054 ("drm/amdgpu/vcn: custom video info caps for sriov") + dd61bbd0d1fb ("accel: Build sub-directories based on config options") + deaccddaf492 ("drm/amd/display: Fix DP MST sinks removal issue") +$ git merge -m Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git drm/drm-next +Auto-merging MAINTAINERS +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +Auto-merging drivers/gpu/drm/amd/amdgpu/nv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/soc21.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_process.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c +Auto-merging 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/link/link_detection.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h +Auto-merging drivers/gpu/drm/drm_edid.c +Auto-merging drivers/gpu/drm/drm_gem.c +Auto-merging drivers/gpu/drm/drm_gem_shmem_helper.c +Auto-merging drivers/gpu/drm/i915/display/intel_crtc.c +Auto-merging drivers/gpu/drm/i915/display/intel_display.c +Auto-merging drivers/gpu/drm/i915/display/intel_display_types.h +Auto-merging drivers/gpu/drm/i915/display/intel_dmc.c +Auto-merging drivers/gpu/drm/i915/display/intel_dp_mst.c +Auto-merging drivers/gpu/drm/i915/display/intel_fbdev.c +Auto-merging drivers/gpu/drm/i915/display/intel_psr.c +Auto-merging drivers/gpu/drm/i915/gt/intel_gt.c +Auto-merging drivers/gpu/drm/i915/gt/intel_gt_pm.c +Auto-merging drivers/gpu/drm/i915/i915_reg.h +Auto-merging drivers/gpu/drm/sun4i/sun4i_drv.c +Auto-merging drivers/gpu/drm/ttm/ttm_bo.c +Auto-merging drivers/gpu/drm/ttm/ttm_device.c +Auto-merging drivers/gpu/drm/virtio/virtgpu_vq.c +Auto-merging include/drm/drm_gem.h +Auto-merging include/linux/fb.h +Merge made by the 'ort' strategy. + .../bindings/display/bridge/analogix,dp.yaml | 63 + + .../bindings/display/bridge/analogix_dp.txt | 51 - + .../bindings/display/bridge/snps,dw-mipi-dsi.yaml | 16 +- + .../bindings/display/dsi-controller.yaml | 18 +- + .../bindings/display/exynos/exynos_dp.txt | 2 +- + .../bindings/display/imx/fsl,imx-lcdc.yaml | 46 +- + .../bindings/display/panel/boe,tv101wum-nl6.yaml | 2 + + .../bindings/display/panel/jadard,jd9365da-h3.yaml | 2 + + .../bindings/display/panel/novatek,nt36523.yaml | 85 + + .../bindings/display/panel/samsung,ams495qa01.yaml | 57 + + .../bindings/display/panel/seiko,43wvf1g.yaml | 2 + + .../bindings/display/panel/sitronix,st7701.yaml | 1 + + .../bindings/display/panel/sony,td4353-jdi.yaml | 82 + + .../display/rockchip/analogix_dp-rockchip.txt | 98 - + .../display/rockchip/dw_mipi_dsi_rockchip.txt | 94 - + .../display/rockchip/rockchip,analogix-dp.yaml | 103 + + .../display/rockchip/rockchip,dw-mipi-dsi.yaml | 166 + + .../bindings/display/rockchip/rockchip,lvds.yaml | 170 + + .../bindings/display/rockchip/rockchip-lvds.txt | 92 - + .../bindings/display/simple-framebuffer.yaml | 9 + + .../devicetree/bindings/soc/rockchip/grf.yaml | 10 +- + .../gpu/amdgpu/display/display-manager.rst | 2 +- + MAINTAINERS | 10 +- + drivers/accel/ivpu/ivpu_pm.c | 10 - + drivers/dma-buf/dma-buf.c | 2 +- + drivers/gpu/drm/Kconfig | 6 +- + drivers/gpu/drm/Makefile | 4 + + drivers/gpu/drm/amd/amdgpu/Kconfig | 2 + + drivers/gpu/drm/amd/amdgpu/Makefile | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 34 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 88 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 80 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c | 24 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 41 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.c | 48 + + drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c | 29 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mca.c | 72 + + drivers/gpu/drm/amd/amdgpu/amdgpu_mca.h | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.c | 46 + + drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.c | 23 + + drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 36 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 48 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 22 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c | 324 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 4 - + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 30 + + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 32 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 29 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 25 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 30 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h | 1 + + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 15 +- + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 26 +- + drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 27 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 59 +- + drivers/gpu/drm/amd/amdgpu/hdp_v4_0.c | 8 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 6 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/mca_v3_0.c | 44 +- + drivers/gpu/drm/amd/amdgpu/mca_v3_0.h | 4 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v3_0.c | 3 + + drivers/gpu/drm/amd/amdgpu/nv.c | 73 +- + drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c | 1967 +++++++++ + .../dc/core/dc_link.c => amdgpu/sdma_v4_4_2.h} | 13 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 76 +- + drivers/gpu/drm/amd/amdgpu/soc21.c | 72 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 6 +- + drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/vega20_ih.c | 15 +- + drivers/gpu/drm/amd/amdgpu/vi.c | 20 - + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 55 + + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 8 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 10 +- + drivers/gpu/drm/amd/display/Kconfig | 14 +- + drivers/gpu/drm/amd/display/Makefile | 4 - + drivers/gpu/drm/amd/display/amdgpu_dm/Makefile | 4 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 220 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 4 - + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 26 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.h | 14 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 33 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 1 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 69 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 88 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.h | 15 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 149 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.h | 12 +- + drivers/gpu/drm/amd/display/dc/Makefile | 7 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 2 +- + drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 16 +- + .../amd/display/dc/clk_mgr/dcn201/dcn201_clk_mgr.c | 2 +- + .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 2 +- + .../amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.c | 5 + + .../amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c | 79 +- + .../amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.h | 3 + + drivers/gpu/drm/amd/display/dc/core/dc.c | 377 +- + .../gpu/drm/amd/display/dc/core/dc_hw_sequencer.c | 38 +- + .../gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c | 2 +- + .../gpu/drm/amd/display/dc/core/dc_link_exports.c | 411 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 21 +- + drivers/gpu/drm/amd/display/dc/core/dc_vm_helper.c | 2 - + drivers/gpu/drm/amd/display/dc/dc.h | 588 ++- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 13 +- + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 173 +- + drivers/gpu/drm/amd/display/dc/dc_dsc.h | 11 +- + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 16 +- + drivers/gpu/drm/amd/display/dc/dc_link.h | 577 --- + drivers/gpu/drm/amd/display/dc/dc_types.h | 117 +- + drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 9 +- + .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 27 +- + .../gpu/drm/amd/display/dc/dce/dce_clock_source.h | 6 - + drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 2 +- + drivers/gpu/drm/amd/display/dc/dce/dce_transform.c | 5 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c | 2 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 2 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.h | 5 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 62 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.h | 2 - + .../drm/amd/display/dc/dce110/dce110_resource.c | 3 - + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.h | 4 + + .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_dscl.c | 4 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dwb.c | 5 - + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dwb.h | 4 - + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 8 +- + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.c | 3 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 2 - + .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 10 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dwb.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 23 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_mmhubbub.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_mpc.c | 2 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 11 +- + .../amd/display/dc/dcn20/dcn20_stream_encoder.c | 3 +- + drivers/gpu/drm/amd/display/dc/dcn201/dcn201_dpp.c | 7 - + .../gpu/drm/amd/display/dc/dcn201/dcn201_hwseq.c | 2 - + drivers/gpu/drm/amd/display/dc/dcn201/dcn201_mpc.c | 2 +- + .../drm/amd/display/dc/dcn201/dcn201_resource.c | 6 +- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hwseq.c | 4 +- + .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 4 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_afmt.c | 2 - + .../display/dc/dcn30/dcn30_dio_stream_encoder.c | 1 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.h | 2 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dwb.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.c | 4 - + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 12 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_mmhubbub.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.c | 2 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 11 +- + .../drm/amd/display/dc/dcn301/dcn301_resource.c | 2 - + .../drm/amd/display/dc/dcn302/dcn302_resource.c | 11 +- + .../drm/amd/display/dc/dcn303/dcn303_resource.c | 13 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_apg.c | 41 - + .../amd/display/dc/dcn31/dcn31_dio_link_encoder.c | 5 +- + .../display/dc/dcn31/dcn31_hpo_dp_link_encoder.c | 1 - + .../display/dc/dcn31/dcn31_hpo_dp_stream_encoder.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c | 14 +- + .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 2 - + .../display/dc/dcn314/dcn314_dio_stream_encoder.c | 8 +- + .../gpu/drm/amd/display/dc/dcn314/dcn314_hwseq.c | 2 +- + .../drm/amd/display/dc/dcn314/dcn314_resource.c | 3 +- + .../drm/amd/display/dc/dcn315/dcn315_resource.c | 2 - + .../drm/amd/display/dc/dcn316/dcn316_resource.c | 2 - + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dccg.h | 36 - + .../display/dc/dcn32/dcn32_dio_stream_encoder.c | 4 +- + .../display/dc/dcn32/dcn32_dio_stream_encoder.h | 64 - + .../display/dc/dcn32/dcn32_hpo_dp_link_encoder.c | 1 - + .../gpu/drm/amd/display/dc/dcn32/dcn32_hubbub.h | 62 - + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hubp.h | 6 - + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c | 117 +- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.h | 4 + + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_init.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_mpc.c | 8 +- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_mpc.h | 13 + + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_optc.h | 71 - + .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.c | 17 +- + .../amd/display/dc/dcn32/dcn32_resource_helpers.c | 47 +- + .../drm/amd/display/dc/dcn321/dcn321_resource.c | 12 +- + drivers/gpu/drm/amd/display/dc/dml/Makefile | 2 +- + .../gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 7 +- + .../amd/display/dc/dml/dcn30/display_mode_vba_30.c | 3 - + .../display/dc/dml/dcn30/display_rq_dlg_calc_30.c | 3 - + .../amd/display/dc/dml/dcn31/display_mode_vba_31.c | 299 +- + .../display/dc/dml/dcn31/display_rq_dlg_calc_31.c | 2 - + .../gpu/drm/amd/display/dc/dml/dcn314/dcn314_fpu.c | 4 + + .../display/dc/dml/dcn314/display_mode_vba_314.c | 299 +- + .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 7 +- + .../amd/display/dc/dml/dcn32/display_mode_vba_32.c | 7 +- + .../dc/dml/dcn32/display_mode_vba_util_32.c | 6 +- + .../dc/dml/dcn32/display_mode_vba_util_32.h | 3 +- + .../gpu/drm/amd/display/dc/dml/dcn321/dcn321_fpu.c | 5 +- + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 86 +- + drivers/gpu/drm/amd/display/dc/dsc/rc_calc.c | 2 + + drivers/gpu/drm/amd/display/dc/hdcp/hdcp_msg.c | 2 +- + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 2 - + drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h | 54 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dwb.h | 8 +- + drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 14 - + .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 52 - + .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 1 - + .../drm/amd/display/dc/inc/hw/timing_generator.h | 2 +- + .../drm/amd/display/dc/inc/hw_sequencer_private.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/link.h | 351 +- + drivers/gpu/drm/amd/display/dc/inc/resource.h | 2 +- + drivers/gpu/drm/amd/display/dc/link/Makefile | 2 +- + .../amd/display/dc/link/accessories/link_dp_cts.c | 65 +- + .../amd/display/dc/link/accessories/link_dp_cts.h | 19 +- + .../display/dc/link/accessories/link_dp_trace.c | 21 +- + .../display/dc/link/accessories/link_dp_trace.h | 17 +- + .../drm/amd/display/dc/link/hwss/link_hwss_dio.c | 22 +- + .../amd/display/dc/link/hwss/link_hwss_hpo_dp.c | 8 +- + .../gpu/drm/amd/display/dc/link/link_detection.c | 115 +- + .../gpu/drm/amd/display/dc/link/link_detection.h | 15 +- + drivers/gpu/drm/amd/display/dc/link/link_dpms.c | 78 +- + drivers/gpu/drm/amd/display/dc/link/link_dpms.h | 23 +- + drivers/gpu/drm/amd/display/dc/link/link_factory.c | 274 +- + drivers/gpu/drm/amd/display/dc/link/link_factory.h | 2 + + .../gpu/drm/amd/display/dc/link/link_resource.h | 3 +- + .../gpu/drm/amd/display/dc/link/link_validation.c | 14 +- + .../gpu/drm/amd/display/dc/link/link_validation.h | 7 + + .../drm/amd/display/dc/link/protocols/link_ddc.c | 24 +- + .../drm/amd/display/dc/link/protocols/link_ddc.h | 31 + + .../display/dc/link/protocols/link_dp_capability.c | 68 +- + .../display/dc/link/protocols/link_dp_capability.h | 28 + + .../amd/display/dc/link/protocols/link_dp_dpia.c | 3 +- + .../amd/display/dc/link/protocols/link_dp_dpia.h | 4 +- + .../display/dc/link/protocols/link_dp_dpia_bw.c | 176 +- + .../display/dc/link/protocols/link_dp_dpia_bw.h | 52 +- + .../dc/link/protocols/link_dp_irq_handler.c | 30 +- + .../dc/link/protocols/link_dp_irq_handler.h | 12 +- + .../amd/display/dc/link/protocols/link_dp_phy.c | 10 +- + .../amd/display/dc/link/protocols/link_dp_phy.h | 3 + + .../display/dc/link/protocols/link_dp_training.c | 26 +- + .../display/dc/link/protocols/link_dp_training.h | 3 + + .../dc/link/protocols/link_dp_training_auxless.c | 2 +- + .../dc/link/protocols/link_dp_training_auxless.h | 2 +- + .../dc/link/protocols/link_dp_training_dpia.c | 7 +- + .../dc/link/protocols/link_dp_training_dpia.h | 2 +- + .../dc/link/protocols/link_edp_panel_control.c | 51 +- + .../dc/link/protocols/link_edp_panel_control.h | 30 + + .../drm/amd/display/dc/link/protocols/link_hpd.c | 14 +- + .../drm/amd/display/dc/link/protocols/link_hpd.h | 7 + + drivers/gpu/drm/amd/display/dc/os_types.h | 4 +- + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 22 +- + .../include/{hdcp_types.h => hdcp_msg_types.h} | 0 + .../drm/amd/display/include/link_service_types.h | 26 - + .../drm/amd/display/modules/freesync/freesync.c | 12 +- + .../gpu/drm/amd/display/modules/hdcp/hdcp_log.h | 2 - + drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h | 1 + + .../drm/amd/display/modules/power/power_helpers.c | 7 - + .../drm/amd/include/asic_reg/gc/gc_10_1_0_offset.h | 4 + + .../amd/include/asic_reg/gc/gc_10_1_0_sh_mask.h | 54 + + .../drm/amd/include/asic_reg/gc/gc_10_3_0_offset.h | 4 + + .../amd/include/asic_reg/gc/gc_10_3_0_sh_mask.h | 54 + + .../amd/include/asic_reg/hdp/hdp_4_4_2_offset.h | 219 + + .../amd/include/asic_reg/hdp/hdp_4_4_2_sh_mask.h | 663 +++ + .../drm/amd/include/asic_reg/mp/mp_13_0_6_offset.h | 456 +++ + .../amd/include/asic_reg/mp/mp_13_0_6_sh_mask.h | 674 ++++ + .../amd/include/asic_reg/sdma/sdma_4_4_2_offset.h | 1109 +++++ + .../amd/include/asic_reg/sdma/sdma_4_4_2_sh_mask.h | 3276 +++++++++++++++ + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 4 + + drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 28 + + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 79 + + drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 3 + + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 30 + + drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 12 + + .../pm/swsmu/inc/pmfw_if/smu11_driver_if_vangogh.h | 4 +- + .../pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_6.h | 141 + + .../amd/pm/swsmu/inc/pmfw_if/smu_v13_0_6_pmfw.h | 212 + + .../amd/pm/swsmu/inc/pmfw_if/smu_v13_0_6_ppsmc.h | 95 + + drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h | 4 +- + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 5 + + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 23 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/Makefile | 2 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 11 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 4 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 2069 ++++++++++ + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.h | 32 + + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 4 +- + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 4 +- + drivers/gpu/drm/arm/hdlcd_drv.c | 4 +- + drivers/gpu/drm/arm/malidp_drv.c | 6 +- + drivers/gpu/drm/aspeed/aspeed_gfx_drv.c | 4 +- + drivers/gpu/drm/ast/ast_dp.c | 10 +- + drivers/gpu/drm/ast/ast_dp501.c | 40 +- + drivers/gpu/drm/ast/ast_drv.c | 2 +- + drivers/gpu/drm/ast/ast_drv.h | 84 +- + drivers/gpu/drm/ast/ast_i2c.c | 8 +- + drivers/gpu/drm/ast/ast_main.c | 24 +- + drivers/gpu/drm/ast/ast_mm.c | 4 +- + drivers/gpu/drm/ast/ast_mode.c | 104 +- + drivers/gpu/drm/ast/ast_post.c | 94 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 4 +- + drivers/gpu/drm/bridge/Kconfig | 2 +- + drivers/gpu/drm/bridge/panel.c | 2 + + drivers/gpu/drm/bridge/tc358762.c | 1 + + drivers/gpu/drm/drm_atomic_helper.c | 20 +- + drivers/gpu/drm/drm_connector.c | 28 +- + drivers/gpu/drm/drm_debugfs.c | 4 +- + drivers/gpu/drm/drm_displayid.c | 62 +- + drivers/gpu/drm/drm_dumb_buffers.c | 5 +- + drivers/gpu/drm/drm_edid.c | 65 +- + drivers/gpu/drm/drm_fbdev_dma.c | 275 ++ + drivers/gpu/drm/drm_file.c | 2 +- + drivers/gpu/drm/drm_gem.c | 25 +- + drivers/gpu/drm/drm_gem_shmem_helper.c | 65 +- + drivers/gpu/drm/drm_gem_vram_helper.c | 11 + + drivers/gpu/drm/drm_internal.h | 3 - + drivers/gpu/drm/drm_modes.c | 3 +- + drivers/gpu/drm/drm_of.c | 51 + + drivers/gpu/drm/drm_probe_helper.c | 5 +- + drivers/gpu/drm/drm_suballoc.c | 457 +++ + drivers/gpu/drm/exynos/Kconfig | 2 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 4 +- + drivers/gpu/drm/i915/Makefile | 3 + + drivers/gpu/drm/i915/display/g4x_dp.c | 53 +- + drivers/gpu/drm/i915/display/g4x_hdmi.c | 21 +- + drivers/gpu/drm/i915/display/i9xx_wm.c | 4047 +++++++++++++++++++ + drivers/gpu/drm/i915/display/i9xx_wm.h | 21 + + drivers/gpu/drm/i915/display/icl_dsi.c | 314 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 84 +- + drivers/gpu/drm/i915/display/intel_audio.c | 86 +- + drivers/gpu/drm/i915/display/intel_backlight.c | 161 +- + drivers/gpu/drm/i915/display/intel_bios.c | 220 +- + drivers/gpu/drm/i915/display/intel_bios.h | 27 +- + drivers/gpu/drm/i915/display/intel_bw.c | 49 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 41 +- + drivers/gpu/drm/i915/display/intel_color.c | 18 +- + drivers/gpu/drm/i915/display/intel_combo_phy.c | 48 +- + .../gpu/drm/i915/display/intel_combo_phy_regs.h | 4 +- + drivers/gpu/drm/i915/display/intel_crt.c | 46 +- + drivers/gpu/drm/i915/display/intel_crtc.c | 3 + + .../gpu/drm/i915/display/intel_crtc_state_dump.c | 16 +- + drivers/gpu/drm/i915/display/intel_cursor.c | 5 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 173 +- + drivers/gpu/drm/i915/display/intel_ddi.h | 6 +- + drivers/gpu/drm/i915/display/intel_display.c | 603 ++- + drivers/gpu/drm/i915/display/intel_display.h | 4 + + drivers/gpu/drm/i915/display/intel_display_core.h | 15 +- + .../gpu/drm/i915/display/intel_display_debugfs.c | 239 +- + drivers/gpu/drm/i915/display/intel_display_power.c | 80 +- + drivers/gpu/drm/i915/display/intel_display_power.h | 4 + + .../drm/i915/display/intel_display_power_well.c | 134 +- + .../gpu/drm/i915/display/intel_display_reg_defs.h | 10 +- + drivers/gpu/drm/i915/display/intel_display_rps.c | 81 + + drivers/gpu/drm/i915/display/intel_display_rps.h | 22 + + drivers/gpu/drm/i915/display/intel_display_types.h | 17 +- + drivers/gpu/drm/i915/display/intel_dmc.c | 395 +- + drivers/gpu/drm/i915/display/intel_dmc.h | 44 +- + drivers/gpu/drm/i915/display/intel_dp.c | 89 +- + drivers/gpu/drm/i915/display/intel_dp_aux.c | 35 + + drivers/gpu/drm/i915/display/intel_dp_aux.h | 4 + + .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 84 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 4 +- + drivers/gpu/drm/i915/display/intel_dpio_phy.c | 51 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 165 +- + drivers/gpu/drm/i915/display/intel_drrs.c | 16 +- + drivers/gpu/drm/i915/display/intel_dsb.c | 41 +- + drivers/gpu/drm/i915/display/intel_dsb.h | 5 +- + .../gpu/drm/i915/display/intel_dsi_dcs_backlight.c | 5 + + drivers/gpu/drm/i915/display/intel_dvo.c | 7 +- + drivers/gpu/drm/i915/display/intel_fb.c | 7 +- + drivers/gpu/drm/i915/display/intel_fbdev.c | 8 +- + drivers/gpu/drm/i915/display/intel_fbdev.h | 8 +- + drivers/gpu/drm/i915/display/intel_fdi.c | 159 +- + drivers/gpu/drm/i915/display/intel_fifo_underrun.c | 20 + + drivers/gpu/drm/i915/display/intel_fifo_underrun.h | 3 + + drivers/gpu/drm/i915/display/intel_gmbus.c | 30 +- + drivers/gpu/drm/i915/display/intel_hdcp.c | 15 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 79 +- + drivers/gpu/drm/i915/display/intel_lpe_audio.c | 6 +- + drivers/gpu/drm/i915/display/intel_lpe_audio.h | 4 +- + drivers/gpu/drm/i915/display/intel_lspcon.c | 2 +- + drivers/gpu/drm/i915/display/intel_lvds.c | 338 +- + drivers/gpu/drm/i915/display/intel_lvds_regs.h | 65 + + drivers/gpu/drm/i915/display/intel_mg_phy_regs.h | 4 +- + drivers/gpu/drm/i915/display/intel_modeset_setup.c | 58 +- + drivers/gpu/drm/i915/display/intel_panel.c | 1 + + drivers/gpu/drm/i915/display/intel_pch_display.c | 72 +- + drivers/gpu/drm/i915/display/intel_pch_refclk.c | 10 +- + drivers/gpu/drm/i915/display/intel_pps.c | 15 +- + drivers/gpu/drm/i915/display/intel_psr.c | 131 +- + drivers/gpu/drm/i915/display/intel_psr.h | 16 +- + drivers/gpu/drm/i915/display/intel_sprite.c | 3 +- + drivers/gpu/drm/i915/display/intel_tv.c | 6 +- + drivers/gpu/drm/i915/display/intel_vblank.c | 4 +- + drivers/gpu/drm/i915/display/intel_vdsc.c | 1 + + drivers/gpu/drm/i915/display/intel_vdsc_regs.h | 461 +++ + drivers/gpu/drm/i915/display/intel_vrr.c | 10 +- + drivers/gpu/drm/i915/display/intel_wm.c | 408 ++ + drivers/gpu/drm/i915/display/intel_wm.h | 37 + + .../{intel_pm_types.h => display/intel_wm_types.h} | 8 +- + drivers/gpu/drm/i915/display/skl_universal_plane.c | 8 +- + drivers/gpu/drm/i915/display/skl_watermark.c | 153 +- + drivers/gpu/drm/i915/display/skl_watermark.h | 7 +- + drivers/gpu/drm/i915/display/vlv_dsi.c | 158 +- + drivers/gpu/drm/i915/display/vlv_dsi_pll.c | 18 +- + drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 15 +- + drivers/gpu/drm/i915/gem/i915_gem_ttm.h | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c | 4 + + drivers/gpu/drm/i915/gem/i915_gem_ttm_pm.c | 7 +- + drivers/gpu/drm/i915/gt/intel_gt.c | 1 - + drivers/gpu/drm/i915/gt/intel_gt_pm.c | 1 - + drivers/gpu/drm/i915/gt/intel_gt_regs.h | 2 - + drivers/gpu/drm/i915/gt/intel_region_lmem.c | 2 +- + drivers/gpu/drm/i915/gt/intel_rps.c | 29 - + drivers/gpu/drm/i915/gt/intel_workarounds.c | 86 +- + drivers/gpu/drm/i915/gt/selftest_llc.c | 1 - + drivers/gpu/drm/i915/gvt/display.c | 16 +- + drivers/gpu/drm/i915/gvt/handlers.c | 18 +- + drivers/gpu/drm/i915/i915_debugfs.c | 1 - + drivers/gpu/drm/i915/i915_driver.c | 42 +- + drivers/gpu/drm/i915/i915_drv.h | 18 +- + drivers/gpu/drm/i915/i915_hwmon.c | 51 +- + drivers/gpu/drm/i915/i915_irq.c | 142 +- + drivers/gpu/drm/i915/i915_pmu.c | 1 - + drivers/gpu/drm/i915/i915_reg.h | 901 ++--- + drivers/gpu/drm/i915/i915_reg_defs.h | 31 + + drivers/gpu/drm/i915/i915_request.c | 1 - + drivers/gpu/drm/i915/i915_sysfs.c | 1 - + drivers/gpu/drm/i915/intel_device_info.c | 28 +- + drivers/gpu/drm/i915/intel_device_info.h | 1 + + drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 71 +- + drivers/gpu/drm/i915/intel_pm.c | 4224 +------------------- + drivers/gpu/drm/i915/intel_pm.h | 16 - + drivers/gpu/drm/i915/intel_runtime_pm.c | 2 + + drivers/gpu/drm/i915/intel_uncore.c | 6 +- + drivers/gpu/drm/i915/pxp/intel_pxp.c | 65 +- + drivers/gpu/drm/i915/pxp/intel_pxp.h | 2 + + .../gpu/drm/i915/pxp/intel_pxp_cmd_interface_42.h | 15 + + .../gpu/drm/i915/pxp/intel_pxp_cmd_interface_cmn.h | 3 + + drivers/gpu/drm/i915/pxp/intel_pxp_pm.c | 4 +- + drivers/gpu/drm/i915/pxp/intel_pxp_pm.h | 6 +- + drivers/gpu/drm/i915/pxp/intel_pxp_session.c | 8 +- + drivers/gpu/drm/i915/pxp/intel_pxp_session.h | 5 + + drivers/gpu/drm/i915/pxp/intel_pxp_tee.c | 46 + + drivers/gpu/drm/i915/pxp/intel_pxp_types.h | 3 + + drivers/gpu/drm/i915/soc/intel_dram.c | 152 + + drivers/gpu/drm/imx/Kconfig | 1 + + drivers/gpu/drm/imx/Makefile | 1 + + drivers/gpu/drm/imx/dcss/dcss-kms.c | 4 +- + drivers/gpu/drm/imx/ipuv3/Kconfig | 2 +- + drivers/gpu/drm/imx/ipuv3/imx-drm-core.c | 4 +- + drivers/gpu/drm/imx/lcdc/Kconfig | 7 + + drivers/gpu/drm/imx/lcdc/Makefile | 1 + + drivers/gpu/drm/imx/lcdc/imx-lcdc.c | 546 +++ + drivers/gpu/drm/kmb/kmb_drv.c | 4 +- + drivers/gpu/drm/logicvc/logicvc_drm.c | 4 +- + drivers/gpu/drm/mcde/mcde_drv.c | 6 +- + drivers/gpu/drm/meson/meson_drv.c | 4 +- + drivers/gpu/drm/meson/meson_venc.c | 4 +- + drivers/gpu/drm/mgag200/mgag200_drv.h | 3 + + drivers/gpu/drm/mgag200/mgag200_mode.c | 22 +- + drivers/gpu/drm/mxsfb/lcdif_drv.c | 4 +- + drivers/gpu/drm/mxsfb/mxsfb_drv.c | 4 +- + drivers/gpu/drm/nouveau/nouveau_bo.c | 3 - + drivers/gpu/drm/nouveau/nouveau_hwmon.c | 10 +- + drivers/gpu/drm/nouveau/nouveau_led.h | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/runl.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/nvfw/acr.c | 2 +- + drivers/gpu/drm/omapdrm/Kconfig | 2 +- + drivers/gpu/drm/panel/Kconfig | 31 + + drivers/gpu/drm/panel/Makefile | 3 + + drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c | 126 + + drivers/gpu/drm/panel/panel-jadard-jd9365da-h3.c | 209 +- + .../gpu/drm/panel/panel-magnachip-d53e6ea8966.c | 522 +++ + drivers/gpu/drm/panel/panel-novatek-nt36523.c | 777 ++++ + drivers/gpu/drm/panel/panel-seiko-43wvf1g.c | 12 + + drivers/gpu/drm/panel/panel-sitronix-st7701.c | 144 + + drivers/gpu/drm/panel/panel-sony-td4353-jdi.c | 329 ++ + drivers/gpu/drm/panfrost/panfrost_drv.c | 11 +- + drivers/gpu/drm/pl111/pl111_drv.c | 4 +- + drivers/gpu/drm/qxl/qxl_ttm.c | 11 + + drivers/gpu/drm/radeon/Kconfig | 1 + + drivers/gpu/drm/radeon/radeon.h | 55 +- + drivers/gpu/drm/radeon/radeon_ib.c | 12 +- + drivers/gpu/drm/radeon/radeon_object.h | 25 +- + drivers/gpu/drm/radeon/radeon_sa.c | 316 +- + drivers/gpu/drm/radeon/radeon_semaphore.c | 4 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 7 +- + drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 5 - + drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 41 +- + drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 16 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 19 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 6 + + drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 84 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop2.h | 5 - + drivers/gpu/drm/rockchip/rockchip_rgb.c | 19 +- + drivers/gpu/drm/rockchip/rockchip_rgb.h | 6 +- + drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 18 + + drivers/gpu/drm/scheduler/sched_main.c | 29 + + drivers/gpu/drm/sti/Kconfig | 2 +- + drivers/gpu/drm/sti/sti_drv.c | 4 +- + drivers/gpu/drm/stm/Kconfig | 2 +- + drivers/gpu/drm/stm/drv.c | 4 +- + drivers/gpu/drm/sun4i/sun4i_drv.c | 4 +- + drivers/gpu/drm/tests/drm_format_helper_test.c | 17 +- + drivers/gpu/drm/tests/drm_kunit_helpers.c | 6 - + drivers/gpu/drm/tidss/tidss_dispc.c | 12 +- + drivers/gpu/drm/tidss/tidss_dispc.h | 8 +- + drivers/gpu/drm/tidss/tidss_drv.c | 4 +- + drivers/gpu/drm/tidss/tidss_plane.c | 20 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 4 +- + drivers/gpu/drm/tiny/arcpgu.c | 4 +- + drivers/gpu/drm/tiny/cirrus.c | 499 ++- + drivers/gpu/drm/tiny/simpledrm.c | 31 +- + drivers/gpu/drm/ttm/ttm_bo.c | 33 +- + drivers/gpu/drm/ttm/ttm_bo_util.c | 19 +- + drivers/gpu/drm/ttm/ttm_device.c | 1 - + drivers/gpu/drm/ttm/ttm_resource.c | 1 - + drivers/gpu/drm/tve200/tve200_drv.c | 4 +- + drivers/gpu/drm/v3d/v3d_gem.c | 26 +- + drivers/gpu/drm/vc4/vc4_drv.c | 4 +- + drivers/gpu/drm/vc4/vc4_drv.h | 2 +- + drivers/gpu/drm/vc4/vc4_gem.c | 78 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 46 +- + drivers/gpu/drm/vc4/vc4_hdmi.h | 1 - + drivers/gpu/drm/vc4/vc4_validate.c | 4 +- + drivers/gpu/drm/vgem/vgem_fence.c | 1 + + drivers/gpu/drm/virtio/Kconfig | 11 + + drivers/gpu/drm/virtio/virtgpu_display.c | 6 + + drivers/gpu/drm/virtio/virtgpu_drv.c | 4 + + drivers/gpu/drm/virtio/virtgpu_kms.c | 39 +- + drivers/gpu/drm/virtio/virtgpu_plane.c | 4 + + drivers/gpu/drm/virtio/virtgpu_vq.c | 3 +- + drivers/gpu/drm/vmwgfx/Makefile | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 407 +- + drivers/gpu/drm/vmwgfx/vmwgfx_bo.h | 203 + + drivers/gpu/drm/vmwgfx/vmwgfx_cmd.c | 14 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c | 53 +- + drivers/gpu/drm/vmwgfx/vmwgfx_context.c | 36 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c | 65 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 26 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 245 +- + drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 105 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_gem.c | 93 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 232 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 43 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 57 +- + drivers/gpu/drm/vmwgfx/vmwgfx_mob.c | 45 +- + drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c | 22 +- + drivers/gpu/drm/vmwgfx/vmwgfx_page_dirty.c | 68 +- + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 246 +- + drivers/gpu/drm/vmwgfx/vmwgfx_resource_priv.h | 10 +- + drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 53 +- + drivers/gpu/drm/vmwgfx/vmwgfx_shader.c | 67 +- + drivers/gpu/drm/vmwgfx/vmwgfx_so.c | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 323 +- + drivers/gpu/drm/vmwgfx/vmwgfx_streamoutput.c | 20 +- + drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 107 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 134 +- + drivers/gpu/drm/vmwgfx/vmwgfx_va.c | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_validation.c | 150 +- + drivers/gpu/drm/vmwgfx/vmwgfx_validation.h | 10 +- + drivers/gpu/drm/xlnx/zynqmp_kms.c | 4 +- + drivers/gpu/ipu-v3/Kconfig | 2 +- + drivers/misc/mei/client.c | 4 +- + drivers/misc/mei/pci-me.c | 20 +- + drivers/ps3/ps3av.c | 9 +- + drivers/video/Kconfig | 3 + + drivers/video/Makefile | 1 + + drivers/video/cmdline.c | 133 + + drivers/video/fbdev/Kconfig | 5 +- + drivers/video/fbdev/core/Makefile | 3 +- + drivers/video/fbdev/core/fb_cmdline.c | 94 +- + drivers/video/fbdev/core/modedb.c | 8 +- + include/drm/drm_atomic_helper.h | 26 + + include/drm/drm_displayid.h | 12 +- + include/drm/drm_drv.h | 19 - + include/drm/drm_edid.h | 12 +- + include/drm/drm_fbdev_dma.h | 15 + + include/drm/drm_gem.h | 12 + + include/drm/drm_gem_shmem_helper.h | 30 +- + include/drm/drm_modeset_helper_vtables.h | 29 +- + include/drm/drm_of.h | 12 + + include/drm/drm_suballoc.h | 108 + + include/drm/gpu_scheduler.h | 6 + + include/drm/i915_pciids.h | 14 +- + include/drm/ttm/ttm_device.h | 2 +- + include/drm/ttm/ttm_tt.h | 10 +- + include/linux/fb.h | 1 - + include/uapi/drm/drm.h | 57 +- + include/uapi/linux/kfd_ioctl.h | 14 +- + include/video/cmdline.h | 20 + + 604 files changed, 31254 insertions(+), 14790 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/bridge/analogix,dp.yaml + delete mode 100644 Documentation/devicetree/bindings/display/bridge/analogix_dp.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/novatek,nt36523.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/samsung,ams495qa01.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/sony,td4353-jdi.yaml + delete mode 100644 Documentation/devicetree/bindings/display/rockchip/analogix_dp-rockchip.txt + delete mode 100644 Documentation/devicetree/bindings/display/rockchip/dw_mipi_dsi_rockchip.txt + create mode 100644 Documentation/devicetree/bindings/display/rockchip/rockchip,analogix-dp.yaml + create mode 100644 Documentation/devicetree/bindings/display/rockchip/rockchip,dw-mipi-dsi.yaml + create mode 100644 Documentation/devicetree/bindings/display/rockchip/rockchip,lvds.yaml + delete mode 100644 Documentation/devicetree/bindings/display/rockchip/rockchip-lvds.txt + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c + rename drivers/gpu/drm/amd/{display/dc/core/dc_link.c => amdgpu/sdma_v4_4_2.h} (82%) + delete mode 100644 drivers/gpu/drm/amd/display/dc/dc_link.h + rename drivers/gpu/drm/amd/display/include/{hdcp_types.h => hdcp_msg_types.h} (100%) + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/hdp/hdp_4_4_2_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/hdp/hdp_4_4_2_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_13_0_6_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_13_0_6_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma/sdma_4_4_2_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma/sdma_4_4_2_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_6.h + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v13_0_6_pmfw.h + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v13_0_6_ppsmc.h + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.h + create mode 100644 drivers/gpu/drm/drm_fbdev_dma.c + create mode 100644 drivers/gpu/drm/drm_suballoc.c + create mode 100644 drivers/gpu/drm/i915/display/i9xx_wm.c + create mode 100644 drivers/gpu/drm/i915/display/i9xx_wm.h + create mode 100644 drivers/gpu/drm/i915/display/intel_display_rps.c + create mode 100644 drivers/gpu/drm/i915/display/intel_display_rps.h + create mode 100644 drivers/gpu/drm/i915/display/intel_lvds_regs.h + create mode 100644 drivers/gpu/drm/i915/display/intel_vdsc_regs.h + create mode 100644 drivers/gpu/drm/i915/display/intel_wm.c + create mode 100644 drivers/gpu/drm/i915/display/intel_wm.h + rename drivers/gpu/drm/i915/{intel_pm_types.h => display/intel_wm_types.h} (89%) + create mode 100644 drivers/gpu/drm/imx/lcdc/Kconfig + create mode 100644 drivers/gpu/drm/imx/lcdc/Makefile + create mode 100644 drivers/gpu/drm/imx/lcdc/imx-lcdc.c + create mode 100644 drivers/gpu/drm/panel/panel-magnachip-d53e6ea8966.c + create mode 100644 drivers/gpu/drm/panel/panel-novatek-nt36523.c + create mode 100644 drivers/gpu/drm/panel/panel-sony-td4353-jdi.c + create mode 100644 drivers/gpu/drm/vmwgfx/vmwgfx_bo.h + create mode 100644 drivers/video/cmdline.c + create mode 100644 include/drm/drm_fbdev_dma.h + create mode 100644 include/drm/drm_suballoc.h + create mode 100644 include/video/cmdline.h +Merging drm-misc/for-linux-next (e0dfefa08d94 drm/lima: Use drm_sched_job_add_syncobj_dependency()) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc drm-misc/for-linux-next +Auto-merging drivers/gpu/drm/ttm/ttm_bo.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/arm/hdlcd_drv.c | 4 +- + drivers/gpu/drm/arm/malidp_drv.c | 3 +- + drivers/gpu/drm/bridge/adv7511/adv7533.c | 25 +- + drivers/gpu/drm/bridge/cadence/cdns-dsi-core.c | 6 +- + drivers/gpu/drm/bridge/display-connector.c | 6 +- + drivers/gpu/drm/bridge/fsl-ldb.c | 6 +- + drivers/gpu/drm/bridge/imx/imx8qm-ldb-drv.c | 6 +- + drivers/gpu/drm/bridge/imx/imx8qxp-ldb-drv.c | 6 +- + .../gpu/drm/bridge/imx/imx8qxp-pixel-combiner.c | 6 +- + drivers/gpu/drm/bridge/imx/imx8qxp-pixel-link.c | 6 +- + drivers/gpu/drm/bridge/imx/imx8qxp-pxl2dpi.c | 6 +- + drivers/gpu/drm/bridge/lvds-codec.c | 6 +- + drivers/gpu/drm/bridge/nwl-dsi.c | 5 +- + drivers/gpu/drm/bridge/sii9234.c | 5 - + drivers/gpu/drm/bridge/simple-bridge.c | 6 +- + .../gpu/drm/bridge/synopsys/dw-hdmi-ahb-audio.c | 6 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c | 6 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi-gp-audio.c | 6 +- + .../gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c | 6 +- + drivers/gpu/drm/bridge/thc63lvd1024.c | 6 +- + drivers/gpu/drm/bridge/ti-tfp410.c | 6 +- + drivers/gpu/drm/drm_connector.c | 2 +- + drivers/gpu/drm/drm_prime.c | 4 +- + drivers/gpu/drm/gma500/Makefile | 1 + + drivers/gpu/drm/gma500/fbdev.c | 344 +++++++++++++++++++++ + drivers/gpu/drm/gma500/framebuffer.c | 341 +------------------- + drivers/gpu/drm/gma500/psb_drv.c | 5 +- + drivers/gpu/drm/gma500/psb_drv.h | 19 +- + drivers/gpu/drm/gma500/psb_irq.c | 11 - + drivers/gpu/drm/lima/lima_gem.c | 12 +- + drivers/gpu/drm/tests/drm_format_helper_test.c | 141 ++++++--- + drivers/gpu/drm/ttm/ttm_bo.c | 3 +- + drivers/gpu/drm/vgem/vgem_drv.h | 11 - + 33 files changed, 517 insertions(+), 515 deletions(-) + create mode 100644 drivers/gpu/drm/gma500/fbdev.c +Merging amdgpu/drm-next (27cb295ffec7 drm/amd/display: remove outdated 8bpc comments) +$ 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.h +Merge made by the 'ort' strategy. + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 41 +++--- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 9 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c | 23 +-- + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 5 + + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 4 +- + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 14 ++ + drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 4 + + drivers/gpu/drm/amd/amdgpu/ih_v6_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c | 162 +++++++++++++++++++-- + drivers/gpu/drm/amd/amdgpu/mmsch_v4_0.h | 5 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 34 +++-- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 3 + + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 2 +- + drivers/gpu/drm/amd/display/dc/core/dc_stat.c | 28 ++-- + drivers/gpu/drm/amd/display/dc/dc_hdmi_types.h | 1 - + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 5 +- + drivers/gpu/drm/amd/display/dc/dce60/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.h | 3 +- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dccg.c | 22 +++ + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dccg.h | 3 +- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c | 2 +- + .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.h | 3 +- + .../gpu/drm/amd/display/dc/link/link_detection.c | 12 +- + .../gpu/drm/amd/display/dc/link/link_validation.c | 51 ------- + .../display/dc/link/protocols/link_dp_capability.c | 4 +- + .../display/dc/link/protocols/link_dp_training.c | 3 +- + .../dc/link/protocols/link_edp_panel_control.c | 5 + + .../drm/amd/display/include/ddc_service_types.h | 13 -- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 2 + + 38 files changed, 326 insertions(+), 179 deletions(-) +Merging drm-intel/for-linux-next (41b4c7fe72b6 drm/i915: Disable DC states for all commits) +$ 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_crtc.c +Auto-merging drivers/gpu/drm/i915/display/intel_display.c +Auto-merging drivers/gpu/drm/i915/display/intel_dmc.c +Auto-merging drivers/gpu/drm/i915/display/intel_fbdev.c +Auto-merging drivers/gpu/drm/i915/i915_driver.c +Auto-merging drivers/gpu/drm/i915/i915_reg.h +Merge made by the 'ort' strategy. + drivers/gpu/drm/i915/Makefile | 1 + + drivers/gpu/drm/i915/display/hsw_ips.c | 37 +++ + drivers/gpu/drm/i915/display/hsw_ips.h | 2 + + drivers/gpu/drm/i915/display/icl_dsi.c | 2 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 60 +++- + drivers/gpu/drm/i915/display/intel_atomic_plane.h | 1 + + drivers/gpu/drm/i915/display/intel_audio.c | 6 +- + drivers/gpu/drm/i915/display/intel_bios.c | 46 +-- + drivers/gpu/drm/i915/display/intel_color.c | 101 +++++- + drivers/gpu/drm/i915/display/intel_color.h | 1 + + drivers/gpu/drm/i915/display/intel_crtc.c | 2 +- + drivers/gpu/drm/i915/display/intel_cursor.c | 1 - + drivers/gpu/drm/i915/display/intel_ddi.c | 11 +- + drivers/gpu/drm/i915/display/intel_display.c | 156 ++++----- + drivers/gpu/drm/i915/display/intel_display.h | 3 +- + drivers/gpu/drm/i915/display/intel_display_core.h | 11 + + .../gpu/drm/i915/display/intel_display_debugfs.c | 353 ++------------------- + .../gpu/drm/i915/display/intel_display_debugfs.h | 6 +- + drivers/gpu/drm/i915/display/intel_display_power.c | 8 + + drivers/gpu/drm/i915/display/intel_dmc.c | 10 +- + drivers/gpu/drm/i915/display/intel_dp.c | 39 ++- + .../gpu/drm/i915/display/intel_dp_link_training.c | 48 ++- + .../gpu/drm/i915/display/intel_dp_link_training.h | 2 + + drivers/gpu/drm/i915/display/intel_fdi.c | 4 +- + drivers/gpu/drm/i915/display/intel_hotplug.c | 9 + + drivers/gpu/drm/i915/display/intel_modeset_setup.c | 1 + + drivers/gpu/drm/i915/display/intel_opregion.c | 40 ++- + drivers/gpu/drm/i915/display/intel_opregion.h | 5 + + drivers/gpu/drm/i915/display/intel_psr.c | 299 +++++++++++++++++ + drivers/gpu/drm/i915/display/intel_psr.h | 3 + + drivers/gpu/drm/i915/display/intel_sprite.c | 183 ----------- + drivers/gpu/drm/i915/display/intel_sprite_uapi.c | 127 ++++++++ + drivers/gpu/drm/i915/display/intel_sprite_uapi.h | 15 + + drivers/gpu/drm/i915/display/intel_vblank.c | 92 ++++++ + drivers/gpu/drm/i915/display/intel_vblank.h | 2 + + drivers/gpu/drm/i915/display/skl_universal_plane.c | 1 - + drivers/gpu/drm/i915/display/skl_watermark.c | 156 ++++++++- + drivers/gpu/drm/i915/display/vlv_dsi.c | 2 +- + drivers/gpu/drm/i915/i915_driver.c | 6 +- + drivers/gpu/drm/i915/i915_reg.h | 79 +++-- + drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 6 +- + include/drm/display/drm_dp.h | 3 + + 42 files changed, 1221 insertions(+), 719 deletions(-) + create mode 100644 drivers/gpu/drm/i915/display/intel_sprite_uapi.c + create mode 100644 drivers/gpu/drm/i915/display/intel_sprite_uapi.h +Merging drm-tegra/for-next (b9930311641c gpu: host1x: Fix uninitialized variable use) +$ git merge -m Merge branch 'for-next' of https://gitlab.freedesktop.org/drm/tegra.git drm-tegra/for-next +Merge made by the 'ort' strategy. +Merging drm-msm/msm-next (f73343fae5fb drm/msm: Update generated headers) +$ git merge -m Merge branch 'msm-next' of https://gitlab.freedesktop.org/drm/msm.git drm-msm/msm-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 1 + + drivers/gpu/drm/bridge/panel.c | 68 +- + drivers/gpu/drm/drm_atomic.c | 60 ++ + drivers/gpu/drm/msm/Kconfig | 1 + + drivers/gpu/drm/msm/adreno/a2xx.xml.h | 54 +- + drivers/gpu/drm/msm/adreno/a3xx.xml.h | 30 +- + drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 11 + + drivers/gpu/drm/msm/adreno/a4xx.xml.h | 38 +- + drivers/gpu/drm/msm/adreno/a4xx_gpu.c | 11 + + drivers/gpu/drm/msm/adreno/a5xx.xml.h | 44 +- + drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 8 +- + drivers/gpu/drm/msm/adreno/a6xx.xml.h | 795 ++++++++++++++++----- + drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 46 +- + drivers/gpu/drm/msm/adreno/a6xx_gmu.h | 7 + + drivers/gpu/drm/msm/adreno/a6xx_gmu.xml.h | 30 +- + drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 42 +- + drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 2 +- + drivers/gpu/drm/msm/adreno/adreno_common.xml.h | 52 +- + drivers/gpu/drm/msm/adreno/adreno_device.c | 27 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 99 ++- + drivers/gpu/drm/msm/adreno/adreno_pm4.xml.h | 115 ++- + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 40 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 26 +- + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 22 + + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 3 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 12 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c | 8 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 2 +- + drivers/gpu/drm/msm/disp/mdp4/mdp4.xml.h | 40 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5.xml.h | 40 +- + drivers/gpu/drm/msm/disp/mdp_common.xml.h | 40 +- + drivers/gpu/drm/msm/dp/dp_catalog.c | 80 +++ + drivers/gpu/drm/msm/dp/dp_catalog.h | 4 + + drivers/gpu/drm/msm/dp/dp_ctrl.c | 80 +++ + drivers/gpu/drm/msm/dp/dp_ctrl.h | 3 + + drivers/gpu/drm/msm/dp/dp_display.c | 36 +- + drivers/gpu/drm/msm/dp/dp_display.h | 2 + + drivers/gpu/drm/msm/dp/dp_drm.c | 173 ++++- + drivers/gpu/drm/msm/dp/dp_drm.h | 9 +- + drivers/gpu/drm/msm/dp/dp_link.c | 36 + + drivers/gpu/drm/msm/dp/dp_panel.c | 22 + + drivers/gpu/drm/msm/dp/dp_panel.h | 6 + + drivers/gpu/drm/msm/dp/dp_reg.h | 27 + + drivers/gpu/drm/msm/dsi/dsi.xml.h | 41 +- + drivers/gpu/drm/msm/dsi/dsi_phy_10nm.xml.h | 40 +- + drivers/gpu/drm/msm/dsi/dsi_phy_14nm.xml.h | 40 +- + drivers/gpu/drm/msm/dsi/dsi_phy_20nm.xml.h | 40 +- + drivers/gpu/drm/msm/dsi/dsi_phy_28nm.xml.h | 40 +- + drivers/gpu/drm/msm/dsi/dsi_phy_28nm_8960.xml.h | 40 +- + drivers/gpu/drm/msm/dsi/dsi_phy_7nm.xml.h | 36 +- + drivers/gpu/drm/msm/dsi/mmss_cc.xml.h | 40 +- + drivers/gpu/drm/msm/dsi/sfpb.xml.h | 38 +- + drivers/gpu/drm/msm/hdmi/hdmi.xml.h | 62 +- + drivers/gpu/drm/msm/hdmi/qfprom.xml.h | 40 +- + drivers/gpu/drm/msm/msm_gpu.c | 8 +- + drivers/gpu/drm/msm/msm_gpu.h | 4 - + drivers/gpu/drm/msm/msm_gpu_devfreq.c | 2 +- + include/drm/drm_atomic.h | 7 + + 58 files changed, 2025 insertions(+), 705 deletions(-) +Merging drm-msm-lumag/msm-next-lumag (0c3f3cfd8ef2 drm/msm/dp: set self refresh aware based on PSR support) +$ git merge -m Merge branch 'msm-next-lumag' of https://gitlab.freedesktop.org/lumag/msm.git drm-msm-lumag/msm-next-lumag +Auto-merging drivers/gpu/drm/bridge/panel.c +Auto-merging drivers/gpu/drm/drm_atomic.c +Merge made by the 'ort' strategy. +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 (b61c2c09c5a3 video: fbdev: xilinxfb: Convert to platform remove callback returning void) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next +Merge made by the 'ort' strategy. + drivers/video/fbdev/amba-clcd.c | 24 +++++++++++++----------- + drivers/video/fbdev/arcfb.c | 5 ++--- + drivers/video/fbdev/au1100fb.c | 11 +++-------- + drivers/video/fbdev/au1200fb.c | 6 ++---- + drivers/video/fbdev/broadsheetfb.c | 5 ++--- + drivers/video/fbdev/bw2.c | 6 ++---- + drivers/video/fbdev/cg14.c | 6 ++---- + drivers/video/fbdev/cg3.c | 6 ++---- + drivers/video/fbdev/cg6.c | 6 ++---- + drivers/video/fbdev/clps711x-fb.c | 6 ++---- + drivers/video/fbdev/cobalt_lcdfb.c | 6 ++---- + drivers/video/fbdev/da8xx-fb.c | 6 ++---- + drivers/video/fbdev/efifb.c | 6 ++---- + drivers/video/fbdev/ep93xx-fb.c | 6 ++---- + drivers/video/fbdev/ffb.c | 6 ++---- + drivers/video/fbdev/fsl-diu-fb.c | 6 ++---- + drivers/video/fbdev/gbefb.c | 6 ++---- + drivers/video/fbdev/goldfishfb.c | 5 ++--- + drivers/video/fbdev/grvga.c | 6 ++---- + drivers/video/fbdev/hecubafb.c | 5 ++--- + drivers/video/fbdev/hgafb.c | 6 ++---- + drivers/video/fbdev/hitfb.c | 6 ++---- + drivers/video/fbdev/imxfb.c | 6 ++---- + drivers/video/fbdev/leo.c | 6 ++---- + drivers/video/fbdev/mb862xx/mb862xxfbdrv.c | 5 ++--- + drivers/video/fbdev/metronomefb.c | 5 ++--- + drivers/video/fbdev/mx3fb.c | 5 ++--- + drivers/video/fbdev/ocfb.c | 6 ++---- + drivers/video/fbdev/offb.c | 8 +++----- + drivers/video/fbdev/omap/omapfb_main.c | 6 ++---- + drivers/video/fbdev/omap2/omapfb/dss/core.c | 6 ++---- + drivers/video/fbdev/omap2/omapfb/dss/dispc.c | 5 ++--- + drivers/video/fbdev/omap2/omapfb/dss/dpi.c | 5 ++--- + drivers/video/fbdev/omap2/omapfb/dss/dsi.c | 5 ++--- + drivers/video/fbdev/omap2/omapfb/dss/dss.c | 5 ++--- + drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c | 5 ++--- + drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c | 5 ++--- + drivers/video/fbdev/omap2/omapfb/dss/sdi.c | 5 ++--- + drivers/video/fbdev/omap2/omapfb/dss/venc.c | 5 ++--- + drivers/video/fbdev/omap2/omapfb/omapfb-main.c | 6 ++---- + drivers/video/fbdev/p9100.c | 6 ++---- + drivers/video/fbdev/platinumfb.c | 6 ++---- + drivers/video/fbdev/pxa168fb.c | 8 +++----- + drivers/video/fbdev/pxa3xx-gcu.c | 6 ++---- + drivers/video/fbdev/pxafb.c | 8 +++----- + drivers/video/fbdev/s1d13xxxfb.c | 5 ++--- + drivers/video/fbdev/s3c-fb.c | 6 ++---- + drivers/video/fbdev/sh7760fb.c | 6 ++---- + drivers/video/fbdev/sh_mobile_lcdcfb.c | 5 ++--- + drivers/video/fbdev/simplefb.c | 6 ++---- + drivers/video/fbdev/sm501fb.c | 6 ++---- + drivers/video/fbdev/tcx.c | 6 ++---- + drivers/video/fbdev/uvesafb.c | 6 ++---- + drivers/video/fbdev/vesafb.c | 6 ++---- + drivers/video/fbdev/vfb.c | 5 ++--- + drivers/video/fbdev/vga16fb.c | 6 ++---- + drivers/video/fbdev/via/via-gpio.c | 5 ++--- + drivers/video/fbdev/via/via_i2c.c | 5 ++--- + drivers/video/fbdev/vt8500lcdfb.c | 6 ++---- + drivers/video/fbdev/wm8505fb.c | 6 ++---- + drivers/video/fbdev/wmt_ge_rops.c | 5 ++--- + drivers/video/fbdev/xilinxfb.c | 6 ++---- + 62 files changed, 139 insertions(+), 241 deletions(-) +Merging regmap/for-next (24d80fde40c9 regmap: cache: Silence checkpatch warning) +$ 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/regcache.c | 8 +++++++- + drivers/base/regmap/regmap-irq.c | 22 ++++++++++++++------- + drivers/base/regmap/regmap-sdw.c | 41 ++++++++++++++++++++++++---------------- + include/linux/regmap.h | 13 +++++++++---- + 4 files changed, 56 insertions(+), 28 deletions(-) +Merging sound/for-next (b1e675d1b57e ALSA: ac97: Remove redundant driver match function) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next +Auto-merging sound/usb/endpoint.c +Merge made by the 'ort' strategy. + sound/ac97_bus.c | 11 ----------- + sound/drivers/portman2x4.c | 10 ---------- + sound/pci/ymfpci/ymfpci_main.c | 5 ----- + sound/usb/card.c | 1 - + sound/usb/endpoint.c | 16 +--------------- + sound/usb/helper.c | 1 - + tools/testing/selftests/alsa/mixer-test.c | 22 +++++++++++++++------- + tools/testing/selftests/alsa/pcm-test.c | 10 ++++++++++ + 8 files changed, 26 insertions(+), 50 deletions(-) +Merging sound-asoc/for-next (54c5dc1df4b0 Merge remote-tracking branch 'asoc/for-6.4' 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 +Auto-merging sound/drivers/portman2x4.c +Merge made by the 'ort' strategy. + .../bindings/soc/fsl/cpm_qe/fsl,cpm1-scc-qmc.yaml | 162 +++ + .../bindings/soc/fsl/cpm_qe/fsl,cpm1-tsa.yaml | 205 +++ + .../devicetree/bindings/sound/adi,adau1372.yaml | 2 +- + .../devicetree/bindings/sound/adi,adau17x1.txt | 32 - + .../devicetree/bindings/sound/adi,adau17x1.yaml | 52 + + .../devicetree/bindings/sound/adi,max98396.yaml | 8 +- + .../bindings/sound/audio-graph-port.yaml | 22 +- + .../devicetree/bindings/sound/audio-graph.yaml | 8 +- + .../devicetree/bindings/sound/cirrus,cs35l41.yaml | 10 +- + .../devicetree/bindings/sound/cirrus,cs35l45.yaml | 80 +- + .../devicetree/bindings/sound/cirrus,cs42l42.yaml | 12 +- + .../devicetree/bindings/sound/everest,es8316.yaml | 4 + + .../devicetree/bindings/sound/fsl,qmc-audio.yaml | 117 ++ + .../devicetree/bindings/sound/max9867.txt | 17 - + .../devicetree/bindings/sound/maxim,max9759.txt | 18 - + .../devicetree/bindings/sound/maxim,max9759.yaml | 45 + + .../devicetree/bindings/sound/maxim,max9867.yaml | 66 + + .../devicetree/bindings/sound/mt8186-afe-pcm.yaml | 6 +- + .../sound/mt8186-mt6366-da7219-max98357.yaml | 2 +- + .../sound/mt8186-mt6366-rt1019-rt5682s.yaml | 2 +- + .../devicetree/bindings/sound/mt8192-afe-pcm.yaml | 6 +- + .../sound/mt8192-mt6359-rt1015-rt5682.yaml | 4 +- + .../devicetree/bindings/sound/mt8195-afe-pcm.yaml | 2 +- + .../devicetree/bindings/sound/mt8195-mt6359.yaml | 8 +- + .../bindings/sound/nvidia,tegra-audio-alc5632.yaml | 8 +- + .../bindings/sound/nvidia,tegra-audio-common.yaml | 4 + + .../sound/nvidia,tegra-audio-max9808x.yaml | 90 ++ + .../sound/nvidia,tegra-audio-max98090.yaml | 8 +- + .../bindings/sound/nvidia,tegra-audio-rt5631.yaml | 85 ++ + .../bindings/sound/nvidia,tegra-audio-rt5640.yaml | 6 +- + .../bindings/sound/nvidia,tegra-audio-rt5677.yaml | 26 +- + .../sound/nvidia,tegra-audio-sgtl5000.yaml | 6 +- + .../bindings/sound/nvidia,tegra-audio-wm8753.yaml | 6 +- + .../bindings/sound/nvidia,tegra-audio-wm8903.yaml | 8 +- + .../bindings/sound/nvidia,tegra-audio-wm9712.yaml | 8 +- + .../devicetree/bindings/sound/qcom,q6asm-dais.yaml | 2 +- + .../devicetree/bindings/sound/qcom,wcd9335.txt | 123 -- + .../devicetree/bindings/sound/qcom,wcd9335.yaml | 156 ++ + .../devicetree/bindings/sound/qcom,wcd934x.yaml | 1 + + .../devicetree/bindings/sound/renesas,rsnd.yaml | 129 +- + .../devicetree/bindings/sound/renesas,rz-ssi.yaml | 21 +- + .../bindings/sound/rockchip,i2s-tdm.yaml | 7 + + .../devicetree/bindings/sound/rockchip-i2s.yaml | 5 + + .../devicetree/bindings/sound/sgtl5000.yaml | 6 +- + .../devicetree/bindings/sound/simple-card.yaml | 2 +- + .../bindings/sound/socionext,uniphier-aio.yaml | 2 +- + .../devicetree/bindings/sound/tas571x.txt | 1 + + .../devicetree/bindings/sound/wlf,wm8524.yaml | 40 + + .../devicetree/bindings/sound/wlf,wm8960.yaml | 88 ++ + Documentation/devicetree/bindings/sound/wm8524.txt | 16 - + Documentation/devicetree/bindings/sound/wm8960.txt | 42 - + MAINTAINERS | 35 +- + arch/powerpc/platforms/8xx/cpm1.c | 2 +- + drivers/firmware/cirrus/cs_dsp.c | 17 +- + drivers/soc/fsl/qe/Kconfig | 23 + + drivers/soc/fsl/qe/Makefile | 2 + + drivers/soc/fsl/qe/qmc.c | 1537 ++++++++++++++++++++ + drivers/soc/fsl/qe/tsa.c | 846 +++++++++++ + drivers/soc/fsl/qe/tsa.h | 42 + + include/dt-bindings/soc/cpm1-fsl,tsa.h | 13 + + include/dt-bindings/sound/cs35l45.h | 57 + + include/linux/firmware/cirrus/cs_dsp.h | 1 + + include/soc/fsl/qe/qmc.h | 71 + + include/sound/cs35l41.h | 13 +- + include/sound/cs35l56.h | 266 ++++ + include/sound/soc-dpcm.h | 1 - + include/sound/sof/ipc4/header.h | 4 + + include/uapi/sound/sof/abi.h | 2 + + include/uapi/sound/sof/header.h | 27 +- + include/uapi/sound/sof/tokens.h | 20 +- + sound/arm/pxa2xx-ac97.c | 6 +- + sound/atmel/ac97c.c | 6 +- + sound/drivers/mts64.c | 6 +- + sound/drivers/portman2x4.c | 6 +- + sound/mips/hal2.c | 5 +- + sound/mips/sgio2audio.c | 5 +- + sound/pci/hda/cs35l41_hda.c | 6 +- + sound/pci/hda/hda_tegra.c | 6 +- + sound/ppc/powermac.c | 5 +- + sound/sh/aica.c | 7 +- + sound/sh/sh_dac_audio.c | 5 +- + sound/soc/adi/axi-i2s.c | 6 +- + sound/soc/adi/axi-spdif.c | 6 +- + sound/soc/amd/acp-pcm-dma.c | 6 +- + sound/soc/amd/acp/acp-rembrandt.c | 13 +- + sound/soc/amd/acp/acp-renoir.c | 5 +- + sound/soc/amd/ps/ps-pdm-dma.c | 5 +- + sound/soc/amd/raven/acp3x-pcm-dma.c | 5 +- + sound/soc/amd/renoir/acp3x-pdm-dma.c | 5 +- + sound/soc/amd/vangogh/acp5x-mach.c | 297 ++-- + sound/soc/amd/vangogh/acp5x-pcm-dma.c | 5 +- + sound/soc/amd/yc/acp6x-pdm-dma.c | 5 +- + sound/soc/apple/mca.c | 5 +- + sound/soc/atmel/atmel-i2s.c | 6 +- + sound/soc/atmel/atmel_wm8904.c | 6 +- + sound/soc/atmel/mchp-i2s-mcc.c | 6 +- + sound/soc/atmel/mchp-pdmc.c | 25 +- + sound/soc/atmel/mchp-spdifrx.c | 6 +- + sound/soc/atmel/mchp-spdiftx.c | 51 +- + sound/soc/atmel/mikroe-proto.c | 6 +- + sound/soc/atmel/sam9g20_wm8731.c | 6 +- + sound/soc/atmel/sam9x5_wm8731.c | 6 +- + sound/soc/atmel/tse850-pcm5142.c | 6 +- + sound/soc/au1x/ac97c.c | 6 +- + sound/soc/au1x/i2sc.c | 6 +- + sound/soc/au1x/psc-ac97.c | 6 +- + sound/soc/au1x/psc-i2s.c | 6 +- + sound/soc/bcm/bcm63xx-i2s-whistler.c | 5 +- + sound/soc/bcm/cygnus-ssp.c | 6 +- + sound/soc/cirrus/edb93xx.c | 6 +- + sound/soc/cirrus/ep93xx-i2s.c | 5 +- + sound/soc/codecs/Kconfig | 44 + + sound/soc/codecs/Makefile | 10 + + sound/soc/codecs/adau1977-spi.c | 2 +- + sound/soc/codecs/cs35l41-lib.c | 73 +- + sound/soc/codecs/cs35l41.c | 144 +- + sound/soc/codecs/cs35l41.h | 1 + + sound/soc/codecs/cs35l45-i2c.c | 3 + + sound/soc/codecs/cs35l45-spi.c | 5 + + sound/soc/codecs/cs35l45-tables.c | 135 +- + sound/soc/codecs/cs35l45.c | 630 +++++++- + sound/soc/codecs/cs35l45.h | 267 +++- + sound/soc/codecs/cs35l56-i2c.c | 83 ++ + sound/soc/codecs/cs35l56-sdw.c | 528 +++++++ + sound/soc/codecs/cs35l56-shared.c | 390 +++++ + sound/soc/codecs/cs35l56-spi.c | 81 ++ + sound/soc/codecs/cs35l56.c | 1461 +++++++++++++++++++ + sound/soc/codecs/cs35l56.h | 77 + + sound/soc/codecs/cs47l15.c | 6 +- + sound/soc/codecs/cs47l24.c | 6 +- + sound/soc/codecs/cs47l35.c | 6 +- + sound/soc/codecs/cs47l85.c | 6 +- + sound/soc/codecs/cs47l90.c | 6 +- + sound/soc/codecs/cs47l92.c | 6 +- + sound/soc/codecs/inno_rk3036.c | 6 +- + sound/soc/codecs/lpass-macro-common.c | 2 +- + sound/soc/codecs/lpass-rx-macro.c | 6 +- + sound/soc/codecs/lpass-tx-macro.c | 6 +- + sound/soc/codecs/lpass-va-macro.c | 6 +- + sound/soc/codecs/lpass-wsa-macro.c | 6 +- + sound/soc/codecs/max9867.c | 19 +- + sound/soc/codecs/msm8916-wcd-analog.c | 6 +- + sound/soc/codecs/msm8916-wcd-digital.c | 6 +- + sound/soc/codecs/mt6358.c | 2 +- + sound/soc/codecs/mt6359.c | 2 +- + sound/soc/codecs/nau8821.c | 96 ++ + sound/soc/codecs/nau8821.h | 23 + + sound/soc/codecs/pcm179x-spi.c | 2 +- + sound/soc/codecs/rk817_codec.c | 6 +- + sound/soc/codecs/rt1019.c | 2 +- + sound/soc/codecs/sma1303.c | 2 +- + sound/soc/codecs/src4xxx-i2c.c | 2 +- + sound/soc/codecs/sta32x.c | 39 +- + sound/soc/codecs/sta350.c | 63 +- + sound/soc/codecs/tas5086.c | 2 +- + sound/soc/codecs/tas571x.c | 59 + + sound/soc/codecs/wcd938x.c | 6 +- + sound/soc/codecs/wm5102.c | 6 +- + sound/soc/codecs/wm5110.c | 6 +- + sound/soc/codecs/wm8994.c | 6 +- + sound/soc/codecs/wm8997.c | 6 +- + sound/soc/codecs/wm8998.c | 6 +- + sound/soc/codecs/wm_adsp.c | 63 +- + sound/soc/codecs/wm_adsp.h | 3 + + sound/soc/codecs/zl38060.c | 2 +- + sound/soc/dwc/dwc-i2s.c | 5 +- + sound/soc/fsl/Kconfig | 9 + + sound/soc/fsl/Makefile | 2 + + sound/soc/fsl/eukrea-tlv320.c | 6 +- + sound/soc/fsl/fsl-asoc-card.c | 7 +- + sound/soc/fsl/fsl_asrc.c | 6 +- + sound/soc/fsl/fsl_aud2htx.c | 6 +- + sound/soc/fsl/fsl_audmix.c | 6 +- + sound/soc/fsl/fsl_dma.c | 6 +- + sound/soc/fsl/fsl_easrc.c | 6 +- + sound/soc/fsl/fsl_esai.c | 6 +- + sound/soc/fsl/fsl_mqs.c | 5 +- + sound/soc/fsl/fsl_qmc_audio.c | 735 ++++++++++ + sound/soc/fsl/fsl_rpmsg.c | 6 +- + sound/soc/fsl/fsl_sai.c | 18 +- + sound/soc/fsl/fsl_spdif.c | 6 +- + sound/soc/fsl/fsl_ssi.c | 8 +- + sound/soc/fsl/fsl_xcvr.c | 5 +- + sound/soc/fsl/imx-audmux.c | 6 +- + sound/soc/fsl/imx-card.c | 2 +- + sound/soc/fsl/imx-pcm-rpmsg.c | 6 +- + sound/soc/fsl/imx-sgtl5000.c | 6 +- + sound/soc/fsl/mpc5200_psc_ac97.c | 5 +- + sound/soc/fsl/mpc5200_psc_i2s.c | 5 +- + sound/soc/fsl/mpc8610_hpcd.c | 6 +- + sound/soc/fsl/p1022_ds.c | 6 +- + sound/soc/fsl/p1022_rdk.c | 6 +- + sound/soc/fsl/pcm030-audio-fabric.c | 6 +- + sound/soc/generic/audio-graph-card.c | 2 +- + sound/soc/generic/audio-graph-card2.c | 2 +- + sound/soc/generic/test-component.c | 6 +- + sound/soc/img/img-i2s-in.c | 6 +- + sound/soc/img/img-i2s-out.c | 6 +- + sound/soc/img/img-parallel-out.c | 6 +- + sound/soc/img/img-spdif-in.c | 6 +- + sound/soc/img/img-spdif-out.c | 6 +- + sound/soc/img/pistachio-internal-dac.c | 6 +- + sound/soc/intel/atom/sst-mfld-platform-pcm.c | 5 +- + sound/soc/intel/atom/sst/sst_acpi.c | 5 +- + sound/soc/intel/avs/path.c | 2 +- + sound/soc/intel/boards/bytcht_es8316.c | 5 +- + sound/soc/intel/boards/bytcr_rt5640.c | 5 +- + sound/soc/intel/boards/bytcr_rt5651.c | 5 +- + sound/soc/intel/boards/bytcr_wm5102.c | 5 +- + sound/soc/intel/boards/cht_bsw_max98090_ti.c | 6 +- + sound/soc/intel/boards/sof_es8336.c | 6 +- + sound/soc/intel/boards/sof_pcm512x.c | 6 +- + sound/soc/intel/boards/sof_rt5682.c | 4 +- + sound/soc/intel/boards/sof_sdw.c | 6 +- + sound/soc/intel/boards/sof_wm8804.c | 5 +- + sound/soc/intel/catpt/device.c | 6 +- + sound/soc/intel/skylake/skl-ssp-clk.c | 6 +- + sound/soc/kirkwood/kirkwood-i2s.c | 6 +- + sound/soc/mediatek/common/mtk-btcvsd.c | 5 +- + sound/soc/mediatek/mt2701/mt2701-afe-pcm.c | 6 +- + sound/soc/mediatek/mt6797/mt6797-afe-pcm.c | 6 +- + sound/soc/mediatek/mt8173/mt8173-afe-pcm.c | 5 +- + sound/soc/mediatek/mt8183/mt8183-afe-pcm.c | 6 +- + sound/soc/mediatek/mt8188/mt8188-afe-pcm.c | 6 +- + sound/soc/mediatek/mt8192/mt8192-afe-clk.c | 4 - + sound/soc/mediatek/mt8192/mt8192-afe-pcm.c | 11 +- + sound/soc/mediatek/mt8192/mt8192-dai-tdm.c | 28 +- + .../mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c | 12 +- + sound/soc/mediatek/mt8195/mt8195-afe-pcm.c | 5 +- + sound/soc/mediatek/mt8195/mt8195-dai-adda.c | 17 +- + sound/soc/mediatek/mt8195/mt8195-dai-etdm.c | 177 ++- + sound/soc/mediatek/mt8195/mt8195-dai-pcm.c | 26 +- + sound/soc/mediatek/mt8195/mt8195-mt6359.c | 2 +- + sound/soc/meson/aiu.c | 6 +- + sound/soc/mxs/mxs-sgtl5000.c | 8 +- + sound/soc/pxa/mmp-sspa.c | 7 +- + sound/soc/pxa/pxa2xx-ac97.c | 5 +- + sound/soc/qcom/common.c | 17 +- + sound/soc/qcom/qdsp6/q6routing.c | 6 +- + sound/soc/rockchip/rockchip_i2s.c | 7 +- + sound/soc/rockchip/rockchip_pdm.c | 6 +- + sound/soc/rockchip/rockchip_rt5645.c | 6 +- + sound/soc/rockchip/rockchip_spdif.c | 6 +- + sound/soc/samsung/arndale.c | 5 +- + sound/soc/samsung/i2s.c | 10 +- + sound/soc/samsung/odroid.c | 6 +- + sound/soc/samsung/pcm.c | 6 +- + sound/soc/samsung/snow.c | 6 +- + sound/soc/samsung/spdif.c | 6 +- + sound/soc/sh/fsi.c | 8 +- + sound/soc/sh/hac.c | 5 +- + sound/soc/sh/rcar/core.c | 6 +- + sound/soc/sh/rcar/ssi.c | 4 +- + sound/soc/sh/rz-ssi.c | 69 +- + sound/soc/sh/siu_dai.c | 5 +- + sound/soc/soc-compress.c | 7 - + sound/soc/soc-core.c | 13 - + sound/soc/soc-dai.c | 3 + + sound/soc/soc-jack.c | 1 + + sound/soc/soc-pcm.c | 10 +- + sound/soc/sof/amd/acp-common.c | 1 + + sound/soc/sof/amd/acp-pcm.c | 34 + + sound/soc/sof/amd/acp.h | 2 + + sound/soc/sof/intel/Makefile | 2 +- + sound/soc/sof/intel/hda-ctrl.c | 8 +- + sound/soc/sof/intel/hda-dai-ops.c | 343 +++++ + sound/soc/sof/intel/hda-dai.c | 688 +++------ + sound/soc/sof/intel/hda-dsp.c | 10 +- + sound/soc/sof/intel/hda-loader.c | 7 +- + sound/soc/sof/intel/hda-stream.c | 15 +- + sound/soc/sof/intel/hda.c | 88 +- + sound/soc/sof/intel/hda.h | 43 +- + sound/soc/sof/intel/mtl.c | 2 +- + sound/soc/sof/ipc3-control.c | 90 +- + sound/soc/sof/ipc4-control.c | 260 +++- + sound/soc/sof/ipc4-mtrace.c | 21 + + sound/soc/sof/ipc4-pcm.c | 66 +- + sound/soc/sof/ipc4-topology.c | 1077 ++++++++++---- + sound/soc/sof/ipc4-topology.h | 87 +- + sound/soc/sof/loader.c | 4 +- + sound/soc/sof/sof-audio.c | 61 +- + sound/soc/sof/sof-audio.h | 37 +- + sound/soc/sof/topology.c | 124 +- + sound/soc/sprd/sprd-mcdt.c | 6 +- + sound/soc/stm/stm32_adfsdm.c | 6 +- + sound/soc/stm/stm32_i2s.c | 8 +- + sound/soc/stm/stm32_sai_sub.c | 10 +- + sound/soc/stm/stm32_spdifrx.c | 6 +- + sound/soc/sunxi/sun4i-codec.c | 6 +- + sound/soc/sunxi/sun4i-i2s.c | 6 +- + sound/soc/sunxi/sun4i-spdif.c | 6 +- + sound/soc/sunxi/sun50i-dmic.c | 6 +- + sound/soc/sunxi/sun8i-codec.c | 6 +- + sound/soc/tegra/Kconfig | 18 + + sound/soc/tegra/tegra186_asrc.c | 6 +- + sound/soc/tegra/tegra186_dspk.c | 6 +- + sound/soc/tegra/tegra20_ac97.c | 6 +- + sound/soc/tegra/tegra20_i2s.c | 6 +- + sound/soc/tegra/tegra210_admaif.c | 6 +- + sound/soc/tegra/tegra210_adx.c | 6 +- + sound/soc/tegra/tegra210_ahub.c | 6 +- + sound/soc/tegra/tegra210_amx.c | 6 +- + sound/soc/tegra/tegra210_dmic.c | 6 +- + sound/soc/tegra/tegra210_i2s.c | 6 +- + sound/soc/tegra/tegra210_mixer.c | 6 +- + sound/soc/tegra/tegra210_mvc.c | 6 +- + sound/soc/tegra/tegra210_ope.c | 6 +- + sound/soc/tegra/tegra210_sfc.c | 6 +- + sound/soc/tegra/tegra30_ahub.c | 6 +- + sound/soc/tegra/tegra30_i2s.c | 6 +- + sound/soc/tegra/tegra_asoc_machine.c | 127 +- + sound/soc/ti/ams-delta.c | 5 +- + sound/soc/ti/davinci-i2s.c | 6 +- + sound/soc/ti/davinci-mcasp.c | 6 +- + sound/soc/ti/omap-hdmi.c | 5 +- + sound/soc/ti/omap-mcbsp.c | 6 +- + sound/soc/uniphier/evea.c | 6 +- + sound/soc/ux500/mop500.c | 6 +- + sound/soc/ux500/ux500_msp_dai.c | 6 +- + sound/soc/xilinx/xlnx_formatter_pcm.c | 5 +- + sound/soc/xilinx/xlnx_spdif.c | 5 +- + sound/soc/xtensa/xtfpga-i2s.c | 5 +- + sound/sparc/cs4231.c | 6 +- + sound/sparc/dbri.c | 6 +- + 324 files changed, 12174 insertions(+), 2665 deletions(-) + create mode 100644 Documentation/devicetree/bindings/soc/fsl/cpm_qe/fsl,cpm1-scc-qmc.yaml + create mode 100644 Documentation/devicetree/bindings/soc/fsl/cpm_qe/fsl,cpm1-tsa.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/adi,adau17x1.txt + create mode 100644 Documentation/devicetree/bindings/sound/adi,adau17x1.yaml + create mode 100644 Documentation/devicetree/bindings/sound/fsl,qmc-audio.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/max9867.txt + delete mode 100644 Documentation/devicetree/bindings/sound/maxim,max9759.txt + create mode 100644 Documentation/devicetree/bindings/sound/maxim,max9759.yaml + create mode 100644 Documentation/devicetree/bindings/sound/maxim,max9867.yaml + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-max9808x.yaml + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-rt5631.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/qcom,wcd9335.txt + create mode 100644 Documentation/devicetree/bindings/sound/qcom,wcd9335.yaml + create mode 100644 Documentation/devicetree/bindings/sound/wlf,wm8524.yaml + create mode 100644 Documentation/devicetree/bindings/sound/wlf,wm8960.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/wm8524.txt + delete mode 100644 Documentation/devicetree/bindings/sound/wm8960.txt + create mode 100644 drivers/soc/fsl/qe/qmc.c + create mode 100644 drivers/soc/fsl/qe/tsa.c + create mode 100644 drivers/soc/fsl/qe/tsa.h + create mode 100644 include/dt-bindings/soc/cpm1-fsl,tsa.h + create mode 100644 include/soc/fsl/qe/qmc.h + create mode 100644 include/sound/cs35l56.h + create mode 100644 sound/soc/codecs/cs35l56-i2c.c + create mode 100644 sound/soc/codecs/cs35l56-sdw.c + create mode 100644 sound/soc/codecs/cs35l56-shared.c + create mode 100644 sound/soc/codecs/cs35l56-spi.c + create mode 100644 sound/soc/codecs/cs35l56.c + create mode 100644 sound/soc/codecs/cs35l56.h + create mode 100644 sound/soc/fsl/fsl_qmc_audio.c + create mode 100644 sound/soc/sof/intel/hda-dai-ops.c +Merging modules/modules-next (3703bd54cd37 kallsyms: Delete an unused parameter related to {module_}kallsyms_on_each_symbol()) +$ git merge -m Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules/modules-next +Auto-merging include/linux/module.h +Auto-merging kernel/module/internal.h +Auto-merging kernel/trace/ftrace.c +Merge made by the 'ort' strategy. + arch/arc/kernel/unwind.c | 12 +- + arch/arm/boot/compressed/decompress.c | 1 + + arch/arm/kernel/module-plts.c | 9 +- + arch/arm64/kernel/module-plts.c | 13 +- + arch/ia64/kernel/module.c | 24 +- + arch/mips/kernel/vpe.c | 11 +- + arch/parisc/kernel/module.c | 51 ++--- + arch/powerpc/kernel/module_32.c | 7 +- + arch/s390/kernel/module.c | 26 ++- + arch/x86/kernel/callthunks.c | 4 +- + arch/x86/kernel/module.c | 4 +- + drivers/infiniband/ulp/srp/ib_srp.c | 5 - + include/linux/dynamic_debug.h | 68 +++--- + include/linux/kallsyms.h | 7 +- + include/linux/module.h | 141 +++++++++--- + kernel/kallsyms.c | 5 +- + kernel/kallsyms_selftest.c | 6 +- + kernel/livepatch/core.c | 3 +- + kernel/module/internal.h | 42 ++-- + kernel/module/kallsyms.c | 63 +++--- + kernel/module/kdb.c | 17 +- + kernel/module/main.c | 410 ++++++++++++++++------------------ + kernel/module/procfs.c | 16 +- + kernel/module/strict_rwx.c | 99 ++------ + kernel/module/tree_lookup.c | 39 ++-- + kernel/params.c | 2 +- + kernel/trace/ftrace.c | 3 +- + lib/Makefile | 3 + + lib/dynamic_debug.c | 51 ++++- + 29 files changed, 573 insertions(+), 569 deletions(-) +Merging input/next (6906f5060d39 Input: iqs62x-keys - suppress duplicated error message in .remove()) +$ 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/touchscreen/sun4i-ts.c +Merge made by the 'ort' strategy. + .../bindings/input/google,cros-ec-keyb.yaml | 2 +- + arch/arm/mach-pxa/spitz.c | 1 + + drivers/input/keyboard/gpio_keys.c | 3 + + drivers/input/keyboard/iqs62x-keys.c | 2 +- + drivers/input/keyboard/matrix_keypad.c | 6 +- + drivers/input/keyboard/omap4-keypad.c | 3 +- + drivers/input/keyboard/samsung-keypad.c | 3 +- + drivers/input/keyboard/st-keyscan.c | 2 +- + drivers/input/keyboard/tegra-kbc.c | 3 +- + drivers/input/keyboard/tm2-touchkey.c | 2 +- + drivers/input/misc/Kconfig | 11 ++ + drivers/input/misc/Makefile | 1 + + drivers/input/misc/hp_sdc_rtc.c | 2 +- + drivers/input/misc/nxp-bbnsm-pwrkey.c | 193 +++++++++++++++++++++ + drivers/input/touchscreen/bcm_iproc_tsc.c | 2 +- + drivers/input/touchscreen/hideep.c | 33 +++- + drivers/input/touchscreen/sun4i-ts.c | 2 +- + drivers/input/touchscreen/zinitix.c | 2 +- + include/linux/input/matrix_keypad.h | 5 +- + 19 files changed, 254 insertions(+), 24 deletions(-) + create mode 100644 drivers/input/misc/nxp-bbnsm-pwrkey.c +Merging block/for-next (d78e81b3fb2f Merge branch 'for-6.4/block' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next +Auto-merging block/blk-core.c +Auto-merging block/blk-mq.c +Auto-merging fs/cifs/file.c +Auto-merging fs/direct-io.c +Auto-merging fs/proc/proc_sysctl.c +Auto-merging fs/splice.c +Auto-merging include/linux/blk-mq.h +Auto-merging include/linux/blkdev.h +Auto-merging include/linux/fs.h +Auto-merging mm/filemap.c +Auto-merging mm/shmem.c +Merge made by the 'ort' strategy. + Documentation/ABI/stable/sysfs-block | 15 +- + Documentation/block/inline-encryption.rst | 3 +- + block/bio.c | 29 +- + block/blk-core.c | 6 - + block/blk-crypto-internal.h | 38 +-- + block/blk-crypto-profile.c | 60 ++--- + block/blk-crypto.c | 66 +++-- + block/blk-map.c | 22 +- + block/blk-merge.c | 2 + + block/blk-mq-debugfs.c | 26 -- + block/blk-mq.c | 225 ++-------------- + block/blk-stat.c | 18 -- + block/blk-sysfs.c | 25 +- + block/blk.h | 12 + + drivers/block/nbd.c | 9 +- + drivers/char/random.c | 4 +- + drivers/md/dm-table.c | 19 +- + drivers/tty/tty_io.c | 4 +- + fs/cifs/cifsfs.c | 8 +- + fs/cifs/cifsfs.h | 3 - + fs/cifs/file.c | 16 -- + fs/coda/file.c | 29 +- + fs/direct-io.c | 2 + + fs/ext4/file.c | 3 +- + fs/iomap/direct-io.c | 1 - + fs/kernfs/file.c | 2 +- + fs/overlayfs/file.c | 23 +- + fs/proc/inode.c | 4 +- + fs/proc/proc_sysctl.c | 2 +- + fs/proc_namespace.c | 6 +- + fs/splice.c | 76 +++--- + fs/xfs/xfs_file.c | 3 +- + include/linux/bio.h | 5 +- + include/linux/blk-crypto.h | 4 +- + include/linux/blk-mq.h | 2 - + include/linux/blk_types.h | 3 +- + include/linux/blkdev.h | 12 - + include/linux/fs.h | 3 + + include/linux/io_uring_types.h | 3 +- + include/linux/splice.h | 3 + + include/linux/uio.h | 14 - + include/uapi/linux/io_uring.h | 19 +- + io_uring/alloc_cache.h | 30 ++- + io_uring/io-wq.c | 180 +++++-------- + io_uring/io_uring.c | 76 +++++- + io_uring/kbuf.c | 162 ++++++++--- + io_uring/kbuf.h | 7 + + io_uring/net.h | 5 +- + io_uring/rw.c | 2 +- + lib/iov_iter.c | 429 +----------------------------- + mm/filemap.c | 4 +- + mm/shmem.c | 134 +++++++++- + 52 files changed, 735 insertions(+), 1123 deletions(-) +Merging device-mapper/for-next (d3aa3e060c4a dm stats: check for and propagate alloc_percpu failure) +$ 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 +Auto-merging drivers/md/dm-crypt.c +Auto-merging drivers/md/dm.c +Merge made by the 'ort' strategy. + drivers/md/dm-crypt.c | 16 ++++++++++------ + drivers/md/dm-stats.c | 7 ++++++- + drivers/md/dm-stats.h | 2 +- + drivers/md/dm-thin.c | 2 ++ + drivers/md/dm.c | 4 +++- + 5 files changed, 22 insertions(+), 9 deletions(-) +Merging libata/for-next (672b7ad20f7b ata: Use of_property_present() for testing DT property presence) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git libata/for-next +Auto-merging drivers/ata/pata_parport/pata_parport.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/ata/ahci-platform.yaml | 49 +++++++++- + drivers/ata/Kconfig | 1 + + drivers/ata/ahci_mtk.c | 2 +- + drivers/ata/libahci_platform.c | 2 +- + drivers/ata/pata_parport/aten.c | 45 +++------ + drivers/ata/pata_parport/bpck.c | 86 +++++------------ + drivers/ata/pata_parport/bpck6.c | 107 +++++---------------- + drivers/ata/pata_parport/comm.c | 52 +++------- + drivers/ata/pata_parport/dstr.c | 45 +++------ + drivers/ata/pata_parport/epat.c | 48 ++++----- + drivers/ata/pata_parport/epia.c | 55 +++-------- + drivers/ata/pata_parport/fit2.c | 37 +++---- + drivers/ata/pata_parport/fit3.c | 39 +++----- + drivers/ata/pata_parport/friq.c | 56 ++++------- + drivers/ata/pata_parport/frpw.c | 71 ++++---------- + drivers/ata/pata_parport/kbic.c | 66 ++++++------- + drivers/ata/pata_parport/ktti.c | 38 +++----- + drivers/ata/pata_parport/on20.c | 45 +++------ + drivers/ata/pata_parport/on26.c | 52 +++------- + drivers/ata/pata_parport/pata_parport.c | 31 +++--- + .../ata/pata_parport}/pata_parport.h | 41 +++----- + drivers/ata/sata_dwc_460ex.c | 4 +- + include/linux/ata.h | 71 -------------- + 23 files changed, 321 insertions(+), 722 deletions(-) + rename {include/linux => drivers/ata/pata_parport}/pata_parport.h (75%) +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 (46d19dc62b45 mmc: sdhci-pci-o2micro: Fix SDR50 mode timing issue) +$ 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. + Documentation/devicetree/bindings/mmc/mtk-sd.yaml | 1 + + drivers/memstick/host/r592.c | 2 +- + drivers/mmc/core/regulator.c | 3 +++ + drivers/mmc/host/mmci.c | 22 ++++++++--------- + drivers/mmc/host/omap_hsmmc.c | 8 +++--- + drivers/mmc/host/renesas_sdhi_internal_dmac.c | 10 +++----- + drivers/mmc/host/sdhci-esdhc-imx.c | 4 +-- + drivers/mmc/host/sdhci-of-arasan.c | 9 ++++++- + drivers/mmc/host/sdhci-of-dwcmshc.c | 9 ++++++- + drivers/mmc/host/sdhci-pci-o2micro.c | 30 ++++++++++++----------- + drivers/mmc/host/sdhci-pxav2.c | 2 +- + drivers/mmc/host/sdhci-s3c.c | 4 +-- + drivers/mmc/host/tmio_mmc_core.c | 2 +- + drivers/mmc/host/wmt-sdmmc.c | 6 ++--- + 14 files changed, 64 insertions(+), 48 deletions(-) +Merging mfd/for-mfd-next (368eb79f738a dt-bindings: mfd: qcom,spmi-pmic: Add PM2250) +$ 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 drivers/gpio/Kconfig +Merge made by the 'ort' strategy. + .../devicetree/bindings/mfd/maxim,max5970.yaml | 151 +++++++ + .../devicetree/bindings/mfd/qcom,spmi-pmic.yaml | 2 + + .../devicetree/bindings/mfd/qcom,tcsr.yaml | 4 + + Documentation/devicetree/bindings/mfd/syscon.yaml | 1 + + .../devicetree/bindings/mfd/ti,nspire-misc.yaml | 51 +++ + drivers/gpio/Kconfig | 12 + + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio-ljca.c | 454 +++++++++++++++++++++ + drivers/mfd/88pm860x-core.c | 4 +- + drivers/mfd/Kconfig | 13 +- + drivers/mfd/atc260x-i2c.c | 2 +- + drivers/mfd/atmel-flexcom.c | 4 +- + drivers/mfd/atmel-smc.c | 2 +- + drivers/mfd/bcm2835-pm.c | 3 +- + drivers/mfd/da903x.c | 1 - + drivers/mfd/da9052-core.c | 1 - + drivers/mfd/da9052-i2c.c | 1 - + drivers/mfd/da9052-spi.c | 1 - + drivers/mfd/da9055-core.c | 1 - + drivers/mfd/da9055-i2c.c | 1 - + drivers/mfd/da9062-core.c | 176 ++++---- + drivers/mfd/ezx-pcap.c | 1 - + drivers/mfd/hi6421-pmic-core.c | 4 +- + drivers/mfd/intel_soc_pmic_chtwc.c | 14 +- + drivers/mfd/intel_soc_pmic_crc.c | 1 - + drivers/mfd/ipaq-micro.c | 4 +- + drivers/mfd/khadas-mcu.c | 2 +- + drivers/mfd/lp8788.c | 1 - + drivers/mfd/mfd-core.c | 26 -- + drivers/mfd/omap-usb-host.c | 1 - + drivers/mfd/omap-usb-tll.c | 1 - + drivers/mfd/qcom-pm8008.c | 131 +++--- + drivers/mfd/qcom_rpm.c | 4 +- + drivers/mfd/rsmu_spi.c | 4 +- + drivers/mfd/sec-core.c | 46 --- + drivers/mfd/sec-irq.c | 89 ---- + drivers/mfd/si476x-cmd.c | 14 +- + drivers/mfd/simple-mfd-i2c.c | 13 + + drivers/mfd/ssbi.c | 4 +- + drivers/mfd/stmpe-i2c.c | 1 - + drivers/mfd/stmpe-spi.c | 1 - + drivers/mfd/stmpe.c | 2 +- + drivers/mfd/sun4i-gpadc.c | 4 +- + drivers/mfd/tc3589x.c | 1 - + drivers/mfd/tps6586x.c | 1 - + drivers/mfd/tqmx86.c | 52 +-- + drivers/mfd/twl4030-audio.c | 1 - + drivers/mfd/twl6040.c | 1 - + drivers/mfd/wm8994-core.c | 19 +- + drivers/rtc/rtc-s5m.c | 82 +--- + include/linux/mfd/core.h | 20 +- + include/linux/mfd/max597x.h | 96 +++++ + include/linux/mfd/rt5033-private.h | 17 +- + include/linux/mfd/rt5033.h | 7 +- + include/linux/mfd/samsung/core.h | 2 - + include/linux/mfd/samsung/irq.h | 50 --- + include/linux/mfd/samsung/s5m8763.h | 90 ---- + 57 files changed, 1005 insertions(+), 688 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mfd/maxim,max5970.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/ti,nspire-misc.yaml + create mode 100644 drivers/gpio/gpio-ljca.c + create mode 100644 include/linux/mfd/max597x.h + delete mode 100644 include/linux/mfd/samsung/s5m8763.h +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 +Merge made by the 'ort' strategy. + drivers/video/backlight/aat2870_bl.c | 6 ++---- + drivers/video/backlight/adp5520_bl.c | 6 ++---- + drivers/video/backlight/arcxcnn_bl.c | 2 +- + drivers/video/backlight/as3711_bl.c | 24 ++++++++++++------------ + drivers/video/backlight/cr_bllcd.c | 6 ++---- + drivers/video/backlight/da9052_bl.c | 6 ++---- + drivers/video/backlight/hp680_bl.c | 6 ++---- + drivers/video/backlight/hx8357.c | 2 +- + drivers/video/backlight/led_bl.c | 6 ++---- + drivers/video/backlight/lm3533_bl.c | 6 ++---- + drivers/video/backlight/lp855x_bl.c | 2 +- + drivers/video/backlight/lp8788_bl.c | 6 ++---- + drivers/video/backlight/mt6370-backlight.c | 6 ++---- + drivers/video/backlight/pwm_bl.c | 6 ++---- + drivers/video/backlight/qcom-wled.c | 7 +++---- + drivers/video/backlight/rt4831-backlight.c | 6 ++---- + drivers/video/backlight/sky81452-backlight.c | 6 ++---- + 17 files changed, 42 insertions(+), 67 deletions(-) +Merging battery/for-next (2c9fafafd186 power: supply: generic-adc-battery: style fixes) +$ 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 +Auto-merging drivers/power/supply/power_supply_core.c +Merge made by the 'ort' strategy. + .../bindings/power/supply/adc-battery.yaml | 70 ++++++ + drivers/power/reset/qcom-pon.c | 2 +- + drivers/power/supply/bq24257_charger.c | 2 +- + drivers/power/supply/bq256xx_charger.c | 40 ++++ + drivers/power/supply/bq25890_charger.c | 2 +- + drivers/power/supply/charger-manager.c | 2 +- + drivers/power/supply/generic-adc-battery.c | 245 ++++++--------------- + drivers/power/supply/lp8727_charger.c | 2 +- + drivers/power/supply/ltc4162-l-charger.c | 2 +- + drivers/power/supply/power_supply_core.c | 179 +++++++++++++-- + drivers/power/supply/power_supply_sysfs.c | 23 +- + drivers/power/supply/rt9455_charger.c | 2 +- + drivers/power/supply/twl4030_charger.c | 2 +- + include/linux/power/generic-adc-battery.h | 23 -- + include/linux/power_supply.h | 8 + + 15 files changed, 373 insertions(+), 231 deletions(-) + create mode 100644 Documentation/devicetree/bindings/power/supply/adc-battery.yaml + delete mode 100644 include/linux/power/generic-adc-battery.h +Merging regulator/for-next (02ce28bc083e regulator: Set PROBE_PREFER_ASYNCHRONOUS for) +$ 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/max8973-regulator.c +Merge made by the 'ort' strategy. + .../bindings/regulator/anatop-regulator.yaml | 22 +- + .../devicetree/bindings/regulator/dlg,da9121.yaml | 2 +- + .../bindings/regulator/fixed-regulator.yaml | 2 +- + .../regulator/google,cros-ec-regulator.yaml | 2 +- + .../bindings/regulator/gpio-regulator.yaml | 2 +- + .../bindings/regulator/max77650-regulator.yaml | 2 +- + .../devicetree/bindings/regulator/max8660.yaml | 2 +- + .../devicetree/bindings/regulator/max8893.yaml | 2 +- + .../regulator/mediatek,mt6331-regulator.yaml | 12 +- + .../regulator/mediatek,mt6332-regulator.yaml | 4 +- + .../devicetree/bindings/regulator/mps,mp5416.yaml | 4 +- + .../devicetree/bindings/regulator/mps,mp886x.yaml | 2 +- + .../devicetree/bindings/regulator/mps,mpq7920.yaml | 6 +- + .../bindings/regulator/mt6315-regulator.yaml | 2 +- + .../bindings/regulator/mt6359-regulator.yaml | 16 +- + .../bindings/regulator/mt6360-regulator.yaml | 4 +- + .../bindings/regulator/nxp,pca9450-regulator.yaml | 4 +- + .../bindings/regulator/nxp,pf8x00-regulator.yaml | 4 +- + .../devicetree/bindings/regulator/pfuze100.yaml | 8 +- + .../bindings/regulator/qcom,rpmh-regulator.yaml | 8 +- + ...pberrypi,7inch-touchscreen-panel-regulator.yaml | 2 +- + .../devicetree/bindings/regulator/regulator.yaml | 22 +- + .../bindings/regulator/richtek,rt5739.yaml | 72 +++++ + .../regulator/richtek,rt6245-regulator.yaml | 8 +- + .../regulator/richtek,rtmv20-regulator.yaml | 2 +- + .../bindings/regulator/rohm,bd71815-regulator.yaml | 8 +- + .../bindings/regulator/rohm,bd71828-regulator.yaml | 8 +- + .../bindings/regulator/rohm,bd71837-regulator.yaml | 6 +- + .../bindings/regulator/rohm,bd71847-regulator.yaml | 6 +- + .../bindings/regulator/rohm,bd9576-regulator.yaml | 2 +- + .../regulator/socionext,uniphier-regulator.yaml | 2 +- + .../bindings/regulator/st,stm32-booster.yaml | 4 +- + .../bindings/regulator/st,stm32-vrefbuf.yaml | 2 +- + .../bindings/regulator/st,stm32mp1-pwr-reg.yaml | 2 +- + .../devicetree/bindings/regulator/ti,tps62360.yaml | 2 +- + .../regulator/vqmmc-ipq4019-regulator.yaml | 2 +- + .../devicetree/bindings/regulator/wlf,arizona.yaml | 6 +- + drivers/regulator/88pg86x.c | 1 + + drivers/regulator/88pm800-regulator.c | 1 + + drivers/regulator/88pm8607.c | 1 + + drivers/regulator/Kconfig | 13 + + drivers/regulator/Makefile | 1 + + drivers/regulator/aat2870-regulator.c | 1 + + drivers/regulator/ab8500-ext.c | 1 + + drivers/regulator/ab8500.c | 1 + + drivers/regulator/act8865-regulator.c | 1 + + drivers/regulator/act8945a-regulator.c | 1 + + drivers/regulator/ad5398.c | 1 + + drivers/regulator/anatop-regulator.c | 1 + + drivers/regulator/arizona-ldo1.c | 2 + + drivers/regulator/arizona-micsupp.c | 2 + + drivers/regulator/as3711-regulator.c | 1 + + drivers/regulator/as3722-regulator.c | 1 + + drivers/regulator/atc260x-regulator.c | 1 + + drivers/regulator/axp20x-regulator.c | 1 + + drivers/regulator/bcm590xx-regulator.c | 1 + + drivers/regulator/bd71815-regulator.c | 9 +- + drivers/regulator/bd71828-regulator.c | 3 +- + drivers/regulator/bd718x7-regulator.c | 1 + + drivers/regulator/bd9571mwv-regulator.c | 1 + + drivers/regulator/bd9576-regulator.c | 1 + + drivers/regulator/core.c | 7 +- + drivers/regulator/cpcap-regulator.c | 1 + + drivers/regulator/cros-ec-regulator.c | 1 + + drivers/regulator/da903x-regulator.c | 1 + + drivers/regulator/da9052-regulator.c | 1 + + drivers/regulator/da9055-regulator.c | 1 + + drivers/regulator/da9062-regulator.c | 1 + + drivers/regulator/da9063-regulator.c | 1 + + drivers/regulator/da9121-regulator.c | 1 + + drivers/regulator/da9210-regulator.c | 1 + + drivers/regulator/da9211-regulator.c | 1 + + drivers/regulator/db8500-prcmu.c | 1 + + drivers/regulator/dummy.c | 1 + + drivers/regulator/fan53555.c | 1 + + drivers/regulator/fan53880.c | 1 + + drivers/regulator/fixed.c | 3 +- + drivers/regulator/gpio-regulator.c | 3 +- + drivers/regulator/hi6421-regulator.c | 1 + + drivers/regulator/hi6421v530-regulator.c | 1 + + drivers/regulator/hi6421v600-regulator.c | 1 + + drivers/regulator/hi655x-regulator.c | 1 + + drivers/regulator/isl6271a-regulator.c | 1 + + drivers/regulator/isl9305.c | 1 + + drivers/regulator/lm363x-regulator.c | 1 + + drivers/regulator/lochnagar-regulator.c | 1 + + drivers/regulator/lp3971.c | 1 + + drivers/regulator/lp3972.c | 1 + + drivers/regulator/lp872x.c | 6 +- + drivers/regulator/lp873x-regulator.c | 1 + + drivers/regulator/lp8755.c | 1 + + drivers/regulator/lp87565-regulator.c | 1 + + drivers/regulator/lp8788-buck.c | 1 + + drivers/regulator/lp8788-ldo.c | 2 + + drivers/regulator/ltc3589.c | 1 + + drivers/regulator/ltc3676.c | 1 + + drivers/regulator/max14577-regulator.c | 1 + + drivers/regulator/max1586.c | 1 + + drivers/regulator/max20086-regulator.c | 3 +- + drivers/regulator/max20411-regulator.c | 1 + + drivers/regulator/max597x-regulator.c | 1 + + drivers/regulator/max77620-regulator.c | 1 + + drivers/regulator/max77650-regulator.c | 1 + + drivers/regulator/max77686-regulator.c | 1 + + drivers/regulator/max77693-regulator.c | 1 + + drivers/regulator/max77802-regulator.c | 1 + + drivers/regulator/max77826-regulator.c | 1 + + drivers/regulator/max8649.c | 1 + + drivers/regulator/max8660.c | 1 + + drivers/regulator/max8893.c | 1 + + drivers/regulator/max8907-regulator.c | 1 + + drivers/regulator/max8925-regulator.c | 1 + + drivers/regulator/max8952.c | 1 + + drivers/regulator/max8973-regulator.c | 1 + + drivers/regulator/max8997-regulator.c | 12 +- + drivers/regulator/max8998.c | 4 +- + drivers/regulator/mc13783-regulator.c | 1 + + drivers/regulator/mc13892-regulator.c | 1 + + drivers/regulator/mcp16502.c | 1 + + drivers/regulator/mp5416.c | 1 + + drivers/regulator/mp8859.c | 3 +- + drivers/regulator/mp886x.c | 1 + + drivers/regulator/mpq7920.c | 1 + + drivers/regulator/mt6311-regulator.c | 1 + + drivers/regulator/mt6315-regulator.c | 1 + + drivers/regulator/mt6323-regulator.c | 1 + + drivers/regulator/mt6331-regulator.c | 1 + + drivers/regulator/mt6332-regulator.c | 1 + + drivers/regulator/mt6357-regulator.c | 1 + + drivers/regulator/mt6358-regulator.c | 1 + + drivers/regulator/mt6359-regulator.c | 1 + + drivers/regulator/mt6360-regulator.c | 1 + + drivers/regulator/mt6370-regulator.c | 1 + + drivers/regulator/mt6380-regulator.c | 1 + + drivers/regulator/mt6397-regulator.c | 3 +- + drivers/regulator/mtk-dvfsrc-regulator.c | 1 + + drivers/regulator/palmas-regulator.c | 1 + + drivers/regulator/pbias-regulator.c | 1 + + drivers/regulator/pca9450-regulator.c | 1 + + drivers/regulator/pcap-regulator.c | 1 + + drivers/regulator/pcf50633-regulator.c | 1 + + drivers/regulator/pf8x00-regulator.c | 1 + + drivers/regulator/pfuze100-regulator.c | 1 + + drivers/regulator/pv88060-regulator.c | 1 + + drivers/regulator/pv88080-regulator.c | 1 + + drivers/regulator/pv88090-regulator.c | 1 + + drivers/regulator/pwm-regulator.c | 3 +- + drivers/regulator/qcom-labibb-regulator.c | 1 + + drivers/regulator/qcom-rpmh-regulator.c | 1 + + drivers/regulator/qcom_rpm-regulator.c | 1 + + drivers/regulator/qcom_smd-regulator.c | 1 + + drivers/regulator/qcom_spmi-regulator.c | 1 + + drivers/regulator/qcom_usb_vbus-regulator.c | 1 + + drivers/regulator/rc5t583-regulator.c | 1 + + drivers/regulator/rk808-regulator.c | 3 +- + drivers/regulator/rn5t618-regulator.c | 1 + + drivers/regulator/rpi-panel-attiny-regulator.c | 1 + + drivers/regulator/rt4801-regulator.c | 1 + + drivers/regulator/rt4831-regulator.c | 1 + + drivers/regulator/rt5033-regulator.c | 1 + + drivers/regulator/rt5120-regulator.c | 1 + + drivers/regulator/rt5190a-regulator.c | 1 + + drivers/regulator/rt5739.c | 291 +++++++++++++++++++++ + drivers/regulator/rt5759-regulator.c | 1 + + drivers/regulator/rt6160-regulator.c | 1 + + drivers/regulator/rt6190-regulator.c | 1 + + drivers/regulator/rt6245-regulator.c | 1 + + drivers/regulator/rtmv20-regulator.c | 1 + + drivers/regulator/rtq2134-regulator.c | 1 + + drivers/regulator/rtq6752-regulator.c | 1 + + drivers/regulator/s2mpa01.c | 1 + + drivers/regulator/s2mps11.c | 1 + + drivers/regulator/s5m8767.c | 18 +- + drivers/regulator/sc2731-regulator.c | 1 + + drivers/regulator/sky81452-regulator.c | 1 + + drivers/regulator/slg51000-regulator.c | 1 + + drivers/regulator/sm5703-regulator.c | 1 + + drivers/regulator/stm32-booster.c | 1 + + drivers/regulator/stm32-pwr.c | 1 + + drivers/regulator/stm32-vrefbuf.c | 1 + + drivers/regulator/stpmic1_regulator.c | 3 +- + drivers/regulator/stw481x-vmmc.c | 1 + + drivers/regulator/sy7636a-regulator.c | 1 + + drivers/regulator/sy8106a-regulator.c | 1 + + drivers/regulator/sy8824x.c | 1 + + drivers/regulator/sy8827n.c | 1 + + drivers/regulator/ti-abb-regulator.c | 1 + + drivers/regulator/tps51632-regulator.c | 1 + + drivers/regulator/tps6105x-regulator.c | 1 + + drivers/regulator/tps62360-regulator.c | 16 +- + drivers/regulator/tps6286x-regulator.c | 1 + + drivers/regulator/tps65023-regulator.c | 1 + + drivers/regulator/tps6507x-regulator.c | 1 + + drivers/regulator/tps65086-regulator.c | 1 + + drivers/regulator/tps65090-regulator.c | 1 + + drivers/regulator/tps65132-regulator.c | 1 + + drivers/regulator/tps65217-regulator.c | 1 + + drivers/regulator/tps65218-regulator.c | 1 + + drivers/regulator/tps65219-regulator.c | 1 + + drivers/regulator/tps6524x-regulator.c | 1 + + drivers/regulator/tps6586x-regulator.c | 1 + + drivers/regulator/tps65910-regulator.c | 1 + + drivers/regulator/tps65912-regulator.c | 1 + + drivers/regulator/tps68470-regulator.c | 1 + + drivers/regulator/twl-regulator.c | 1 + + drivers/regulator/twl6030-regulator.c | 3 +- + drivers/regulator/uniphier-regulator.c | 1 + + drivers/regulator/userspace-consumer.c | 1 + + drivers/regulator/vctrl-regulator.c | 1 + + drivers/regulator/vexpress-regulator.c | 1 + + drivers/regulator/virtual.c | 1 + + drivers/regulator/vqmmc-ipq4019-regulator.c | 1 + + drivers/regulator/wm831x-dcdc.c | 4 + + drivers/regulator/wm831x-isink.c | 1 + + drivers/regulator/wm831x-ldo.c | 3 + + drivers/regulator/wm8350-regulator.c | 1 + + drivers/regulator/wm8400-regulator.c | 1 + + drivers/regulator/wm8994-regulator.c | 1 + + 218 files changed, 692 insertions(+), 150 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regulator/richtek,rt5739.yaml + create mode 100644 drivers/regulator/rt5739.c +Merging security/next (b9b8701b4314 security: Remove integrity from the LSM list in Kconfig) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git security/next +Merge made by the 'ort' strategy. + include/linux/lsm_hook_defs.h | 2 +- + include/linux/lsm_hooks.h | 1625 +----------------------- + security/Kconfig | 16 +- + security/device_cgroup.c | 2 +- + security/integrity/iint.c | 9 +- + security/security.c | 2725 +++++++++++++++++++++++++++++++++++++++-- + 6 files changed, 2644 insertions(+), 1735 deletions(-) +Merging apparmor/apparmor-next (cb60752f0c37 apparmor: fix use of strcpy in policy_unpack_test) +$ 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 +Merge made by the 'ort' strategy. + 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_test.c | 13 ++++++------- + security/apparmor/secid.c | 3 +-- + security/apparmor/task.c | 5 +---- + 7 files changed, 13 insertions(+), 21 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 +Merge made by the 'ort' strategy. + security/integrity/ima/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +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 (79781fe466b0 selinux: update the file list in MAINTAINERS) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next +Auto-merging MAINTAINERS +Auto-merging include/linux/lsm_hooks.h +Auto-merging security/Kconfig +Auto-merging security/security.c +Merge made by the 'ort' strategy. + .../sysfs-selinux-checkreqprot | 3 + + .../{obsolete => removed}/sysfs-selinux-disable | 3 + + MAINTAINERS | 4 +- + include/linux/lsm_hooks.h | 7 - + security/Kconfig | 5 - + security/apparmor/lsm.c | 6 +- + security/bpf/hooks.c | 4 +- + security/commoncap.c | 2 +- + security/landlock/cred.c | 2 +- + security/landlock/fs.c | 2 +- + security/landlock/ptrace.c | 2 +- + security/landlock/setup.c | 4 +- + security/loadpin/loadpin.c | 2 +- + security/lockdown/lockdown.c | 2 +- + security/security.c | 4 +- + security/selinux/Kconfig | 47 -- + security/selinux/avc.c | 262 ++++----- + security/selinux/hooks.c | 612 +++++++-------------- + security/selinux/ibpkey.c | 2 +- + security/selinux/ima.c | 37 +- + security/selinux/include/avc.h | 29 +- + security/selinux/include/avc_ss.h | 3 +- + security/selinux/include/conditional.h | 4 +- + security/selinux/include/ima.h | 10 +- + security/selinux/include/security.h | 185 ++----- + security/selinux/netif.c | 2 +- + security/selinux/netlabel.c | 17 +- + security/selinux/netnode.c | 4 +- + security/selinux/netport.c | 2 +- + security/selinux/selinuxfs.c | 258 +++------ + security/selinux/ss/services.c | 346 +++++------- + security/selinux/ss/services.h | 1 - + security/selinux/status.c | 44 +- + security/selinux/xfrm.c | 20 +- + security/smack/smack_lsm.c | 4 +- + security/tomoyo/tomoyo.c | 6 +- + security/yama/yama_lsm.c | 2 +- + 37 files changed, 727 insertions(+), 1222 deletions(-) + rename Documentation/ABI/{obsolete => removed}/sysfs-selinux-checkreqprot (90%) + rename Documentation/ABI/{obsolete => removed}/sysfs-selinux-disable (90%) +Merging smack/next (502a29b04d85 smack_lsm: remove unnecessary type casting) +$ git merge -m Merge branch 'next' of git://github.com/cschaufler/smack-next smack/next +Auto-merging security/smack/smack_lsm.c +Merge made by the 'ort' strategy. + security/smack/smack_lsm.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging tomoyo/master (ab8527429de6 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 ++ + security/tomoyo/audit.c | 6 +++--- + security/tomoyo/common.c | 2 +- + security/tomoyo/common.h | 44 -------------------------------------------- + 5 files changed, 8 insertions(+), 48 deletions(-) +Merging tpmdd/next (923c8dfa9a36 tpm: fix build break in tpm-chip.c caused by AMD fTPM quirk) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tpmdd/next +Merge made by the 'ort' strategy. + drivers/char/tpm/eventlog/common.c | 6 +++--- + drivers/char/tpm/tpm-chip.c | 2 +- + drivers/char/tpm/tpm_tis_i2c_cr50.c | 3 +-- + 3 files changed, 5 insertions(+), 6 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at 1380e196af58 Merge branch 'master' of https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git +Merging next-20230320 version of tpmdd +$ git merge -m next-20230320/tpmdd 3dc8b8b705a7ad8c6938cd90453fa474c668703d +Merge made by the 'ort' strategy. + drivers/char/tpm/eventlog/common.c | 6 +++--- + drivers/char/tpm/tpm_tis_i2c_cr50.c | 3 +-- + 2 files changed, 4 insertions(+), 5 deletions(-) +Merging watchdog/master (cf3be7e82b12 watchdog: at91rm9200: Only warn once about problems in .remove()) +$ 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 (bedd29d793da Merge branches 'apple/dart', 'arm/exynos', 'arm/renesas', 'arm/smmu', 'x86/vt-d', 'x86/amd' and 'core' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git iommu/next +Already up to date. +Merging audit/next (fe15c26ee26e Linux 6.3-rc1) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git audit/next +Already up to date. +Merging devicetree/for-next (c9c9d764daee of: unittest: Convert to platform remove callback returning void) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next +Auto-merging Documentation/devicetree/bindings/media/i2c/sony,imx334.yaml +Auto-merging Documentation/devicetree/bindings/regulator/google,cros-ec-regulator.yaml +Auto-merging Documentation/devicetree/bindings/regulator/nxp,pca9450-regulator.yaml +Auto-merging Documentation/devicetree/bindings/regulator/nxp,pf8x00-regulator.yaml +Auto-merging Documentation/devicetree/bindings/regulator/rohm,bd71828-regulator.yaml +Auto-merging Documentation/devicetree/bindings/regulator/rohm,bd71837-regulator.yaml +Auto-merging Documentation/devicetree/bindings/regulator/rohm,bd71847-regulator.yaml +Auto-merging Documentation/devicetree/bindings/soc/renesas/renesas.yaml +Auto-merging Documentation/devicetree/bindings/sound/everest,es8316.yaml +Auto-merging Documentation/devicetree/bindings/sound/simple-card.yaml +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/.yamllint | 2 +- + Documentation/devicetree/bindings/arm/cpus.yaml | 2 + + .../bindings/auxdisplay/holtek,ht16k33.yaml | 2 +- + .../bindings/chrome/google,cros-ec-typec.yaml | 2 +- + .../chrome/google,cros-kbd-led-backlight.yaml | 2 +- + .../devicetree/bindings/clock/qcom,a53pll.yaml | 4 +- + .../devicetree/bindings/clock/ti,lmk04832.yaml | 2 +- + .../bindings/crypto/fsl,sec-v4.0-mon.yaml | 150 ++++++ + .../devicetree/bindings/crypto/fsl,sec-v4.0.yaml | 266 ++++++++++ + .../devicetree/bindings/crypto/fsl-sec4.txt | 553 --------------------- + .../devicetree/bindings/crypto/ti,sa2ul.yaml | 4 +- + .../bindings/display/bridge/analogix,anx7625.yaml | 2 +- + .../bindings/display/bridge/anx6345.yaml | 2 +- + .../bindings/display/bridge/lontium,lt8912b.yaml | 2 +- + .../bindings/display/bridge/nxp,ptn3460.yaml | 2 +- + .../bindings/display/bridge/parade,ps8622.yaml | 115 +++++ + .../devicetree/bindings/display/bridge/ps8622.txt | 31 -- + .../devicetree/bindings/display/bridge/ps8640.yaml | 2 +- + .../bindings/display/bridge/sil,sii9234.yaml | 2 +- + .../bindings/display/bridge/ti,dlpc3433.yaml | 2 +- + .../bindings/display/bridge/toshiba,tc358762.yaml | 2 +- + .../bindings/display/bridge/toshiba,tc358764.txt | 35 -- + .../bindings/display/bridge/toshiba,tc358764.yaml | 89 ++++ + .../bindings/display/bridge/toshiba,tc358768.yaml | 2 +- + .../devicetree/bindings/display/msm/qcom,mdp5.yaml | 2 +- + .../bindings/display/panel/nec,nl8048hl11.yaml | 2 +- + .../bindings/display/solomon,ssd1307fb.yaml | 4 +- + Documentation/devicetree/bindings/eeprom/at25.yaml | 2 +- + .../bindings/extcon/extcon-usbc-cros-ec.yaml | 2 +- + .../bindings/extcon/extcon-usbc-tusb320.yaml | 2 +- + .../bindings/fpga/xilinx-pr-decoupler.txt | 54 -- + .../bindings/fpga/xilinx-slave-serial.txt | 51 -- + .../bindings/fpga/xlnx,fpga-slave-serial.yaml | 80 +++ + .../bindings/fpga/xlnx,pr-decoupler.yaml | 64 +++ + .../devicetree/bindings/gpio/gpio-pca9570.yaml | 2 +- + .../devicetree/bindings/gpio/gpio-pca95xx.yaml | 8 +- + .../devicetree/bindings/i2c/aspeed,i2c.yaml | 2 +- + .../bindings/i2c/google,cros-ec-i2c-tunnel.yaml | 2 +- + .../devicetree/bindings/input/snvs-pwrkey.txt | 1 - + .../bindings/interrupt-controller/arm,gic.yaml | 4 +- + .../interrupt-controller/loongson,pch-msi.yaml | 2 +- + .../interrupt-controller/mediatek,sysirq.txt | 1 + + .../bindings/leds/cznic,turris-omnia-leds.yaml | 2 +- + .../devicetree/bindings/leds/issi,is31fl319x.yaml | 2 +- + .../devicetree/bindings/leds/leds-aw2013.yaml | 2 +- + .../devicetree/bindings/leds/leds-rt4505.yaml | 2 +- + .../devicetree/bindings/leds/ti,tca6507.yaml | 2 +- + .../bindings/media/i2c/aptina,mt9p031.yaml | 2 +- + .../bindings/media/i2c/aptina,mt9v111.yaml | 2 +- + .../devicetree/bindings/media/i2c/imx219.yaml | 2 +- + .../devicetree/bindings/media/i2c/imx258.yaml | 4 +- + .../devicetree/bindings/media/i2c/mipi-ccs.yaml | 2 +- + .../devicetree/bindings/media/i2c/ovti,ov5648.yaml | 2 +- + .../devicetree/bindings/media/i2c/ovti,ov772x.yaml | 2 +- + .../devicetree/bindings/media/i2c/ovti,ov8865.yaml | 2 +- + .../devicetree/bindings/media/i2c/ovti,ov9282.yaml | 2 +- + .../devicetree/bindings/media/i2c/rda,rda5807.yaml | 2 +- + .../devicetree/bindings/media/i2c/sony,imx214.yaml | 2 +- + .../devicetree/bindings/media/i2c/sony,imx274.yaml | 2 +- + .../devicetree/bindings/media/i2c/sony,imx334.yaml | 2 +- + .../devicetree/bindings/media/i2c/sony,imx335.yaml | 2 +- + .../devicetree/bindings/media/i2c/sony,imx412.yaml | 2 +- + .../devicetree/bindings/media/renesas,vin.yaml | 4 +- + .../devicetree/bindings/media/ti,cal.yaml | 4 +- + .../devicetree/bindings/mfd/actions,atc260x.yaml | 2 +- + .../devicetree/bindings/mfd/google,cros-ec.yaml | 6 +- + .../devicetree/bindings/mfd/ti,tps65086.yaml | 2 +- + .../devicetree/bindings/mfd/x-powers,axp152.yaml | 4 +- + .../devicetree/bindings/net/asix,ax88796c.yaml | 2 +- + .../devicetree/bindings/net/brcm,bcmgenet.yaml | 2 - + .../bindings/net/can/microchip,mcp251xfd.yaml | 2 +- + .../bindings/net/cortina,gemini-ethernet.yaml | 6 +- + .../devicetree/bindings/net/dsa/microchip,ksz.yaml | 2 +- + .../devicetree/bindings/net/mdio-gpio.yaml | 4 +- + .../bindings/net/nfc/samsung,s3fwrn5.yaml | 2 +- + .../devicetree/bindings/net/vertexcom-mse102x.yaml | 2 +- + .../bindings/net/wireless/ti,wlcore.yaml | 10 +- + .../phy/marvell,armada-cp110-utmi-phy.yaml | 2 +- + .../devicetree/bindings/phy/phy-stm32-usbphyc.yaml | 2 +- + .../bindings/phy/qcom,sc7180-qmp-usb3-dp-phy.yaml | 2 +- + .../bindings/pinctrl/pinctrl-mt8192.yaml | 2 +- + .../devicetree/bindings/pinctrl/pinmux-node.yaml | 2 +- + .../bindings/pinctrl/starfive,jh7100-pinctrl.yaml | 2 +- + .../devicetree/bindings/power/supply/bq2415x.yaml | 2 +- + .../devicetree/bindings/power/supply/bq24190.yaml | 2 +- + .../devicetree/bindings/power/supply/bq24257.yaml | 4 +- + .../devicetree/bindings/power/supply/bq24735.yaml | 2 +- + .../devicetree/bindings/power/supply/bq2515x.yaml | 2 +- + .../devicetree/bindings/power/supply/bq25890.yaml | 2 +- + .../devicetree/bindings/power/supply/bq25980.yaml | 2 +- + .../devicetree/bindings/power/supply/bq27xxx.yaml | 15 +- + .../bindings/power/supply/lltc,ltc294x.yaml | 2 +- + .../bindings/power/supply/ltc4162-l.yaml | 2 +- + .../bindings/power/supply/maxim,max14656.yaml | 2 +- + .../bindings/power/supply/maxim,max17040.yaml | 4 +- + .../bindings/power/supply/maxim,max17042.yaml | 2 +- + .../bindings/power/supply/richtek,rt9455.yaml | 2 +- + .../bindings/power/supply/ti,lp8727.yaml | 2 +- + .../bindings/regulator/active-semi,act8865.yaml | 2 +- + .../regulator/google,cros-ec-regulator.yaml | 2 +- + .../bindings/regulator/nxp,pca9450-regulator.yaml | 8 +- + .../bindings/regulator/nxp,pf8x00-regulator.yaml | 2 +- + .../bindings/regulator/rohm,bd71828-regulator.yaml | 20 +- + .../bindings/regulator/rohm,bd71837-regulator.yaml | 6 +- + .../bindings/regulator/rohm,bd71847-regulator.yaml | 6 +- + Documentation/devicetree/bindings/rtc/snvs-rtc.txt | 1 - + .../devicetree/bindings/serial/mediatek,uart.yaml | 1 + + .../devicetree/bindings/soc/renesas/renesas.yaml | 2 +- + .../devicetree/bindings/soc/ti/ti,pruss.yaml | 2 +- + .../bindings/sound/amlogic,axg-tdm-iface.yaml | 2 +- + .../devicetree/bindings/sound/everest,es8316.yaml | 2 +- + .../bindings/sound/qcom,lpass-rx-macro.yaml | 4 +- + .../bindings/sound/qcom,lpass-tx-macro.yaml | 4 +- + .../bindings/sound/qcom,lpass-va-macro.yaml | 4 +- + .../bindings/sound/qcom,q6dsp-lpass-ports.yaml | 2 +- + .../devicetree/bindings/sound/simple-card.yaml | 24 +- + .../devicetree/bindings/sound/tas2562.yaml | 2 +- + .../devicetree/bindings/sound/tas2770.yaml | 2 +- + .../devicetree/bindings/sound/tas27xx.yaml | 2 +- + .../devicetree/bindings/sound/tas5805m.yaml | 2 +- + .../devicetree/bindings/sound/tlv320adcx140.yaml | 2 +- + .../devicetree/bindings/sound/zl38060.yaml | 2 +- + .../bindings/spi/microchip,mpfs-spi.yaml | 2 +- + .../devicetree/bindings/usb/maxim,max33359.yaml | 2 +- + .../devicetree/bindings/usb/maxim,max3420-udc.yaml | 2 +- + .../bindings/usb/mediatek,mt6360-tcpc.yaml | 2 +- + .../devicetree/bindings/usb/richtek,rt1711h.yaml | 2 +- + .../devicetree/bindings/usb/richtek,rt1719.yaml | 2 +- + .../devicetree/bindings/usb/st,stusb160x.yaml | 2 +- + .../devicetree/bindings/usb/ti,hd3ss3220.yaml | 2 +- + .../devicetree/bindings/usb/ti,tps6598x.yaml | 2 +- + MAINTAINERS | 2 +- + drivers/of/unittest.c | 21 +- + 133 files changed, 951 insertions(+), 913 deletions(-) + create mode 100644 Documentation/devicetree/bindings/crypto/fsl,sec-v4.0-mon.yaml + create mode 100644 Documentation/devicetree/bindings/crypto/fsl,sec-v4.0.yaml + delete mode 100644 Documentation/devicetree/bindings/crypto/fsl-sec4.txt + create mode 100644 Documentation/devicetree/bindings/display/bridge/parade,ps8622.yaml + delete mode 100644 Documentation/devicetree/bindings/display/bridge/ps8622.txt + delete mode 100644 Documentation/devicetree/bindings/display/bridge/toshiba,tc358764.txt + create mode 100644 Documentation/devicetree/bindings/display/bridge/toshiba,tc358764.yaml + delete mode 100644 Documentation/devicetree/bindings/fpga/xilinx-pr-decoupler.txt + delete mode 100644 Documentation/devicetree/bindings/fpga/xilinx-slave-serial.txt + create mode 100644 Documentation/devicetree/bindings/fpga/xlnx,fpga-slave-serial.yaml + create mode 100644 Documentation/devicetree/bindings/fpga/xlnx,pr-decoupler.yaml + delete mode 100644 Documentation/devicetree/bindings/input/snvs-pwrkey.txt + delete mode 100644 Documentation/devicetree/bindings/rtc/snvs-rtc.txt +Merging dt-krzk/for-next (efb75299863e Merge branch 'next/dt64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk/for-next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/armada-388-db.dts | 2 +- + arch/arm/boot/dts/da850-evm.dts | 2 +- + arch/arm/boot/dts/dove.dtsi | 2 +- + arch/arm/boot/dts/hi3620-hi4511.dts | 12 ++++++------ + arch/arm/boot/dts/hip04-d01.dts | 2 +- + arch/arm/boot/dts/keystone-k2e-evm.dts | 2 +- + arch/arm/boot/dts/keystone-k2g-evm.dts | 2 +- + arch/arm/boot/dts/keystone-k2hk-evm.dts | 2 +- + arch/arm/boot/dts/keystone-k2l-evm.dts | 2 +- + arch/arm/boot/dts/omap-zoom-common.dtsi | 8 ++++---- + arch/arm64/boot/dts/cavium/thunder-88xx.dtsi | 3 ++- + arch/arm64/boot/dts/cavium/thunder2-99xx.dtsi | 4 ++-- + arch/arm64/boot/dts/marvell/armada-ap810-ap0.dtsi | 2 +- + arch/arm64/boot/dts/toshiba/tmpv7708.dtsi | 2 +- + 14 files changed, 24 insertions(+), 23 deletions(-) +Merging mailbox/mailbox-for-next (6ccbe33a3952 dt-bindings: mailbox: qcom-ipcc: Add compatible for QDU1000/QRU1000) +$ 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 (103c6a315bc7 spi: sprd: Convert to platform remove callback) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next +Auto-merging MAINTAINERS +Auto-merging arch/powerpc/platforms/83xx/mpc832x_rdb.c +Auto-merging drivers/net/ieee802154/ca8210.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/spi/cdns,qspi-nor.yaml | 37 +++++- + .../devicetree/bindings/spi/renesas,sh-msiof.yaml | 23 +++- + Documentation/spi/spi-summary.rst | 23 ++-- + MAINTAINERS | 2 +- + arch/powerpc/platforms/83xx/mpc832x_rdb.c | 2 +- + drivers/iio/imu/adis16400.c | 2 +- + drivers/mtd/devices/mtd_dataflash.c | 2 +- + drivers/net/ethernet/adi/adin1110.c | 2 +- + drivers/net/ethernet/asix/ax88796c_main.c | 2 +- + drivers/net/ethernet/davicom/dm9051.c | 2 +- + drivers/net/ethernet/qualcomm/qca_debug.c | 2 +- + drivers/net/ieee802154/ca8210.c | 2 +- + drivers/net/wan/slic_ds26522.c | 2 +- + drivers/net/wireless/marvell/libertas/if_spi.c | 2 +- + drivers/net/wireless/silabs/wfx/bus_spi.c | 2 +- + drivers/net/wireless/st/cw1200/cw1200_spi.c | 2 +- + drivers/platform/x86/serial-multi-instantiate.c | 3 +- + drivers/spi/Kconfig | 10 +- + drivers/spi/atmel-quadspi.c | 36 +++-- + drivers/spi/spi-altera-core.c | 2 +- + drivers/spi/spi-amd.c | 4 +- + drivers/spi/spi-ar934x.c | 8 +- + drivers/spi/spi-armada-3700.c | 10 +- + drivers/spi/spi-aspeed-smc.c | 18 +-- + drivers/spi/spi-at91-usart.c | 8 +- + drivers/spi/spi-ath79.c | 10 +- + drivers/spi/spi-atmel.c | 32 +++-- + drivers/spi/spi-au1550.c | 9 +- + drivers/spi/spi-axi-spi-engine.c | 8 +- + drivers/spi/spi-bcm-qspi.c | 12 +- + drivers/spi/spi-bcm2835.c | 19 +-- + drivers/spi/spi-bcm2835aux.c | 10 +- + drivers/spi/spi-bcm63xx-hsspi.c | 36 +++-- + drivers/spi/spi-bcm63xx.c | 18 +-- + drivers/spi/spi-bcmbca-hsspi.c | 36 +++-- + drivers/spi/spi-brcmstb-qspi.c | 6 +- + drivers/spi/spi-cadence-quadspi.c | 32 ++++- + drivers/spi/spi-cadence-xspi.c | 4 +- + drivers/spi/spi-cadence.c | 10 +- + drivers/spi/spi-cavium-octeon.c | 6 +- + drivers/spi/spi-cavium.c | 8 +- + drivers/spi/spi-coldfire-qspi.c | 14 +- + drivers/spi/spi-davinci.c | 23 ++-- + drivers/spi/spi-dln2.c | 12 +- + drivers/spi/spi-dw-bt1.c | 6 +- + drivers/spi/spi-dw-core.c | 2 +- + drivers/spi/spi-dw-mmio.c | 10 +- + drivers/spi/spi-ep93xx.c | 6 +- + drivers/spi/spi-falcon.c | 2 +- + drivers/spi/spi-fsi.c | 2 +- + drivers/spi/spi-fsl-dspi.c | 24 ++-- + drivers/spi/spi-fsl-espi.c | 12 +- + drivers/spi/spi-fsl-lpspi.c | 7 +- + drivers/spi/spi-fsl-qspi.c | 12 +- + drivers/spi/spi-fsl-spi.c | 13 +- + drivers/spi/spi-geni-qcom.c | 11 +- + drivers/spi/spi-gpio.c | 4 +- + drivers/spi/spi-gxp.c | 4 +- + drivers/spi/spi-hisi-kunpeng.c | 6 +- + drivers/spi/spi-hisi-sfc-v3xx.c | 2 +- + drivers/spi/spi-img-spfi.c | 20 ++- + drivers/spi/spi-imx.c | 48 ++++--- + drivers/spi/spi-ingenic.c | 4 +- + drivers/spi/spi-intel.c | 2 +- + drivers/spi/spi-iproc-qspi.c | 6 +- + drivers/spi/spi-jcore.c | 4 +- + drivers/spi/spi-lantiq-ssc.c | 12 +- + drivers/spi/spi-mem.c | 4 +- + drivers/spi/spi-meson-spicc.c | 8 +- + drivers/spi/spi-meson-spifc.c | 6 +- + drivers/spi/spi-microchip-core-qspi.c | 6 +- + drivers/spi/spi-microchip-core.c | 12 +- + drivers/spi/spi-mpc512x-psc.c | 142 +++++--------------- + drivers/spi/spi-mpc52xx-psc.c | 145 +++++---------------- + drivers/spi/spi-mpc52xx.c | 8 +- + drivers/spi/spi-mt65xx.c | 6 +- + drivers/spi/spi-mt7621.c | 2 +- + drivers/spi/spi-mtk-nor.c | 6 +- + drivers/spi/spi-mtk-snfi.c | 5 +- + drivers/spi/spi-mux.c | 8 +- + drivers/spi/spi-mxic.c | 16 +-- + drivers/spi/spi-mxs.c | 8 +- + drivers/spi/spi-npcm-fiu.c | 25 ++-- + drivers/spi/spi-npcm-pspi.c | 6 +- + drivers/spi/spi-nxp-fspi.c | 16 +-- + drivers/spi/spi-oc-tiny.c | 5 +- + drivers/spi/spi-omap-uwire.c | 13 +- + drivers/spi/spi-omap2-mcspi.c | 32 +++-- + drivers/spi/spi-orion.c | 10 +- + drivers/spi/spi-pci1xxxx.c | 4 +- + drivers/spi/spi-pic32-sqi.c | 8 +- + drivers/spi/spi-pic32.c | 10 +- + drivers/spi/spi-pl022.c | 4 +- + drivers/spi/spi-ppc4xx.c | 5 +- + drivers/spi/spi-pxa2xx.c | 14 +- + drivers/spi/spi-qcom-qspi.c | 8 +- + drivers/spi/spi-qup.c | 3 +- + drivers/spi/spi-rb4xx.c | 8 +- + drivers/spi/spi-rockchip-sfc.c | 8 +- + drivers/spi/spi-rockchip.c | 36 +++-- + drivers/spi/spi-rpc-if.c | 6 +- + drivers/spi/spi-rspi.c | 24 ++-- + drivers/spi/spi-s3c64xx.c | 8 +- + drivers/spi/spi-sc18is602.c | 6 +- + drivers/spi/spi-sh-hspi.c | 6 +- + drivers/spi/spi-sh-msiof.c | 13 +- + drivers/spi/spi-sh-sci.c | 7 +- + drivers/spi/spi-sh.c | 6 +- + drivers/spi/spi-sifive.c | 12 +- + drivers/spi/spi-slave-mt27xx.c | 6 +- + drivers/spi/spi-sn-f-ospi.c | 8 +- + drivers/spi/spi-sprd-adi.c | 5 +- + drivers/spi/spi-sprd.c | 20 ++- + drivers/spi/spi-st-ssc4.c | 8 +- + drivers/spi/spi-stm32-qspi.c | 18 ++- + drivers/spi/spi-stm32.c | 12 +- + drivers/spi/spi-sun4i.c | 8 +- + drivers/spi/spi-sun6i.c | 7 +- + drivers/spi/spi-sunplus-sp7021.c | 5 +- + drivers/spi/spi-synquacer.c | 12 +- + drivers/spi/spi-tegra114.c | 34 +++-- + drivers/spi/spi-tegra20-sflash.c | 8 +- + drivers/spi/spi-tegra20-slink.c | 11 +- + drivers/spi/spi-tegra210-quad.c | 14 +- + drivers/spi/spi-ti-qspi.c | 16 +-- + drivers/spi/spi-topcliff-pch.c | 10 +- + drivers/spi/spi-uniphier.c | 6 +- + drivers/spi/spi-wpcm-fiu.c | 12 +- + drivers/spi/spi-xcomm.c | 2 +- + drivers/spi/spi-xilinx.c | 12 +- + drivers/spi/spi-xlp.c | 4 +- + drivers/spi/spi-xtensa-xtfpga.c | 6 +- + drivers/spi/spi-zynq-qspi.c | 8 +- + drivers/spi/spi-zynqmp-gqspi.c | 8 +- + drivers/spi/spi.c | 102 +++++++++++---- + drivers/spi/spidev.c | 6 +- + drivers/staging/fbtft/fbtft-core.c | 2 +- + drivers/staging/greybus/spilib.c | 2 +- + include/linux/spi/spi.h | 20 +-- + include/trace/events/spi.h | 10 +- + sound/pci/hda/cs35l41_hda_spi.c | 2 +- + 141 files changed, 809 insertions(+), 1012 deletions(-) +Merging tip/master (8a071b9c1325 Merge branch into tip/master: 'x86/shstk') +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master +Auto-merging Documentation/filesystems/proc.rst +Auto-merging Documentation/mm/arch_pgtable_helpers.rst +Auto-merging MAINTAINERS +Auto-merging arch/arm64/include/asm/pgtable.h +Auto-merging arch/mips/include/asm/pgtable.h +Auto-merging arch/mips/loongson64/smp.c +Auto-merging arch/powerpc/kernel/smp.c +Auto-merging arch/riscv/include/asm/pgtable.h +Auto-merging arch/s390/include/asm/pgtable.h +Auto-merging arch/s390/mm/pageattr.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/include/asm/pgtable.h +Auto-merging arch/x86/mm/fault.c +Auto-merging drivers/gpu/drm/i915/gt/intel_gt.c +Auto-merging drivers/gpu/drm/i915/gt/intel_gt_pm.c +Auto-merging drivers/gpu/drm/i915/gt/intel_rc6.c +Auto-merging drivers/gpu/drm/i915/gt/intel_rps.c +Auto-merging include/linux/mm.h +Auto-merging include/linux/pgtable.h +Auto-merging mm/debug_vm_pgtable.c +Auto-merging mm/gup.c +Auto-merging mm/huge_memory.c +Auto-merging mm/hugetlb.c +Auto-merging mm/internal.h +Auto-merging mm/memory.c +Auto-merging mm/mmap.c +Auto-merging mm/mprotect.c +Auto-merging mm/nommu.c +Auto-merging mm/userfaultfd.c +CONFLICT (content): Merge conflict in mm/userfaultfd.c +Auto-merging mm/util.c +Recorded preimage for 'mm/userfaultfd.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'mm/userfaultfd.c'. +[master 09dd1e66721c] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/proc.rst | 1 + + Documentation/mm/arch_pgtable_helpers.rst | 9 +- + Documentation/x86/index.rst | 1 + + Documentation/x86/microcode.rst | 10 + + Documentation/x86/shstk.rst | 179 ++++++ + MAINTAINERS | 11 + + arch/alpha/include/asm/cmpxchg.h | 10 +- + arch/alpha/include/asm/pgtable.h | 6 +- + arch/alpha/kernel/process.c | 4 +- + arch/arc/include/asm/cmpxchg.h | 4 +- + arch/arc/include/asm/hugepage.h | 2 +- + arch/arc/include/asm/pgtable-bits-arcv2.h | 7 +- + arch/arm/include/asm/cmpxchg.h | 7 +- + arch/arm/include/asm/pgtable-3level.h | 7 +- + arch/arm/include/asm/pgtable.h | 2 +- + arch/arm/kernel/signal.c | 2 +- + arch/arm/kernel/smp.c | 4 +- + arch/arm/probes/uprobes/core.c | 8 +- + arch/arm64/include/asm/cmpxchg.h | 7 +- + arch/arm64/include/asm/pgtable.h | 9 +- + arch/arm64/include/asm/smp.h | 2 +- + arch/arm64/kernel/probes/uprobes.c | 9 +- + arch/arm64/kernel/process.c | 2 +- + arch/arm64/kernel/signal.c | 2 +- + arch/arm64/kernel/signal32.c | 2 +- + arch/arm64/kernel/smp.c | 2 +- + arch/arm64/mm/trans_pgd.c | 4 +- + arch/csky/include/asm/pgtable.h | 2 +- + arch/csky/kernel/probes/uprobes.c | 9 +- + arch/csky/kernel/smp.c | 4 +- + arch/hexagon/include/asm/cmpxchg.h | 10 +- + arch/hexagon/include/asm/pgtable.h | 2 +- + arch/ia64/include/asm/cmpxchg.h | 2 +- + arch/ia64/include/asm/pgtable.h | 2 +- + arch/ia64/include/uapi/asm/cmpxchg.h | 4 +- + arch/ia64/kernel/process.c | 6 +- + arch/loongarch/include/asm/cmpxchg.h | 4 +- + arch/loongarch/include/asm/pgtable.h | 4 +- + arch/loongarch/include/asm/smp.h | 2 +- + arch/loongarch/kernel/process.c | 2 +- + arch/loongarch/kernel/smp.c | 2 +- + arch/m68k/include/asm/cmpxchg.h | 6 +- + arch/m68k/include/asm/mcf_pgtable.h | 2 +- + arch/m68k/include/asm/motorola_pgtable.h | 6 +- + arch/m68k/include/asm/sun3_pgtable.h | 6 +- + arch/microblaze/include/asm/pgtable.h | 2 +- + arch/mips/cavium-octeon/smp.c | 1 + + arch/mips/include/asm/cmpxchg.h | 4 +- + arch/mips/include/asm/pgtable.h | 6 +- + arch/mips/include/asm/smp.h | 2 +- + arch/mips/kernel/process.c | 2 +- + arch/mips/kernel/smp-bmips.c | 4 + + arch/mips/kernel/smp-cps.c | 1 + + arch/mips/kernel/uprobes.c | 10 +- + arch/mips/loongson64/smp.c | 2 + + arch/nios2/include/asm/pgtable.h | 2 +- + arch/openrisc/include/asm/cmpxchg.h | 10 +- + arch/openrisc/include/asm/pgtable.h | 2 +- + arch/parisc/include/asm/cmpxchg.h | 4 +- + arch/parisc/include/asm/pgtable.h | 6 +- + arch/parisc/kernel/process.c | 2 +- + arch/powerpc/include/asm/book3s/32/pgtable.h | 2 +- + arch/powerpc/include/asm/book3s/64/pgtable.h | 4 +- + arch/powerpc/include/asm/cmpxchg.h | 4 +- + arch/powerpc/include/asm/nohash/32/pgtable.h | 2 +- + arch/powerpc/include/asm/nohash/32/pte-8xx.h | 2 +- + arch/powerpc/include/asm/nohash/64/pgtable.h | 2 +- + arch/powerpc/include/asm/smp.h | 2 +- + arch/powerpc/kernel/smp.c | 2 +- + arch/powerpc/kernel/uprobes.c | 10 +- + arch/riscv/include/asm/atomic.h | 2 +- + arch/riscv/include/asm/cmpxchg.h | 4 +- + arch/riscv/include/asm/pgtable.h | 6 +- + arch/riscv/kernel/cpu-hotplug.c | 2 +- + arch/riscv/kernel/probes/uprobes.c | 9 +- + arch/s390/include/asm/cmpxchg.h | 8 +- + arch/s390/include/asm/hugetlb.h | 4 +- + arch/s390/include/asm/pgtable.h | 14 +- + arch/s390/kernel/idle.c | 2 +- + arch/s390/kernel/uprobes.c | 7 +- + arch/s390/mm/pageattr.c | 4 +- + arch/sh/include/asm/cmpxchg.h | 4 +- + arch/sh/include/asm/pgtable_32.h | 10 +- + arch/sh/include/asm/smp-ops.h | 5 +- + arch/sh/kernel/idle.c | 3 +- + arch/sparc/include/asm/cmpxchg_32.h | 4 +- + arch/sparc/include/asm/cmpxchg_64.h | 6 +- + arch/sparc/include/asm/pgtable_32.h | 2 +- + arch/sparc/include/asm/pgtable_64.h | 6 +- + arch/sparc/include/asm/smp_64.h | 2 +- + arch/sparc/kernel/process_64.c | 2 +- + arch/sparc/kernel/signal32.c | 2 +- + arch/sparc/kernel/signal_64.c | 2 +- + arch/sparc/kernel/uprobes.c | 7 +- + arch/um/include/asm/pgtable.h | 2 +- + arch/x86/Kconfig | 24 + + arch/x86/Kconfig.assembler | 5 + + arch/x86/entry/entry_64.S | 2 +- + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + arch/x86/include/asm/cpufeatures.h | 2 + + arch/x86/include/asm/disabled-features.h | 16 +- + arch/x86/include/asm/fpu/api.h | 9 + + arch/x86/include/asm/fpu/regset.h | 7 +- + arch/x86/include/asm/fpu/sched.h | 3 +- + arch/x86/include/asm/fpu/types.h | 16 +- + arch/x86/include/asm/fpu/xstate.h | 6 +- + arch/x86/include/asm/idtentry.h | 2 +- + arch/x86/include/asm/mmu_context.h | 13 +- + arch/x86/include/asm/paravirt.h | 14 +- + arch/x86/include/asm/paravirt_types.h | 15 +- + arch/x86/include/asm/pgtable.h | 322 ++++++++-- + arch/x86/include/asm/pgtable_types.h | 56 +- + arch/x86/include/asm/processor.h | 8 + + arch/x86/include/asm/shstk.h | 38 ++ + arch/x86/include/asm/smp.h | 3 +- + arch/x86/include/asm/special_insns.h | 13 + + arch/x86/include/asm/tlbflush.h | 3 +- + arch/x86/include/asm/trap_pf.h | 2 + + arch/x86/include/asm/traps.h | 12 + + arch/x86/include/asm/uaccess_64.h | 2 - + arch/x86/include/uapi/asm/mman.h | 4 + + arch/x86/include/uapi/asm/prctl.h | 12 + + arch/x86/kernel/Makefile | 4 + + arch/x86/kernel/cet.c | 152 +++++ + arch/x86/kernel/cpu/amd.c | 11 + + arch/x86/kernel/cpu/bugs.c | 10 +- + arch/x86/kernel/cpu/common.c | 35 +- + arch/x86/kernel/cpu/cpu.h | 8 + + arch/x86/kernel/cpu/cpuid-deps.c | 1 + + arch/x86/kernel/cpu/intel.c | 59 +- + arch/x86/kernel/cpu/mce/amd.c | 16 +- + arch/x86/kernel/cpu/mce/internal.h | 10 +- + arch/x86/kernel/cpu/microcode/amd.c | 9 +- + arch/x86/kernel/cpu/microcode/core.c | 3 +- + arch/x86/kernel/cpu/proc.c | 23 + + arch/x86/kernel/cpu/resctrl/monitor.c | 43 +- + arch/x86/kernel/fpu/core.c | 54 +- + arch/x86/kernel/fpu/regset.c | 78 +++ + arch/x86/kernel/fpu/xstate.c | 90 ++- + arch/x86/kernel/idt.c | 2 +- + arch/x86/kernel/paravirt.c | 30 +- + arch/x86/kernel/process.c | 26 +- + arch/x86/kernel/process_64.c | 9 +- + arch/x86/kernel/ptrace.c | 12 + + arch/x86/kernel/shstk.c | 499 +++++++++++++++ + arch/x86/kernel/signal.c | 1 + + arch/x86/kernel/signal_32.c | 2 +- + arch/x86/kernel/signal_64.c | 8 +- + arch/x86/kernel/sys_x86_64.c | 6 +- + arch/x86/kernel/traps.c | 87 --- + arch/x86/lib/usercopy_64.c | 9 - + arch/x86/mm/fault.c | 22 + + arch/x86/mm/init.c | 2 +- + arch/x86/mm/pat/set_memory.c | 4 +- + arch/x86/mm/pgtable.c | 38 ++ + arch/x86/xen/enlighten_pv.c | 2 +- + arch/x86/xen/mmu_pv.c | 14 +- + arch/x86/xen/xen-asm.S | 2 +- + arch/xtensa/include/asm/cmpxchg.h | 4 +- + arch/xtensa/include/asm/pgtable.h | 2 +- + arch/xtensa/include/asm/smp.h | 2 +- + arch/xtensa/kernel/smp.c | 4 +- + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 2 +- + drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c | 4 +- + .../gpu/drm/i915/gt/intel_execlists_submission.c | 4 +- + drivers/gpu/drm/i915/gt/intel_ggtt.c | 4 +- + drivers/gpu/drm/i915/gt/intel_gsc.c | 2 +- + drivers/gpu/drm/i915/gt/intel_gt.c | 4 +- + drivers/gpu/drm/i915/gt/intel_gt_pm.c | 2 +- + drivers/gpu/drm/i915/gt/intel_lrc.c | 6 +- + drivers/gpu/drm/i915/gt/intel_migrate.c | 2 +- + drivers/gpu/drm/i915/gt/intel_rc6.c | 2 +- + drivers/gpu/drm/i915/gt/intel_rps.c | 2 +- + drivers/gpu/drm/i915/gt/selftest_context.c | 2 +- + drivers/gpu/drm/i915/gt/selftest_ring_submission.c | 2 +- + drivers/gpu/drm/i915/gt/selftest_timeline.c | 2 +- + drivers/gpu/drm/i915/gt/uc/intel_uc.c | 2 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 2 +- + drivers/gpu/drm/i915/i915_utils.h | 1 + + fs/aio.c | 2 +- + fs/proc/array.c | 6 + + fs/proc/task_mmu.c | 3 + + include/asm-generic/hugetlb.h | 4 +- + include/linux/context_tracking.h | 1 + + include/linux/context_tracking_state.h | 2 + + include/linux/cpu.h | 2 +- + include/linux/llist.h | 6 +- + include/linux/mm.h | 65 +- + include/linux/mman.h | 4 + + include/linux/non-atomic/xchg.h | 19 + + include/linux/pgtable.h | 14 + + include/linux/proc_fs.h | 2 + + include/linux/syscalls.h | 1 + + include/uapi/asm-generic/siginfo.h | 3 +- + include/uapi/asm-generic/unistd.h | 2 +- + include/uapi/linux/elf.h | 2 + + ipc/shm.c | 2 +- + kernel/entry/common.c | 2 +- + kernel/sched/idle.c | 2 +- + kernel/sys_ni.c | 1 + + mm/debug_vm_pgtable.c | 16 +- + mm/gup.c | 2 +- + mm/huge_memory.c | 7 +- + mm/hugetlb.c | 4 +- + mm/internal.h | 4 +- + mm/memory.c | 5 +- + mm/migrate_device.c | 2 +- + mm/mmap.c | 10 +- + mm/mprotect.c | 2 +- + mm/nommu.c | 4 +- + mm/userfaultfd.c | 2 +- + mm/util.c | 2 +- + tools/arch/x86/kcpuid/cpuid.csv | 61 +- + tools/arch/x86/kcpuid/kcpuid.c | 32 +- + tools/objtool/check.c | 1 + + tools/testing/selftests/x86/Makefile | 2 +- + tools/testing/selftests/x86/test_shadow_stack.c | 695 +++++++++++++++++++++ + 217 files changed, 2988 insertions(+), 653 deletions(-) + create mode 100644 Documentation/x86/shstk.rst + create mode 100644 arch/x86/include/asm/shstk.h + create mode 100644 arch/x86/kernel/cet.c + create mode 100644 arch/x86/kernel/shstk.c + create mode 100644 include/linux/non-atomic/xchg.h + create mode 100644 tools/testing/selftests/x86/test_shadow_stack.c +Merging clockevents/timers/drivers/next (ab407a1919d2 Merge tag 'clocksource.2023.02.06b' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into timers/core) +$ 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 (541a6110b627 Merge edac-misc into edac-for-next) +$ git merge -m Merge branch 'edac-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac/edac-for-next +Merge made by the 'ort' strategy. + drivers/edac/altera_edac.c | 9 +++------ + drivers/edac/skx_base.c | 4 ++-- + 2 files changed, 5 insertions(+), 8 deletions(-) +Merging irqchip/irq/irqchip-next (a83bf176fed4 Merge branch irq/bcm-l2-fixes 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 (ca6cbe8c481a 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 Documentation/trace/kprobetrace.rst +CONFLICT (content): Merge conflict in Documentation/trace/kprobetrace.rst +Auto-merging init/Kconfig +Auto-merging init/main.c +Auto-merging kernel/trace/trace.c +Auto-merging kernel/trace/trace_probe.c +Auto-merging kernel/trace/trace_probe.h +Resolved 'Documentation/trace/kprobetrace.rst' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 9c2413f513f3] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git +$ git diff -M --stat --summary HEAD^.. + +Merging rcu/rcu/next (86efad5f5436 Revert "rcu/kvfree: Eliminate k[v]free_rcu() single argument macro") +$ 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 arch/x86/Kconfig +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec.c +Auto-merging fs/ext4/super.c +Auto-merging kernel/entry/common.c +Auto-merging kernel/trace/trace_osnoise.c +Auto-merging lib/Kconfig.debug +Auto-merging mm/Kconfig +Auto-merging scripts/checkpatch.pl +Merge made by the 'ort' strategy. + .../Expedited-Grace-Periods.rst | 6 +- + .../Memory-Ordering/Tree-RCU-Memory-Ordering.rst | 2 +- + Documentation/RCU/RTFP.txt | 10 +- + Documentation/RCU/UP.rst | 4 +- + Documentation/RCU/checklist.rst | 2 +- + Documentation/RCU/lockdep.rst | 2 +- + Documentation/RCU/torture.rst | 4 +- + Documentation/RCU/whatisRCU.rst | 6 +- + Documentation/admin-guide/kernel-parameters.txt | 17 +- + Documentation/litmus-tests/README | 2 +- + .../litmus-tests/locking/DCL-broken.litmus | 55 +++ + .../litmus-tests/locking/DCL-fixed.litmus | 56 +++ + .../litmus-tests/locking/RM-broken.litmus | 42 ++ + Documentation/litmus-tests/locking/RM-fixed.litmus | 42 ++ + arch/arm64/kvm/Kconfig | 1 - + arch/mips/kvm/Kconfig | 1 - + arch/powerpc/kvm/Kconfig | 1 - + arch/riscv/kvm/Kconfig | 1 - + arch/s390/kvm/Kconfig | 1 - + arch/x86/Kconfig | 2 - + arch/x86/kvm/Kconfig | 1 - + drivers/base/cpu.c | 3 +- + drivers/block/drbd/drbd_nl.c | 6 +- + drivers/block/drbd/drbd_receiver.c | 4 +- + drivers/block/drbd/drbd_state.c | 2 +- + drivers/infiniband/sw/rxe/rxe_mr.c | 2 +- + drivers/misc/vmw_vmci/vmci_context.c | 2 +- + drivers/misc/vmw_vmci/vmci_event.c | 2 +- + .../ethernet/mellanox/mlx5/core/en/tc/int_port.c | 2 +- + .../ethernet/mellanox/mlx5/core/en_accel/macsec.c | 4 +- + fs/ext4/super.c | 2 +- + include/linux/instrumented.h | 63 ++- + include/linux/lockdep.h | 8 +- + include/linux/notifier.h | 5 +- + include/linux/srcu.h | 38 +- + include/linux/srcutiny.h | 6 +- + include/linux/srcutree.h | 94 +++-- + include/linux/tick.h | 2 + + include/trace/events/rcu.h | 4 +- + include/trace/events/timer.h | 3 +- + kernel/entry/common.c | 3 +- + kernel/kcsan/core.c | 17 +- + kernel/locking/lockdep.c | 64 ++- + kernel/locking/locktorture.c | 239 +++++++++--- + kernel/locking/test-ww_mutex.c | 2 +- + kernel/rcu/Kconfig | 3 - + kernel/rcu/rcu.h | 43 ++- + kernel/rcu/rcuscale.c | 9 +- + kernel/rcu/rcutorture.c | 234 ++++++++++- + kernel/rcu/refscale.c | 2 +- + kernel/rcu/srcutiny.c | 2 + + kernel/rcu/srcutree.c | 428 +++++++++++---------- + kernel/rcu/tasks.h | 31 ++ + kernel/rcu/tree.c | 18 +- + kernel/rcu/tree_exp.h | 16 +- + kernel/rcu/tree_nocb.h | 4 + + kernel/smp.c | 258 ++----------- + kernel/time/tick-sched.c | 16 +- + kernel/trace/trace_osnoise.c | 2 +- + kernel/trace/trace_probe.c | 2 +- + lib/Kconfig.debug | 9 + + lib/test_vmalloc.c | 2 +- + mm/Kconfig | 1 - + net/core/sysctl_net_core.c | 4 +- + net/mac802154/scan.c | 4 +- + scripts/checkpatch.pl | 9 + + tools/include/nolibc/.gitignore | 1 + + tools/include/nolibc/Makefile | 4 +- + tools/include/nolibc/arch-loongarch.h | 200 ++++++++++ + tools/include/nolibc/arch.h | 2 + + tools/include/nolibc/std.h | 15 +- + tools/include/nolibc/stdint.h | 99 +++++ + tools/include/nolibc/sys.h | 100 ++++- + tools/include/nolibc/types.h | 28 +- + tools/memory-model/Documentation/explanation.txt | 178 ++++++++- + tools/memory-model/Documentation/locking.txt | 320 +++++++++++++++ + tools/memory-model/linux-kernel.bell | 30 +- + tools/memory-model/linux-kernel.cat | 20 +- + tools/memory-model/linux-kernel.def | 7 +- + tools/memory-model/litmus-tests/.gitignore | 2 +- + tools/memory-model/lock.cat | 6 +- + tools/memory-model/scripts/README | 48 ++- + tools/memory-model/scripts/checkalllitmus.sh | 29 +- + tools/memory-model/scripts/checkghlitmus.sh | 15 +- + tools/memory-model/scripts/checklitmus.sh | 25 +- + tools/memory-model/scripts/checklitmushist.sh | 2 +- + tools/memory-model/scripts/checktheselitmus.sh | 43 +++ + tools/memory-model/scripts/cmplitmushist.sh | 49 ++- + tools/memory-model/scripts/hwfnseg.sh | 20 + + tools/memory-model/scripts/initlitmushist.sh | 2 +- + tools/memory-model/scripts/judgelitmus.sh | 120 +++++- + tools/memory-model/scripts/newlitmushist.sh | 4 +- + tools/memory-model/scripts/parseargs.sh | 21 +- + tools/memory-model/scripts/runlitmus.sh | 80 ++++ + tools/memory-model/scripts/runlitmushist.sh | 29 +- + tools/memory-model/scripts/simpletest.sh | 35 ++ + tools/rcu/extract-stall.sh | 26 +- + tools/testing/selftests/nolibc/Makefile | 81 ++-- + tools/testing/selftests/nolibc/nolibc-test.c | 157 +++++--- + .../testing/selftests/rcutorture/bin/kvm-again.sh | 2 +- + .../selftests/rcutorture/bin/srcu_lockdep.sh | 73 ++++ + tools/testing/selftests/rcutorture/bin/torture.sh | 6 +- + .../selftests/rcutorture/configs/lock/CFLIST | 2 + + .../selftests/rcutorture/configs/lock/LOCK08 | 6 + + .../selftests/rcutorture/configs/lock/LOCK08.boot | 1 + + .../selftests/rcutorture/configs/lock/LOCK09 | 6 + + .../selftests/rcutorture/configs/lock/LOCK09.boot | 1 + + .../selftests/rcutorture/configs/rcu/TREE01 | 1 + + .../selftests/rcutorture/configs/rcu/TREE04 | 1 + + .../selftests/rcutorture/doc/TREE_RCU-kconfig.txt | 4 - + 110 files changed, 2923 insertions(+), 910 deletions(-) + create mode 100644 Documentation/litmus-tests/locking/DCL-broken.litmus + create mode 100644 Documentation/litmus-tests/locking/DCL-fixed.litmus + create mode 100644 Documentation/litmus-tests/locking/RM-broken.litmus + create mode 100644 Documentation/litmus-tests/locking/RM-fixed.litmus + create mode 100644 tools/include/nolibc/.gitignore + create mode 100644 tools/include/nolibc/arch-loongarch.h + create mode 100644 tools/include/nolibc/stdint.h + create mode 100644 tools/memory-model/Documentation/locking.txt + create mode 100755 tools/memory-model/scripts/checktheselitmus.sh + create mode 100755 tools/memory-model/scripts/hwfnseg.sh + create mode 100755 tools/memory-model/scripts/runlitmus.sh + create mode 100755 tools/memory-model/scripts/simpletest.sh + mode change 100644 => 100755 tools/rcu/extract-stall.sh + create mode 100755 tools/testing/selftests/rcutorture/bin/srcu_lockdep.sh + create mode 100644 tools/testing/selftests/rcutorture/configs/lock/LOCK08 + create mode 100644 tools/testing/selftests/rcutorture/configs/lock/LOCK08.boot + create mode 100644 tools/testing/selftests/rcutorture/configs/lock/LOCK09 + create mode 100644 tools/testing/selftests/rcutorture/configs/lock/LOCK09.boot +Merging kvm/next (d8708b80fa0e KVM: Change return type of kvm_arch_vm_ioctl() to "int") +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next +Merge made by the 'ort' strategy. + Documentation/virt/kvm/api.rst | 3 +- + arch/arm64/include/asm/kvm_host.h | 4 +- + arch/arm64/kvm/arm.c | 3 +- + arch/arm64/kvm/guest.c | 8 ++- + arch/mips/kvm/mips.c | 4 +- + arch/powerpc/include/asm/kvm_ppc.h | 14 ++--- + arch/powerpc/kvm/book3s_64_mmu_hv.c | 14 ++--- + arch/powerpc/kvm/book3s_64_vio.c | 4 +- + arch/powerpc/kvm/book3s_hv.c | 6 +- + arch/powerpc/kvm/book3s_pr.c | 4 +- + arch/powerpc/kvm/powerpc.c | 5 +- + arch/riscv/kvm/vm.c | 3 +- + arch/s390/kvm/kvm-s390.c | 7 +-- + arch/x86/include/asm/kvm_host.h | 37 ++++++------ + arch/x86/kvm/cpuid.c | 2 +- + arch/x86/kvm/mmu/mmu.c | 5 +- + arch/x86/kvm/mmu/mmu_internal.h | 12 +++- + arch/x86/kvm/mmu/paging_tmpl.h | 61 ++++--------------- + arch/x86/kvm/svm/svm.c | 43 ++++++++++---- + arch/x86/kvm/vmx/hyperv.c | 107 ++++++++++++++++++++++++++++++++- + arch/x86/kvm/vmx/hyperv.h | 115 +++--------------------------------- + arch/x86/kvm/vmx/nested.c | 3 + + arch/x86/kvm/vmx/vmx.c | 85 +++++++++++++++----------- + arch/x86/kvm/vmx/vmx_ops.h | 22 +++---- + arch/x86/kvm/x86.c | 26 +------- + include/linux/kvm_host.h | 3 +- + include/uapi/linux/kvm.h | 2 +- + tools/include/uapi/linux/kvm.h | 2 +- + virt/kvm/kvm_main.c | 4 +- + 29 files changed, 302 insertions(+), 306 deletions(-) +Merging kvm-arm/next (96a4627dbbd4 Merge tag ' https://github.com/oupton/linux tags/kvmarm-6.3' from into kvmarm-master/next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm/next +Already up to date. +Merging kvms390/next (5fc5b94a2736 s390/virtio: sort out physical vs virtual pointers usage) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390/next +Already up to date. +Merging kvm-x86/next (d8708b80fa0e KVM: Change return type of kvm_arch_vm_ioctl() to "int") +$ git merge -m Merge branch 'next' of https://github.com/kvm-x86/linux.git kvm-x86/next +Already up to date. +Merging xen-tip/linux-next (7ad2c39860dc xen: remove unnecessary (void*) conversions) +$ 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 (cd2440d66fec workqueue: Print backtraces from CPUs with hung CPU bound workqueues) +$ 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 MAINTAINERS +Auto-merging kernel/workqueue.c +Merge made by the 'ort' strategy. + MAINTAINERS | 1 + + kernel/workqueue.c | 108 +++++++++++++++++++++++++++++++++++++++++++++++------ + 2 files changed, 98 insertions(+), 11 deletions(-) +Merging drivers-x86/for-next (fd3c35845390 platform/x86: pcengines-apuv2: Drop platform:pcengines-apuv2 module-alias) +$ 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 +Auto-merging drivers/platform/x86/acerhdf.c +Auto-merging drivers/platform/x86/serial-multi-instantiate.c +Merge made by the 'ort' strategy. + MAINTAINERS | 8 +- + .../platform/surface/surface_aggregator_registry.c | 2 +- + .../platform/surface/surface_aggregator_tabletsw.c | 180 +- + drivers/platform/x86/Kconfig | 25 +- + drivers/platform/x86/Makefile | 3 +- + drivers/platform/x86/acer-wmi.c | 5 +- + drivers/platform/x86/acerhdf.c | 2 +- + drivers/platform/x86/adv_swbutton.c | 6 +- + drivers/platform/x86/amd/hsmp.c | 6 +- + drivers/platform/x86/amd/pmc.c | 5 +- + drivers/platform/x86/amd/pmf/core.c | 5 +- + drivers/platform/x86/amilo-rfkill.c | 5 +- + drivers/platform/x86/apple-gmux.c | 404 ++++- + drivers/platform/x86/barco-p50-gpio.c | 6 +- + drivers/platform/x86/classmate-laptop.c | 2 +- + drivers/platform/x86/compal-laptop.c | 8 +- + drivers/platform/x86/dell/dcdbas.c | 6 +- + drivers/platform/x86/dell/dell-laptop.c | 42 + + drivers/platform/x86/dell/dell-smbios.h | 2 + + drivers/platform/x86/dell/dell-smo8800.c | 5 +- + drivers/platform/x86/hp/hp_accel.c | 5 +- + drivers/platform/x86/hp/tc1100-wmi.c | 6 +- + drivers/platform/x86/huawei-wmi.c | 6 +- + drivers/platform/x86/ideapad-laptop.c | 6 +- + drivers/platform/x86/intel/Kconfig | 10 + + drivers/platform/x86/intel/Makefile | 2 + + drivers/platform/x86/intel/bxtwc_tmu.c | 5 +- + drivers/platform/x86/intel/bytcrc_pwrsrc.c | 181 ++ + drivers/platform/x86/intel/chtdc_ti_pwrbtn.c | 5 +- + drivers/platform/x86/intel/chtwc_int33fe.c | 6 +- + drivers/platform/x86/intel/hid.c | 10 +- + drivers/platform/x86/intel/int0002_vgpio.c | 5 +- + drivers/platform/x86/intel/int1092/intel_sar.c | 5 +- + drivers/platform/x86/intel/int3472/discrete.c | 6 +- + drivers/platform/x86/intel/mrfld_pwrbtn.c | 5 +- + drivers/platform/x86/intel/pmc/core.c | 5 +- + drivers/platform/x86/intel/speed_select_if/Kconfig | 4 + + .../platform/x86/intel/speed_select_if/Makefile | 2 + + .../x86/intel/speed_select_if/isst_if_common.c | 47 +- + .../x86/intel/speed_select_if/isst_if_common.h | 8 +- + .../platform/x86/intel/speed_select_if/isst_tpmi.c | 72 + + .../x86/intel/speed_select_if/isst_tpmi_core.c | 1438 ++++++++++++++++ + .../x86/intel/speed_select_if/isst_tpmi_core.h | 18 + + drivers/platform/x86/intel/telemetry/pltdrv.c | 5 +- + drivers/platform/x86/intel/vbtn.c | 10 +- + drivers/platform/x86/pcengines-apuv2.c | 1 - + drivers/platform/x86/peaq-wmi.c | 128 -- + drivers/platform/x86/samsung-q10.c | 6 +- + drivers/platform/x86/serial-multi-instantiate.c | 6 +- + drivers/platform/x86/sony-laptop.c | 2 +- + drivers/platform/x86/think-lmi.c | 36 +- + drivers/platform/x86/wmi.c | 6 +- + drivers/platform/x86/x86-android-tablets.c | 1803 -------------------- + drivers/platform/x86/x86-android-tablets/Kconfig | 21 + + drivers/platform/x86/x86-android-tablets/Makefile | 9 + + drivers/platform/x86/x86-android-tablets/asus.c | 325 ++++ + drivers/platform/x86/x86-android-tablets/core.c | 391 +++++ + drivers/platform/x86/x86-android-tablets/dmi.c | 156 ++ + drivers/platform/x86/x86-android-tablets/lenovo.c | 502 ++++++ + drivers/platform/x86/x86-android-tablets/other.c | 522 ++++++ + .../x86/x86-android-tablets/shared-psy-info.c | 100 ++ + .../x86/x86-android-tablets/shared-psy-info.h | 32 + + .../x86/x86-android-tablets/x86-android-tablets.h | 108 ++ + drivers/platform/x86/xo1-rfkill.c | 5 +- + drivers/video/backlight/Kconfig | 1 + + drivers/video/backlight/apple_bl.c | 31 +- + include/linux/apple-gmux.h | 72 +- + include/linux/apple_bl.h | 27 - + include/uapi/linux/isst_if.h | 303 ++++ + 69 files changed, 4897 insertions(+), 2295 deletions(-) + create mode 100644 drivers/platform/x86/intel/bytcrc_pwrsrc.c + create mode 100644 drivers/platform/x86/intel/speed_select_if/isst_tpmi.c + create mode 100644 drivers/platform/x86/intel/speed_select_if/isst_tpmi_core.c + create mode 100644 drivers/platform/x86/intel/speed_select_if/isst_tpmi_core.h + delete mode 100644 drivers/platform/x86/peaq-wmi.c + delete mode 100644 drivers/platform/x86/x86-android-tablets.c + create mode 100644 drivers/platform/x86/x86-android-tablets/Kconfig + create mode 100644 drivers/platform/x86/x86-android-tablets/Makefile + create mode 100644 drivers/platform/x86/x86-android-tablets/asus.c + create mode 100644 drivers/platform/x86/x86-android-tablets/core.c + create mode 100644 drivers/platform/x86/x86-android-tablets/dmi.c + create mode 100644 drivers/platform/x86/x86-android-tablets/lenovo.c + create mode 100644 drivers/platform/x86/x86-android-tablets/other.c + create mode 100644 drivers/platform/x86/x86-android-tablets/shared-psy-info.c + create mode 100644 drivers/platform/x86/x86-android-tablets/shared-psy-info.h + create mode 100644 drivers/platform/x86/x86-android-tablets/x86-android-tablets.h + delete mode 100644 include/linux/apple_bl.h +Merging chrome-platform/for-next (db7df0cfaff3 platform/chrome: cros_ec: remove unneeded label and if-condition) +$ 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 +Merge made by the 'ort' strategy. + drivers/platform/chrome/cros_ec.c | 10 ++++------ + include/linux/platform_data/cros_ec_commands.h | 2 +- + 2 files changed, 5 insertions(+), 7 deletions(-) +Merging hsi/for-next (1b929c02afd3 Linux 6.2-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 (4ba9df04b7ac docs: leds: Add MT6370 RGB LED pattern document) +$ 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 +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/leds/common.yaml | 35 +- + .../bindings/leds/qcom,spmi-flash-led.yaml | 117 +++ + Documentation/leds/leds-mt6370-rgb.rst | 64 ++ + drivers/leds/Kconfig | 4 +- + drivers/leds/flash/Kconfig | 28 + + drivers/leds/flash/Makefile | 2 + + drivers/leds/flash/leds-mt6370-flash.c | 573 +++++++++++ + drivers/leds/flash/leds-qcom-flash.c | 773 +++++++++++++++ + drivers/leds/leds-lp8860.c | 10 +- + drivers/leds/leds-tlc591xx.c | 2 +- + drivers/leds/rgb/Kconfig | 13 + + drivers/leds/rgb/Makefile | 1 + + drivers/leds/rgb/leds-mt6370-rgb.c | 1010 ++++++++++++++++++++ + drivers/leds/trigger/Kconfig | 1 + + include/linux/leds.h | 2 +- + 15 files changed, 2621 insertions(+), 14 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/qcom,spmi-flash-led.yaml + create mode 100644 Documentation/leds/leds-mt6370-rgb.rst + create mode 100644 drivers/leds/flash/leds-mt6370-flash.c + create mode 100644 drivers/leds/flash/leds-qcom-flash.c + create mode 100644 drivers/leds/rgb/leds-mt6370-rgb.c +$ git reset --hard HEAD^ +HEAD is now at 31dd553faf46 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git +Merging next-20230317 version of leds-lj +$ git merge -m next-20230317/leds-lj 1aeff621689120db60cb7029e5a0fde7d01f7fb6 +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/leds/common.yaml | 33 +- + .../bindings/leds/qcom,spmi-flash-led.yaml | 116 ++++ + drivers/leds/Kconfig | 2 +- + drivers/leds/flash/Kconfig | 15 + + drivers/leds/flash/Makefile | 1 + + drivers/leds/flash/leds-qcom-flash.c | 773 +++++++++++++++++++++ + drivers/leds/leds-lp8860.c | 10 +- + drivers/leds/leds-tlc591xx.c | 2 +- + drivers/leds/trigger/Kconfig | 1 + + include/linux/leds.h | 2 +- + 10 files changed, 942 insertions(+), 13 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/qcom,spmi-flash-led.yaml + create mode 100644 drivers/leds/flash/leds-qcom-flash.c +Merging ipmi/for-next (d352cb47df75 ipmi: simplify sysctl registration) +$ git merge -m Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git ipmi/for-next +Merge made by the 'ort' strategy. + drivers/char/ipmi/Kconfig | 3 ++- + drivers/char/ipmi/ipmi_poweroff.c | 16 +--------------- + 2 files changed, 3 insertions(+), 16 deletions(-) +Merging driver-core/driver-core-next (fea087fc291b irqchip/mbigen: move to use bus_get_dev_root()) +$ 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 +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging arch/mips/sibyte/common/sb_tbprof.c +Auto-merging arch/s390/kernel/smp.c +Auto-merging arch/s390/kernel/topology.c +CONFLICT (content): Merge conflict in arch/s390/kernel/topology.c +Auto-merging arch/x86/kernel/cpu/microcode/core.c +Auto-merging block/genhd.c +Auto-merging drivers/char/tpm/tpm-chip.c +Auto-merging drivers/char/tpm/tpm.h +Auto-merging drivers/cpufreq/amd-pstate.c +Auto-merging drivers/cpufreq/intel_pstate.c +Auto-merging drivers/crypto/qat/qat_common/adf_ctl_drv.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +Auto-merging drivers/hwmon/hwmon.c +Auto-merging drivers/i2c/i2c-dev.c +Auto-merging drivers/mtd/mtdcore.c +Auto-merging drivers/net/wireless/virtual/mac80211_hwsim.c +Auto-merging drivers/net/wwan/wwan_core.c +Auto-merging drivers/net/wwan/wwan_hwsim.c +Auto-merging drivers/nvme/host/core.c +Auto-merging drivers/power/supply/power_supply_core.c +Auto-merging drivers/ptp/ptp_ocp.c +Auto-merging drivers/s390/crypto/zcrypt_api.c +Auto-merging drivers/scsi/sd.c +Auto-merging drivers/soc/qcom/rmtfs_mem.c +Auto-merging drivers/spi/spi.c +Auto-merging drivers/spi/spidev.c +Auto-merging drivers/tty/tty_io.c +Auto-merging drivers/tty/vt/vt.c +Auto-merging fs/pstore/pmsg.c +Auto-merging kernel/cpu.c +Auto-merging kernel/workqueue.c +Resolved 'arch/s390/kernel/topology.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master f54b2c2b5ab3] Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-devices-state_synced | 5 + + Documentation/admin-guide/kernel-parameters.txt | 23 ++-- + arch/arm64/kernel/cpufeature.c | 10 +- + arch/mips/kernel/mips-mt.c | 2 +- + arch/mips/kernel/vpe-mt.c | 1 - + arch/mips/sibyte/common/sb_tbprof.c | 2 +- + arch/powerpc/kernel/sysfs.c | 14 ++- + arch/powerpc/platforms/book3s/vas-api.c | 2 +- + arch/powerpc/platforms/powernv/idle.c | 9 +- + arch/powerpc/platforms/powernv/subcore.c | 10 +- + arch/powerpc/platforms/pseries/pseries_energy.c | 28 +++-- + arch/powerpc/platforms/pseries/suspend.c | 10 +- + arch/powerpc/sysdev/fsl_mpic_timer_wakeup.c | 19 +++- + arch/s390/kernel/smp.c | 12 +- + arch/s390/kernel/topology.c | 11 +- + arch/sh/drivers/dma/dma-sysfs.c | 8 +- + arch/x86/kernel/cpu/microcode/core.c | 13 ++- + arch/x86/kernel/cpu/resctrl/pseudo_lock.c | 2 +- + arch/x86/kernel/cpu/umwait.c | 8 +- + arch/x86/kernel/cpuid.c | 2 +- + arch/x86/kernel/msr.c | 2 +- + block/bsg.c | 2 +- + block/genhd.c | 19 ++-- + drivers/accel/drm_accel.c | 2 +- + drivers/accel/habanalabs/common/habanalabs_drv.c | 2 +- + drivers/base/base.h | 9 ++ + drivers/base/class.c | 23 ++-- + drivers/base/core.c | 119 +++++++++++--------- + drivers/base/dd.c | 29 ++++- + drivers/base/devcoredump.c | 1 - + drivers/base/devres.c | 11 +- + drivers/base/power/wakeup_stats.c | 2 +- + drivers/base/property.c | 124 +++++++++++++++------ + drivers/block/aoe/aoechr.c | 2 +- + drivers/block/pktcdvd.c | 1 - + drivers/block/rnbd/rnbd-clt-sysfs.c | 2 +- + drivers/block/rnbd/rnbd-srv-sysfs.c | 2 +- + drivers/block/ublk_drv.c | 2 +- + drivers/block/zram/zram_drv.c | 1 - + drivers/char/bsr.c | 2 +- + drivers/char/dsp56k.c | 2 +- + drivers/char/ipmi/ipmi_devintf.c | 2 +- + drivers/char/lp.c | 2 +- + drivers/char/mem.c | 2 +- + drivers/char/misc.c | 2 +- + drivers/char/pcmcia/cm4000_cs.c | 2 +- + drivers/char/pcmcia/cm4040_cs.c | 2 +- + drivers/char/pcmcia/scr24x_cs.c | 2 +- + drivers/char/ppdev.c | 2 +- + drivers/char/tpm/tpm-chip.c | 3 +- + drivers/char/tpm/tpm-interface.c | 5 +- + drivers/char/tpm/tpm.h | 1 + + drivers/char/virtio_console.c | 2 +- + drivers/char/xilinx_hwicap/xilinx_hwicap.c | 2 +- + drivers/char/xillybus/xillybus_class.c | 2 +- + drivers/comedi/comedi_fops.c | 2 +- + drivers/comedi/drivers/comedi_test.c | 2 +- + drivers/cpufreq/amd-pstate.c | 24 ++-- + drivers/cpufreq/cpufreq.c | 7 +- + drivers/cpufreq/intel_pstate.c | 7 +- + drivers/crypto/qat/qat_common/adf_ctl_drv.c | 2 +- + drivers/dca/dca-sysfs.c | 2 +- + drivers/devfreq/devfreq-event.c | 2 +- + drivers/devfreq/devfreq.c | 2 +- + drivers/dma-buf/dma-heap.c | 2 +- + drivers/extcon/extcon.c | 2 +- + drivers/fpga/fpga-bridge.c | 2 +- + drivers/fpga/fpga-mgr.c | 2 +- + drivers/fpga/fpga-region.c | 2 +- + drivers/gnss/core.c | 2 +- + drivers/gpio/gpiolib-sysfs.c | 2 - + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 2 +- + drivers/gpu/drm/display/drm_dp_aux_dev.c | 2 +- + drivers/gpu/drm/drm_sysfs.c | 2 +- + drivers/hid/hid-roccat-arvo.c | 2 +- + drivers/hid/hid-roccat-isku.c | 2 +- + drivers/hid/hid-roccat-kone.c | 2 +- + drivers/hid/hid-roccat-koneplus.c | 2 +- + drivers/hid/hid-roccat-konepure.c | 2 +- + drivers/hid/hid-roccat-kovaplus.c | 2 +- + drivers/hid/hid-roccat-pyra.c | 2 +- + drivers/hid/hid-roccat-ryos.c | 2 +- + drivers/hid/hid-roccat-savu.c | 2 +- + drivers/hid/hidraw.c | 2 +- + drivers/hwmon/hwmon.c | 1 - + drivers/i2c/i2c-dev.c | 2 +- + drivers/infiniband/core/uverbs_main.c | 2 +- + drivers/infiniband/hw/hfi1/device.c | 4 +- + drivers/infiniband/hw/qib/qib_file_ops.c | 2 +- + drivers/infiniband/ulp/rtrs/rtrs-clt.c | 2 +- + drivers/infiniband/ulp/rtrs/rtrs-srv.c | 2 +- + drivers/irqchip/irq-mbigen.c | 13 ++- + drivers/isdn/capi/capi.c | 2 +- + drivers/isdn/mISDN/core.c | 1 - + drivers/isdn/mISDN/dsp_pipeline.c | 2 +- + drivers/leds/led-class.c | 2 +- + drivers/macintosh/adb.c | 2 +- + drivers/media/dvb-core/dvbdev.c | 2 +- + drivers/media/pci/ddbridge/ddbridge-core.c | 1 - + drivers/media/rc/lirc_dev.c | 2 +- + drivers/mfd/cros_ec_dev.c | 1 - + drivers/misc/c2port/core.c | 2 +- + drivers/misc/cxl/file.c | 2 +- + drivers/misc/enclosure.c | 1 - + drivers/misc/genwqe/card_base.c | 2 +- + drivers/misc/hpilo.c | 2 +- + drivers/misc/mei/main.c | 2 +- + drivers/misc/ocxl/file.c | 2 +- + drivers/misc/phantom.c | 2 +- + drivers/misc/uacce/uacce.c | 2 +- + drivers/most/most_cdev.c | 2 +- + drivers/mtd/mtdcore.c | 1 - + drivers/mtd/ubi/build.c | 1 - + drivers/mux/core.c | 1 - + drivers/net/ethernet/hisilicon/hns/hnae.c | 2 +- + drivers/net/ipvlan/ipvtap.c | 1 - + drivers/net/macvtap.c | 1 - + drivers/net/ppp/ppp_generic.c | 2 +- + drivers/net/wireless/virtual/mac80211_hwsim.c | 2 +- + drivers/net/wwan/wwan_core.c | 2 +- + drivers/net/wwan/wwan_hwsim.c | 2 +- + drivers/nvdimm/bus.c | 2 +- + drivers/nvme/host/core.c | 6 +- + drivers/nvme/host/fabrics.c | 2 +- + drivers/nvme/host/fc.c | 1 - + drivers/nvme/target/fcloop.c | 2 +- + drivers/pci/endpoint/pci-epc-core.c | 2 +- + drivers/pci/switch/switchtec.c | 2 +- + drivers/phy/phy-core.c | 2 +- + drivers/platform/chrome/wilco_ec/event.c | 1 - + drivers/platform/chrome/wilco_ec/telemetry.c | 1 - + drivers/platform/x86/ibm_rtl.c | 18 ++- + drivers/platform/x86/intel/pmt/class.c | 1 - + .../uncore-frequency/uncore-frequency-common.c | 12 +- + drivers/platform/x86/intel_scu_ipc.c | 1 - + drivers/power/supply/power_supply_core.c | 2 +- + drivers/pps/pps.c | 2 +- + drivers/ptp/ptp_clock.c | 2 +- + drivers/ptp/ptp_ocp.c | 1 - + drivers/pwm/sysfs.c | 1 - + drivers/rapidio/devices/rio_mport_cdev.c | 2 +- + drivers/rapidio/rio-driver.c | 1 - + drivers/rapidio/rio_cm.c | 2 +- + drivers/rpmsg/rpmsg_core.c | 2 +- + drivers/rtc/class.c | 2 +- + drivers/s390/char/hmcdrv_dev.c | 2 +- + drivers/s390/char/raw3270.c | 2 +- + drivers/s390/char/tape_class.c | 2 +- + drivers/s390/char/vmlogrdr.c | 2 +- + drivers/s390/char/vmur.c | 2 +- + drivers/s390/crypto/zcrypt_api.c | 2 +- + drivers/sbus/char/oradax.c | 2 +- + drivers/scsi/ch.c | 2 +- + drivers/scsi/cxlflash/main.c | 2 +- + drivers/scsi/pmcraid.c | 2 +- + drivers/scsi/sd.c | 1 - + drivers/scsi/sg.c | 2 +- + drivers/sh/intc/userimask.c | 10 +- + drivers/soc/qcom/rmtfs_mem.c | 1 - + drivers/spi/spi.c | 2 - + drivers/spi/spidev.c | 2 +- + drivers/staging/fieldbus/anybuss/arcx-anybus.c | 2 +- + drivers/staging/fieldbus/dev_core.c | 1 - + drivers/staging/greybus/authentication.c | 2 +- + drivers/staging/greybus/fw-management.c | 2 +- + drivers/staging/greybus/loopback.c | 1 - + drivers/staging/greybus/raw.c | 2 +- + drivers/staging/greybus/vibrator.c | 1 - + drivers/staging/pi433/pi433_if.c | 2 +- + drivers/staging/vme_user/vme_user.c | 2 +- + drivers/tee/tee_core.c | 2 +- + drivers/tty/tty_io.c | 2 +- + drivers/tty/vt/vc_screen.c | 2 +- + drivers/tty/vt/vt.c | 2 +- + drivers/usb/core/file.c | 2 +- + drivers/usb/gadget/function/f_hid.c | 2 +- + drivers/usb/gadget/function/f_printer.c | 2 +- + drivers/usb/gadget/udc/core.c | 2 +- + drivers/usb/mon/mon_bin.c | 2 +- + drivers/usb/roles/class.c | 2 +- + drivers/usb/typec/class.c | 1 - + drivers/usb/typec/mux.c | 1 - + drivers/usb/typec/pd.c | 1 - + drivers/usb/typec/retimer.c | 1 - + drivers/vdpa/vdpa_user/vduse_dev.c | 2 +- + drivers/vfio/group.c | 2 +- + drivers/vfio/vfio_main.c | 2 +- + drivers/video/backlight/backlight.c | 2 +- + drivers/video/backlight/lcd.c | 2 +- + drivers/video/fbdev/core/fbmem.c | 2 +- + drivers/watchdog/watchdog_dev.c | 1 - + fs/coda/psdev.c | 2 +- + fs/fuse/cuse.c | 2 +- + fs/ksmbd/server.c | 1 - + fs/pstore/pmsg.c | 2 +- + include/linux/device.h | 27 +++-- + include/linux/device/class.h | 51 ++++----- + init/Kconfig | 38 ------- + kernel/cpu.c | 23 +++- + kernel/sched/debug.c | 52 ++++++++- + kernel/workqueue.c | 8 +- + lib/kobject.c | 34 +++--- + mm/backing-dev.c | 2 +- + net/bluetooth/hci_sysfs.c | 2 +- + net/netfilter/xt_IDLETIMER.c | 2 +- + net/wireless/sysfs.c | 1 - + samples/vfio-mdev/mbochs.c | 2 +- + samples/vfio-mdev/mdpy.c | 2 +- + samples/vfio-mdev/mtty.c | 2 +- + sound/sound_core.c | 2 +- + tools/testing/nvdimm/test/ndtest.c | 2 +- + tools/testing/nvdimm/test/nfit.c | 2 +- + 212 files changed, 685 insertions(+), 482 deletions(-) +Merging usb/usb-next (55b7fa634d9f dt-bindings: usb: dwc3: Add QCM2290 compatible) +$ 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 drivers/usb/dwc3/core.h +Auto-merging drivers/usb/dwc3/gadget.c +Auto-merging drivers/usb/gadget/composite.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/usb/generic-ohci.yaml | 2 +- + .../devicetree/bindings/usb/qcom,dwc3.yaml | 2 + + .../devicetree/bindings/usb/smsc,usb3503.yaml | 54 +++++++++++++++++- + .../devicetree/bindings/usb/snps,dwc3.yaml | 24 ++++++-- + .../devicetree/bindings/usb/usb-device.yaml | 1 - + drivers/usb/cdns3/cdns3-debug.h | 8 +-- + drivers/usb/cdns3/cdns3-trace.h | 28 +++------- + drivers/usb/cdns3/cdnsp-trace.h | 12 ++-- + drivers/usb/chipidea/ci_hdrc_imx.c | 6 +- + drivers/usb/chipidea/core.c | 2 +- + drivers/usb/core/usb-acpi.c | 12 ++-- + drivers/usb/dwc2/params.c | 3 +- + drivers/usb/dwc3/core.c | 12 ++++ + drivers/usb/dwc3/core.h | 4 ++ + drivers/usb/dwc3/gadget.c | 16 +----- + drivers/usb/dwc3/trace.h | 6 +- + drivers/usb/gadget/composite.c | 4 ++ + drivers/usb/gadget/function/f_fs.c | 7 ++- + drivers/usb/gadget/udc/aspeed-vhub/core.c | 1 - + drivers/usb/gadget/udc/aspeed-vhub/dev.c | 1 - + drivers/usb/gadget/udc/aspeed-vhub/ep0.c | 1 - + drivers/usb/gadget/udc/aspeed-vhub/epn.c | 1 - + drivers/usb/gadget/udc/aspeed-vhub/hub.c | 1 - + drivers/usb/gadget/udc/max3420_udc.c | 2 +- + drivers/usb/gadget/udc/mv_udc_core.c | 6 +- + drivers/usb/gadget/udc/renesas_usb3.c | 25 +-------- + drivers/usb/gadget/udc/rzv2m_usb3drd.c | 2 +- + drivers/usb/gadget/udc/snps_udc_plat.c | 2 +- + drivers/usb/host/ehci-ppc-of.c | 6 +- + drivers/usb/host/fsl-mph-dr-of.c | 11 ++-- + drivers/usb/host/max3421-hcd.c | 2 +- + drivers/usb/host/oxu210hp-hcd.c | 2 +- + drivers/usb/host/xhci-rcar.c | 36 +----------- + drivers/usb/host/xhci-tegra.c | 17 +++--- + drivers/usb/host/xhci-trace.h | 20 +++---- + drivers/usb/misc/usb251xb.c | 43 ++++++--------- + drivers/usb/misc/usb3503.c | 64 +++++++++++++--------- + drivers/usb/musb/Kconfig | 2 +- + drivers/usb/musb/omap2430.c | 2 +- + drivers/usb/phy/phy-mxs-usb.c | 2 +- + drivers/usb/phy/phy-tegra-usb.c | 2 +- + drivers/usb/renesas_usbhs/common.c | 2 +- + drivers/usb/typec/hd3ss3220.c | 2 +- + drivers/usb/typec/tcpm/fusb302.c | 2 +- + include/linux/platform_data/usb3503.h | 1 + + 45 files changed, 226 insertions(+), 235 deletions(-) +Merging thunderbolt/next (ebde5ba27c64 thunderbolt: Refactor DROM reading) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt/next +Merge made by the 'ort' strategy. + drivers/thunderbolt/eeprom.c | 204 +++++++++++++++++++++++-------------------- + 1 file changed, 107 insertions(+), 97 deletions(-) +Merging usb-serial/usb-next (eeac8ede1755 Linux 6.3-rc2) +$ 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 (f16a70c0472e Merge 6.3-rc3 into tty-next) +$ 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/tty_io.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/serial-console.rst | 36 ++++++- + .../bindings/serial/amlogic,meson-uart.yaml | 9 ++ + .../devicetree/bindings/serial/fsl-imx-uart.yaml | 27 +++++ + arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 15 ++- + drivers/char/pcmcia/synclink_cs.c | 6 +- + drivers/mmc/core/sdio_uart.c | 10 +- + drivers/tty/amiserial.c | 6 +- + drivers/tty/mxser.c | 6 +- + drivers/tty/n_tty.c | 43 ++++---- + drivers/tty/serial/8250/8250_bcm7271.c | 18 ++-- + drivers/tty/serial/8250/8250_em.c | 113 ++++++++++++++++----- + drivers/tty/serial/imx.c | 34 +++---- + drivers/tty/serial/meson_uart.c | 8 +- + drivers/tty/serial/mxs-auart.c | 4 +- + drivers/tty/serial/serial_core.c | 113 ++++++++++----------- + drivers/tty/serial/sh-sci.c | 4 +- + drivers/tty/serial/sprd_serial.c | 2 +- + drivers/tty/serial/stm32-usart.c | 6 +- + drivers/tty/serial/stm32-usart.h | 1 - + drivers/tty/serial/sunzilog.c | 4 +- + drivers/tty/serial/ucc_uart.c | 2 +- + drivers/tty/synclink_gt.c | 6 +- + drivers/tty/tty_io.c | 20 +--- + drivers/tty/tty_ioctl.c | 9 +- + drivers/tty/tty_ldisc.c | 3 +- + include/linux/serial_8250.h | 45 ++++---- + include/linux/serial_core.h | 15 ++- + include/linux/tty.h | 2 +- + 28 files changed, 338 insertions(+), 229 deletions(-) +Merging char-misc/char-misc-next (abae262640ef Merge 6.3-rc3 into char-misc-next) +$ 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 MAINTAINERS +Auto-merging arch/powerpc/configs/ppc6xx_defconfig +CONFLICT (modify/delete): drivers/char/pcmcia/cm4000_cs.c deleted in char-misc/char-misc-next and modified in HEAD. Version HEAD of drivers/char/pcmcia/cm4000_cs.c left in tree. +CONFLICT (modify/delete): drivers/char/pcmcia/cm4040_cs.c deleted in char-misc/char-misc-next and modified in HEAD. Version HEAD of drivers/char/pcmcia/cm4040_cs.c left in tree. +CONFLICT (modify/delete): drivers/char/pcmcia/scr24x_cs.c deleted in char-misc/char-misc-next and modified in HEAD. Version HEAD of drivers/char/pcmcia/scr24x_cs.c left in tree. +CONFLICT (modify/delete): drivers/char/pcmcia/synclink_cs.c deleted in char-misc/char-misc-next and modified in HEAD. Version HEAD of drivers/char/pcmcia/synclink_cs.c left in tree. +Auto-merging drivers/fpga/fpga-bridge.c +Auto-merging drivers/misc/genwqe/card_base.c +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/char/pcmcia/cm4000_cs.c drivers/char/pcmcia/cm4040_cs.c drivers/char/pcmcia/scr24x_cs.c drivers/char/pcmcia/synclink_cs.c +rm 'drivers/char/pcmcia/cm4000_cs.c' +rm 'drivers/char/pcmcia/cm4040_cs.c' +rm 'drivers/char/pcmcia/scr24x_cs.c' +rm 'drivers/char/pcmcia/synclink_cs.c' +$ git commit --no-edit -v -a +[master 8717fb12618a] Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git +$ git diff -M --stat --summary HEAD^.. + .../sysfs-bus-platform-devices-ampere-smpro | 19 +- + Documentation/ABI/testing/sysfs-driver-zynqmp-fpga | 73 + + Documentation/process/magic-number.rst | 1 - + .../translations/it_IT/process/magic-number.rst | 1 - + .../translations/sp_SP/process/magic-number.rst | 1 - + .../translations/zh_CN/process/magic-number.rst | 1 - + .../translations/zh_TW/process/magic-number.rst | 1 - + Documentation/userspace-api/ioctl/ioctl-number.rst | 1 - + MAINTAINERS | 17 - + arch/powerpc/configs/ppc6xx_defconfig | 2 - + drivers/char/Kconfig | 2 - + drivers/char/Makefile | 1 - + drivers/char/pcmcia/Kconfig | 68 - + drivers/char/pcmcia/Makefile | 11 - + drivers/char/pcmcia/cm4000_cs.c | 1912 --------- + drivers/char/pcmcia/cm4040_cs.c | 684 ---- + drivers/char/pcmcia/cm4040_cs.h | 48 - + drivers/char/pcmcia/scr24x_cs.c | 359 -- + drivers/char/pcmcia/synclink_cs.c | 4290 -------------------- + drivers/firmware/dmi-sysfs.c | 4 +- + drivers/firmware/edd.c | 2 +- + drivers/firmware/xilinx/zynqmp.c | 33 + + drivers/fpga/fpga-bridge.c | 2 +- + drivers/fpga/zynqmp-fpga.c | 21 + + drivers/misc/cardreader/alcor_pci.c | 144 +- + drivers/misc/genwqe/card_base.c | 2 - + drivers/misc/lis3lv02d/lis3lv02d.c | 66 +- + drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gpio.c | 10 +- + drivers/misc/sgi-xp/xpc_main.c | 24 +- + drivers/misc/smpro-errmon.c | 82 + + drivers/misc/sram.c | 28 +- + drivers/misc/sram.h | 1 - + drivers/tty/Kconfig | 9 + + include/linux/alcor_pci.h | 7 - + include/linux/cm4000_cs.h | 11 - + include/linux/firmware/xlnx-zynqmp.h | 11 + + include/uapi/linux/cm4000_cs.h | 64 - + 37 files changed, 312 insertions(+), 7701 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-driver-zynqmp-fpga + delete mode 100644 drivers/char/pcmcia/Kconfig + delete mode 100644 drivers/char/pcmcia/Makefile + delete mode 100644 drivers/char/pcmcia/cm4000_cs.c + delete mode 100644 drivers/char/pcmcia/cm4040_cs.c + delete mode 100644 drivers/char/pcmcia/cm4040_cs.h + delete mode 100644 drivers/char/pcmcia/scr24x_cs.c + delete mode 100644 drivers/char/pcmcia/synclink_cs.c + delete mode 100644 include/linux/cm4000_cs.h + delete mode 100644 include/uapi/linux/cm4000_cs.h +Merging accel/habanalabs-next (75b445753047 accel/habanalabs: remove redundant TODOs) +$ git merge -m Merge branch 'habanalabs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux.git accel/habanalabs-next +Auto-merging drivers/accel/habanalabs/common/habanalabs_drv.c +Merge made by the 'ort' strategy. + .../accel/habanalabs/common/command_submission.c | 130 +- + drivers/accel/habanalabs/common/debugfs.c | 142 +- + drivers/accel/habanalabs/common/decoder.c | 22 +- + drivers/accel/habanalabs/common/device.c | 315 +- + drivers/accel/habanalabs/common/firmware_if.c | 2 +- + drivers/accel/habanalabs/common/habanalabs.h | 129 +- + drivers/accel/habanalabs/common/habanalabs_drv.c | 14 +- + drivers/accel/habanalabs/common/habanalabs_ioctl.c | 60 +- + drivers/accel/habanalabs/common/irq.c | 73 +- + drivers/accel/habanalabs/common/memory.c | 133 +- + drivers/accel/habanalabs/common/memory_mgr.c | 15 +- + drivers/accel/habanalabs/common/mmu/mmu.c | 6 +- + drivers/accel/habanalabs/common/security.c | 6 +- + drivers/accel/habanalabs/common/security.h | 2 +- + drivers/accel/habanalabs/gaudi/gaudi.c | 65 +- + drivers/accel/habanalabs/gaudi2/gaudi2.c | 1543 ++++-- + drivers/accel/habanalabs/gaudi2/gaudi2P.h | 9 +- + drivers/accel/habanalabs/gaudi2/gaudi2_coresight.c | 2 +- + drivers/accel/habanalabs/gaudi2/gaudi2_masks.h | 3 +- + drivers/accel/habanalabs/gaudi2/gaudi2_security.c | 1 + + drivers/accel/habanalabs/goya/goya.c | 21 +- + drivers/accel/habanalabs/include/common/cpucp_if.h | 9 +- + .../accel/habanalabs/include/common/hl_boot_if.h | 47 +- + .../include/gaudi2/asic_reg/gaudi2_regs.h | 5 + + drivers/accel/habanalabs/include/gaudi2/gaudi2.h | 2 + + .../include/gaudi2/gaudi2_async_events.h | 4 +- + .../include/gaudi2/gaudi2_async_ids_map_extended.h | 5294 ++++++++++---------- + .../accel/habanalabs/include/gaudi2/gaudi2_fw_if.h | 5 +- + include/drm/drm_file.h | 3 +- + include/uapi/drm/habanalabs_accel.h | 102 +- + 30 files changed, 4541 insertions(+), 3623 deletions(-) +Merging coresight/next (669c4614236a coresight: tmc: Don't enable TMC when it's not ready.) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git coresight/next +Already up to date. +Merging fpga/for-next (fe15c26ee26e Linux 6.3-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga/for-next +Already up to date. +Merging icc/icc-next (403ade557dd1 interconnect: qcom: rpm: drop bogus pm domain attach) +$ git merge -m Merge branch 'icc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git icc/icc-next +Merge made by the 'ort' strategy. + drivers/interconnect/core.c | 133 ++++------------------------------ + drivers/interconnect/qcom/Kconfig | 2 +- + drivers/interconnect/qcom/icc-rpm.c | 7 -- + drivers/interconnect/qcom/icc-rpm.h | 1 - + drivers/interconnect/qcom/msm8996.c | 1 - + drivers/interconnect/qcom/osm-l3.c | 7 -- + drivers/interconnect/qcom/sc7180.h | 2 - + drivers/interconnect/qcom/sc7280.h | 2 - + drivers/interconnect/qcom/sc8180x.h | 2 - + drivers/interconnect/qcom/sdm845.h | 2 - + drivers/interconnect/qcom/sm8150.h | 2 - + drivers/interconnect/qcom/sm8250.h | 2 - + include/linux/interconnect-provider.h | 17 ----- + include/linux/interconnect.h | 8 -- + 14 files changed, 14 insertions(+), 174 deletions(-) +Merging iio/togreg (225dc61e2fa8 iio: adc: stm32-adc: set some stm32-adc.c variables storage-class-specifier to static) +$ 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/kionix-kx022a.c +Auto-merging drivers/iio/adc/max11410.c +Auto-merging drivers/iio/dac/cio-dac.c +Auto-merging drivers/iio/light/vcnl4000.c +Merge made by the 'ort' strategy. + .../bindings/iio/adc/renesas,rcar-gyroadc.yaml | 60 +- + .../devicetree/bindings/iio/adc/ti,ads1100.yaml | 46 ++ + .../bindings/iio/addac/adi,ad74413r.yaml | 9 + + .../devicetree/bindings/iio/imu/st,lsm6dsx.yaml | 3 + + .../devicetree/bindings/iio/pressure/bmp085.yaml | 2 + + .../bindings/iio/temperature/ti,tmp117.yaml | 8 +- + drivers/iio/accel/bma400_core.c | 2 +- + drivers/iio/accel/kionix-kx022a.c | 3 +- + drivers/iio/accel/mma8452.c | 2 +- + drivers/iio/accel/msa311.c | 2 +- + drivers/iio/adc/Kconfig | 10 + + drivers/iio/adc/Makefile | 1 + + drivers/iio/adc/ad7606.c | 2 +- + drivers/iio/adc/at91-sama5d2_adc.c | 2 +- + drivers/iio/adc/axp20x_adc.c | 77 ++- + drivers/iio/adc/max11410.c | 2 +- + drivers/iio/adc/meson_saradc.c | 21 +- + drivers/iio/adc/rcar-gyroadc.c | 2 +- + drivers/iio/adc/stm32-adc.c | 6 +- + drivers/iio/adc/ti-ads1100.c | 445 ++++++++++++ + drivers/iio/addac/ad74413r.c | 44 +- + drivers/iio/chemical/sps30_i2c.c | 6 +- + drivers/iio/common/st_sensors/st_sensors_trigger.c | 4 +- + drivers/iio/dac/ad5592r-base.c | 5 + + drivers/iio/dac/cio-dac.c | 2 +- + drivers/iio/gyro/fxas21002c_core.c | 2 +- + drivers/iio/gyro/mpu3050-core.c | 2 +- + drivers/iio/humidity/hts221_buffer.c | 2 +- + drivers/iio/imu/adis16475.c | 6 +- + drivers/iio/imu/st_lsm6dsx/Kconfig | 4 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 13 + + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 59 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 22 + + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c | 5 + + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c | 5 + + drivers/iio/industrialio-trigger.c | 17 +- + drivers/iio/light/acpi-als.c | 2 +- + drivers/iio/light/max44009.c | 13 +- + drivers/iio/light/rpr0521.c | 2 +- + drivers/iio/light/st_uvis25_core.c | 2 +- + drivers/iio/light/vcnl4000.c | 2 +- + drivers/iio/light/vcnl4035.c | 2 +- + drivers/iio/potentiostat/lmp91000.c | 2 +- + drivers/iio/pressure/Kconfig | 6 +- + drivers/iio/pressure/bmp280-core.c | 765 ++++++++++++++++----- + drivers/iio/pressure/bmp280-i2c.c | 45 +- + drivers/iio/pressure/bmp280-regmap.c | 60 ++ + drivers/iio/pressure/bmp280-spi.c | 47 +- + drivers/iio/pressure/bmp280.h | 273 +++++++- + drivers/iio/pressure/zpa2326.c | 2 +- + drivers/iio/proximity/as3935.c | 2 +- + drivers/iio/proximity/sx9324.c | 96 +-- + drivers/iio/proximity/sx9360.c | 32 +- + drivers/iio/proximity/sx9500.c | 4 +- + drivers/iio/proximity/sx_common.c | 21 + + drivers/iio/proximity/sx_common.h | 6 +- + drivers/iio/temperature/tmp117.c | 80 ++- + drivers/iio/trigger/iio-trig-loop.c | 2 +- + drivers/staging/iio/Kconfig | 1 - + drivers/staging/iio/Makefile | 1 - + drivers/staging/iio/meter/Kconfig | 37 - + drivers/staging/iio/meter/Makefile | 8 - + drivers/staging/iio/meter/ade7854-i2c.c | 153 ----- + drivers/staging/iio/meter/ade7854-spi.c | 160 ----- + drivers/staging/iio/meter/ade7854.c | 556 --------------- + drivers/staging/iio/meter/ade7854.h | 173 ----- + drivers/staging/iio/meter/meter.h | 398 ----------- + include/linux/iio/trigger.h | 8 +- + 68 files changed, 1908 insertions(+), 1956 deletions(-) + create mode 100644 Documentation/devicetree/bindings/iio/adc/ti,ads1100.yaml + create mode 100644 drivers/iio/adc/ti-ads1100.c + delete mode 100644 drivers/staging/iio/meter/Kconfig + delete mode 100644 drivers/staging/iio/meter/Makefile + delete mode 100644 drivers/staging/iio/meter/ade7854-i2c.c + delete mode 100644 drivers/staging/iio/meter/ade7854-spi.c + delete mode 100644 drivers/staging/iio/meter/ade7854.c + delete mode 100644 drivers/staging/iio/meter/ade7854.h + delete mode 100644 drivers/staging/iio/meter/meter.h +Merging phy-next/next (84a59a314263 phy: xgene: Depend on ARCH_XGENE rather than plain arm64) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../bindings/phy/intel,phy-thunderbay-emmc.yaml | 45 -- + MAINTAINERS | 7 - + drivers/phy/Kconfig | 2 +- + drivers/phy/allwinner/phy-sun4i-usb.c | 8 +- + drivers/phy/broadcom/phy-bcm-ns-usb2.c | 2 +- + drivers/phy/broadcom/phy-brcm-usb.c | 6 +- + drivers/phy/cadence/cdns-dphy.c | 6 +- + drivers/phy/cadence/phy-cadence-sierra.c | 6 +- + drivers/phy/cadence/phy-cadence-torrent.c | 6 +- + drivers/phy/freescale/phy-fsl-imx8qm-lvds-phy.c | 6 +- + drivers/phy/intel/Kconfig | 10 - + drivers/phy/intel/Makefile | 1 - + drivers/phy/intel/phy-intel-lgm-combo.c | 5 +- + drivers/phy/intel/phy-intel-thunderbay-emmc.c | 509 --------------------- + drivers/phy/marvell/phy-pxa-28nm-hsic.c | 2 +- + drivers/phy/marvell/phy-pxa-28nm-usb2.c | 2 +- + drivers/phy/mediatek/phy-mtk-mipi-dsi.c | 5 +- + drivers/phy/motorola/phy-cpcap-usb.c | 6 +- + drivers/phy/motorola/phy-mapphone-mdm6600.c | 6 +- + drivers/phy/phy-lgm-usb.c | 6 +- + drivers/phy/qualcomm/phy-qcom-apq8064-sata.c | 6 +- + drivers/phy/qualcomm/phy-qcom-eusb2-repeater.c | 8 +- + drivers/phy/qualcomm/phy-qcom-ipq806x-sata.c | 6 +- + drivers/phy/qualcomm/phy-qcom-qmp-pcie.c | 91 +++- + drivers/phy/qualcomm/phy-qcom-qmp-pcs-pcie-v4_20.h | 2 + + drivers/phy/renesas/phy-rcar-gen3-pcie.c | 6 +- + drivers/phy/renesas/phy-rcar-gen3-usb2.c | 6 +- + drivers/phy/renesas/phy-rcar-gen3-usb3.c | 6 +- + drivers/phy/renesas/r8a779f0-ether-serdes.c | 6 +- + drivers/phy/rockchip/phy-rockchip-inno-csidphy.c | 6 +- + drivers/phy/rockchip/phy-rockchip-inno-dsidphy.c | 6 +- + drivers/phy/rockchip/phy-rockchip-inno-hdmi.c | 6 +- + drivers/phy/rockchip/phy-rockchip-typec.c | 6 +- + drivers/phy/st/phy-miphy28lp.c | 42 +- + drivers/phy/st/phy-spear1310-miphy.c | 2 +- + drivers/phy/st/phy-spear1340-miphy.c | 2 +- + drivers/phy/st/phy-stm32-usbphyc.c | 6 +- + drivers/phy/tegra/xusb-tegra186.c | 20 + + drivers/phy/tegra/xusb.c | 6 +- + drivers/phy/tegra/xusb.h | 1 + + drivers/phy/ti/phy-am654-serdes.c | 6 +- + drivers/phy/ti/phy-da8xx-usb.c | 6 +- + drivers/phy/ti/phy-dm816x-usb.c | 6 +- + drivers/phy/ti/phy-j721e-wiz.c | 6 +- + drivers/phy/ti/phy-omap-usb2.c | 6 +- + drivers/phy/ti/phy-ti-pipe3.c | 6 +- + drivers/phy/ti/phy-twl4030-usb.c | 6 +- + 47 files changed, 179 insertions(+), 749 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/phy/intel,phy-thunderbay-emmc.yaml + delete mode 100644 drivers/phy/intel/phy-intel-thunderbay-emmc.c +Merging soundwire/next (6c469871e801 soundwire: stream: restore cumulative bus bandwidth when compute_params callback failed) +$ 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. + drivers/soundwire/Makefile | 3 +- + drivers/soundwire/bus.h | 11 - + drivers/soundwire/cadence_master.c | 139 ++++++---- + drivers/soundwire/cadence_master.h | 3 + + drivers/soundwire/dmi-quirks.c | 25 ++ + drivers/soundwire/generic_bandwidth_allocation.c | 3 +- + drivers/soundwire/intel.c | 325 ++--------------------- + drivers/soundwire/intel.h | 67 +++++ + drivers/soundwire/intel_bus_common.c | 259 ++++++++++++++++++ + drivers/soundwire/qcom.c | 20 +- + drivers/soundwire/stream.c | 2 +- + include/linux/soundwire/sdw_intel.h | 11 + + 12 files changed, 484 insertions(+), 384 deletions(-) + create mode 100644 drivers/soundwire/intel_bus_common.c +Merging extcon/extcon-next (19685ae43489 extcon: usbc-tusb320: add usb_role_switch support) +$ 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 4aad0541cee1] 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/extcon-axp288.c | 2 +- + drivers/extcon/extcon-palmas.c | 1 - + drivers/extcon/extcon-qcom-spmi-misc.c | 4 +- + drivers/extcon/extcon-usbc-tusb320.c | 153 +++++++++-- + drivers/extcon/extcon.c | 302 ++++++++++++--------- + 6 files changed, 310 insertions(+), 166 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 (d649c34cb916 vfio: Fix NULL pointer dereference caused by uninitialized group->iommufd) +$ git merge -m Merge branch 'next' of git://github.com/awilliam/linux-vfio.git vfio/next +Already up to date. +Merging staging/staging-next (f4a8e711a66b Staging: octeon: Fix line ending with '(') +$ 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/axis-fifo/axis-fifo.c | 28 ++-- + drivers/staging/most/dim2/dim2.c | 3 +- + drivers/staging/octeon/octeon-stubs.h | 4 +- + drivers/staging/qlge/qlge_dbg.c | 35 ++--- + drivers/staging/rtl8192e/rtl8192e/Makefile | 2 +- + drivers/staging/rtl8192e/rtl8192e/r8190P_def.h | 11 -- + drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c | 10 -- + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 18 +-- + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h | 1 - + .../staging/rtl8192e/rtl8192e/r8192E_firmware.c | 2 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.h | 33 ---- + drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 168 +++------------------ + drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h | 21 --- + drivers/staging/rtl8192e/rtl8192e/r8192E_phyreg.h | 37 ----- + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 77 +++------- + drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 41 ----- + drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 109 +++---------- + drivers/staging/rtl8192e/rtl8192e/rtl_pci.c | 6 +- + drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 8 +- + .../rtl8192e/rtl8192e/{r8192E_hwimg.c => table.c} | 22 +-- + drivers/staging/rtl8192e/rtl8192e/table.h | 27 ++++ + drivers/staging/rtl8192e/rtllib.h | 1 - + drivers/staging/rtl8192e/rtllib_rx.c | 7 +- + drivers/staging/rtl8192e/rtllib_softmac.c | 24 +-- + drivers/staging/rtl8192e/rtllib_softmac_wx.c | 9 +- + drivers/staging/rtl8192u/r8192U_dm.c | 38 ----- + drivers/staging/rtl8192u/r8192U_dm.h | 1 - + drivers/staging/rtl8192u/r819xU_phy.c | 87 ----------- + drivers/staging/rtl8192u/r819xU_phy.h | 2 - + drivers/staging/rtl8712/rtl871x_mlme.c | 97 ++++++------ + drivers/staging/rtl8723bs/core/rtw_mlme.c | 17 +-- + drivers/staging/rtl8723bs/hal/hal_com.c | 108 ------------- + drivers/staging/rtl8723bs/include/hal_com.h | 9 -- + drivers/staging/rtl8723bs/include/rtw_mlme.h | 20 --- + drivers/staging/vme_user/vme_fake.c | 5 - + drivers/staging/vme_user/vme_tsi148.c | 13 +- + drivers/staging/vt6655/baseband.c | 44 ------ + drivers/staging/vt6655/baseband.h | 2 - + drivers/staging/vt6656/card.c | 21 --- + drivers/staging/vt6656/card.h | 1 - + drivers/staging/wlan-ng/prism2fw.c | 8 +- + 41 files changed, 216 insertions(+), 961 deletions(-) + delete mode 100644 drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.h + rename drivers/staging/rtl8192e/rtl8192e/{r8192E_hwimg.c => table.c} (95%) + create mode 100644 drivers/staging/rtl8192e/rtl8192e/table.h +Merging counter-next/counter-next (fe15c26ee26e Linux 6.3-rc1) +$ git merge -m Merge branch 'counter-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-next/counter-next +Already up to date. +Merging mux/for-next (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 (fe8f1a2e9b7c dt-bindings: dma: apple,admac: Add t8112-admac compatible) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/dma/apple,admac.yaml | 1 + + Documentation/devicetree/bindings/dma/qcom,gpi.yaml | 1 + + Documentation/devicetree/bindings/dma/renesas,rz-dmac.yaml | 14 ++++++++++++++ + drivers/dma/idxd/init.c | 1 - + drivers/dma/imx-dma.c | 1 - + drivers/dma/ioat/init.c | 12 +++--------- + drivers/dma/ioat/registers.h | 7 ------- + drivers/dma/of-dma.c | 2 +- + drivers/dma/sh/rz-dmac.c | 14 ++++++++++++++ + 9 files changed, 34 insertions(+), 19 deletions(-) +Merging cgroup/for-next (f7ac82ea4b45 Merge branch 'for-6.3-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git cgroup/for-next +Auto-merging kernel/bpf/cgroup.c +Auto-merging kernel/bpf/local_storage.c +Auto-merging kernel/cgroup/cgroup.c +Merge made by the 'ort' strategy. + kernel/bpf/cgroup.c | 38 ++++++++++++++--------------- + kernel/bpf/cgroup_iter.c | 4 ++-- + kernel/bpf/local_storage.c | 4 ++-- + kernel/cgroup/cgroup-v1.c | 16 ++++++------- + kernel/cgroup/cgroup.c | 60 +++++++++++++++++++++++----------------------- + kernel/cgroup/rstat.c | 4 +--- + 6 files changed, 62 insertions(+), 64 deletions(-) +Merging scsi/for-next (2b6ac25dfa2a Merge branch 'misc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi/for-next +Auto-merging drivers/scsi/lpfc/lpfc_init.c +Merge made by the 'ort' strategy. + drivers/message/fusion/mptbase.h | 1 - + drivers/message/fusion/mptscsih.c | 1 - + drivers/scsi/aacraid/linit.c | 3 - + drivers/scsi/arcmsr/arcmsr_hba.c | 1 - + drivers/scsi/be2iscsi/be_cmds.c | 2 - + drivers/scsi/be2iscsi/be_main.c | 9 --- + drivers/scsi/be2iscsi/be_main.h | 1 - + drivers/scsi/bfa/bfad.c | 6 -- + drivers/scsi/bfa/bfad_drv.h | 1 - + drivers/scsi/csiostor/csio_init.c | 1 - + drivers/scsi/hisi_sas/hisi_sas.h | 6 +- + drivers/scsi/hisi_sas/hisi_sas_main.c | 95 +++++++++++++++++++------ + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 102 +++++++++++++++++++++++---- + drivers/scsi/hpsa.c | 1 - + drivers/scsi/lpfc/lpfc.h | 2 - + drivers/scsi/lpfc/lpfc_attr.c | 102 +++++++++------------------ + drivers/scsi/lpfc/lpfc_bsg.c | 4 +- + drivers/scsi/lpfc/lpfc_crtn.h | 2 + + drivers/scsi/lpfc/lpfc_ct.c | 8 +-- + drivers/scsi/lpfc/lpfc_debugfs.c | 9 ++- + drivers/scsi/lpfc/lpfc_els.c | 50 +++++++------ + drivers/scsi/lpfc/lpfc_hbadisc.c | 39 +++++++++- + drivers/scsi/lpfc/lpfc_hw.h | 14 +--- + drivers/scsi/lpfc/lpfc_init.c | 6 +- + drivers/scsi/lpfc/lpfc_nvme.c | 6 +- + drivers/scsi/lpfc/lpfc_sli.c | 83 ++++++---------------- + drivers/scsi/lpfc/lpfc_sli4.h | 19 +++++ + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/mpt3sas/mpt3sas_base.c | 5 -- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 1 - + drivers/scsi/qla2xxx/qla_def.h | 1 - + drivers/scsi/qla2xxx/qla_os.c | 6 -- + drivers/scsi/qla4xxx/ql4_def.h | 1 - + drivers/scsi/qla4xxx/ql4_os.c | 4 -- + drivers/target/target_core_alua.c | 4 +- + drivers/target/target_core_device.c | 43 +---------- + drivers/target/target_core_fabric_configfs.c | 44 ++++++++++-- + drivers/target/target_core_internal.h | 3 +- + drivers/target/target_core_pr.c | 8 +-- + drivers/target/target_core_spc.c | 2 +- + drivers/target/target_core_stat.c | 6 +- + drivers/target/target_core_tpg.c | 71 +++++++++++++++++-- + include/target/target_core_base.h | 7 +- + 43 files changed, 448 insertions(+), 334 deletions(-) +Merging scsi-mkp/for-next (e05c006dac08 Merge patch series "mpi3mr: Few Enhancements and minor fixes") +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-mkp/for-next +Auto-merging drivers/scsi/mpi3mr/mpi3mr.h +Auto-merging drivers/scsi/mpi3mr/mpi3mr_app.c +Auto-merging drivers/scsi/mpi3mr/mpi3mr_fw.c +CONFLICT (content): Merge conflict in drivers/scsi/mpi3mr/mpi3mr_fw.c +Auto-merging drivers/scsi/mpi3mr/mpi3mr_os.c +Auto-merging drivers/scsi/mpi3mr/mpi3mr_transport.c +Auto-merging drivers/ufs/core/ufshcd.c +Auto-merging drivers/ufs/host/ufs-qcom.c +Resolved 'drivers/scsi/mpi3mr/mpi3mr_fw.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 378143e2800d] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git +$ git diff -M --stat --summary HEAD^.. + drivers/infiniband/ulp/srpt/ib_srpt.c | 33 ---- + drivers/scsi/be2iscsi/be_main.c | 18 +- + drivers/scsi/elx/efct/efct_lio.c | 20 --- + drivers/scsi/fnic/fnic_trace.c | 17 +- + drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 30 ---- + drivers/scsi/mpi3mr/mpi/mpi30_cnfg.h | 112 +++++++++++-- + drivers/scsi/mpi3mr/mpi/mpi30_image.h | 2 +- + drivers/scsi/mpi3mr/mpi/mpi30_init.h | 23 ++- + drivers/scsi/mpi3mr/mpi/mpi30_ioc.h | 2 +- + drivers/scsi/mpi3mr/mpi/mpi30_pci.h | 6 +- + drivers/scsi/mpi3mr/mpi/mpi30_sas.h | 2 +- + drivers/scsi/mpi3mr/mpi/mpi30_transport.h | 4 +- + drivers/scsi/mpi3mr/mpi3mr.h | 15 +- + drivers/scsi/mpi3mr/mpi3mr_app.c | 5 +- + drivers/scsi/mpi3mr/mpi3mr_debug.h | 2 +- + drivers/scsi/mpi3mr/mpi3mr_fw.c | 6 +- + drivers/scsi/mpi3mr/mpi3mr_os.c | 78 ++++++--- + drivers/scsi/mpi3mr/mpi3mr_transport.c | 2 +- + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 14 -- + drivers/scsi/qlogicpti.c | 11 +- + drivers/scsi/scsi_debug.c | 209 +++++++++-------------- + drivers/scsi/sun_esp.c | 2 +- + drivers/target/Kconfig | 1 + + drivers/target/Makefile | 1 + + drivers/target/loopback/tcm_loop.c | 41 ----- + drivers/target/sbp/sbp_target.c | 31 ---- + drivers/target/target_core_configfs.c | 94 +++++++---- + drivers/target/tcm_fc/tcm_fc.h | 1 - + drivers/target/tcm_fc/tfc_cmd.c | 5 - + drivers/target/tcm_fc/tfc_conf.c | 15 -- + drivers/target/tcm_remote/Kconfig | 8 + + drivers/target/tcm_remote/Makefile | 2 + + drivers/target/tcm_remote/tcm_remote.c | 268 ++++++++++++++++++++++++++++++ + drivers/target/tcm_remote/tcm_remote.h | 20 +++ + drivers/ufs/core/ufshcd.c | 115 ++++++++----- + drivers/ufs/host/ufs-exynos.c | 2 +- + drivers/ufs/host/ufs-hisi.c | 2 +- + drivers/ufs/host/ufs-qcom.c | 2 +- + drivers/usb/gadget/function/f_tcm.c | 31 ---- + drivers/vhost/scsi.c | 31 ---- + drivers/xen/xen-scsiback.c | 30 ---- + include/trace/events/ufs.h | 22 +-- + 42 files changed, 752 insertions(+), 583 deletions(-) + create mode 100644 drivers/target/tcm_remote/Kconfig + create mode 100644 drivers/target/tcm_remote/Makefile + create mode 100644 drivers/target/tcm_remote/tcm_remote.c + create mode 100644 drivers/target/tcm_remote/tcm_remote.h +Merging vhost/linux-next (bce7bbce4c15 vdpa_sim: add support for user VA) +$ 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/scsi.c +Auto-merging drivers/vhost/vhost.c +Merge made by the 'ort' strategy. + drivers/vdpa/mlx5/net/mlx5_vnet.c | 6 +- + drivers/vdpa/vdpa_sim/vdpa_sim.c | 144 ++++++++++--- + drivers/vdpa/vdpa_sim/vdpa_sim.h | 11 +- + drivers/vdpa/vdpa_sim/vdpa_sim_blk.c | 10 +- + drivers/vdpa/vdpa_sim/vdpa_sim_net.c | 10 +- + drivers/vhost/scsi.c | 141 ++++++------- + drivers/vhost/vdpa.c | 31 +++ + drivers/vhost/vhost.c | 6 +- + drivers/vhost/vringh.c | 153 +++++++++++--- + drivers/virtio/virtio.c | 6 + + drivers/virtio/virtio_ring.c | 388 ++++++++++++++++++++++++----------- + include/linux/vdpa.h | 10 + + include/linux/virtio.h | 20 +- + include/linux/vringh.h | 5 +- + tools/virtio/virtio_test.c | 12 +- + 15 files changed, 660 insertions(+), 293 deletions(-) +Merging rpmsg/for-next (e19967994d34 remoteproc/mtk_scpi_ipi: Fix one kernel-doc comment) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next +Merge made by the 'ort' strategy. + drivers/mailbox/zynqmp-ipi-mailbox.c | 13 +- + drivers/remoteproc/imx_dsp_rproc.c | 219 +++++++++++++++++++- + drivers/remoteproc/mtk_scp_ipi.c | 2 +- + drivers/remoteproc/xlnx_r5_remoteproc.c | 308 ++++++++++++++++++++++------- + include/linux/mailbox/zynqmp-ipi-message.h | 2 +- + 5 files changed, 464 insertions(+), 80 deletions(-) +Merging gpio/for-next (e73f0f0ee754 Linux 5.14-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git gpio/for-next +Already up to date. +Merging gpio-brgl/gpio/for-next (03810031c91d gpio: fxl6408: add I2C GPIO expander driver) +$ 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 +Auto-merging MAINTAINERS +Auto-merging arch/arm/Kconfig +Auto-merging arch/m68k/Kconfig.cpu +Auto-merging arch/powerpc/platforms/8xx/cpm1.c +Auto-merging drivers/gpio/Kconfig +Auto-merging drivers/gpio/Makefile +Auto-merging drivers/gpio/gpiolib-acpi.c +Auto-merging drivers/gpio/gpiolib-sysfs.c +Auto-merging drivers/net/ieee802154/ca8210.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/gpio/sysfs.rst | 2 +- + .../devicetree/bindings/gpio/fcs,fxl6408.yaml | 58 +++++ + Documentation/devicetree/bindings/gpio/gpio.txt | 41 ++-- + .../devicetree/bindings/gpio/loongson,ls-gpio.yaml | 126 +++++++++++ + Documentation/driver-api/gpio/driver.rst | 8 +- + Documentation/driver-api/gpio/legacy.rst | 23 -- + .../translations/zh_CN/driver-api/gpio/legacy.rst | 20 -- + Documentation/translations/zh_TW/gpio.txt | 19 -- + MAINTAINERS | 9 +- + arch/arm/Kconfig | 1 - + arch/arm/include/asm/gpio.h | 21 -- + arch/arm/mach-omap1/irq.c | 1 + + arch/arm/mach-omap2/pdata-quirks.c | 9 +- + arch/arm/mach-orion5x/board-rd88f5182.c | 1 + + arch/arm/mach-s3c/s3c64xx.c | 2 +- + arch/arm/mach-sa1100/assabet.c | 1 + + arch/arm/plat-orion/gpio.c | 5 +- + arch/m68k/Kconfig.cpu | 1 - + arch/m68k/include/asm/gpio.h | 95 -------- + arch/m68k/include/asm/mcfgpio.h | 2 +- + arch/powerpc/platforms/44x/Kconfig | 1 + + arch/powerpc/platforms/4xx/gpio.c | 2 +- + arch/powerpc/platforms/8xx/Kconfig | 1 + + arch/powerpc/platforms/8xx/cpm1.c | 2 +- + arch/powerpc/platforms/Kconfig | 2 + + arch/powerpc/sysdev/cpm_common.c | 2 +- + arch/sh/Kconfig | 1 - + arch/sh/boards/board-magicpanelr2.c | 1 + + arch/sh/boards/mach-ap325rxa/setup.c | 7 +- + arch/sh/include/asm/gpio.h | 45 ---- + drivers/gpio/Kconfig | 57 +++-- + drivers/gpio/Makefile | 2 + + drivers/gpio/TODO | 15 +- + drivers/gpio/gpio-104-dio-48e.c | 5 +- + drivers/gpio/gpio-adnp.c | 9 +- + drivers/gpio/gpio-aggregator.c | 9 +- + drivers/gpio/gpio-altera.c | 29 +-- + drivers/gpio/gpio-aspeed-sgpio.c | 45 +++- + drivers/gpio/gpio-aspeed.c | 82 ++++--- + drivers/gpio/gpio-ath79.c | 8 +- + drivers/gpio/gpio-cadence.c | 10 +- + drivers/gpio/gpio-davinci.c | 2 - + drivers/gpio/gpio-ftgpio010.c | 2 +- + drivers/gpio/gpio-fxl6408.c | 158 ++++++++++++++ + drivers/gpio/gpio-hisi.c | 25 ++- + drivers/gpio/gpio-hlwd.c | 33 ++- + drivers/gpio/gpio-idt3243x.c | 11 +- + drivers/gpio/gpio-imx-scu.c | 1 - + drivers/gpio/gpio-loongson-64bit.c | 238 +++++++++++++++++++++ + drivers/gpio/gpio-max732x.c | 8 +- + drivers/gpio/gpio-mlxbf2.c | 32 ++- + drivers/gpio/gpio-mm-lantiq.c | 2 +- + drivers/gpio/gpio-mpc5200.c | 2 +- + drivers/gpio/gpio-msc313.c | 26 ++- + drivers/gpio/gpio-mxs.c | 1 - + drivers/gpio/gpio-omap.c | 83 +++---- + drivers/gpio/gpio-pci-idio-16.c | 12 +- + drivers/gpio/gpio-pcie-idio-24.c | 21 +- + drivers/gpio/gpio-raspberrypi-exp.c | 2 +- + drivers/gpio/gpio-rcar.c | 2 +- + drivers/gpio/gpio-rda.c | 1 - + drivers/gpio/gpio-reg.c | 12 +- + drivers/gpio/gpio-regmap.c | 12 +- + drivers/gpio/gpio-sama5d2-piobu.c | 2 +- + drivers/gpio/gpio-sifive.c | 2 +- + drivers/gpio/gpio-sim.c | 2 +- + drivers/gpio/gpio-stp-xway.c | 2 +- + drivers/gpio/gpio-tb10x.c | 2 +- + drivers/gpio/gpio-visconti.c | 2 +- + drivers/gpio/gpio-xra1403.c | 2 +- + drivers/gpio/gpiolib-acpi.c | 10 +- + drivers/gpio/gpiolib-acpi.h | 1 - + drivers/gpio/gpiolib-of.c | 9 +- + drivers/gpio/gpiolib-of.h | 1 - + drivers/gpio/gpiolib-swnode.c | 5 +- + drivers/gpio/gpiolib-sysfs.c | 25 ++- + drivers/gpio/gpiolib.c | 89 ++++---- + drivers/hte/hte-tegra194-test.c | 10 +- + drivers/input/touchscreen/ads7846.c | 5 +- + drivers/media/pci/sta2x11/sta2x11_vip.c | 10 +- + drivers/net/ieee802154/ca8210.c | 3 +- + .../net/wireless/broadcom/brcm80211/brcmsmac/led.c | 1 + + drivers/pinctrl/core.c | 1 - + drivers/soc/fsl/qe/gpio.c | 2 +- + include/asm-generic/gpio.h | 147 ------------- + include/linux/gpio.h | 104 +++++---- + include/linux/gpio/consumer.h | 24 +-- + include/linux/gpio/driver.h | 31 ++- + include/linux/gpio/legacy-of-mm-gpiochip.h | 36 ++++ + include/linux/mfd/ucb1x00.h | 1 + + include/linux/of_gpio.h | 21 -- + 91 files changed, 1268 insertions(+), 748 deletions(-) + create mode 100644 Documentation/devicetree/bindings/gpio/fcs,fxl6408.yaml + create mode 100644 Documentation/devicetree/bindings/gpio/loongson,ls-gpio.yaml + delete mode 100644 arch/arm/include/asm/gpio.h + delete mode 100644 arch/m68k/include/asm/gpio.h + delete mode 100644 arch/sh/include/asm/gpio.h + create mode 100644 drivers/gpio/gpio-fxl6408.c + create mode 100644 drivers/gpio/gpio-loongson-64bit.c + delete mode 100644 include/asm-generic/gpio.h + create mode 100644 include/linux/gpio/legacy-of-mm-gpiochip.h +Merging gpio-intel/for-next (d884ae2571af gpio: mm-lantiq: Fix typo in the newly added header filename) +$ 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 +Auto-merging MAINTAINERS +Auto-merging drivers/gpio/Kconfig +Auto-merging drivers/gpio/Makefile +Auto-merging drivers/gpio/gpiolib-acpi.c +Merge made by the 'ort' strategy. + MAINTAINERS | 2 + + arch/mips/ar7/gpio.c | 2 +- + arch/sh/boards/mach-x3proto/setup.c | 2 +- + drivers/gpio/Kconfig | 24 +- + drivers/gpio/Makefile | 2 + + drivers/gpio/gpio-elkhartlake.c | 90 ++++++ + drivers/gpio/gpio-ich.c | 10 +- + drivers/gpio/gpio-merrifield.c | 453 +++--------------------------- + drivers/gpio/gpio-mm-lantiq.c | 2 +- + drivers/gpio/gpio-tangier.c | 536 ++++++++++++++++++++++++++++++++++++ + drivers/gpio/gpio-tangier.h | 117 ++++++++ + drivers/gpio/gpiolib-acpi.c | 13 +- + 12 files changed, 811 insertions(+), 442 deletions(-) + create mode 100644 drivers/gpio/gpio-elkhartlake.c + create mode 100644 drivers/gpio/gpio-tangier.c + create mode 100644 drivers/gpio/gpio-tangier.h +Merging pinctrl/for-next (454c44542d35 Merge branch 'devel' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next +Auto-merging Documentation/devicetree/bindings/pinctrl/mediatek,mt8192-pinctrl.yaml +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/gpio/nxp,pcf8575.yaml | 4 + + .../bindings/pinctrl/mediatek,mt65xx-pinctrl.yaml | 32 +- + .../bindings/pinctrl/mediatek,mt6779-pinctrl.yaml | 39 +- + ...rl-mt6795.yaml => mediatek,mt6795-pinctrl.yaml} | 51 +- + .../bindings/pinctrl/mediatek,mt7620-pinctrl.yaml | 298 +++++ + ...1-pinctrl.yaml => mediatek,mt7621-pinctrl.yaml} | 17 +- + .../bindings/pinctrl/mediatek,mt7622-pinctrl.yaml | 34 +- + ...0-pinctrl.yaml => mediatek,mt76x8-pinctrl.yaml} | 252 +--- + .../bindings/pinctrl/mediatek,mt7981-pinctrl.yaml | 35 +- + .../bindings/pinctrl/mediatek,mt7986-pinctrl.yaml | 80 +- + .../bindings/pinctrl/mediatek,mt8183-pinctrl.yaml | 32 +- + ...rl-mt8186.yaml => mediatek,mt8186-pinctrl.yaml} | 55 +- + .../bindings/pinctrl/mediatek,mt8188-pinctrl.yaml | 80 +- + ...rl-mt8192.yaml => mediatek,mt8192-pinctrl.yaml} | 57 +- + ...rl-mt8195.yaml => mediatek,mt8195-pinctrl.yaml} | 51 +- + .../bindings/pinctrl/mediatek,mt8365-pinctrl.yaml | 30 +- + .../bindings/pinctrl/nxp,s32g2-siul2-pinctrl.yaml | 123 ++ + .../bindings/pinctrl/qcom,ipq9574-tlmm.yaml | 130 ++ + .../bindings/pinctrl/qcom,qcm2290-tlmm.yaml | 1 + + .../pinctrl/qcom,sc8280xp-lpass-lpi-pinctrl.yaml | 2 +- + .../bindings/pinctrl/qcom,sc8280xp-tlmm.yaml | 1 + + .../bindings/pinctrl/qcom,sm7150-tlmm.yaml | 162 +++ + .../pinctrl/qcom,sm8450-lpass-lpi-pinctrl.yaml | 2 +- + .../pinctrl/qcom,sm8550-lpass-lpi-pinctrl.yaml | 2 +- + .../bindings/pinctrl/ralink,rt2880-pinctrl.yaml | 11 +- + .../bindings/pinctrl/ralink,rt305x-pinctrl.yaml | 89 +- + .../bindings/pinctrl/ralink,rt3352-pinctrl.yaml | 243 ++++ + .../bindings/pinctrl/ralink,rt3883-pinctrl.yaml | 11 +- + .../bindings/pinctrl/ralink,rt5350-pinctrl.yaml | 206 ++++ + MAINTAINERS | 37 +- + drivers/pinctrl/Kconfig | 15 +- + drivers/pinctrl/Makefile | 3 +- + drivers/pinctrl/freescale/Kconfig | 2 +- + drivers/pinctrl/freescale/pinctrl-imx.c | 80 +- + drivers/pinctrl/freescale/pinctrl-imx.h | 24 - + drivers/pinctrl/mediatek/Kconfig | 98 +- + drivers/pinctrl/mediatek/Makefile | 63 +- + drivers/pinctrl/mediatek/pinctrl-mt7620.c | 137 +++ + .../pinctrl/{ralink => mediatek}/pinctrl-mt7621.c | 31 +- + drivers/pinctrl/mediatek/pinctrl-mt76x8.c | 283 +++++ + .../pinctrl-ralink.c => mediatek/pinctrl-mtmips.c} | 90 +- + .../pinctrl-ralink.h => mediatek/pinctrl-mtmips.h} | 16 +- + .../pinctrl/{ralink => mediatek}/pinctrl-rt2880.c | 21 +- + .../pinctrl/{ralink => mediatek}/pinctrl-rt305x.c | 47 +- + .../pinctrl/{ralink => mediatek}/pinctrl-rt3883.c | 29 +- + drivers/pinctrl/nxp/Kconfig | 15 + + drivers/pinctrl/nxp/Makefile | 4 + + drivers/pinctrl/nxp/pinctrl-s32.h | 73 ++ + drivers/pinctrl/nxp/pinctrl-s32cc.c | 945 +++++++++++++++ + drivers/pinctrl/nxp/pinctrl-s32g2.c | 772 ++++++++++++ + drivers/pinctrl/pinctrl-at91-pio4.c | 42 +- + drivers/pinctrl/pinctrl-at91.c | 189 ++- + drivers/pinctrl/pinctrl-mlxbf3.c | 320 +++++ + drivers/pinctrl/pinctrl-ocelot.c | 2 +- + drivers/pinctrl/pinctrl-sx150x.c | 2 +- + drivers/pinctrl/qcom/Kconfig | 21 + + drivers/pinctrl/qcom/Makefile | 2 + + drivers/pinctrl/qcom/pinctrl-ipq9574.c | 826 +++++++++++++ + drivers/pinctrl/qcom/pinctrl-lpass-lpi.c | 46 +- + drivers/pinctrl/qcom/pinctrl-msm.c | 3 +- + drivers/pinctrl/qcom/pinctrl-msm8998.c | 14 + + drivers/pinctrl/qcom/pinctrl-sm7150.c | 1280 ++++++++++++++++++++ + drivers/pinctrl/qcom/pinctrl-sm8550-lpass-lpi.c | 8 + + drivers/pinctrl/ralink/Kconfig | 35 - + drivers/pinctrl/ralink/Makefile | 8 - + drivers/pinctrl/ralink/pinctrl-mt7620.c | 391 ------ + drivers/pinctrl/stm32/pinctrl-stm32.c | 2 +- + 67 files changed, 6645 insertions(+), 1461 deletions(-) + rename Documentation/devicetree/bindings/pinctrl/{mediatek,pinctrl-mt6795.yaml => mediatek,mt6795-pinctrl.yaml} (85%) + create mode 100644 Documentation/devicetree/bindings/pinctrl/mediatek,mt7620-pinctrl.yaml + rename Documentation/devicetree/bindings/pinctrl/{ralink,mt7621-pinctrl.yaml => mediatek,mt7621-pinctrl.yaml} (96%) + rename Documentation/devicetree/bindings/pinctrl/{ralink,mt7620-pinctrl.yaml => mediatek,mt76x8-pinctrl.yaml} (61%) + rename Documentation/devicetree/bindings/pinctrl/{pinctrl-mt8186.yaml => mediatek,mt8186-pinctrl.yaml} (87%) + rename Documentation/devicetree/bindings/pinctrl/{pinctrl-mt8192.yaml => mediatek,mt8192-pinctrl.yaml} (81%) + rename Documentation/devicetree/bindings/pinctrl/{pinctrl-mt8195.yaml => mediatek,mt8195-pinctrl.yaml} (89%) + create mode 100644 Documentation/devicetree/bindings/pinctrl/nxp,s32g2-siul2-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,ipq9574-tlmm.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sm7150-tlmm.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/ralink,rt3352-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/ralink,rt5350-pinctrl.yaml + create mode 100644 drivers/pinctrl/mediatek/pinctrl-mt7620.c + rename drivers/pinctrl/{ralink => mediatek}/pinctrl-mt7621.c (79%) + create mode 100644 drivers/pinctrl/mediatek/pinctrl-mt76x8.c + rename drivers/pinctrl/{ralink/pinctrl-ralink.c => mediatek/pinctrl-mtmips.c} (74%) + rename drivers/pinctrl/{ralink/pinctrl-ralink.h => mediatek/pinctrl-mtmips.h} (75%) + rename drivers/pinctrl/{ralink => mediatek}/pinctrl-rt2880.c (69%) + rename drivers/pinctrl/{ralink => mediatek}/pinctrl-rt305x.c (73%) + rename drivers/pinctrl/{ralink => mediatek}/pinctrl-rt3883.c (79%) + create mode 100644 drivers/pinctrl/nxp/Kconfig + create mode 100644 drivers/pinctrl/nxp/Makefile + create mode 100644 drivers/pinctrl/nxp/pinctrl-s32.h + create mode 100644 drivers/pinctrl/nxp/pinctrl-s32cc.c + create mode 100644 drivers/pinctrl/nxp/pinctrl-s32g2.c + create mode 100644 drivers/pinctrl/pinctrl-mlxbf3.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-ipq9574.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-sm7150.c + delete mode 100644 drivers/pinctrl/ralink/Kconfig + delete mode 100644 drivers/pinctrl/ralink/Makefile + delete mode 100644 drivers/pinctrl/ralink/pinctrl-mt7620.c +Merging pinctrl-intel/for-next (fe15c26ee26e Linux 6.3-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel/for-next +Already up to date. +Merging pinctrl-renesas/renesas-pinctrl (9d7558ed8372 pinctrl: renesas: Drop support for Renesas-specific properties) +$ 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/Kconfig | 5 - + drivers/pinctrl/renesas/Makefile | 1 - + drivers/pinctrl/renesas/core.c | 41 +- + drivers/pinctrl/renesas/pfc-r8a77950.c | 5947 -------------------------------- + drivers/pinctrl/renesas/pfc-r8a779a0.c | 8 - + drivers/pinctrl/renesas/pfc-r8a779f0.c | 2 +- + drivers/pinctrl/renesas/pfc-r8a779g0.c | 1042 +++--- + drivers/pinctrl/renesas/pinctrl.c | 31 +- + drivers/pinctrl/renesas/sh_pfc.h | 1 - + 9 files changed, 565 insertions(+), 6513 deletions(-) + delete mode 100644 drivers/pinctrl/renesas/pfc-r8a77950.c +Merging pinctrl-samsung/for-next (fe15c26ee26e Linux 6.3-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung/for-next +Already up to date. +Merging pwm/for-next (cf70d01a62c7 pwm: dwc: Use devm_pwmchip_add()) +$ 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 (e1e17d7debf4 kselftest: amd-pstate: Fix spelling mistakes) +$ 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/amd-pstate/gitsource.sh | 4 ++-- + tools/testing/selftests/amd-pstate/run.sh | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) +Merging kunit/test (fe15c26ee26e Linux 6.3-rc1) +$ git merge -m Merge branch 'test' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit/test +Already up to date. +Merging kunit-next/kunit (99be6588118b kunit: Use gfp in kunit_alloc_resource() kernel-doc) +$ 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. + include/kunit/resource.h | 2 +- + include/kunit/test.h | 4 +-- + lib/kunit/debugfs.c | 14 ++++++-- + lib/kunit/kunit-test.c | 35 +++++++++++++------- + lib/kunit/test.c | 57 ++++++++++++++++++++++++-------- + tools/testing/kunit/kunit.py | 26 +++++++-------- + tools/testing/kunit/kunit_config.py | 4 +-- + tools/testing/kunit/kunit_kernel.py | 36 ++++++++++---------- + tools/testing/kunit/kunit_parser.py | 1 - + tools/testing/kunit/kunit_printer.py | 2 +- + tools/testing/kunit/kunit_tool_test.py | 2 +- + tools/testing/kunit/qemu_configs/m68k.py | 10 ++++++ + tools/testing/kunit/run_checks.py | 6 ++-- + 13 files changed, 130 insertions(+), 69 deletions(-) + create mode 100644 tools/testing/kunit/qemu_configs/m68k.py +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 +Auto-merging include/linux/module.h +Auto-merging kernel/livepatch/core.c +Merge made by the 'ort' strategy. + Documentation/livepatch/module-elf-format.rst | 20 ++++++++++---------- + include/linux/module.h | 6 +++--- + kernel/livepatch/core.c | 6 +++--- + kernel/module/livepatch.c | 10 +++++----- + 4 files changed, 21 insertions(+), 21 deletions(-) +Merging rtc/rtc-next (0e6255fa3f64 rtc: meson-vrtc: Use ktime_get_real_ts64() to get the current time) +$ git merge -m Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next +Merge made by the 'ort' strategy. + .../bindings/rtc/allwinner,sun4i-a10-rtc.yaml | 2 +- + .../bindings/rtc/allwinner,sun6i-a31-rtc.yaml | 2 +- + .../devicetree/bindings/rtc/atmel,at91rm9200-rtc.yaml | 2 +- + .../devicetree/bindings/rtc/atmel,at91sam9260-rtt.yaml | 2 +- + .../devicetree/bindings/rtc/brcm,brcmstb-waketimer.yaml | 2 +- + .../devicetree/bindings/rtc/faraday,ftrtc010.yaml | 4 ++-- + .../devicetree/bindings/rtc/microcrystal,rv3032.yaml | 2 +- + .../devicetree/bindings/rtc/mstar,msc313-rtc.yaml | 2 +- + .../devicetree/bindings/rtc/nuvoton,nct3018y.yaml | 2 +- + Documentation/devicetree/bindings/rtc/nxp,pcf2127.yaml | 2 +- + Documentation/devicetree/bindings/rtc/rtc-mxc.yaml | 2 +- + Documentation/devicetree/bindings/rtc/rtc-mxc_v2.yaml | 2 +- + Documentation/devicetree/bindings/rtc/sa1100-rtc.yaml | 4 ++-- + Documentation/devicetree/bindings/rtc/st,stm32-rtc.yaml | 2 +- + Documentation/devicetree/bindings/rtc/ti,k3-rtc.yaml | 2 +- + Documentation/devicetree/bindings/rtc/trivial-rtc.yaml | 2 +- + drivers/rtc/Kconfig | 2 +- + drivers/rtc/rtc-88pm80x.c | 5 ++--- + drivers/rtc/rtc-88pm860x.c | 6 ++---- + drivers/rtc/rtc-ab8500.c | 6 ++---- + drivers/rtc/rtc-ac100.c | 6 ++---- + drivers/rtc/rtc-asm9260.c | 5 ++--- + drivers/rtc/rtc-at91sam9.c | 6 ++---- + drivers/rtc/rtc-brcmstb-waketimer.c | 6 ++---- + drivers/rtc/rtc-cadence.c | 6 ++---- + drivers/rtc/rtc-cmos.c | 5 ++--- + drivers/rtc/rtc-cros-ec.c | 6 ++---- + drivers/rtc/rtc-ds1390.c | 2 +- + drivers/rtc/rtc-ds1685.c | 6 ++---- + drivers/rtc/rtc-ftrtc010.c | 6 ++---- + drivers/rtc/rtc-hid-sensor-time.c | 6 ++---- + drivers/rtc/rtc-lpc24xx.c | 6 ++---- + drivers/rtc/rtc-max77686.c | 6 ++---- + drivers/rtc/rtc-mc13xxx.c | 6 ++---- + drivers/rtc/rtc-meson-vrtc.c | 4 ++-- + drivers/rtc/rtc-mpc5121.c | 6 ++---- + drivers/rtc/rtc-mpfs.c | 6 ++---- + drivers/rtc/rtc-mt7622.c | 6 ++---- + drivers/rtc/rtc-mxc_v2.c | 5 ++--- + drivers/rtc/rtc-omap.c | 7 +++---- + drivers/rtc/rtc-palmas.c | 5 ++--- + drivers/rtc/rtc-pcf50633.c | 6 ++---- + drivers/rtc/rtc-pcf8523.c | 17 ++++++++--------- + drivers/rtc/rtc-pic32.c | 6 ++---- + drivers/rtc/rtc-pm8xxx.c | 5 ++--- + drivers/rtc/rtc-rc5t583.c | 5 ++--- + drivers/rtc/rtc-rtd119x.c | 6 ++---- + drivers/rtc/rtc-rzn1.c | 6 ++---- + drivers/rtc/rtc-s3c.c | 6 ++---- + drivers/rtc/rtc-sa1100.c | 6 ++---- + drivers/rtc/rtc-spear.c | 6 ++---- + drivers/rtc/rtc-stm32.c | 6 ++---- + drivers/rtc/rtc-stmp3xxx.c | 8 +++----- + drivers/rtc/rtc-sun6i.c | 2 +- + drivers/rtc/rtc-sunplus.c | 6 ++---- + drivers/rtc/rtc-tegra.c | 6 ++---- + drivers/rtc/rtc-tps6586x.c | 5 ++--- + drivers/rtc/rtc-twl.c | 6 ++---- + drivers/rtc/rtc-vt8500.c | 6 ++---- + drivers/rtc/rtc-wm8350.c | 6 ++---- + drivers/rtc/rtc-xgene.c | 5 ++--- + drivers/rtc/rtc-zynqmp.c | 6 ++---- + 62 files changed, 115 insertions(+), 188 deletions(-) +Merging nvdimm/libnvdimm-for-next (305a72efa791 Merge branch 'for-6.1/nvdimm' into libnvdimm-for-next) +$ git merge -m Merge branch 'libnvdimm-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm/libnvdimm-for-next +Already up to date. +Merging at24/at24/for-next (fe15c26ee26e Linux 6.3-rc1) +$ git merge -m Merge branch 'at24/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (0310a30a9395 NTB: ntb_transport: fix possible memory leak while device_register() fails) +$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next +Auto-merging drivers/pci/endpoint/functions/pci-epf-vntb.c +Merge made by the 'ort' strategy. + drivers/ntb/hw/amd/ntb_hw_amd.c | 7 ++++++- + drivers/ntb/hw/idt/ntb_hw_idt.c | 7 ++++++- + drivers/ntb/hw/intel/ntb_hw_gen1.c | 7 ++++++- + drivers/ntb/ntb_transport.c | 2 +- + drivers/pci/endpoint/functions/pci-epf-vntb.c | 1 + + 5 files changed, 20 insertions(+), 4 deletions(-) +Merging seccomp/for-next/seccomp (0fb0624b15d2 seccomp: fix kernel-doc function name warning) +$ git merge -m Merge branch 'for-next/seccomp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git seccomp/for-next/seccomp +Already up to date. +Merging fsi/next (35af9fb49bc5 fsi: core: Check error number after calling ida_simple_get) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git fsi/next +Already up to date. +Merging slimbus/for-next (fe15c26ee26e Linux 6.3-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git slimbus/for-next +Already up to date. +Merging nvmem/for-next (1fc7a13bb731 dt-bindings: nvmem: Drop unneeded quotes) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git nvmem/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/i2c/i2c-core-of.c +Auto-merging drivers/nvmem/core.c +Auto-merging drivers/spi/spi.c +Merge made by the 'ort' strategy. + .../bindings/nvmem/allwinner,sun4i-a10-sid.yaml | 2 +- + .../bindings/nvmem/amlogic,meson-gxbb-efuse.yaml | 57 +++++ + .../bindings/nvmem/amlogic,meson6-efuse.yaml | 57 +++++ + .../devicetree/bindings/nvmem/amlogic-efuse.txt | 48 ---- + .../bindings/nvmem/amlogic-meson-mx-efuse.txt | 22 -- + .../devicetree/bindings/nvmem/apple,efuses.yaml | 2 +- + .../devicetree/bindings/nvmem/brcm,nvram.yaml | 2 +- + .../bindings/nvmem/fsl,layerscape-sfp.yaml | 2 +- + .../devicetree/bindings/nvmem/imx-iim.yaml | 2 +- + .../devicetree/bindings/nvmem/imx-ocotp.yaml | 2 +- + .../bindings/nvmem/ingenic,jz4780-efuse.yaml | 2 +- + .../bindings/nvmem/layouts/onie,tlv-layout.yaml | 2 +- + .../devicetree/bindings/nvmem/mediatek,efuse.yaml | 2 +- + .../bindings/nvmem/microchip,sama7g5-otpc.yaml | 2 +- + .../devicetree/bindings/nvmem/mxs-ocotp.yaml | 2 +- + .../devicetree/bindings/nvmem/nintendo-otp.yaml | 2 +- + .../devicetree/bindings/nvmem/qcom,qfprom.yaml | 2 +- + .../devicetree/bindings/nvmem/qcom,spmi-sdam.yaml | 2 +- + Documentation/devicetree/bindings/nvmem/rmem.yaml | 2 +- + .../devicetree/bindings/nvmem/rockchip-efuse.yaml | 2 +- + .../bindings/nvmem/socionext,uniphier-efuse.yaml | 2 +- + .../devicetree/bindings/nvmem/st,stm32-romem.yaml | 2 +- + .../bindings/nvmem/sunplus,sp7021-ocotp.yaml | 2 +- + Documentation/driver-api/nvmem.rst | 15 ++ + MAINTAINERS | 12 + + drivers/acpi/bus.c | 7 +- + drivers/gpu/drm/drm_mipi_dsi.c | 2 +- + drivers/hsi/hsi_core.c | 2 +- + drivers/i2c/busses/i2c-powermac.c | 2 +- + drivers/i2c/i2c-core-of.c | 2 +- + drivers/nvmem/Kconfig | 6 +- + drivers/nvmem/Makefile | 1 + + drivers/nvmem/core.c | 160 ++++++++++++- + drivers/nvmem/imx-ocotp.c | 30 ++- + drivers/nvmem/layouts/Kconfig | 23 ++ + drivers/nvmem/layouts/Makefile | 7 + + drivers/nvmem/layouts/onie-tlv.c | 257 +++++++++++++++++++++ + drivers/nvmem/layouts/sl28vpd.c | 165 +++++++++++++ + drivers/of/Makefile | 2 +- + drivers/of/base.c | 18 +- + drivers/of/device.c | 75 +----- + drivers/of/module.c | 74 ++++++ + drivers/spi/spi.c | 4 +- + drivers/usb/common/ulpi.c | 2 +- + include/linux/nvmem-consumer.h | 7 + + include/linux/nvmem-provider.h | 66 +++++- + include/linux/of.h | 18 +- + include/linux/of_device.h | 6 - + 48 files changed, 984 insertions(+), 201 deletions(-) + create mode 100644 Documentation/devicetree/bindings/nvmem/amlogic,meson-gxbb-efuse.yaml + create mode 100644 Documentation/devicetree/bindings/nvmem/amlogic,meson6-efuse.yaml + delete mode 100644 Documentation/devicetree/bindings/nvmem/amlogic-efuse.txt + delete mode 100644 Documentation/devicetree/bindings/nvmem/amlogic-meson-mx-efuse.txt + create mode 100644 drivers/nvmem/layouts/Kconfig + create mode 100644 drivers/nvmem/layouts/Makefile + create mode 100644 drivers/nvmem/layouts/onie-tlv.c + create mode 100644 drivers/nvmem/layouts/sl28vpd.c + create mode 100644 drivers/of/module.c +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 (fe15c26ee26e Linux 6.3-rc1) +$ git merge -m Merge branch 'hyperv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv/hyperv-next +Already up to date. +Merging auxdisplay/auxdisplay (ddf75a86aba2 auxdisplay: hd44780: Fix potential memory leak in hd44780_remove()) +$ git merge -m Merge branch 'auxdisplay' of https://github.com/ojeda/linux.git auxdisplay/auxdisplay +Already up to date. +Merging kgdb/kgdb/for-next (c1cb81429df4 kdb: Fix the putarea helper function) +$ git merge -m Merge branch 'kgdb/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git kgdb/kgdb/for-next +Already up to date. +Merging hmm/hmm (fe15c26ee26e Linux 6.3-rc1) +$ git merge -m Merge branch 'hmm' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git hmm/hmm +Already up to date. +Merging cfi/cfi/next (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'cfi/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git cfi/cfi/next +Already up to date. +Merging mhi/mhi-next (14853a0676c1 bus: mhi: host: pci_generic: Revert "Add a secondary AT port to Telit FN990") +$ git merge -m Merge branch 'mhi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git mhi/mhi-next +Merge made by the 'ort' strategy. + drivers/bus/mhi/ep/main.c | 4 ++-- + drivers/bus/mhi/host/main.c | 15 --------------- + drivers/bus/mhi/host/pci_generic.c | 10 +--------- + include/linux/mhi.h | 7 ------- + 4 files changed, 3 insertions(+), 33 deletions(-) +Merging memblock/for-next (34875d6fc52d Add tests for memblock_alloc_node()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock/for-next +Merge made by the 'ort' strategy. + tools/testing/memblock/tests/alloc_nid_api.c | 40 ++++++++++++++++++++++++++++ + 1 file changed, 40 insertions(+) +Merging cxl/next (e686c32590f4 dax/kmem: Fix leak of memory-hotplug resources) +$ 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 (bac363715a7c efi/libstub: Look for initrd LoadFile2 protocol on image handle) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next +Auto-merging drivers/firmware/efi/libstub/efistub.h +Auto-merging include/linux/efi.h +Merge made by the 'ort' strategy. + drivers/firmware/efi/libstub/efi-stub-helper.c | 56 ++++++++++++++++---------- + drivers/firmware/efi/libstub/efi-stub.c | 4 +- + drivers/firmware/efi/libstub/efistub.h | 7 ++-- + drivers/firmware/efi/libstub/file.c | 2 +- + drivers/firmware/efi/libstub/x86-stub.c | 4 +- + include/linux/efi.h | 1 + + include/linux/pe.h | 2 +- + 7 files changed, 46 insertions(+), 30 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 (ac19705397df Merge branch 'slab/for-6.3-rc4/fixes' 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 +Auto-merging include/linux/page-flags.h +Auto-merging include/linux/slab.h +CONFLICT (content): Merge conflict in include/linux/slab.h +Auto-merging init/Kconfig +Auto-merging mm/Kconfig +Auto-merging mm/Kconfig.debug +Auto-merging mm/Makefile +Auto-merging mm/slab.c +Auto-merging mm/slab.h +Auto-merging mm/slub.c +Resolved 'include/linux/slab.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 99aece0c9443] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/mm/pagemap.rst | 6 +- + Documentation/core-api/memory-allocation.rst | 17 +- + fs/proc/page.c | 9 +- + include/linux/page-flags.h | 4 - + include/linux/rcupdate.h | 6 +- + include/linux/slab.h | 41 +- + init/Kconfig | 2 +- + kernel/configs/tiny.config | 1 - + mm/Kconfig | 22 - + mm/Kconfig.debug | 6 +- + mm/Makefile | 2 - + mm/slab.c | 2 +- + mm/slab.h | 61 --- + mm/slab_common.c | 7 +- + mm/slob.c | 757 --------------------------- + mm/slub.c | 2 +- + tools/mm/page-types.c | 6 +- + 17 files changed, 33 insertions(+), 918 deletions(-) + delete mode 100644 mm/slob.c +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 +Merge made by the 'ort' strategy. + include/uapi/linux/landlock.h | 46 +++++++++++++++++++++++++++++-------------- + 1 file changed, 31 insertions(+), 15 deletions(-) +Merging rust/rust-next (fe15c26ee26e Linux 6.3-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 (9b15aa91b3b2 mm: memory-failure: Move memory failure sysctls to its own file) + 879d6e0be61e ("ppc: simplify one-level sysctl registration for nmi_wd_lpm_factor_ctl_table") + 936e720e729c ("ppc: simplify one-level sysctl registration for powersave_nap_ctl_table") +$ git merge -m Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git sysctl/sysctl-next +Auto-merging fs/proc/proc_sysctl.c +Auto-merging fs/userfaultfd.c +Auto-merging include/linux/hugetlb.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/userfaultfd_k.h +Auto-merging mm/hugetlb.c +Auto-merging mm/memory-failure.c +Auto-merging security/apparmor/lsm.c +Auto-merging security/loadpin/loadpin.c +Auto-merging security/yama/yama_lsm.c +Merge made by the 'ort' strategy. + arch/arm/kernel/isa.c | 18 +------- + arch/csky/abiv1/alignment.c | 15 +------ + arch/ia64/kernel/crash.c | 11 +---- + arch/x86/entry/vdso/vdso32-setup.c | 11 +---- + arch/x86/kernel/itmt.c | 11 +---- + drivers/hv/vmbus_drv.c | 11 +---- + drivers/md/md.c | 22 +--------- + drivers/scsi/scsi_sysctl.c | 16 +------ + drivers/xen/balloon.c | 20 +-------- + fs/cachefiles/error_inject.c | 11 +---- + fs/coda/sysctl.c | 11 +---- + fs/lockd/svc.c | 20 +-------- + fs/nfs/nfs4sysctl.c | 21 +-------- + fs/nfs/sysctl.c | 20 +-------- + fs/ntfs/sysctl.c | 12 +----- + fs/proc/proc_sysctl.c | 88 +++++++++++++++++++++++++------------- + fs/userfaultfd.c | 20 ++++++++- + fs/xfs/xfs_sysctl.c | 20 +-------- + include/linux/hugetlb.h | 8 ---- + include/linux/mm.h | 2 - + include/linux/userfaultfd_k.h | 2 - + kernel/seccomp.c | 15 +------ + kernel/sysctl.c | 63 --------------------------- + kernel/utsname_sysctl.c | 11 +---- + mm/hugetlb.c | 51 ++++++++++++++++++++-- + mm/memory-failure.c | 36 +++++++++++++++- + security/apparmor/lsm.c | 8 +--- + security/loadpin/loadpin.c | 8 +--- + security/yama/yama_lsm.c | 8 +--- + 29 files changed, 181 insertions(+), 389 deletions(-) +Merging execve/for-next/execve (88603b6dc419 Linux 6.2-rc2) +$ git merge -m Merge branch 'for-next/execve' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git execve/for-next/execve +Already up to date. +Merging bitmap/bitmap-for-next (714f3af11b21 cpumask: fix function description kernel-doc notation) +$ git merge -m Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git bitmap/bitmap-for-next +Auto-merging include/linux/cpumask.h +CONFLICT (content): Merge conflict in include/linux/cpumask.h +Auto-merging include/linux/find.h +Resolved 'include/linux/cpumask.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 28906e33153d] 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 (fe15c26ee26e Linux 6.3-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git hte/for-next +Already up to date. +Merging kspp/for-next/kspp (78f7a3fd6dc6 randstruct: disable Clang 15 support) +$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git kspp/for-next/kspp +Already up to date. +Merging kspp-gustavo/for-next/kspp (edfea16a6dae drm/vmwgfx: Replace one-element array with flexible-array member) +$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git kspp-gustavo/for-next/kspp +Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_so.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/vmwgfx/vmwgfx_so.c | 2 +- + include/uapi/sound/asoc.h | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) +Merging iommufd/for-next (4ed4791afb34 iommufd/selftest: Add a selftest for iommufd_device_attach() with a hwpt argument) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd/for-next +Merge made by the 'ort' strategy. + drivers/iommu/iommufd/device.c | 149 ++++++----------- + drivers/iommu/iommufd/hw_pagetable.c | 70 ++++++-- + drivers/iommu/iommufd/iommufd_private.h | 35 +++- + drivers/iommu/iommufd/iommufd_test.h | 2 +- + drivers/iommu/iommufd/selftest.c | 198 +++++++++++++++++++---- + tools/testing/selftests/iommu/iommufd.c | 70 ++++---- + tools/testing/selftests/iommu/iommufd_fail_nth.c | 38 ++--- + tools/testing/selftests/iommu/iommufd_utils.h | 16 +- + 8 files changed, 369 insertions(+), 209 deletions(-) diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..2e7747a15acd --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20230322 |